1658 change membership renewal

README.md

@@ -30,6 +30,11 @@ pnpm i <dep_name> -E
 
 # Update all packages
 pnpm upgrade -L
+
+# Database migration
+pnpm drizzle-kit pull
+pnpm drizzle-kit generate
+pnpm drizzle-kit migrate
 ```
 
 ## Planned Features

declarations.d.ts

@@ -0,0 +1 @@
+declare module "*.css"

src/app/about/clients.tsx

@@ -1,4 +1,4 @@
-import clients from "data/clients.json"
+import clients from "@/data/clients.json"
 
 import { type ImageProps } from "~/lib/types"
 

src/app/about/committee.tsx

@@ -1,4 +1,4 @@
-import committee from "data/committee.json"
+import committee from "@/data/committee.json"
 import Image from "next/image"
 import * as React from "react"
 import { siGithub } from "simple-icons"

src/app/about/sponsors.tsx

@@ -1,4 +1,4 @@
-import sponsors from "data/sponsors.json"
+import sponsors from "@/data/sponsors.json"
 
 import { type ImageProps } from "~/lib/types"
 

src/app/create-account/loading.tsx

@@ -37,8 +37,8 @@ const Loading = () => {
           <h2 className="font-semibold leading-none tracking-tight">Payment</h2>
           <div className="text-sm text-muted-foreground">
             <p>
-              Become a paying member of Coders for Causes for just $5 a year (ends on 31st Dec{" "}
-              {new Date().getFullYear()}). There are many benefits to becoming a member which include:
+              Become a paying member of Coders for Causes for just $5 a year (ends one year from now). There are many
+              benefits to becoming a member which include:
             </p>
             <ul className="list-inside list-disc">
               <li>discounts to paid events such as industry nights</li>

src/app/create-account/page.tsx

@@ -609,8 +609,8 @@ export default function CreateAccount() {
             <h2 className="font-semibold leading-none tracking-tight">Payment</h2>
             <div className="text-sm text-muted-foreground">
               <p>
-                Become a paying member of Coders for Causes for just $5 a year (ends on 31st Dec{" "}
-                {new Date().getFullYear()}). There are many benefits to becoming a member which include:
+                Become a paying member of Coders for Causes for just $5 a year (ends one year from now). There are many
+                benefits to becoming a member which include:
               </p>
               <ul className="list-inside list-disc">
                 <li>discounts to paid events such as industry nights</li>

src/app/create-account/payment.tsx

@@ -15,9 +15,8 @@ const PaymentBlock = () => {
           <h2 className="font-semibold leading-none tracking-tight">Payment</h2>
           <div className="text-sm text-muted-foreground">
             <p>
-              Become a paying member of Coders for Causes for just $5 a year (ends on 31st Dec{" "}
-              {new Date().getFullYear()}
-              ). There are many benefits to becoming a member which include:
+              Become a paying member of Coders for Causes for just $5 a year (ends one year from now). There are many
+              benefits to becoming a member which include:
             </p>
             <ul className="list-inside list-disc">
               <li>discounts to paid events such as industry nights</li>

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

@@ -169,6 +169,24 @@ const columns = (updateRole: ({ id, role }: UpdateUserRoleFunctionProps) => void
     cell: (cell) => <span className="text-xs">{cell.getValue<React.ReactNode>()}</span>,
     accessorFn: (user) => format(user.createdAt, "Pp", { locale: enAU }),
   },
+  {
+    id: "Membership expiry",
+    header: "Membership expiry",
+    cell: ({ row }) => {
+      const user = row.original
+      if (!user.membership_expiry) {
+        return
+      }
+      const isExpired = new Date(user.membership_expiry) < new Date()
+      return (
+        <span className={`text-xs ${isExpired ? "text-destructive" : "text-foreground"}`}>
+          {format(user.membership_expiry, "Pp", { locale: enAU })}
+        </span>
+      )
+    },
+    accessorFn: (user) =>
+      user.membership_expiry ? format(user.membership_expiry, "Pp", { locale: enAU }) : "No membership",
+  },
   {
     header: "Socials",
     cell: ({ row }) => {

src/app/events/page.tsx

@@ -1,4 +1,4 @@
-import eventList from "data/events.json"
+import eventList from "@/data/events.json"
 import { format, isAfter, isBefore, isSameDay, parse } from "date-fns"
 import Link from "next/link"
 

src/app/hack-for-homes/agenda/page.tsx

@@ -1,4 +1,4 @@
-import agendaList from "data/hackathon2025/agenda.json"
+import agendaList from "@/data/hackathon2025/agenda.json"
 
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "~/components/ui/tabs"
 

src/app/hack-for-homes/participants/page.tsx

@@ -1,4 +1,4 @@
-import participantList from "data/hackathon2025/participants.json"
+import participantList from "@/data/hackathon2025/participants.json"
 
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "~/components/ui/tabs"
 

src/app/hack-for-homes/sponsors.tsx

@@ -1,4 +1,4 @@
-import sponsors from "data/hackathon2025/sponsors.json"
+import sponsors from "@/data/hackathon2025/sponsors.json"
 
 import { type ImageProps } from "~/lib/types"
 

src/app/profile/[id]/profile.tsx

@@ -122,8 +122,8 @@ const ProfilePage = ({ id, currentUser }: ProfilePageProps) => {
                         <div className="text-sm text-muted-foreground">
                           <p>
                             You&apos;re not a member with us yet. Become a paying member of Coders for Causes for just
-                            $5 a year (ends on 31st Dec {new Date().getFullYear()}). There are many benefits to becoming
-                            a member which include:
+                            $5 a year (ends one year from now). There are many benefits to becoming a member which
+                            include:
                           </p>
                           <ul className="list-inside list-disc">
                             <li>discounts to paid events such as industry nights</li>

src/app/projects/(default)/page.tsx

@@ -1,4 +1,4 @@
-import projectData from "data/projects.json"
+import projectData from "@/data/projects.json"
 import type { Metadata, Viewport } from "next"
 import dynamic from "next/dynamic"
 

src/app/projects/[id]/page.tsx

@@ -1,6 +1,6 @@
 "use client"
 
-import projects from "data/projects.json"
+import projects from "@/data/projects.json"
 import Image from "next/image"
 import Link from "next/link"
 

src/components/email-template.tsx

@@ -10,11 +10,11 @@ export const MembershipRenewalReminderEmail = ({
   Firstname,
   WebsiteLink = "https://codersforcauses.org/join",
 }: MembershipRenewalReminderEmailProps) => {
-  let year = new Date().getFullYear()
-  const month = new Date().getMonth()
-  if (month < 6) {
-    year -= 1
-  }
+  // let year = new Date().getFullYear()
+  // const month = new Date().getMonth()
+  // if (month < 6) {
+  //   year -= 1
+  // }
 
   return (
     <Html>
@@ -29,13 +29,15 @@ export const MembershipRenewalReminderEmail = ({
           <Section>
             <Text style={text}>Hi {Firstname},</Text>
             <Text style={text}>
-              {`Your membership of Coders for Causes ends on 31st Dec ${year}. To keep your membership active, please renew it by clicking the button below.`}
+              {`Your membership of Coders for Causes ends on 31st Dec 2025. To keep your membership active, please renew it by clicking the button below.`}
             </Text>
+            <Text
+              style={text}
+            >{`Please note that, following an amendment to our constitution last year, subscriptions will expire one year from the date of purchase, effective from 2026.`}</Text>
             <Button style={button} href={WebsiteLink}>
               Login to my account
             </Button>
-
-            <Text style={text}>Happy coding!</Text>
+            <Text style={text}>Happy new year and happy coding!</Text>
             <Img
               src="https://codersforcauses.org/logo/cfc_logo_white_circle.png"
               width="50"

src/components/payment/online/apple-pay.tsx

@@ -70,8 +70,8 @@ const ApplePay = ({ paymentInstance, payRequest, ...props }: ApplePayProps) => {
       }
 
       let message = `Tokenization failed with status: ${result.status}`
-      if (result?.errors) {
-        message += ` and errors: ${JSON.stringify(result?.errors)}`
+      if (result.status !== "OK" && "errors" in result && result.errors) {
+        message += ` and errors: ${JSON.stringify(result.errors)}`
 
         throw new Error(message)
       }

src/components/payment/online/card.tsx

@@ -84,8 +84,8 @@ const Card = ({ amount, paymentInstance, theme, setFocus, ...props }: CardProps)
       }
 
       let message = `Tokenization failed with status: ${result.status}`
-      if (result?.errors) {
-        message += ` and errors: ${JSON.stringify(result?.errors)}`
+      if (result.status !== "OK" && "errors" in result && result.errors) {
+        message += ` and errors: ${JSON.stringify(result.errors)}`
 
         throw new Error(message)
       }

src/components/payment/online/google-pay.tsx

@@ -95,8 +95,8 @@ const GooglePay = ({ paymentInstance, payRequest, theme, ...props }: GooglePayPr
       }
 
       let message = `Tokenization failed with status: ${result.status}`
-      if (result?.errors) {
-        message += ` and errors: ${JSON.stringify(result?.errors, null, 2)}`
+      if (result.status !== "OK" && "errors" in result && result.errors) {
+        message += ` and errors: ${JSON.stringify(result.errors, null, 2)}`
 
         throw new Error(message)
       }

src/components/payment/online/index.tsx

@@ -122,36 +122,49 @@ const OnlinePaymentForm = ({
   }, [])
 
   const cardTokenizeResponseReceived = async (result: TokenResult) => {
-    if (result.errors) {
-      // TODO handle errors
+    if (result.status !== "OK") {
+      toast({
+        variant: "destructive",
+        title: "Payment tokenization failed",
+        description: "There was an issue processing your payment method. Please try again.",
+      })
       return
     }
 
     let paymentID: string | undefined = ""
-    if (cardDetails[0] && (result?.details?.method as string) === "Card") {
+    if (cardDetails[0] && (result.details?.method as string) === "Card") {
       try {
         const id = await storeCard.mutateAsync({
-          sourceID: result.token!,
+          sourceID: result.token,
         })
         paymentID = await pay.mutateAsync({
           sourceID: id!,
           label,
           amount,
         })
       } catch (error) {
-        // TODO: handle error
-        console.log(error)
+        toast({
+          variant: "destructive",
+          title: "Payment failed",
+          description:
+            "Unable to process your payment with stored card. Please try again or use a different payment method.",
+        })
+        console.error("Stored card payment error:", error)
       }
     } else {
       try {
         paymentID = await pay.mutateAsync({
-          sourceID: result.token!,
+          sourceID: result.token,
           label,
           amount,
         })
       } catch (error) {
-        // TODO: handle error
-        console.log(error)
+        toast({
+          variant: "destructive",
+          title: "Payment failed",
+          description: "Unable to process your payment. Please try again or use a different payment method.",
+        })
+        console.error("Direct payment error:", error)
       }
     }
 

src/components/payment/online/saved-cards.tsx

@@ -68,10 +68,12 @@ const SavedCardsForm = ({ amount, cards, ...props }: SavedCardsProps) => {
     try {
       props.loadingState[1](true)
       await props.cardTokenizeResponseReceived({
-        // fuck you square
-        status: "OK" as TokenStatusType,
+        status: "OK",
         token: values.card,
-      })
+        details: {
+          method: "Card",
+        },
+      } as TokenResult)
     } catch (error) {
       console.error(error)
     } finally {

src/server/api/routers/admin/users/update-role.ts

@@ -1,4 +1,5 @@
 import { TRPCError } from "@trpc/server"
+import { addYears } from "date-fns"
 import { eq } from "drizzle-orm"
 import { z } from "zod"
 
@@ -23,5 +24,12 @@ export const updateRole = adminProcedure
       throw new TRPCError({ code: "NOT_FOUND", message: `User with id: ${input.id} does not exist` })
     }
 
+    if (input.role === "member") {
+      await ctx.db
+        .update(User)
+        .set({ membership_expiry: addYears(new Date(), 1) })
+        .where(eq(User.id, input.id))
+    }
+
     return user
   })

src/server/api/routers/payments/pay.ts

@@ -1,6 +1,7 @@
 import { TRPCError } from "@trpc/server"
 import { Ratelimit } from "@upstash/ratelimit"
 import { randomUUID } from "crypto"
+import { addYears } from "date-fns"
 import { eq } from "drizzle-orm"
 import { env } from "process"
 import { z } from "zod"
@@ -74,7 +75,13 @@ export const pay = protectedRatedProcedure(Ratelimit.fixedWindow(2, "30s"))
       currency: result.payment.amountMoney.currency,
     })
 
-    await ctx.db.update(User).set({ role: "member" }).where(eq(User.id, currentUser.id))
+    await ctx.db
+      .update(User)
+      .set({
+        role: "member",
+        membership_expiry: addYears(new Date(), 1),
+      })
+      .where(eq(User.id, currentUser.id))
 
     return result.payment.id
   })

src/server/api/routers/users/update.ts

@@ -37,7 +37,6 @@ export const update = protectedRatedProcedure(Ratelimit.fixedWindow(4, "30s"))
   .mutation(async ({ ctx, input }) => {
     const currentUser = ctx.user
     if (!currentUser) throw new Error("Not authenticated")
-    // TODO: update clerk email
     // TODO: Wrap in a transaction
     try {
       const clerk = await clerkClient()

src/server/db/migrations/0005_daffy_victor_mancha.sql

@@ -0,0 +1 @@
+ALTER TABLE "cfc-website_user" ADD COLUMN "membership_expiry" timestamp;