some fix and env var change

Author: ErikaKK

.env.example

@@ -39,8 +39,9 @@ NEXT_PUBLIC_MAPBOX_API=mapbox-key
 # Cron (openssl rand -hex 32)
 CRON_SECRET=some-random-secret
 
+# Resend
+RESEND_API_KEY=
+
 # Supabase
-SUPABASE_URL=
-SUPABASE_PUBLISHABLE_DEFAULT_KEY=
-SUPABASE_ANON_KEY=
-SUPABASE_SERVICE_ROLE_KEY=
+SUPABASE_DB_URL=
+SUPABASE_ANON_KEY=

README.md

@@ -14,7 +14,8 @@ Bootstrapped using the create-t3-app using:
 - [Drizzle ORM](https://orm.drizzle.team/docs/overview)
 - [Clerk authentication](https://clerk.com/docs)
 - [Vercel](https://vercel.com)
-- [Xata](https://app.xata.io)
+- [Supabase](https://supabase.com/)
+- Deprecated: [Xata lite](https://app.xata.io)
 
 We use [pnpm](https://pnpm.io/) as the package manager for this project.
 
@@ -32,22 +33,26 @@ pnpm i <dep_name> -E
 pnpm upgrade -L
 
 # Database migration
-pnpm drizzle-kit pull
-pnpm drizzle-kit generate
-pnpm drizzle-kit migrate
+npx drizzle-kit generate
+npx drizzle-kit push
 ```
 
+### Notes
+
+- UTC time
+- When you make changes to the DB, please back up the data first.
+
 ## Planned Features
 
 ### Project Integration Enhancements
 
-- Profiles will soon showcase the projects that users have contributed to, highlighting their work and collaborations.
+- Profiles showcase the projects that users have contributed to, highlighting their work and collaborations.
 - Applications to join our seasonal Summer and Winter projects will be directly accessible through the site for our members.
 - Committee members and Administrators will gain the ability to upload project specifics directly to the platform.
 
 ### User Profile Enhancements
 
-- The platform will support multiple role assignments for users, offering tailored experiences based on their involvement and interests.
+- The platform supports multiple role assignments for users, offering tailored experiences based on their involvement and interests.
 - Enhanced profile customization options will be introduced.
 
 ### Event Participation and Management

src/app/dashboard/(root)/page.tsx

@@ -13,7 +13,7 @@ export default async function Dashboard() {
           Here you can see our upcoming projects and the projects you have participated in. You can apply for new
           projects here if we link the application form.
         </p>
-        <div className="flex h-full mb-8">
+        <div className="h-full mb-8">
           <DashboardContent />
         </div>
       </div>

src/app/dashboard/admin/@analytics/count.tsx

@@ -1,5 +1,3 @@
-import Link from "next/link"
-
 import { api } from "~/trpc/server"
 
 interface CardProps {
@@ -25,13 +23,14 @@ const Card = (props: CardProps) => {
 
 const Count = async () => {
   const count = await api.admin.analytics.getUserCount.query()
+  const projectCount = await api.admin.analytics.getProjectCount.query()
 
   return (
     <>
       <Card heading="Users" count={count.users} icon="group" />
       <Card heading="Members" count={count.members} icon="group" />
-      <Card heading="Projects" count={"N/A"} icon="devices" />
-      <Card heading="Events" count={"N/A"} icon="event" />
+      <Card heading="Projects" count={projectCount.publicProjects} icon="devices" />
+      {/* <Card heading="Events" count={"N/A"} icon="event" /> */}
     </>
   )
 }

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 (
+    <div className="col-span-2 border bg-card text-card-foreground">
+      <div className="flex flex-row items-center justify-between space-y-0 p-6 pb-2">
+        <h3 className="text-sm font-medium tracking-tight">{title}</h3>
+      </div>
+      <div className="w-full p-6 pt-0">
+        <Dialog>
+          <DialogTrigger asChild>
+            <Button>Open form</Button>
+          </DialogTrigger>
+          <DialogContent className="max-h-screen overflow-auto sm:max-w-md">
+            <DialogHeader>
+              <DialogTitle>{title}</DialogTitle>
+              <DialogDescription></DialogDescription>
+            </DialogHeader>
+            {children}
+          </DialogContent>
+        </Dialog>
+      </div>
+    </div>
+  )
+}
+
+export default ToolCard

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(),
@@ -35,25 +29,9 @@ const defaultValues: FormSchema = {
 
 const UpdateEmail = () => {
   return (
-    <div className="col-span-2 border bg-card text-card-foreground">
-      <div className="flex flex-row items-center justify-between space-y-0 p-6 pb-2">
-        <h3 className="text-sm font-medium tracking-tight">Update Email</h3>
-      </div>
-      <div className="w-full p-6 pt-0">
-        <Dialog>
-          <DialogTrigger asChild>
-            <Button>Open form</Button>
-          </DialogTrigger>
-          <DialogContent className="max-h-screen overflow-auto sm:max-w-md">
-            <DialogHeader>
-              <DialogTitle>Update user email</DialogTitle>
-              <DialogDescription></DialogDescription>
-            </DialogHeader>
-            <UpdateEmailForm />
-          </DialogContent>
-        </Dialog>
-      </div>
-    </div>
+    <ToolCard title="Update Email">
+      <UpdateEmailForm />
+    </ToolCard>
   )
 }
 

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-primary">
+                        <span className="font-bold">
                           {format(new Date(String(user.membership_expiry)), "dd MMMM yyyy")}
                         </span>
                       </div>

src/components/payment/online/index.tsx

@@ -16,7 +16,7 @@ import { type RouterOutputs } from "~/trpc/shared"
 
 const Card = dynamic(() => import("./card"), {
   ssr: false,
-  loading: () => <Skeleton className="h-[97px] w-full @[485px]:h-[48px]" />,
+  loading: () => <Skeleton className="h-24 w-full @[485px]:h-12" />,
 })
 const GooglePay = dynamic(() => import("./google-pay"), {
   ssr: false,
@@ -206,7 +206,7 @@ const OnlinePaymentForm = ({
       </AccordionItem>
     </Accordion>
   ) : (
-    <Skeleton className="h-[320px] w-full" />
+    <Skeleton className="h-80 w-full" />
   )
 }
 

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

src/server/api/routers/admin/analytics/get-payments.ts

@@ -1,4 +1,4 @@
-import { desc } from "drizzle-orm"
+import { desc, sql } from "drizzle-orm"
 
 import { adminProcedure } from "~/server/api/trpc"
 import { Payment } from "~/server/db/schema"