diff --git a/src/app/assets/AboutIcon.tsx b/src/app/assets/AboutIcon.tsx new file mode 100644 index 0000000..eee333e --- /dev/null +++ b/src/app/assets/AboutIcon.tsx @@ -0,0 +1,22 @@ +export default function AboutIcon() { + return ( + + + + + + ); +} diff --git a/src/app/assets/AgendaIcon.tsx b/src/app/assets/AgendaIcon.tsx new file mode 100644 index 0000000..1728413 --- /dev/null +++ b/src/app/assets/AgendaIcon.tsx @@ -0,0 +1,15 @@ +export default function AgendaIcon() { + return ( + + + + + + + ); +} diff --git a/src/app/assets/GalleryIcon.tsx b/src/app/assets/GalleryIcon.tsx new file mode 100644 index 0000000..34bdb77 --- /dev/null +++ b/src/app/assets/GalleryIcon.tsx @@ -0,0 +1,30 @@ +export default function GalleryIcon() { + return ( + + + + + + + ); +} diff --git a/src/app/assets/MyCardsIcon.tsx b/src/app/assets/MyCardsIcon.tsx new file mode 100644 index 0000000..047f99d --- /dev/null +++ b/src/app/assets/MyCardsIcon.tsx @@ -0,0 +1,12 @@ +export default function MyCardsIcon() { + return ( + + + + ); +} diff --git a/src/app/components/ExpandedCard/ExpandedCard.tsx b/src/app/components/ExpandedCard/ExpandedCard.tsx index cc4ec8b..3df24c6 100644 --- a/src/app/components/ExpandedCard/ExpandedCard.tsx +++ b/src/app/components/ExpandedCard/ExpandedCard.tsx @@ -17,6 +17,9 @@ import { import GlassButton from '../GlassButton/GlassButton'; import SectionsIcon from '@/app/assets/SectionsIcon'; import { getCardLogo } from '@/app/util/getCardLogo'; +import ProfileIcon from '@/app/assets/ProfileIcon'; +import AgendaIcon from '@/app/assets/AgendaIcon'; +import AboutIcon from '@/app/assets/AboutIcon'; export type SectionId = 'faq' | 'agenda' | 'judges'; @@ -142,10 +145,22 @@ const ExpandedCardComponent = ({ showExpanded }: ExpandedCardProps) => { - - scrollToSection('faq')}>FAQ{' '} - scrollToSection('agenda')}>Agenda - scrollToSection('judges')}>Judges + + scrollToSection('faq')}> + + About + {' '} + {/* Divider Line*/} +
+ scrollToSection('agenda')}> + + Agenda + +
+ scrollToSection('judges')}> + + Judges +
diff --git a/src/app/components/SignInButton.tsx b/src/app/components/SignInButton.tsx index 9ab3392..f2cec0a 100644 --- a/src/app/components/SignInButton.tsx +++ b/src/app/components/SignInButton.tsx @@ -1,5 +1,5 @@ import { memo, useState } from 'react'; -import { useRouter } from 'next/navigation'; +import { usePathname, useRouter } from 'next/navigation'; import { authClient } from '@/lib/auth-client'; import LoginIcon from '../assets/LoginIcon'; import GlassButton from './GlassButton/GlassButton'; @@ -13,6 +13,8 @@ import { import ProfileIcon from '../assets/ProfileIcon'; import { Session } from '@/lib/auth'; import Modal from './Modal'; +import MyCardsIcon from '../assets/MyCardsIcon'; +import GalleryIcon from '../assets/GalleryIcon'; interface SignInButtonProps { session: Session | null; @@ -22,6 +24,7 @@ interface SignInButtonProps { function SignInButton({ session, className }: SignInButtonProps) { const [openLoginModal, setOpenLoginModal] = useState(false); const [openSignOutModal, setOpenSignOutModal] = useState(false); + const pathname = usePathname(); const router = useRouter(); const handleSignOut = async () => { @@ -68,10 +71,19 @@ function SignInButton({ session, className }: SignInButtonProps) { - - router.push('/my-cards')}>My Cards{' '} - {/* Placeholder for now */} - setOpenSignOutModal(true)}>Sign Out + + router.push(pathname === '/my-cards' ? '/' : '/my-cards')} + > + {pathname === '/my-cards' ? : } + {pathname === '/my-cards' ? 'Gallery' : 'My Cards'} + + {/* Divider Line*/} +
+ setOpenSignOutModal(true)}> + + Log Out +