Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 57bcf446e3 | |||
|
|
b4f0faad76 | ||
| 8d113211d3 | |||
|
|
96f02ef992 |
@@ -17,7 +17,7 @@ const INITIAL_STATE = {
|
||||
last: '',
|
||||
companyName: '',
|
||||
},
|
||||
loading: false,
|
||||
loading: false
|
||||
};
|
||||
|
||||
export default (state = INITIAL_STATE, action) => {
|
||||
@@ -37,7 +37,7 @@ export default (state = INITIAL_STATE, action) => {
|
||||
password: '',
|
||||
authToken: action.payload.authToken,
|
||||
user: action.payload.user,
|
||||
loading: false,
|
||||
loading: false
|
||||
};
|
||||
|
||||
case LOGIN_USER_FAIL:
|
||||
@@ -45,7 +45,7 @@ export default (state = INITIAL_STATE, action) => {
|
||||
...state,
|
||||
error: 'Authentication failed!',
|
||||
password: '',
|
||||
loading: false,
|
||||
loading: false
|
||||
};
|
||||
|
||||
case LOGOUT:
|
||||
@@ -55,4 +55,3 @@ export default (state = INITIAL_STATE, action) => {
|
||||
return state;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -4,5 +4,5 @@ import MeshifyReducer from './meshifyReducer';
|
||||
|
||||
export default combineReducers({
|
||||
auth: AuthReducer,
|
||||
meshify: MeshifyReducer,
|
||||
meshify: MeshifyReducer
|
||||
});
|
||||
|
||||
5632
package-lock.json
generated
5632
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
24
package.json
24
package.json
@@ -12,22 +12,22 @@
|
||||
},
|
||||
"author": "Patric McDonagh",
|
||||
"devDependencies": {
|
||||
"electron": "^2.0.2",
|
||||
"npm-run-all": "^4.1.3",
|
||||
"babel-core": "^6.26.0",
|
||||
"babel-eslint": "^8.2.2",
|
||||
"babel-loader": "^7.1.4",
|
||||
"babel-eslint": "^8.2.6",
|
||||
"babel-loader": "^7.1.5",
|
||||
"babel-preset-env": "^1.6.1",
|
||||
"babel-preset-react": "^6.24.1",
|
||||
"babel-preset-stage-0": "^6.24.1",
|
||||
"electron-builder": "^20.8.1",
|
||||
"electron-reload": "^1.2.2",
|
||||
"electron": "^2.0.18",
|
||||
"electron-builder": "^20.44.4",
|
||||
"electron-reload": "^1.5.0",
|
||||
"extract-text-webpack-plugin": "^4.0.0-beta.0",
|
||||
"file-loader": "^1.1.10",
|
||||
"jest": "^22.4.3",
|
||||
"mini-css-extract-plugin": "^0.4.0",
|
||||
"mini-css-extract-plugin": "^0.4.5",
|
||||
"npm-run-all": "^4.1.5",
|
||||
"style-loader": "^0.20.3",
|
||||
"webpack": "^4.1.1",
|
||||
"webpack": "^4.42.1",
|
||||
"webpack-cli": "^2.0.11"
|
||||
},
|
||||
"dependencies": {
|
||||
@@ -35,16 +35,16 @@
|
||||
"base-64": "^0.1.0",
|
||||
"electron-localshortcut": "^1.1.1",
|
||||
"eslint-config-rallycoding": "^3.2.0",
|
||||
"lodash": "^4.17.10",
|
||||
"moment": "^2.18.1",
|
||||
"lodash": "^4.17.15",
|
||||
"moment": "^2.24.0",
|
||||
"moment-duration-format": "^1.3.0",
|
||||
"react": "^15.4.2",
|
||||
"react-dom": "^15.4.2",
|
||||
"react-redux": "^5.0.7",
|
||||
"react-router": "^4.0.0",
|
||||
"react-router-dom": "^4.0.0",
|
||||
"redux": "^4.0.0",
|
||||
"redux-persist": "^5.9.1",
|
||||
"redux": "^4.0.5",
|
||||
"redux-persist": "^5.10.0",
|
||||
"redux-thunk": "^2.3.0"
|
||||
},
|
||||
"build": {
|
||||
|
||||
Reference in New Issue
Block a user