schuelerlabor-cleverlab/smarti
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

store locale in localStorage only if user is not logged in

Browse Source
This commit is contained in:
Delucse 2020-12-14 20:04:49 +01:00
parent 49730f51ac
commit b04a5bc591
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/actions/authActions.js
View File

@ -54,6 +54,9 @@ const timeToLogout = 14.9*60*1000; // nearly 15 minutes corresponding to the API
// Login user // Login user
export const login = ({ email, password }) => (dispatch) => { export const login = ({ email, password }) => (dispatch) => {
dispatch({
type: USER_LOADING
});
// Headers // Headers
const config = { const config = {
headers: { headers: {
@ -70,11 +73,11 @@ export const login = ({ email, password }) => (dispatch) => {
timeToLogout timeToLogout
); );
logoutTimerId = logoutTimer(); logoutTimerId = logoutTimer();
dispatch(setLanguage(res.data.user.language));
dispatch({ dispatch({
type: LOGIN_SUCCESS, type: LOGIN_SUCCESS,
payload: res.data payload: res.data
}); });
dispatch(setLanguage(res.data.user.language));
dispatch({ dispatch({
type: GET_STATUS, type: GET_STATUS,
payload: res.data.user.status payload: res.data.user.status

2
src/actions/generalActions.js
View File

@ -8,7 +8,7 @@ export const visitPage = () => (dispatch) => {
}; };
export const setLanguage = (language) => (dispatch, getState) => { export const setLanguage = (language) => (dispatch, getState) => {
if(!getState().auth.isAuthenticated){ if(!getState().auth.progress && !getState().auth.isAuthenticated){
window.localStorage.setItem('locale', language); window.localStorage.setItem('locale', language);
} }
dispatch({ dispatch({