External/fredy
1
0
Fork 0
mirror of https://github.com/orangecoding/fredy.git synced 2026-06-16 12:31:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing app init

Browse Source
This commit is contained in:
orangecoding
2026-02-17 14:28:08 +01:00
parent 19d4721f9f
commit 05218800d2
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "fredy", "name": "fredy",
"version": "19.4.1", "version": "19.4.2",
"description": "[F]ind [R]eal [E]states [d]amn eas[y].", "description": "[F]ind [R]eal [E]states [d]amn eas[y].",
"scripts": { "scripts": {
"prepare": "husky", "prepare": "husky",

31
ui/src/App.jsx
View File

@@ -11,7 +11,7 @@ import GeneralSettings from './views/generalSettings/GeneralSettings';
import UserSettings from './views/userSettings/UserSettings'; import UserSettings from './views/userSettings/UserSettings';
import JobMutation from './views/jobs/mutation/JobMutation'; import JobMutation from './views/jobs/mutation/JobMutation';
import UserMutator from './views/user/mutation/UserMutator'; import UserMutator from './views/user/mutation/UserMutator';
import { useActions, useSelector, useFredyState } from './services/state/store'; import { useActions, useSelector } from './services/state/store';
import { Routes, Route, Navigate } from 'react-router-dom'; import { Routes, Route, Navigate } from 'react-router-dom';
import Login from './views/login/Login'; import Login from './views/login/Login';
import Users from './views/user/Users'; import Users from './views/user/Users';
@@ -41,24 +41,21 @@ export default function FredyApp() {
useEffect(() => { useEffect(() => {
async function init() { async function init() {
await actions.user.getCurrentUser(); await actions.user.getCurrentUser();
const user = useFredyState.getState().user.currentUser; if (!needsLogin()) {
if (!user || Object.keys(user).length === 0) { await actions.provider.getProvider();
setLoading(false); await actions.jobsData.getJobs();
return; await actions.jobsData.getSharableUserList();
await actions.notificationAdapter.getAdapter();
await actions.generalSettings.getGeneralSettings();
await actions.userSettings.getUserSettings();
await actions.versionUpdate.getVersionUpdate();
await actions.tracking.getTrackingPois();
} }
await actions.provider.getProvider();
await actions.jobsData.getJobs();
await actions.jobsData.getSharableUserList();
await actions.notificationAdapter.getAdapter();
await actions.generalSettings.getGeneralSettings();
await actions.userSettings.getUserSettings();
await actions.versionUpdate.getVersionUpdate();
await actions.tracking.getTrackingPois();
setLoading(false); setLoading(false);
} }
init(); init();
}, []); }, [currentUser?.userId]);
const needsLogin = () => { const needsLogin = () => {
return currentUser == null || Object.keys(currentUser).length === 0; return currentUser == null || Object.keys(currentUser).length === 0;
@@ -68,7 +65,10 @@ export default function FredyApp() {
const { Sider, Content } = Layout; const { Sider, Content } = Layout;
return loading ? null : needsLogin() ? ( return loading ? null : needsLogin() ? (
<Login /> <Routes>
<Route path="/login" element={<Login />} />
<Route path="*" element={<Navigate to="/login" replace />} />
</Routes>
) : ( ) : (
<Layout className="app"> <Layout className="app">
<Sider> <Sider>
@@ -137,7 +137,6 @@ export default function FredyApp() {
} }
/> />
{/* Authenticated fallbacks */}
<Route path="/" element={<Navigate to="/dashboard" replace />} /> <Route path="/" element={<Navigate to="/dashboard" replace />} />
</Routes> </Routes>
</Content> </Content>