makes sections reusable and adds customer content

nileorg · Apr 4, 2019 · 1a7bf5c · 1a7bf5c
1 parent f16bdc6
commit 1a7bf5c
Show file tree

Hide file tree

Showing 30 changed files with 1,093 additions and 878 deletions.
diff --git a/public/assets/heros/customer_hero.jpg b/public/assets/heros/customer_hero.jpg
diff --git a/public/assets/heros/divider.svg b/public/assets/heros/divider.svg
diff --git a/public/assets/heros/divider_grey.svg b/public/assets/heros/divider_grey.svg
diff --git a/public/assets/heros/earth.svg b/public/assets/heros/earth.svg
diff --git a/public/assets/heros/home_hero.jpg b/public/assets/heros/home_hero.jpg
diff --git a/public/assets/heros/imprint_hero.png b/public/assets/heros/imprint_hero.png
diff --git a/public/assets/heros/supplier_hero.jpg b/public/assets/heros/supplier_hero.jpg
diff --git a/public/assets/heros/vendor_hero.jpg b/public/assets/heros/vendor_hero.jpg
diff --git a/public/assets/mockups/customer/Product.png b/public/assets/mockups/customer/Product.png
diff --git a/public/assets/mockups/customer/Shop.png b/public/assets/mockups/customer/Shop.png
diff --git a/public/index.html b/public/index.html
@@ -7,15 +7,6 @@
       name="viewport"
       content="width=device-width, initial-scale=1, shrink-to-fit=no"
     />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
     <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
@@ -26,18 +17,7 @@
     <title>Nile - Empowering local economies</title>
   </head>
   <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
   </body>
   <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
 

diff --git a/src/Components/App.js b/src/Components/App.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from 'react'
+import React, { Component } from 'react'
 import { BrowserRouter, Route, Switch } from 'react-router-dom'
 
 // D E F A U L T S
@@ -21,72 +21,35 @@ import '../styles/sections/showcase.scss'
 import '../styles/sections/use-case.scss'
 import '../styles/sections/news.scss'
 
+// N A V   C O M P O N E N T S
 import Navigation from './Navigation'
-import SectionHero from './Sections/SectionHero'
-
-import SectionEcosystem from './Sections/SectionEcosystem'
-import SectionUseCases from './Sections/SectionUseCases'
-import SectionMission from './Sections/SectionMission'
-import SectionNews from './Sections/SectionNews'
-import SectionContact from './Sections/SectionContact'
 import Footer from './Footer'
 
-import Imprint from './Imprint'
-
-import AppNavigation from './Apps/AppNavigation'
+// P A G E S
+import Home from './Pages/Home'
+import Vendor from './Pages/Vendor'
+import Supplier from './Pages/Supplier'
+import Customer from './Pages/Customer'
+import Imprint from './Pages/Imprint'
 
-import VendorHome from './Apps/VendorHome'
-import SupplierHome from './Apps/SupplierHome'
-import CustomerHome from './Apps/CustomerHome'
 
-class App extends Component {
+export default class extends Component {
 
   render() {
     return (
       <div className="app">
         <BrowserRouter>
-          <Switch>
-            <Route exact
-              path='/'
-              component={HomeContainer}
-            />
-            <Route path='/app' component={AppContainer} />
-            <Route path='/imprint' component={ImprintContainer} />
-          </Switch>
+          <Route path='/' component={Navigation} />
+            <Switch>
+              <Route exact path='/' component={Home} />
+              <Route path='/vendor' component={Vendor} exact />
+              <Route path='/supplier' component={Supplier} exact />
+              <Route path='/customer' component={Customer} exact />
+              <Route path='/imprint' component={Imprint} exact />
+            </Switch>
+          <Footer />
         </BrowserRouter>
       </div>
     )
   }
 }
-
-const HomeContainer = (props) => (
-  <Fragment>
-    <Route path='/' component={Navigation} />
-
-    <SectionHero />
-    <SectionEcosystem />
-    <SectionUseCases />
-    <SectionMission />
-    <SectionNews />
-    <SectionContact />
-
-    <Footer />
-  </Fragment>
-)
-
-const AppContainer = (props) => (
-  <Fragment>
-    <Route path='/app' component={AppNavigation} />
-    <Route path='/app/vendor' component={VendorHome} exact />
-    <Route path='/app/supplier' component={SupplierHome} exact />
-    <Route path='/app/customer' component={CustomerHome} exact />
-  </Fragment>
-)
-
-const ImprintContainer = (props) => (
-  <Fragment>
-    <Route path='/imprint' component={Imprint} exact />
-  </Fragment>
-)
-
-export default App
diff --git a/src/Components/Apps/AppNavigation.js b/src/Components/Apps/AppNavigation.js
diff --git a/src/Components/Apps/CustomerHome.js b/src/Components/Apps/CustomerHome.js