fsd: moved app-related code to app

azakharo · Jan 2, 2025 · 7c5ee36 · 7c5ee36
1 parent 4d0061c
commit 7c5ee36
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/index.html b/index.html
@@ -16,6 +16,6 @@
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
-    <script type="module" src="/src/index.tsx"></script>
+    <script type="module" src="/src/app/main.tsx"></script>
   </body>
 </html>
diff --git a/src/__mocks__/fileMock.ts b/src/__mocks__/fileMock.ts
diff --git a/src/App.tsx → src/app/App.tsx b/src/App.tsx → src/app/App.tsx
@@ -2,8 +2,8 @@ import {memo, useEffect} from 'react';
 import {BrowserRouter} from 'react-router-dom';
 import {createTheme, ThemeProvider} from '@mui/material/styles';
 
-import AppGlobalStyles from 'src/AppGlobalStyles';
-import AppRoutes from 'src/AppRoutes';
+import AppGlobalStyles from './GlobalStyles';
+import AppRoutes from 'src/app/Routes';
 import {AuthProvider} from 'src/contexts/AuthContext';
 import {isProduction} from 'src/utils/env';
 

diff --git a/src/AppGlobalStyles.tsx → src/app/GlobalStyles.tsx b/src/AppGlobalStyles.tsx → src/app/GlobalStyles.tsx
@@ -1,8 +1,8 @@
-import GlobalStyles from '@mui/material/GlobalStyles';
+import MuiGlobalStyles from '@mui/material/GlobalStyles';
 
-const AppGlobalStyles = (): JSX.Element => {
+const GlobalStyles = (): JSX.Element => {
   return (
-    <GlobalStyles
+    <MuiGlobalStyles
       styles={{
         '*': {
           boxSizing: 'border-box',
@@ -29,4 +29,4 @@ const AppGlobalStyles = (): JSX.Element => {
   );
 };
 
-export default AppGlobalStyles;
+export default GlobalStyles;
diff --git a/src/AppRoutes.tsx → src/app/Routes.tsx b/src/AppRoutes.tsx → src/app/Routes.tsx
@@ -1,29 +1,29 @@
 import {FC, memo} from 'react';
-import {Navigate, Route, Routes} from 'react-router-dom';
+import {Navigate, Route, Routes as ReactRoutes} from 'react-router-dom';
 
 import {ROUTE__LOGIN, ROUTE__MAIN} from 'src/constants/routes';
 import useAuth from 'src/hooks/useAuth';
 import Login from 'src/pages/Login';
 import Main from 'src/pages/Main';
 
-const AppRoutes: FC = () => {
+const Routes: FC = () => {
   const {isAuthenticated} = useAuth();
 
   if (!isAuthenticated) {
     return (
-      <Routes>
+      <ReactRoutes>
         <Route path={ROUTE__LOGIN} element={<Login />} />
         <Route path="*" element={<Navigate to={ROUTE__LOGIN} replace />} />
-      </Routes>
+      </ReactRoutes>
     );
   }
 
   return (
-    <Routes>
+    <ReactRoutes>
       <Route path={ROUTE__MAIN} element={<Main />} />
       <Route path="*" element={<Navigate to={ROUTE__MAIN} replace />} />
-    </Routes>
+    </ReactRoutes>
   );
 };
 
-export default memo(AppRoutes);
+export default memo(Routes);
diff --git a/src/index.tsx → src/app/main.tsx b/src/index.tsx → src/app/main.tsx