From b37efc0ff9699d8bd8581c5e9c3af175c9c11978 Mon Sep 17 00:00:00 2001
From: ErikaKK <491649804@qq.com>
Date: Sun, 1 Feb 2026 22:23:46 +0800
Subject: [PATCH 1/3] add export button for project and payment table

---
 .../admin/{@users => @tools}/export.tsx       | 26 ++++++++++++++-----
 src/app/dashboard/admin/@tools/page.tsx       | 10 +++++++
 src/app/dashboard/admin/@users/table.tsx      | 12 ++++-----
 src/app/profile/[id]/profile.tsx              | 13 +++++++++-
 .../routers/admin/analytics/get-payments.ts   | 12 +++++++++
 .../api/routers/admin/analytics/index.ts      |  2 ++
 .../api/routers/admin/projects/get-all.ts     | 12 +++++++++
 .../api/routers/admin/projects/index.ts       |  2 ++
 src/server/api/routers/admin/users/get-all.ts |  6 -----
 9 files changed, 75 insertions(+), 20 deletions(-)
 rename src/app/dashboard/admin/{@users => @tools}/export.tsx (67%)
 create mode 100644 src/server/api/routers/admin/analytics/get-payments.ts
 create mode 100644 src/server/api/routers/admin/projects/get-all.ts

diff --git a/src/app/dashboard/admin/@users/export.tsx b/src/app/dashboard/admin/@tools/export.tsx
similarity index 67%
rename from src/app/dashboard/admin/@users/export.tsx
rename to src/app/dashboard/admin/@tools/export.tsx
index 5ecb0ba4c..b264d2143 100644
--- a/src/app/dashboard/admin/@users/export.tsx
+++ b/src/app/dashboard/admin/@tools/export.tsx
@@ -5,9 +5,14 @@ import { useEffect, useState } from "react"
 import { Alert, AlertDescription, AlertTitle } from "~/components/ui/alert"
 import { Button } from "~/components/ui/button"
 
-import { TableProps } from "./table"
+import { type Payment, type Project, type User } from "~/server/db/types"
 
-export default function ExportButton({ data }: TableProps) {
+export interface ExportButtonProps {
+  data: Array<Project | Payment | User>
+  label: string
+}
+
+export default function ExportButton({ data, label }: ExportButtonProps) {
   const [open, setOpen] = useState(false)
   useEffect(() => {
     if (!open) return
@@ -17,19 +22,26 @@ export default function ExportButton({ data }: TableProps) {
   const downloadCSV = () => {
     if (!data || data.length === 0) {
       setOpen(true)
-      console.log("open")
       return
     }
 
     const headers = Object.keys(data[0] as Record<string, unknown>).join(",")
-    const rows = data.map((row) => Object.values(row).join(",")).join("\n")
+    const escapeCSV = (value: unknown) => {
+      if (value == null) return ""
+      const str = String(value)
+      if (/[",\n]/.test(str)) {
+        return `"${str.replace(/"/g, '""')}"`
+      }
+      return str
+    }
+    const rows = data.map((row) => Object.values(row).map(escapeCSV).join(",")).join("\n")
     const csv = headers + "\n" + rows
     const blob = new Blob([csv], { type: "text/csv" })
     const url = window.URL.createObjectURL(blob)
 
     const a = document.createElement("a")
     a.setAttribute("href", url)
-    a.setAttribute("download", "output.csv")
+    a.setAttribute("download", `${label}.csv`)
     a.click()
     window.URL.revokeObjectURL(url)
     setOpen(true)
@@ -38,7 +50,7 @@ export default function ExportButton({ data }: TableProps) {
   return (
     <div className="relative inline-block">
       <Button onClick={downloadCSV} variant={"outline"}>
-        Export CSV
+        Export {label}
       </Button>
       {open && (!data || data.length === 0) && (
         <Alert variant="destructive" className="fixed top-30 left-1/2 -translate-x-1/2  z-50 max-w-sm">
@@ -49,7 +61,7 @@ export default function ExportButton({ data }: TableProps) {
       {open && data && data.length > 0 && (
         <Alert variant="default" className="fixed top-30 left-1/2 -translate-x-1/2 z-50 max-w-sm">
           <AlertTitle>Export Successful</AlertTitle>
-          <AlertDescription>Your data has been exported as `output.csv`.</AlertDescription>
+          <AlertDescription>Your data has been exported as {`${label}.csv`}.</AlertDescription>
         </Alert>
       )}
     </div>
diff --git a/src/app/dashboard/admin/@tools/page.tsx b/src/app/dashboard/admin/@tools/page.tsx
index b334cc783..38fc1e1ac 100644
--- a/src/app/dashboard/admin/@tools/page.tsx
+++ b/src/app/dashboard/admin/@tools/page.tsx
@@ -1,6 +1,12 @@
+import { api } from "~/trpc/server"
+
+import ExportButton from "./export"
 import UpdateEmail from "./update-email"
 
 export default async function AdminUserTable() {
+  const projects = await api.admin.projects.getAllProjects.query()
+  const payments = await api.admin.analytics.getAllPayments.query()
+
   return (
     <>
       <div className="flex h-[50px] items-center p-1">
@@ -9,6 +15,10 @@ export default async function AdminUserTable() {
       <div className="grid grid-cols-1 md:grid-cols-5 gap-4">
         <UpdateEmail />
       </div>
+      <div className=" flex flex-col space-y-4 my-4">
+        <ExportButton data={projects} label="projects" />
+        <ExportButton data={payments} label="payments" />
+      </div>
     </>
   )
 }
diff --git a/src/app/dashboard/admin/@users/table.tsx b/src/app/dashboard/admin/@users/table.tsx
index b6840dbd0..5adb01847 100644
--- a/src/app/dashboard/admin/@users/table.tsx
+++ b/src/app/dashboard/admin/@users/table.tsx
@@ -63,13 +63,13 @@ import { cn } from "~/lib/utils"
 import { type User } from "~/server/db/types"
 import { api } from "~/trpc/react"
 
-import ExportButton from "./export"
+import ExportButton from "../@tools/export"
 import AddUserForm from "./form"
 
-type UserProps = Omit<User, "subscribe" | "square_customer_id" | "updatedAt" | "reminder_pending">
+type DisplayColumn = Omit<User, "subscribe" | "square_customer_id" | "updatedAt" | "reminder_pending">
 
 export interface TableProps {
-  data: Array<UserProps>
+  data: Array<User>
 }
 interface UserTableProps extends TableProps {
   refetch: () => void
@@ -92,7 +92,7 @@ const sortIcon = (sortOrder: string | boolean) => {
   }
 }
 
-const columns = (updateRole: ({ id, role }: UpdateUserRoleFunctionProps) => void): ColumnDef<UserProps>[] => [
+const columns = (updateRole: ({ id, role }: UpdateUserRoleFunctionProps) => void): ColumnDef<DisplayColumn>[] => [
   {
     id: "Select",
     enableSorting: false,
@@ -341,7 +341,7 @@ const UserTable = ({ data, isRefetching, ...props }: UserTableProps) => {
 
   return (
     <>
-      <div className="flex h-[50px] items-center gap-2 p-1 pr-0">
+      <div className="flex h-12 items-center gap-2 p-1 pr-0">
         {data.length > 0 && (
           <>
             {selectedRowIDs.length > 0 && (
@@ -418,7 +418,7 @@ const UserTable = ({ data, isRefetching, ...props }: UserTableProps) => {
                   })}
               </DropdownMenuContent>
             </DropdownMenu>
-            <ExportButton data={data} />
+            <ExportButton data={data} label="users" />
             <Button variant="secondary" disabled={isRefetching} onClick={props.refetch}>
               <span className={cn("material-symbols-sharp", isRefetching && "animate-spin")}>autorenew</span>
               <span className="ml-2 hidden sm:block">Sync{isRefetching && "ing"}</span>
diff --git a/src/app/profile/[id]/profile.tsx b/src/app/profile/[id]/profile.tsx
index 4be283460..4053f0bc4 100644
--- a/src/app/profile/[id]/profile.tsx
+++ b/src/app/profile/[id]/profile.tsx
@@ -1,5 +1,6 @@
 "use client"
 
+import { format } from "date-fns"
 import Link from "next/link"
 import { siDiscord, siGithub } from "simple-icons"
 
@@ -115,7 +116,7 @@ const ProfilePage = ({ id, currentUser }: ProfilePageProps) => {
             <div className="p-2 w-auto">
               <div className="">
                 {currentUser?.id === user.id ? (
-                  user?.role === null && (
+                  user?.role === null ? (
                     <div className="space-y-4 max-w-md">
                       <div className="space-y-2">
                         <h2 className="font-semibold leading-none tracking-tight">Membership</h2>
@@ -140,6 +141,16 @@ const ProfilePage = ({ id, currentUser }: ProfilePageProps) => {
                         </p>
                       )}
                     </div>
+                  ) : (
+                    user.role === "member" &&
+                    user.membership_expiry && (
+                      <div>
+                        Your membership will expire on{" "}
+                        <span className="text-destructive">
+                          {format(new Date(String(user.membership_expiry)), "dd MMMM yyyy")}
+                        </span>
+                      </div>
+                    )
                   )
                 ) : (
                   <>
diff --git a/src/server/api/routers/admin/analytics/get-payments.ts b/src/server/api/routers/admin/analytics/get-payments.ts
new file mode 100644
index 000000000..ee2ce741e
--- /dev/null
+++ b/src/server/api/routers/admin/analytics/get-payments.ts
@@ -0,0 +1,12 @@
+import { desc } from "drizzle-orm"
+
+import { adminProcedure } from "~/server/api/trpc"
+import { Payment } from "~/server/db/schema"
+
+export const getAllPayments = adminProcedure.query(async ({ ctx }) => {
+  const paymentList = await ctx.db.query.Payment.findMany({
+    orderBy: [desc(Payment.createdAt), desc(Payment.id)],
+  })
+
+  return paymentList
+})
diff --git a/src/server/api/routers/admin/analytics/index.ts b/src/server/api/routers/admin/analytics/index.ts
index ad7923687..75d2fd0f3 100644
--- a/src/server/api/routers/admin/analytics/index.ts
+++ b/src/server/api/routers/admin/analytics/index.ts
@@ -1,6 +1,7 @@
 import { createTRPCRouter } from "~/server/api/trpc"
 
 import { getGenderStatistics } from "./get-gender-statistics"
+import { getAllPayments } from "./get-payments"
 import { getUserCount } from "./get-user-count"
 import { getUsersPerDay } from "./get-users-per-day"
 
@@ -8,4 +9,5 @@ export const analyticsAdminRouter = createTRPCRouter({
   getUserCount,
   getUsersPerDay,
   getGenderStatistics,
+  getAllPayments,
 })
diff --git a/src/server/api/routers/admin/projects/get-all.ts b/src/server/api/routers/admin/projects/get-all.ts
new file mode 100644
index 000000000..6ccbd0478
--- /dev/null
+++ b/src/server/api/routers/admin/projects/get-all.ts
@@ -0,0 +1,12 @@
+import { desc } from "drizzle-orm"
+
+import { adminProcedure } from "~/server/api/trpc"
+import { Project } from "~/server/db/schema"
+
+export const getAllProjects = adminProcedure.query(async ({ ctx }) => {
+  const projectList = await ctx.db.query.Project.findMany({
+    orderBy: [desc(Project.createdAt), desc(Project.id)],
+  })
+
+  return projectList
+})
diff --git a/src/server/api/routers/admin/projects/index.ts b/src/server/api/routers/admin/projects/index.ts
index ac4cb1c6c..79a1db00e 100644
--- a/src/server/api/routers/admin/projects/index.ts
+++ b/src/server/api/routers/admin/projects/index.ts
@@ -2,6 +2,7 @@ import { createTRPCRouter } from "~/server/api/trpc"
 
 import { create } from "./create"
 import { deleteProject } from "./delete"
+import { getAllProjects } from "./get-all"
 import { getProjectById } from "./get-project-by-id"
 import { getProjects, getPublicProjects } from "./get-projects"
 import { update } from "./update"
@@ -13,4 +14,5 @@ export const projectsAdminRouter = createTRPCRouter({
   update,
   getProjectById,
   deleteProject,
+  getAllProjects,
 })
diff --git a/src/server/api/routers/admin/users/get-all.ts b/src/server/api/routers/admin/users/get-all.ts
index 9e216239a..f08e09616 100644
--- a/src/server/api/routers/admin/users/get-all.ts
+++ b/src/server/api/routers/admin/users/get-all.ts
@@ -5,12 +5,6 @@ import { User } from "~/server/db/schema"
 
 export const getAll = adminProcedure.query(async ({ ctx }) => {
   const userList = await ctx.db.query.User.findMany({
-    columns: {
-      subscribe: false,
-      square_customer_id: false,
-      updatedAt: false,
-      reminder_pending: false,
-    },
     orderBy: [desc(User.createdAt), desc(User.id)],
   })
 

From 7e9f4a736ef789c3f15a26657f4788bce5f43f10 Mon Sep 17 00:00:00 2001
From: ErikaKK <491649804@qq.com>
Date: Thu, 5 Feb 2026 20:36:25 +0800
Subject: [PATCH 2/3] improve the export for jsonb type

---
 src/app/dashboard/admin/@tools/export.tsx | 30 ++++++++++++++++++-----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/app/dashboard/admin/@tools/export.tsx b/src/app/dashboard/admin/@tools/export.tsx
index b264d2143..2fc42097f 100644
--- a/src/app/dashboard/admin/@tools/export.tsx
+++ b/src/app/dashboard/admin/@tools/export.tsx
@@ -25,17 +25,35 @@ export default function ExportButton({ data, label }: ExportButtonProps) {
       return
     }
 
-    const headers = Object.keys(data[0] as Record<string, unknown>).join(",")
-    const escapeCSV = (value: unknown) => {
+    const headers = Object.keys(data[0] as Record<string, unknown>)
+    const escapeCSV = (value: unknown): string => {
       if (value == null) return ""
-      const str = String(value)
-      if (/[",\n]/.test(str)) {
+
+      let str: string
+      if (typeof value === "object") {
+        if (value instanceof Date) {
+          str = value.toISOString()
+        } else {
+          // Stringify JSON objects/arrays
+          str = JSON.stringify(value)
+        }
+      } else {
+        str = String(value)
+      }
+
+      // Escape CSV: wrap in quotes if contains comma, quote, or newline
+      // and escape internal quotes by doubling them
+      if (/[",\n\r]/.test(str)) {
         return `"${str.replace(/"/g, '""')}"`
       }
       return str
     }
-    const rows = data.map((row) => Object.values(row).map(escapeCSV).join(",")).join("\n")
-    const csv = headers + "\n" + rows
+
+    const rows = data
+      .map((row) => headers.map((key) => escapeCSV((row as Record<string, unknown>)[key])).join(","))
+      .join("\n")
+
+    const csv = headers.join(",") + "\n" + rows
     const blob = new Blob([csv], { type: "text/csv" })
     const url = window.URL.createObjectURL(blob)
 

From b9286a3635305fffb2b19c2907dea81d72257c76 Mon Sep 17 00:00:00 2001
From: ErikaKK <491649804@qq.com>
Date: Thu, 5 Feb 2026 20:40:41 +0800
Subject: [PATCH 3/3] edit color

---
 src/app/profile/[id]/profile.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/profile/[id]/profile.tsx b/src/app/profile/[id]/profile.tsx
index 4053f0bc4..84c77ca25 100644
--- a/src/app/profile/[id]/profile.tsx
+++ b/src/app/profile/[id]/profile.tsx
@@ -146,7 +146,7 @@ const ProfilePage = ({ id, currentUser }: ProfilePageProps) => {
                     user.membership_expiry && (
                       <div>
                         Your membership will expire on{" "}
-                        <span className="text-destructive">
+                        <span className="text-primary">
                           {format(new Date(String(user.membership_expiry)), "dd MMMM yyyy")}
                         </span>
                       </div>