diff --git a/public/assets/images/join-discord-card.jpg b/public/assets/images/join-discord-card.jpg new file mode 100644 index 0000000..f5eabe8 Binary files /dev/null and b/public/assets/images/join-discord-card.jpg differ diff --git a/src/Components/Navbar/NavDesktop.tsx b/src/Components/Navbar/NavDesktop.tsx index d752197..e45b46a 100644 --- a/src/Components/Navbar/NavDesktop.tsx +++ b/src/Components/Navbar/NavDesktop.tsx @@ -52,7 +52,12 @@ export default function NavDesktop() { Projects -
  • +
  • + + 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 "" }