Fix/last min fixes

suncityla/app/admin/page.tsx

@@ -2,30 +2,22 @@ import { authOptions } from '@/lib/auth';
 import { getServerSession } from 'next-auth';
 import { redirect } from 'next/navigation';
 import { getBookings } from './action';
-import { cancelledBookings, pendingBookings } from './action';
 import { DataTable } from '@/components/data-table/data-table';
 import { columns } from '@/components/data-table/columns';
 
 export const dynamic = 'force-dynamic';
 
 export default async function AdminsPage () {
   const bookings = await getBookings();
-  const totalBookings = bookings.length;
-  const pendingBooking = await pendingBookings();
-  const cancelledBooking = await cancelledBookings();
   const session = await getServerSession(authOptions);
-  if (!session || !session.user)
-  {
+  if (!session || !session.user) {
     redirect('/admin/signin');
   }
   return (
     <div>
       <h1 className="text-center font-semibold text-xl">
-        Welcome back <span className=" capitalize">{session.user.username}</span>
+        Welcome back <span className=" capitalize">{session.user.username ? session.user.username : session.user.name}</span>
       </h1>
-      <p>Number of Bookings: {totalBookings}</p>
-      <p>Pending Bookings: {pendingBooking.length}</p>
-      <p>Cancelled Bookings: {cancelledBooking.length}</p>
       <DataTable columns={columns} data={bookings} />
     </div>
   );

suncityla/app/booking/new/page.tsx

@@ -1,9 +1,9 @@
 import BookingForm from '../components/BookingForm/BookingForm';
 
-export default function NewBooking() {
+export default function NewBooking () {
   return (
-    <div>
-      <h1>New Booking</h1>
+    <div className='flex flex-col items-center justify-center'>
+      <h1 className=' font-bold mb-4'>New Booking</h1>
       <BookingForm />
     </div>
   );

suncityla/app/booking/page.tsx

@@ -1,5 +1,12 @@
 import FindBookingForm from './components/BookingForm/FindBookingForm';
 
-export default function Page() {
-  return <FindBookingForm />;
+export default function Page () {
+  return (
+    <div className='flex flex-col items-center justify-center'>
+      <div>
+        <h1 className=' font-bold mb-4'>Please enter your booking reference</h1>
+      </div>
+      <FindBookingForm />;
+    </div>
+  )
 }

suncityla/components/NavbarToggle.tsx

@@ -68,11 +68,11 @@ export default function NavbarToggle ({ session }: { session: Session | null })
               <Link href="/" className="hover:text-[#7F95D1]">
                 Home
               </Link>
-              <Link href="/about" className="hover:text-[#7F95D1]">
-                About
+              <Link href="/booking/new" className="hover:text-[#7F95D1]">
+                New Request
               </Link>
               <Link href="/booking" className="hover:text-[#7F95D1]">
-                Booking
+                Verify Booking
               </Link>
               <Link href="/admin/signin">
                 <Button className="font-bold">Admin Login</Button>

suncityla/components/data-table/columns.tsx

@@ -36,7 +36,7 @@ export const columns: ColumnDef<BookingTableProps>[] = [
                 </button>
             )
         },
-        cell: ({ getValue }) => <span>{new Date(getValue() as string).toDateString()}</span>,
+        cell: ({ getValue }) => <span>{new Date(getValue() as string).toDateString()} {new Date(getValue() as string).toLocaleTimeString()}</span>,
     },
     {
         accessorKey: "streetAddress",

suncityla/lib/auth.ts

@@ -27,8 +27,7 @@ export const authOptions: NextAuthOptions = {
         password: { label: "Password", type: "password" },
       },
       async authorize (credentials) {
-        if (!credentials?.username || !credentials?.password)
-        {
+        if (!credentials?.username || !credentials?.password) {
           return null;
         }
 
@@ -38,20 +37,17 @@ export const authOptions: NextAuthOptions = {
           },
         });
 
-        if (!existingAdmin)
-        {
+        if (!existingAdmin) {
           return null;
         }
         console.log(credentials.password, existingAdmin.password);
 
-        if (existingAdmin.password)
-        {
+        if (existingAdmin.password) {
           const passwordMatch = await compare(
             credentials.password,
             existingAdmin.password
           );
-          if (!passwordMatch)
-          {
+          if (!passwordMatch) {
             return null;
           }
         }
@@ -62,4 +58,10 @@ export const authOptions: NextAuthOptions = {
       },
     }),
   ],
+  callbacks: {
+    async jwt ({ token, user }) {
+      if (user && user.username) token.username = user.username;
+      return token;
+    },
+  },
 };