From dd6fc7e2c75bc9c33e4a22b0c5a27b436075a527 Mon Sep 17 00:00:00 2001
From: Guryash <gmat224@aucklanduni.ac.nz>
Date: Wed, 11 Dec 2024 09:53:01 +1300
Subject: [PATCH 1/2] fix: mounting secrets

---
 web/Dockerfile.staging         | 4 +---
 web/src/screens/ExecScreen.tsx | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/web/Dockerfile.staging b/web/Dockerfile.staging
index 5e8e073..12209a7 100644
--- a/web/Dockerfile.staging
+++ b/web/Dockerfile.staging
@@ -37,9 +37,7 @@ ENV VITE_APP_URL="https://wdcc-auis-staging.fly.dev"
 ENV VITE_APP_NAME="AUIS"
 
 # Mount secrets into Dockerfile and set environment variables
-RUN  --mount=type=secret,id=VITE_CLERK_PUBLISHABLE_KEY \
-    VITE_CLERK_PUBLISHABLE_KEY="$(cat /run/secrets/VITE_CLERK_PUBLISHABLE_KEY)" 
-RUN  --mount=type=secret,id=VITE_STRIPE_PUBLISHABLE_KEY \
+RUN --mount=type=secret,id=VITE_STRIPE_PUBLISHABLE_KEY \
     VITE_STRIPE_PUBLISHABLE_KEY="$(cat /run/secrets/VITE_STRIPE_PUBLISHABLE_KEY)" \
     yarn run build   
 
diff --git a/web/src/screens/ExecScreen.tsx b/web/src/screens/ExecScreen.tsx
index 85fdd1b..4581e2c 100644
--- a/web/src/screens/ExecScreen.tsx
+++ b/web/src/screens/ExecScreen.tsx
@@ -120,7 +120,7 @@ export default function ExecScreen({ navbar }: { navbar: JSX.Element }) {
             </h3>
             <h2 className="text-tertiary-blue text-3xl font-bold">President</h2>
             {errorExecutives ? (
-              <div className="py-10">There are no execs to display</div>
+              <div className="py-10 text-white">There are no execs to display</div>
             ) : (
               <div className="flex flex-wrap justify-center">
                 {presidents?.map((exec) => (
@@ -139,7 +139,7 @@ export default function ExecScreen({ navbar }: { navbar: JSX.Element }) {
               Executive Team
             </h2>
             {errorExecutives ? (
-              <div className="py-10">There are no execs to display</div>
+              <div className="py-10 text-white">There are no execs to display</div>
             ) : (
               <div className="mb-5 flex flex-wrap justify-center">
                 {otherExecutives?.map((exec) => (

From f409a60ab20fd4d0d656ad00df1f8743c51fa752 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 10 Dec 2024 20:53:30 +0000
Subject: [PATCH 2/2] Format code with Prettier

---
 web/src/screens/ExecScreen.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/web/src/screens/ExecScreen.tsx b/web/src/screens/ExecScreen.tsx
index 4581e2c..8612bc8 100644
--- a/web/src/screens/ExecScreen.tsx
+++ b/web/src/screens/ExecScreen.tsx
@@ -120,7 +120,9 @@ export default function ExecScreen({ navbar }: { navbar: JSX.Element }) {
             </h3>
             <h2 className="text-tertiary-blue text-3xl font-bold">President</h2>
             {errorExecutives ? (
-              <div className="py-10 text-white">There are no execs to display</div>
+              <div className="py-10 text-white">
+                There are no execs to display
+              </div>
             ) : (
               <div className="flex flex-wrap justify-center">
                 {presidents?.map((exec) => (
@@ -139,7 +141,9 @@ export default function ExecScreen({ navbar }: { navbar: JSX.Element }) {
               Executive Team
             </h2>
             {errorExecutives ? (
-              <div className="py-10 text-white">There are no execs to display</div>
+              <div className="py-10 text-white">
+                There are no execs to display
+              </div>
             ) : (
               <div className="mb-5 flex flex-wrap justify-center">
                 {otherExecutives?.map((exec) => (