- updated dependencies;
- fixed displaying delega; - fixed switching companies; - added toast for profile and company profile; - fixed registration 'deby/allow all' func;
This commit is contained in:
17
src/App.js
17
src/App.js
@@ -17,7 +17,6 @@ function App() {
|
||||
const chosenCompanyId = useStore().main.chosenCompanyId();
|
||||
|
||||
const callback = (data) => {
|
||||
//console.log('app /me', data);
|
||||
if (data.status === 'SUCCESS') {
|
||||
storeSet.main.userData(data.data);
|
||||
} else {
|
||||
@@ -27,36 +26,20 @@ function App() {
|
||||
}
|
||||
|
||||
const errCallback = (data) => {
|
||||
//storeSet.main.doLogout();
|
||||
storeSet.main.unsetAsyncRequest();
|
||||
}
|
||||
|
||||
/*const companyCallback = (data) => {
|
||||
if (data.status === 'SUCCESS') {
|
||||
storeSet.main.companies(data.data);
|
||||
}
|
||||
storeSet.main.unsetAsyncRequest();
|
||||
}
|
||||
|
||||
const errCompanyCallback = (data) => {
|
||||
storeSet.main.doLogout();
|
||||
storeSet.main.unsetAsyncRequest();
|
||||
}*/
|
||||
|
||||
useEffect(() => {
|
||||
if (role === 'ROLE_BENEFICIARY') {
|
||||
//storeSet.main.setAsyncRequest();
|
||||
const userData = storeGet.main.userData();
|
||||
if (userData.companies) {
|
||||
storeSet.main.companies(userData.companies);
|
||||
}
|
||||
//CompanyService.getCompanyForUser(userData.id, companyCallback, errCompanyCallback)
|
||||
}
|
||||
}, [role])
|
||||
|
||||
useEffect(() => {
|
||||
storeSet.main.setAsyncRequest();
|
||||
//console.log('app loaded, initiate call to /me');
|
||||
AuthenticationService.me(callback, errCallback);
|
||||
|
||||
fetch('/languages/en_US.json')
|
||||
|
||||
Reference in New Issue
Block a user