Merge pull request #278 from UoaWDCC/UABC-238-View-attendees-list

* squashed commits from #278

.env-example

@@ -10,7 +10,8 @@ NEXTAUTH_SECRET=EXAMPLE_NEXTAUTH_SECRET
 
 SES_ACCESS_KEY=EXAMPLE_ACCESS_KEY
 SES_SECRET_ACCESS_KEY=EXAMPLE_SECRET_ACCESS_KEY
-[email protected]
+[email protected]
+[email protected]
 AWS_REGION=ap-southeast-2
 
 APP_URL=http://localhost:3000

.github/workflows/deploy-prod.yml

@@ -1,9 +1,7 @@
 name: Deploy Production
 on:
-  push:
-    tags:
-      - "v*"
   workflow_dispatch:
+  workflow_call:
 
 env:
   FLY_API_TOKEN: ${{ secrets.FLY_WEB_PRODUCTION_API_TOKEN }}
@@ -15,12 +13,6 @@ jobs:
     runs-on: ubuntu-latest
     concurrency: deploy-group # optional: ensure only one action runs at a time
     steps:
-      - name: Tag release
-        uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          prerelease: false
-
       - name: Checkout code
         uses: actions/checkout@v4
 

.github/workflows/e2e.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   test:
     timeout-minutes: 60
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/tag-release.yml

@@ -0,0 +1,22 @@
+name: "Tag Release and Deploy"
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  tagged-release:
+    name: "Tagged Release"
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          prerelease: false
+
+  deploy:
+    name: "Deploy Production"
+    needs: [tagged-release]
+    uses: ./.github/workflows/deploy-prod.yml
+    secrets: inherit

Dockerfile

@@ -35,7 +35,8 @@ ENV GOOGLE_CLIENT_ID " "
 ENV GOOGLE_CLIENT_SECRET " "
 ENV SES_ACCESS_KEY " "
 ENV SES_SECRET_ACCESS_KEY " "
-ENV SENDER_EMAIL_ADDRESS "[email protected]"
+ENV MAIL_FROM "[email protected]"
+ENV REPLY_TO "[email protected]"
 ENV AWS_REGION " "
 ENV SQID_SECRET "ABC"
 ENV CRON_SECRET " "

playwright/fixtures/users.ts

@@ -32,7 +32,7 @@ export const createUserFixture = (user: User, page: Page) => {
   return {
     ...user,
     login: async () => {
-      await login(user.email, user.password!, page);
+      await login(user.email, user.password ?? "", page);
     },
   };
 };