jyapayne/langflow
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

🐛 fix(App.tsx): set loading state to false after successful auto login or getting logged user data

Browse source 
🐛 fix(routes.tsx): remove duplicate import of ApiKeysPage
This commit is contained in:
Cristhian Zanforlin Lousa 2023-08-17 19:23:52 -03:00
commit a35a4fd648
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/frontend/src/App.tsx
View file

@ -40,6 +40,7 @@ export default function App() {
setSuccessOpen, setSuccessOpen,
setErrorData, setErrorData,
loading, loading,
setLoading
} = useContext(alertContext); } = useContext(alertContext);
const navigate = useNavigate(); const navigate = useNavigate();
@ -143,6 +144,7 @@ export default function App() {
user['refresh_token'] = "auto"; user['refresh_token'] = "auto";
login(user['access_token'], user['refresh_token']); login(user['access_token'], user['refresh_token']);
setAutoLogin(true); setAutoLogin(true);
setLoading(false);
} }
}).catch((error) => { }).catch((error) => {
setAutoLogin(false); setAutoLogin(false);
@ -150,6 +152,7 @@ export default function App() {
getLoggedUser() getLoggedUser()
.then((user) => { .then((user) => {
setUserData(user); setUserData(user);
setLoading(false);
}) })
.catch((error) => {}); .catch((error) => {});
} }

15
src/frontend/src/routes.tsx
View file

@ -5,6 +5,7 @@ import { ProtectedLoginRoute } from "./components/authLoginGuard";
import { CatchAllRoute } from "./components/catchAllRoutes"; import { CatchAllRoute } from "./components/catchAllRoutes";
import AdminPage from "./pages/AdminPage"; import AdminPage from "./pages/AdminPage";
import LoginAdminPage from "./pages/AdminPage/LoginPage"; import LoginAdminPage from "./pages/AdminPage/LoginPage";
import ApiKeysPage from "./pages/ApiKeysPage";
import CommunityPage from "./pages/CommunityPage"; import CommunityPage from "./pages/CommunityPage";
import FlowPage from "./pages/FlowPage"; import FlowPage from "./pages/FlowPage";
import HomePage from "./pages/MainPage"; import HomePage from "./pages/MainPage";
@ -12,7 +13,6 @@ import ViewPage from "./pages/ViewPage";
import DeleteAccountPage from "./pages/deleteAccountPage"; import DeleteAccountPage from "./pages/deleteAccountPage";
import LoginPage from "./pages/loginPage"; import LoginPage from "./pages/loginPage";
import SignUp from "./pages/signUpPage"; import SignUp from "./pages/signUpPage";
import ApiKeysPage from "./pages/ApiKeysPage";
const Router = () => { const Router = () => {
return ( return (
@ -42,11 +42,14 @@ const Router = () => {
</ProtectedRoute> </ProtectedRoute>
} }
/> />
<Route path="view" element={ <Route
<ProtectedRoute> path="view"
<ViewPage /> element={
</ProtectedRoute> <ProtectedRoute>
} /> <ViewPage />
</ProtectedRoute>
}
/>
</Route> </Route>
<Route <Route
path="*" path="*"