Merge branch 'master' into proxy

reiniergs · Apr 13, 2017 · 2ed9107 · 2ed9107
2 parents cecb700 + d5b43b8
commit 2ed9107
Show file tree

Hide file tree

Showing 13 changed files with 97 additions and 24 deletions.
diff --git a/app/components/About/index.js b/app/components/About/index.js
@@ -0,0 +1,7 @@
+import React, { PropTypes, Component } from 'react';
+
+export default class About extends Component {
+    render() {
+        return <h1>About</h1>;
+    }
+}
diff --git a/app/components/ApiReference/index.js b/app/components/ApiReference/index.js
@@ -0,0 +1,7 @@
+import React, { PropTypes, Component } from 'react';
+
+export default class About extends Component {
+    render() {
+        return <h1>API Reference</h1>;
+    }
+}
diff --git a/app/components/App/index.js b/app/components/App/index.js
@@ -1,14 +1,20 @@
 import React from 'react';
 import GlobalHeader from './../GlobalHeader';
+import AppMenu from './../AppMenu';
 import './styles.scss';
 
 export default ({children}) => {
     return (
         <div className="app-container">
-            <GlobalHeader />
+            <GlobalHeader/>
             <div className="app-content-container">
                 <div className="app-content">
-                    { children }
+                    <div className="app-content-layout">
+                        <AppMenu/>
+                        <div className="content">
+                            { children }
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>

diff --git a/app/components/App/styles.scss b/app/components/App/styles.scss
@@ -10,6 +10,15 @@
         .app-content {
             max-width: 1024px;
             margin: auto;
+
+            .app-content-layout {
+                display: flex;
+                flex-direction: row;
+
+                .content {
+                    flex: 1;
+                }
+            }
         }
     }
 }
diff --git a/app/components/AppMenu/index.js b/app/components/AppMenu/index.js
@@ -0,0 +1,21 @@
+import React, { PropTypes, Component } from 'react';
+import { Link } from 'react-router';
+import './styles.scss';
+
+export default class AppMenu extends Component {
+    render() {
+        return (
+            <ul className="app-menu-container">
+                <li className="menu-option">
+                    <Link to="about">About</Link>
+                </li>
+                <li className="menu-option">
+                    <Link to="features">Features</Link>
+                </li>
+                <li className="menu-option is-selected">
+                    <Link to="reference">API reference</Link>
+                </li>
+            </ul>
+        );
+    }
+}
diff --git a/app/components/AppMenu/styles.scss b/app/components/AppMenu/styles.scss
@@ -0,0 +1,18 @@
+.app-menu-container {
+    padding: 15px;
+    width: 200px;
+
+    li.menu-option {
+        padding-left: 10px;
+        margin-bottom: 5px;
+
+        //&.is-selected {
+        //  border-left: 4px solid #0070D2;
+        //}
+
+        a {
+            font-size: 1.2em;
+        }
+    }
+
+}
diff --git a/app/components/Home/index.js → app/components/Features/index.js b/app/components/Home/index.js → app/components/Features/index.js
diff --git a/app/router.js b/app/router.js
@@ -2,15 +2,19 @@ import React, { PropTypes } from 'react';
 import { Router, Route, hashHistory, IndexRedirect } from 'react-router';
 import { Provider } from 'react-redux';
 import App from './components/App';
-import Home from './components/Home';
+import Features from './components/Features';
+import About from './components/About';
+import ApiReference from './components/ApiReference';
 import Polyfill from './components/Polyfill';
 
 const Root = ({ store }) => (
     <Provider store={ store }>
         <Router history={ hashHistory }>
             <Route path="/" component={ App }>
-                <IndexRedirect to="home"/>
-                <Route path="home" component={ Home }/>
+                <IndexRedirect to="features"/>
+                <Route path="features" component={ Features }/>
+                <Route path="about" component={ About }/>
+                <Route path="reference" component={ ApiReference }/>
                 <Route path="polyfill/:pName" component={ Polyfill }/>
             </Route>
         </Router>

diff --git a/...sets/js/bootstrap.1b5500e2874a298a944f.js → ...sets/js/bootstrap.7445740280defc073f77.js b/...sets/js/bootstrap.1b5500e2874a298a944f.js → ...sets/js/bootstrap.7445740280defc073f77.js
diff --git a/...ssets/js/manifest.24472986558b098086c5.js → ...ssets/js/manifest.3fbad1e048e6ba299531.js b/...ssets/js/manifest.24472986558b098086c5.js → ...ssets/js/manifest.3fbad1e048e6ba299531.js
diff --git a/.../assets/js/vendor.f77644ae5cb59fc276f8.js → .../assets/js/vendor.6eefab3cdc21467c30d4.js b/.../assets/js/vendor.f77644ae5cb59fc276f8.js → .../assets/js/vendor.6eefab3cdc21467c30d4.js
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
@@ -16,8 +16,8 @@
     <body>
             <div id="app"></div>
 
-            <script src="assets/js/manifest.24472986558b098086c5.js" type="text/javascript"></script>
-            <script src="assets/js/vendor.f77644ae5cb59fc276f8.js" type="text/javascript"></script>
-            <script src="assets/js/bootstrap.1b5500e2874a298a944f.js" type="text/javascript"></script>
+            <script src="assets/js/manifest.3fbad1e048e6ba299531.js" type="text/javascript"></script>
+            <script src="assets/js/vendor.6eefab3cdc21467c30d4.js" type="text/javascript"></script>
+            <script src="assets/js/bootstrap.7445740280defc073f77.js" type="text/javascript"></script>
     </body>
 </html>
diff --git a/webpack.config.js b/webpack.config.js
@@ -39,7 +39,7 @@ var commonConfig = {
             dry: false
         }),
         new HtmlWebpackPlugin({
-            filename: path.resolve(__dirname, 'src/main/webapp/landing.html'),
+            filename: path.resolve(__dirname, 'src/main/webapp/index.html'),
             template: 'app/templates/webpack-app-template.hbs',
             title: 'Polyfill as a service',
             appMountId: 'app',