From 26faeafbfb621ba76f4054f7a88a046ec86147af Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Mon, 12 Sep 2022 15:19:20 +0300 Subject: [PATCH] update: final QA fixes --- src/Components/Button/Button.tsx | 2 +- .../pages/HackathonsPage/HackathonsPage.tsx | 33 +++++++++---------- .../pages/ExplorePage/Header/Header.tsx | 31 ++++++++++++----- .../RegisterCard/RegisterCard.tsx | 2 +- .../TournamentDetailsPage/Header/Header.tsx | 2 +- src/styles/shared.scss | 2 +- 6 files changed, 42 insertions(+), 30 deletions(-) diff --git a/src/Components/Button/Button.tsx b/src/Components/Button/Button.tsx index e01b929..81fa3c1 100644 --- a/src/Components/Button/Button.tsx +++ b/src/Components/Button/Button.tsx @@ -89,7 +89,7 @@ const Button = React.forwardRef(({ color = 'white', ${variant === 'fill' ? btnStylesFill[color] : btnStylesOutline[color]} ${isLoading && disableOnLoading && 'bg-opacity-70 pointer-events-none'} ${fullWidth && 'w-full'} - ${disabled && 'opacity-40 pointer-events-none'} + ${disabled && 'opacity-90 pointer-events-none'} `; diff --git a/src/features/Hackathons/pages/HackathonsPage/HackathonsPage.tsx b/src/features/Hackathons/pages/HackathonsPage/HackathonsPage.tsx index 7b0914c..a69618f 100644 --- a/src/features/Hackathons/pages/HackathonsPage/HackathonsPage.tsx +++ b/src/features/Hackathons/pages/HackathonsPage/HackathonsPage.tsx @@ -10,6 +10,7 @@ import { Fulgur } from 'src/Components/Ads/Fulgur' import { IoLocationOutline } from 'react-icons/io5' import { Link } from 'react-router-dom' import { createRoute } from 'src/utils/routing' +import { bannerData } from 'src/features/Projects/pages/ExplorePage/Header/Header' export default function HackathonsPage() { @@ -33,24 +34,22 @@ export default function HackathonsPage() {
-
- -
- -
-
-

Legends of Lightning ⚡️ Tournament

-

1st Oct - 31st Nov, 2022

-
-

- Online -

+
+
+ +
+
+ {bannerData.title}
- + + +

Hackathons 🏆

diff --git a/src/features/Projects/pages/ExplorePage/Header/Header.tsx b/src/features/Projects/pages/ExplorePage/Header/Header.tsx index 3a08965..5eace51 100644 --- a/src/features/Projects/pages/ExplorePage/Header/Header.tsx +++ b/src/features/Projects/pages/ExplorePage/Header/Header.tsx @@ -7,6 +7,19 @@ import useEmblaCarousel from 'embla-carousel-react' import { useCallback, useEffect, useState } from "react"; import { createRoute } from "src/utils/routing"; +export const bannerData = { + title: + <> +

Legends of Lightning ⚡️ Tournament

+

1st Oct - 31st Nov, 2022

+ , + img: "https://imagedelivery.net/wyrwp3c-j0gDDUWgnE7lig/1d5d2c86-fe46-4478-6909-bb3c425c0d00/public", + link: { + content: "Register Now", + url: createRoute({ type: "tournament", id: 1, tab: 'overview' }), + }, +} + const headerLinks = [ { title: @@ -62,22 +75,22 @@ export default function Header() {
-
+
-
+
- {headerLinks[0].title} + {bannerData.title}
-
-
+ {/*
{headerLinks[1].link.content} -
+
*/}
diff --git a/src/features/Tournaments/pages/OverviewPage/RegisterCard/RegisterCard.tsx b/src/features/Tournaments/pages/OverviewPage/RegisterCard/RegisterCard.tsx index cfe200c..214f014 100644 --- a/src/features/Tournaments/pages/OverviewPage/RegisterCard/RegisterCard.tsx +++ b/src/features/Tournaments/pages/OverviewPage/RegisterCard/RegisterCard.tsx @@ -45,7 +45,7 @@ export default function RegisterCard({ makers_count, start_date, avatars, isRegi return ( - +
{makers_count > 2 &&

{avatars.map((img, idx) =>

)} diff --git a/src/features/Tournaments/pages/TournamentDetailsPage/Header/Header.tsx b/src/features/Tournaments/pages/TournamentDetailsPage/Header/Header.tsx index ace5b32..7071565 100644 --- a/src/features/Tournaments/pages/TournamentDetailsPage/Header/Header.tsx +++ b/src/features/Tournaments/pages/TournamentDetailsPage/Header/Header.tsx @@ -15,7 +15,7 @@ export default function Header() { {tournamentDetails.title} Tournament -
+
diff --git a/src/styles/shared.scss b/src/styles/shared.scss index 6a03db4..8e4caf6 100644 --- a/src/styles/shared.scss +++ b/src/styles/shared.scss @@ -10,7 +10,7 @@ } button[disabled] { - opacity: 0.5; + opacity: 0.8; pointer-events: none; }