From 4dd4ea2c87fa5721af21a7d4b558c49bff3d94f3 Mon Sep 17 00:00:00 2001 From: Vasilica Olariu Date: Fri, 11 Aug 2023 13:48:07 +0300 Subject: [PATCH] TAL-51 - show talent badges --- .../MemberBadgesPage.module.scss | 11 +----- .../src/member-badges/MemberBadgesPage.tsx | 36 +++++++++---------- .../src/talent-search.routes.tsx | 9 +++++ 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/src/apps/profiles/src/member-badges/MemberBadgesPage.module.scss b/src/apps/profiles/src/member-badges/MemberBadgesPage.module.scss index eecfc1193..88b1d4d1d 100644 --- a/src/apps/profiles/src/member-badges/MemberBadgesPage.module.scss +++ b/src/apps/profiles/src/member-badges/MemberBadgesPage.module.scss @@ -2,16 +2,7 @@ .container { .backLink { - text-transform: uppercase; - color: $turq-160; - font-weight: $font-weight-bold; margin: $sp-6 0; - display: flex; - align-items: center; - - svg { - margin-right: $sp-2; - } } .badgesWrapper { @@ -67,4 +58,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/apps/profiles/src/member-badges/MemberBadgesPage.tsx b/src/apps/profiles/src/member-badges/MemberBadgesPage.tsx index 136ce00c0..a9df85468 100644 --- a/src/apps/profiles/src/member-badges/MemberBadgesPage.tsx +++ b/src/apps/profiles/src/member-badges/MemberBadgesPage.tsx @@ -1,9 +1,9 @@ import { Dispatch, FC, SetStateAction, useCallback, useEffect, useState } from 'react' -import { Link, Params, useParams } from 'react-router-dom' +import { Link, Params, useNavigate, useParams } from 'react-router-dom' import { bind } from 'lodash' import { profileGetPublicAsync, useMemberBadges, UserBadge, UserBadgesResponse, UserProfile } from '~/libs/core' -import { ContentLayout, LoadingSpinner } from '~/libs/ui' +import { Button, ContentLayout, IconSolid, LoadingSpinner } from '~/libs/ui' import { MemberBadgeModal } from '../components' @@ -11,6 +11,7 @@ import styles from './MemberBadgesPage.module.scss' const MemberBadgesPage: FC<{}> = () => { const routeParams: Params = useParams() + const navigate = useNavigate() const [profile, setProfile]: [ UserProfile | undefined, @@ -32,6 +33,10 @@ const MemberBadgesPage: FC<{}> = () => { setSelectedBadge(badge) }, []) + const handleBackBtn = useCallback(() => { + navigate(-1) + }, [navigate]) + useEffect(() => { if (routeParams.memberHandle) { profileGetPublicAsync(routeParams.memberHandle) @@ -55,24 +60,17 @@ const MemberBadgesPage: FC<{}> = () => { - - + - Return to Profile - + Return to profile + +

COMMUNITY AWARDS & HONORS

diff --git a/src/apps/talent-search/src/talent-search.routes.tsx b/src/apps/talent-search/src/talent-search.routes.tsx index 0f4175297..7764a7aca 100644 --- a/src/apps/talent-search/src/talent-search.routes.tsx +++ b/src/apps/talent-search/src/talent-search.routes.tsx @@ -13,6 +13,10 @@ const TalentPage: LazyLoadedComponent = lazyLoad( () => import('./routes/talent-page'), 'TalentPage', ) +const MemberBadgesPage: LazyLoadedComponent = lazyLoad( + () => import('@profiles/member-badges'), + 'MemberBadgesPage', +) const isOnAppSubdomain = EnvironmentConfig.SUBDOMAIN === AppSubdomain.talentSearch export const rootRoute: string = ( @@ -46,6 +50,11 @@ export const talentSearchRoutes: ReadonlyArray = [ element: , route: '/talent/:memberHandle', }, + { + element: , + id: 'MemberBadgesPage', + route: '/talent/:memberHandle/badges', + }, ], domain: AppSubdomain.talentSearch, element: ,