refact the directory structure

.umirc.js

@@ -0,0 +1,19 @@
+
+export default {
+  plugins: [
+    'umi-plugin-dva',
+    [
+      'umi-plugin-routes',
+      {
+        exclude: [
+          /model\.(j|t)sx?$/,
+          /service\.(j|t)sx?$/,
+          /models\//,
+          /components\//,
+          /services\//,
+          /chart\/Container\.js$/,
+        ],
+      },
+    ],
+  ],
+}

package.json

@@ -3,6 +3,7 @@
   "name": "antd-admin",
   "version": "4.3.9",
   "dependencies": {
+    "@babel/polyfill": "^7.0.0-beta.42",
     "axios": "^0.17.1",
     "classnames": "^2.2.5",
     "d3-shape": "^1.2.0",
@@ -28,7 +29,10 @@
     "react-draft-wysiwyg": "^1.10.0",
     "react-helmet": "^5.1.3",
     "react-highcharts": "^15.0.0",
-    "recharts": "^1.0.0-beta.0"
+    "recharts": "^1.0.0-beta.0",
+    "umi": "^1.1.0",
+    "umi-plugin-dva": "^0.4.0",
+    "umi-plugin-routes": "^0.1.2"
   },
   "devDependencies": {
     "babel-plugin-dev-expression": "^0.2.1",

src/global.js

@@ -0,0 +1 @@
+import '@babel/polyfill'

src/index.js

@@ -1,25 +0,0 @@
-import { message } from 'antd'
-import dva from 'dva'
-import createLoading from 'dva-loading'
-import createHistory from 'history/createBrowserHistory'
-import 'babel-polyfill'
-
-// 1. Initialize
-const app = dva({
-  ...createLoading({
-    effects: true,
-  }),
-  history: createHistory(),
-  onError (error) {
-    message.error(error.message)
-  },
-})
-
-// 2. Model
-app.model(require('./models/app'))
-
-// 3. Router
-app.router(require('./router'))
-
-// 4. Start
-app.start('#root')

src/layouts/app.js

@@ -10,7 +10,7 @@ import { BackTop, Layout } from 'antd'
 import { classnames, config } from 'utils'
 import { Helmet } from 'react-helmet'
 import { withRouter } from 'dva/router'
-import Error from './error'
+import Error from '../pages/404'
 import '../themes/index.less'
 import './app.less'
 

src/layouts/index.js

@@ -0,0 +1,14 @@
+import { LocaleProvider } from 'antd'
+import enUS from 'antd/lib/locale-provider/en_US'
+import withRouter from 'umi/withRouter'
+import App from './app'
+
+export default withRouter((props) => {
+  return (
+    <LocaleProvider locale={enUS}>
+      <App>
+        { props.children }
+      </App>
+    </LocaleProvider>
+  )
+})

src/pages/404.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import { Icon } from 'antd'
 import { Page } from 'components'
-import styles from './index.less'
+import styles from './404.less'
 
 const Error = () => (<Page inner>
   <div className={styles.error}>

src/pages/dashboard/models/dashboard.js

@@ -1,8 +1,8 @@
 import { parse } from 'qs'
 import modelExtend from 'dva-model-extend'
-import { query } from 'services/dashboard'
-import { model } from 'models/common'
-import * as weatherService from 'services/weather'
+import { query } from '../services/dashboard'
+import { model } from 'utils/model'
+import * as weatherService from '../services/weather'
 
 export default modelExtend(model, {
   namespace: 'dashboard',

src/pages/index.js

@@ -0,0 +1,3 @@
+import Redirect from 'umi/redirect'
+
+export default () => <Redirect to="/dashboard" />

src/pages/login/models/login.js

@@ -1,5 +1,5 @@
 import { routerRedux } from 'dva/router'
-import { login } from 'services/login'
+import { login } from '../services/login'
 
 export default {
   namespace: 'login',

src/pages/post/index.js

@@ -5,7 +5,7 @@ import { Tabs } from 'antd'
 import { routerRedux } from 'dva/router'
 import queryString from 'query-string'
 import { Page } from 'components'
-import List from './List'
+import List from './components/List'
 
 const { TabPane } = Tabs
 

src/pages/post/models/post.js

@@ -1,6 +1,6 @@
 import modelExtend from 'dva-model-extend'
-import { query } from 'services/posts'
-import { pageModel } from 'models/common'
+import { query } from '../services/posts'
+import { pageModel } from 'utils/model'
 import queryString from 'query-string'
 
 export default modelExtend(pageModel, {