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

set preferences when authenticating user

Browse source
This commit is contained in:
catarak 2016-08-09 17:50:45 -04:00
parent 2f581a6a77
commit d9ea10c4c6
5 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/constants.js
View file

@ -52,6 +52,7 @@ export const SHOW_EDIT_FILE_NAME = 'SHOW_EDIT_FILE_NAME';
export const HIDE_EDIT_FILE_NAME = 'HIDE_EDIT_FILE_NAME'; export const HIDE_EDIT_FILE_NAME = 'HIDE_EDIT_FILE_NAME';
export const SET_AUTOSAVE = 'SET_AUTOSAVE'; export const SET_AUTOSAVE = 'SET_AUTOSAVE';
export const SET_PREFERENCES = 'SET_PREFERENCES';
// eventually, handle errors more specifically and better // eventually, handle errors more specifically and better
export const ERROR = 'ERROR'; export const ERROR = 'ERROR';

12
client/modules/IDE/pages/IDEView.js
View file

@ -21,14 +21,20 @@ class IDEView extends React.Component {
const id = this.props.params.project_id; const id = this.props.params.project_id;
this.props.getProject(id); this.props.getProject(id);
// if autosave is enabled if (this.props.preferences.autosave) {
this.autosaveInterval = setInterval(this.props.saveProject, 30000); this.autosaveInterval = setInterval(this.props.saveProject, 30000);
}
} }
} }
componentDidUpdate(prevProps) { componentDidUpdate(prevProps) {
if (!this.autosaveInterval && this.props.project.id && !prevProps.project.id) { if (!this.autosaveInterval &&
((this.props.preferences.autosave && !prevProps.preferences.autosave) ||
(this.props.project.id && !prevProps.project.id))) {
this.autosaveInterval = setInterval(this.props.saveProject, 30000); this.autosaveInterval = setInterval(this.props.saveProject, 30000);
} else if (this.autosaveInterval && !this.props.preferences.autosave && prevProps.preferences.autosave) {
clearInterval(this.autosaveInterval);
this.autosaveInterval = null;
} }
} }

2
client/modules/IDE/reducers/preferences.js
View file

@ -23,6 +23,8 @@ const preferences = (state = initialState, action) => {
}); });
case ActionTypes.SET_AUTOSAVE: case ActionTypes.SET_AUTOSAVE:
return Object.assign({}, state, { autosave: action.value }); return Object.assign({}, state, { autosave: action.value });
case ActionTypes.SET_PREFERENCES:
return action.preferences;
default: default:
return state; return state;
} }

4
client/modules/User/actions.js
View file

@ -46,6 +46,10 @@ export function getUser() {
type: ActionTypes.AUTH_USER, type: ActionTypes.AUTH_USER,
user: response.data user: response.data
}); });
dispatch({
type: ActionTypes.SET_PREFERENCES,
preferences: response.data.preferences
});
}) })
.catch(response => dispatch(authError(response.data.error))); .catch(response => dispatch(authError(response.data.error)));
}; };

3
server/controllers/session.controller.js
View file

@ -21,7 +21,8 @@ export function getSession(req, res) {
if (req.user) { if (req.user) {
return res.json({ return res.json({
email: req.user.email, email: req.user.email,
username: req.user.username username: req.user.username,
preferences: req.user.preferences
}); });
} }
return res.status(404).send({ message: 'Session does not exist' }); return res.status(404).send({ message: 'Session does not exist' });