Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

quality of life to admin panel (#404)

bautistaaaeb9ecb9d22cb
diff --git a/apps/admin/package.json b/apps/admin/package.json
index 3054c2b6..3119a5a4 100644
--- a/apps/admin/package.json
+++ b/apps/admin/package.json
@@ -6,7 +6,7 @@
"scripts": {
"build": "next build",
"clean": "rm -rf .next dist node_modules",
- "dev": "dotenv -e ../../.env next dev -p 3001",
+ "dev": "dotenv -e ../../.env next dev -- -p 3001",
"format": "prettier -w \"src/**/*.{ts,tsx,css,cjs,mjs,json}\"",
"lint": "eslint .",
"start": "next start",
diff --git a/apps/admin/src/app/_components/TabView.tsx b/apps/admin/src/app/_components/TabView.tsx
new file mode 100644
index 00000000..689c85d5
--- /dev/null
+++ b/apps/admin/src/app/_components/TabView.tsx
@@ -0,0 +1,105 @@
+'use client';
+
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@repo/ui';
+import { useRouter, useSearchParams } from 'next/navigation';
+import React from 'react';
+import type { InfiniteReports } from '../report/[id]/_components/report/report.action';
+import type { BannedUsers, UploadedImages } from './admin.actions';
+import { ChallengeReviews } from './challenge-reviews';
+import { ImageUploadReport } from './images';
+import Reports from './reports';
+import { ManageTracks } from './tracks';
+import { BannedUsers as BannedUserComponent } from './users';
+
+interface Props {
+ reports: InfiniteReports;
+ allBannedUsers: BannedUsers;
+ uploadedImages: UploadedImages;
+}
+
+export function TabView({ reports, allBannedUsers, uploadedImages }: Props) {
+ const searchParams = useSearchParams();
+ const router = useRouter();
+
+ const tab = searchParams.get('tab') ?? 'reports';
+ return (
+ <div className="container m-8 flex flex-col space-y-4">
+ <div className="space-y-2">
+ <div className="mx-2 flex flex-col">
+ <p className="text-2xl font-semibold text-black dark:text-white">Moderation</p>
+ <p className="text-start text-sm text-neutral-400 dark:text-neutral-600">
+ A view of all the reports & users and all uploaded user images
+ </p>
+ </div>
+ <div className="flex flex-col space-y-2">
+ <Tabs className="space-x-4" defaultValue={tab}>
+ <TabsList className="border-border bg-background rounded-full border">
+ <TabsTrigger
+ className="data-[state=active]:bg-border rounded-l-2xl rounded-r-lg duration-300"
+ value="reports"
+ onClick={() => {
+ router.push('/?tab=reports');
+ }}
+ >
+ Reports
+ </TabsTrigger>
+ <TabsTrigger
+ className="data-[state=active]:bg-border duration-300"
+ value="challengeReviews"
+ onClick={() => {
+ router.push('/?tab=challengeReviews');
+ }}
+ >
+ Challenge Reviews
+ </TabsTrigger>
+ <TabsTrigger
+ className="data-[state=active]:bg-border duration-300"
+ value="users"
+ onClick={() => {
+ router.push('/?tab=users');
+ }}
+ >
+ Users
+ </TabsTrigger>
+ <TabsTrigger
+ className="data-[state=active]:bg-border duration-300"
+ value="images"
+ onClick={() => {
+ router.push('/?tab=images');
+ }}
+ >
+ Images
+ </TabsTrigger>
+ <TabsTrigger
+ className="data-[state=active]:bg-border rounded-l-lg rounded-r-2xl duration-300"
+ value="tracks"
+ onClick={() => {
+ router.push('/?tab=tracks');
+ }}
+ >
+ Tracks
+ </TabsTrigger>
+ </TabsList>
+ <TabsContent value="reports">
+ <React.Suspense fallback={<>Loading...</>}>
+ <Reports initialReports={reports} />
+ </React.Suspense>
+ </TabsContent>
+ <TabsContent value="users">
+ <BannedUserComponent data={allBannedUsers} />
+ </TabsContent>
+ <TabsContent value="challengeReviews">
+ <ChallengeReviews />
+ </TabsContent>
+ <TabsContent value="images">
+ <ImageUploadReport data={uploadedImages} />
+ </TabsContent>
+ <TabsContent value="tracks">
+ <ManageTracks />
+ </TabsContent>
+ </Tabs>
+ </div>
+ </div>
+ </div>
+ );
+}
diff --git a/apps/admin/src/app/_components/admin.actions.tsx b/apps/admin/src/app/_components/admin.actions.tsx
index e88d761b..30ff584b 100644
--- a/apps/admin/src/app/_components/admin.actions.tsx
+++ b/apps/admin/src/app/_components/admin.actions.tsx
@@ -33,7 +33,7 @@ export async function addReport(
});
}
-export type AdminBannedUsers = Awaited<ReturnType<typeof getBannedUsers>>;
+export type BannedUsers = Awaited<ReturnType<typeof getBannedUsers>>;
export async function deleteComment(commentId: number, reportId: number) {
return prisma.$transaction([
@@ -58,6 +58,7 @@ export async function deleteComment(commentId: number, reportId: number) {
* The function fetches all the banned
* user's.
*/
+export type GetBannedUsers = NonNullable<Awaited<ReturnType<typeof getBannedUsers>>>;
export async function getBannedUsers() {
return prisma.user.findMany({
where: {
@@ -238,6 +239,7 @@ export async function getChallenge(id: number) {
});
}
+export type UploadedImages = Awaited<ReturnType<typeof getUploadedImages>>;
/**
* The function fetches the last 100 uploaded images.
*/
diff --git a/apps/admin/src/app/_components/tracks/columns.tsx b/apps/admin/src/app/_components/tracks/columns.tsx
index 6e0b680b..61f465ba 100644
--- a/apps/admin/src/app/_components/tracks/columns.tsx
+++ b/apps/admin/src/app/_components/tracks/columns.tsx
@@ -23,7 +23,6 @@ export const columns: ColumnDef<Track & { trackChallenges: TrackChallenge[] }>[]
accessorKey: 'trackChallenges',
header: 'No. of challenges',
cell: ({ row }) => {
- console.log({ row: row.original });
return <pre>{row.original.trackChallenges?.length ?? 0}</pre>;
},
},
diff --git a/apps/admin/src/app/_components/users.tsx b/apps/admin/src/app/_components/users.tsx
index c63eb258..d350571e 100644
--- a/apps/admin/src/app/_components/users.tsx
+++ b/apps/admin/src/app/_components/users.tsx
@@ -14,10 +14,10 @@ import {
} from '@repo/ui';
import { Unlock } from '@repo/ui/icons';
import { useRouter } from 'next/navigation';
-import { unbanUser, type AdminBannedUsers } from './admin.actions';
+import { unbanUser, type BannedUsers } from './admin.actions';
interface BannedUsersProps {
- data: AdminBannedUsers;
+ data: BannedUsers;
}
export function BannedUsers({ data }: BannedUsersProps) {
diff --git a/apps/admin/src/app/challenge/[challengeId]/challenge-review.tsx b/apps/admin/src/app/challenge/[challengeId]/challenge-review.tsx
index 43ff325a..78260fb2 100644
--- a/apps/admin/src/app/challenge/[challengeId]/challenge-review.tsx
+++ b/apps/admin/src/app/challenge/[challengeId]/challenge-review.tsx
@@ -73,7 +73,7 @@ export function ChallengeReview({ challenge }: Props) {
</div>
</div>
<div className="flex justify-end gap-3 p-4">
- <Link href="/admin">
+ <Link href="/?tab=challengeReviews">
<Button variant="ghost">Cancel</Button>
</Link>
<Button onClick={handleDenyChallenge} variant="destructive">
diff --git a/apps/admin/src/app/page.tsx b/apps/admin/src/app/page.tsx
index 853a3b1f..786174b0 100644
--- a/apps/admin/src/app/page.tsx
+++ b/apps/admin/src/app/page.tsx
@@ -1,16 +1,9 @@
-'use server';
import { getServerAuthSession } from '@repo/auth/server';
import { RoleTypes } from '@repo/db/types';
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@repo/ui';
import { Lock } from '@repo/ui/icons';
-import React from 'react';
import { getBannedUsers, getUploadedImages } from './_components/admin.actions';
-import { ChallengeReviews } from './_components/challenge-reviews';
-import { ManageTracks } from './_components/tracks';
import { getInfiniteReports } from './report/[id]/_components/report/report.action';
-import { ImageUploadReport } from './_components/images';
-import { BannedUsers } from './_components/users';
-import Reports from './_components/reports';
+import { TabView } from './_components/TabView';
async function Admin() {
const session = await getServerAuthSession();
@@ -20,11 +13,20 @@ async function Admin() {
const isAdmin = roles.includes(RoleTypes.ADMIN);
const isModOrAdmin = isAdmin || isMod;
+ const allBannedUsers = await getBannedUsers();
+ // This needs done because server functions are dumb and this throws A LOT of errors otherwise.
+ const reports = await getInfiniteReports();
+ const uploadedImages = await getUploadedImages();
+
return (
<div>
<div className="flex flex-col gap-4">
{isModOrAdmin ? (
- <View />
+ <TabView
+ allBannedUsers={allBannedUsers}
+ reports={reports}
+ uploadedImages={uploadedImages}
+ />
) : (
<div className="flex min-h-[calc(100dvh-112px)] w-full flex-col items-center justify-center space-y-2">
<Lock className="h-8 w-8" />
@@ -38,73 +40,4 @@ async function Admin() {
);
}
-// TODO: i think we need nested routing here so we can only load the data when the tab is active
-// 💀 this has to be a job for trash
-const View = async () => {
- const allBannedUsers = await getBannedUsers();
- // This needs done because server functions are dumb and this throws A LOT of errors otherwise.
- const firstPage = await getInfiniteReports();
- const uploadedimages = await getUploadedImages();
-
- return (
- <div className="container m-8 flex flex-col space-y-4">
- <div className="space-y-2">
- <div className="mx-2 flex flex-col">
- <p className="text-2xl font-semibold text-black dark:text-white">Moderation</p>
- <p className="text-start text-sm text-neutral-400 dark:text-neutral-600">
- A view of all the reports & users and all uploaded user images
- </p>
- </div>
- <div className="flex flex-col space-y-2">
- <Tabs className="space-x-4" defaultValue="reports">
- <TabsList className="border-border bg-background rounded-full border">
- <TabsTrigger
- className="data-[state=active]:bg-border rounded-l-2xl rounded-r-lg duration-300"
- value="reports"
- >
- Reports
- </TabsTrigger>
- <TabsTrigger
- className="data-[state=active]:bg-border duration-300"
- value="challengeReviews"
- >
- Challenge Reviews
- </TabsTrigger>
- <TabsTrigger className="data-[state=active]:bg-border duration-300" value="users">
- Users
- </TabsTrigger>
- <TabsTrigger className="data-[state=active]:bg-border duration-300" value="images">
- Images
- </TabsTrigger>
- <TabsTrigger
- className="data-[state=active]:bg-border rounded-l-lg rounded-r-2xl duration-300"
- value="tracks"
- >
- Tracks
- </TabsTrigger>
- </TabsList>
- <TabsContent value="reports">
- <React.Suspense fallback={<>Loading...</>}>
- <Reports initialReports={firstPage} />
- </React.Suspense>
- </TabsContent>
- <TabsContent value="users">
- <BannedUsers data={allBannedUsers} />
- </TabsContent>
- <TabsContent value="challengeReviews">
- <ChallengeReviews />
- </TabsContent>
- <TabsContent value="images">
- <ImageUploadReport data={uploadedimages} />
- </TabsContent>
- <TabsContent value="tracks">
- <ManageTracks />
- </TabsContent>
- </Tabs>
- </div>
- </div>
- </div>
- );
-};
-
export default Admin;
diff --git a/apps/admin/src/app/tracks/[trackId]/_components/update-track-form.tsx b/apps/admin/src/app/tracks/[trackId]/_components/update-track-form.tsx
index 89629749..d12beff7 100644
--- a/apps/admin/src/app/tracks/[trackId]/_components/update-track-form.tsx
+++ b/apps/admin/src/app/tracks/[trackId]/_components/update-track-form.tsx
@@ -15,12 +15,13 @@ import {
Input,
useToast,
} from '@repo/ui';
+import Link from 'next/link';
+import { useMemo } from 'react';
import { useFieldArray, useForm } from 'react-hook-form';
import Select from 'react-select';
import { z } from 'zod';
-import { useMemo } from 'react';
-import type { ChallengesForTrack, TrackToManage } from '../page';
import { updateTrack } from '../_actions/update-track.action';
+import type { ChallengesForTrack, TrackToManage } from '../page';
import { DraggableChallenge } from './draggable-challenge';
const trackChallengeSchema = z.object({
@@ -112,6 +113,7 @@ export function UpdateTrackForm({ challenges, track }: Props) {
});
}
}
+
return (
<ForceRenderUntilClient>
<div className="container flex flex-col gap-5">
@@ -203,6 +205,9 @@ export function UpdateTrackForm({ challenges, track }: Props) {
</div>
<DialogFooter className="py-3">
+ <Link href="/?tab=tracks">
+ <Button variant="ghost">Cancel</Button>
+ </Link>
<Button type="submit">Save</Button>
</DialogFooter>
</form>
diff --git a/apps/web/package.json b/apps/web/package.json
index 155aa402..6a7e6ed2 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -6,7 +6,7 @@
"scripts": {
"build": "next build",
"clean": "rm -rf .next dist node_modules",
- "dev": "dotenv -e ../../.env next dev",
+ "dev": "dotenv -e ../../.env next dev -- -p 3000",
"format": "prettier -w \"src/**/*.{ts,tsx,css,cjs,mjs,json}\"",
"lint": "eslint .",
"start": "next start",