From a29f617684322ee89c7ccdfec30f9eb41402ec32 Mon Sep 17 00:00:00 2001
From: Arman Moztarzadeh <armanmoztar@outlook.com>
Date: Thu, 19 Sep 2024 14:02:41 -0700
Subject: [PATCH 1/4] fix: change mailgun api prefix to use from client side

---
 .env.template                | 5 +++--
 src/lib/utils/forms/email.ts | 4 ++--
 src/pages/contact-us.tsx     | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.env.template b/.env.template
index 10da5056..28302763 100644
--- a/.env.template
+++ b/.env.template
@@ -4,12 +4,13 @@ NEXT_PUBLIC_BASE_URL=http://localhost:3000
 NEXT_PUBLIC_SUPABASE_URL=<supabase_url>
 NEXT_PUBLIC_SUPABASE_ANON_KEY=<supabase_anon_key>
 
+NEXT_PUBLIC_MAILGUN_DOMAIN = <mailgun_domain>
+NEXT_PUBLIC_MAILGUN_API_KEY = <mailgun_api_key>
+
 DATABASE_URL=<database_url>
 DIRECT_URL=<direct_url>
 
 NEWSLETTER_URI=<post_endpoint_for_newsletter>
 
-MAILGUN_DOMAIN=<mailgun_domain>
-MAILGUN_API_KEY=<mailgun_api_key>
 NOTION_DB_ID=<notion_db_id>
 NOTION_DB_SECRET=<notion_db_secret>
\ No newline at end of file
diff --git a/src/lib/utils/forms/email.ts b/src/lib/utils/forms/email.ts
index 8db5a7ca..21b07f6f 100644
--- a/src/lib/utils/forms/email.ts
+++ b/src/lib/utils/forms/email.ts
@@ -12,8 +12,8 @@ type MailConfig = {
   html?: string;
 };
 
-const DOMAIN = process.env.MAILGUN_DOMAIN || "mg.ubclaunchpad.com";
-const API_KEY = process.env.MAILGUN_API_KEY || "";
+const DOMAIN = process.env.NEXT_PUBLIC_MAILGUN_DOMAIN || "mg.ubclaunchpad.com";
+const API_KEY = process.env.NEXT_PUBLIC_MAILGUN_API_KEY || "";
 
 const mailgun = new Mailgun(formData);
 const mg = mailgun.client({
diff --git a/src/pages/contact-us.tsx b/src/pages/contact-us.tsx
index f5071156..0bbe3d39 100644
--- a/src/pages/contact-us.tsx
+++ b/src/pages/contact-us.tsx
@@ -6,8 +6,8 @@ import formData from "form-data";
 import { Button } from "@/components/primitives/button";
 import "../app/globals.css";
 
-const DOMAIN = process.env.MAILGUN_DOMAIN || "mg.ubclaunchpad.com";
-const API_KEY = process.env.MAILGUN_API_KEY || "";
+const DOMAIN = process.env.NEXT_PUBLIC_MAILGUN_DOMAIN || "mg.ubclaunchpad.com";
+const API_KEY = process.env.NEXT_PUBLIC_MAILGUN_API_KEY || "";
 
 const mailgun = new Mailgun(formData);
 const mg = mailgun.client({

From afd9df617d09edcf89fd2829503be9ba456105c7 Mon Sep 17 00:00:00 2001
From: Arman Moztarzadeh <armanmoztar@outlook.com>
Date: Sat, 21 Sep 2024 18:12:30 -0700
Subject: [PATCH 2/4] fix: typo in email

---
 src/app/page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/page.tsx b/src/app/page.tsx
index 0487e814..0c6b0684 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -37,7 +37,7 @@ const text = {
   joinUsButton: "Join Our Team",
   partnerWithUsTitle: "Partner with us 🤝",
   partnerWithUsSubtitle:
-    "Reach out to us through email or social media! You can also connect with us through launchpad@email.com",
+    "Reach out to us through email or social media! You can also connect with us through strategy@ubclaunchpad.com",
   partnerWithUsButton: "Contact us",
 };
 

From 461871ebb19488d8df48d392e52e8bbc03fb4361 Mon Sep 17 00:00:00 2001
From: Arman Moztarzadeh <armanmoztar@outlook.com>
Date: Thu, 26 Sep 2024 12:25:28 -0700
Subject: [PATCH 3/4] Remove unused imports

---
 src/app/portal/admin/forms/[id]/submissions/AnalyticsPage.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/portal/admin/forms/[id]/submissions/AnalyticsPage.tsx b/src/app/portal/admin/forms/[id]/submissions/AnalyticsPage.tsx
index 53361903..ef85f490 100644
--- a/src/app/portal/admin/forms/[id]/submissions/AnalyticsPage.tsx
+++ b/src/app/portal/admin/forms/[id]/submissions/AnalyticsPage.tsx
@@ -1,8 +1,6 @@
 "use client";
 import { FormChart } from "@/app/portal/admin/forms/[id]/submissions/formDataChart";
-import { formContext } from "@/components/layouts/formTabView";
 import { getFormAnalytics } from "@/lib/utils/forms/analytics";
-import { useContext, useEffect, useState } from "react";
 import { ReferenceMap } from "./columns";
 
 export default function AnalyticsPage({

From f05d03c570ba30f682eaad048c596a2751e69396 Mon Sep 17 00:00:00 2001
From: Arman Moztarzadeh <armanmoztar@outlook.com>
Date: Thu, 26 Sep 2024 12:26:11 -0700
Subject: [PATCH 4/4] remove deprecated layout field

---
 src/pages/contact-us.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/contact-us.tsx b/src/pages/contact-us.tsx
index 0bbe3d39..47d8f5ad 100644
--- a/src/pages/contact-us.tsx
+++ b/src/pages/contact-us.tsx
@@ -72,7 +72,7 @@ const ContactUs = () => {
             <Image
               src={"../images/assets/planet1.svg"}
               alt={"planet"}
-              layout={"fill"}
+              fill={true}
               style={{ objectFit: "contain" }}
             />
           </div>
@@ -80,14 +80,14 @@ const ContactUs = () => {
             <Image
               src={"../images/assets/planet2.svg"}
               alt={"planet"}
-              layout={"fill"}
+              fill={true}
               style={{ objectFit: "contain" }}
             />
           </div>
           <Image
             src={"../images/assets/starsBg.svg"}
             alt={"planet"}
-            layout={"fill"}
+            fill={true}
             style={{ objectFit: "contain" }}
           />
         </div>