From 2efcd4841e4bd84ba4d3d10afbd67c15226dd9a7 Mon Sep 17 00:00:00 2001 From: zwjamnsss Date: Fri, 4 Aug 2017 12:15:45 +0800 Subject: [PATCH 01/12] feat: add redux-devtools --- client/containers/DevTools/DevTools.js | 11 +++++++++++ client/containers/index.js | 4 +++- client/index.js | 23 +++++++++++++++++------ package.json | 13 +++++-------- 4 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 client/containers/DevTools/DevTools.js diff --git a/client/containers/DevTools/DevTools.js b/client/containers/DevTools/DevTools.js new file mode 100644 index 00000000..8cf7de7f --- /dev/null +++ b/client/containers/DevTools/DevTools.js @@ -0,0 +1,11 @@ +import React from 'react'; +import { createDevTools } from 'redux-devtools'; +import LogMonitor from 'redux-devtools-log-monitor'; +import DockMonitor from 'redux-devtools-dock-monitor'; +const DockMonitorD = DockMonitor.default // 这里有 bug 不知道为啥非要使用 default + +export default createDevTools( + + + +); diff --git a/client/containers/index.js b/client/containers/index.js index 34e4f3e4..1368eda2 100644 --- a/client/containers/index.js +++ b/client/containers/index.js @@ -5,6 +5,7 @@ import ProjectGroups from './ProjectGroups/ProjectGroups.js' import Interface from './Interface/Interface.js' import News from './News/News.js' import AddInterface from './AddInterface/AddInterface.js' +import DevTools from './DevTools/DevTools.js' export { Header, @@ -13,5 +14,6 @@ export { ProjectGroups, Interface, AddInterface, - News + News, + DevTools } diff --git a/client/index.js b/client/index.js index 6a41341d..c576190e 100644 --- a/client/index.js +++ b/client/index.js @@ -4,19 +4,30 @@ import thunkMiddleware from 'redux-thunk' import promiseMiddleware from 'redux-promise'; import ReactDOM from 'react-dom' import App from './Application' -import { createStore, combineReducers, applyMiddleware } from 'redux' +import { createStore, combineReducers, applyMiddleware, compose } from 'redux' import { Provider } from 'react-redux' import ReduxContainer from './ReduxContainer.js' +import { DevTools } from './containers'; + +const enhancer = compose( + // Middleware you want to use in development: + applyMiddleware( + thunkMiddleware.default, + promiseMiddleware + ), + // Required! Enable Redux DevTools with the monitors you chose + DevTools.instrument() +); // 合并 redux 创建stroe -const store = createStore(combineReducers( ReduxContainer ), applyMiddleware( - thunkMiddleware.default, - promiseMiddleware -)) +const store = createStore(combineReducers( ReduxContainer ), {}, enhancer) ReactDOM.render( - +
+ + +
, document.getElementById('yapi') ) diff --git a/package.json b/package.json index a881dd70..29f74c66 100644 --- a/package.json +++ b/package.json @@ -63,13 +63,11 @@ "wangeditor": "^3.0.4", "ykit-config-antd": "^0.1.3", "ykit-config-react": "^0.4.4", - "axios": "^0.16.2", "babel": "^6.5.2", "babel-cli": "^6.24.1", "babel-core": "^6.8.0", "babel-eslint": "^7.2.3", "babel-loader": "^6.2.4", - "babel-plugin-transform-decorators-legacy": "^1.3.4", "babel-plugin-transform-object-rest-spread": "^6.8.0", "babel-plugin-transform-runtime": "^6.9.0", "babel-preset-es2015": "^6.9.0", @@ -85,15 +83,11 @@ "eslint-plugin-react": "^7.1.0", "express": "^4.15.3", "extract-text-webpack-plugin": "^1.0.1", - "fast-sass-loader": "^1.2.5", - "fs-extra": "^3.0.1", "gulp": "^3.9.1", "gulp-babel": "^6.1.2", "gulp-watch": "^4.3.11", "node-sass": "^4.5.3", - "ora": "^1.3.0", - "prop-types": "^15.5.10", "react": "^15.6.1", "react-dom": "^15.6.1", "react-redux": "^5.0.5", @@ -106,10 +100,13 @@ "validate-commit-msg": "^2.12.2" }, "devDependencies": { + "ghooks": "^2.0.0", "nodemon": "^1.11.0", + "redux-devtools": "^3.4.0", + "redux-devtools-dock-monitor": "^1.1.2", + "redux-devtools-log-monitor": "^1.3.0", "webpack": "^2.0.0", - "webpack-node-externals": "^1.6.0", - "ghooks": "^2.0.0" + "webpack-node-externals": "^1.6.0" }, "config": { "ghooks": { From cf544d4a0e8386dafd9d8a873c0809576eda8ec5 Mon Sep 17 00:00:00 2001 From: zwjamnsss Date: Fri, 4 Aug 2017 15:15:28 +0800 Subject: [PATCH 02/12] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=9A=84=20babel-polyfill?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/client/index.js b/client/index.js index c576190e..386ed9e1 100644 --- a/client/index.js +++ b/client/index.js @@ -1,5 +1,4 @@ import React from 'react' -import 'babel-polyfill' import thunkMiddleware from 'redux-thunk' import promiseMiddleware from 'redux-promise'; import ReactDOM from 'react-dom' From fe06942703dd28e9fa7df44d12f9e02d09062bfd Mon Sep 17 00:00:00 2001 From: zwjamnsss Date: Fri, 4 Aug 2017 17:47:31 +0800 Subject: [PATCH 03/12] =?UTF-8?q?opti:=20redux-devtools=20=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/containers/DevTools/DevTools.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/client/containers/DevTools/DevTools.js b/client/containers/DevTools/DevTools.js index 8cf7de7f..932a0e97 100644 --- a/client/containers/DevTools/DevTools.js +++ b/client/containers/DevTools/DevTools.js @@ -5,7 +5,11 @@ import DockMonitor from 'redux-devtools-dock-monitor'; const DockMonitorD = DockMonitor.default // 这里有 bug 不知道为啥非要使用 default export default createDevTools( - + ); From 1799c2ac588e140765684e2fb6d79be716120693 Mon Sep 17 00:00:00 2001 From: zwjamnsss Date: Fri, 4 Aug 2017 17:59:44 +0800 Subject: [PATCH 04/12] =?UTF-8?q?opti:=20=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/ReduxContainer.js | 19 ------------------- client/base.js | 6 ------ client/index.js | 2 +- client/reducer/index.js | 19 +++++++++++++++++++ 4 files changed, 20 insertions(+), 26 deletions(-) delete mode 100644 client/ReduxContainer.js delete mode 100644 client/base.js create mode 100644 client/reducer/index.js diff --git a/client/ReduxContainer.js b/client/ReduxContainer.js deleted file mode 100644 index 600d315a..00000000 --- a/client/ReduxContainer.js +++ /dev/null @@ -1,19 +0,0 @@ -import login from './reducer/Login/login.js' -import group from './reducer/group/group.js' -import project from './reducer/group/project.js' -import Interface from './reducer/Interface/InterfaceReducer.js' -import news from './reducer/news/news.js' -import addInterface from './reducer/addInterface/addInterface.js' -import user from './reducer/user/user.js' -import menu from './reducer/menu/menu.js' - -export default { - group, - login, - Interface, - user, - project, - news, - addInterface, - menu -} diff --git a/client/base.js b/client/base.js deleted file mode 100644 index 82be8d72..00000000 --- a/client/base.js +++ /dev/null @@ -1,6 +0,0 @@ -import React, { Component } from 'react' - -export { - React, - Component -} diff --git a/client/index.js b/client/index.js index 386ed9e1..45370270 100644 --- a/client/index.js +++ b/client/index.js @@ -5,7 +5,7 @@ import ReactDOM from 'react-dom' import App from './Application' import { createStore, combineReducers, applyMiddleware, compose } from 'redux' import { Provider } from 'react-redux' -import ReduxContainer from './ReduxContainer.js' +import ReduxContainer from './reducer' import { DevTools } from './containers'; const enhancer = compose( diff --git a/client/reducer/index.js b/client/reducer/index.js new file mode 100644 index 00000000..aff2d39e --- /dev/null +++ b/client/reducer/index.js @@ -0,0 +1,19 @@ +import login from './Login/login.js' +import group from './group/group.js' +import project from './group/project.js' +import Interface from './Interface/InterfaceReducer.js' +import news from './news/news.js' +import addInterface from './addInterface/addInterface.js' +import user from './user/user.js' +import menu from './menu/menu.js' + +export default { + group, + login, + Interface, + user, + project, + news, + addInterface, + menu +} From 3ab875c36c62a01108a939dfb9ea96227cd5b6f2 Mon Sep 17 00:00:00 2001 From: zwjamnsss Date: Mon, 7 Aug 2017 15:27:27 +0800 Subject: [PATCH 05/12] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/reducer/index.js | 4 +- client/reducer/interface/InterfaceReducer.js | 53 ------------- .../interface.js} | 0 client/reducer/login/login.js | 76 ------------------- client/reducer/{Login => login2}/login.js | 0 5 files changed, 2 insertions(+), 131 deletions(-) delete mode 100644 client/reducer/interface/InterfaceReducer.js rename client/reducer/{Interface/InterfaceReducer.js => interface2/interface.js} (100%) delete mode 100644 client/reducer/login/login.js rename client/reducer/{Login => login2}/login.js (100%) diff --git a/client/reducer/index.js b/client/reducer/index.js index aff2d39e..ac71656e 100644 --- a/client/reducer/index.js +++ b/client/reducer/index.js @@ -1,7 +1,7 @@ -import login from './Login/login.js' +import login from './login2/login.js' import group from './group/group.js' import project from './group/project.js' -import Interface from './Interface/InterfaceReducer.js' +import Interface from './interface2/interface.js' import news from './news/news.js' import addInterface from './addInterface/addInterface.js' import user from './user/user.js' diff --git a/client/reducer/interface/InterfaceReducer.js b/client/reducer/interface/InterfaceReducer.js deleted file mode 100644 index 52a11ed9..00000000 --- a/client/reducer/interface/InterfaceReducer.js +++ /dev/null @@ -1,53 +0,0 @@ -import { - FETCH_INTERFACE_DATA, - LIST_INTERFACE_CLICK, - PROJECT_MEMBER_INTERFACE, - DELETE_INTERFACE_DATA, - SAVE_INTERFACE_PROJECT_ID, - GET_INTERFACE_GROUP_LIST -} from '../../constants/action-types.js' - -const initialState = { - interfaceData: [], - modalVisible: false, - interfaceName: '', - projectId: '', - memberList: [] -} - -export default (state = initialState, action) => { - switch (action.type) { - case FETCH_INTERFACE_DATA: - return { - ...state, - interfaceData: action.payload - } - case LIST_INTERFACE_CLICK: - return { - ...state, - modalVisible: true - } - case PROJECT_MEMBER_INTERFACE: - return { - ...state, - modalVisible: false - } - case DELETE_INTERFACE_DATA: - return { - ...state, - interfaceData: action.payload - } - case SAVE_INTERFACE_PROJECT_ID: - return { - ...state, - projectId: action.payload - } - case GET_INTERFACE_GROUP_LIST: - return { - ...state, - projectId: action.payload - } - default: - return state - } -} diff --git a/client/reducer/Interface/InterfaceReducer.js b/client/reducer/interface2/interface.js similarity index 100% rename from client/reducer/Interface/InterfaceReducer.js rename to client/reducer/interface2/interface.js diff --git a/client/reducer/login/login.js b/client/reducer/login/login.js deleted file mode 100644 index 583113d1..00000000 --- a/client/reducer/login/login.js +++ /dev/null @@ -1,76 +0,0 @@ -import { - LOGIN, - LOGIN_OUT, - LOGIN_TYPE, - GET_LOGIN_STATE, - REGISTER -} from '../../constants/action-types'; - -const LOADING_STATUS = 0; -const GUEST_STATUS = 1; -const MEMBER_STATUS = 2; - -const initialState = { - isLogin: false, - userName: null, - uid: null, - loginState: LOADING_STATUS, - loginWrapActiveKey: "1" -}; - -export default (state = initialState, action) => { - switch (action.type) { - case GET_LOGIN_STATE: { - console.log(action.payload.data); - return { - ...state, - isLogin: (action.payload.data.errcode == 0), - role: action.payload.data.data ? action.payload.data.data.role:null, - loginState: (action.payload.data.errcode == 0)?MEMBER_STATUS:GUEST_STATUS, - userName: action.payload.data.data ? action.payload.data.data.username : null, - uid: action.payload.data.data ? action.payload.data.data._id : null, - server_ip: action.payload.data.data ? action.payload.data.data.server_ip:null - }; - } - case LOGIN: { - if (action.payload.data.errcode === 0) { - return { - ...state, - isLogin: true, - loginState: MEMBER_STATUS, - uid: action.payload.data.data.uid, - userName: action.payload.data.data.username, - server_ip: action.payload.data.data.server_ip - }; - } else { - return state; - } - } - case LOGIN_OUT: { - return{ - ...state, - isLogin: false, - loginState: GUEST_STATUS, - userName: null, - uid: null - } - } - case LOGIN_TYPE: { - return { - ...state, - loginWrapActiveKey: action.index - }; - } - case REGISTER: { - return { - ...state, - isLogin: true, - loginState: MEMBER_STATUS, - uid: action.payload.data.data.uid, - userName: action.payload.data.data.username - }; - } - default: - return state; - } -}; diff --git a/client/reducer/Login/login.js b/client/reducer/login2/login.js similarity index 100% rename from client/reducer/Login/login.js rename to client/reducer/login2/login.js From 77ad483f94bb51b688a050fc16c84a727a91f602 Mon Sep 17 00:00:00 2001 From: zwjamnsss Date: Mon, 7 Aug 2017 15:32:25 +0800 Subject: [PATCH 06/12] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/reducer/index.js | 4 ++-- client/reducer/{interface2 => interface}/interface.js | 0 client/reducer/{login2 => login}/login.js | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename client/reducer/{interface2 => interface}/interface.js (100%) rename client/reducer/{login2 => login}/login.js (100%) diff --git a/client/reducer/index.js b/client/reducer/index.js index ac71656e..297a7a3a 100644 --- a/client/reducer/index.js +++ b/client/reducer/index.js @@ -1,7 +1,7 @@ -import login from './login2/login.js' +import login from './login/login.js' import group from './group/group.js' import project from './group/project.js' -import Interface from './interface2/interface.js' +import Interface from './interface/interface.js' import news from './news/news.js' import addInterface from './addInterface/addInterface.js' import user from './user/user.js' diff --git a/client/reducer/interface2/interface.js b/client/reducer/interface/interface.js similarity index 100% rename from client/reducer/interface2/interface.js rename to client/reducer/interface/interface.js diff --git a/client/reducer/login2/login.js b/client/reducer/login/login.js similarity index 100% rename from client/reducer/login2/login.js rename to client/reducer/login/login.js From 8dd5f5924a5e30e01105b6126d172014ade8a26d Mon Sep 17 00:00:00 2001 From: zwjamnsss Date: Mon, 7 Aug 2017 15:39:15 +0800 Subject: [PATCH 07/12] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/reducer/interface/interface.js | 53 ------------------- client/reducer/login/login.js | 76 --------------------------- 2 files changed, 129 deletions(-) delete mode 100644 client/reducer/interface/interface.js delete mode 100644 client/reducer/login/login.js diff --git a/client/reducer/interface/interface.js b/client/reducer/interface/interface.js deleted file mode 100644 index 52a11ed9..00000000 --- a/client/reducer/interface/interface.js +++ /dev/null @@ -1,53 +0,0 @@ -import { - FETCH_INTERFACE_DATA, - LIST_INTERFACE_CLICK, - PROJECT_MEMBER_INTERFACE, - DELETE_INTERFACE_DATA, - SAVE_INTERFACE_PROJECT_ID, - GET_INTERFACE_GROUP_LIST -} from '../../constants/action-types.js' - -const initialState = { - interfaceData: [], - modalVisible: false, - interfaceName: '', - projectId: '', - memberList: [] -} - -export default (state = initialState, action) => { - switch (action.type) { - case FETCH_INTERFACE_DATA: - return { - ...state, - interfaceData: action.payload - } - case LIST_INTERFACE_CLICK: - return { - ...state, - modalVisible: true - } - case PROJECT_MEMBER_INTERFACE: - return { - ...state, - modalVisible: false - } - case DELETE_INTERFACE_DATA: - return { - ...state, - interfaceData: action.payload - } - case SAVE_INTERFACE_PROJECT_ID: - return { - ...state, - projectId: action.payload - } - case GET_INTERFACE_GROUP_LIST: - return { - ...state, - projectId: action.payload - } - default: - return state - } -} diff --git a/client/reducer/login/login.js b/client/reducer/login/login.js deleted file mode 100644 index 583113d1..00000000 --- a/client/reducer/login/login.js +++ /dev/null @@ -1,76 +0,0 @@ -import { - LOGIN, - LOGIN_OUT, - LOGIN_TYPE, - GET_LOGIN_STATE, - REGISTER -} from '../../constants/action-types'; - -const LOADING_STATUS = 0; -const GUEST_STATUS = 1; -const MEMBER_STATUS = 2; - -const initialState = { - isLogin: false, - userName: null, - uid: null, - loginState: LOADING_STATUS, - loginWrapActiveKey: "1" -}; - -export default (state = initialState, action) => { - switch (action.type) { - case GET_LOGIN_STATE: { - console.log(action.payload.data); - return { - ...state, - isLogin: (action.payload.data.errcode == 0), - role: action.payload.data.data ? action.payload.data.data.role:null, - loginState: (action.payload.data.errcode == 0)?MEMBER_STATUS:GUEST_STATUS, - userName: action.payload.data.data ? action.payload.data.data.username : null, - uid: action.payload.data.data ? action.payload.data.data._id : null, - server_ip: action.payload.data.data ? action.payload.data.data.server_ip:null - }; - } - case LOGIN: { - if (action.payload.data.errcode === 0) { - return { - ...state, - isLogin: true, - loginState: MEMBER_STATUS, - uid: action.payload.data.data.uid, - userName: action.payload.data.data.username, - server_ip: action.payload.data.data.server_ip - }; - } else { - return state; - } - } - case LOGIN_OUT: { - return{ - ...state, - isLogin: false, - loginState: GUEST_STATUS, - userName: null, - uid: null - } - } - case LOGIN_TYPE: { - return { - ...state, - loginWrapActiveKey: action.index - }; - } - case REGISTER: { - return { - ...state, - isLogin: true, - loginState: MEMBER_STATUS, - uid: action.payload.data.data.uid, - userName: action.payload.data.data.username - }; - } - default: - return state; - } -}; From 6f0ee6bba66a69a3b5aef833cc3c055ff11e4546 Mon Sep 17 00:00:00 2001 From: zwjamnsss Date: Mon, 7 Aug 2017 15:40:21 +0800 Subject: [PATCH 08/12] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8D=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/reducer/interface/interface.js | 53 +++++++++++++++++++ client/reducer/login/login.js | 76 +++++++++++++++++++++++++++ 2 files changed, 129 insertions(+) create mode 100644 client/reducer/interface/interface.js create mode 100644 client/reducer/login/login.js diff --git a/client/reducer/interface/interface.js b/client/reducer/interface/interface.js new file mode 100644 index 00000000..52a11ed9 --- /dev/null +++ b/client/reducer/interface/interface.js @@ -0,0 +1,53 @@ +import { + FETCH_INTERFACE_DATA, + LIST_INTERFACE_CLICK, + PROJECT_MEMBER_INTERFACE, + DELETE_INTERFACE_DATA, + SAVE_INTERFACE_PROJECT_ID, + GET_INTERFACE_GROUP_LIST +} from '../../constants/action-types.js' + +const initialState = { + interfaceData: [], + modalVisible: false, + interfaceName: '', + projectId: '', + memberList: [] +} + +export default (state = initialState, action) => { + switch (action.type) { + case FETCH_INTERFACE_DATA: + return { + ...state, + interfaceData: action.payload + } + case LIST_INTERFACE_CLICK: + return { + ...state, + modalVisible: true + } + case PROJECT_MEMBER_INTERFACE: + return { + ...state, + modalVisible: false + } + case DELETE_INTERFACE_DATA: + return { + ...state, + interfaceData: action.payload + } + case SAVE_INTERFACE_PROJECT_ID: + return { + ...state, + projectId: action.payload + } + case GET_INTERFACE_GROUP_LIST: + return { + ...state, + projectId: action.payload + } + default: + return state + } +} diff --git a/client/reducer/login/login.js b/client/reducer/login/login.js new file mode 100644 index 00000000..583113d1 --- /dev/null +++ b/client/reducer/login/login.js @@ -0,0 +1,76 @@ +import { + LOGIN, + LOGIN_OUT, + LOGIN_TYPE, + GET_LOGIN_STATE, + REGISTER +} from '../../constants/action-types'; + +const LOADING_STATUS = 0; +const GUEST_STATUS = 1; +const MEMBER_STATUS = 2; + +const initialState = { + isLogin: false, + userName: null, + uid: null, + loginState: LOADING_STATUS, + loginWrapActiveKey: "1" +}; + +export default (state = initialState, action) => { + switch (action.type) { + case GET_LOGIN_STATE: { + console.log(action.payload.data); + return { + ...state, + isLogin: (action.payload.data.errcode == 0), + role: action.payload.data.data ? action.payload.data.data.role:null, + loginState: (action.payload.data.errcode == 0)?MEMBER_STATUS:GUEST_STATUS, + userName: action.payload.data.data ? action.payload.data.data.username : null, + uid: action.payload.data.data ? action.payload.data.data._id : null, + server_ip: action.payload.data.data ? action.payload.data.data.server_ip:null + }; + } + case LOGIN: { + if (action.payload.data.errcode === 0) { + return { + ...state, + isLogin: true, + loginState: MEMBER_STATUS, + uid: action.payload.data.data.uid, + userName: action.payload.data.data.username, + server_ip: action.payload.data.data.server_ip + }; + } else { + return state; + } + } + case LOGIN_OUT: { + return{ + ...state, + isLogin: false, + loginState: GUEST_STATUS, + userName: null, + uid: null + } + } + case LOGIN_TYPE: { + return { + ...state, + loginWrapActiveKey: action.index + }; + } + case REGISTER: { + return { + ...state, + isLogin: true, + loginState: MEMBER_STATUS, + uid: action.payload.data.data.uid, + userName: action.payload.data.data.username + }; + } + default: + return state; + } +}; From b1ee3575c6843d0945215a9eb26f33d89dce402e Mon Sep 17 00:00:00 2001 From: zwjamnsss Date: Mon, 7 Aug 2017 15:41:41 +0800 Subject: [PATCH 09/12] fix: none --- client/reducer/Interface/interface.js | 53 +++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 client/reducer/Interface/interface.js diff --git a/client/reducer/Interface/interface.js b/client/reducer/Interface/interface.js new file mode 100644 index 00000000..52a11ed9 --- /dev/null +++ b/client/reducer/Interface/interface.js @@ -0,0 +1,53 @@ +import { + FETCH_INTERFACE_DATA, + LIST_INTERFACE_CLICK, + PROJECT_MEMBER_INTERFACE, + DELETE_INTERFACE_DATA, + SAVE_INTERFACE_PROJECT_ID, + GET_INTERFACE_GROUP_LIST +} from '../../constants/action-types.js' + +const initialState = { + interfaceData: [], + modalVisible: false, + interfaceName: '', + projectId: '', + memberList: [] +} + +export default (state = initialState, action) => { + switch (action.type) { + case FETCH_INTERFACE_DATA: + return { + ...state, + interfaceData: action.payload + } + case LIST_INTERFACE_CLICK: + return { + ...state, + modalVisible: true + } + case PROJECT_MEMBER_INTERFACE: + return { + ...state, + modalVisible: false + } + case DELETE_INTERFACE_DATA: + return { + ...state, + interfaceData: action.payload + } + case SAVE_INTERFACE_PROJECT_ID: + return { + ...state, + projectId: action.payload + } + case GET_INTERFACE_GROUP_LIST: + return { + ...state, + projectId: action.payload + } + default: + return state + } +} From 70aa69a3511ccc272ca71fb8ae09643ca3325bbb Mon Sep 17 00:00:00 2001 From: zwjamnsss Date: Mon, 7 Aug 2017 15:52:46 +0800 Subject: [PATCH 10/12] =?UTF-8?q?test:=20=E8=AF=A5=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/reducer/{login => Login}/login.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename client/reducer/{login => Login}/login.js (100%) diff --git a/client/reducer/login/login.js b/client/reducer/Login/login.js similarity index 100% rename from client/reducer/login/login.js rename to client/reducer/Login/login.js From eb97de36690e07ea131dd53aaed964c9dde6fce0 Mon Sep 17 00:00:00 2001 From: zwjamnsss Date: Mon, 7 Aug 2017 15:55:32 +0800 Subject: [PATCH 11/12] =?UTF-8?q?fix:=20=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/reducer/{Login => login}/login.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename client/reducer/{Login => login}/login.js (100%) diff --git a/client/reducer/Login/login.js b/client/reducer/login/login.js similarity index 100% rename from client/reducer/Login/login.js rename to client/reducer/login/login.js From e5b99b40cbff7835cc695142b29d48886c88429f Mon Sep 17 00:00:00 2001 From: zwjamnsss Date: Mon, 7 Aug 2017 15:57:15 +0800 Subject: [PATCH 12/12] =?UTF-8?q?fix:=20=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/reducer/Interface/interface.js | 53 --------------------------- 1 file changed, 53 deletions(-) delete mode 100644 client/reducer/Interface/interface.js diff --git a/client/reducer/Interface/interface.js b/client/reducer/Interface/interface.js deleted file mode 100644 index 52a11ed9..00000000 --- a/client/reducer/Interface/interface.js +++ /dev/null @@ -1,53 +0,0 @@ -import { - FETCH_INTERFACE_DATA, - LIST_INTERFACE_CLICK, - PROJECT_MEMBER_INTERFACE, - DELETE_INTERFACE_DATA, - SAVE_INTERFACE_PROJECT_ID, - GET_INTERFACE_GROUP_LIST -} from '../../constants/action-types.js' - -const initialState = { - interfaceData: [], - modalVisible: false, - interfaceName: '', - projectId: '', - memberList: [] -} - -export default (state = initialState, action) => { - switch (action.type) { - case FETCH_INTERFACE_DATA: - return { - ...state, - interfaceData: action.payload - } - case LIST_INTERFACE_CLICK: - return { - ...state, - modalVisible: true - } - case PROJECT_MEMBER_INTERFACE: - return { - ...state, - modalVisible: false - } - case DELETE_INTERFACE_DATA: - return { - ...state, - interfaceData: action.payload - } - case SAVE_INTERFACE_PROJECT_ID: - return { - ...state, - projectId: action.payload - } - case GET_INTERFACE_GROUP_LIST: - return { - ...state, - projectId: action.payload - } - default: - return state - } -}