diff --git a/app/(main-layout)/admin/users/edit/[id]/page.tsx b/app/(main-layout)/admin/users/edit/[id]/page.tsx index d9250ea1..4047c94a 100644 --- a/app/(main-layout)/admin/users/edit/[id]/page.tsx +++ b/app/(main-layout)/admin/users/edit/[id]/page.tsx @@ -34,7 +34,10 @@ export default async function UserEditPage({

{userToEdit.name}

Email: {userToEdit.email}

- +
); diff --git a/app/(main-layout)/editEntry/[id]/page.tsx b/app/(main-layout)/editEntry/[id]/page.tsx index 2eb26aed..1db5c58d 100644 --- a/app/(main-layout)/editEntry/[id]/page.tsx +++ b/app/(main-layout)/editEntry/[id]/page.tsx @@ -84,7 +84,7 @@ export default async function EditEntryPage({ holdingsData={holdingsData} actionType="edit" existingEntry={existingEntry} - isEditor={canEdit} + isEditor={canEdit ?? false} /> ); diff --git a/app/(main-layout)/layout.tsx b/app/(main-layout)/layout.tsx index b5a83a58..45f9b696 100644 --- a/app/(main-layout)/layout.tsx +++ b/app/(main-layout)/layout.tsx @@ -5,7 +5,7 @@ import { Roboto } from 'next/font/google'; import '@/app/styles/custom-bootstrap.scss'; import './globals.css'; import { ClerkProvider } from '@clerk/nextjs'; -import Header from '@/components/Header'; +import Header from '@/components/Header/Header'; import Footer from '@/components/Footer'; import { ToastContainer } from 'react-toastify'; import 'react-toastify/dist/ReactToastify.css'; @@ -27,7 +27,8 @@ export default function RootLayout({ }>) { return ( - + + @@ -37,7 +38,8 @@ export default function RootLayout({