Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#106] chore: update user menu logout colour #107

Merged
merged 2 commits into from
Jul 11, 2023
Merged

[#106] chore: update user menu logout colour #107

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97039a8
[#106] chore: update user menu logout text colour
Jo9871 Jul 11, 2023
7e69e34
[#106] chore: update user menu logout bg focus colour
Jo9871 Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions src/components/user-dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
"use client";

import { signOut, useSession } from "next-auth/react";
import Spinner from "./ui/spinner";
import Image from "next/image";
import Link from "next/link";
import { Icons } from "./icons";
import { Button } from "./ui/button";
Jo9871 marked this conversation as resolved.
Show resolved Hide resolved
import { LoginButton } from "./ui/buttons";
import {
DropdownMenu,
Expand All @@ -10,16 +13,13 @@ import {
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "./ui/dropdown-menu";
import { Button } from "./ui/button";
import Link from "next/link";
import { Icons } from "./icons";
import Image from "next/image";
import Spinner from "./ui/spinner";

export function UserDropdown() {
const session = useSession();

return (
<div className="flex gap-4 items-center">
<div className="flex items-center gap-4">
<div className="flex justify-center">
{session.status === "loading" && <Spinner />}
{session.status === "unauthenticated" && <LoginButton />}
Expand Down Expand Up @@ -48,22 +48,23 @@ const AccountMenu = () => {
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuItem>
<Link href="/dashboard" className="flex gap-1 items-center">
<Icons.lineChart className="mr-2 h-4 w-4" />
<Link href="/dashboard" className="flex items-center gap-1">
<Icons.lineChart className="w-4 h-4 mr-2" />
<span>Dashboard</span>
</Link>
</DropdownMenuItem>
<DropdownMenuItem>
<Link href="/profile" className="flex gap-1 items-center">
<Icons.profile className="mr-2 h-4 w-4" />
<Link href="/profile" className="flex items-center gap-1">
<Icons.profile className="w-4 h-4 mr-2" />
<span>Profile</span>
</Link>
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem
className="text-red-500 hover:text-white focus:bg-destructive hover:cursor-pointer"
onClick={() => signOut({ callbackUrl: `${window.location.origin}` })}
>
<Icons.logout className="mr-2 h-4 w-4" />
<Icons.logout className="w-4 h-4 mr-2" />
<span>Logout</span>
</DropdownMenuItem>
</DropdownMenuContent>
Expand Down