Connect, collaborate, and grow with a community of TypeScript developers
break up navigation
bautistaaa796e568348ac
diff --git a/src/components/ui/navigation.tsx b/src/components/ui/navigation.tsxindex f7b11ff0..a5dcdac5 100644--- a/src/components/ui/navigation.tsx+++ b/src/components/ui/navigation.tsx@@ -2,12 +2,12 @@import { useTheme } from 'next-themes';+import { RoleTypes } from '@prisma/client';+import { Loader2, LogIn, Moon, Plus, Settings, Settings2, Sun, User } from 'lucide-react';+import { signIn, signOut, useSession } from 'next-auth/react';import Link from 'next/link';-import { Settings2, LogIn, Plus, Settings, User, Bell, Moon, Sun, Loader2 } from 'lucide-react';+import { usePathname, useRouter } from 'next/navigation';import { useEffect, useState } from 'react';-import { useRouter, usePathname } from 'next/navigation';-import { signIn, signOut, useSession } from 'next-auth/react';-import { navigationMenuTriggerStyle } from './navigation-menu';import { Button } from './button';import {DropdownMenu,@@ -16,108 +16,10 @@ import {DropdownMenuSeparator,DropdownMenuTrigger,} from './dropdown-menu';-import { RoleTypes } from '@prisma/client';+import { navigationMenuTriggerStyle } from './navigation-menu';export function Navigation() {- const [mounted, setMounted] = useState(false);- const [loading, setLoading] = useState(false);- const { data: session, status } = useSession();- const { setTheme, resolvedTheme } = useTheme();- const router = useRouter();const pathname = usePathname();-- const isAdmin = session?.user?.role?.includes(RoleTypes.ADMIN);- const isMod = session?.user?.role?.includes(RoleTypes.MODERATOR);- const isAdminOrMod = isAdmin || isMod;-- // NOTE: 1. loading == true -> 2. signIn() -> 3. session status == 'loading' (loading == false)- const handleSignIn = async () => {- try {- setLoading(true);- // page reloads after sign in, so no need to setLoading(false), othersiwe ugly visual glitch- await signIn('github');- } catch (error) {- // only set loading to false if there was an error and page didn't reload after sign in- setLoading(false);- }- };- const handleSignOut = async () => {- await signOut({ redirect: false });- router.push('/');- };-- useEffect(() => {- setMounted(true);- }, []);-- const renderLoginDetails = (): JSX.Element | null => {- return session ? (- <>- <DropdownMenu>- <DropdownMenuTrigger asChild>- <button className="rounded-lg p-2 duration-300 focus:bg-accent focus:outline-none">- <User className="h-5 w-5" />- </button>- </DropdownMenuTrigger>- <DropdownMenuContent- align="end"- className="mt-[0.33rem] w-56 rounded-xl bg-white/50 backdrop-blur-sm dark:bg-neutral-950/50"- >- <Link className="block" href="/wizard">- <DropdownMenuItem className="rounded-lg p-2 duration-300 focus:bg-accent focus:outline-none dark:hover:bg-neutral-700/50">- <Plus className="mr-2 h-4 w-4" />- <span>Create a Challange</span>- </DropdownMenuItem>- </Link>- <Link className="block" href={`/@${session.user.name}`}>- <DropdownMenuItem className="rounded-lg p-2 duration-300 focus:bg-accent focus:outline-none dark:hover:bg-neutral-700/50">- <User className="mr-2 h-4 w-4" />- <span>Profile</span>- </DropdownMenuItem>- </Link>- <Link className="block" href="/settings">- <DropdownMenuItem className="rounded-lg p-2 duration-300 focus:bg-accent focus:outline-none">- <Settings2 className="mr-2 h-4 w-4" />- <span>Settings</span>- </DropdownMenuItem>- </Link>- {isAdminOrMod && (- <Link className="block" href="/admin">- <DropdownMenuItem className="rounded-lg p-2 duration-300 focus:bg-accent focus:outline-none dark:hover:bg-neutral-700/50">- <Settings className="mr-2 h-4 w-4" />- <span>Admin</span>- </DropdownMenuItem>- </Link>- )}- <DropdownMenuSeparator />- <Button- variant="ghost"- className="h-8 w-full justify-start rounded-b-lg rounded-t-sm bg-opacity-50 px-2 text-red-500 hover:bg-red-500/20 hover:text-red-500"- onClick={handleSignOut}- >- <span className="text-red-500">Log out</span>- </Button>- </DropdownMenuContent>- </DropdownMenu>- </>- ) : (- <Button- disabled={loading || status === 'loading'}- onClick={handleSignIn}- className="w-20 rounded-lg bg-transparent p-2 text-black duration-300 hover:bg-gray-200 focus:bg-accent focus:outline-none dark:text-white hover:dark:bg-gray-800"- >- {loading || status === 'loading' ? (- <Loader2 className="h-5 w-5 animate-spin" />- ) : (- <div className="flex items-center space-x-2">- <LogIn className="h-5 w-5" />- <span className="dark:text-white">Login</span>- </div>- )}- </Button>- );- };-return (<header className="z-10 w-full"><nav@@ -171,20 +73,8 @@ export function Navigation() {</div><div className="flex"><div className="flex items-center justify-end gap-2">- {mounted && (- <button- type="button"- className="rounded-lg p-2 duration-300 focus:bg-accent focus:outline-none"- onClick={() => {- setTheme(resolvedTheme === 'dark' ? 'light' : 'dark');- }}- >- {resolvedTheme === 'dark' && <Moon className="h-5 w-5" aria-hidden="true" />}- {resolvedTheme === 'light' && <Sun className="h-5 w-5" aria-hidden="true" />}- </button>- )}-- {renderLoginDetails()}+ <ThemeButton />+ <LoginButton /></div></div></div>@@ -192,3 +82,121 @@ export function Navigation() {</header>);}++function ThemeButton() {+ const [mounted, setMounted] = useState(false);+ const { setTheme, resolvedTheme } = useTheme();++ useEffect(() => {+ setMounted(true);+ }, []);++ return (+ <>+ {mounted && (+ <button+ type="button"+ className="rounded-lg p-2 duration-300 focus:bg-accent focus:outline-none"+ onClick={() => {+ setTheme(resolvedTheme === 'dark' ? 'light' : 'dark');+ }}+ >+ {resolvedTheme === 'dark' && <Moon className="h-5 w-5" aria-hidden="true" />}+ {resolvedTheme === 'light' && <Sun className="h-5 w-5" aria-hidden="true" />}+ </button>+ )}+ </>+ );+}++function LoginButton() {+ const [loading, setLoading] = useState(false);+ const { data: session, status } = useSession();+ const router = useRouter();++ const isAdmin = session?.user?.role?.includes(RoleTypes.ADMIN);+ const isMod = session?.user?.role?.includes(RoleTypes.MODERATOR);+ const isAdminOrMod = isAdmin || isMod;++ // NOTE: 1. loading == true -> 2. signIn() -> 3. session status == 'loading' (loading == false)+ const handleSignIn = async () => {+ try {+ setLoading(true);+ // page reloads after sign in, so no need to setLoading(false), othersiwe ugly visual glitch+ await signIn('github', { redirect: false });+ } catch (error) {+ // only set loading to false if there was an error and page didn't reload after sign in+ setLoading(false);+ }+ };+ const handleSignOut = async () => {+ await signOut({ redirect: false });+ router.push('/');+ };++ return session ? (+ <>+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <button className="rounded-lg p-2 duration-300 focus:bg-accent focus:outline-none">+ <User className="h-5 w-5" />+ </button>+ </DropdownMenuTrigger>+ <DropdownMenuContent+ align="end"+ className="mt-[0.33rem] w-56 rounded-xl bg-white/50 backdrop-blur-sm dark:bg-neutral-950/50"+ >+ <Link className="block" href="/wizard">+ <DropdownMenuItem className="rounded-lg p-2 duration-300 focus:bg-accent focus:outline-none dark:hover:bg-neutral-700/50">+ <Plus className="mr-2 h-4 w-4" />+ <span>Create a Challange</span>+ </DropdownMenuItem>+ </Link>+ <Link className="block" href={`/@${session.user.name}`}>+ <DropdownMenuItem className="rounded-lg p-2 duration-300 focus:bg-accent focus:outline-none dark:hover:bg-neutral-700/50">+ <User className="mr-2 h-4 w-4" />+ <span>Profile</span>+ </DropdownMenuItem>+ </Link>+ <Link className="block" href="/settings">+ <DropdownMenuItem className="rounded-lg p-2 duration-300 focus:bg-accent focus:outline-none">+ <Settings2 className="mr-2 h-4 w-4" />+ <span>Settings</span>+ </DropdownMenuItem>+ </Link>+ {isAdminOrMod && (+ <Link className="block" href="/admin">+ <DropdownMenuItem className="rounded-lg p-2 duration-300 focus:bg-accent focus:outline-none dark:hover:bg-neutral-700/50">+ <Settings className="mr-2 h-4 w-4" />+ <span>Admin</span>+ </DropdownMenuItem>+ </Link>+ )}+ <DropdownMenuSeparator />+ <Button+ variant="ghost"+ className="h-8 w-full justify-start rounded-b-lg rounded-t-sm bg-opacity-50 px-2 text-red-500 hover:bg-red-500/20 hover:text-red-500"+ onClick={handleSignOut}+ >+ <span className="text-red-500">Log out</span>+ </Button>+ </DropdownMenuContent>+ </DropdownMenu>+ </>+ ) : (+ <Button+ disabled={loading || status === 'loading'}+ onClick={handleSignIn}+ className="w-20 rounded-lg bg-transparent p-2 text-black duration-300 hover:bg-gray-200 focus:bg-accent focus:outline-none dark:text-white hover:dark:bg-gray-800"+ >+ {loading || status === 'loading' ? (+ <Loader2 className="h-5 w-5 animate-spin" />+ ) : (+ <div className="flex items-center space-x-2">+ <LogIn className="h-5 w-5" />+ <span className="dark:text-white">Login</span>+ </div>+ )}+ </Button>+ );+}