From b0f790ffafd581c236f3f83d385c407430c68bf6 Mon Sep 17 00:00:00 2001
From: zuiidea <zuiiidea@gmail.com>
Date: Fri, 14 Apr 2017 18:55:19 +0800
Subject: [PATCH] update theme

---
 .roadhogrc.js                                 | 10 +----
 src/components/Layout/Bread.less              |  2 +-
 src/components/Layout/Footer.less             |  2 +-
 src/components/Layout/Header.less             |  2 +-
 src/components/Layout/Layout.less             |  2 +-
 src/components/Layout/Sider.less              |  2 +-
 src/components/vars.less                      | 16 -------
 src/index.html                                |  4 +-
 src/models/app.js                             | 44 +++++--------------
 src/models/dashboard.js                       |  7 +--
 src/router.js                                 | 13 ------
 src/routes/app.js                             |  2 +-
 src/routes/dashboard/components/comments.less |  2 +-
 .../dashboard/components/completed.less       |  2 +-
 .../dashboard/components/numberCard.less      |  3 +-
 src/routes/dashboard/components/quote.less    |  2 +-
 .../dashboard/components/recentSales.less     |  2 +-
 src/routes/dashboard/components/sales.less    |  2 +-
 src/routes/dashboard/components/user.less     |  2 +-
 src/routes/dashboard/components/weather.less  |  2 +-
 src/routes/users/UserFilter.js                |  2 +-
 src/themes/default.less                       | 14 ++++++
 .../skin.less => themes/index.less}           |  0
 src/themes/mixin.less                         | 14 ++++++
 src/themes/vars.less                          |  2 +
 src/utils/index.js                            |  1 -
 src/utils/mock.js                             | 43 ------------------
 src/utils/mockStorge.js                       | 14 ------
 theme.config.js                               |  2 +-
 29 files changed, 62 insertions(+), 153 deletions(-)
 delete mode 100644 src/components/vars.less
 create mode 100644 src/themes/default.less
 rename src/{components/skin.less => themes/index.less} (100%)
 create mode 100644 src/themes/mixin.less
 create mode 100644 src/themes/vars.less
 delete mode 100644 src/utils/mock.js
 delete mode 100644 src/utils/mockStorge.js

diff --git a/.roadhogrc.js b/.roadhogrc.js
index 8aac693..70ebcb2 100644
--- a/.roadhogrc.js
+++ b/.roadhogrc.js
@@ -6,16 +6,8 @@ const svgSpriteDirs = [
 
 export default {
   entry: 'src/index.js',
-  publicPath: "http://47.92.30.98:8000",
   svgSpriteLoaderDirs: svgSpriteDirs,
-  "theme": "src/theme.js",
-  // "proxy": {
-  //   "/api": {
-  //     "target": "http://localhost:7001/api/v1/",
-  //     "changeOrigin": true,
-  //     "pathRewrite": { "^/api" : "" }
-  //   }
-  // },
+  "theme": "./theme.config.js",
   "env": {
       "development": {
         "extraBabelPlugins": [
diff --git a/src/components/Layout/Bread.less b/src/components/Layout/Bread.less
index 9c091e5..27a58a9 100644
--- a/src/components/Layout/Bread.less
+++ b/src/components/Layout/Bread.less
@@ -1,4 +1,4 @@
-@import "../vars.less";
+@import "../../themes/vars.less";
 
 .bread {
   height: 64px;
diff --git a/src/components/Layout/Footer.less b/src/components/Layout/Footer.less
index 9f5a967..4fe07d3 100644
--- a/src/components/Layout/Footer.less
+++ b/src/components/Layout/Footer.less
@@ -1,4 +1,4 @@
-@import "../vars.less";
+@import "../../themes/vars.less";
 
 .footer {
   height: 48px;
diff --git a/src/components/Layout/Header.less b/src/components/Layout/Header.less
index 1eca871..eb108ec 100644
--- a/src/components/Layout/Header.less
+++ b/src/components/Layout/Header.less
@@ -1,4 +1,4 @@
-@import "../vars.less";
+@import "../../themes/vars.less";
 
 .header {
   :global .ant-menu-horizontal {
diff --git a/src/components/Layout/Layout.less b/src/components/Layout/Layout.less
index 7c5e000..6ab9521 100644
--- a/src/components/Layout/Layout.less
+++ b/src/components/Layout/Layout.less
@@ -1,4 +1,4 @@
-@import "../vars.less";
+@import "../../themes/vars.less";
 
 .layout {
   position: relative;
diff --git a/src/components/Layout/Sider.less b/src/components/Layout/Sider.less
index 9146181..25c3bae 100644
--- a/src/components/Layout/Sider.less
+++ b/src/components/Layout/Sider.less
@@ -1 +1 @@
-@import "../vars.less";
+@import "../../themes/vars.less";
diff --git a/src/components/vars.less b/src/components/vars.less
deleted file mode 100644
index 407bec2..0000000
--- a/src/components/vars.less
+++ /dev/null
@@ -1,16 +0,0 @@
-@import '~antd/lib/style/themes/default.less'; // https://github.com/ant-design/ant-design/blob/master/components/style/themes/default.less
-/*========================*/
-/*=======Antd Admin=======*/
-/*========================*/
-@dark-half: #494949;
-@purple: #d897eb;
-@shadow-1: 4px 4px 20px 0 rgba(0,0,0,0.01);
-@shadow-2: 4px 4px 40px 0 rgba(0,0,0,0.05);
-@transition-ease-in: all 0.3s @ease-in;
-@transition-ease-out: all 0.3s @ease-out;
-
-.text-overflow() {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
diff --git a/src/index.html b/src/index.html
index e84c9f8..374a3f3 100644
--- a/src/index.html
+++ b/src/index.html
@@ -5,7 +5,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <link rel="stylesheet" href="index.css" />
+  <link rel="stylesheet" href="/index.css" />
   <!--[if lte IE 10]>
       <script
         src="https://as.alipayobjects.com/g/component/??console-polyfill/0.2.2/index.js,media-match/2.0.2/media.match.min.js"></script>
@@ -14,7 +14,7 @@
 
 <body>
   <div id="root"></div>
-  <script src="index.js"></script>
+  <script src="/index.js"></script>
 </body>
 
 </html>
diff --git a/src/models/app.js b/src/models/app.js
index 64b1c38..78536a3 100644
--- a/src/models/app.js
+++ b/src/models/app.js
@@ -1,6 +1,8 @@
 import { getUserInfo, logout } from '../services/app'
 import { routerRedux } from 'dva/router'
 import { parse } from 'qs'
+import { config } from '../utils'
+const { prefix } = config
 
 export default {
   namespace: 'app',
@@ -8,33 +10,10 @@ export default {
     user: {},
     loginButtonLoading: false,
     menuPopoverVisible: false,
-    siderFold: localStorage.getItem('antdAdminSiderFold') === 'true',
-    darkTheme: localStorage.getItem('antdAdminDarkTheme') !== 'false',
+    siderFold: localStorage.getItem(`${prefix}siderFold`) === 'true',
+    darkTheme: localStorage.getItem(`${prefix}darkTheme`) === 'true',
     isNavbar: document.body.clientWidth < 769,
     navOpenKeys: [],
-    permissions: {
-      dashboard: {
-        text: 'Dashboard',
-        route: 'dashboard',
-      },
-      users: {
-        text: 'User Manage',
-        route: 'users',
-      },
-      UIElement: {
-        text: 'UI Element',
-        route: 'UIElement',
-      },
-      UIElementIconfont: {
-        text: 'Iconfont',
-        route: 'UIElement/iconfont',
-        parent: 'UIElement',
-      },
-      chart: {
-        text: 'Rechart',
-        route: 'chart',
-      },
-    },
   },
   subscriptions: {
     setup ({ dispatch }) {
@@ -59,11 +38,11 @@ export default {
         }
       } else {
         if (location.pathname !== '/login') {
+          let from = location.pathname
           if (location.pathname === '/dashboard') {
-            window.location = `${location.origin}/login?from=/dashboard`
-          } else {
-            yield put(routerRedux.push(`/login?from=${location.pathname}`))
+            from = '/dashboard'
           }
+          window.location = `${location.origin}/login?from=${from}`
         }
       }
     },
@@ -122,14 +101,14 @@ export default {
       }
     },
     handleSwitchSider (state) {
-      localStorage.setItem('antdAdminSiderFold', !state.siderFold)
+      localStorage.setItem(`${prefix}siderFold`, !state.siderFold)
       return {
         ...state,
         siderFold: !state.siderFold,
       }
     },
     handleChangeTheme (state) {
-      localStorage.setItem('antdAdminDarkTheme', !state.darkTheme)
+      localStorage.setItem(`${prefix}darkTheme`, !state.darkTheme)
       return {
         ...state,
         darkTheme: !state.darkTheme,
@@ -153,10 +132,11 @@ export default {
         menuPopoverVisible: !state.menuPopoverVisible,
       }
     },
-    handleNavOpenKeys (state, action) {
+    handleNavOpenKeys (state, { payload: navOpenKeys }) {
+      console.log(navOpenKeys)
       return {
         ...state,
-        ...action.payload,
+        ...navOpenKeys,
       }
     },
   },
diff --git a/src/models/dashboard.js b/src/models/dashboard.js
index 18edc51..eca6289 100644
--- a/src/models/dashboard.js
+++ b/src/models/dashboard.js
@@ -188,12 +188,7 @@ export default {
     },
   },
   subscriptions: {
-    setup ({ dispatch, history }) {
-      history.listen(location => {
-        if (location.pathname === '/dashboard') {
-          console.log('dashboard')
-        }
-      })
+    setup ({ dispatch }) {
       dispatch({ type: 'query' })
       dispatch({ type: 'queryWeather' })
     },
diff --git a/src/router.js b/src/router.js
index c427d0c..47c4233 100644
--- a/src/router.js
+++ b/src/router.js
@@ -11,14 +11,6 @@ const registerModel = (app, model) => {
 }
 
 const Routers = function ({ history, app }) {
-  const handleChildRoute = ({ location }) => {
-    console.log(location)
-    // const state = app._store.getState()
-    // if (!state.app.login && location.pathname !== '/login') {
-    //   app._store.dispatch(routerRedux.push('/login'))
-    // }
-  }
-
   const routes = [
     {
       path: '/',
@@ -136,11 +128,6 @@ const Routers = function ({ history, app }) {
     },
   ]
 
-  routes[0].childRoutes.map(item => {
-    item.onEnter = handleChildRoute
-    return item
-  })
-
   return <Router history={history} routes={routes} />
 }
 
diff --git a/src/routes/app.js b/src/routes/app.js
index 445a6bf..2cedfef 100644
--- a/src/routes/app.js
+++ b/src/routes/app.js
@@ -3,7 +3,7 @@ import { connect } from 'dva'
 import { Layout } from '../components'
 import { classnames, config } from '../utils'
 import { Helmet } from 'react-helmet'
-import '../components/skin.less'
+import '../themes/index.less'
 
 const { Header, Bread, Footer, Sider, styles } = Layout
 
diff --git a/src/routes/dashboard/components/comments.less b/src/routes/dashboard/components/comments.less
index d204f1f..63b712c 100644
--- a/src/routes/dashboard/components/comments.less
+++ b/src/routes/dashboard/components/comments.less
@@ -1,4 +1,4 @@
-@import "../../../components/vars.less";
+@import "../../../themes/vars.less";
 
 .comments {
   :global .ant-table-thead > tr > th {
diff --git a/src/routes/dashboard/components/completed.less b/src/routes/dashboard/components/completed.less
index d04f80f..d619d38 100644
--- a/src/routes/dashboard/components/completed.less
+++ b/src/routes/dashboard/components/completed.less
@@ -1,4 +1,4 @@
-@import "../../../components/vars.less";
+@import "../../../themes/vars.less";
 
 .sales {
   .title {
diff --git a/src/routes/dashboard/components/numberCard.less b/src/routes/dashboard/components/numberCard.less
index eaae27c..59f1159 100644
--- a/src/routes/dashboard/components/numberCard.less
+++ b/src/routes/dashboard/components/numberCard.less
@@ -1,8 +1,7 @@
-@import "../../../components/vars.less";
+@import "../../../themes/vars.less";
 
 .numberCard {
   padding: 32px;
-  font-family: monospace;
   margin-bottom: 24px;
   cursor: pointer;
 
diff --git a/src/routes/dashboard/components/quote.less b/src/routes/dashboard/components/quote.less
index 36de0af..2f2cd4d 100644
--- a/src/routes/dashboard/components/quote.less
+++ b/src/routes/dashboard/components/quote.less
@@ -1,4 +1,4 @@
-@import "../../../components/vars.less";
+@import "../../../themes/vars.less";
 
 .quote {
   color: #fff;
diff --git a/src/routes/dashboard/components/recentSales.less b/src/routes/dashboard/components/recentSales.less
index 987226c..2637e42 100644
--- a/src/routes/dashboard/components/recentSales.less
+++ b/src/routes/dashboard/components/recentSales.less
@@ -1,4 +1,4 @@
-@import "../../../components/vars.less";
+@import "../../../themes/vars.less";
 
 .recentsales {
   :global .ant-table-thead > tr > th {
diff --git a/src/routes/dashboard/components/sales.less b/src/routes/dashboard/components/sales.less
index d04f80f..d619d38 100644
--- a/src/routes/dashboard/components/sales.less
+++ b/src/routes/dashboard/components/sales.less
@@ -1,4 +1,4 @@
-@import "../../../components/vars.less";
+@import "../../../themes/vars.less";
 
 .sales {
   .title {
diff --git a/src/routes/dashboard/components/user.less b/src/routes/dashboard/components/user.less
index 39220b0..fc24cf9 100644
--- a/src/routes/dashboard/components/user.less
+++ b/src/routes/dashboard/components/user.less
@@ -1,4 +1,4 @@
-@import "../../../components/vars.less";
+@import "../../../themes/vars.less";
 
 .user {
   .header {
diff --git a/src/routes/dashboard/components/weather.less b/src/routes/dashboard/components/weather.less
index 938e0df..355b31e 100644
--- a/src/routes/dashboard/components/weather.less
+++ b/src/routes/dashboard/components/weather.less
@@ -1,4 +1,4 @@
-@import "../../../components/vars.less";
+@import "../../../themes/vars.less";
 
 .weather {
   color: #fff;
diff --git a/src/routes/users/UserFilter.js b/src/routes/users/UserFilter.js
index 5ab4f6b..0f9b972 100644
--- a/src/routes/users/UserFilter.js
+++ b/src/routes/users/UserFilter.js
@@ -29,7 +29,7 @@ const UserFilter = ({
         <Search {...searchGroupProps} />
       </Col>
       <Col lg={{ offset: 8, span: 8 }} md={12} sm={8} xs={24} style={{ marginBottom: 16, textAlign: 'right' }}>
-        <Switch style={{ marginRight: 16 }} defaultChecked={isMotion} onChange={switchIsMotion} checkedChildren={'动画开'} unCheckedChildren={'动画关'} />
+        {/* <Switch style={{ marginRight: 16 }} defaultChecked={isMotion} onChange={switchIsMotion} checkedChildren={'动画开'} unCheckedChildren={'动画关'} /> */}
         <Button size="large" type="ghost" onClick={onAdd}>添加</Button>
       </Col>
     </Row>
diff --git a/src/themes/default.less b/src/themes/default.less
new file mode 100644
index 0000000..f07e325
--- /dev/null
+++ b/src/themes/default.less
@@ -0,0 +1,14 @@
+// 本文件是对 ant-design:
+// https://github.com/ant-design/ant-design/blob/master/components/style/themes/default.less
+// 相应变量值的覆盖
+// 注意：只需写出要覆盖的变量即可（不需要覆盖的变量不要写）
+@import "../../node_modules/antd/lib/style/themes/default.less"; // // Prefix
+// @border-radius-base: 3px;
+// @border-radius-sm: 2px;
+// @shadow-color: rgba(0,0,0,0.05);
+// @shadow-1-down: 4px 4px 40px @shadow-color;
+// @border-color-split: #f4f4f4;
+// @border-color-base: #e5e5e5;
+// @menu-dark-bg: #3e3e3e;
+// @text-color: #666;
+// @font-family: "AvenirNext-Regular", "Helvetica Neue", "lucida grande", "PingFangHK-Light", "STHeiti", "Heiti SC", "Hiragino Sans GB", "Microsoft JhengHei", "Microsoft Yahei", SimHei, "WenQuanYi Micro Hei", "Droid Sans", "Roboto", Helvetica, Tahoma, Arial, "sans-serif";
diff --git a/src/components/skin.less b/src/themes/index.less
similarity index 100%
rename from src/components/skin.less
rename to src/themes/index.less
diff --git a/src/themes/mixin.less b/src/themes/mixin.less
new file mode 100644
index 0000000..f6c170e
--- /dev/null
+++ b/src/themes/mixin.less
@@ -0,0 +1,14 @@
+@import "./default.less"; // antd-admin
+@dark-half: #494949;
+@purple: #d897eb;
+@shadow-1: 4px 4px 20px 0 rgba(0,0,0,0.01);
+@shadow-2: 4px 4px 40px 0 rgba(0,0,0,0.05);
+@transition-ease-in: all 0.3s ease-out;
+@transition-ease-out: all 0.3s ease-out;
+@ease-in: ease-in;
+
+.text-overflow {
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
diff --git a/src/themes/vars.less b/src/themes/vars.less
new file mode 100644
index 0000000..4e5afee
--- /dev/null
+++ b/src/themes/vars.less
@@ -0,0 +1,2 @@
+@import "./default.less";
+@import "./mixin.less";
diff --git a/src/utils/index.js b/src/utils/index.js
index b0c168f..b124624 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -3,7 +3,6 @@ import menu from './menu'
 import request from './request'
 import classnames from 'classnames'
 import { color } from './theme'
-// require('./mock.js')
 
 // 连字符转驼峰
 String.prototype.hyphenToHump = function () {
diff --git a/src/utils/mock.js b/src/utils/mock.js
deleted file mode 100644
index 197765b..0000000
--- a/src/utils/mock.js
+++ /dev/null
@@ -1,43 +0,0 @@
-const Mock = require('mockjs')
-const users = require('../../mock/users')
-const app = require('../../mock/app')
-const dashboard = require('../../mock/dashboard')
-const mockData = [users, app, dashboard]
-
-function serialize (str) {
-  let paramArray = str.split('&')
-  let query = {}
-  for (let i in paramArray) {
-    if (Object.prototype.hasOwnProperty.call(paramArray, i)) {
-      query[paramArray[i].split('=')[0]] = paramArray[i].split('=')[1]
-    }
-  }
-  return query
-}
-
-for (let i in mockData) {
-  if (Object.prototype.hasOwnProperty.call(mockData, i)) {
-    for (let key in mockData[i]) {
-      if (Object.prototype.hasOwnProperty.call(mockData[i], key)) {
-        Mock.mock(eval(`/${key.split(' ')[1].replace(/\//g, '\\/')}/`), key.split(' ')[0].toLowerCase(), (options) => {
-          if (key.split(' ')[0].toLowerCase() === 'get') {
-            if (options.url.split('?')[1]) {
-              options.query = serialize(options.url.split('?')[1])
-            } else {
-              options.query = options.body ? JSON.parse(options.body) : {}
-            }
-          }
-          let res = {}
-          let result = {}
-          res.json = function (data) {
-            result = data
-          }
-          mockData[i][key](options, res)
-          return result
-        })
-      }
-    }
-  }
-}
-
-Mock.setup({ timeout: '200-600' })
diff --git a/src/utils/mockStorge.js b/src/utils/mockStorge.js
deleted file mode 100644
index 68527b7..0000000
--- a/src/utils/mockStorge.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const Watch = require('watchjs')
-const config = require('./config')
-
-export default function mockStorge (name, defaultValue) {
-  let key = config.prefix + name
-  global[key] = localStorage.getItem(key)
-    ? JSON.parse(localStorage.getItem(key))
-    : defaultValue
-  !localStorage.getItem(key) && localStorage.setItem(key, JSON.stringify(global[key]))
-  Watch.watch(global[key], () => {
-    localStorage.setItem(key, JSON.stringify(global[key]))
-  })
-  return key
-}
diff --git a/theme.config.js b/theme.config.js
index 0bf2003..f8fa588 100644
--- a/theme.config.js
+++ b/theme.config.js
@@ -3,6 +3,6 @@ const path = require('path')
 const lessToJs = require('less-vars-to-js')
 
 module.exports = () => {
-  const themePath = path.join(__dirname, './src/components/vars.less')
+  const themePath = path.join(__dirname, './src/themes/default.less')
   return lessToJs(fs.readFileSync(themePath, 'utf8'))
 }