Merge pull request 'Token table caching issue resolved' (#5) from dev/TokenTableCachingIssue into main

Reviewed-on: #5

src/app/components/TokenTable.jsx

@@ -96,49 +96,46 @@ export default function TokenTable({ statusFilter }) {
 
 
 
-// Handle theme loading state
+  // Handle theme loading state
-if (darkMode === undefined) {
+  if (darkMode === undefined) {
     return (
       <div className={`flex items-center justify-center min-h-[200px] ${darkMode ? 'bg-gray-900' : 'bg-white'}`}>
         <div className="text-center">
-        <div className={`animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 border-blue-500 mx-auto ${
+          <div
-          darkMode === true ? 'border-gray-100' : 'border-gray-900'
+            className={`animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 border-blue-500 mx-auto ${darkMode === true ? "border-gray-100" : "border-blue-400"
-        }`}></div>
+              }`}
-        <p className={`mt-4 text-lg font-semibold ${
+          ></div>
-          darkMode === true ? 'text-gray-100' : 'text-gray-900'
+          <p className={`mt-4 text-lg font-semibold ${darkMode === true ? 'text-gray-100' : 'text-gray-900'
             }`}>
             Loading...
           </p>
         </div>
       </div>
     );
-}
+  }
-if (loading) return (
+  if (loading) return (
     <div className={`text-center py-10 ${darkMode ? 'bg-gray-900' : 'bg-white'}`}>
-    <div className={`animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 mx-auto ${
+      <div className={`animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 mx-auto ${darkMode ? 'border-gray-100' : 'border-blue-400'
-      darkMode ? 'border-gray-100' : 'border-gray-900'
         }`}></div>
-    <p className={`mt-4 text-lg font-semibold ${
+      <p className={`mt-4 text-lg font-semibold ${darkMode ? 'text-gray-100' : 'text-gray-900'
-      darkMode ? 'text-gray-100' : 'text-gray-900'
         }`}>
         Loading...
       </p>
     </div>
-);
+  );
 
-if (error) return (
+  if (error) return (
     <div className={`p-4 rounded ${darkMode ? 'bg-red-900 text-red-100' : 'bg-red-100 text-red-900'}`}>
       Error: {error}
     </div>
-);
+  );
 
-return (
+  return (
     <div className={`transition-colors duration-300 ${darkMode ? 'text-gray-100' : 'text-gray-800'}`}>
       <input
         type="text"
         placeholder="Search by token or name"
-      className={`mb-4 p-2 border rounded w-full max-w-sm transition-colors ${
+        className={`mb-4 p-2 border rounded w-full max-w-sm transition-colors ${darkMode
-        darkMode 
           ? 'bg-gray-800 border-gray-700 text-white placeholder-gray-400 focus:ring-blue-500 focus:border-blue-500'
           : 'bg-white border-gray-300 placeholder-gray-500 focus:ring-blue-500 focus:border-blue-500'
           }`}
@@ -172,8 +169,7 @@ return (
                     <td className="p-3">{entry.patientName}</td>
                     <td className="p-3">
                       <span
-                      className={`px-2 py-1 rounded-full text-xs font-semibold ${
+                        className={`px-2 py-1 rounded-full text-xs font-semibold ${entry.status === "done"
-                        entry.status === "done"
                           ? darkMode
                             ? "bg-green-900 text-green-100"
                             : "bg-green-100 text-green-800"
@@ -194,8 +190,7 @@ return (
                         <>
                           <button
                             onClick={() => updateStatus(entry.$id, "done")}
-                          className={`border rounded-full px-2 py-1 text-xs transition-colors ${
+                            className={`border rounded-full px-2 py-1 text-xs transition-colors ${darkMode
-                            darkMode
                               ? 'border-green-400 text-green-400 hover:bg-green-900'
                               : 'border-green-600 text-green-600 hover:bg-green-50'
                               }`}
@@ -204,8 +199,7 @@ return (
                           </button>
                           <button
                             onClick={() => updateStatus(entry.$id, "missed")}
-                          className={`border rounded-full px-2 py-1 text-xs transition-colors ${
+                            className={`border rounded-full px-2 py-1 text-xs transition-colors ${darkMode
-                            darkMode
                               ? 'border-red-400 text-red-400 hover:bg-red-900'
                               : 'border-red-600 text-red-600 hover:bg-red-50'
                               }`}
@@ -221,14 +215,12 @@ return (
             </table>
           </div>
 
-        <div className={`flex justify-between items-center mt-4 p-2 rounded ${
+          <div className={`flex justify-between items-center mt-4 p-2 rounded ${darkMode ? 'bg-gray-800' : 'bg-gray-100'
-          darkMode ? 'bg-gray-800' : 'bg-gray-100'
             }`}>
             <button
               disabled={currentPage === 1}
               onClick={() => setCurrentPage((prev) => prev - 1)}
-            className={`px-3 py-1 border rounded disabled:opacity-50 transition-colors ${
+              className={`px-3 py-1 border rounded disabled:opacity-50 transition-colors ${darkMode
-              darkMode 
                 ? 'border-gray-600 hover:bg-gray-700 disabled:hover:bg-transparent'
                 : 'border-gray-300 hover:bg-gray-200 disabled:hover:bg-transparent'
                 }`}
@@ -241,8 +233,7 @@ return (
             <button
               disabled={currentPage === totalPages}
               onClick={() => setCurrentPage((prev) => prev + 1)}
-            className={`px-3 py-1 border rounded disabled:opacity-50 transition-colors ${
+              className={`px-3 py-1 border rounded disabled:opacity-50 transition-colors ${darkMode
-              darkMode 
                 ? 'border-gray-600 hover:bg-gray-700 disabled:hover:bg-transparent'
                 : 'border-gray-300 hover:bg-gray-200 disabled:hover:bg-transparent'
                 }`}
@@ -253,5 +244,5 @@ return (
         </>
       )}
     </div>
-);
+  );
 }

src/app/dashboard/page.js

@@ -1,5 +1,6 @@
-// src/app/dashboard/page.js
+
 "use client";
+
 import { useRouter } from "next/navigation";
 import { useAuth } from "../context/AuthContext";
 import { useEffect } from "react";
@@ -22,12 +23,16 @@ export default function DashboardPage() {
     return (
       <div className="flex items-center justify-center min-h-screen bg-white dark:bg-gray-900">
         <div className="text-center">
-          <div className={`animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 border-blue-500 mx-auto ${
+          <div
-            darkMode === true ? 'border-gray-100' : 'border-gray-900'
+            className={`animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 border-blue-500 mx-auto ${
-          }`}></div>
+              darkMode === true ? "border-gray-100" : "border-gray-900"
-          <p className={`mt-4 text-lg font-semibold ${
+            }`}
-            darkMode === true ? 'text-gray-100' : 'text-gray-900'
+          ></div>
-          }`}>
+          <p
+            className={`mt-4 text-lg font-semibold ${
+              darkMode === true ? "text-gray-100" : "text-gray-900"
+            }`}
+          >
             Loading...
           </p>
         </div>
@@ -39,12 +44,28 @@ export default function DashboardPage() {
     return null;
   }
 
+  // Check if user is admin or staff to show entries table
+  const canViewEntries = userRole === "admin" || userRole === "staff";
+
   return (
-    <main className={`min-h-screen transition-colors duration-300 ${
+    <main
-      darkMode ? 'dark bg-gray-900' : 'bg-white'
+      className={`min-h-screen transition-colors duration-300 ${
-    }`}>
+        darkMode ? "dark bg-gray-900" : "bg-white"
+      }`}
+    >
       <div className="p-1">
+        {canViewEntries ? (
           <EntriesTable />
+        ) : (
+          <div className="text-center p-8">
+            <h2 className={`text-2xl font-semibold ${darkMode ? "text-white" : "text-gray-800"}`}>
+              Welcome to your Dashboard
+            </h2>
+            <p className={`mt-4 ${darkMode ? "text-gray-300" : "text-gray-600"}`}>
+              You don't have permission to view entries.
+            </p>
+          </div>
+        )}
       </div>
     </main>
   );

src/app/page.js

@@ -90,7 +90,7 @@ export default function AuthPage() {
         if (user) {
           localStorage.setItem("isLoggedIn", "true");
           setIsAuthenticated(true);
-          router.push("/dashboard");
+          window.location.href = '/dashboard';
         }
       }
     } catch (error) {

src/app/pages/MultiBooking/page.js

@@ -1,44 +1,126 @@
+
 "use client";
-import { useState } from 'react';
+import { useState, useEffect } from "react";
-import { useRouter } from 'next/navigation';
+import { useRouter } from "next/navigation";
 import Header from "../../components/partials/header";
 import { useTheme } from "../../context/ThemeContext";
+import { databases, Query } from "../../lib/appwrite";
+import { DATABASE_ID, COLLECTION_ID } from "../../lib/api";
 
 export default function MultiBooking() {
   const { darkMode } = useTheme();
   const router = useRouter();
-  const [appointmentDate, setAppointmentDate] = useState(new Date().toISOString().split('T')[0]);
+
+  const [appointmentDate, setAppointmentDate] = useState(
+    new Date().toISOString().split("T")[0]
+  );
   const [patients, setPatients] = useState(
-    Array(5).fill().map((_, i) => ({ id: i+1, name: "" }))
+    Array(5)
+      .fill()
+      .map((_, i) => ({ id: i + 1, name: "" }))
   );
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState(null);
 
+  // Header related states - matching EntriesTable
+  const [entries, setEntries] = useState([]);
+  const [currentToken, setCurrentToken] = useState(null);
+  const [previousToken, setPreviousToken] = useState(null);
+  const [nextToken, setNextToken] = useState(null);
+  const [missedTokens, setMissedTokens] = useState("");
+  const [dataLoading, setDataLoading] = useState(true);
+
   const handleNameChange = (id, value) => {
-    setPatients(patients.map(p => 
+    setPatients(patients.map((p) => (p.id === id ? { ...p, name: value } : p)));
-      p.id === id ? { ...p, name: value } : p
-    ));
   };
 
+  // Get entries from database - similar to EntriesTable
+  const getEntries = async () => {
+    try {
+      const today = new Date().toISOString().split("T")[0];
+      const response = await databases.listDocuments(
+        DATABASE_ID,
+        COLLECTION_ID,
+        [Query.equal("date", today), Query.orderAsc("tokenNumber")],
+        100
+      );
+      return response.documents;
+    } catch (error) {
+      console.error("Fetch error:", error);
+      throw error;
+    }
+  };
+
+  // Update token information - same as EntriesTable
+  const updateTokenInfo = (entries) => {
+    if (entries.length === 0) {
+      setCurrentToken(null);
+      setPreviousToken(null);
+      setNextToken(null);
+      setMissedTokens("");
+      return;
+    }
+
+    const currentIndex = entries.findIndex(
+      (entry) => entry.status === "booked"
+    );
+    const current = currentIndex >= 0 ? entries[currentIndex] : null;
+
+    setCurrentToken(current?.tokenNumber || null);
+    setPreviousToken(
+      currentIndex > 0 ? entries[currentIndex - 1]?.tokenNumber : null
+    );
+    setNextToken(
+      currentIndex < entries.length - 1
+        ? entries[currentIndex + 1]?.tokenNumber
+        : null
+    );
+
+    const missed = entries
+      .filter((entry) => entry.status === "missed")
+      .map((entry) => entry.tokenNumber)
+      .join(", ");
+    setMissedTokens(missed || "None");
+  };
+
+  // Load token data - similar to EntriesTable
+  useEffect(() => {
+    const loadTokenData = async () => {
+      try {
+        setDataLoading(true);
+        const data = await getEntries();
+        setEntries(data);
+        updateTokenInfo(data);
+      } catch (err) {
+        console.error("Error loading token data:", err);
+      } finally {
+        setDataLoading(false);
+      }
+    };
+
+    loadTokenData();
+  }, []);
+
   const handleSubmit = async (e) => {
     e.preventDefault();
     setLoading(true);
     setError(null);
 
     try {
-      // Filter out empty names and validate
+      const validPatients = patients.filter((p) => p.name.trim() !== "");
-      const validPatients = patients.filter(p => p.name.trim() !== "");
       if (validPatients.length === 0) {
-        throw new Error("Please enter at least one patient name");
+        throw new Error("Please enter at least one patient name.");
       }
 
-      // Store in session to use in MultiBooked page
+      sessionStorage.setItem(
-      sessionStorage.setItem('multiBookingData', JSON.stringify({
+        "multiBookingData",
+        JSON.stringify({
           date: appointmentDate,
-        patients: validPatients
+          patients: validPatients,
-      }));
+        })
+      );
 
-      router.push('/pages/MultiBooked');
+      router.push("/pages/MultiBooked");
     } catch (error) {
       setError(error.message);
     } finally {
@@ -47,23 +129,32 @@ export default function MultiBooking() {
   };
 
   const addMorePatients = () => {
-    const newId = patients.length > 0 ? 
+    if (patients.length >= 20) return;
-      Math.max(...patients.map(p => p.id)) + 1 : 1;
+    const newId =
+      patients.length > 0 ? Math.max(...patients.map((p) => p.id)) + 1 : 1;
     setPatients([...patients, { id: newId, name: "" }]);
   };
 
   return (
-    <div className={`flex h-screen overflow-hidden ${darkMode ? 'dark bg-gray-900' : 'bg-white'}`}>
+    <div
-      {/* Content Area */}
+      className={`flex h-screen overflow-hidden ${
+        darkMode ? "dark bg-gray-900" : "bg-white"
+      }`}
+    >
       <div className="relative flex flex-1 flex-col overflow-x-hidden overflow-y-auto">
-        {/* Sticky Header */}
         <header className="sticky top-0 z-50 bg-white shadow-sm dark:bg-gray-800">
           <div className="flex items-center justify-between">
-            <Header />
+            {/* Pass the same props to Header as in EntriesTable */}
+            <Header
+              currentToken={currentToken}
+              previousToken={previousToken}
+              nextToken={nextToken}
+              missedTokens={missedTokens}
+              entries={entries}
+            />
           </div>
         </header>
 
-        {/* Main Content */}
         <main className="flex-1 overflow-y-auto scrollbar-hide">
           <div className="mx-auto max-w-[--breakpoint-2xl] p-4 md:p-6 pt-20">
             {error && (
@@ -73,18 +164,30 @@ export default function MultiBooking() {
             )}
 
             <div className="mb-6">
-              <h2 className={`text-2xl mb-2 ${darkMode ? 'text-white' : 'text-black'}`}>
+              <h2
+                className={`text-2xl mb-2 ${
+                  darkMode ? "text-white" : "text-black"
+                }`}
+              >
                 Staff Multi-Booking
               </h2>
               <div className="flex items-center">
-                <label className={`mr-2 ${darkMode ? 'text-gray-300' : 'text-gray-700'}`}>
+                <label
+                  className={`mr-2 ${
+                    darkMode ? "text-gray-300" : "text-gray-700"
+                  }`}
+                >
                   Date:
                 </label>
                 <input
                   type="date"
                   value={appointmentDate}
                   onChange={(e) => setAppointmentDate(e.target.value)}
-                  className={`p-1 border rounded ${darkMode ? 'bg-gray-800 text-white border-gray-700' : 'bg-white'}`}
+                  className={`p-1 border rounded ${
+                    darkMode
+                      ? "bg-gray-800 text-white border-gray-700"
+                      : "bg-white"
+                  }`}
                 />
               </div>
             </div>
@@ -93,27 +196,40 @@ export default function MultiBooking() {
               <div className="space-y-4 mb-6">
                 {patients.map((patient) => (
                   <div key={patient.id} className="flex items-center gap-3">
-                    <span className={`w-6 text-right ${darkMode ? 'text-gray-300' : 'text-gray-700'}`}>
+                    <span
+                      className={`w-6 text-right ${
+                        darkMode ? "text-gray-300" : "text-gray-700"
+                      }`}
+                    >
                       {patient.id}.
                     </span>
                     <input
                       type="text"
                       value={patient.name}
-                      onChange={(e) => handleNameChange(patient.id, e.target.value)}
+                      onChange={(e) =>
+                        handleNameChange(patient.id, e.target.value)
+                      }
                       placeholder="Patient name"
                       className={`flex-1 shadow-theme-xs h-11 rounded-lg border px-4 py-2.5 text-sm focus:outline-none focus:ring-2 ${
-                        darkMode ? 
+                        darkMode
-                        'bg-gray-800 border-gray-700 text-white placeholder-gray-500 focus:border-blue-800 focus:ring-blue-800/30' : 
+                          ? "bg-gray-800 border-gray-700 text-white placeholder-gray-500 focus:border-blue-800 focus:ring-blue-800/30"
-                        'bg-white border-gray-300 text-gray-800 placeholder-gray-400 focus:border-blue-300 focus:ring-blue-500/10'
+                          : "bg-white border-gray-300 text-gray-800 placeholder-gray-400 focus:border-blue-300 focus:ring-blue-500/10"
                       }`}
                     />
                     {patient.id > 5 && (
                       <button
                         type="button"
-                        onClick={() => setPatients(patients.filter(p => p.id !== patient.id))}
+                        onClick={() =>
+                          setPatients(
+                            patients.filter((p) => p.id !== patient.id)
+                          )
+                        }
                         className={`p-2 rounded-full ${
-                          darkMode ? 'text-red-400 hover:bg-gray-700' : 'text-red-500 hover:bg-gray-100'
+                          darkMode
+                            ? "text-red-400 hover:bg-gray-700"
+                            : "text-red-500 hover:bg-gray-100"
                         }`}
+                        title="Remove"
                       >
                         ✕
                       </button>
@@ -122,20 +238,27 @@ export default function MultiBooking() {
                 ))}
               </div>
 
-              <div className="flex flex-wrap gap-3 mb-6">
+              <div className="flex flex-wrap gap-3 mb-6 items-center">
                 <button
                   type="button"
                   onClick={addMorePatients}
+                  disabled={patients.length >= 20}
                   className={`px-4 py-2 rounded-lg text-sm font-medium ${
-                    darkMode ? 
+                    darkMode
-                    'bg-gray-700 text-white hover:bg-gray-600' : 
+                      ? "bg-gray-700 text-white hover:bg-gray-600"
-                    'bg-gray-200 text-gray-700 hover:bg-gray-300'
+                      : "bg-gray-200 text-gray-700 hover:bg-gray-300"
+                  } ${
+                    patients.length >= 20 ? "opacity-50 cursor-not-allowed" : ""
                   }`}
                 >
                   + Add More Patients
                 </button>
-                <div className="text-sm text-gray-500 dark:text-gray-400 mt-1">
+                <div
-                  {patients.length} patients entered
+                  className={`text-sm mt-1 ${
+                    darkMode ? "text-gray-400" : "text-gray-600"
+                  }`}
+                >
+                  {patients.length} / 20 patients entered
                 </div>
               </div>
 
@@ -144,18 +267,20 @@ export default function MultiBooking() {
                   type="submit"
                   disabled={loading}
                   className={`text-center rounded-lg px-5 py-3.5 text-sm font-medium text-white shadow-theme-xs transition w-full ${
-                    loading ? 'bg-blue-400 cursor-not-allowed' : 'bg-blue-700 hover:bg-blue-600'
+                    loading
+                      ? "bg-blue-400 cursor-not-allowed"
+                      : "bg-blue-700 hover:bg-blue-600"
                   }`}
                 >
-                  {loading ? 'Processing...' : 'Generate Tokens'}
+                  {loading ? "Processing..." : "Generate Tokens"}
                 </button>
                 <button
                   type="button"
-                  onClick={() => router.push('/entries')}
+                  onClick={() => router.push("/entries")}
                   className={`text-center rounded-lg px-5 py-3.5 text-sm font-medium shadow-theme-xs ring-1 ring-inset transition w-full ${
-                    darkMode ? 
+                    darkMode
-                    'bg-gray-800 text-gray-300 ring-gray-700 hover:bg-gray-700' : 
+                      ? "bg-gray-800 text-gray-300 ring-gray-700 hover:bg-gray-700"
-                    'bg-white text-gray-700 ring-gray-300 hover:bg-gray-50'
+                      : "bg-white text-gray-700 ring-gray-300 hover:bg-gray-50"
                   }`}
                 >
                   View All Entries
@@ -163,11 +288,18 @@ export default function MultiBooking() {
               </div>
             </form>
 
-            <div className={`text-center mt-8 text-sm ${
+            <div
-              darkMode ? 'text-gray-400' : 'text-gray-600'
+              className={`text-center mt-8 text-sm ${
-            }`}>
+                darkMode ? "text-gray-400" : "text-gray-600"
-              <p>Staff can book multiple tokens at once. All tokens will be assigned for the same date.</p>
+              }`}
-              <p className="mt-1">Minimum 1 patient required. Maximum 20 patients per batch.</p>
+            >
+              <p>
+                Staff can book multiple tokens at once. All tokens will be
+                assigned for the same date.
+              </p>
+              <p className="mt-1">
+                Minimum 1 patient required. Maximum 20 patients per batch.
+              </p>
             </div>
           </div>
         </main>

src/app/pages/entries/EntriesTable.js

@@ -5,6 +5,7 @@ import { DATABASE_ID, COLLECTION_ID } from "../../lib/api";
 import Header from "../../components/partials/header";
 import { useTheme } from "../../context/ThemeContext";
 import { useAuth } from "../../context/AuthContext";
+import { FaSearch } from 'react-icons/fa';
 
 export default function EntriesTable() {
   const { userRole } = useAuth();
@@ -13,7 +14,7 @@ export default function EntriesTable() {
   const [filteredEntries, setFilteredEntries] = useState([]);
   const [searchQuery, setSearchQuery] = useState("");
   const [currentPage, setCurrentPage] = useState(1);
-  const [avgConsultTime, setAvgConsultTime] = useState(15); // Default 15 mins
+  const [avgConsultTime, setAvgConsultTime] = useState(15);
   const entriesPerPage = 20;
 
   const [currentToken, setCurrentToken] = useState(null);
@@ -23,23 +24,21 @@ export default function EntriesTable() {
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState(null);
 
-  // Calculate waiting time based on position in queue
   const calculateWaitTime = (tokenNumber) => {
-    const bookedEntries = entries.filter(e => e.status === "booked");
+    const bookedEntries = entries.filter((e) => e.status === "booked");
-    const position = bookedEntries.findIndex(e => e.tokenNumber === tokenNumber);
+    const position = bookedEntries.findIndex(
-    return position >= 0 ? (position * avgConsultTime) : 0;
+      (e) => e.tokenNumber === tokenNumber
+    );
+    return position >= 0 ? position * avgConsultTime : 0;
   };
 
   const getEntries = async () => {
     try {
-      const today = new Date().toISOString().split('T')[0];
+      const today = new Date().toISOString().split("T")[0];
       const response = await databases.listDocuments(
         DATABASE_ID,
         COLLECTION_ID,
-        [
+        [Query.equal("date", today), Query.orderAsc("tokenNumber")],
-          Query.equal('date', today),
-          Query.orderAsc('tokenNumber')
-        ],
         100
       );
       return response.documents;
@@ -63,7 +62,9 @@ export default function EntriesTable() {
 
     setCurrentToken(current?.tokenNumber || null);
     setPreviousToken(currentIndex > 0 ? entries[currentIndex - 1]?.tokenNumber : null);
-    setNextToken(currentIndex < entries.length - 1 ? entries[currentIndex + 1]?.tokenNumber : null);
+    setNextToken(
+      currentIndex < entries.length - 1 ? entries[currentIndex + 1]?.tokenNumber : null
+    );
 
     const missed = entries
       .filter((entry) => entry.status === "missed")
@@ -75,12 +76,9 @@ export default function EntriesTable() {
   const updateStatus = async (entryId, newStatus) => {
     try {
       setLoading(true);
-      await databases.updateDocument(
+      await databases.updateDocument(DATABASE_ID, COLLECTION_ID, entryId, {
-        DATABASE_ID,
+        status: newStatus,
-        COLLECTION_ID,
+      });
-        entryId,
-        { status: newStatus }
-      );
       const data = await getEntries();
       setEntries(data);
       setFilteredEntries(data);
@@ -94,18 +92,13 @@ export default function EntriesTable() {
   };
 
   useEffect(() => {
-    if (userRole === "patient") return; // Don't load data if patient
+    if (userRole === "patient") return;
-
     const loadData = async () => {
       try {
         const data = await getEntries();
         setEntries(data);
         setFilteredEntries(data);
         updateTokenInfo(data);
-
-        // Load settings (avg consultation time)
-        // const settings = await getSettings();
-        // setAvgConsultTime(settings?.avgConsultationTime || 15);
       } catch (err) {
         setError(err.message);
       } finally {
@@ -131,17 +124,19 @@ export default function EntriesTable() {
   const currentEntries = filteredEntries.slice(indexOfFirstEntry, indexOfLastEntry);
   const totalPages = Math.ceil(filteredEntries.length / entriesPerPage);
 
-  if (loading) return <div className="text-center mt-50">
+  if (loading)
-    <div className={`animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 border-blue-500 mx-auto`}></div>
+    return (
-    <p className={`mt-4 text-lg font-semibold`}>Loading...</p>
+      <div className="text-center mt-20">
-  </div>;
+        <div className="animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 border-blue-500 mx-auto"></div>
+        <p className="mt-4 text-lg font-semibold">Loading...</p>
+      </div>
+    );
 
   if (error) return <div className="p-4 text-red-500">Error: {error}</div>;
 
-  // Check user role and show permission message if patient
   if (userRole === "patient") {
     return (
-      <div className={`min-h-screen w-full ${darkMode ? 'bg-gray-900 text-white' : 'bg-white text-black'}`}>
+      <div className={`min-h-screen w-full ${darkMode ? "bg-gray-900 text-white" : "bg-white text-black"}`}>
         <div className="flex items-center justify-center h-screen">
           <div className="text-center">
             <h1 className="text-2xl font-bold mb-4">Access Denied</h1>
@@ -153,24 +148,56 @@ export default function EntriesTable() {
   }
 
   return (
-    <div className={`min-h-screen w-full ${darkMode ? 'bg-gray-900 text-white' : 'bg-white text-black'}`}>
+    <div className={`min-h-screen w-full ${darkMode ? "bg-gray-900 text-white" : "bg-white text-black"}`}>
       <div className="sticky top-0 z-10 bg-white shadow-md mb-4">
         <Header
           currentToken={currentToken}
           previousToken={previousToken}
           nextToken={nextToken}
           missedTokens={missedTokens}
-          entries={entries} // Pass the entries data
+          entries={entries}
         />
       </div>
+
+      <div className="p-4">
         <h1 className="text-2xl font-bold mb-4">Today&apos;s Entries</h1>
+       <div className={`
+  hidden md:flex items-center gap-[2px] 
+  border ${darkMode ? 'border-gray-600 bg-gray-800' : 'border-gray-300 bg-white'}
+  p-2 rounded-lg 
+  h-[45px] w-[300px] lg:w-[400px] ml-2 mb-6
+  transition-colors duration-300
+  focus-within:ring-2 focus-within:ring-blue-500 focus-within:ring-opacity-50
+  ${darkMode ? 'focus-within:border-gray-500' : 'focus-within:border-blue-500'}
+`}>
+  <div className="relative flex-1">
+    <FaSearch className={`
+      absolute left-3 top-1/2 transform -translate-y-1/2 
+      ${darkMode ? 'text-gray-400' : 'text-gray-500'}
+    `} />
     <input
       type="text"
       placeholder="Search by token or name"
-        className="mb-4 p-2 border rounded bg-white w-full max-w-sm"
+      className={`
+        w-full bg-transparent border-none 
+        pl-10 pr-10 py-2 
+        focus:outline-none 
+        ${darkMode ? 'text-gray-200 placeholder-gray-500' : 'text-gray-800 placeholder-gray-400'}
+        text-sm
+      `}
       value={searchQuery}
       onChange={(e) => setSearchQuery(e.target.value)}
     />
+  </div>
+  <div className={`
+    px-2 py-1 
+    ${darkMode ? 'bg-gray-700 text-gray-300' : 'bg-gray-100 text-gray-500'}
+    text-xs rounded-md 
+    font-mono
+  `}>
+    ⌘K
+  </div>
+</div>
 
         {filteredEntries.length === 0 ? (
           <div className="p-4">No entries found for today.</div>
@@ -181,9 +208,7 @@ export default function EntriesTable() {
                 <tr>
                   <th className="p-3 text-left">Token</th>
                   <th className="p-3 text-left">Name</th>
-                {/* <th className="p-3 text-left">Booked By</th> */}
                   <th className="p-3 text-left">Status</th>
-                {/* <th className="p-3 text-left">Wait Time</th> */}
                   <th className="p-3 text-left">Actions</th>
                 </tr>
               </thead>
@@ -191,35 +216,23 @@ export default function EntriesTable() {
                 {currentEntries.map((entry) => (
                   <tr
                     key={entry.$id}
-                  className={`border ${darkMode ? 'border-gray-700' : 'border-gray-200'}`}
+                    className={`border ${darkMode ? "border-gray-700" : "border-gray-200"}`}
                   >
                     <td className="p-3 font-mono">{entry.tokenNumber}</td>
                     <td className="p-3">{entry.patientName}</td>
-                  {/* <td className="p-3">
-                    <span className={`text-xs px-2 py-1 rounded ${entry.bookedBy === 'staff' ?
-                      'bg-purple-100 text-purple-800' :
-                      'bg-blue-100 text-blue-800'
-                      }`}>
-                      {entry.bookedBy}
-                    </span>
-                  </td> */}
                     <td className="p-3">
                       <span
-                      className={`px-2 py-1 rounded-full text-xs ${entry.status === "done"
+                        className={`px-2 py-1 rounded-full text-xs font-semibold ${
+                          entry.status === "done"
                             ? "bg-green-100 text-green-800"
                             : entry.status === "booked"
                             ? "bg-yellow-100 text-yellow-800"
                             : "bg-red-100 text-red-800"
-                        } font-semibold`}
+                        }`}
                       >
                         {entry.status === "booked" ? "In-Queue" : entry.status}
                       </span>
                     </td>
-                  {/* <td className="p-3">
-                    {entry.status === "booked" ?
-                      `~${calculateWaitTime(entry.tokenNumber)} mins` :
-                      '-'}
-                  </td> */}
                     <td className="p-3 flex gap-2">
                       {entry.status === "booked" && (
                         <>
@@ -244,8 +257,11 @@ export default function EntriesTable() {
             </table>
 
             {/* Pagination */}
-          <div className={`flex justify-between items-center mt-4 ${darkMode ? 'text-white' : 'text-gray-700'
+            <div
-            }`}>
+              className={`flex justify-between items-center mt-6 ${
+                darkMode ? "text-white" : "text-gray-700"
+              }`}
+            >
               <button
                 disabled={currentPage === 1}
                 onClick={() => setCurrentPage((prev) => prev - 1)}
@@ -267,5 +283,6 @@ export default function EntriesTable() {
           </>
         )}
       </div>
+    </div>
   );
 }