Modified folder structure

addhome2001 · Oct 25, 2016 · 148031d · 148031d
1 parent e7568da
commit 148031d
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# koa-simple-isomorphic
+# koa2-simple-isomorphic
 
 > A simple isomorphic React for koa2.
 

diff --git a/bin/run b/bin/run
@@ -2,5 +2,5 @@ require('babel-core/register');
 require('babel-polyfill');
 
 if(process.env.NODE_ENV === 'development') {
-    require('../server.js');
+    require('../src/server.js');
 }
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "koa-simple-isomorphic",
+  "name": "koa2-simple-isomorphic",
   "version": "1.0.1",
-  "description": "simple koa server-render",
+  "description": "simple koa2 server-side-render",
   "main": "index.js",
   "scripts": {
     "start": "PORT=8000 NODE_ENV=development nodemon ./bin/run",
@@ -32,16 +32,21 @@
     "mocha": "2.5.3",
     "nodemon": "1.10.0",
     "passport": "0.3.2",
-    "passport-local": "1.0.0"
+    "passport-local": "1.0.0",
+    "webpack": "2.1.0-beta.4",
+    "webpack-dev-server": "2.0.0-beta"
   },
   "dependencies": {
+    "electrode-react-ssr-caching": "^0.1.3",
     "koa-csrf": "2.4.0",
     "koa-logger": "1.3.0",
     "koa-router": "7.0.1",
     "koa-session": "3.3.1",
     "react": "15.1.0",
     "react-dom": "15.1.0",
+    "react-redux": "^4.4.5",
     "react-router": "2.4.1",
+    "redux": "^3.6.0",
     "supertest": "1.2.0"
   }
 }
diff --git a/app/components/About.js → src/components/About.js b/app/components/About.js → src/components/About.js
@@ -6,7 +6,7 @@ class About extends Component {
         return (
             <div>
               <IndexLink className="btn btn-default" Link to="/">Home</IndexLink >
-              <p>About</p>              
+              <p>About</p>         
             </div>
         );
     }

diff --git a/app/components/Error.js → src/components/Error.js b/app/components/Error.js → src/components/Error.js
diff --git a/app/components/Home.js → src/components/Home.js b/app/components/Home.js → src/components/Home.js
diff --git a/app/components/Index.js → src/components/Index.js b/app/components/Index.js → src/components/Index.js
diff --git a/app/components/LoginPage.js → src/components/LoginPage.js b/app/components/LoginPage.js → src/components/LoginPage.js
diff --git a/app/components/Profile.js → src/components/Profile.js b/app/components/Profile.js → src/components/Profile.js
diff --git a/config/koaConfig.js → src/config/koaConfig.js b/config/koaConfig.js → src/config/koaConfig.js
diff --git a/config/passportConfig.js → src/config/passportConfig.js b/config/passportConfig.js → src/config/passportConfig.js
diff --git a/config/render.js → src/config/render.js b/config/render.js → src/config/render.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { renderToString } from 'react-dom/server';
 import { match, RouterContext } from 'react-router';
-import routes from '../app/app';
+import routes from '../routes';
 
 export default async (ctx) => {
    const initialState = {
@@ -26,8 +26,8 @@ export default async (ctx) => {
           ctx.throw(404, 'Not found');
         }
       });
-      
-      await ctx.render('index', { 
+
+      await ctx.render('index', {
         reactContent: ctx.state.reactContent
       });
-}
+}
diff --git a/config/routes.js → src/config/router.js b/config/routes.js → src/config/router.js
diff --git a/app/app.js → src/routes.js b/app/app.js → src/routes.js
diff --git a/server.js → src/server.js b/server.js → src/server.js
@@ -7,10 +7,9 @@ const app = module.exports = new koa();
 import koaConfig from './config/koaConfig';
 koaConfig(app, process.env.NODE_ENV, passport);
 
-//routes
-import routes from './config/routes';
-routes(app);
-
+//router
+import router from './config/router';
+router(app);
 
 app.listen(process.env.PORT || 3000, () => {
     console.log(`Server is running at ${process.env.PORT}!`);