r/p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull requests Releases 1 Wiki Activity

Changes API_KEY_REMOVED action constant to match API_KEY_CREATED

Browse source
This commit is contained in:
Andrew Nicolaou 2019-05-15 16:39:53 +02:00 committed by Cassie Tarakajian
parent 64caab0702
commit e77cbf4fa3
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/modules/User/reducers.js
View file

@ -31,15 +31,9 @@ const user = (state = { authenticated: false }, action) => {
return Object.assign({}, state, { emailVerificationTokenState: 'invalid' }); return Object.assign({}, state, { emailVerificationTokenState: 'invalid' });
case ActionTypes.SETTINGS_UPDATED: case ActionTypes.SETTINGS_UPDATED:
return { ...state, ...action.user }; return { ...state, ...action.user };
<<<<<<< HEAD
case ActionTypes.API_KEY_REMOVED: case ActionTypes.API_KEY_REMOVED:
return { ...state, ...action.user }; return { ...state, ...action.user };
case ActionTypes.API_KEY_CREATED: case ActionTypes.API_KEY_CREATED:
=======
case ActionTypes.REMOVED_API_KEY:
return { ...state, ...action.user };
case ActionTypes.ADDED_API_KEY:
>>>>>>> You can now generate keys from the advanced settings interface
return { ...state, ...action.user }; return { ...state, ...action.user };
default: default:
return state; return state;