From 82bba5735347e7f4d4710967e9790908bde4f142 Mon Sep 17 00:00:00 2001 From: klotske Date: Wed, 11 Jan 2023 16:09:08 +0300 Subject: [PATCH 1/2] Added admin dashboard link to UserMenu --- website/src/components/Header/UserMenu.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/website/src/components/Header/UserMenu.tsx b/website/src/components/Header/UserMenu.tsx index 2f59efb1..da8ad37b 100644 --- a/website/src/components/Header/UserMenu.tsx +++ b/website/src/components/Header/UserMenu.tsx @@ -5,7 +5,7 @@ import Image from "next/image"; import NextLink from "next/link"; import { signOut, useSession } from "next-auth/react"; import React from "react"; -import { FiLayout, FiLogOut, FiSettings } from "react-icons/fi"; +import { FiLayout, FiLogOut, FiSettings, FiShield } from "react-icons/fi"; export function UserMenu() { const { data: session } = useSession(); @@ -23,6 +23,12 @@ export function UserMenu() { desc: "Dashboard", icon: FiLayout, }, + session.user.role === "admin" && { + name: "Admin Dashboard", + href: "/admin", + desc: "Admin Dashboard", + icon: FiShield, + }, { name: "Account Settings", href: "/account", From b568f127275c3d80e7f13d1d1c7135b3e6fcf013 Mon Sep 17 00:00:00 2001 From: klotske Date: Wed, 11 Jan 2023 18:43:28 +0300 Subject: [PATCH 2/2] Moved check out of the array --- website/src/components/Header/UserMenu.tsx | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/website/src/components/Header/UserMenu.tsx b/website/src/components/Header/UserMenu.tsx index da8ad37b..f2d1b818 100644 --- a/website/src/components/Header/UserMenu.tsx +++ b/website/src/components/Header/UserMenu.tsx @@ -23,12 +23,6 @@ export function UserMenu() { desc: "Dashboard", icon: FiLayout, }, - session.user.role === "admin" && { - name: "Admin Dashboard", - href: "/admin", - desc: "Admin Dashboard", - icon: FiShield, - }, { name: "Account Settings", href: "/account", @@ -36,6 +30,16 @@ export function UserMenu() { icon: FiSettings, }, ]; + + if (session.user.role === "admin") { + accountOptions.unshift({ + name: "Admin Dashboard", + href: "/admin", + desc: "Admin Dashboard", + icon: FiShield, + }); + } + return ( {({ open }) => (