From f55485136299c4f143d97baf96ee7fe70148985d Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Sun, 11 Sep 2022 17:56:31 +0300 Subject: [PATCH] update: QA fixes --- .../assets/images/logos}/fulgur_logo.svg | 0 src/Components/Ads/Fulgur/Fulgur.tsx | 3 +-- .../Projects/pages/ExplorePage/ExplorePage.tsx | 4 ++-- .../Tournaments/pages/EventsPage/EventsPage.tsx | 6 +++++- .../pages/MakersPage/MakerCard/MakerCard.tsx | 4 ++-- .../pages/OverviewPage/FAQsSection/FAQsSection.tsx | 3 +++ .../OverviewPage/RegisterCard/RegisterCard.tsx | 13 ++++--------- .../ConfirmAccount/ConfirmAccount.tsx | 10 +++++----- .../RegisterationModals/LoginModal/LoginModal.tsx | 6 +++--- .../RegistrationDetails/RegistrationDetails.tsx | 6 +++--- .../RegistrationSuccess/RegistrationSuccess.tsx | 14 +++++++------- .../Navigation/Navigation.tsx | 2 +- src/styles/index.scss | 2 +- src/styles/tw.scss | 2 +- 14 files changed, 38 insertions(+), 37 deletions(-) rename {src/Components/Ads/Fulgur => public/assets/images/logos}/fulgur_logo.svg (100%) diff --git a/src/Components/Ads/Fulgur/fulgur_logo.svg b/public/assets/images/logos/fulgur_logo.svg similarity index 100% rename from src/Components/Ads/Fulgur/fulgur_logo.svg rename to public/assets/images/logos/fulgur_logo.svg diff --git a/src/Components/Ads/Fulgur/Fulgur.tsx b/src/Components/Ads/Fulgur/Fulgur.tsx index 10ae079..5328196 100644 --- a/src/Components/Ads/Fulgur/Fulgur.tsx +++ b/src/Components/Ads/Fulgur/Fulgur.tsx @@ -1,5 +1,4 @@ import Button from 'src/Components/Button/Button' -import Logo from './fulgur_logo.svg' import Lines from './lines-h.png' @@ -8,7 +7,7 @@ export default function Fulgur() {
- Fulgur Ventures Logo + Fulgur Ventures Logo

Turn your hackathon project into a startup

Schedule an office hour with Fulgur Ventures

diff --git a/src/features/Projects/pages/ExplorePage/ExplorePage.tsx b/src/features/Projects/pages/ExplorePage/ExplorePage.tsx index 27053cd..ec3d04c 100644 --- a/src/features/Projects/pages/ExplorePage/ExplorePage.tsx +++ b/src/features/Projects/pages/ExplorePage/ExplorePage.tsx @@ -6,7 +6,7 @@ import Categories from "./Categories/Categories"; export default function ExplorePage() { return ( - <> +
{`Explore Lightning Products`} @@ -22,6 +22,6 @@ export default function ExplorePage() {
- +
) } diff --git a/src/features/Tournaments/pages/EventsPage/EventsPage.tsx b/src/features/Tournaments/pages/EventsPage/EventsPage.tsx index c721bd4..95977ff 100644 --- a/src/features/Tournaments/pages/EventsPage/EventsPage.tsx +++ b/src/features/Tournaments/pages/EventsPage/EventsPage.tsx @@ -1,4 +1,5 @@ import { useState } from 'react' +import Button from 'src/Components/Button/Button'; import { TournamentEventTypeEnum } from 'src/graphql' import { useTournament } from '../TournamentDetailsPage/TournamentDetailsContext'; import EventCard from './EventCard/EventCard'; @@ -12,7 +13,10 @@ export default function EventsPage() { return (
-

Events 📆 ({events_count})

+
+

Events 📆 ({events_count})

+ +
🚦 Hacking status

diff --git a/src/features/Tournaments/pages/OverviewPage/FAQsSection/FAQsSection.tsx b/src/features/Tournaments/pages/OverviewPage/FAQsSection/FAQsSection.tsx index 426037c..8807968 100644 --- a/src/features/Tournaments/pages/OverviewPage/FAQsSection/FAQsSection.tsx +++ b/src/features/Tournaments/pages/OverviewPage/FAQsSection/FAQsSection.tsx @@ -17,6 +17,9 @@ export default function FAQsSection({ faqs }: Props) {

FAQs

({ heading: faq.question, content:
+
{makers_count > 2 &&

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

)} + {makers_count} makers

} - +
{counter.isExpired ? @@ -77,14 +77,9 @@ export default function RegisterCard({ makers_count, start_date, avatars, isRegi

- Sponsors + Sponsored by

-
- - - - -
+ Fulgur Ventures Logo
) diff --git a/src/features/Tournaments/pages/OverviewPage/RegisterationModals/ConfirmAccount/ConfirmAccount.tsx b/src/features/Tournaments/pages/OverviewPage/RegisterationModals/ConfirmAccount/ConfirmAccount.tsx index 9ea7762..6fbd69b 100644 --- a/src/features/Tournaments/pages/OverviewPage/RegisterationModals/ConfirmAccount/ConfirmAccount.tsx +++ b/src/features/Tournaments/pages/OverviewPage/RegisterationModals/ConfirmAccount/ConfirmAccount.tsx @@ -40,15 +40,15 @@ export default function ConfirmAccount({ onClose, direction, tournamentId, ...pr exit='exit' className="modal-card max-w-[442px] rounded-xl relative" > -
- +
+

Register for tournament


-
+
-
-

{me.name}

+
+

{me.name}

{me.jobTitle}

diff --git a/src/features/Tournaments/pages/OverviewPage/RegisterationModals/LoginModal/LoginModal.tsx b/src/features/Tournaments/pages/OverviewPage/RegisterationModals/LoginModal/LoginModal.tsx index 7c68e50..71bf657 100644 --- a/src/features/Tournaments/pages/OverviewPage/RegisterationModals/LoginModal/LoginModal.tsx +++ b/src/features/Tournaments/pages/OverviewPage/RegisterationModals/LoginModal/LoginModal.tsx @@ -171,12 +171,12 @@ export default function LinkingAccountModal({ onClose, direction, tournamentId, exit='exit' className="modal-card max-w-[442px] rounded-xl relative" > -
- +
+

Connect ⚡️ your maker profile


-
+
{content}
diff --git a/src/features/Tournaments/pages/OverviewPage/RegisterationModals/RegistrationDetails/RegistrationDetails.tsx b/src/features/Tournaments/pages/OverviewPage/RegisterationModals/RegistrationDetails/RegistrationDetails.tsx index 76e8348..6ee6298 100644 --- a/src/features/Tournaments/pages/OverviewPage/RegisterationModals/RegistrationDetails/RegistrationDetails.tsx +++ b/src/features/Tournaments/pages/OverviewPage/RegisterationModals/RegistrationDetails/RegistrationDetails.tsx @@ -113,12 +113,12 @@ export default function RegistrationDetails({ onClose, direction, ...props }: Pr exit='exit' className="modal-card max-w-[442px] rounded-xl relative " > -
- +
+

Register for tournament


-
+

Please provide us with some additional details below.

diff --git a/src/features/Tournaments/pages/OverviewPage/RegisterationModals/RegistrationSuccess/RegistrationSuccess.tsx b/src/features/Tournaments/pages/OverviewPage/RegisterationModals/RegistrationSuccess/RegistrationSuccess.tsx index a267c32..ed74936 100644 --- a/src/features/Tournaments/pages/OverviewPage/RegisterationModals/RegistrationSuccess/RegistrationSuccess.tsx +++ b/src/features/Tournaments/pages/OverviewPage/RegisterationModals/RegistrationSuccess/RegistrationSuccess.tsx @@ -30,15 +30,15 @@ export default function RegistrationSuccess({ onClose, direction, ...props }: Pr exit='exit' className="modal-card max-w-[442px] rounded-xl relative" > -
- +
+

Registration succeeded!! ✅


-
+
-
-

{me.name}

+
+

{me.name}

{me.jobTitle}

@@ -61,8 +61,8 @@ export default function RegistrationSuccess({ onClose, direction, ...props }: Pr
- - + +
diff --git a/src/features/Tournaments/pages/TournamentDetailsPage/Navigation/Navigation.tsx b/src/features/Tournaments/pages/TournamentDetailsPage/Navigation/Navigation.tsx index bd3cec5..ce8e79d 100644 --- a/src/features/Tournaments/pages/TournamentDetailsPage/Navigation/Navigation.tsx +++ b/src/features/Tournaments/pages/TournamentDetailsPage/Navigation/Navigation.tsx @@ -44,7 +44,7 @@ export default function Navigation() { ], [tournamentDetails.events_count, tournamentDetails.makers_count]) return ( -
+
diff --git a/src/styles/index.scss b/src/styles/index.scss index 74fe6ac..a2439b5 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -12,7 +12,7 @@ html { body { overflow-x: hidden; - background-color: #ffffff; + background-color: #f9fafb; } .content-container, diff --git a/src/styles/tw.scss b/src/styles/tw.scss index 18b2141..896cb1b 100644 --- a/src/styles/tw.scss +++ b/src/styles/tw.scss @@ -16,7 +16,7 @@ } .input-wrapper { - @apply relative w-full border border-gray-300 rounded-12 flex focus-within:outline-primary-400 focus-within:border-primary-300 focus-within:ring focus-within:ring-primary-200 focus-within:ring-opacity-50; + @apply relative w-full border bg-white border-gray-300 rounded-12 flex focus-within:outline-primary-400 focus-within:border-primary-300 focus-within:ring focus-within:ring-primary-200 focus-within:ring-opacity-50; } .input-text {