Spring 2025

src/app/auth/actions.ts

@@ -3,14 +3,19 @@
 import { revalidatePath } from "next/cache";
 import { redirect } from "next/navigation";
 import { createClient } from "@/lib/utils/supabase/server";
+import { headers, cookies } from "next/headers";
 
 export async function login() {
   const supabase = createClient();
+  const c = cookies();
+  const redirectPath = `redirect=${c.get("x-path")?.value || ""}`;
+  c.delete("x-path");
+  const callbackUrl = `${process.env.NEXT_PUBLIC_BASE_URL}/auth/callback?${redirectPath}`;
 
   const { data, error } = await supabase.auth.signInWithOAuth({
     provider: "google",
     options: {
-      redirectTo: process.env.NEXT_PUBLIC_BASE_URL + "/auth/callback",
+      redirectTo: callbackUrl,
     },
   });
 

src/app/auth/callback/route.ts

@@ -6,7 +6,9 @@ export async function GET(request: Request) {
   const { searchParams, origin } = new URL(request.url);
   const code = searchParams.get("code");
   // if "next" is in param, use it as the redirect URL
-  const next = searchParams.get("next") ?? "/";
+  const next = searchParams.get("redirect") ?? "/";
+
+  console.log("next", next);
 
   if (code) {
     const supabase = createClient();

src/app/page.tsx

@@ -14,16 +14,6 @@ import MemberRoles from "@/components/general/memberRoles";
 import ProjectSection from "@/components/general/projectSection";
 import PartnerSection from "@/components/general/partnerSection";
 
-// const refreshProjects = async () => {
-//     const res = await fetch(
-//         `${process.env.NEXT_PUBLIC_BASE_URL}/api/projects/refresh`
-// );
-//
-//     const data = await res.json();
-//     console.log(data.data);
-//     return data.data;
-// };
-
 const text = {
   aboutUsTitle: "What we do at",
   aboutUsSubtitle: "Launch Pad",
@@ -97,7 +87,7 @@ export default async function Home() {
           <p className="gradient-subtitle text-center lg:text-left py-10">
             {text.joinUsText}
           </p>
-          <Link href="/portal/forms/241">
+          <Link href="/portal/forms/8">
             <Button className="p-4" size={"xl"} icon>
               <span className="text-lg">{text.joinUsButton}</span>
             </Button>

src/app/portal/forms/[id]/apply/page.tsx

@@ -36,7 +36,6 @@ export default async function page({
       />
     );
   } catch (e) {
-    toast.error("Error loading application");
     return redirect(`/portal/forms/${params.id}`);
   }
 }

src/app/portal/forms/actions.ts

@@ -88,38 +88,38 @@ export async function submitApplication({ formId }: { formId: bigint }) {
     return newObj;
   }
 
-  // const updateSubmission = db.submissions.update({
-  //   where: {
-  //     user_id_form_id: {
-  //       form_id: formId,
-  //       user_id: data.user.id,
-  //     },
-  //   },
-  //   data: {
-  //     status: "submitted",
-  //   },
-  // });
-
-  // const createApplication = db.applications.create({
-  //   data: {
-  //     id: res.id!,
-  //     status: null,
-  //     reviewer_id: null,
-  //   },
-  // });
-
-  // await Promise.all([updateSubmission, createApplication]);
-  // const appEmail = res.details ? (res.details as Obj) : {};
-  // const template = await render(SubmissionTemplate({ formTitle: form.title }));
-  // await sendEmail({
-  //   from: "[email protected]",
-  //   fromName: "No-reply UBC Launch Pad",
-  //   to: data.user.email!.toString(),
-  //   subject: `${form.title} - Form Submitted`,
-  //   html: template,
-  //   cc: appEmail?.email as string,
-  // });
-  // return true;
+  const updateSubmission = db.submissions.update({
+    where: {
+      user_id_form_id: {
+        form_id: formId,
+        user_id: data.user.id,
+      },
+    },
+    data: {
+      status: "submitted",
+    },
+  });
+
+  const createApplication = db.applications.create({
+    data: {
+      id: res.id!,
+      status: null,
+      reviewer_id: null,
+    },
+  });
+
+  await Promise.all([updateSubmission, createApplication]);
+  const appEmail = res.details ? (res.details as Obj) : {};
+  const template = await render(SubmissionTemplate({ formTitle: form.title }));
+  await sendEmail({
+    from: "[email protected]",
+    fromName: "No-reply UBC Launch Pad",
+    to: data.user.email!.toString(),
+    subject: `${form.title} - Form Submitted`,
+    html: template,
+    cc: appEmail?.email as string,
+  });
+  return true;
 }
 
 export async function updateApplication({

src/components/general/hero.tsx

@@ -26,7 +26,7 @@ export default function LandingPage() {
           <p className="text-lg w-full text-center md:text-left gradient-subtitle">
             {text.description}
           </p>
-          <Link href="/portal/forms/241">
+          <Link href="/portal/forms/8">
             <Button className="p-3 px-6" size={"xl"} icon>
               <span className="text-lg">{text.joinUs}</span>
             </Button>

src/lib/utils/supabase/middleware.ts

@@ -53,7 +53,9 @@ export async function updateSession(request: NextRequest) {
       // no user, potentially respond by redirecting the user to the login page
       const url = request.nextUrl.clone();
       url.pathname = "/auth";
-      return NextResponse.redirect(url);
+      const resp = NextResponse.redirect(url);
+      resp.cookies.set("x-path", request.nextUrl.pathname);
+      return resp;
     }
   } catch (error) {
     console.error("Error fetching user", error);