Connect, collaborate, and grow with a community of TypeScript developers
chore: admin dash refactor (#1070)
bautistaaa0c3778965669
diff --git a/apps/admin/src/app/_components/TabView.tsx b/apps/admin/src/app/_components/TabView.tsxdeleted file mode 100644index c8f1f9c6..00000000--- a/apps/admin/src/app/_components/TabView.tsx+++ /dev/null@@ -1,105 +0,0 @@-'use client';--import { Tabs, TabsContent, TabsList, TabsTrigger } from '@repo/ui/components/tabs';-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/challenge-reviews/challenge-reviews.action.ts b/apps/admin/src/app/_components/challenge-reviews/challenge-reviews.action.tsdeleted file mode 100644index c5f66f5a..00000000--- a/apps/admin/src/app/_components/challenge-reviews/challenge-reviews.action.ts+++ /dev/null@@ -1,19 +0,0 @@-'use server';--import { prisma } from '@repo/db';--export type ChallengeReviewData = Awaited<ReturnType<typeof getPendingChallenges>>;-export async function getPendingChallenges() {- return prisma.challenge.findMany({- where: {- status: 'PENDING',- },- include: {- user: {- select: {- name: true,- },- },- },- });-}diff --git a/apps/admin/src/app/_components/challenge-reviews/columns.tsx b/apps/admin/src/app/_components/challenge-reviews/columns.tsxdeleted file mode 100644index 06a1e108..00000000--- a/apps/admin/src/app/_components/challenge-reviews/columns.tsx+++ /dev/null@@ -1,40 +0,0 @@-'use client';--import type { Challenge } from '@repo/db/types';-import { Button } from '@repo/ui/components/button';-import { type ColumnDef } from '@tanstack/react-table';-import Link from 'next/link';--export const columns: ColumnDef<Challenge>[] = [- {- accessorKey: 'name',- header: 'Name',- },- {- accessorKey: 'difficulty',- header: 'Difficulty',- },- {- accessorKey: 'shortDescription',- header: 'Description',- },- {- accessorKey: 'user.name',- header: 'Created By',- },- {- accessorKey: 'createdAt',- header: 'Created On',- cell: (info) => new Date(info.getValue() as Date).toLocaleDateString(),- },- {- header: '...',- cell: ({ row }) => {- return (- <Link href={`challenge/${row.original.id}`}>- <Button variant="link">Manage</Button>- </Link>- );- },- },-];diff --git a/apps/admin/src/app/_components/challenge-reviews/index.tsx b/apps/admin/src/app/_components/challenge-reviews/index.tsxdeleted file mode 100644index d6877eb1..00000000--- a/apps/admin/src/app/_components/challenge-reviews/index.tsx+++ /dev/null@@ -1,18 +0,0 @@-'use client';--import { DataTable } from '@repo/ui/components/data-table';-import { useQuery } from '@tanstack/react-query';-import { getPendingChallenges } from './challenge-reviews.action';-import { columns } from './columns';--export function ChallengeReviews() {- const { data, isLoading } = useQuery(['challenge-reviews'], () => getPendingChallenges());-- if (isLoading || !data) return null;-- return (- <div className="w-full rounded-md border">- <DataTable data={data} columns={columns} />- </div>- );-}diff --git a/apps/admin/src/app/_components/images.tsx b/apps/admin/src/app/_components/images.tsxdeleted file mode 100644index 50e1f765..00000000--- a/apps/admin/src/app/_components/images.tsx+++ /dev/null@@ -1,28 +0,0 @@-'use client';-import Image from 'next/image';-import type { getUploadedImages } from './admin.actions';--export type ImageUpload = Awaited<ReturnType<typeof getUploadedImages>>;--interface ImageUploadProps {- data: ImageUpload;-}--export function ImageUploadReport({ data }: ImageUploadProps) {- return (- <div className="flex flex-col gap-2">- <div>- {data.map((image) => (- <Image- alt={`${image.id}`}- className="rounded-lg"- height="300"- key={image.id}- src={image.url}- width="300"- />- ))}- </div>- </div>- );-}diff --git a/apps/admin/src/app/_components/reports.tsx b/apps/admin/src/app/_components/reports.tsxdeleted file mode 100644index 27c16a4b..00000000--- a/apps/admin/src/app/_components/reports.tsx+++ /dev/null@@ -1,107 +0,0 @@-'use client';-import { useInfiniteQuery } from '@tanstack/react-query';-import { useRouter } from 'next/navigation';-import React from 'react';-import { Pagination } from '@repo/ui/components/pagination';-import {- Table,- TableBody,- TableCell,- TableHead,- TableHeader,- TableRow,-} from '@repo/ui/components/table';-import {- getInfiniteReports,- type InfiniteReports,-} from '../report/[id]/_components/report/report.action';--export interface ReportsProps {- initialReports: InfiniteReports;-}--export function Reports({ initialReports }: ReportsProps) {- const router = useRouter();-- const [page, setPage] = React.useState(0);- const [enableInfinite, setEnableInfinite] = React.useState(false);-- const { data, hasNextPage, fetchNextPage } = useInfiniteQuery(- ['reports'],- async ({ pageParam }) => {- const data = await getInfiniteReports(pageParam);- return data;- },- {- suspense: true,- getNextPageParam: (- a,-- b,- ) => (a.metadata.hasNextPage ? a.metadata.lastCursor : false),- initialData: {- pages: [initialReports],- pageParams: [null],- },- enabled: enableInfinite,- },- );-- React.useEffect(() => {- setEnableInfinite(true);- }, []);-- return (- <section className="data-table">- <header className="flex justify-end">- <Pagination- onChange={(e) => {- if (!e.detail.pageLoaded) fetchNextPage().then(() => setPage(e.detail.page - 1));- else setPage(e.detail.page - 1);- }}- totalPages={data?.pages.length}- hasNextPage={hasNextPage}- currentPage={0 + 1}- />- </header>- <Table>- <TableHeader>- <TableRow>- <TableHead>Type</TableHead>- <TableHead>Reporter</TableHead>- <TableHead>Status</TableHead>- <TableHead>Info</TableHead>- <TableHead>Tags</TableHead>- <TableHead>Created at</TableHead>- <TableHead>Updated at</TableHead>- </TableRow>- </TableHeader>- <TableBody>- {data?.pages[page]?.data.map((tr) => (- <TableRow key={`report-${tr.id}`} onClick={() => router.push(`/report/${tr.id}`)}>- <TableCell>{tr.type}</TableCell>- <TableCell>{tr.reporter.name}</TableCell>- <TableCell>{tr.status}</TableCell>- <TableCell>{tr.text.slice(0, 100)}</TableCell>- <TableCell>- <div className="flex flex-wrap gap-2">- {tr.issues.map((i) => (- <div key={`issues-${i.id}`} className="rounded-full bg-zinc-800 px-3 py-1">- {i.type}- </div>- ))}- </div>- </TableCell>- <TableCell>- {tr.createdAt.toLocaleString(undefined, { dateStyle: 'short', timeStyle: 'short' })}- </TableCell>- <TableCell>- {tr.updatedAt.toLocaleString(undefined, { dateStyle: 'short', timeStyle: 'short' })}- </TableCell>- </TableRow>- ))}- </TableBody>- </Table>- </section>- );-}diff --git a/apps/admin/src/app/_components/tracks/index.tsx b/apps/admin/src/app/_components/tracks/index.tsxdeleted file mode 100644index bda2aabf..00000000--- a/apps/admin/src/app/_components/tracks/index.tsx+++ /dev/null@@ -1,19 +0,0 @@-'use client';--import { DataTable } from '@repo/ui/components/data-table';-import { useQuery } from '@tanstack/react-query';-import { ActionBar } from './action-bar';-import { columns } from './columns';-import { getTracks } from './tracks.actions';--export function ManageTracks() {- const { data, isLoading } = useQuery(['admin-tracks'], () => getTracks());- if (isLoading || !data) return <div>Loading...</div>;-- return (- <div>- <ActionBar />- <DataTable data={data} columns={columns} />- </div>- );-}diff --git a/apps/admin/src/app/_components/users.tsx b/apps/admin/src/app/_components/users.tsxdeleted file mode 100644index 4fa1860d..00000000--- a/apps/admin/src/app/_components/users.tsx+++ /dev/null@@ -1,111 +0,0 @@-'use client';--import {- Table,- TableBody,- TableCell,- TableHead,- TableHeader,- TableRow,-} from '@repo/ui/components/table';-import { Unlock } from '@repo/ui/icons';-import { useRouter } from 'next/navigation';-import { unbanUser, type BannedUsers } from './admin.actions';-import { toast } from '@repo/ui/components/use-toast';-import { TypographyH3 } from '@repo/ui/components/typography/h3';-import { Badge } from '@repo/ui/components/badge';-import { ActionMenu } from '@repo/ui/components/action-menu';--interface BannedUsersProps {- data: BannedUsers;-}--export function BannedUsers({ data }: BannedUsersProps) {- // State- const router = useRouter();-- // Functions- async function handleUserUnban(user: (typeof data)[number]) {- try {- await unbanUser(user.id);- toast({- title: 'Unbanned',- description: `The user @${user.name} was successfully unbanned.`,- });- } catch (e) {- toast({- title: 'Something went wrong.',- variant: 'destructive',- description: `The user @${user.name} could not be unbanned.`,- });- } finally {- router.refresh();- }- }-- return (- <div className="flex flex-col gap-2">- <div className="flex w-full flex-col justify-start gap-4 rounded-md border-2 p-5 md:flex-row md:items-center">- <TypographyH3>Statistics</TypographyH3>- <span className="text-sm text-neutral-400 dark:text-neutral-600">- <strong>{data.length}</strong> total bans.- </span>- </div>- <Table>- <TableHeader>- <TableRow>- <TableHead>Username</TableHead>- <TableHead>Status</TableHead>- <TableHead>At</TableHead>- <TableHead>Reason</TableHead>- <TableHead />- </TableRow>- </TableHeader>- <TableBody>- {data.map((user, userIdx) => {- const username = user.name;- const status = user.status;- const absoluteTime = new Intl.DateTimeFormat('en-US', {- dateStyle: 'medium',- timeStyle: 'medium',- }).format(user.updatedAt);- const banReason = user.banReason;- return (- <TableRow key={userIdx}>- <TableCell title={username ?? ''}>@{username}</TableCell>- <TableCell>- <Badge>{status}</Badge>- </TableCell>- <TableCell title={absoluteTime}>{absoluteTime}</TableCell>- <TableCell title={banReason ?? ''}>- {banReason- ? banReason.length > 15- ? banReason.substring(0, 10)- : banReason- : 'N/A'}- </TableCell>- <TableCell>- <ActionMenu- items={[- {- key: 'unban',- label: 'Unban',- icon: Unlock,- },- ]}- onChange={(item) => {- if (item.key === 'unban') {- // any better workarounds for void?- handleUserUnban(user);- }- }}- />- </TableCell>- </TableRow>- );- })}- </TableBody>- </Table>- </div>- );-}diff --git a/apps/admin/src/app/challenge/[challengeId]/challenge-review.action.ts b/apps/admin/src/app/challenge/[challengeId]/challenge-review.action.tsdeleted file mode 100644index 20a1c326..00000000--- a/apps/admin/src/app/challenge/[challengeId]/challenge-review.action.ts+++ /dev/null@@ -1,46 +0,0 @@-'use server';--import { RoleTypes } from '@repo/db/types';-import { prisma } from '@repo/db';--export async function approveChallenge(- challengeId: number,- userId: string,- isUserACreator: boolean,-) {- return prisma.$transaction([- prisma.challenge.update({- where: {- id: challengeId,- },- data: {- status: 'ACTIVE',- },- }),- ...(isUserACreator- ? [- prisma.role.create({- data: {- user: {- connect: {- id: userId,- },- },- role: RoleTypes.ADMIN,- },- }),- ]- : []),- ]);-}--export async function denyChallenge(challengeId: number) {- return prisma.challenge.update({- where: {- id: challengeId,- },- data: {- status: 'DECLINED',- },- });-}diff --git a/apps/admin/src/app/challenge/[challengeId]/challenge-review.tsx b/apps/admin/src/app/challenge/[challengeId]/challenge-review.tsxdeleted file mode 100644index 69dc0b97..00000000--- a/apps/admin/src/app/challenge/[challengeId]/challenge-review.tsx+++ /dev/null@@ -1,93 +0,0 @@-'use client';--import Link from 'next/link';-import { useRouter } from 'next/navigation';-import { useSession } from '@repo/auth/react';-import { useMemo } from 'react';-import { CodeEditor } from '@repo/monaco/code-editor';-import type { ChallengeToReview } from './page';-import { approveChallenge, denyChallenge } from './challenge-review.action';-import { Text } from '@repo/ui/components/typography/typography';-import { useToast } from '@repo/ui/components/use-toast';-import { Button } from '@repo/ui/components/button';-import { Markdown } from '@repo/ui/components/markdown';-import { DifficultyBadge } from '@repo/ui/components/difficulty-badge';-import { UserBadge } from '@repo/ui/components/user-badge';--interface Props {- challenge: ChallengeToReview;-}-export function ChallengeReview({ challenge }: Props) {- const router = useRouter();- const { data: session } = useSession();- const { toast } = useToast();- const isUserACreator = useMemo(- () => session?.user.role.includes('CREATOR') ?? false,- [session?.user.role],- );- const handleApproveChallenge = async () => {- try {- await approveChallenge(challenge.id, challenge.userId, isUserACreator);- toast({- variant: 'success',- title: 'Challenge Approved Successfully',- });- router.push('/?tab=challengeReviews');- } catch {- toast({- variant: 'destructive',- title: 'Something went wrong',- });- }- };-- const handleDenyChallenge = async () => {- try {- await denyChallenge(challenge.id);- toast({- variant: 'success',- title: 'Challenge Denied Successfully',- });- router.push('/?tab=challengeReviews');- } catch {- toast({- variant: 'destructive',- title: 'Something went wrong',- });- }- };-- return (- <div className="flex h-full flex-col px-4">- <div className="mb-5">- <Text intent="h2">{challenge.name}</Text>- <div className="mb-3 flex gap-4">- <DifficultyBadge difficulty={challenge.difficulty} />- <UserBadge username={challenge.user.name} linkComponent={Link} />- </div>- <div className="font-semibold">Short Description</div>- <div>{challenge.shortDescription}</div>- </div>-- <div className="flex h-full gap-4">- <div className="w-[500px] rounded-l-2xl rounded-r-xl border border-zinc-300 bg-white p-4 dark:border-zinc-700 dark:bg-zinc-800">- <Markdown>{challenge.description}</Markdown>- </div>- <div className="flex-1 rounded-l-xl rounded-r-2xl border border-zinc-300 dark:border-zinc-700">- <CodeEditor value={challenge.tests} />- </div>- </div>- <div className="flex justify-end gap-3 p-4">- <Link href="/?tab=challengeReviews">- <Button variant="ghost">Cancel</Button>- </Link>- <Button onClick={handleDenyChallenge} variant="destructive">- Deny- </Button>- <Button className="bg-green-300 dark:bg-green-700" onClick={handleApproveChallenge}>- Approve- </Button>- </div>- </div>- );-}diff --git a/apps/admin/src/app/challenge/[challengeId]/page.tsx b/apps/admin/src/app/challenge/[challengeId]/page.tsxdeleted file mode 100644index 5038da82..00000000--- a/apps/admin/src/app/challenge/[challengeId]/page.tsx+++ /dev/null@@ -1,33 +0,0 @@-import { prisma } from '@repo/db';-import { ChallengeReview } from './challenge-review';-import { cache } from 'react';--interface Props {- params: {- challengeId: string;- };-}--export default async function ChallengeReviewPage({ params: { challengeId } }: Props) {- const challenge = await getChallengeToReview(Number(challengeId));- return <ChallengeReview challenge={challenge} />;-}--export type ChallengeToReview = NonNullable<Awaited<ReturnType<typeof getChallengeToReview>>>;-const getChallengeToReview = cache(async (id: number) => {- return prisma.challenge.findFirstOrThrow({- where: {- id,- },- include: {- user: {- select: {- name: true,- },- },- },- orderBy: {- createdAt: 'desc',- },- });-});diff --git a/apps/admin/src/app/dashboard/_components/side-nav.tsx b/apps/admin/src/app/dashboard/_components/side-nav.tsxnew file mode 100644index 00000000..09ac6c0f--- /dev/null+++ b/apps/admin/src/app/dashboard/_components/side-nav.tsx@@ -0,0 +1,40 @@+'use client';++import { cn } from '@repo/ui/cn';+import { buttonVariants } from '@repo/ui/components/button';+import Link from 'next/link';+import { usePathname } from 'next/navigation';++interface SidebarNavProps extends React.HTMLAttributes<HTMLElement> {+ items: {+ href: string;+ title: string;+ }[];+}++export function SidebarNav({ className, items, ...props }: SidebarNavProps) {+ const pathname = usePathname();++ return (+ <nav+ className={cn('flex space-x-2 lg:flex-col lg:space-x-0 lg:space-y-1', className)}+ {...props}+ >+ {items.map((item) => (+ <Link+ key={item.href}+ href={item.href}+ className={cn(+ buttonVariants({ variant: 'ghost' }),+ pathname.includes(item.href)+ ? 'bg-muted hover:bg-muted'+ : 'hover:bg-transparent hover:underline',+ 'justify-start',+ )}+ >+ {item.title}+ </Link>+ ))}+ </nav>+ );+}diff --git a/apps/admin/src/app/dashboard/images/page.tsx b/apps/admin/src/app/dashboard/images/page.tsxnew file mode 100644index 00000000..37920dae--- /dev/null+++ b/apps/admin/src/app/dashboard/images/page.tsx@@ -0,0 +1,35 @@+import { prisma } from '@repo/db';+import Image from 'next/image';++export default async function ImagesPage() {+ const data = await getUploadedImages();+ return (+ <div className="flex flex-col gap-2">+ <div>+ {data.map((image) => (+ <Image+ alt={`${image.id}`}+ className="rounded-lg"+ height="300"+ key={image.id}+ src={image.url}+ width="300"+ />+ ))}+ </div>+ </div>+ );+}++export type UploadedImages = Awaited<ReturnType<typeof getUploadedImages>>;+/**+ * The function fetches the last 100 uploaded images.+ */+export async function getUploadedImages() {+ return prisma.imageUpload.findMany({+ take: 100,+ orderBy: {+ createdAt: 'asc',+ },+ });+}diff --git a/apps/admin/src/app/dashboard/layout.tsx b/apps/admin/src/app/dashboard/layout.tsxnew file mode 100644index 00000000..02e065b0--- /dev/null+++ b/apps/admin/src/app/dashboard/layout.tsx@@ -0,0 +1,30 @@+import { SidebarNav } from './_components/side-nav';++const sidebarNavItems = [+ {+ title: 'Reports',+ href: '/dashboard/reports',+ },+ {+ title: 'Users',+ href: '/dashboard/users',+ },+ {+ title: 'Images',+ href: '/dashboard/images',+ },+ {+ title: 'Tracks',+ href: '/dashboard/tracks',+ },+];+export default function DashboardLayout({ children }: { children: React.ReactNode }) {+ return (+ <main className="flex gap-7 px-4">+ <aside className="-mx-4 lg:w-1/5">+ <SidebarNav items={sidebarNavItems} />+ </aside>+ <div className="flex-1">{children}</div>+ </main>+ );+}diff --git a/apps/admin/src/app/_components/admin.actions.tsx b/apps/admin/src/app/dashboard/reports/[id]/_actions.tssimilarity index 72%rename from apps/admin/src/app/_components/admin.actions.tsxrename to apps/admin/src/app/dashboard/reports/[id]/_actions.tsindex 40c831e6..cbbd757c 100644--- a/apps/admin/src/app/_components/admin.actions.tsx+++ b/apps/admin/src/app/dashboard/reports/[id]/_actions.ts@@ -4,6 +4,7 @@ import { getServerAuthSession } from '@repo/auth/server';import { prisma } from '@repo/db';import { type Prisma, type Report } from '@repo/db/types';import { cache } from 'react';+import { assertAdmin } from '~/utils/auth-guards';// FML this was obnoxious to doexport type ChallengeInfo = Omit<Report, 'id' | 'status' | 'type' | 'userId'> & {@@ -153,6 +154,8 @@ export async function deleteSolution(solutionId: number, reportId: number) {export async function banUser(userId: string, reportId: number, banReason?: string) {const session = await getServerAuthSession();+ assertAdmin(session);+await prisma.$transaction([prisma.user.update({where: {@@ -245,15 +248,109 @@ export const getChallenge = cache(async (id: number) => {});});-export type UploadedImages = Awaited<ReturnType<typeof getUploadedImages>>;-/**- * The function fetches the last 100 uploaded images.- */-export async function getUploadedImages() {- return prisma.imageUpload.findMany({- take: 100,+export const getReportedUserInformation = async (userId: string) => {+ return await prisma.user.findFirstOrThrow({+ where: {+ id: userId,+ },+ include: {+ comment: {+ take: 10,+ include: {+ user: {+ select: {+ name: true,+ },+ },+ _count: {+ select: {+ replies: true,+ },+ },+ rootChallenge: true,+ rootSolution: true,+ },+ orderBy: {+ createdAt: 'desc',+ },+ },+ sharedSolution: {+ take: 5,+ orderBy: {+ createdAt: 'desc',+ },+ },+ challenge: {+ take: 5,+ orderBy: {+ createdAt: 'asc',+ },+ },+ },+ });+};++export type ReportWithInfo = Awaited<ReturnType<typeof getReport>>;++export async function getReport(id: number) {+ return prisma.report.findFirstOrThrow({+ where: {+ id: Number(id),+ },orderBy: {- createdAt: 'asc',+ type: 'asc',+ },+ include: {+ user: {+ select: {+ name: true,+ },+ },+ challenge: {+ include: {+ user: {+ select: {+ name: true,+ },+ },+ },+ },+ comment: {+ include: {+ _count: {+ select: {+ replies: true,+ },+ },+ rootChallenge: true,+ rootSolution: true,+ user: {+ select: {+ name: true,+ },+ },+ },+ },+ issues: true,+ reporter: {+ select: {+ name: true,+ },+ },+ solution: {+ include: {+ user: {+ select: {+ name: true,+ },+ },+ },+ },+ moderator: {+ select: {+ name: true,+ },+ },},});}diff --git a/apps/admin/src/app/report/[id]/_components/report/challenge.report.tsx b/apps/admin/src/app/dashboard/reports/[id]/_components/challenge.report.tsxsimilarity index 93%rename from apps/admin/src/app/report/[id]/_components/report/challenge.report.tsxrename to apps/admin/src/app/dashboard/reports/[id]/_components/challenge.report.tsxindex db455d06..48cb642e 100644--- a/apps/admin/src/app/report/[id]/_components/report/challenge.report.tsx+++ b/apps/admin/src/app/dashboard/reports/[id]/_components/challenge.report.tsx@@ -1,10 +1,10 @@-import { ThumbsUp } from '@repo/ui/icons';-import Link from 'next/link';-import { getChallenge } from '~/app/_components/admin.actions';-import type { ReportWithInfo } from '../../report.action';-import { UserBadge } from '@repo/ui/components/user-badge';import { Markdown } from '@repo/ui/components/markdown';import { Text } from '@repo/ui/components/typography/typography';+import { UserBadge } from '@repo/ui/components/user-badge';+import { ThumbsUp } from '@repo/ui/icons';+import Link from 'next/link';+import type { ReportWithInfo } from '../_actions';+import { getChallenge } from '../_actions';export interface ChallengeReportProps {report: NonNullable<ReportWithInfo>;diff --git a/apps/admin/src/app/report/[id]/_components/report/comment.report.tsx b/apps/admin/src/app/dashboard/reports/[id]/_components/comment.report.tsxsimilarity index 96%rename from apps/admin/src/app/report/[id]/_components/report/comment.report.tsxrename to apps/admin/src/app/dashboard/reports/[id]/_components/comment.report.tsxindex d302bed3..d7ec11a0 100644--- a/apps/admin/src/app/report/[id]/_components/report/comment.report.tsx+++ b/apps/admin/src/app/dashboard/reports/[id]/_components/comment.report.tsx@@ -1,7 +1,7 @@-import Link from 'next/link';-import { ExternalLink } from '@repo/ui/icons';-import type { ReportWithInfo } from '../../report.action';import { Markdown } from '@repo/ui/components/markdown';+import { ExternalLink } from '@repo/ui/icons';+import Link from 'next/link';+import type { ReportWithInfo } from '../_actions';export function CommentReport({ report }: { report: NonNullable<ReportWithInfo> }) {if (report.type !== 'COMMENT' || report.commentId === null || !report.comment) return null;diff --git a/apps/admin/src/app/report/[id]/_components/report/solution.report.tsx b/apps/admin/src/app/dashboard/reports/[id]/_components/solution.report.tsxsimilarity index 95%rename from apps/admin/src/app/report/[id]/_components/report/solution.report.tsxrename to apps/admin/src/app/dashboard/reports/[id]/_components/solution.report.tsxindex 4689636e..60c2eac6 100644--- a/apps/admin/src/app/report/[id]/_components/report/solution.report.tsx+++ b/apps/admin/src/app/dashboard/reports/[id]/_components/solution.report.tsx@@ -1,11 +1,11 @@'use server';-import Link from 'next/link';import { prisma } from '@repo/db';-import { Text } from '@repo/ui/components/typography/typography';import { Markdown } from '@repo/ui/components/markdown';-import type { ReportWithInfo } from '../../report.action';+import { Text } from '@repo/ui/components/typography/typography';+import Link from 'next/link';import { cache } from 'react';+import type { ReportWithInfo } from '../_actions';const getSolutionChallenge = cache(async (challengeId: number) => {return prisma.challenge.findFirstOrThrow({diff --git a/apps/admin/src/app/report/[id]/_components/report/user.report.tsx b/apps/admin/src/app/dashboard/reports/[id]/_components/user.report.tsxsimilarity index 95%rename from apps/admin/src/app/report/[id]/_components/report/user.report.tsxrename to apps/admin/src/app/dashboard/reports/[id]/_components/user.report.tsxindex 1411b349..804a3cca 100644--- a/apps/admin/src/app/report/[id]/_components/report/user.report.tsx+++ b/apps/admin/src/app/dashboard/reports/[id]/_components/user.report.tsx@@ -1,10 +1,9 @@'use server';-// import { Comment } from '~/app/challenge/_components/comments/comment';-import { Text } from '@repo/ui/components/typography/typography';-import { Markdown } from '@repo/ui/components/markdown';import { Expandable } from '@repo/ui/components/expandable';-import { getReportedUserInformation, type ReportWithInfo } from '../../report.action';+import { Markdown } from '@repo/ui/components/markdown';+import { Text } from '@repo/ui/components/typography/typography';+import { getReportedUserInformation, type ReportWithInfo } from '../_actions';interface UserReportProps {report: NonNullable<ReportWithInfo>;@@ -13,7 +12,6 @@ interface UserReportProps {export async function UserReport({ report }: UserReportProps) {if (!report.userId) return null;const userInfo = await getReportedUserInformation(report.userId);- const commentRootId = report.comment?.rootChallengeId ?? report.comment?.rootSolutionId ?? -1;return (<div>diff --git a/apps/admin/src/app/report/[id]/actions.tsx b/apps/admin/src/app/dashboard/reports/[id]/actions.tsxsimilarity index 94%rename from apps/admin/src/app/report/[id]/actions.tsxrename to apps/admin/src/app/dashboard/reports/[id]/actions.tsxindex a82362a1..28eaa297 100644--- a/apps/admin/src/app/report/[id]/actions.tsx+++ b/apps/admin/src/app/dashboard/reports/[id]/actions.tsx@@ -1,6 +1,7 @@'use client';import { type User } from '@repo/db/types';+import { Button } from '@repo/ui/components/button';import {Dialog,DialogContent,@@ -9,25 +10,17 @@ import {DialogHeader,DialogTitle,} from '@repo/ui/components/dialog';-import { useRouter } from 'next/navigation';-import { useMemo, useState } from 'react';-import {- banChallenge,- banUser,- deleteComment,- deleteSolution,- dismissReport,-} from '../../_components/admin.actions';-import { type ReportWithInfo } from './report.action';-import { toast } from '@repo/ui/components/use-toast';-import { Button } from '@repo/ui/components/button';import { Label } from '@repo/ui/components/label';import { Textarea } from '@repo/ui/components/textarea';+import { toast } from '@repo/ui/components/use-toast';+import { useRouter } from 'next/navigation';+import { useMemo, useState } from 'react';+import type { ReportWithInfo } from './_actions';+import { banChallenge, banUser, deleteComment, deleteSolution, dismissReport } from './_actions';export interface ReportActionsProps {report: NonNullable<ReportWithInfo>;}-// export type ReportActionsProps = UserReportActionProps | ChallengeReportActionProps | SolutionReportActionProps | CommentReportActionProps;export interface ReportActionsBase {moderator?: User;@@ -38,6 +31,7 @@ export function ReportActions({ report }: ReportActionsProps) {const [banReason, setBanReason] = useState('');const [ban, setBan] = useState(false);const router = useRouter();+ console.log({ report });const user = useMemo(() => {switch (report.type) {diff --git a/apps/admin/src/app/report/[id]/loading.tsx b/apps/admin/src/app/dashboard/reports/[id]/loading.tsxsimilarity index 100%rename from apps/admin/src/app/report/[id]/loading.tsxrename to apps/admin/src/app/dashboard/reports/[id]/loading.tsxdiff --git a/apps/admin/src/app/report/[id]/page.tsx b/apps/admin/src/app/dashboard/reports/[id]/page.tsxsimilarity index 63%rename from apps/admin/src/app/report/[id]/page.tsxrename to apps/admin/src/app/dashboard/reports/[id]/page.tsxindex 2efbe8c2..2acd4d93 100644--- a/apps/admin/src/app/report/[id]/page.tsx+++ b/apps/admin/src/app/dashboard/reports/[id]/page.tsx@@ -1,15 +1,14 @@import { Alert, AlertDescription, AlertTitle } from '@repo/ui/components/alert';-import { Text } from '@repo/ui/components/typography/typography';import { Markdown } from '@repo/ui/components/markdown';+import { Text } from '@repo/ui/components/typography/typography';import { AlertCircle, ChevronLeft } from '@repo/ui/icons';import Link from 'next/link';-import { redirect } from 'next/navigation';-import { ChallengeReport } from './_components/report/challenge.report';-import { CommentReport } from './_components/report/comment.report';-import { SolutionReport } from './_components/report/solution.report';-import { UserReport } from './_components/report/user.report';+import { getReport, type ReportWithInfo } from './_actions';+import { ChallengeReport } from './_components/challenge.report';+import { CommentReport } from './_components/comment.report';+import { SolutionReport } from './_components/solution.report';+import { UserReport } from './_components/user.report';import { ReportActions } from './actions';-import { getReport, type ReportWithInfo } from './report.action';export interface Props {params: {@@ -17,46 +16,31 @@ export interface Props {};}-const Report = async function (props: Props) {- const idNum = Number(props.params.id);- // Double check that we have a number, redirect out if we don't- if (isNaN(idNum)) {- return redirect('/?tab=reports');- }-- const report = await getReport(idNum);-- if (!report) return redirect('/?tab=reports');-- let title = '';-- switch (report.type) {+const getTitle = (type: string) => {+ switch (type) {case 'USER':- title = 'User Report';- break;+ return 'User Report';case 'CHALLENGE':- title = 'Challenge Report';- break;+ return 'Challenge Report';case 'COMMENT':- title = 'Comment Report';- break;+ return 'Comment Report';case 'SOLUTION':- title = 'Solution Report';- break;+ return 'Solution Report';}+};- function ReportEl(report: NonNullable<ReportWithInfo>) {- switch (report.type) {- case 'CHALLENGE':- return <ChallengeReport report={report} />;- case 'COMMENT':- return <CommentReport report={report} />;- case 'SOLUTION':- return <SolutionReport report={report} />;- case 'USER':- return <UserReport report={report} />;- }- }+const getComponentByType = (type: ReportWithInfo['type']) => {+ return {+ CHALLENGE: ChallengeReport,+ COMMENT: CommentReport,+ SOLUTION: SolutionReport,+ USER: UserReport,+ }[type];+};+export default async function ({ params: { id } }: Props) {+ const report = await getReport(Number(id));++ const ReportComponent = getComponentByType(report.type);return (<div className="container ">@@ -66,7 +50,7 @@ const Report = async function (props: Props) {</Link><div className="bg-background/80 sticky top-0 z-50 flex items-center justify-between"><Text color="primary" intent="h1">- {title}+ {getTitle(report.type)}</Text><ReportActions report={report} /></div>@@ -85,7 +69,9 @@ const Report = async function (props: Props) {) : null}<div className="wrapper mt-4 flex flex-col gap-4 md:flex-row">- <section className="order-2 flex-grow md:order-1">{ReportEl(report)}</section>+ <section className="order-2 flex-grow md:order-1">+ <ReportComponent report={report} />+ </section><aside className="order-1 flex-shrink-0 md:order-2 md:w-1/3 lg:w-[30%]"><Text className="mt-6" intent="h2">Information@@ -115,6 +101,4 @@ const Report = async function (props: Props) {</div></div>);-};--export default Report;+}diff --git a/apps/admin/src/app/dashboard/reports/_actions.tsx b/apps/admin/src/app/dashboard/reports/_actions.tsxnew file mode 100644index 00000000..a533e762--- /dev/null+++ b/apps/admin/src/app/dashboard/reports/_actions.tsx@@ -0,0 +1,30 @@+'use server';++import { prisma } from '@repo/db';++export type AdminReport = NonNullable<Awaited<ReturnType<typeof getReports>>>[0];+export type Reports = Awaited<ReturnType<typeof getReports>>;+export async function getReports() {+ const reports = await prisma.report.findMany({+ select: {+ id: true,+ type: true,+ reporter: {+ select: {+ name: true,+ },+ },+ status: true,+ text: true,+ issues: true,+ createdAt: true,+ },+ orderBy: [+ {+ status: 'asc',+ },+ ],+ });++ return reports;+}diff --git a/apps/admin/src/app/dashboard/reports/_components/columns.tsx b/apps/admin/src/app/dashboard/reports/_components/columns.tsxnew file mode 100644index 00000000..d3c6dfa8--- /dev/null+++ b/apps/admin/src/app/dashboard/reports/_components/columns.tsx@@ -0,0 +1,52 @@+'use client';++import { type ColumnDef } from '@tanstack/react-table';+import type { AdminReport } from '../_actions';+import Link from 'next/link';+import { Button } from '@repo/ui/components/button';++export const columns: ColumnDef<AdminReport>[] = [+ {+ accessorKey: 'type',+ header: 'Type',+ },+ {+ accessorKey: 'reporter',+ header: 'Reporter',+ cell: ({ row }) => {+ return <pre>{row.original.reporter.name}</pre>;+ },+ },+ {+ accessorKey: 'status',+ header: 'Status',+ },+ {+ accessorKey: 'text',+ header: 'Info',+ },+ {+ accessorKey: 'issues',+ header: 'Tags',+ cell: ({ row }) => {+ return <pre>{row.original.issues.map((i) => i.type).join(', ')}</pre>;+ },+ },+ {+ accessorKey: 'createdAt',+ header: 'Created At',+ cell: ({ row }) => {+ return <pre>{row.original.createdAt.toDateString()}</pre>;+ },+ },+ {+ header: '...',+ cell: ({ row }) => {+ return (+ <Link href={`reports/${row.original.id}`}>+ <Button variant="link">Manage</Button>+ </Link>+ );+ },+ },+];diff --git a/apps/admin/src/app/dashboard/reports/page.tsx b/apps/admin/src/app/dashboard/reports/page.tsxnew file mode 100644index 00000000..6c9ec7e7--- /dev/null+++ b/apps/admin/src/app/dashboard/reports/page.tsx@@ -0,0 +1,13 @@+import { DataTable } from '@repo/ui/components/data-table';+import { getReports } from './_actions';+import { columns } from './_components/columns';++export default async function ReportsPage() {+ const reports = await getReports();++ return (+ <div>+ <DataTable data={reports} columns={columns} />+ </div>+ );+}diff --git a/apps/admin/src/app/dashboard/tracks/[trackId]/_actions/update-track.action.ts b/apps/admin/src/app/dashboard/tracks/[trackId]/_actions/update-track.action.tsnew file mode 100644index 00000000..ed2191ec--- /dev/null+++ b/apps/admin/src/app/dashboard/tracks/[trackId]/_actions/update-track.action.ts@@ -0,0 +1,25 @@+'use server';++import { prisma } from '@repo/db';+import type { FormSchema } from '../_components/update-track-form';++export async function updateTrack(data: FormSchema & { trackId: number }) {+ const { trackId, trackChallenges, ...rest } = data;+ await prisma.trackChallenge.deleteMany({+ where: { trackId },+ });+ await prisma.track.update({+ where: { id: trackId },+ data: {+ ...rest,+ trackChallenges: {+ createMany: {+ data: trackChallenges.map((tc) => {+ const { challenge, ...rest } = tc;+ return { ...rest };+ }),+ },+ },+ },+ });+}diff --git a/apps/admin/src/app/tracks/[trackId]/_components/draggable-challenge.tsx b/apps/admin/src/app/dashboard/tracks/[trackId]/_components/draggable-challenge.tsxsimilarity index 100%rename from apps/admin/src/app/tracks/[trackId]/_components/draggable-challenge.tsxrename to apps/admin/src/app/dashboard/tracks/[trackId]/_components/draggable-challenge.tsxdiff --git a/apps/admin/src/app/tracks/[trackId]/_components/update-track-form.tsx b/apps/admin/src/app/dashboard/tracks/[trackId]/_components/update-track-form.tsxsimilarity index 97%rename from apps/admin/src/app/tracks/[trackId]/_components/update-track-form.tsxrename to apps/admin/src/app/dashboard/tracks/[trackId]/_components/update-track-form.tsxindex 65b40ee6..89f775dd 100644--- a/apps/admin/src/app/tracks/[trackId]/_components/update-track-form.tsx+++ b/apps/admin/src/app/dashboard/tracks/[trackId]/_components/update-track-form.tsx@@ -95,11 +95,6 @@ export function UpdateTrackForm({ challenges, track }: Props) {toast({title: 'Track Updated',- description: (- <pre className="mt-2 w-[340px] rounded-md bg-slate-950 p-4">- <code className="text-white">{JSON.stringify(data, null, 2)}</code>- </pre>- ),});} catch (e) {toast({diff --git a/apps/admin/src/app/tracks/[trackId]/layout.tsx b/apps/admin/src/app/dashboard/tracks/[trackId]/layout.tsxsimilarity index 100%rename from apps/admin/src/app/tracks/[trackId]/layout.tsxrename to apps/admin/src/app/dashboard/tracks/[trackId]/layout.tsxdiff --git a/apps/admin/src/app/tracks/[trackId]/page.tsx b/apps/admin/src/app/dashboard/tracks/[trackId]/page.tsxsimilarity index 100%rename from apps/admin/src/app/tracks/[trackId]/page.tsxrename to apps/admin/src/app/dashboard/tracks/[trackId]/page.tsxdiff --git a/apps/admin/src/app/tracks/[trackId]/providers.tsx b/apps/admin/src/app/dashboard/tracks/[trackId]/providers.tsxsimilarity index 100%rename from apps/admin/src/app/tracks/[trackId]/providers.tsxrename to apps/admin/src/app/dashboard/tracks/[trackId]/providers.tsxdiff --git a/apps/admin/src/app/_components/tracks/action-bar.tsx b/apps/admin/src/app/dashboard/tracks/_components/action-bar.tsxsimilarity index 86%rename from apps/admin/src/app/_components/tracks/action-bar.tsxrename to apps/admin/src/app/dashboard/tracks/_components/action-bar.tsxindex 1769b846..41cdc922 100644--- a/apps/admin/src/app/_components/tracks/action-bar.tsx+++ b/apps/admin/src/app/dashboard/tracks/_components/action-bar.tsx@@ -14,10 +14,10 @@ import { AddTrackForm } from './add-track-form';export function ActionBar() {const [open, setOpen] = useState(false);return (- <div className="flex w-full flex-row-reverse items-center py-4">+ <div className="flex w-full flex-row-reverse items-center pb-4"><Dialog open={open} onOpenChange={setOpen}><DialogTrigger asChild>- <Button variant="ghost">Add Track</Button>+ <Button>Add Track</Button></DialogTrigger><DialogContent className="w-[200px]"><DialogHeader>diff --git a/apps/admin/src/app/_components/tracks/add-track-form.tsx b/apps/admin/src/app/dashboard/tracks/_components/add-track-form.tsxsimilarity index 94%rename from apps/admin/src/app/_components/tracks/add-track-form.tsxrename to apps/admin/src/app/dashboard/tracks/_components/add-track-form.tsxindex 8a941664..1488a9b8 100644--- a/apps/admin/src/app/_components/tracks/add-track-form.tsx+++ b/apps/admin/src/app/dashboard/tracks/_components/add-track-form.tsx@@ -1,21 +1,21 @@import { zodResolver } from '@hookform/resolvers/zod';-import { useQueryClient } from '@tanstack/react-query';-import { useForm } from 'react-hook-form';-import { z } from 'zod';-import { createTrack } from './tracks.actions';-import { useToast } from '@repo/ui/components/use-toast';+import { Button } from '@repo/ui/components/button';+import { Checkbox } from '@repo/ui/components/checkbox';+import { DialogFooter } from '@repo/ui/components/dialog';import {Form,- FormItem,+ FormControl,FormField,+ FormItem,FormLabel,- FormControl,FormMessage,} from '@repo/ui/components/form';import { Input } from '@repo/ui/components/input';-import { Checkbox } from '@repo/ui/components/checkbox';-import { DialogFooter } from '@repo/ui/components/dialog';-import { Button } from '@repo/ui/components/button';+import { useToast } from '@repo/ui/components/use-toast';+import { useForm } from 'react-hook-form';+import { z } from 'zod';+import { createTrack } from '../tracks.actions';+import { useRouter } from 'next/navigation';const formSchema = z.object({name: z.string().min(3),@@ -30,7 +30,7 @@ interface Props {}export function AddTrackForm({ toggle }: Props) {const { toast } = useToast();- const queryClient = useQueryClient();+ const router = useRouter();const form = useForm<FormSchema>({resolver: zodResolver(formSchema),@@ -44,7 +44,7 @@ export function AddTrackForm({ toggle }: Props) {async function onSubmit(data: FormSchema) {try {await createTrack(data);- queryClient.invalidateQueries(['tracks']);+ router.refresh();toggle(false);toast({title: 'Track Added',diff --git a/apps/admin/src/app/_components/tracks/columns.tsx b/apps/admin/src/app/dashboard/tracks/_components/columns.tsxsimilarity index 100%rename from apps/admin/src/app/_components/tracks/columns.tsxrename to apps/admin/src/app/dashboard/tracks/_components/columns.tsxdiff --git a/apps/admin/src/app/dashboard/tracks/page.tsx b/apps/admin/src/app/dashboard/tracks/page.tsxnew file mode 100644index 00000000..a630f40b--- /dev/null+++ b/apps/admin/src/app/dashboard/tracks/page.tsx@@ -0,0 +1,14 @@+import { DataTable } from '@repo/ui/components/data-table';+import { getTracks } from './tracks.actions';+import { ActionBar } from './_components/action-bar';+import { columns } from './_components/columns';++export default async function () {+ const data = await getTracks();+ return (+ <div>+ <ActionBar />+ <DataTable data={data} columns={columns} />+ </div>+ );+}diff --git a/apps/admin/src/app/_components/tracks/tracks.actions.ts b/apps/admin/src/app/dashboard/tracks/tracks.actions.tssimilarity index 87%rename from apps/admin/src/app/_components/tracks/tracks.actions.tsrename to apps/admin/src/app/dashboard/tracks/tracks.actions.tsindex cbbbcd1b..b4d0a2ce 100644--- a/apps/admin/src/app/_components/tracks/tracks.actions.ts+++ b/apps/admin/src/app/dashboard/tracks/tracks.actions.ts@@ -4,11 +4,13 @@ import { prisma } from '@repo/db';import type { Prisma } from '@repo/db/types';export async function getTracks() {- return prisma.track.findMany({+ const tracks = await prisma.track.findMany({include: {trackChallenges: true,},});++ return tracks;}export async function createTrack(data: Omit<Prisma.TrackCreateInput, 'slug'>) {diff --git a/apps/admin/src/app/dashboard/users/_actions.ts b/apps/admin/src/app/dashboard/users/_actions.tsnew file mode 100644index 00000000..9f824cbf--- /dev/null+++ b/apps/admin/src/app/dashboard/users/_actions.ts@@ -0,0 +1,94 @@+'use server';++import { getServerAuthSession } from '@repo/auth/server';+import { prisma } from '@repo/db';+import { revalidatePath } from 'next/cache';++export type BannedUsers = NonNullable<Awaited<ReturnType<typeof getBannedUsers>>>;+export async function getBannedUsers() {+ return prisma.user.findMany({+ where: {+ status: 'BANNED',+ },+ });+}+/**+ * The function updates the user to indicate a status+ * of `BANNED`.+ * @param userId The id of the user.+ * @param reportId The id of the report.+ * @returns+ */+export async function banUser(userId: string, reportId: number, banReason?: string) {+ const session = await getServerAuthSession();++ await prisma.$transaction([+ prisma.user.update({+ where: {+ id: userId,+ },+ data: {+ status: 'BANNED',+ banReason,+ },+ }),+ prisma.challenge.updateMany({+ where: {+ userId,+ },+ data: {+ status: 'BANNED',+ },+ }),+ prisma.session.deleteMany({+ where: {+ userId,+ },+ }),+ prisma.report.update({+ where: {+ id: reportId,+ },+ data: {+ status: 'CLEARED',+ moderatorId: session?.user.id,+ updatedAt: new Date(),+ },+ }),+ prisma.comment.updateMany({+ where: {+ userId,+ },+ data: {+ visible: false,+ },+ }),+ ]);+}+/**+ * The function lifts the ban off the user i.e. updates+ * the status to `ACTIVE`.+ * @param userId The id of the user.+ * @returns+ */+export async function unbanUser(userId: string) {+ revalidatePath('/');+ return prisma.$transaction([+ prisma.challenge.updateMany({+ where: {+ userId,+ },+ data: {+ status: 'ACTIVE',+ },+ }),+ prisma.user.update({+ where: {+ id: userId,+ },+ data: {+ status: 'ACTIVE',+ },+ }),+ ]);+}diff --git a/apps/admin/src/app/dashboard/users/_components/columns.tsx b/apps/admin/src/app/dashboard/users/_components/columns.tsxnew file mode 100644index 00000000..8ec9fdc0--- /dev/null+++ b/apps/admin/src/app/dashboard/users/_components/columns.tsx@@ -0,0 +1,46 @@+'use client';++import { Button } from '@repo/ui/components/button';+import { type ColumnDef } from '@tanstack/react-table';+import { unbanUser, type BannedUsers } from '../_actions';++export const columns: ColumnDef<BannedUsers[0]>[] = [+ {+ accessorKey: 'name',+ header: 'Username',+ },+ {+ accessorKey: 'status',+ header: 'Status',+ },+ {+ accessorKey: 'updatedAt',+ header: 'Date',+ cell: ({ row }) => {+ const absoluteTime = new Intl.DateTimeFormat('en-US', {+ dateStyle: 'medium',+ timeStyle: 'medium',+ }).format(row.original.updatedAt);+ return <pre>{absoluteTime}</pre>;+ },+ },+ {+ accessorKey: 'banReason',+ header: 'Reason',+ },+ {+ header: '...',+ cell: ({ row }) => {+ return (+ <Button+ variant="outline"+ onClick={async () => {+ await unbanUser(row.original.id);+ }}+ >+ Unban+ </Button>+ );+ },+ },+];diff --git a/apps/admin/src/app/dashboard/users/page.tsx b/apps/admin/src/app/dashboard/users/page.tsxnew file mode 100644index 00000000..78cd1d87--- /dev/null+++ b/apps/admin/src/app/dashboard/users/page.tsx@@ -0,0 +1,13 @@+import { DataTable } from '@repo/ui/components/data-table';+import { getBannedUsers } from './_actions';+import { columns } from './_components/columns';++export default async function BannedUsers() {+ const reports = await getBannedUsers();++ return (+ <div>+ <DataTable data={reports} columns={columns} />+ </div>+ );+}diff --git a/apps/admin/src/app/layout.tsx b/apps/admin/src/app/layout.tsxindex cc23e4d9..e4e382ad 100644--- a/apps/admin/src/app/layout.tsx+++ b/apps/admin/src/app/layout.tsx@@ -16,7 +16,14 @@ export default function RootLayout({ children }: { children: React.ReactNode })<body className={`${inter.className} flex flex-col`}><Providers><Navigation />- <main className="flex-1">+ <main className="py-5">+ <div className="space-y-0.5 px-4">+ <h2 className="text-2xl font-bold tracking-tight">Admin</h2>+ <p className="text-muted-foreground">+ The dashboard for all things moderation, administration, and more.+ </p>+ </div>+ <div className="bg-border my-6 h-[1px] w-full shrink-0" /><div className="h-full">{children}</div></main><Toaster />diff --git a/apps/admin/src/app/page.tsx b/apps/admin/src/app/page.tsxindex 9b43cff8..5beb8f14 100644--- a/apps/admin/src/app/page.tsx+++ b/apps/admin/src/app/page.tsx@@ -1,11 +1,8 @@import { getServerAuthSession } from '@repo/auth/server';import { RoleTypes } from '@repo/db/types';import { Lock } from '@repo/ui/icons';-import { getBannedUsers, getUploadedImages } from './_components/admin.actions';-import { getInfiniteReports } from './report/[id]/_components/report/report.action';-import { TabView } from './_components/TabView';+import { redirect } from 'next/navigation';-// whatasync function Admin() {const session = await getServerAuthSession();const roles = session?.user.role ?? [];@@ -13,28 +10,16 @@ async function Admin() {const isMod = roles.includes(RoleTypes.MODERATOR);const isAdmin = roles.includes(RoleTypes.ADMIN);const isModOrAdmin = isAdmin || isMod;-- const allBannedUsers = await getBannedUsers();- const reports = await getInfiniteReports();- const uploadedImages = await getUploadedImages();-+ if (isModOrAdmin) redirect('/dashboard/reports');return (<div><div className="flex flex-col gap-4">- {isModOrAdmin ? (- <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" />- <span className="max-w-[40ch] text-center text-black/50 dark:text-white/50">- You do not have permissions to access the page.- </span>- </div>- )}+ <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" />+ <span className="max-w-[40ch] text-center text-black/50 dark:text-white/50">+ You do not have permissions to access the page.+ </span>+ </div></div></div>);diff --git a/apps/admin/src/app/providers.tsx b/apps/admin/src/app/providers.tsxindex e33fb0bf..062f67d8 100644--- a/apps/admin/src/app/providers.tsx+++ b/apps/admin/src/app/providers.tsx@@ -1,15 +1,21 @@'use client';import { SessionProvider } from '@repo/auth/react';-import { ThemeProvider } from 'next-themes';-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';import { TooltipProvider } from '@repo/ui/components/tooltip';+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';+import { ThemeProvider } from 'next-themes';interface Props {children: React.ReactNode;}-const queryClient = new QueryClient();+const queryClient = new QueryClient({+ defaultOptions: {+ queries: {+ cacheTime: 0,+ },+ },+});export function Providers({ children }: Props) {return (diff --git a/apps/admin/src/app/report/[id]/_components/report/report.action.ts b/apps/admin/src/app/report/[id]/_components/report/report.action.tsdeleted file mode 100644index 343d5dbe..00000000--- a/apps/admin/src/app/report/[id]/_components/report/report.action.ts+++ /dev/null@@ -1,105 +0,0 @@-'use server';--import { prisma } from '@repo/db';-import { cache } from 'react';--export type ReportsData = Awaited<ReturnType<typeof getReports>>;-export type InfiniteReports = Awaited<ReturnType<typeof getInfiniteReports>>;--export async function getInfiniteReports(lastCursor?: number) {- const reports = await getReports(lastCursor);- const nextCursor = reports.at(-1)?.id;-- let hasNextCursor = false;- if (nextCursor) {- const nextPage = await getReports(nextCursor);- if (nextPage.length > 0) hasNextCursor = true;- }-- return {- data: reports,- metadata: {- hasNextPage: hasNextCursor,- lastCursor: hasNextCursor ? nextCursor : null,- },- };-}--export async function getReports(lastCursor?: number, take = 3) {- return prisma.report.findMany({- include: {- challenge: {- include: {- _count: {- select: {- vote: true,- },- },- user: {- select: {- name: true,- },- },- },- },- reporter: true,- issues: true,- comment: true,- solution: true,- },- take,- ...(lastCursor && {- skip: 1,- cursor: {- id: lastCursor,- },- }),- orderBy: [- {- status: 'asc',- },- ],- });-}--export const getReportedUserInformation = cache(async (userId: string) => {- return await prisma.user.findFirstOrThrow({- where: {- id: userId,- },- include: {- comment: {- take: 10,- include: {- user: {- select: {- name: true,- },- },- _count: {- select: {- replies: true,- },- },- rootChallenge: true,- rootSolution: true,- },- orderBy: {- createdAt: 'desc',- },- },- sharedSolution: {- take: 5,- orderBy: {- createdAt: 'desc',- },- },- challenge: {- take: 5,- orderBy: {- createdAt: 'asc',- },- },- },- });-});diff --git a/apps/admin/src/app/report/[id]/report.action.ts b/apps/admin/src/app/report/[id]/report.action.tsdeleted file mode 100644index 1d3c0c89..00000000--- a/apps/admin/src/app/report/[id]/report.action.ts+++ /dev/null@@ -1,94 +0,0 @@-import { prisma } from '@repo/db';--export type ReportWithInfo = Awaited<ReturnType<typeof getReport>>;--export async function getReport(idNum: number) {- return prisma.report.findFirst({- where: {- id: Number(idNum),- },- orderBy: {- type: 'asc',- },- include: {- user: {- select: {- name: true,- },- },- challenge: {- include: {- user: {- select: {- name: true,- },- },- },- },- comment: {- include: {- _count: {- select: {- replies: true,- },- },- rootChallenge: true,- rootSolution: true,- user: {- select: {- name: true,- },- },- },- },- issues: true,- reporter: {- select: {- name: true,- },- },- solution: {- include: {- user: {- select: {- name: true,- },- },- },- },- moderator: {- select: {- name: true,- },- },- },- });-}--export async function getReportedUserInformation(userId: string) {- return await prisma.user.findFirst({- where: {- id: userId,- },- select: {- comment: {- take: 10,- orderBy: {- createdAt: 'desc',- },- },- sharedSolution: {- take: 5,- orderBy: {- createdAt: 'desc',- },- },- challenge: {- take: 5,- orderBy: {- createdAt: 'asc',- },- },- },- });-}diff --git a/apps/admin/src/app/tracks/[trackId]/_actions/update-track.action.ts b/apps/admin/src/app/tracks/[trackId]/_actions/update-track.action.tsdeleted file mode 100644index 2ef9fc20..00000000--- a/apps/admin/src/app/tracks/[trackId]/_actions/update-track.action.ts+++ /dev/null@@ -1,32 +0,0 @@-'use server';--import { prisma } from '@repo/db';-import type { FormSchema } from '../_components/update-track-form';--export async function updateTrack(data: FormSchema & { trackId: number }) {- const { trackId, ...rest } = data;- await prisma.$transaction([- prisma.track.update({- where: { id: trackId },- data: {- trackChallenges: {- set: [],- },- },- }),- prisma.track.update({- where: { id: trackId },- data: {- ...rest,- trackChallenges: {- createMany: {- data: data.trackChallenges.map((tc) => {- const { challenge, ...rest } = tc;- return { ...rest };- }),- },- },- },- }),- ]);-}diff --git a/apps/admin/src/components/navigation.tsx b/apps/admin/src/components/navigation.tsxindex 9bd1d7fe..c2892c9f 100644--- a/apps/admin/src/components/navigation.tsx+++ b/apps/admin/src/components/navigation.tsx@@ -15,7 +15,7 @@ import { useEffect, useState } from 'react';export function Navigation() {return (<header className="z-0 w-full">- <nav className="container flex h-14 items-center">+ <nav className="flex h-14 items-center px-4"><div className="flex w-full items-center justify-between"><div className="relative flex gap-3"><a className="flex items-center space-x-2 duration-300" href="/">diff --git a/apps/admin/src/utils/auth-guards.ts b/apps/admin/src/utils/auth-guards.tsnew file mode 100644index 00000000..2b433843--- /dev/null+++ b/apps/admin/src/utils/auth-guards.ts@@ -0,0 +1,10 @@+import type { Session } from '@repo/auth/server';+import { RoleTypes } from '@repo/db/types';++export const assertAdmin = (session: Session | null) => {+ const isAdmin = session?.user.role.includes(RoleTypes.ADMIN);++ if (!isAdmin) {+ throw new Error('You are not authorized to perform this action.');+ }+};diff --git a/apps/admin/src/utils/with-unstable-cache.ts b/apps/admin/src/utils/with-unstable-cache.tsnew file mode 100644index 00000000..2a4e13cf--- /dev/null+++ b/apps/admin/src/utils/with-unstable-cache.ts@@ -0,0 +1,20 @@+import { unstable_cache } from 'next/cache';++// eslint-disable-next-line+export async function withUnstableCache<T extends (...args: any[]) => Promise<any>>(opts: {+ fn: T;+ args: Parameters<T>;+ keys: string[];+ tags: string[];+}) {+ const cachedResult = await unstable_cache(+ async (...args) => {+ const result = await opts.fn(...args);+ return result;+ },+ [...opts.keys],+ { tags: opts.tags },+ )(...opts.args);++ return cachedResult as Awaited<ReturnType<T>>;+}diff --git a/packages/db/schema.prisma b/packages/db/schema.prismaindex 46af7c3a..deefe1b0 100644--- a/packages/db/schema.prisma+++ b/packages/db/schema.prisma@@ -391,7 +391,6 @@ model TrackChallenge {track Track? @relation(fields: [trackId], references: [id])trackId Int?- @@unique([challengeId, orderId])@@index([challengeId])@@index([trackId])}diff --git a/packages/db/seed/prod.ts b/packages/db/seed/prod.tsindex 12763f25..dbbc6ab9 100644--- a/packages/db/seed/prod.ts+++ b/packages/db/seed/prod.ts@@ -1,3 +1,5 @@+// if you want a similar db to what prod looks like.+// this should never be run on prod directlyimport path from 'node:path';import { fileURLToPath } from 'node:url';import uuidByString from 'uuid-by-string';diff --git a/packages/ui/src/components/data-table.tsx b/packages/ui/src/components/data-table.tsxindex 1fd65d4b..e8d2510f 100644--- a/packages/ui/src/components/data-table.tsx+++ b/packages/ui/src/components/data-table.tsx@@ -17,6 +17,7 @@ import {import { useState } from 'react';import { DataTablePagination } from './data-table-pagination';import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from './table';+import { ChevronDown, ChevronUp } from '../icons';interface DataTableProps<TData, TValue> {columns: ColumnDef<TData, TValue>[];@@ -60,10 +61,16 @@ export function DataTable<TData, TValue>({ columns, data }: DataTableProps<TData<TableRow key={headerGroup.id}>{headerGroup.headers.map((header) => {return (- <TableHead key={header.id}>- {header.isPlaceholder- ? null- : flexRender(header.column.columnDef.header, header.getContext())}+ <TableHead key={header.id} onClick={header.column.getToggleSortingHandler()}>+ <div className="flex items-center justify-between">+ {header.isPlaceholder+ ? null+ : flexRender(header.column.columnDef.header, header.getContext())}+ {{+ asc: <ChevronUp size={16} />,+ desc: <ChevronDown size={16} />,+ }[header.column.getIsSorted() as string] ?? null}+ </div></TableHead>);})}diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex fe86231f..9e98eba8 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -730,7 +730,7 @@ importers:dependencies:'@next/eslint-plugin-next':specifier: canary- version: 14.0.2-canary.18+ version: 13.4.20-canary.0'@repo/tsconfig':specifier: workspace:*version: link:../config-typescript@@ -742,7 +742,7 @@ importers:version: 5.62.0([email protected])([email protected])'@vercel/style-guide':specifier: ^4.0.2eslint:specifier: ^8.45.0version: 8.45.0@@ -2331,8 +2331,8 @@ packages:glob: 7.1.7dev: true- /@next/[email protected]:- resolution: {integrity: sha512-YKTBPd/EkIpAPiogJ0mbCs1e/Sx1OO9vdQxbC3hm/N2IFnnHCTJ/18A/WLtbJvlp1izr2tfM+TZV7F6CiS3v8w==}+ /@next/[email protected]:+ resolution: {integrity: sha512-vFC1meiw/awh2xJZMWaoECsfZbgkt2fF3HIg8f2fSM/w41Z86L1SS7SjKmpbbD87yq3tiqgqHmFv0JCych4g4g==}dependencies:glob: 7.1.7dev: false@@ -5142,7 +5142,7 @@ packages:yoga-wasm-web: 0.3.0dev: false- /@vercel/[email protected](@next/[email protected])([email protected])([email protected])([email protected]):+ /@vercel/[email protected](@next/[email protected])([email protected])([email protected])([email protected]):resolution: {integrity: sha512-FroL+oOePzhw7n/I+f7zr4WNroGHT/+2TlW6WH9+CVSjMNsEyu7Qstj2mI5gWIBjT1Y2ZImKPppCzI2cIYmNZw==}engines: {node: '>=16'}peerDependencies:@@ -5162,7 +5162,7 @@ packages:dependencies:'@babel/core': 7.22.10'@babel/eslint-parser': 7.22.10(@babel/[email protected])([email protected])- '@next/eslint-plugin-next': 14.0.2-canary.18+ '@next/eslint-plugin-next': 13.4.20-canary.0'@rushstack/eslint-patch': 1.3.2'@typescript-eslint/eslint-plugin': 5.59.1(@typescript-eslint/[email protected])([email protected])([email protected])'@typescript-eslint/parser': 5.62.0([email protected])([email protected])