migration

Author: ErikaKK

.env.example

@@ -37,4 +37,10 @@ UPSTASH_REDIS_REST_TOKEN=upstash-redis-token
 NEXT_PUBLIC_MAPBOX_API=mapbox-key
 
 # Cron (openssl rand -hex 32)
-CRON_SECRET=some-random-secret
+CRON_SECRET=some-random-secret
+
+# Supabase
+SUPABASE_URL=
+SUPABASE_PUBLISHABLE_DEFAULT_KEY=
+SUPABASE_ANON_KEY=
+SUPABASE_SERVICE_ROLE_KEY=

drizzle.config.ts

@@ -1,14 +1,12 @@
 import { defineConfig } from "drizzle-kit"
 
-import { getXataClient } from "~/server/db/xata"
-
 export default defineConfig({
   out: "./src/server/db/migrations",
   schema: "./src/server/db/schema.ts",
   verbose: true,
   dialect: "postgresql",
   tablesFilter: ["cfc-website_*"],
   dbCredentials: {
-    url: getXataClient().sql.connectionString,
+    url: process.env.SUPABASE_DB_URL!,
   },
 })

package.json

@@ -71,6 +71,7 @@
     "next": "14.2.26",
     "next-themes": "0.3.0",
     "pg": "^8.14.1",
+    "pg-native": "^3.5.2",
     "react": "18.3.1",
     "react-day-picker": "8.10.0",
     "react-dom": "18.3.1",
@@ -96,6 +97,7 @@
     "@types/eslint": "8.56.6",
     "@types/mapbox-gl": "3.1.0",
     "@types/node": "20.12.2",
+    "@types/pg": "^8.16.0",
     "@types/react": "18.3.3",
     "@types/react-dom": "18.2.23",
     "@typescript-eslint/eslint-plugin": "7.4.0",

pnpm-lock.yaml

@@ -28,6 +28,10 @@ export default function ExportButton({ data, label }: ExportButtonProps) {
     const headers = Object.keys(data[0] as Record<string, unknown>).join(",")
     const escapeCSV = (value: unknown) => {
       if (value == null) return ""
+      if (value instanceof Date) return value.toISOString()
+      if (typeof value === "string" && !isNaN(Date.parse(value))) {
+        return new Date(value).toISOString()
+      }
       const str = String(value)
       if (/[",\n]/.test(str)) {
         return `"${str.replace(/"/g, '""')}"`

src/app/dashboard/admin/@tools/export.tsx

@@ -66,7 +66,7 @@ import { api } from "~/trpc/react"
 import ExportButton from "../@tools/export"
 import AddUserForm from "./form"
 
-type DisplayColumn = Omit<User, "subscribe" | "square_customer_id" | "updatedAt" | "reminder_pending">
+type DisplayColumn = Omit<User, "subscribe" | "square_customer_id" | "updated_at" | "reminder_pending">
 
 export interface TableProps {
   data: Array<User>
@@ -167,7 +167,7 @@ const columns = (updateRole: ({ id, role }: UpdateUserRoleFunctionProps) => void
     id: "Date joined",
     header: "Date joined",
     cell: (cell) => <span className="text-xs">{cell.getValue<React.ReactNode>()}</span>,
-    accessorFn: (user) => format(user.createdAt, "Pp", { locale: enAU }),
+    accessorFn: (user) => format(user.created_at, "Pp", { locale: enAU }),
   },
   {
     id: "Membership expiry",

src/app/dashboard/admin/@users/table.tsx

@@ -1,14 +1,10 @@
-"use client"
-
 import * as React from "react"
-import type { ImperativePanelHandle } from "react-resizable-panels"
 
-import { ResizableHandle, ResizablePanel, ResizablePanelGroup } from "~/components/ui/resizable"
-import { Separator } from "~/components/ui/separator"
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "~/components/ui/tabs"
 
+import NotFound from "~/app/not-found"
 import type { PropsWithChildren } from "~/lib/types"
-import { cn } from "~/lib/utils"
+import { api } from "~/trpc/server"
 
 interface AdminDashLayoutProps extends PropsWithChildren {
   users: React.ReactNode
@@ -18,7 +14,12 @@ interface AdminDashLayoutProps extends PropsWithChildren {
   tools: React.ReactNode
 }
 
-const Layout = ({ children, ...props }: AdminDashLayoutProps) => {
+const Layout = async ({ children, ...props }: AdminDashLayoutProps) => {
+  const user = await api.users.getCurrent.query()
+  if (!["admin", "committee"].includes(user?.role ?? "")) {
+    return <NotFound />
+  }
+
   const sidebarItems = [
     { text: "Users", icon: "group", component: props.users },
     { text: "Projects", icon: "devices", component: props.projects },

src/app/dashboard/admin/layout.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>