From 1508eac92de2f22087219b059e883f5971cbfbe8 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 8 Nov 2016 15:51:43 -0300
Subject: [PATCH] Removing divs from routes

---
 client/coral-admin/index.ejs                          |  4 ++--
 client/coral-admin/package.json                       |  1 +
 client/coral-admin/public/index.html                  |  4 ++--
 client/coral-admin/src/components/App.js              | 11 +++++------
 client/coral-admin/src/components/Header.js           |  9 +++++----
 .../coral-admin/src/containers/CommunityContainer.js  | 10 ++++++++++
 client/coral-admin/webpack.config.dev.js              |  6 ++++++
 client/coral-admin/webpack.config.js                  |  8 +++++++-
 8 files changed, 38 insertions(+), 15 deletions(-)
 create mode 100644 client/coral-admin/src/containers/CommunityContainer.js

diff --git a/client/coral-admin/index.ejs b/client/coral-admin/index.ejs
index 9b5fe84bf..038fb58d7 100644
--- a/client/coral-admin/index.ejs
+++ b/client/coral-admin/index.ejs
@@ -10,8 +10,8 @@
       body, #root {
         width: 100%;
         height: 100%;
-				margin: 0;
-				background: #fff;
+        margin: 0;
+        background: #fff;
       }
     </style>
   </head>
diff --git a/client/coral-admin/package.json b/client/coral-admin/package.json
index ced6a3512..26f355e3d 100644
--- a/client/coral-admin/package.json
+++ b/client/coral-admin/package.json
@@ -5,6 +5,7 @@
   "main": "index.js",
   "scripts": {
     "build": "./node_modules/.bin/webpack --config webpack.config.js",
+    "watch": "./node_modules/.bin/webpack --config webpack.config.js --watch",
     "start": "./node_modules/.bin/webpack-dev-server --config webpack.config.dev.js --inline --hot --content-base public --port 3142"
   },
   "keywords": [],
diff --git a/client/coral-admin/public/index.html b/client/coral-admin/public/index.html
index c31c22a6d..daf7304c8 100644
--- a/client/coral-admin/public/index.html
+++ b/client/coral-admin/public/index.html
@@ -10,8 +10,8 @@
       body, #root {
         width: 100%;
         height: 100%;
-				margin: 0;
-				background: #fff;
+        margin: 0;
+        background: #fff;
       }
     </style>
   </head>
diff --git a/client/coral-admin/src/components/App.js b/client/coral-admin/src/components/App.js
index 545cd80a4..ff1c8f1d0 100644
--- a/client/coral-admin/src/components/App.js
+++ b/client/coral-admin/src/components/App.js
@@ -18,14 +18,13 @@ export default class App extends React.Component {
       <Provider store={store}>
         <Layout>
           <Header>
-            <div>
               <Router history={browserHistory}>
-                <Route path={config.base} component={ModerationQueue} />
-                <Route path={`${config.base}/embed`} component={CommentStream} />
-                <Route path={`${config.base}/embedlink`} component={EmbedLink} />
-                <Route path={`${config.base}/configure`} component={Configure} />
+                <Route path={config.base} component={ModerationQueue}>
+                  <Route path="embed" component={CommentStream} />
+                  <Route path="embedlink" component={EmbedLink} />
+                  <Route path="configure" component={Configure} />
+                </Route>
               </Router>
-            </div>
           </Header>
         </Layout>
       </Provider>
diff --git a/client/coral-admin/src/components/Header.js b/client/coral-admin/src/components/Header.js
index 8aebe7864..88a92c7ef 100644
--- a/client/coral-admin/src/components/Header.js
+++ b/client/coral-admin/src/components/Header.js
@@ -9,14 +9,15 @@ export default (props) => (
   <Layout fixedDrawer>
     <Header title='Talk'>
       <Navigation>
-        <Link className={styles.navLink} href={`/${config.base}/`}>Moderate</Link>
-        <Link className={styles.navLink} href={`/${config.base}/configure`}>Configure</Link>
+        <Link className={styles.navLink} to={`/${config.basePath}/`}>Moderate</Link>
+        <Link className={styles.navLink} to={`/${config.basePath}/`}>Community</Link>
+        <Link className={styles.navLink} to={`/${config.basePath}/configure`}>Configure</Link>
       </Navigation>
     </Header>
     <Drawer>
       <Navigation>
-        <Link className={styles.navLink} href={`/${config.base}/`}>Moderate</Link>
-        <Link className={styles.navLink} href={`/${config.base}/configure`}>Configure</Link>
+        <Link className={styles.navLink} to={`/${config.basePath}/`}>Moderate</Link>
+        <Link className={styles.navLink} to={`/${config.basePath}/configure`}>Configure</Link>
       </Navigation>
     </Drawer>
     {props.children}
diff --git a/client/coral-admin/src/containers/CommunityContainer.js b/client/coral-admin/src/containers/CommunityContainer.js
new file mode 100644
index 000000000..6eb673125
--- /dev/null
+++ b/client/coral-admin/src/containers/CommunityContainer.js
@@ -0,0 +1,10 @@
+import React, { Component } from 'react'
+import { connect } from 'react-redux'
+import I18n from 'coral-framework/i18n/i18n'
+import translations from '../translations'
+
+export default class CommunityContainer extends Component {
+  render() {
+    return <div>Hello</div>
+  }
+}
\ No newline at end of file
diff --git a/client/coral-admin/webpack.config.dev.js b/client/coral-admin/webpack.config.dev.js
index ca3b5cab5..277da1877 100644
--- a/client/coral-admin/webpack.config.dev.js
+++ b/client/coral-admin/webpack.config.dev.js
@@ -36,6 +36,12 @@ module.exports = {
         context: __dirname,
         postcss: [autoprefixer, precss]
       }
+    }),
+    new webpack.DefinePlugin({
+      'process.env': {
+        'NODE_ENV': JSON.stringify('development'),
+        'VERSION': JSON.stringify(require("./package.json").version)
+      }
     })
   ],
   resolve: {
diff --git a/client/coral-admin/webpack.config.js b/client/coral-admin/webpack.config.js
index 67d5aef22..92a758cce 100644
--- a/client/coral-admin/webpack.config.js
+++ b/client/coral-admin/webpack.config.js
@@ -35,6 +35,12 @@ module.exports = Object.assign({}, devConfig, {
         debug: false
       }
     }),
-    new webpack.optimize.UglifyJsPlugin()
+    new webpack.optimize.UglifyJsPlugin(),
+    new webpack.DefinePlugin({
+      'process.env': {
+        'NODE_ENV': JSON.stringify('production'),
+        'VERSION': JSON.stringify(require("./package.json").version)
+      }
+    })
   ]
 })