Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SOK-81] Fixes #57

Merged
merged 1 commit into from
Dec 11, 2024
Merged

[SOK-81] Fixes #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/client/src/pages/Leaderboard/components/User/User.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ $medal-colors: (
// Gold
2: #c0c0c0,
// Silver
3: #cd7f32 // Bronze,,
3: #cd7f32 // Bronze
);

$c_item-border-main-color: #9d9b9b;
Expand Down
15 changes: 8 additions & 7 deletions packages/client/src/pages/Main/Main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion packages/client/src/services/o-auth/YandexOAuth.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading
Loading