Skip to content

Commit

Permalink
Merge pull request #146 from UoaWDCC/feat/ticket-scanning-page
Browse files Browse the repository at this point in the history
Feat/ticket scanning page
  • Loading branch information
gmat224 authored Dec 10, 2024
2 parents 7f59fba + 4b65fc5 commit 824dc48
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
4 changes: 1 addition & 3 deletions web/Dockerfile.staging
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 6 additions & 2 deletions web/src/screens/ExecScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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">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) => (
Expand All @@ -139,7 +141,9 @@ 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) => (
Expand Down

0 comments on commit 824dc48

Please sign in to comment.