re-order App.js code

tomzaoral · May 7, 2015 · d8de3f5 · d8de3f5
1 parent e61100e
commit d8de3f5
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 32 deletions.
diff --git a/app/App.js b/app/App.js
@@ -2,7 +2,6 @@ require('normalize.css/normalize.css');
 require('./styles/main.scss');
 
 const React = require('react');
-const authUtils = require('./utils/authUtils');
 
 // top level components for layouts
 let Navigation = require('./components/Navigation');
@@ -11,41 +10,13 @@ let ListContainer = require('./components/list/ListContainer');
 let Login = require('./components/login/Login');
 let Account = require('./components/Account');
 
-let homeRoute = (
-    <div>
-        <Navigation />
-        <Home />
-    </div>
-);
-
-let listRoute = (
-    <div>
-        <Navigation />
-        <ListContainer />
-    </div>
-);
-
-let loginRoute = (
-    <div>
-        <Navigation />
-        <Login />
-    </div>
-);
-
-let accountRoute = (
-    <div>
-        <Navigation />
-        <Account />
-    </div>
-);
-
 class App extends React.Component {
 
     render() {
 
         let ui = null;
 
-        switch(this.props.route) {  // current hash is given to you
+        switch(this.props.route) {
 
             case "home":
                 ui = homeRoute;
@@ -72,4 +43,32 @@ class App extends React.Component {
     }
 }
 
+let homeRoute = (
+    <div>
+        <Navigation />
+        <Home />
+    </div>
+);
+
+let listRoute = (
+    <div>
+        <Navigation />
+        <ListContainer />
+    </div>
+);
+
+let loginRoute = (
+    <div>
+        <Navigation />
+        <Login />
+    </div>
+);
+
+let accountRoute = (
+    <div>
+        <Navigation />
+        <Account />
+    </div>
+);
+
 module.exports = App;
diff --git a/app/components/Home.js b/app/components/Home.js
@@ -3,7 +3,7 @@
  */
 const React = require('react');
 
-class Welcome extends React.Component {
+class Home extends React.Component {
 
     constructor() {
         super();
@@ -54,4 +54,4 @@ class Welcome extends React.Component {
 
 }
 
-module.exports = Welcome;
+module.exports = Home;