Merge branch 'main' into chore/mobile-responsiveness

src/app/(account)/signin/page.tsx

@@ -106,7 +106,8 @@ export default function SignInPage() {
                             size="small"
                         >
                             <FcGoogle className="mr-2 inline-block text-xl" /> Continue with Google
-                        </Button>
+                            Forgot password?
+                        </Link>
 
                         <div className="my-6 mt-10 flex items-center justify-center">
                             <div className="w-full border-t border-grey"></div>

src/components/Button.tsx

@@ -26,6 +26,10 @@ const Button = ({
     font,
     size = 'base',
 }: ButtonProps) => {
+    font?: string;
+}
+
+const Button = ({ children, colour, href, onClick, width, type, loading, font }: ButtonProps) => {
     const isAnchor = !!href;
     const Component = isAnchor ? 'a' : 'button';
 

src/db/index.ts

@@ -8,4 +8,4 @@ const client = createClient({
     authToken: env.DATABASE_AUTH_TOKEN,
 });
 
-export const db = drizzle(client, { schema });
+export const db = drizzle(client, { schema, logger: process.env.NODE_ENV === 'development' });

src/server/check-user-exists.ts

@@ -1,11 +1,12 @@
 import { db } from '@/db';
 import { memberTable } from '@/db/schema';
 import { eq } from 'drizzle-orm';
+import { cache } from 'react';
 
-export const checkUserExists = async (clerkUserId: string) => {
+export const checkUserExists = cache(async (clerkUserId: string) => {
     const existingUser = await db
         .select({ count: memberTable.id })
         .from(memberTable)
         .where(eq(memberTable.clerkId, clerkUserId));
     return existingUser.length > 0;
-};
+});

src/server/verify-membership-payment.ts

@@ -3,9 +3,10 @@ import { memberTable } from '@/db/schema';
 import { redisClient } from '@/lib/redis';
 import { squareClient } from '@/lib/square';
 import { eq } from 'drizzle-orm';
+import { cache } from 'react';
 import { updateMemberExpiryDate } from './update-member-expiry-date';
 
-export const verifyMembershipPayment = async (clerkId: string) => {
+export const verifyMembershipPayment = cache(async (clerkId: string) => {
     // Get user's membership expiry date from the database
     const [member] = await db
         .select({
@@ -47,5 +48,5 @@ export const verifyMembershipPayment = async (clerkId: string) => {
     } catch {
         return { paid: false as const };
     }
-};
+});
 export type MembershipPayment = Awaited<ReturnType<typeof verifyMembershipPayment>>;