Skip to content

Commit 030b14d

Browse files
ruchiralakruchiralak
committed
Finalize the Super admin Component
1 parent a9be787 commit 030b14d

File tree

4 files changed

+3
-110
lines changed

4 files changed

+3
-110
lines changed

‎docs/api/API_INVITATIONS.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,6 @@ return <RegistrationForm invitation={data.invitation} />;
349349
- Throws `"Invalid token"` on a non-OK response; surfaced via `error` from React Query.
350350
- Uses a scoped query key `["invitation", token]` so each token is cached independently.
351351

352-
353352
## POST `/api/invitations`
354353

355354
Create and send an invitation to a new user.
@@ -679,7 +678,6 @@ return <RegistrationForm invitation={data.invitation} />;
679678
- Throws `"Invalid token"` on a non-OK response; surfaced via `error` from React Query.
680679
- Uses a scoped query key `["invitation", token]` so each token is cached independently.
681680

682-
683681
## POST `/api/invitations`
684682

685683
Create and send an invitation to a new user.

‎server/src/app/admin/projects/page.tsx‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -202,22 +202,10 @@ export default function ProjectsPage() {
202202
<AsideSidebar />
203203

204204
<div className="flex-1 p-8 space-y-6 min-w-0">
205-
<<<<<<< HEAD
206-
{/* Header */}
207-
<div className="flex items-center justify-between">
208-
<h1 className="text-page-title text-[#0A0A0A]">Projects</h1>
209-
<Button
210-
className="bg-[#0A0A0A] text-white hover:bg-[#333] flex items-center gap-2"
211-
onClick={() => { setCreateForm(EMPTY_FORM); setShowCreate(true); }}
212-
>
213-
+ Create New Project
214-
</Button>
215-
</div>
216-
=======
217205
{/* Header + Stat Cards */}
218206
<Card className="p-6 space-y-4">
219207
<div className="flex items-center justify-between">
220-
<h1 className="text-2xl font-bold text-[#0A0A0A]">Projects</h1>
208+
<h1 className="text-page-title text-[#0A0A0A]">Projects</h1>
221209
<Button
222210
className="bg-[#0A0A0A] text-white hover:bg-[#333] flex items-center gap-2"
223211
onClick={() => {
@@ -228,7 +216,6 @@ export default function ProjectsPage() {
228216
+ Create New Project
229217
</Button>
230218
</div>
231-
>>>>>>> origin/86ewz6ncb-Create-the-Report-component
232219

233220
<div className="grid grid-cols-1 md:grid-cols-3 gap-4">
234221
<div className="flex items-center justify-between rounded-xl border border-[#E5E5E5] bg-[#fafafa] p-5">

‎server/src/app/admin/reports/page.tsx‎

Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -311,91 +311,10 @@ export default function ReportsPage() {
311311
<AsideSidebar />
312312

313313
<div className="flex-1 p-8 space-y-6">
314-
<<<<<<< HEAD
315-
{/* Header */}
316-
<div className="flex items-center justify-between">
317-
<h1 className="text-page-title text-[#0A0A0A]">Reports</h1>
318-
<Button className="bg-[#0A0A0A] text-white hover:bg-[#333]">
319-
Generate Report
320-
</Button>
321-
</div>
322-
323-
{/* Stat Cards */}
324-
<div className="grid grid-cols-1 md:grid-cols-3 gap-4">
325-
<Card className="flex items-center justify-between p-6">
326-
<div>
327-
<p className="text-sm text-[#737373]">Total Generated</p>
328-
<p className="text-3xl font-bold text-[#0A0A0A]">1,284</p>
329-
</div>
330-
<FileText className="text-[#737373]" size={28} />
331-
</Card>
332-
<Card className="flex items-center justify-between p-6">
333-
<div>
334-
<p className="text-sm text-[#737373]">Pending Reports</p>
335-
<p className="text-3xl font-bold text-[#0A0A0A]">42</p>
336-
</div>
337-
<Clock className="text-yellow-500" size={28} />
338-
</Card>
339-
<Card className="flex items-center justify-between p-6">
340-
<div>
341-
<p className="text-sm text-[#737373]">Completed Reports</p>
342-
<p className="text-3xl font-bold text-[#0A0A0A]">1,242</p>
343-
</div>
344-
<CheckCircle className="text-green-500" size={28} />
345-
</Card>
346-
</div>
347-
348-
{/* Filters */}
349-
<Card className="p-4">
350-
<div className="flex flex-wrap gap-4 items-end">
351-
<div className="flex flex-col gap-1">
352-
<label className="text-xs text-[#737373] font-semibold uppercase tracking-wide">
353-
Project
354-
</label>
355-
<Select>
356-
<SelectTrigger className="w-[160px]">
357-
<SelectValue placeholder="All Projects" />
358-
</SelectTrigger>
359-
<SelectContent>
360-
<SelectItem value="all">All Projects</SelectItem>
361-
<SelectItem value="alpha">Alpha Initiative</SelectItem>
362-
<SelectItem value="beta">Beta Growth Phase</SelectItem>
363-
<SelectItem value="quantum">Quantum Leap</SelectItem>
364-
<SelectItem value="eco">Eco-Sustain Project</SelectItem>
365-
</SelectContent>
366-
</Select>
367-
</div>
368-
<div className="flex flex-col gap-1">
369-
<label className="text-xs text-[#737373] font-semibold uppercase tracking-wide">
370-
Mentor
371-
</label>
372-
<Select>
373-
<SelectTrigger className="w-[160px]">
374-
<SelectValue placeholder="Select Mentor" />
375-
</SelectTrigger>
376-
<SelectContent>
377-
<SelectItem value="aris">Dr. Aris Thorne</SelectItem>
378-
<SelectItem value="sarah">Sarah Jenkins</SelectItem>
379-
<SelectItem value="marcus">Marcus Vane</SelectItem>
380-
<SelectItem value="elena">Elena Rossi</SelectItem>
381-
</SelectContent>
382-
</Select>
383-
</div>
384-
<div className="flex flex-col gap-1">
385-
<label className="text-xs text-[#737373] font-semibold uppercase tracking-wide">
386-
Date Range
387-
</label>
388-
<input
389-
type="date"
390-
className="border border-[#E5E5E5] rounded-md px-3 py-2 text-sm text-[#0A0A0A] bg-white focus:outline-none focus:ring-2 focus:ring-[#3B82F6]"
391-
/>
392-
</div>
393-
=======
394314
{/* Header + Stat Cards */}
395315
<Card className="p-6 space-y-4">
396316
<div className="flex items-center justify-between">
397-
<h1 className="text-2xl font-bold text-[#0A0A0A]">Reports</h1>
398-
>>>>>>> origin/86ewz6ncb-Create-the-Report-component
317+
<h1 className="text-page-title text-[#0A0A0A]">Reports</h1>
399318
<Button
400319
className="bg-[#0A0A0A] text-white hover:bg-[#333]"
401320
disabled={isExporting || isLoading}

‎server/src/app/admin/users/page.tsx‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ export default function UsersPage() {
311311
<Card className="overflow-hidden border-[#d9dde5] bg-white">
312312
<div className="space-y-4 p-4 md:p-5">
313313
<div>
314-
<h1 className="text-2xl font-bold text-slate-900">
314+
<h1 className="text-page-title text-slate-900">
315315
User Administration
316316
</h1>
317317
<p className="mt-1 text-sm text-slate-500">
@@ -320,16 +320,6 @@ export default function UsersPage() {
320320
</p>
321321
</div>
322322

323-
<<<<<<< HEAD
324-
<div className="space-y-4 p-4 md:p-5">
325-
<div>
326-
<h1 className="text-page-title text-slate-900">User Administration</h1>
327-
<p className="mt-1 text-sm text-slate-500">
328-
Manage system users, define their platform roles, and monitor
329-
account statuses.
330-
</p>
331-
</div>
332-
=======
333323
<div className="flex flex-wrap items-end gap-3 rounded-lg border border-[#e4e7ed] bg-[#f8fafc] p-3">
334324
<div className="space-y-1">
335325
<p className="text-[10px] font-bold tracking-wider text-slate-500 uppercase">
@@ -353,7 +343,6 @@ export default function UsersPage() {
353343
</SelectContent>
354344
</Select>
355345
</div>
356-
>>>>>>> origin/86ewz6ncb-Create-the-Report-component
357346

358347
<div className="space-y-1">
359348
<p className="text-[10px] font-bold tracking-wider text-slate-500 uppercase">

0 commit comments

Comments
 (0)