diff --git a/src/app/dashboard/admin/@tools/tool-card.tsx b/src/app/dashboard/admin/@tools/tool-card.tsx
new file mode 100644
index 000000000..361bb762b
--- /dev/null
+++ b/src/app/dashboard/admin/@tools/tool-card.tsx
@@ -0,0 +1,42 @@
+import * as React from "react"
+
+import { Button } from "~/components/ui/button"
+import {
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from "~/components/ui/dialog"
+
+type ToolCardProps = {
+ title: string
+ children: React.ReactNode
+}
+
+function ToolCard({ title, children }: ToolCardProps) {
+ return (
+
+
+
{title}
+
+
+
+
+
+ )
+}
+
+export default ToolCard
diff --git a/src/app/dashboard/admin/@tools/update-email.tsx b/src/app/dashboard/admin/@tools/update-email.tsx
index 02e91785b..5f6366f08 100644
--- a/src/app/dashboard/admin/@tools/update-email.tsx
+++ b/src/app/dashboard/admin/@tools/update-email.tsx
@@ -5,20 +5,14 @@ import { useForm } from "react-hook-form"
import { z } from "zod"
import { Button } from "~/components/ui/button"
-import {
- Dialog,
- DialogContent,
- DialogDescription,
- DialogHeader,
- DialogTitle,
- DialogTrigger,
-} from "~/components/ui/dialog"
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "~/components/ui/form"
import { Input } from "~/components/ui/input"
import { toast } from "~/components/ui/use-toast"
import { api } from "~/trpc/react"
+import ToolCard from "./tool-card"
+
const formSchema = z.object({
userId: z.string(),
oldEmail: z.string().email(),
@@ -33,27 +27,13 @@ const defaultValues: FormSchema = {
newEmail: "",
}
+// deprecated, only for admin to update user email
+// users should use the updateEmail procedure in users router to update their own email
const UpdateEmail = () => {
return (
-
-
-
Update Email
-
-
-
-
-
+
+
+
)
}
diff --git a/src/app/dashboard/admin/@users/table.tsx b/src/app/dashboard/admin/@users/table.tsx
index 5adb01847..c0844a6a2 100644
--- a/src/app/dashboard/admin/@users/table.tsx
+++ b/src/app/dashboard/admin/@users/table.tsx
@@ -66,7 +66,7 @@ import { api } from "~/trpc/react"
import ExportButton from "../@tools/export"
import AddUserForm from "./form"
-type DisplayColumn = Omit
+type DisplayColumn = Omit
export interface TableProps {
data: Array
@@ -167,7 +167,7 @@ const columns = (updateRole: ({ id, role }: UpdateUserRoleFunctionProps) => void
id: "Date joined",
header: "Date joined",
cell: (cell) => {cell.getValue()},
- accessorFn: (user) => format(user.createdAt, "Pp", { locale: enAU }),
+ accessorFn: (user) => format(user.created_at, "Pp", { locale: enAU }),
},
{
id: "Membership expiry",
diff --git a/src/app/dashboard/admin/layout.tsx b/src/app/dashboard/admin/layout.tsx
index b2de060aa..87c29705b 100644
--- a/src/app/dashboard/admin/layout.tsx
+++ b/src/app/dashboard/admin/layout.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
+ }
+
const sidebarItems = [
{ text: "Users", icon: "group", component: props.users },
{ text: "Projects", icon: "devices", component: props.projects },
diff --git a/src/app/profile/[id]/profile.tsx b/src/app/profile/[id]/profile.tsx
index 84c77ca25..7ebe3b0b4 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 && (
Your membership will expire on{" "}
-
+
{format(new Date(String(user.membership_expiry)), "dd MMMM yyyy")}
diff --git a/src/app/projects/(default)/db-project.tsx b/src/app/projects/(default)/db-project.tsx
index 8a19e4994..4303aa12e 100644
--- a/src/app/projects/(default)/db-project.tsx
+++ b/src/app/projects/(default)/db-project.tsx
@@ -53,7 +53,7 @@ export const Impact = ({ impact, ...props }: { impact?: string[]; className?: st
)
export default function DBProject({ data }: DBProjectProps) {
- const { data: users } = api.admin.users.getNamesByEmails.useQuery({ emails: data.members ? data.members : [] })
+ const { data: users } = api.users.getNamesByEmails.useQuery({ emails: data.members ? data.members : [] })
let icon = "devices" // default "devices"
if (data.type === "Mobile application") {
diff --git a/src/components/payment/online/index.tsx b/src/components/payment/online/index.tsx
index e5236644a..c372393ea 100644
--- a/src/components/payment/online/index.tsx
+++ b/src/components/payment/online/index.tsx
@@ -16,7 +16,7 @@ import { type RouterOutputs } from "~/trpc/shared"
const Card = dynamic(() => import("./card"), {
ssr: false,
- loading: () => ,
+ loading: () => ,
})
const GooglePay = dynamic(() => import("./google-pay"), {
ssr: false,
@@ -206,7 +206,7 @@ const OnlinePaymentForm = ({
) : (
-
+
)
}
diff --git a/src/env.js b/src/env.js
index 11507a5a1..fb77e45af 100644
--- a/src/env.js
+++ b/src/env.js
@@ -14,6 +14,9 @@ export const env = createEnv({
UPSTASH_REDIS_REST_URL: z.string().url(),
UPSTASH_REDIS_REST_TOKEN: z.string(),
CRON_SECRET: z.string(),
+ RESEND_API_KEY: z.string(),
+ SUPABASE_DB_URL: z.string().url(),
+ SUPABASE_ANON_KEY: z.string(),
},
/**
@@ -53,6 +56,9 @@ export const env = createEnv({
NEXT_PUBLIC_CLERK_SIGN_IN_URL: process.env.NEXT_PUBLIC_CLERK_SIGN_IN_URL,
NEXT_PUBLIC_CLERK_SIGN_UP_URL: process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL,
CRON_SECRET: process.env.CRON_SECRET,
+ RESEND_API_KEY: process.env.RESEND_API_KEY,
+ SUPABASE_DB_URL: process.env.SUPABASE_DB_URL,
+ SUPABASE_ANON_KEY: process.env.SUPABASE_ANON_KEY,
},
/**
* Run `build` or `dev` with `SKIP_ENV_VALIDATION` to skip env validation. This is especially
diff --git a/src/middleware.ts b/src/middleware.ts
index d5b7acdfb..9a12d65e4 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -1,36 +1,17 @@
-import { auth, clerkMiddleware, createRouteMatcher } from "@clerk/nextjs/server"
-import { eq } from "drizzle-orm"
+import { clerkMiddleware, createRouteMatcher } from "@clerk/nextjs/server"
-import { db } from "./server/db"
-import { User } from "./server/db/schema"
-
-const adminRoles = ["admin", "committee"]
-
-const isAdminPage = createRouteMatcher(["/dashboard/admin(.*)"])
const isProtectedPage = createRouteMatcher(["/dashboard(.*)", "/profile/settings(.*)"])
const isAuthPage = createRouteMatcher(["/join(.*)"])
export default clerkMiddleware(async (auth, req) => {
- const session = await auth()
- const clerkId = session.userId
-
- if (isAdminPage(req) && clerkId) {
- const user = await db.query.User.findFirst({
- where: eq(User.clerk_id, clerkId),
- })
-
- if (!adminRoles.includes(user?.role ?? "")) {
- // non-existent clerk role so we go to 404 page cleanly
- await auth.protect({
- role: "lmfaooo",
- })
- }
- }
-
+ // Only require authentication for protected pages
if (isProtectedPage(req)) {
await auth.protect()
}
+ // Redirect authenticated users away from /join
+ const session = await auth()
+ const clerkId = session.userId
if (isAuthPage(req) && clerkId) {
return Response.redirect(new URL("/dashboard", req.url))
}
diff --git a/src/server/api/routers/admin/analytics/get-payments.ts b/src/server/api/routers/admin/analytics/get-payments.ts
index ee2ce741e..8a13cb45d 100644
--- a/src/server/api/routers/admin/analytics/get-payments.ts
+++ b/src/server/api/routers/admin/analytics/get-payments.ts
@@ -1,11 +1,11 @@
-import { desc } from "drizzle-orm"
+import { desc, sql } 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)],
+ orderBy: [desc(Payment.created_at), desc(Payment.id)],
})
return paymentList
diff --git a/src/server/api/routers/admin/analytics/get-project-count.ts b/src/server/api/routers/admin/analytics/get-project-count.ts
new file mode 100644
index 000000000..e6f9c1b80
--- /dev/null
+++ b/src/server/api/routers/admin/analytics/get-project-count.ts
@@ -0,0 +1,13 @@
+import { eq, sql } from "drizzle-orm"
+
+import { adminProcedure } from "~/server/api/trpc"
+import { Project } from "~/server/db/schema"
+
+export const getProjectCount = adminProcedure.query(async ({ ctx }) => {
+ const [result] = await ctx.db
+ .select({ count: sql`count(*)`.mapWith(Number) })
+ .from(Project)
+ .where(eq(Project.is_public, true))
+
+ return { publicProjects: result?.count ?? 0 }
+})
diff --git a/src/server/api/routers/admin/analytics/get-user-count.ts b/src/server/api/routers/admin/analytics/get-user-count.ts
index fc1ff31b3..7decc31af 100644
--- a/src/server/api/routers/admin/analytics/get-user-count.ts
+++ b/src/server/api/routers/admin/analytics/get-user-count.ts
@@ -1,4 +1,4 @@
-import { isNotNull, sql } from "drizzle-orm"
+import { eq, sql } from "drizzle-orm"
import { adminProcedure } from "~/server/api/trpc"
import { User } from "~/server/db/schema"
@@ -9,7 +9,7 @@ export const getUserCount = adminProcedure.query(async ({ ctx }) => {
ctx.db
.select({ count: sql`count(*)`.mapWith(Number) })
.from(User)
- .where(isNotNull(User.role)),
+ .where(eq(User.role, "member")),
])
return {
diff --git a/src/server/api/routers/admin/analytics/get-users-per-day.ts b/src/server/api/routers/admin/analytics/get-users-per-day.ts
index b2fd49b3c..03e978aff 100644
--- a/src/server/api/routers/admin/analytics/get-users-per-day.ts
+++ b/src/server/api/routers/admin/analytics/get-users-per-day.ts
@@ -20,7 +20,7 @@ export const getUsersPerDay = adminProcedure.query(async ({ ctx }) => {
count: sql`count(*)`.mapWith(Number),
})
.from(User)
- .where(between(User.createdAt, twoMonths, new Date()))
+ .where(between(User.created_at, twoMonths, new Date()))
.groupBy(
sql`extract(day from created_at)`,
sql`extract(month from created_at)`,
@@ -39,7 +39,7 @@ export const getUsersPerDay = adminProcedure.query(async ({ ctx }) => {
count: sql`count(*)`.mapWith(Number),
})
.from(User)
- .where(and(isNotNull(User.role), between(User.createdAt, twoMonths, new Date())))
+ .where(and(isNotNull(User.role), between(User.created_at, twoMonths, new Date())))
.groupBy(
sql`extract(day from created_at)`,
sql`extract(month from created_at)`,
diff --git a/src/server/api/routers/admin/analytics/index.ts b/src/server/api/routers/admin/analytics/index.ts
index 75d2fd0f3..726604003 100644
--- a/src/server/api/routers/admin/analytics/index.ts
+++ b/src/server/api/routers/admin/analytics/index.ts
@@ -2,6 +2,7 @@ import { createTRPCRouter } from "~/server/api/trpc"
import { getGenderStatistics } from "./get-gender-statistics"
import { getAllPayments } from "./get-payments"
+import { getProjectCount } from "./get-project-count"
import { getUserCount } from "./get-user-count"
import { getUsersPerDay } from "./get-users-per-day"
@@ -10,4 +11,5 @@ export const analyticsAdminRouter = createTRPCRouter({
getUsersPerDay,
getGenderStatistics,
getAllPayments,
+ getProjectCount,
})
diff --git a/src/server/api/routers/admin/projects/get-all.ts b/src/server/api/routers/admin/projects/get-all.ts
index 6ccbd0478..94324cb01 100644
--- a/src/server/api/routers/admin/projects/get-all.ts
+++ b/src/server/api/routers/admin/projects/get-all.ts
@@ -5,7 +5,7 @@ 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)],
+ orderBy: [desc(Project.created_at), desc(Project.id)],
})
return projectList
diff --git a/src/server/api/routers/admin/projects/get-projects.ts b/src/server/api/routers/admin/projects/get-projects.ts
index ae2ea89c1..12138ba92 100644
--- a/src/server/api/routers/admin/projects/get-projects.ts
+++ b/src/server/api/routers/admin/projects/get-projects.ts
@@ -1,5 +1,5 @@
import { desc } from "drizzle-orm"
-import { and, eq } from "drizzle-orm"
+import { eq } from "drizzle-orm"
import { z } from "zod"
import { adminProcedure } from "~/server/api/trpc"
@@ -35,7 +35,7 @@ export const getProjects = adminProcedure
},
where: name ? eq(Project.name, name) : undefined,
- orderBy: [desc(Project.createdAt), desc(Project.id)],
+ orderBy: [desc(Project.created_at), desc(Project.id)],
})
return projectList
@@ -71,7 +71,7 @@ export const getPublicProjects = adminProcedure
},
where: eq(Project.is_public, is_public),
- orderBy: [desc(Project.createdAt), desc(Project.id)],
+ orderBy: [desc(Project.created_at), desc(Project.id)],
})
return projectList
diff --git a/src/server/api/routers/admin/users/get-all.ts b/src/server/api/routers/admin/users/get-all.ts
index f08e09616..7f9e3bece 100644
--- a/src/server/api/routers/admin/users/get-all.ts
+++ b/src/server/api/routers/admin/users/get-all.ts
@@ -5,7 +5,7 @@ import { User } from "~/server/db/schema"
export const getAll = adminProcedure.query(async ({ ctx }) => {
const userList = await ctx.db.query.User.findMany({
- orderBy: [desc(User.createdAt), desc(User.id)],
+ orderBy: [desc(User.created_at), desc(User.id)],
})
return userList
diff --git a/src/server/api/routers/admin/users/index.ts b/src/server/api/routers/admin/users/index.ts
index cd3f7b885..1a83a3eef 100644
--- a/src/server/api/routers/admin/users/index.ts
+++ b/src/server/api/routers/admin/users/index.ts
@@ -2,7 +2,6 @@ import { createTRPCRouter } from "~/server/api/trpc"
import { createManual } from "./create-manual"
import { getAll } from "./get-all"
-import { getNamesByEmails } from "./get-name-by-email"
import { updateEmail } from "./update-email"
import { updateRole } from "./update-role"
@@ -11,5 +10,4 @@ export const usersAdminRouter = createTRPCRouter({
getAll,
updateRole,
updateEmail,
- getNamesByEmails,
})
diff --git a/src/server/api/routers/admin/users/update-email.ts b/src/server/api/routers/admin/users/update-email.ts
index 3acf3cefa..8b18111f1 100644
--- a/src/server/api/routers/admin/users/update-email.ts
+++ b/src/server/api/routers/admin/users/update-email.ts
@@ -1,12 +1,13 @@
import { clerkClient } from "@clerk/nextjs/server"
import { TRPCError } from "@trpc/server"
-import { eq } from "drizzle-orm"
+import { eq, sql } from "drizzle-orm"
import { z } from "zod"
import { adminProcedure } from "~/server/api/trpc"
-import { db } from "~/server/db"
-import { User } from "~/server/db/schema"
+import { Project, User } from "~/server/db/schema"
+// deprecated, only for admin to update user email
+// users should use the updateEmail procedure in users router to update their own email
export const updateEmail = adminProcedure
.input(z.object({ userId: z.string(), oldEmail: z.string().email(), newEmail: z.string().email() }))
.mutation(async ({ ctx, input }) => {
@@ -14,18 +15,23 @@ export const updateEmail = adminProcedure
const user_data = await ctx.db.query.User.findFirst({
where: eq(User.email, input.oldEmail),
})
+
if (!user_data) {
throw new TRPCError({ code: "NOT_FOUND", message: `User with email: ${input.oldEmail} does not exist` })
}
+
const user_email_data = await ctx.db.query.User.findFirst({
where: eq(User.email, input.newEmail),
})
+
if (user_email_data) {
throw new TRPCError({ code: "FORBIDDEN", message: `User with email: ${input.newEmail} already exist` })
}
+
const user = await ctx.db.query.User.findFirst({
where: eq(User.id, input.userId),
})
+
if (!user) {
throw new TRPCError({ code: "NOT_FOUND", message: `User with id: ${input.userId} does not exist` })
}
@@ -47,6 +53,12 @@ export const updateEmail = adminProcedure
console.error(err)
throw new TRPCError({ code: "INTERNAL_SERVER_ERROR", message: "Failed to update email" })
}
+ await ctx.db
+ .update(Project)
+ .set({
+ members: sql`array_replace(${Project.members}, ${input.oldEmail}, ${input.newEmail})`,
+ })
+ .where(sql`${input.oldEmail} = ANY(${Project.members})`)
return user
})
diff --git a/src/server/api/routers/projects/get-application-open.ts b/src/server/api/routers/projects/get-application-open.ts
index 13786aa61..d11855904 100644
--- a/src/server/api/routers/projects/get-application-open.ts
+++ b/src/server/api/routers/projects/get-application-open.ts
@@ -7,7 +7,7 @@ import { Project } from "~/server/db/schema"
export const getApplicationOpen = protectedRatedProcedure(Ratelimit.fixedWindow(60, "30s")).query(async ({ ctx }) => {
const projectList = await ctx.db.query.Project.findMany({
where: (project, { eq }) => eq(project.is_application_open, true),
- orderBy: [desc(Project.createdAt), desc(Project.id)],
+ orderBy: [desc(Project.created_at), desc(Project.id)],
})
return projectList
diff --git a/src/server/api/routers/projects/get-public.ts b/src/server/api/routers/projects/get-public.ts
index d1748e159..7175cc082 100644
--- a/src/server/api/routers/projects/get-public.ts
+++ b/src/server/api/routers/projects/get-public.ts
@@ -14,7 +14,7 @@ export const getPublic = publicRatedProcedure(Ratelimit.fixedWindow(60, "30s")).
},
where: (project, { eq }) => eq(project.is_public, true),
- orderBy: [desc(Project.createdAt), desc(Project.id)],
+ orderBy: [desc(Project.created_at), desc(Project.id)],
})
return projectList
diff --git a/src/server/api/routers/admin/users/get-name-by-email.ts b/src/server/api/routers/users/get-name-by-email.ts
similarity index 67%
rename from src/server/api/routers/admin/users/get-name-by-email.ts
rename to src/server/api/routers/users/get-name-by-email.ts
index b9a469f55..a4bc4032d 100644
--- a/src/server/api/routers/admin/users/get-name-by-email.ts
+++ b/src/server/api/routers/users/get-name-by-email.ts
@@ -1,10 +1,11 @@
+import { Ratelimit } from "@upstash/ratelimit"
import { inArray } from "drizzle-orm"
import { z } from "zod"
-import { adminProcedure } from "~/server/api/trpc"
+import { publicRatedProcedure } from "~/server/api/trpc"
import { User } from "~/server/db/schema"
-export const getNamesByEmails = adminProcedure
+export const getNamesByEmails = publicRatedProcedure(Ratelimit.fixedWindow(4, "30s"))
.input(z.object({ emails: z.array(z.string().email()) }))
.query(async ({ ctx, input }) => {
const users = await ctx.db.query.User.findMany({
diff --git a/src/server/api/routers/users/index.ts b/src/server/api/routers/users/index.ts
index c52fb16ff..1bc9527be 100644
--- a/src/server/api/routers/users/index.ts
+++ b/src/server/api/routers/users/index.ts
@@ -3,6 +3,7 @@ import { createTRPCRouter } from "~/server/api/trpc"
import { create } from "./create"
import { get } from "./get"
import { getCurrent } from "./get-current"
+import { getNamesByEmails } from "./get-name-by-email"
import { update } from "./update"
import { updateEmail } from "./update-email"
@@ -12,4 +13,5 @@ export const usersRouter = createTRPCRouter({
get,
update,
updateEmail,
+ getNamesByEmails,
})
diff --git a/src/server/api/routers/users/update-email.ts b/src/server/api/routers/users/update-email.ts
index 18a7c84ef..98d7f6e92 100644
--- a/src/server/api/routers/users/update-email.ts
+++ b/src/server/api/routers/users/update-email.ts
@@ -20,18 +20,23 @@ export const updateEmail = protectedRatedProcedure(Ratelimit.fixedWindow(4, "30s
const user_data = await ctx.db.query.User.findFirst({
where: eq(User.email, input.oldEmail),
})
+
if (!user_data) {
throw new TRPCError({ code: "NOT_FOUND", message: `User with email: ${input.oldEmail} does not exist` })
}
+
const user_email_data = await ctx.db.query.User.findFirst({
where: eq(User.email, input.newEmail),
})
+
if (user_email_data) {
throw new TRPCError({ code: "FORBIDDEN", message: `User with email: ${input.newEmail} already exist` })
}
+
const user = await ctx.db.query.User.findFirst({
where: eq(User.id, input.userId),
})
+
if (!user) {
throw new TRPCError({ code: "NOT_FOUND", message: `User with id: ${input.userId} does not exist` })
}
diff --git a/src/server/db/index.ts b/src/server/db/index.ts
index 2a9dd6d97..d3646f385 100644
--- a/src/server/db/index.ts
+++ b/src/server/db/index.ts
@@ -1,8 +1,10 @@
-import { drizzle } from "drizzle-orm/xata-http"
+import { drizzle } from "drizzle-orm/node-postgres"
+import { Pool } from "pg"
import * as schema from "./schema"
-import { getXataClient } from "./xata"
-const xata = getXataClient()
+const pool = new Pool({
+ connectionString: process.env.SUPABASE_DB_URL,
+})
-export const db = drizzle(xata, { schema })
+export const db = drizzle(pool, { schema })
diff --git a/src/server/db/schema.ts b/src/server/db/schema.ts
index b4667f96d..73b096e40 100644
--- a/src/server/db/schema.ts
+++ b/src/server/db/schema.ts
@@ -37,10 +37,10 @@ export const User = pgTable(
role: roleEnum("role"),
square_customer_id: varchar("square_customer_id", { length: 32 }).unique().notNull(),
membership_expiry: timestamp("membership_expiry"),
- createdAt: timestamp("created_at")
+ created_at: timestamp("created_at")
.$default(() => new Date())
.notNull(),
- updatedAt: timestamp("updated_at").$onUpdate(() => new Date()),
+ updated_at: timestamp("updated_at").$onUpdate(() => new Date()),
// `reminder_pending` id a Flag used to send reminders for membership renewal bc Resend can only send 100 emails per day
reminder_pending: boolean("reminder_pending").default(false).notNull(),
},
@@ -62,10 +62,10 @@ export const Payment = pgTable(
label: varchar("label", { length: 256 }).notNull(),
event_id: varchar("event_id", { length: 32 }), // TODO: link when events are implemented
- createdAt: timestamp("created_at")
+ created_at: timestamp("created_at")
.$default(() => new Date())
.notNull(),
- updatedAt: timestamp("updated_at").$onUpdate(() => new Date()),
+ updated_at: timestamp("updated_at").$onUpdate(() => new Date()),
},
(payment) => [index("user_id_idx").on(payment.user_id), index("event_id_idx").on(payment.event_id)],
)
@@ -105,10 +105,10 @@ export const Project = pgTable(
is_application_open: boolean("is_application_open").default(false).notNull(), // whether the project is receiving applications or not
application_url: varchar("application_url", { length: 256 }), // link to the application form
is_public: boolean("is_public").default(false).notNull(), // means they are visible on projects page
- createdAt: timestamp("created_at")
+ created_at: timestamp("created_at")
.$default(() => new Date())
.notNull(),
- updatedAt: timestamp("updated_at").$onUpdate(() => new Date()),
+ updated_at: timestamp("updated_at").$onUpdate(() => new Date()),
},
(project) => [index("name_idx").on(project.name)],
)
diff --git a/src/server/db/xata.ts b/src/server/db/xata.ts
deleted file mode 100644
index 50f317f61..000000000
--- a/src/server/db/xata.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { buildClient } from "@xata.io/client"
-import type { BaseClientOptions, SchemaInference } from "@xata.io/client"
-
-import { env } from "~/env"
-
-const tables = [] as const
-
-export type SchemaTables = typeof tables
-export type InferredTypes = SchemaInference
-
-// eslint-disable-next-line
-export type DatabaseSchema = {}
-
-const DatabaseClient = buildClient()
-
-const defaultOptions = {
- databaseURL: env.XATA_DATABASE_URL,
-}
-
-export class XataClient extends DatabaseClient {
- constructor(options?: BaseClientOptions) {
- super({ ...defaultOptions, ...options }, tables)
- }
-}
-
-let instance: XataClient | undefined = undefined
-
-export const getXataClient = () => {
- if (instance) return instance
-
- instance = new XataClient()
- return instance
-}