Merge pull request #201 from CodeForCharlotte/145_adoption-site-design

#145 adoption site design
OpenCLTBrigade · Sep 15, 2018 · 2800352 · 2800352
2 parents 9ba2075 + 5edc5d9
commit 2800352
Show file tree

Hide file tree

Showing 23 changed files with 6,562 additions and 60 deletions.
diff --git a/frontend/applications/adoption/package.json b/frontend/applications/adoption/package.json
@@ -4,13 +4,13 @@
   "dependencies": {
     "axios": "^0.16.2",
     "babel-polyfill": "^6.26.0",
-    "bootstrap": "3.3.7",
+    "bootstrap": "^4.1.0",
     "moment": "^2.19.1",
     "ramda": "^0.25.0",
     "react": "^16.3.0",
-    "react-bootstrap": "0.32.1",
     "react-dom": "^16.3.0",
     "react-router-dom": "4.2.2",
+    "reactstrap": "^6.4.0",
     "styled-components": "^2.4.0",
     "ts-loader": "^2.3.7",
     "tslint": "^5.7.0",

diff --git a/frontend/applications/adoption/public/img/adoptions-banner.jpg b/frontend/applications/adoption/public/img/adoptions-banner.jpg
diff --git a/frontend/applications/adoption/public/img/logo.jpg b/frontend/applications/adoption/public/img/logo.jpg
diff --git a/frontend/applications/adoption/src/components/Navigation/Navigation.tsx b/frontend/applications/adoption/src/components/Navigation/Navigation.tsx
diff --git a/frontend/applications/adoption/src/layouts/PrimaryLayout/PrimaryLayout.tsx b/frontend/applications/adoption/src/layouts/PrimaryLayout/PrimaryLayout.tsx
@@ -1,10 +1,13 @@
 import * as React from 'react';
-import { Navigation } from '../../components/Navigation';
 import { PrimaryLayoutRoutes } from '../../routes';
+import Logo from './components/Logo';
+import { Navigation } from './components/Navigation';
+// import './assets/css/bootstrap-theme.css';
 
 const PrimaryLayout: React.SFC<{}> = _props => {
   return (
     <React.Fragment>
+      <Logo />
       <Navigation />
       <PrimaryLayoutRoutes />
     </React.Fragment>