From e10e2a36b06ae32cf4829c1c013e1b8bd775b0e0 Mon Sep 17 00:00:00 2001
From: soundsng <thesoundsng@gmail.com>
Date: Thu, 25 Jun 2026 14:49:25 +0100
Subject: [PATCH 1/2] feat: add Stocktake management page [FE-20] (#957)

---
 frontend/app/(dashboard)/stocktake/page.tsx | 57 +++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 frontend/app/(dashboard)/stocktake/page.tsx

diff --git a/frontend/app/(dashboard)/stocktake/page.tsx b/frontend/app/(dashboard)/stocktake/page.tsx
new file mode 100644
index 00000000..2bfce3bd
--- /dev/null
+++ b/frontend/app/(dashboard)/stocktake/page.tsx
@@ -0,0 +1,57 @@
+'use client';
+
+import { useState } from 'react';
+import { Plus, BarChart3, CheckCircle, AlertTriangle } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+
+type AuditStatus = 'SCHEDULED' | 'IN_PROGRESS' | 'COMPLETE';
+interface Audit { id: string; name: string; department: string; scheduledDate: string; status: AuditStatus; total: number; scanned: number; discrepancies: number }
+
+const MOCK: Audit[] = [
+  { id:'1', name:'Q1 IT Audit', department:'Engineering', scheduledDate:'2024-01-30', status:'IN_PROGRESS', total:45, scanned:32, discrepancies:3 },
+  { id:'2', name:'Annual Furniture Check', department:'All', scheduledDate:'2024-02-15', status:'SCHEDULED', total:120, scanned:0, discrepancies:0 },
+  { id:'3', name:'Q4 2023 Audit', department:'Admin', scheduledDate:'2023-12-20', status:'COMPLETE', total:30, scanned:30, discrepancies:1 },
+];
+
+const STATUS_BADGE: Record<AuditStatus, string> = { SCHEDULED:'bg-gray-100 text-gray-600', IN_PROGRESS:'bg-blue-50 text-blue-700', COMPLETE:'bg-green-50 text-green-700' };
+
+export default function StocktakePage() {
+  const [audits] = useState<Audit[]>(MOCK);
+  return (
+    <div>
+      <div className="flex items-center justify-between mb-6">
+        <div><h1 className="text-2xl font-bold text-gray-900">Stocktake</h1><p className="text-sm text-gray-500 mt-1">Schedule audits, scan assets, review discrepancies</p></div>
+        <Button><Plus size={16} className="mr-1.5"/>Schedule Audit</Button>
+      </div>
+      <div className="bg-white rounded-xl border border-gray-200 overflow-hidden">
+        <table className="w-full text-sm">
+          <thead><tr className="border-b border-gray-200 bg-gray-50">{["Audit Name","Department","Date","Status","Progress","Discrepancies"].map(h=><th key={h} className="text-left px-4 py-3 font-medium text-gray-500">{h}</th>)}</tr></thead>
+          <tbody>
+            {audits.map(a => {
+              const pct = a.total > 0 ? Math.round((a.scanned / a.total) * 100) : 0;
+              return (
+                <tr key={a.id} className="border-b border-gray-100 hover:bg-gray-50 cursor-pointer">
+                  <td className="px-4 py-3 font-medium text-gray-900">{a.name}</td>
+                  <td className="px-4 py-3 text-gray-600">{a.department}</td>
+                  <td className="px-4 py-3 text-gray-500">{a.scheduledDate}</td>
+                  <td className="px-4 py-3"><span className={px-2 py-0.5 rounded-full text-xs font-medium }>{a.status.replace('_',' ')}</span></td>
+                  <td className="px-4 py-3">
+                    <div className="flex items-center gap-2">
+                      <div className="w-20 h-1.5 bg-gray-200 rounded-full"><div className="h-1.5 bg-blue-500 rounded-full" style={{width:${pct}%}}/></div>
+                      <span className="text-xs text-gray-500">{a.scanned}/{a.total}</span>
+                    </div>
+                  </td>
+                  <td className="px-4 py-3">
+                    {a.discrepancies > 0
+                      ? <span className="flex items-center gap-1 text-red-600 text-xs"><AlertTriangle size={13}/>{a.discrepancies}</span>
+                      : <span className="flex items-center gap-1 text-green-600 text-xs"><CheckCircle size={13}/>None</span>}
+                  </td>
+                </tr>
+              );
+            })}
+          </tbody>
+        </table>
+      </div>
+    </div>
+  );
+}
\ No newline at end of file

From 671b69bcb7d00acd3a516fbd0f41b869eaeb2e24 Mon Sep 17 00:00:00 2001
From: soundsng <thesoundsng@gmail.com>
Date: Thu, 25 Jun 2026 14:49:27 +0100
Subject: [PATCH 2/2] feat: add Organisation settings page [FE-25] (#962)

---
 .../settings/organisation/page.tsx            | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 frontend/app/(dashboard)/settings/organisation/page.tsx

diff --git a/frontend/app/(dashboard)/settings/organisation/page.tsx b/frontend/app/(dashboard)/settings/organisation/page.tsx
new file mode 100644
index 00000000..f26c8f1e
--- /dev/null
+++ b/frontend/app/(dashboard)/settings/organisation/page.tsx
@@ -0,0 +1,45 @@
+'use client';
+
+import { useState } from 'react';
+import { Building2, Upload } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+
+export default function OrganisationSettingsPage() {
+  const [orgName, setOrgName] = useState('Acme Corporation');
+  const [tagline, setTagline] = useState('Asset Management Platform');
+  const [plan] = useState('Business');
+
+  return (
+    <div>
+      <div className="mb-6"><h1 className="text-2xl font-bold text-gray-900">Organisation Settings</h1><p className="text-sm text-gray-500 mt-1">Manage org name, branding, and plan information</p></div>
+      <div className="space-y-4 max-w-xl">
+        <div className="bg-white rounded-xl border border-gray-200 p-6">
+          <h2 className="text-sm font-semibold text-gray-900 mb-4 flex items-center gap-2"><Building2 size={16}/>Organisation Details</h2>
+          <div className="space-y-4">
+            <div><label className="text-xs font-medium text-gray-500 block mb-1">Organisation Name</label>
+              <input value={orgName} onChange={e=>setOrgName(e.target.value)} className="w-full text-sm border border-gray-300 rounded-lg px-3 py-2 focus:outline-none focus:ring-2 focus:ring-gray-900"/></div>
+            <div><label className="text-xs font-medium text-gray-500 block mb-1">Tagline</label>
+              <input value={tagline} onChange={e=>setTagline(e.target.value)} className="w-full text-sm border border-gray-300 rounded-lg px-3 py-2 focus:outline-none focus:ring-2 focus:ring-gray-900"/></div>
+          </div>
+          <Button className="mt-4">Save Changes</Button>
+        </div>
+        <div className="bg-white rounded-xl border border-gray-200 p-6">
+          <h2 className="text-sm font-semibold text-gray-900 mb-4">Branding</h2>
+          <div className="flex items-center gap-4">
+            <div className="w-16 h-16 rounded-xl bg-gray-100 flex items-center justify-center"><Building2 size={24} className="text-gray-400"/></div>
+            <div><p className="text-sm text-gray-700 mb-1">Organisation Logo</p><p className="text-xs text-gray-400 mb-2">PNG or SVG, max 2MB</p>
+              <Button variant="outline" size="sm"><Upload size={14} className="mr-1.5"/>Upload Logo</Button></div>
+          </div>
+        </div>
+        <div className="bg-white rounded-xl border border-gray-200 p-6">
+          <h2 className="text-sm font-semibold text-gray-900 mb-3">Plan Information</h2>
+          <div className="flex items-center justify-between">
+            <div><p className="text-sm text-gray-700">Current Plan</p><p className="text-2xl font-bold text-gray-900 mt-0.5">{plan}</p></div>
+            <span className="px-3 py-1 bg-blue-50 text-blue-700 rounded-full text-sm font-medium">Active</span>
+          </div>
+          <Button variant="outline" className="mt-3 text-sm">Upgrade Plan</Button>
+        </div>
+      </div>
+    </div>
+  );
+}
\ No newline at end of file