🐛 fix(App.tsx): set loading state to false after successful auto login or getting logged user data
🐛 fix(routes.tsx): remove duplicate import of ApiKeysPage
This commit is contained in:
parent
bfe8053127
commit
a35a4fd648
2 changed files with 12 additions and 6 deletions
|
|
@ -40,6 +40,7 @@ export default function App() {
|
|||
setSuccessOpen,
|
||||
setErrorData,
|
||||
loading,
|
||||
setLoading
|
||||
} = useContext(alertContext);
|
||||
const navigate = useNavigate();
|
||||
|
||||
|
|
@ -143,6 +144,7 @@ export default function App() {
|
|||
user['refresh_token'] = "auto";
|
||||
login(user['access_token'], user['refresh_token']);
|
||||
setAutoLogin(true);
|
||||
setLoading(false);
|
||||
}
|
||||
}).catch((error) => {
|
||||
setAutoLogin(false);
|
||||
|
|
@ -150,6 +152,7 @@ export default function App() {
|
|||
getLoggedUser()
|
||||
.then((user) => {
|
||||
setUserData(user);
|
||||
setLoading(false);
|
||||
})
|
||||
.catch((error) => {});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import { ProtectedLoginRoute } from "./components/authLoginGuard";
|
|||
import { CatchAllRoute } from "./components/catchAllRoutes";
|
||||
import AdminPage from "./pages/AdminPage";
|
||||
import LoginAdminPage from "./pages/AdminPage/LoginPage";
|
||||
import ApiKeysPage from "./pages/ApiKeysPage";
|
||||
import CommunityPage from "./pages/CommunityPage";
|
||||
import FlowPage from "./pages/FlowPage";
|
||||
import HomePage from "./pages/MainPage";
|
||||
|
|
@ -12,7 +13,6 @@ import ViewPage from "./pages/ViewPage";
|
|||
import DeleteAccountPage from "./pages/deleteAccountPage";
|
||||
import LoginPage from "./pages/loginPage";
|
||||
import SignUp from "./pages/signUpPage";
|
||||
import ApiKeysPage from "./pages/ApiKeysPage";
|
||||
|
||||
const Router = () => {
|
||||
return (
|
||||
|
|
@ -42,11 +42,14 @@ const Router = () => {
|
|||
</ProtectedRoute>
|
||||
}
|
||||
/>
|
||||
<Route path="view" element={
|
||||
<ProtectedRoute>
|
||||
<ViewPage />
|
||||
</ProtectedRoute>
|
||||
} />
|
||||
<Route
|
||||
path="view"
|
||||
element={
|
||||
<ProtectedRoute>
|
||||
<ViewPage />
|
||||
</ProtectedRoute>
|
||||
}
|
||||
/>
|
||||
</Route>
|
||||
<Route
|
||||
path="*"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue