reordered modules

src/App.tsx

@@ -1,23 +1,23 @@
 import React, { useEffect, useState } from "react";
-import { useController } from "@hooks/useController";
-import { InjectionToken } from "./constants/injection-token";
+import { bootstrap } from "@/utils/bootstrap";
 
 type PropsType = {
   children: React.ReactNode;
 };
 
 const App = ({ children }: PropsType) => {
-  const [isAuthChecked, setIsAuthChecked] = useState<boolean>(false);
-  const { appReady } = useController<IAuthController>(
-    InjectionToken.IAuthController
-  );
+  const [appReady, setAppReady] = useState<boolean>(false);
 
   useEffect(() => {
-    appReady();
-    setIsAuthChecked(true);
+    const boot = async () => {
+      const res = await bootstrap();
+      setAppReady(res);
+    };
+
+    boot();
   }, []);
 
-  if (!isAuthChecked) {
+  if (!appReady) {
     return <h1>Loading...</h1>;
   }
 

src/index.tsx

@@ -2,13 +2,10 @@ import "reflect-metadata";
 import React from "react";
 import { createRoot } from "react-dom/client";
 
+import { AppRoutes } from "@routes/AppRoutes";
 import App from "@/App";
 
 import "@/index.css";
-import { AppRoutes } from "./modules/shared/routes/components/AppRoutes";
-import { injectDeps } from "./utils/bootstrap";
-
-injectDeps();
 
 const root = createRoot(document.getElementById("root")!);
 

src/modules/shared/routes/components/AppRoutes.tsx → src/routes/AppRoutes.tsx

@@ -1,11 +1,11 @@
 import React from "react";
 import { Navigate, Route, Routes } from "react-router-dom";
 
-import { CustomBrowserRouter } from "./CustomRouter";
+import { CustomBrowserRouter } from "@routes/CustomRouter";
 import { Login } from "@/modules/shared/auth/components/Login";
 import { ProtectedRoute } from "./ProtectedRoute";
 import { Game } from "@/modules/game/components/Game";
-import { Layout } from "@/modules/shared/Layout";
+import { Layout } from "@/Layout";
 
 export const AppRoutes = () => {
   return (

src/utils/bootstrap.ts

@@ -1,7 +1,7 @@
 import { container, Lifecycle } from "tsyringe";
 
 import { InjectionToken } from "@/constants/injection-token";
-import { HistoryService } from "@/modules/shared/routes/HistoryService";
+import { HistoryService } from "@/modules/shared/history/HistoryService";
 import { useGameStore } from "@/modules/game/useGameStore";
 import { GameService } from "@/modules/game/GameService";
 import { GameController } from "@/modules/game/GameController";
@@ -55,3 +55,22 @@ export function injectDeps() {
     useValue: useGameStore,
   });
 }
+
+const initServices = () => {
+  const authService = container.resolve<IAuthService>(
+    InjectionToken.IAuthService
+  );
+
+  authService.setAuthStateOnAppReady();
+};
+
+export const bootstrap = async () => {
+  try {
+    injectDeps();
+    initServices();
+
+    return true;
+  } catch (e) {
+    throw new Error(e);
+  }
+};

tsconfig.json

@@ -14,7 +14,8 @@
       "@/*": ["*"],
       "@hooks/*": ["utils/hooks/*"],
       "@history": ["utils/history"],
-      "@helpers": ["utils/helpers"]
+      "@helpers": ["utils/helpers"],
+      "@routes/*": ["routes/*"]
     },
     "typeRoots": ["@types", "node_modules/@types"]
   },