From ce65be4f9ac375023f9a892f60eedafd8957d9cf Mon Sep 17 00:00:00 2001
From: Basichy <ethanmarcg@gmail.com>
Date: Fri, 31 Jul 2026 00:32:01 +1000
Subject: [PATCH 1/2] Feature Admin Panel, Add read-only shift oversight table

---
 app-frontend/admin-panel/src/pages/Shifts.jsx | 180 +++++++++++++++++-
 1 file changed, 178 insertions(+), 2 deletions(-)

diff --git a/app-frontend/admin-panel/src/pages/Shifts.jsx b/app-frontend/admin-panel/src/pages/Shifts.jsx
index 88f6fb050..89d34a8dc 100644
--- a/app-frontend/admin-panel/src/pages/Shifts.jsx
+++ b/app-frontend/admin-panel/src/pages/Shifts.jsx
@@ -1,8 +1,184 @@
+import { useEffect, useMemo, useState } from 'react';
+import { getShifts } from '../service/adminAPI';
+import DataTable from '../components/DataTable';
+import LoadingComponent from '../components/LoadingComponent';
+import SearchFilter from '../components/SearchFilter';
+
+// List of status options for the filter
+const STATUS_OPTIONS = ['draft', 'open', 'applied', 'assigned', 'completed'];
+
+// Number of shifts shown per page
+const PAGE_SIZE = 20;
+
+// Format the shift date
+function formatDate(d) {
+  if (!d) return '\u2014';
+  const parsed = new Date(d);
+  return Number.isNaN(parsed.getTime()) ? '\u2014' : parsed.toLocaleDateString();
+}
+
+// Format the shift start and end times
+function formatTimes(r) {
+  if (!r.startTime && !r.endTime) return '\u2014';
+  return `${r.startTime || '\u2014'} \u2013 ${r.endTime || '\u2014'}`;
+}
+
+// Show a person's name or email if no name exists
+function personLabel(person) {
+  if (!person) return '\u2014';
+  return person.name || person.email || '\u2014';
+}
+
+// Read-only admin oversight of all shifts
 export default function Shifts() {
+  const [shifts, setShifts] = useState([]);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState('');
+  const [query, setQuery] = useState('');
+  const [status, setStatus] = useState('');
+  const [page, setPage] = useState(1);
+
+  // Load all shifts when the page opens
+  useEffect(() => {
+    let mounted = true;
+    (async () => {
+      try {
+        setLoading(true);
+        setError('');
+
+        // Get shifts from the backend
+        const data = await getShifts();
+        const list = Array.isArray(data) ? data : data.shifts || data.data || [];
+        if (mounted) setShifts(list);
+      } catch (err) {
+        if (mounted) setError(err?.response?.data?.message || 'Failed to load shifts');
+      } finally {
+        if (mounted) setLoading(false);
+      }
+    })();
+    return () => {
+      mounted = false;
+    };
+  }, []);
+
+  // Go back to page 1 when the search or filter changes
+  useEffect(() => {
+    setPage(1);
+  }, [query, status]);
+
+  // Filter shifts by search text and status
+  const filtered = useMemo(() => {
+    const q = query.trim().toLowerCase();
+    return shifts.filter((s) => {
+      if (status && s.status !== status) return false;
+      if (!q) return true;
+      const haystack = [
+        s.title,
+        s.status,
+        personLabel(s.createdBy),
+        s.createdBy?.email,
+        personLabel(s.acceptedBy),
+        s.acceptedBy?.email,
+      ]
+        .filter(Boolean)
+        .join(' ')
+        .toLowerCase();
+      return haystack.includes(q);
+    });
+  }, [shifts, query, status]);
+
+  // Calculate pagination
+  const totalPages = Math.max(1, Math.ceil(filtered.length / PAGE_SIZE));
+  const currentPage = Math.min(page, totalPages);
+  const paged = filtered.slice((currentPage - 1) * PAGE_SIZE, currentPage * PAGE_SIZE);
+
+  // Column shown in the table
+  const columns = [
+    { key: 'title', header: 'Title' },
+    { key: 'date', header: 'Date', render: (r) => formatDate(r.date) },
+    { key: 'times', header: 'Time', render: (r) => formatTimes(r) },
+    { key: 'status', header: 'Status' },
+    { key: 'employer', header: 'Employer', render: (r) => personLabel(r.createdBy) },
+    { key: 'guard', header: 'Guard', render: (r) => personLabel(r.acceptedBy) },
+  ];
+
+  // Display the admin shifts page
   return (
     <div>
       <h1>Shifts</h1>
-      <p style={{ color: '#777' }}>Planned (Sprint 2). Backend: GET /admin/shifts.</p>
+      <p style={{ color: '#777', marginTop: -8 }}>Read-only oversight of all shifts.</p>
+
+      <div style={{ display: 'flex', gap: 12, alignItems: 'center', flexWrap: 'wrap' }}>
+        <SearchFilter
+          value={query}
+          onChange={setQuery}
+          placeholder={'Search title, employer, guard\u2026'}
+        />
+        <select
+          value={status}
+          onChange={(e) => setStatus(e.target.value)}
+          style={{
+            padding: '8px 12px',
+            border: '1px solid #ccc',
+            borderRadius: 4,
+            marginBottom: 16,
+          }}
+        >
+          <option value="">All statuses</option>
+          {STATUS_OPTIONS.map((s) => (
+            <option key={s} value={s}>
+              {s}
+            </option>
+          ))}
+        </select>
+      </div>
+
+      {loading ? (
+        <LoadingComponent label={'Loading shifts\u2026'} />
+      ) : error ? (
+        <p style={{ color: '#c00' }}>{error}</p>
+      ) : (
+        <>
+          <DataTable columns={columns} rows={paged} empty="No shifts found" />
+          {filtered.length > 0 && (
+            <div
+              style={{
+                display: 'flex',
+                justifyContent: 'space-between',
+                alignItems: 'center',
+                marginTop: 12,
+                color: '#555',
+                fontSize: 14,
+              }}
+            >
+              <span>
+                Showing {(currentPage - 1) * PAGE_SIZE + 1}
+                {'\u2013'}
+                {Math.min(currentPage * PAGE_SIZE, filtered.length)} of {filtered.length}
+              </span>
+              <div style={{ display: 'flex', gap: 8 }}>
+                <button
+                  type="button"
+                  onClick={() => setPage((p) => Math.max(1, p - 1))}
+                  disabled={currentPage <= 1}
+                >
+                  Prev
+                </button>
+                <span>
+                  Page {currentPage} of {totalPages}
+                </span>
+                <button
+                  type="button"
+                  onClick={() => setPage((p) => Math.min(totalPages, p + 1))}
+                  disabled={currentPage >= totalPages}
+                >
+                  Next
+                </button>
+              </div>
+            </div>
+          )}
+        </>
+      )}
     </div>
   );
-}
+}
\ No newline at end of file

From 60ddb09e96ceaedc38e9437aeb54a49e2957b48c Mon Sep 17 00:00:00 2001
From: Ethan <128652728+Basichy@users.noreply.github.com>
Date: Fri, 31 Jul 2026 00:50:32 +1000
Subject: [PATCH 2/2] Fix lint formatting

---
 app-frontend/admin-panel/src/pages/Shifts.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-frontend/admin-panel/src/pages/Shifts.jsx b/app-frontend/admin-panel/src/pages/Shifts.jsx
index 89d34a8dc..56ef61478 100644
--- a/app-frontend/admin-panel/src/pages/Shifts.jsx
+++ b/app-frontend/admin-panel/src/pages/Shifts.jsx
@@ -181,4 +181,4 @@ export default function Shifts() {
       )}
     </div>
   );
-}
\ No newline at end of file
+}