From 0365419fb733464f084d5c1d459dc8d58dc6edf3 Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Mon, 19 Sep 2022 13:07:45 +0300 Subject: [PATCH 01/19] feat: update feed page navs, header image color, join discord card image --- public/assets/images/join-discord-card.jpg | Bin 0 -> 27601 bytes src/Components/Navbar/NavDesktop.tsx | 12 +++-- src/Components/Navbar/NavMobile.tsx | 12 ++++- .../pages/HackathonsPage/HackathonsPage.tsx | 26 +++++------ .../Posts/pages/FeedPage/FeedPage.tsx | 41 +++++++++--------- .../pages/ExplorePage/Header/Header.tsx | 34 +++++---------- src/utils/routing/routes.ts | 4 +- 7 files changed, 64 insertions(+), 65 deletions(-) create mode 100644 public/assets/images/join-discord-card.jpg diff --git a/public/assets/images/join-discord-card.jpg b/public/assets/images/join-discord-card.jpg new file mode 100644 index 0000000000000000000000000000000000000000..f5eabe89ca23c0dff2606787bdd165506dbbdce9 GIT binary patch literal 27601 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 -
  • +
  • + + Events + +
    • + {/*
  • - {/* */} - ✍🏼 + ✍🏼

    @@ -121,7 +125,7 @@ export default function NavDesktop() {

    -
    • + */}
    • -
  • +
  • + toggleDrawerOpen(false)} + className='text-body4 font-bold hover:text-primary-600'> + Events + +
    • + {/*
    • + */}
  • -
    - -
    -
    - {bannerData.title} + +
    + +
    +
    + {bannerData.title} +
    - - -
    +

    Hackathons 🏆

    diff --git a/src/features/Posts/pages/FeedPage/FeedPage.tsx b/src/features/Posts/pages/FeedPage/FeedPage.tsx index 45c15ba..3a7ced6 100644 --- a/src/features/Posts/pages/FeedPage/FeedPage.tsx +++ b/src/features/Posts/pages/FeedPage/FeedPage.tsx @@ -14,7 +14,9 @@ import { FaDiscord } from 'react-icons/fa' import { FiArrowRight } from 'react-icons/fi' import { capitalize } from 'src/utils/helperFunctions' import { bannerData } from 'src/features/Projects/pages/ExplorePage/Header/Header' -import { PAGES_ROUTES } from 'src/utils/routing' +import { createRoute, PAGES_ROUTES } from 'src/utils/routing' +import { Link } from 'react-router-dom' +import { IoLocationOutline } from 'react-icons/io5' export default function FeedPage() { @@ -47,21 +49,19 @@ export default function FeedPage() {
    -
    - -
    -
    - {bannerData.title} + +
    + +
    +
    + {bannerData.title} +
    - - -
    +
    {tagFilter &&

    @@ -70,10 +70,8 @@ export default function FeedPage() { {tagFilter.title}

    }

    { - tagFilter ? - <>{tagFilter.icon} {capitalize(tagFilter.title)} - : - "Stories ✍🏼" + tagFilter && + <>{tagFilter.icon} {capitalize(tagFilter.title)} }

    @@ -91,6 +89,7 @@ export default function FeedPage() {
    diff --git a/src/utils/routing/routes.ts b/src/utils/routing/routes.ts index 1d2f178..c53a03e 100644 --- a/src/utils/routing/routes.ts +++ b/src/utils/routing/routes.ts @@ -37,7 +37,7 @@ type RouteOptions = | { type: "tournament", id: string | number - tab: 'overview' | 'events' | 'makers' | 'projects' + tab?: 'overview' | 'events' | 'makers' | 'projects' } export function createRoute(options: RouteOptions) { @@ -72,7 +72,7 @@ export function createRoute(options: RouteOptions) { if (options.type === 'tournament') - return `/tournaments/${options.id}/${options.tab}` + return `/tournaments/${options.id}` + (options.tab ? `/${options.tab}` : "") return "" } From 7b5a6738e9bbe55858d628a8cb59a0d489951423 Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Mon, 19 Sep 2022 13:14:34 +0300 Subject: [PATCH 02/19] update: prizes section --- .../PrizesSection/PrizesSection.tsx | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/features/Tournaments/pages/OverviewPage/PrizesSection/PrizesSection.tsx b/src/features/Tournaments/pages/OverviewPage/PrizesSection/PrizesSection.tsx index cac98e9..599053d 100644 --- a/src/features/Tournaments/pages/OverviewPage/PrizesSection/PrizesSection.tsx +++ b/src/features/Tournaments/pages/OverviewPage/PrizesSection/PrizesSection.tsx @@ -28,7 +28,21 @@ export default function PrizesSection({ prizes }: Props) {

    {track.prizes[0].amount}

    } - {/* Four Prizez */} + + {/* Two Prizes */} + {track.prizes.length === 2 && +
    +
    +

    {track.prizes[0].title}

    +

    {track.prizes[0].amount}

    +
    +
    +

    {track.prizes[1].title}

    +

    {track.prizes[1].amount}

    +
    +
    + } + {/* Four Prizes */} {track.prizes.length === 4 &&
    {track.prizes.map((prize, idx) =>
    @@ -69,6 +83,11 @@ const data = { id: 1, title: "the legend", amount: "1 BTC" + }, + { + id: 1, + title: "Runners UP x2", + amount: "0.5 BTC" } ] }, From 51c2cc590a8383dd563a2951ad17c45b1d715e51 Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Mon, 19 Sep 2022 13:24:52 +0300 Subject: [PATCH 03/19] fix: responsiveness for prizes section --- .../pages/OverviewPage/PrizesSection/PrizesSection.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/features/Tournaments/pages/OverviewPage/PrizesSection/PrizesSection.tsx b/src/features/Tournaments/pages/OverviewPage/PrizesSection/PrizesSection.tsx index 599053d..b1da304 100644 --- a/src/features/Tournaments/pages/OverviewPage/PrizesSection/PrizesSection.tsx +++ b/src/features/Tournaments/pages/OverviewPage/PrizesSection/PrizesSection.tsx @@ -1,4 +1,3 @@ -import React from 'react' import { Tournament } from 'src/graphql' import styles from './styles.module.scss' @@ -20,7 +19,7 @@ export default function PrizesSection({ prizes }: Props) {

    {track.title}

    {track.description}

    -
    +
    {/* One Prize */} {track.prizes.length === 1 &&
    @@ -31,7 +30,7 @@ export default function PrizesSection({ prizes }: Props) { {/* Two Prizes */} {track.prizes.length === 2 && -
    +

    {track.prizes[0].title}

    {track.prizes[0].amount}

    @@ -44,7 +43,7 @@ export default function PrizesSection({ prizes }: Props) { } {/* Four Prizes */} {track.prizes.length === 4 && -
    +
    {track.prizes.map((prize, idx) =>

    {prize.title}

    {prize.amount}

    From 160701a262faa048622132631314f583a1f075a6 Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Mon, 19 Sep 2022 14:13:59 +0300 Subject: [PATCH 04/19] update: discord card on feed page, events page title --- public/assets/icons/join-discord.svg | 4 ++ .../pages/HackathonsPage/HackathonsPage.tsx | 2 +- .../Posts/pages/FeedPage/FeedPage.tsx | 40 +++++++++---------- 3 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 public/assets/icons/join-discord.svg diff --git a/public/assets/icons/join-discord.svg b/public/assets/icons/join-discord.svg new file mode 100644 index 0000000..da52ce2 --- /dev/null +++ b/public/assets/icons/join-discord.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/features/Hackathons/pages/HackathonsPage/HackathonsPage.tsx b/src/features/Hackathons/pages/HackathonsPage/HackathonsPage.tsx index d5aa06d..62760cf 100644 --- a/src/features/Hackathons/pages/HackathonsPage/HackathonsPage.tsx +++ b/src/features/Hackathons/pages/HackathonsPage/HackathonsPage.tsx @@ -49,7 +49,7 @@ export default function HackathonsPage() {
    -

    Hackathons 🏆

    +

    {sortByFilter ? sortByFilter : "All"} Events

    - {`Bolt.Fun Stories`} - + {`Bolt.Fun`} +
    - From 386413eb7f1608a7d2d48cc23739639304839bd1 Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Mon, 19 Sep 2022 15:15:42 +0300 Subject: [PATCH 05/19] update: partners --- .../RegisterCard/RegisterCard.tsx | 42 ++++++++++++++++++- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/src/features/Tournaments/pages/OverviewPage/RegisterCard/RegisterCard.tsx b/src/features/Tournaments/pages/OverviewPage/RegisterCard/RegisterCard.tsx index 20e7d22..641d97d 100644 --- a/src/features/Tournaments/pages/OverviewPage/RegisterCard/RegisterCard.tsx +++ b/src/features/Tournaments/pages/OverviewPage/RegisterCard/RegisterCard.tsx @@ -79,10 +79,48 @@ export default function RegisterCard({ makers_count, start_date, avatars, isRegi

    - Sponsored by + In partnership with

    - Fulgur Ventures Logo +
    + {partners.map((p, idx) => )} +
    ) } + +const partners = [ + { + link: "https://fulgur.ventures/", + image: "https://i.ibb.co/9gZFQ4d/fulgur.webp", + }, + { + link: "https://2022.tabconf.com/", + image: "https://i.ibb.co/zFGVqvV/tab-conf.jpg", + }, + { + link: "https://adoptingbitcoin.org/2022/", + image: "https://i.ibb.co/HdvRbxQ/Screenshot-2022-09-14-at-17-06-33.jpg", + }, + { + link: "https://breez.technology/", + image: "https://i.ibb.co/6stx8tC/breez.webp", + }, + { + link: "https://www.afrobitcoin.org/", + image: "https://i.ibb.co/qDZYrGz/Screenshot-2022-09-14-at-17-03-47.jpg", + }, + { + link: "https://opensats.org/", + image: "https://i.ibb.co/b5y29TL/open-sats.jpg", + }, + { + link: "https://bitcoin.design/", + image: "https://i.ibb.co/cgY6zy2/bitcoin-design.jpg", + }, + { + link: "https://geyser.fund/", + image: "https://i.ibb.co/tp6L5bt/geyser.jpg", + }, +] + From e706b875f19df7f7d943d1e46cf458f6486c1808 Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Mon, 19 Sep 2022 15:20:03 +0300 Subject: [PATCH 06/19] update: partners link --- .../RegisterCard/RegisterCard.tsx | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/features/Tournaments/pages/OverviewPage/RegisterCard/RegisterCard.tsx b/src/features/Tournaments/pages/OverviewPage/RegisterCard/RegisterCard.tsx index 641d97d..1ae9695 100644 --- a/src/features/Tournaments/pages/OverviewPage/RegisterCard/RegisterCard.tsx +++ b/src/features/Tournaments/pages/OverviewPage/RegisterCard/RegisterCard.tsx @@ -94,6 +94,18 @@ const partners = [ link: "https://fulgur.ventures/", image: "https://i.ibb.co/9gZFQ4d/fulgur.webp", }, + { + link: "https://breez.technology/", + image: "https://i.ibb.co/6stx8tC/breez.webp", + }, + { + link: "https://bitcoin.design/", + image: "https://i.ibb.co/cgY6zy2/bitcoin-design.jpg", + }, + { + link: "https://www.afrobitcoin.org/", + image: "https://i.ibb.co/qDZYrGz/Screenshot-2022-09-14-at-17-03-47.jpg", + }, { link: "https://2022.tabconf.com/", image: "https://i.ibb.co/zFGVqvV/tab-conf.jpg", @@ -103,24 +115,12 @@ const partners = [ image: "https://i.ibb.co/HdvRbxQ/Screenshot-2022-09-14-at-17-06-33.jpg", }, { - link: "https://breez.technology/", - image: "https://i.ibb.co/6stx8tC/breez.webp", - }, - { - link: "https://www.afrobitcoin.org/", - image: "https://i.ibb.co/qDZYrGz/Screenshot-2022-09-14-at-17-03-47.jpg", + link: "https://geyser.fund/", + image: "https://i.ibb.co/tp6L5bt/geyser.jpg", }, { link: "https://opensats.org/", image: "https://i.ibb.co/b5y29TL/open-sats.jpg", }, - { - link: "https://bitcoin.design/", - image: "https://i.ibb.co/cgY6zy2/bitcoin-design.jpg", - }, - { - link: "https://geyser.fund/", - image: "https://i.ibb.co/tp6L5bt/geyser.jpg", - }, ] From c544d6965460bfc921933e7659ea1b99b5569985 Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Mon, 19 Sep 2022 15:23:26 +0300 Subject: [PATCH 07/19] fix: banner link --- .../Hackathons/pages/HackathonsPage/HackathonsPage.tsx | 2 +- src/features/Posts/pages/FeedPage/FeedPage.tsx | 2 +- src/features/Projects/pages/ExplorePage/Header/Header.tsx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/features/Hackathons/pages/HackathonsPage/HackathonsPage.tsx b/src/features/Hackathons/pages/HackathonsPage/HackathonsPage.tsx index 62760cf..e572057 100644 --- a/src/features/Hackathons/pages/HackathonsPage/HackathonsPage.tsx +++ b/src/features/Hackathons/pages/HackathonsPage/HackathonsPage.tsx @@ -35,7 +35,7 @@ export default function HackathonsPage() { className={`page-container`} >
    - +
    - +
    {headerLinks[0].title}
    -
    From 15ad24debcdfb0cbf6ce547e0c7a6d6955b26701 Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Mon, 19 Sep 2022 15:59:05 +0300 Subject: [PATCH 08/19] update: banner image --- src/features/Projects/pages/ExplorePage/Header/Header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/Projects/pages/ExplorePage/Header/Header.tsx b/src/features/Projects/pages/ExplorePage/Header/Header.tsx index a10b798..4c12e30 100644 --- a/src/features/Projects/pages/ExplorePage/Header/Header.tsx +++ b/src/features/Projects/pages/ExplorePage/Header/Header.tsx @@ -15,7 +15,7 @@ export const bannerData = {

    1st Oct - 31st Nov, 2022

    Online

    , - img: "https://i.ibb.co/bRY635n/wide.png", + img: "https://i.ibb.co/Xzwm6St/wide.jpg", link: { content: "Register Now", url: createRoute({ type: "tournament", id: 1 }), From 9d9f774823d5e33c2269f8d2110b38aad3940c27 Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Mon, 19 Sep 2022 16:18:44 +0300 Subject: [PATCH 09/19] update: banner img --- src/features/Projects/pages/ExplorePage/Header/Header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/Projects/pages/ExplorePage/Header/Header.tsx b/src/features/Projects/pages/ExplorePage/Header/Header.tsx index 4c12e30..93c3cca 100644 --- a/src/features/Projects/pages/ExplorePage/Header/Header.tsx +++ b/src/features/Projects/pages/ExplorePage/Header/Header.tsx @@ -15,7 +15,7 @@ export const bannerData = {

    1st Oct - 31st Nov, 2022

    Online

    , - img: "https://i.ibb.co/Xzwm6St/wide.jpg", + img: "https://i.ibb.co/3S35g6T/wide.jpg", link: { content: "Register Now", url: createRoute({ type: "tournament", id: 1 }), From 5f2e626f4634275db381699099897f2299241cd5 Mon Sep 17 00:00:00 2001 From: Johns Beharry Date: Mon, 19 Sep 2022 15:35:27 +0200 Subject: [PATCH 10/19] feature(database): use new data proxy url --- prisma/schema.prisma | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 1a5b903..a6bb7e6 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -1,6 +1,6 @@ datasource db { provider = "postgresql" - url = env("DATABASE_URL") + url = env("DATABASE_PROXY_URL") } generator client { From 7a422366fceb4d6346a76eeb90eb2fc4cf720023 Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Mon, 19 Sep 2022 17:15:33 +0300 Subject: [PATCH 11/19] style: fix prizes line-height --- .../PrizesSection/PrizesSection.tsx | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/features/Tournaments/pages/OverviewPage/PrizesSection/PrizesSection.tsx b/src/features/Tournaments/pages/OverviewPage/PrizesSection/PrizesSection.tsx index b1da304..1beecde 100644 --- a/src/features/Tournaments/pages/OverviewPage/PrizesSection/PrizesSection.tsx +++ b/src/features/Tournaments/pages/OverviewPage/PrizesSection/PrizesSection.tsx @@ -23,8 +23,8 @@ export default function PrizesSection({ prizes }: Props) { {/* One Prize */} {track.prizes.length === 1 &&
    -

    {track.prizes[0].title}

    -

    {track.prizes[0].amount}

    +

    {track.prizes[0].title}

    +

    {track.prizes[0].amount}

    } @@ -32,12 +32,12 @@ export default function PrizesSection({ prizes }: Props) { {track.prizes.length === 2 &&
    -

    {track.prizes[0].title}

    -

    {track.prizes[0].amount}

    +

    {track.prizes[0].title}

    +

    {track.prizes[0].amount}

    -

    {track.prizes[1].title}

    -

    {track.prizes[1].amount}

    +

    {track.prizes[1].title}

    +

    {track.prizes[1].amount}

    } @@ -75,7 +75,7 @@ const data = { { id: 1, title: "Grand Champion", - description: "Our Grand Champion, a.k.a “The Legend of Lightning” will be the best in show, la créme de la créme. Every project entered in the tournament will be eligible for this award, no matter what track they choose.", + description: "Our Grand Champion, a.k.a “The Legend of Lightning” will be the best in show, la créme de la créme. Every project entered in the tournament will be eligible for this award, no matter what track they choose. The Legend will be taking home 1 BTC, with both runners up also bagging 0.5 BTC each.", image: "https://s3-alpha-sig.figma.com/img/33fa/68dc/1015f7806d8706cbb29b057f85482755?Expires=1664755200&Signature=QdesbJJcLG84k-SudRv9ah-tVSf~zv4NZKU1EQM9cz-L7qZ1crx7awSVBFZdP~p4R7h1FsUqQfSNHsOPQOKTRiWOL~mpKLe6SAlKhdeqrm8RCNmnhNHpMOxJrCGAsJ7vQDkUKFw9VsJjufTjtEgLHN-EWH5L~RvNHKa06f6rRyiMeRl5HCu9JWT5Spjb0zK7IrU2gT7G~Dw0FTdbE35uxCbN9pU-XuPLbqmAIsPBR-gV4uuf21NBapFOLFDazi-tDzIJO--vH6C4RjuI-i3sl1WV75-SM0DW9MVNBvXiWfPrtGXbNd379xJXQoCBVxv4qzl3YkdoxFUG1-uwKTrVaA__&Key-Pair-Id=APKAINTVSUGEWH5XD5UA", prizes: [ { @@ -92,8 +92,8 @@ const data = { }, { id: 2, - title: "Bitcoin Adoption Track", - description: "On-chain applications have been the bed rock of bitcoin’s explosive growth and adoption over the last decade. Slowly, steadily, and securely, bitcoin’s base layer always seeks to evolve and improve.", + title: "Global Adoption Track", + description: " We will aim our first prize track at solving issues surrounding the global adoption of bitcoin - focusing on virality, scalability, and product market fit. With this track, makers can let their imaginations run wild with either lightning or on-chain technology, as well as driving adoption either via online or locally based solutions.", image: "https://s3-alpha-sig.figma.com/img/cb90/77b4/5ea853a671d0cb1c64bde10dd8955d39?Expires=1664755200&Signature=aXtIhKJg58wRTQlJIGWxpfCN2hxJx8L0~8Hu5aH8LKUVAYrxSV5Tvvxevx9xDnf-RpjTVfB6D7RKuVQjfIiftB4Ym80oOlW9tNzYUo991cJhdYnqaGzJ6Ht2kF7NHmxbiY5RUMYj8bGf2AF1A2a7wuW~DaqHyLQ0s2sszwH2EAv31QTH1DAOO97pQzQ5asas7qGjARWh45QEfw6F8e~6iq3UWHXtIcJ0HMJO4q3ONhsMkuC6XQNfAmWTRwKb3tPZ79oehWgDeyOMGQkRS0uaal~6fNkheEN5DuRBH2dbXtqB6va0PJCTB1l8P558HXhKQjHXRLPPReIci72jPuTzdA__&Key-Pair-Id=APKAINTVSUGEWH5XD5UA", prizes: [ { @@ -120,8 +120,8 @@ const data = { }, { id: 3, - title: "Building for Africa track", - description: "With ~1.4bn inhabitants, Africa is ripe for bitcoin adoption. In partnership with ABC 22, this track seeks to encourage makers to build solutions that are local to the African continent.", + title: "Building for Africa", + description: "With an estimated population of ~1.4bn inhabitants, Africa has poised itself as ripe for bitcoin adoption. In partnership with the African Bitcoin Conference 22, this track seeks to encourage makers to build solutions that solve local challenges & increase bitcoin adoption in Africa.", image: "https://s3-alpha-sig.figma.com/img/c306/f172/7ce7befa9414372e6d0ede739be46de8?Expires=1664755200&Signature=BBfOTJzk7Si7zs9dOBhTdIhoKCvUDxAr6Do0wCZaIq9PD2Jcfxu3ANbiogzihC5O2Rwz3sKsajsRCd8eSs8HGrHrQh89SfNIl0~MYjMz12yWpsc1vC5M5hmXH~VQzCTOWsSki9BimcpCu0IOWfJFjY-p0rlo8UFhdDe56DiRUOSW0pAm5UxTstzOew6X015xA3qQWwUIea2JAtlsI5RqMQMRB-QlaKFlQvYHBU6YzLUNTuTn4MfOd-1oZXKtDArubYnSrJb2rJAXqccxgsXceDl8jq8HXKwkBR95-sG3UDZB7q7qb1Nk3HlsDtirGNlOjLx~vDKpOuyIk5ufAkdJmQ__&Key-Pair-Id=APKAINTVSUGEWH5XD5UA", prizes: [ { From 3da47f9f1031a20a0e135657602daa93321c90cf Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Mon, 19 Sep 2022 17:43:47 +0300 Subject: [PATCH 12/19] fix: text-stroke width, extra spacing issue --- src/features/Tournaments/pages/OverviewPage/OverviewPage.tsx | 2 +- .../pages/OverviewPage/PrizesSection/PrizesSection.tsx | 4 ++-- .../pages/OverviewPage/PrizesSection/styles.module.scss | 2 +- .../pages/OverviewPage/RegisterCard/RegisterCard.tsx | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/features/Tournaments/pages/OverviewPage/OverviewPage.tsx b/src/features/Tournaments/pages/OverviewPage/OverviewPage.tsx index 3cc08c2..6ee2e70 100644 --- a/src/features/Tournaments/pages/OverviewPage/OverviewPage.tsx +++ b/src/features/Tournaments/pages/OverviewPage/OverviewPage.tsx @@ -19,7 +19,7 @@ export default function OverviewPage() {
    diff --git a/src/features/Tournaments/pages/OverviewPage/PrizesSection/PrizesSection.tsx b/src/features/Tournaments/pages/OverviewPage/PrizesSection/PrizesSection.tsx index 1beecde..d1d115e 100644 --- a/src/features/Tournaments/pages/OverviewPage/PrizesSection/PrizesSection.tsx +++ b/src/features/Tournaments/pages/OverviewPage/PrizesSection/PrizesSection.tsx @@ -75,7 +75,7 @@ const data = { { id: 1, title: "Grand Champion", - description: "Our Grand Champion, a.k.a “The Legend of Lightning” will be the best in show, la créme de la créme. Every project entered in the tournament will be eligible for this award, no matter what track they choose. The Legend will be taking home 1 BTC, with both runners up also bagging 0.5 BTC each.", + description: "Our Grand Champion, a.k.a “The Legend of Lightning” will be the best in show, la créme de la créme. Every project entered in the tournament will be eligible for this award, no matter what track they choose.", image: "https://s3-alpha-sig.figma.com/img/33fa/68dc/1015f7806d8706cbb29b057f85482755?Expires=1664755200&Signature=QdesbJJcLG84k-SudRv9ah-tVSf~zv4NZKU1EQM9cz-L7qZ1crx7awSVBFZdP~p4R7h1FsUqQfSNHsOPQOKTRiWOL~mpKLe6SAlKhdeqrm8RCNmnhNHpMOxJrCGAsJ7vQDkUKFw9VsJjufTjtEgLHN-EWH5L~RvNHKa06f6rRyiMeRl5HCu9JWT5Spjb0zK7IrU2gT7G~Dw0FTdbE35uxCbN9pU-XuPLbqmAIsPBR-gV4uuf21NBapFOLFDazi-tDzIJO--vH6C4RjuI-i3sl1WV75-SM0DW9MVNBvXiWfPrtGXbNd379xJXQoCBVxv4qzl3YkdoxFUG1-uwKTrVaA__&Key-Pair-Id=APKAINTVSUGEWH5XD5UA", prizes: [ { @@ -93,7 +93,7 @@ const data = { { id: 2, title: "Global Adoption Track", - description: " We will aim our first prize track at solving issues surrounding the global adoption of bitcoin - focusing on virality, scalability, and product market fit. With this track, makers can let their imaginations run wild with either lightning or on-chain technology, as well as driving adoption either via online or locally based solutions.", + description: "This prize track is aimed at solving issues surrounding the global adoption of bitcoin - focusing on scalability, and product market fit. Makers can let their imaginations run wild with either lightning or on-chain technology, as well as driving adoption either via online or locally based solutions.", image: "https://s3-alpha-sig.figma.com/img/cb90/77b4/5ea853a671d0cb1c64bde10dd8955d39?Expires=1664755200&Signature=aXtIhKJg58wRTQlJIGWxpfCN2hxJx8L0~8Hu5aH8LKUVAYrxSV5Tvvxevx9xDnf-RpjTVfB6D7RKuVQjfIiftB4Ym80oOlW9tNzYUo991cJhdYnqaGzJ6Ht2kF7NHmxbiY5RUMYj8bGf2AF1A2a7wuW~DaqHyLQ0s2sszwH2EAv31QTH1DAOO97pQzQ5asas7qGjARWh45QEfw6F8e~6iq3UWHXtIcJ0HMJO4q3ONhsMkuC6XQNfAmWTRwKb3tPZ79oehWgDeyOMGQkRS0uaal~6fNkheEN5DuRBH2dbXtqB6va0PJCTB1l8P558HXhKQjHXRLPPReIci72jPuTzdA__&Key-Pair-Id=APKAINTVSUGEWH5XD5UA", prizes: [ { diff --git a/src/features/Tournaments/pages/OverviewPage/PrizesSection/styles.module.scss b/src/features/Tournaments/pages/OverviewPage/PrizesSection/styles.module.scss index a43c236..d5d0645 100644 --- a/src/features/Tournaments/pages/OverviewPage/PrizesSection/styles.module.scss +++ b/src/features/Tournaments/pages/OverviewPage/PrizesSection/styles.module.scss @@ -11,7 +11,7 @@ @include gt-md { h4 { - -webkit-text-stroke: 0.06em black; + -webkit-text-stroke: calc(max(1.4px, 0.06em)) black; } } diff --git a/src/features/Tournaments/pages/OverviewPage/RegisterCard/RegisterCard.tsx b/src/features/Tournaments/pages/OverviewPage/RegisterCard/RegisterCard.tsx index 1ae9695..81408d3 100644 --- a/src/features/Tournaments/pages/OverviewPage/RegisterCard/RegisterCard.tsx +++ b/src/features/Tournaments/pages/OverviewPage/RegisterCard/RegisterCard.tsx @@ -47,11 +47,11 @@ export default function RegisterCard({ makers_count, start_date, avatars, isRegi return (
    - {makers_count > 2 &&

    + {makers_count > 2 &&

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

    )} + {makers_count} makers

    } - +
    From 7876f358e28842c5a9951cb737cb509d545ce3db Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Mon, 19 Sep 2022 19:22:09 +0300 Subject: [PATCH 13/19] fix: format date on banner tournament --- .../pages/ExplorePage/Header/Header.tsx | 2 +- .../TournamentDetailsPage/Header/Header.tsx | 3 ++- src/utils/helperFunctions.tsx | 18 +++++++++++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/features/Projects/pages/ExplorePage/Header/Header.tsx b/src/features/Projects/pages/ExplorePage/Header/Header.tsx index 93c3cca..055bcde 100644 --- a/src/features/Projects/pages/ExplorePage/Header/Header.tsx +++ b/src/features/Projects/pages/ExplorePage/Header/Header.tsx @@ -12,7 +12,7 @@ export const bannerData = { title: <>

    Legends of Lightning ⚡️ Tournament

    -

    1st Oct - 31st Nov, 2022

    +

    12th Oct - 7th Dec, 2022

    Online

    , img: "https://i.ibb.co/3S35g6T/wide.jpg", diff --git a/src/features/Tournaments/pages/TournamentDetailsPage/Header/Header.tsx b/src/features/Tournaments/pages/TournamentDetailsPage/Header/Header.tsx index f65733e..e26a315 100644 --- a/src/features/Tournaments/pages/TournamentDetailsPage/Header/Header.tsx +++ b/src/features/Tournaments/pages/TournamentDetailsPage/Header/Header.tsx @@ -3,6 +3,7 @@ import advancedFormat from 'dayjs/plugin/advancedFormat' import React from 'react' import { Helmet } from 'react-helmet' import { IoLocationOutline } from 'react-icons/io5' +import { getSpanDate } from 'src/utils/helperFunctions' import { useTournament } from '../TournamentDetailsContext' dayjs.extend(advancedFormat) @@ -24,7 +25,7 @@ export default function Header() {

    TOURNAMENT 🏆

    {tournamentDetails.title}

    -

    {`${dayjs(tournamentDetails.start_date).format('Do')} - ${dayjs(tournamentDetails.end_date).format('Do MMMM, YYYY')}`}

    +

    {getSpanDate(tournamentDetails.start_date, tournamentDetails.end_date)}

    {tournamentDetails.location}

    diff --git a/src/utils/helperFunctions.tsx b/src/utils/helperFunctions.tsx index 23a2e9c..69bf086 100644 --- a/src/utils/helperFunctions.tsx +++ b/src/utils/helperFunctions.tsx @@ -165,4 +165,20 @@ export async function lightningAddressToPR(address: string, amount_in_sat: numbe .then((prResponse) => { return prResponse.data.pr as string; }); -} \ No newline at end of file +} + +export const getSpanDate = (_date1: string, _date2: string) => { + const date1 = new Date(_date1); + const date2 = new Date(_date2); + + const isSameMonth = date1.getMonth() === date2.getMonth(); + if (!isSameMonth) + return `${dayjs(_date1).format('Do MMM')} - ${dayjs(_date2).format('Do MMM')}` + + const isSameDay = date1.getDay() === date2.getDay(); + if (!isSameDay) + return `${dayjs(_date1).format('Do')} - ${dayjs(_date2).format('Do MMM')}` + // Same Day + return `${dayjs(_date1).format('H:mm')} - ${dayjs(_date2).format('H:mm, Do MMM')}` + +} From cde2a2212a93ab71f98bb85fdd8a67ede7c4b49a Mon Sep 17 00:00:00 2001 From: Johns Beharry Date: Mon, 19 Sep 2022 18:23:07 +0200 Subject: [PATCH 14/19] chore(database): update prisma client packages --- package-lock.json | 68 ++++++++++++++++++++----------------- package.json | 4 +-- public/mockServiceWorker.js | 2 +- 3 files changed, 39 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1638ed0..5a0b5a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "@apollo/client": "^3.6.9", "@hookform/resolvers": "^2.8.8", "@noble/secp256k1": "^1.6.3", - "@prisma/client": "^3.12.0", + "@prisma/client": "^4.3.1", "@react-hookz/web": "^13.2.1", "@react-spring/web": "^9.4.4", "@reduxjs/toolkit": "^1.8.1", @@ -63,7 +63,6 @@ "nostr-tools": "^0.23.4", "passport": "^0.6.0", "passport-lnurl-auth": "^1.5.0", - "prisma": "^3.12.0", "qrcode.react": "^3.0.2", "react": "^18.0.0", "react-accessible-accordion": "^5.0.0", @@ -128,6 +127,7 @@ "msw": "^0.39.2", "netlify-cli": "^10.0.0", "postcss": "^8.4.12", + "prisma": "^4.3.1", "readable-stream": "^4.1.0", "serverless": "^3.22.0", "serverless-offline": "^8.7.0", @@ -5136,15 +5136,15 @@ } }, "node_modules/@prisma/client": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/@prisma/client/-/client-3.12.0.tgz", - "integrity": "sha512-4NEQjUcWja/NVBvfuDFscWSk1/rXg3+wj+TSkqXCb1tKlx/bsUE00rxsvOvGg7VZ6lw1JFpGkwjwmsOIc4zvQw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.3.1.tgz", + "integrity": "sha512-FA0/d1VMJNWqzU7WVWTNWJ+lGOLR9JUBnF73GdIPAEVo/6dWk4gHx0EmgeU+SMv4MZoxgOeTBJF2azhg7x0hMw==", "hasInstallScript": true, "dependencies": { - "@prisma/engines-version": "3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980" + "@prisma/engines-version": "4.3.0-32.c875e43600dfe042452e0b868f7a48b817b9640b" }, "engines": { - "node": ">=12.6" + "node": ">=14.17" }, "peerDependencies": { "prisma": "*" @@ -5156,15 +5156,16 @@ } }, "node_modules/@prisma/engines": { - "version": "3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980", - "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980.tgz", - "integrity": "sha512-zULjkN8yhzS7B3yeEz4aIym4E2w1ChrV12i14pht3ePFufvsAvBSoZ+tuXMvfSoNTgBS5E4bolRzLbMmbwkkMQ==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.3.1.tgz", + "integrity": "sha512-4JF/uMaEDAPdcdZNOrnzE3BvrbGpjgV0FcPT3EVoi6I86fWkloqqxBt+KcK/+fIRR0Pxj66uGR9wVH8U1Y13JA==", + "devOptional": true, "hasInstallScript": true }, "node_modules/@prisma/engines-version": { - "version": "3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980", - "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980.tgz", - "integrity": "sha512-o+jo8d7ZEiVpcpNWUDh3fj2uPQpBxl79XE9ih9nkogJbhw6P33274SHnqheedZ7PyvPIK/mvU8MLNYgetgXPYw==" + "version": "4.3.0-32.c875e43600dfe042452e0b868f7a48b817b9640b", + "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.3.0-32.c875e43600dfe042452e0b868f7a48b817b9640b.tgz", + "integrity": "sha512-8yWpXkQRmiSfsi2Wb/ZS5D3RFbeu/btL9Pm/gdF4phB0Lo5KGsDFMxFMgaD64mwED2nHc8ZaEJg/+4Jymb9Znw==" }, "node_modules/@protobufjs/aspromise": { "version": "1.1.2", @@ -60984,19 +60985,20 @@ } }, "node_modules/prisma": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/prisma/-/prisma-3.12.0.tgz", - "integrity": "sha512-ltCMZAx1i0i9xuPM692Srj8McC665h6E5RqJom999sjtVSccHSD8Z+HSdBN2183h9PJKvC5dapkn78dd0NWMBg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.3.1.tgz", + "integrity": "sha512-90xo06wtqil76Xsi3mNpc4Js3SdDRR5g4qb9h+4VWY4Y8iImJY6xc3PX+C9xxTSt1lr0Q89A0MLkJjd8ax6KiQ==", + "devOptional": true, "hasInstallScript": true, "dependencies": { - "@prisma/engines": "3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980" + "@prisma/engines": "4.3.1" }, "bin": { "prisma": "build/index.js", "prisma2": "build/index.js" }, "engines": { - "node": ">=12.6" + "node": ">=14.17" } }, "node_modules/prismjs": { @@ -74556,22 +74558,23 @@ "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==" }, "@prisma/client": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/@prisma/client/-/client-3.12.0.tgz", - "integrity": "sha512-4NEQjUcWja/NVBvfuDFscWSk1/rXg3+wj+TSkqXCb1tKlx/bsUE00rxsvOvGg7VZ6lw1JFpGkwjwmsOIc4zvQw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.3.1.tgz", + "integrity": "sha512-FA0/d1VMJNWqzU7WVWTNWJ+lGOLR9JUBnF73GdIPAEVo/6dWk4gHx0EmgeU+SMv4MZoxgOeTBJF2azhg7x0hMw==", "requires": { - "@prisma/engines-version": "3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980" + "@prisma/engines-version": "4.3.0-32.c875e43600dfe042452e0b868f7a48b817b9640b" } }, "@prisma/engines": { - "version": "3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980", - "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980.tgz", - "integrity": "sha512-zULjkN8yhzS7B3yeEz4aIym4E2w1ChrV12i14pht3ePFufvsAvBSoZ+tuXMvfSoNTgBS5E4bolRzLbMmbwkkMQ==" + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.3.1.tgz", + "integrity": "sha512-4JF/uMaEDAPdcdZNOrnzE3BvrbGpjgV0FcPT3EVoi6I86fWkloqqxBt+KcK/+fIRR0Pxj66uGR9wVH8U1Y13JA==", + "devOptional": true }, "@prisma/engines-version": { - "version": "3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980", - "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980.tgz", - "integrity": "sha512-o+jo8d7ZEiVpcpNWUDh3fj2uPQpBxl79XE9ih9nkogJbhw6P33274SHnqheedZ7PyvPIK/mvU8MLNYgetgXPYw==" + "version": "4.3.0-32.c875e43600dfe042452e0b868f7a48b817b9640b", + "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.3.0-32.c875e43600dfe042452e0b868f7a48b817b9640b.tgz", + "integrity": "sha512-8yWpXkQRmiSfsi2Wb/ZS5D3RFbeu/btL9Pm/gdF4phB0Lo5KGsDFMxFMgaD64mwED2nHc8ZaEJg/+4Jymb9Znw==" }, "@protobufjs/aspromise": { "version": "1.1.2", @@ -117444,11 +117447,12 @@ "dev": true }, "prisma": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/prisma/-/prisma-3.12.0.tgz", - "integrity": "sha512-ltCMZAx1i0i9xuPM692Srj8McC665h6E5RqJom999sjtVSccHSD8Z+HSdBN2183h9PJKvC5dapkn78dd0NWMBg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.3.1.tgz", + "integrity": "sha512-90xo06wtqil76Xsi3mNpc4Js3SdDRR5g4qb9h+4VWY4Y8iImJY6xc3PX+C9xxTSt1lr0Q89A0MLkJjd8ax6KiQ==", + "devOptional": true, "requires": { - "@prisma/engines": "3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980" + "@prisma/engines": "4.3.1" } }, "prismjs": { diff --git a/package.json b/package.json index f78d0a4..e60232f 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "@apollo/client": "^3.6.9", "@hookform/resolvers": "^2.8.8", "@noble/secp256k1": "^1.6.3", - "@prisma/client": "^3.12.0", + "@prisma/client": "^4.3.1", "@react-hookz/web": "^13.2.1", "@react-spring/web": "^9.4.4", "@reduxjs/toolkit": "^1.8.1", @@ -58,7 +58,6 @@ "nostr-tools": "^0.23.4", "passport": "^0.6.0", "passport-lnurl-auth": "^1.5.0", - "prisma": "^3.12.0", "qrcode.react": "^3.0.2", "react": "^18.0.0", "react-accessible-accordion": "^5.0.0", @@ -180,6 +179,7 @@ "msw": "^0.39.2", "netlify-cli": "^10.0.0", "postcss": "^8.4.12", + "prisma": "^4.3.1", "readable-stream": "^4.1.0", "serverless": "^3.22.0", "serverless-offline": "^8.7.0", diff --git a/public/mockServiceWorker.js b/public/mockServiceWorker.js index ba0c013..0966a9d 100644 --- a/public/mockServiceWorker.js +++ b/public/mockServiceWorker.js @@ -2,7 +2,7 @@ /* tslint:disable */ /** - * Mock Service Worker (0.39.1). + * Mock Service Worker (0.39.2). * @see https://github.com/mswjs/msw * - Please do NOT modify this file. * - Please do NOT serve this file on production. From 503962cb86bcec919d494e4367d45655516505d8 Mon Sep 17 00:00:00 2001 From: Johns Beharry Date: Mon, 19 Sep 2022 18:26:45 +0200 Subject: [PATCH 15/19] feature(analytics): add plausible tracking code google analytics alternative. supposidily better policies. we need to learn more about how the platform is doing so we can tell people who fund us, and excite the community about our growth. --- public/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/public/index.html b/public/index.html index c2f94a6..460311e 100644 --- a/public/index.html +++ b/public/index.html @@ -41,6 +41,7 @@ content="%PUBLIC_URL%/assets/images/og-thumbnail.jpg" data-react-helmet="true" /> + From 9a1db07f5cff7c2c0134f20791faf8a7e06cc8c7 Mon Sep 17 00:00:00 2001 From: Johns Beharry Date: Mon, 19 Sep 2022 19:16:18 +0200 Subject: [PATCH 16/19] chore(database): use edge client for prisma data proxy --- api/prisma/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/prisma/index.js b/api/prisma/index.js index 2013b99..42dcb51 100644 --- a/api/prisma/index.js +++ b/api/prisma/index.js @@ -1,4 +1,4 @@ -const { PrismaClient } = require('@prisma/client'); +const { PrismaClient } = require('@prisma/client/edge'); const createGlobalModule = require('../utils/createGlobalModule'); From 00ede216bb580e8285d7f0582d7b0ac265cde53c Mon Sep 17 00:00:00 2001 From: Dolu Date: Tue, 20 Sep 2022 09:59:45 +0200 Subject: [PATCH 17/19] fix: displaying avatar in story comments --- .../nostr-events-extra-data/nostr-events-extra-data.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/api/functions/nostr-events-extra-data/nostr-events-extra-data.js b/api/functions/nostr-events-extra-data/nostr-events-extra-data.js index 9a395aa..b1d00f5 100644 --- a/api/functions/nostr-events-extra-data/nostr-events-extra-data.js +++ b/api/functions/nostr-events-extra-data/nostr-events-extra-data.js @@ -23,12 +23,19 @@ const getEventsExtraData = async (req, res) => { select: { id: true, avatar: true, + avatar_rel: { + select: { + url: true, + } + }, name: true, } } } }); + comments.map(c => c.user.avatar = c.user.avatar_rel?.url ?? c.user.avatar) + return res .status(200) .json(comments) From 4b3a21947ded4bc64ede0080238ce22cd2f6a196 Mon Sep 17 00:00:00 2001 From: Johns Beharry Date: Tue, 20 Sep 2022 10:05:42 +0200 Subject: [PATCH 18/19] chore: trigger deploy --- api/prisma/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/api/prisma/index.js b/api/prisma/index.js index 42dcb51..1ad9482 100644 --- a/api/prisma/index.js +++ b/api/prisma/index.js @@ -1,7 +1,6 @@ const { PrismaClient } = require('@prisma/client/edge'); const createGlobalModule = require('../utils/createGlobalModule'); - const createPrismaClient = () => { console.log("New Prisma Client"); return new PrismaClient({ From 7f30c610ba7841151f491527e8077483d948db70 Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Tue, 20 Sep 2022 15:46:10 +0300 Subject: [PATCH 19/19] update: db schema --- .../20220920093026_add_contact_email_to_project/migration.sql | 2 ++ prisma/schema.prisma | 1 + 2 files changed, 3 insertions(+) create mode 100644 prisma/migrations/20220920093026_add_contact_email_to_project/migration.sql diff --git a/prisma/migrations/20220920093026_add_contact_email_to_project/migration.sql b/prisma/migrations/20220920093026_add_contact_email_to_project/migration.sql new file mode 100644 index 0000000..9624cc6 --- /dev/null +++ b/prisma/migrations/20220920093026_add_contact_email_to_project/migration.sql @@ -0,0 +1,2 @@ +-- AlterTable +ALTER TABLE "Project" ADD COLUMN "contact_email" TEXT; diff --git a/prisma/schema.prisma b/prisma/schema.prisma index e66a5cd..80a88f8 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -137,6 +137,7 @@ model Project { github String? telegram String? slack String? + contact_email String? thumbnail_image String? thumbnail_image_id Int? @unique thumbnail_image_rel HostedImage? @relation("Project_Thumbnail", fields: [thumbnail_image_id], references: [id])