diff --git a/src/components/navbar/DropDown.tsx b/src/components/navbar/DropDown.tsx index 25b464af0..f3019e541 100644 --- a/src/components/navbar/DropDown.tsx +++ b/src/components/navbar/DropDown.tsx @@ -1,7 +1,7 @@ "use client"; import { ChevronDownIcon } from "@heroicons/react/24/outline"; -import DropDownLink from "./DropDownLink"; +import Link from "next/link"; import Button from "@/components/Button"; import { useAppDispatch, useUser } from "@/store/hooks"; import { clientSignOut } from "@/store/features/auth/authSlice"; @@ -14,12 +14,18 @@ export default function DropDown({ openState }: { openState?: boolean }) { const activeVoyage = allVoyages?.find( (item) => item.voyageTeam.voyage.status.name === "Active", ); - const currentVoyage = - activeVoyage?.voyageTeam.name ?? - "Please join a voyage to see your status information."; + + const currentVoyage = activeVoyage?.voyageTeam.name + ? `Team - Tier ${activeVoyage.voyageTeam.name + .split("-")[1] + .split("tier")[1] + .toUpperCase()} ${activeVoyage.voyageTeam.name + .split("-")[0] + .toUpperCase()}` + : "Please join a voyage to see your status information."; const closed = "hidden"; const open = - "absolute z-[1] w-44 p-4 [&>*]:mt-2 mt-6 shadow bg-base-100 right-0 border border-neutral rounded-2xl"; + "absolute flex flex-col gap-5 z-[1] w-[250px] p-5 bottom-100 translate-y-[15%] shadow-md bg-base-200 right-0 border border-base-100 rounded-2xl"; async function handleClick() { const [res, error] = await serverSignOut(); @@ -35,7 +41,7 @@ export default function DropDown({ openState }: { openState?: boolean }) { } } - const handleDropDownClick = (event: React.MouseEvent) => { + const handleDropDownClick = (event: React.MouseEvent) => { event.stopPropagation(); }; @@ -47,15 +53,17 @@ export default function DropDown({ openState }: { openState?: boolean }) { > -
    -
  • -

    My Status:

    - {currentVoyage ? ( -

    +

    +

    + My Voyage: +

    + {activeVoyage?.voyageTeam.name ? ( +

    {currentVoyage}

    ) : ( @@ -63,19 +71,27 @@ export default function DropDown({ openState }: { openState?: boolean }) { {currentVoyage}

    )} -
  • - + + + + -
+ ); } diff --git a/src/components/navbar/DropDownLink.tsx b/src/components/navbar/DropDownLink.tsx deleted file mode 100644 index b5ee72c9d..000000000 --- a/src/components/navbar/DropDownLink.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import Link from "next/link"; - -interface DropDownLinkProps { - title: string; - href?: string; -} - -export default function DropDownLink({ title, href = "#" }: DropDownLinkProps) { - return ( -
  • - - {title} - -
  • - ); -}