From a35a4fd6482131a7c2d197d25276b2d6f0f8770d Mon Sep 17 00:00:00 2001
From: Cristhian Zanforlin Lousa <cristhian.lousa@gmail.com>
Date: Thu, 17 Aug 2023 19:23:52 -0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(App.tsx):=20set=20loading=20?=
 =?UTF-8?q?state=20to=20false=20after=20successful=20auto=20login=20or=20g?=
 =?UTF-8?q?etting=20logged=20user=20data=20=F0=9F=90=9B=20fix(routes.tsx):?=
 =?UTF-8?q?=20remove=20duplicate=20import=20of=20ApiKeysPage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/src/App.tsx    |  3 +++
 src/frontend/src/routes.tsx | 15 +++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx
index 6c44bd097..a691472c2 100644
--- a/src/frontend/src/App.tsx
+++ b/src/frontend/src/App.tsx
@@ -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) => {});
         }
diff --git a/src/frontend/src/routes.tsx b/src/frontend/src/routes.tsx
index a2c487b87..cd8f86c9a 100644
--- a/src/frontend/src/routes.tsx
+++ b/src/frontend/src/routes.tsx
@@ -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="*"