Merge branch 'develop' into SOK-27_game-prototype

Timur233 · Oct 7, 2024 · 5bcb231 · 5bcb231
2 parents 6e5a0cb + f5937d3
commit 5bcb231
Show file tree

Hide file tree

Showing 60 changed files with 5,594 additions and 5,484 deletions.
diff --git a/.env.sample b/.env.sample
@@ -9,3 +9,4 @@ TRAEFIK_NETWORK_NAME=traefik_traefik
 DOCKER_BUILDKIT=1 #Build only stages required for target
 COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml
 VITE_AUTH_URL='https://ya-praktikum.tech/api/v2'
+VITE_SRC_URL='https://ya-praktikum.tech/api/v2/resources'
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/client/index.html b/packages/client/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/png" href="/favicon.png" />
 
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
@@ -15,6 +15,7 @@
   </head>
   <body>
     <div id="root"></div>
+    <div id="modal-root"></div>
     <script type="module" src="/src/main.tsx"></script>
   </body>
 </html>
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -12,14 +12,15 @@
   },
   "dependencies": {
     "dotenv": "^16.0.2",
-    "esbuild-linux-64": "^0.15.18",
     "eslint-config-prettier": "^8.5.0",
     "prettier": "^2.7.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-toastify": "^10.0.5"
   },
   "devDependencies": {
+    "react-redux": "^9.1.2",
+    "axios": "^1.7.7",
     "@reduxjs/toolkit": "^2.2.7",
     "@testing-library/react": "^13.3.0",
     "@types/jest": "^28.1.8",
@@ -28,19 +29,17 @@
     "@typescript-eslint/eslint-plugin": "^5.35.1",
     "@typescript-eslint/parser": "^5.35.1",
     "@vitejs/plugin-react": "^2.0.1",
-    "axios": "^1.7.7",
     "eslint": "^8.23.0",
     "jest": "^28",
     "jest-environment-jsdom": "^29.0.1",
     "lefthook": "^1.7.15",
-    "normalize": "^0.3.1",
     "prettier": "^2.7.1",
-    "react-redux": "^9.1.2",
-    "react-router-dom": "^6.26.2",
-    "sass": "^1.79.1",
     "ts-jest": "^28.0.8",
     "typescript": "^4.8.2",
-    "vite": "^3.0.7"
+    "vite": "^3.0.7",
+    "normalize": "^0.3.1",
+    "react-router-dom": "^6.26.2",
+    "sass": "^1.79.1"
   },
   "license": "MIT"
 }
diff --git a/packages/client/public/favicon.png b/packages/client/public/favicon.png
diff --git a/packages/client/public/sprite.symbol.svg b/packages/client/public/sprite.symbol.svg
diff --git a/packages/client/public/vite.svg b/packages/client/public/vite.svg
diff --git a/packages/client/src/app/App.tsx b/packages/client/src/app/App.tsx
@@ -1,19 +1,24 @@
-import AuthLayout from '@/layouts/AuthLayout/AuthLayout'
+import { createBrowserRouter, RouterProvider } from 'react-router-dom'
+import RootLayout from '@/layouts/RootLayout/RootLayout'
 import PrivateLayout from '@/layouts/PrivateLayout/PrivateLayout'
+import AuthLayout from '@/layouts/AuthLayout/AuthLayout'
 import PublicLayout from '@/layouts/PublicLayout/PublicLayout'
 import RootLayout from '@/layouts/RootLayout/RootLayout'
 import { Error } from '@/pages/Error/Error'
 import { Forum } from '@/pages/Forum/Forum'
 import { GamePage } from '@/pages/Game/Game'
 import { Leaderboard } from '@/pages/Leaderboard/Leaderboard'
 import { Main } from '@/pages/Main/Main'
-import { ChangePassword } from '@/pages/Profile/ChangePassword'
-import { ProfileEdit } from '@/pages/Profile/Edit'
-import { Profile } from '@/pages/Profile/Profile'
 import { SignIn } from '@/pages/SignIn/SignIn'
 import { SignUp } from '@/pages/SignUp/SignUp'
+import { Game } from '@/pages/Game/Game'
+import { Forum } from '@/pages/Forum/Forum'
+import { Error } from '@/pages/Error/Error'
 import { Thread } from '@/pages/Thread/Thread'
-import { createBrowserRouter, RouterProvider } from 'react-router-dom'
+import { Leaderboard } from '@/pages/Leaderboard/Leaderboard'
+import { Profile } from '@/pages/Profile/Profile'
+import { ChangePassword } from '@/pages/Profile/ChangePassword'
+import { SvgSprite } from '@/components/ui/SvgSprite/SvgSprite'
 
 const routerConfig = createBrowserRouter([
   {
@@ -52,10 +57,6 @@ const routerConfig = createBrowserRouter([
             path: '/profile',
             element: <Profile />,
           },
-          {
-            path: '/profile/edit',
-            element: <ProfileEdit />,
-          },
           {
             path: '/profile/change-password',
             element: <ChangePassword />,
@@ -80,7 +81,12 @@ const routerConfig = createBrowserRouter([
 ])
 
 function App() {
-  return <RouterProvider router={routerConfig} />
+  return (
+    <>
+      <RouterProvider router={routerConfig} />
+      <SvgSprite url={'/sprite.symbol.svg'} />
+    </>
+  )
 }
 
 export default App
diff --git a/packages/client/src/assets/images/avatar-placeholder.png b/packages/client/src/assets/images/avatar-placeholder.png
diff --git a/packages/client/src/assets/images/game-info.jpg b/packages/client/src/assets/images/game-info.jpg
diff --git a/packages/client/src/assets/images/game-over.png b/packages/client/src/assets/images/game-over.png
diff --git a/packages/client/src/assets/images/ground.png b/packages/client/src/assets/images/ground.png
diff --git a/packages/client/src/assets/images/loader.png b/packages/client/src/assets/images/loader.png
diff --git a/packages/client/src/assets/images/profile-background-right.png b/packages/client/src/assets/images/profile-background-right.png