From 4642ba700c5deb00f2bd5062af5d4728b53bbca4 Mon Sep 17 00:00:00 2001
From: zuiidea <zuiiidea@gmail.com>
Date: Thu, 27 Oct 2016 22:27:45 +0800
Subject: [PATCH] login

---
 src/models/login.js                            | 15 +++++++++++++++
 src/router.js                                  |  2 +-
 .../layout/main.jsx => routes/app.js}          | 18 +++++++++---------
 src/routes/dashboard.js                        |  1 -
 src/routes/login.js                            |  8 ++++++++
 src/routes/users.js                            |  1 -
 6 files changed, 33 insertions(+), 12 deletions(-)
 rename src/{components/layout/main.jsx => routes/app.js} (61%)

diff --git a/src/models/login.js b/src/models/login.js
index e69de29..05aceed 100644
--- a/src/models/login.js
+++ b/src/models/login.js
@@ -0,0 +1,15 @@
+// export default {
+//   namespace: 'login',
+//   state: {
+//     list: [],
+//     total: null,
+//   },
+//     effects: {
+//         *query(){},
+//     },
+//     reducers: {
+//         loginSuccess(){
+//
+//         }
+//     }
+// }
diff --git a/src/router.js b/src/router.js
index 3faee7b..abf1c58 100644
--- a/src/router.js
+++ b/src/router.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import { Router, Route , IndexRedirect , hashHistory} from 'dva/router'
-import App from './components/layout/main'
+import App from './routes/app'
 import Error from './routes/error'
 import Dashboard from './routes/dashboard'
 import Users from './routes/users'
diff --git a/src/components/layout/main.jsx b/src/routes/app.js
similarity index 61%
rename from src/components/layout/main.jsx
rename to src/routes/app.js
index f9ea642..edd8f00 100644
--- a/src/components/layout/main.jsx
+++ b/src/routes/app.js
@@ -1,13 +1,13 @@
 import React, { PropTypes } from 'react'
 import classnames from 'classnames'
-import Header from './header'
-import Bread from './bread'
-import Footer from './footer'
-import Sider from './sider'
-import styles from './main.less'
-import './common.less'
+import Header from '../components/layout/header'
+import Bread from '../components/layout/bread'
+import Footer from '../components/layout/footer'
+import Sider from '../components/layout/sider'
+import styles from '../components/layout/main.less'
+import '../components/layout/common.less'
 
-function Main({ children, location }) {
+function App({ children, location }) {
   return (
     <div className={styles.layout}>
       <aside className={styles.sider}>
@@ -27,9 +27,9 @@ function Main({ children, location }) {
   )
 }
 
-Main.propTypes = {
+App.propTypes = {
   children: PropTypes.element.isRequired,
   location: PropTypes.object,
 }
 
-export default Main
+export default App
diff --git a/src/routes/dashboard.js b/src/routes/dashboard.js
index 14b6434..932cadc 100644
--- a/src/routes/dashboard.js
+++ b/src/routes/dashboard.js
@@ -1,6 +1,5 @@
 import React, { PropTypes } from 'react'
 import { Link } from 'dva/router'
-import Main from '../components/layout/main'
 
 function Dashboard() {
   return (
diff --git a/src/routes/login.js b/src/routes/login.js
index e69de29..50a131e 100644
--- a/src/routes/login.js
+++ b/src/routes/login.js
@@ -0,0 +1,8 @@
+import React from 'react'
+import styles from './login.less'
+
+const Login = () => <div>
+  <h1>404 Not Found</h1>
+</div>
+
+export default Login
diff --git a/src/routes/users.js b/src/routes/users.js
index 738cb2f..15612d4 100644
--- a/src/routes/users.js
+++ b/src/routes/users.js
@@ -1,7 +1,6 @@
 import React, { PropTypes } from 'react'
 import { routerRedux } from 'dva/router'
 import { connect } from 'dva'
-import Main from '../components/layout/main'
 import styles from './users.less'
 import UserList from '../components/users/list'
 import UserSearch from '../components/users/search'