- updated zustand and react libraries;
- added 'put in draft' btn;
This commit is contained in:
60
src/App.js
60
src/App.js
@@ -1,58 +1,60 @@
|
||||
import { useEffect } from 'react';
|
||||
import { BrowserRouter } from 'react-router-dom';
|
||||
import Routes from './routes';
|
||||
import { createI18n, setLocaleData } from '@wordpress/i18n';
|
||||
import { I18nProvider } from '@wordpress/react-i18n';
|
||||
import {
|
||||
//createI18n,
|
||||
setLocaleData } from '@wordpress/i18n';
|
||||
//import { I18nProvider } from '@wordpress/react-i18n';
|
||||
import './assets/scss/theme.scss';
|
||||
import { isEmpty, head } from 'ramda';
|
||||
import { addLocale, PrimeReactProvider } from 'primereact/api';
|
||||
|
||||
// store
|
||||
import { useStore, storeSet, storeGet } from './store';
|
||||
import { useStoreValue, storeSet, storeGet } from './store';
|
||||
|
||||
// api
|
||||
import AuthenticationService from './service/authentication-service';
|
||||
|
||||
const i18n = createI18n({}, 'gepafin');
|
||||
//const i18n = createI18n({}, 'gepafin');
|
||||
|
||||
function App() {
|
||||
const role = useStore().main.getRole();
|
||||
const chosenCompanyId = useStore().main.chosenCompanyId();
|
||||
const isRedirectedOnceNoCompany = useStore().main.isRedirectedOnceNoCompany();
|
||||
const role = useStoreValue('getRole');
|
||||
const chosenCompanyId = useStoreValue('chosenCompanyId');
|
||||
const isRedirectedOnceNoCompany = useStoreValue('isRedirectedOnceNoCompany');
|
||||
const value = {
|
||||
locale: 'it',
|
||||
};
|
||||
|
||||
const callback = (data) => {
|
||||
if (data.status === 'SUCCESS') {
|
||||
storeSet.main.userData(data.data);
|
||||
const callback = (resp) => {
|
||||
if (resp.status === 'SUCCESS') {
|
||||
storeSet('userData', resp.data);
|
||||
} else {
|
||||
storeSet.main.doLogout();
|
||||
storeSet('doLogout');
|
||||
}
|
||||
storeSet.main.unsetAsyncRequest();
|
||||
storeSet('unsetAsyncRequest');
|
||||
}
|
||||
|
||||
const errCallback = (data) => {
|
||||
storeSet.main.unsetAsyncRequest();
|
||||
const errCallback = () => {
|
||||
storeSet('unsetAsyncRequest');
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
if (['ROLE_BENEFICIARY', 'ROLE_CONFIDI'].includes(role)) {
|
||||
const userData = storeGet.main.userData();
|
||||
const userData = storeGet('userData');
|
||||
if (userData.companies && !isEmpty(userData.companies)) {
|
||||
storeSet.main.companies(userData.companies);
|
||||
storeSet('companies', userData.companies);
|
||||
const company = head(userData.companies.filter(o => o.id === chosenCompanyId));
|
||||
|
||||
if (!company) {
|
||||
storeSet.main.chosenCompanyId(userData.companies[0].id);
|
||||
storeSet('chosenCompanyId', userData.companies[0].id);
|
||||
}
|
||||
} else {
|
||||
storeSet.main.chosenCompanyId(0);
|
||||
storeSet('chosenCompanyId', 0);
|
||||
const { origin, href } = window.location;
|
||||
const url = `${origin}/agguingi-azienda`;
|
||||
|
||||
if (!isRedirectedOnceNoCompany && url !== href) {
|
||||
storeSet.main.isRedirectedOnceNoCompany(true);
|
||||
storeSet('isRedirectedOnceNoCompany', true);
|
||||
window.location.replace('/agguingi-azienda')
|
||||
}
|
||||
}
|
||||
@@ -60,7 +62,7 @@ function App() {
|
||||
}, [role]);
|
||||
|
||||
useEffect(() => {
|
||||
storeSet.main.setAsyncRequest();
|
||||
storeSet('setAsyncRequest');
|
||||
AuthenticationService.me(callback, errCallback);
|
||||
|
||||
addLocale('it', {
|
||||
@@ -116,14 +118,22 @@ function App() {
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<I18nProvider i18n={i18n}>
|
||||
<BrowserRouter>
|
||||
<PrimeReactProvider value={value}>
|
||||
<Routes role={role} chosenCompanyId={chosenCompanyId}/>
|
||||
</PrimeReactProvider>
|
||||
</BrowserRouter>
|
||||
);
|
||||
}
|
||||
|
||||
export default App;
|
||||
|
||||
/*
|
||||
<I18nProvider i18n={i18n}>
|
||||
<BrowserRouter>
|
||||
<PrimeReactProvider value={value}>
|
||||
<Routes role={role} chosenCompanyId={chosenCompanyId}/>
|
||||
</PrimeReactProvider>
|
||||
</BrowserRouter>
|
||||
</I18nProvider>
|
||||
);
|
||||
}
|
||||
|
||||
export default App;
|
||||
*/
|
||||
Reference in New Issue
Block a user