Merge branch 'dev' into search-map-button

Author: bengodw

.github/workflows/docker.yml

@@ -6,7 +6,8 @@ on:
       - "dev"
 
 env:
-  BRANCH_NAME: ${{ github.base_ref || github.ref_name }}
+  ENVIRONMENT: ${{ github.ref_name == 'master' && 'prod' || 'staging' }}
+  IMAGE_NAME: ${{ github.ref_name == 'master' && 'freerooms' || 'freerooms-staging' }}
 
 jobs:
   build:
@@ -51,8 +52,8 @@ jobs:
           platforms: linux/amd64
           file: ${{ matrix.context }}.dockerfile
           tags: |
-            ghcr.io/csesoc/freerooms-${{ matrix.name }}:${{ github.sha }}
-            ghcr.io/csesoc/freerooms-${{ matrix.name }}:latest
+            ghcr.io/devsoc-unsw/${{ env.IMAGE_NAME }}-${{ matrix.name }}:${{ github.sha }}
+            ghcr.io/devsoc-unsw/${{ env.IMAGE_NAME }}-${{ matrix.name }}:latest
           labels: ${{ steps.meta.outputs.labels }}
   deploy:
     name: Deploy (CD)
@@ -64,9 +65,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          repository: csesoc/deployment
+          repository: devsoc-unsw/deployment
           token: ${{ secrets.GH_TOKEN }}
-          ref: migration
+          ref: dev
       - name: Install yq - portable yaml processor
         uses: mikefarah/yq@v4.44.3
       - name: Update deployment
@@ -76,26 +77,12 @@ jobs:
           git config user.name "CSESoc CD"
           git config user.email "technical@csesoc.org.au"
 
-          case $BRANCH_NAME in
-          dev)
-            build_type="staging"
-            ;;
-
-          master)
-            build_type="prod"
-            ;;
-          *)
-            echo "Invalid branch '$branch'"
-            exit 1
-            ;;
-          esac
-
-          git checkout -b update/freerooms-$build_type/${{ github.sha }}
-          yq -i '.items[0].spec.template.spec.containers[0].image = "ghcr.io/csesoc/freerooms-backend:${{ github.sha }}"' projects/freerooms/$build_type/deploy-backend.yml
-          yq -i '.items[0].spec.template.spec.containers[0].image = "ghcr.io/csesoc/freerooms-frontend:${{ github.sha }}"' projects/freerooms/$build_type/deploy-frontend.yml
+          git checkout -b update/${{ env.IMAGE_NAME }}/${{ github.sha }}
+          yq -i '.items[0].spec.template.spec.containers[0].image = "ghcr.io/devsoc-unsw/${{ env.IMAGE_NAME }}-backend:${{ github.sha }}"' projects/freerooms/${{ env.ENVIRONMENT }}/deploy-backend.yml
+          yq -i '.items[0].spec.template.spec.containers[0].image = "ghcr.io/devsoc-unsw/${{ env.IMAGE_NAME }}-frontend:${{ github.sha }}"' projects/freerooms/${{ env.ENVIRONMENT }}/deploy-frontend.yml
 
           git add . 
-          git commit -m "feat(freerooms-$build_type): update images" 
-          git push -u origin update/freerooms-$build_type/${{ github.sha }}
-          gh pr create -B migration --title "feat(freerooms-$build_type): update image" --body "Updates the image for the freerooms deployment to commit csesoc/freerooms@${{ github.sha }}." > URL
+          git commit -m "feat(${{ env.IMAGE_NAME }}): update images" 
+          git push -u origin update/${{ env.IMAGE_NAME }}/${{ github.sha }}
+          gh pr create -B dev --title "feat(${{ env.IMAGE_NAME }}): update image" --body "Updates the image for the ${{ env.IMAGE_NAME }} deployment to commit devsoc-unsw/${{ env.IMAGE_NAME }}@${{ github.sha }}." > URL
           gh pr merge $(cat URL) --squash -d

README.md

@@ -11,7 +11,7 @@ Freerooms is a tool designed to help UNSW students find empty rooms on campus.
 - TypeScript (everything)
 and more! 🤓👨‍💻
 
-You can find a live build of Freerooms at [https://freerooms.csesoc.app](https://freerooms.csesoc.app/).
+You can find a live build of Freerooms at [https://freerooms.devsoc.app](https://freerooms.devsoc.app/).
 
 ## Features
 

TEAM.md

@@ -1,5 +1,21 @@
 # Freerooms Team
 
+## 2025
+
+### Leads
+- Anh Viet Duc Nguyen (@avdn-dev)
+- Michael Tanto (@mt-fns)
+
+### Developers
+- Benjamin Harold Godwin (@bengodw)
+- Connie Du (@c0nnied)
+- Brandon Tan (@BT0906)
+- Yi Yao Wang (@yiyaoW11) 
+- Shabinda Sarkaria (@shaykaria)
+- Dicko Evaldo (@dickoevaldo)
+- Chris Wong (@xleonx0x)
+- Muqueet Mohsen Chowdhury (@mmc03-ucb)
+
 ## 2024
 
 ### Leads

app/package-lock.json

@@ -40,7 +40,7 @@
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",
     "eslint": "^8.57.0",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-prettier": "^10.0.0",
     "eslint-plugin-simple-import-sort": "^12.0.0",
     "jest": "^29.7.0",
     "nodemon": "^3.0.0",

backend/package-lock.json

@@ -19,6 +19,7 @@ import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 import { Dictionary } from "@reduxjs/toolkit";
 import RoomRating from "components/Rating/RoomRating";
+import RoomUtilityTags from "components/RoomUtilityTags";
 import useRoomRatings from "hooks/useRoomRatings";
 import Image from "next/image";
 import { useParams } from "next/navigation";
@@ -86,6 +87,7 @@ export default function Page() {
             }
           />
           <BookingCalendar events={adjustedBookings ?? []} roomID={room.id} />
+          <RoomUtilityTags roomId={room?.id} />
           <RoomRating buildingID={building.id} roomID={room.id} />
         </Stack>
       ) : (