Merge pull request #57 from Timur233/SOK-81_fixes

[SOK-81] Fixes
Timur233 · Dec 11, 2024 · e9a1a85 · e9a1a85
2 parents cd8871c + 93203ad
commit e9a1a85
Show file tree

Hide file tree

Showing 4 changed files with 412 additions and 355 deletions.
diff --git a/packages/client/src/pages/Leaderboard/components/User/User.scss b/packages/client/src/pages/Leaderboard/components/User/User.scss
@@ -6,7 +6,7 @@ $medal-colors: (
   // Gold
   2: #c0c0c0,
   // Silver
-  3: #cd7f32 // Bronze,,
+  3: #cd7f32 // Bronze
 );
 
 $c_item-border-main-color: #9d9b9b;

diff --git a/packages/client/src/pages/Main/Main.tsx b/packages/client/src/pages/Main/Main.tsx
@@ -43,20 +43,21 @@ export const Main = () => {
           </div>
 
           <div className="promo-page__actions">
-            {!userIsLogged && (
+            {userIsLogged.current ? (
+              <Button
+                className="promo-page__btn"
+                useFixWidth
+                onClick={() => navigate('/game')}
+                text="Играть"
+              />
+            ) : (
               <Button
                 className="promo-page__btn custom-button_blue"
                 useFixWidth
                 onClick={() => navigate('/sign-in')}
                 text="Вход / Регистрация"
               />
             )}
-            <Button
-              className="promo-page__btn"
-              useFixWidth
-              onClick={() => navigate('/game')}
-              text="Играть"
-            />
           </div>
         </div>
       </div>

diff --git a/packages/client/src/services/o-auth/YandexOAuth.tsx b/packages/client/src/services/o-auth/YandexOAuth.tsx
@@ -5,7 +5,8 @@ import { NavigateFunction } from 'react-router-dom'
 import { toast } from 'react-toastify'
 
 const BASE_URL = import.meta.env.VITE_AUTH_URL
-const REDIRECT_URI = import.meta.env.VITE_OAUTH_REDIRECTURL || 'http://localhost:3000'
+const REDIRECT_URI =
+  import.meta.env.VITE_OAUTH_REDIRECTURL || 'http://localhost:3000'
 const YANDEX_AUTH_LINK = 'https://oauth.yandex.ru/authorize'
 
 export class YandexOAuth {