Skip to content

Commit 8182fd9

Browse files
authored
Merge branch 'master' into I2-15/interactable-terminal
2 parents 0fd2438 + bec7ffb commit 8182fd9

23 files changed

+322
-423
lines changed

.github/workflows/backend-ci.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: ci
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- renovate/*
8+
pull_request:
9+
branches:
10+
- master
11+
12+
jobs:
13+
api-ci:
14+
runs-on: ubuntu-latest
15+
defaults:
16+
run:
17+
working-directory: ./backend
18+
steps:
19+
- uses: actions/checkout@v4
20+
- uses: actions/setup-node@v3
21+
with:
22+
node-version: 22
23+
- run: npm ci
24+
- run: npm run type-check
25+
- run: npm run build
26+
ui-ci:
27+
runs-on: ubuntu-latest
28+
defaults:
29+
run:
30+
working-directory: ./frontend
31+
steps:
32+
- uses: actions/checkout@v4
33+
- uses: actions/setup-node@v3
34+
with:
35+
node-version: 16
36+
- run: npm install
37+
- run: npm run lint
38+
- run: npm run type-check
39+
- run: npm run build

.github/workflows/docker.yml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: Docker
2+
on:
3+
push:
4+
branches:
5+
- "master"
6+
7+
jobs:
8+
build:
9+
name: "Build (${{ matrix.component }})"
10+
runs-on: ubuntu-latest
11+
permissions:
12+
contents: read
13+
packages: write
14+
strategy:
15+
fail-fast: true
16+
matrix:
17+
component: [backend, frontend]
18+
steps:
19+
- name: Checkout repository
20+
uses: actions/checkout@v4
21+
- name: Set up QEMU
22+
uses: docker/setup-qemu-action@v3
23+
with:
24+
platforms: arm64
25+
- name: Set up Docker Buildx
26+
uses: docker/setup-buildx-action@v3
27+
- name: Log into registry ${{ env.REGISTRY }}
28+
uses: docker/login-action@v3
29+
with:
30+
registry: ghcr.io
31+
username: ${{ github.actor }}
32+
password: ${{ secrets.GH_TOKEN }}
33+
- name: Build and push Docker image
34+
uses: docker/build-push-action@v5
35+
with:
36+
context: ${{ matrix.component }}
37+
push: ${{ github.event_name != 'pull_request' }}
38+
platforms: linux/amd64
39+
file: ${{ matrix.component }}/Dockerfile
40+
tags: |
41+
ghcr.io/csesoc/website-${{ matrix.component }}:${{ github.sha }}
42+
ghcr.io/csesoc/website-${{ matrix.component }}:latest
43+
labels: ${{ steps.meta.outputs.labels }}
44+
deploy-prod:
45+
name: Deploy Production (CD)
46+
runs-on: ubuntu-latest
47+
needs: [build]
48+
concurrency: prod
49+
environment:
50+
name: prod
51+
if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/master' }}
52+
steps:
53+
- name: Checkout repository
54+
uses: actions/checkout@v4
55+
with:
56+
repository: csesoc/deployment
57+
token: ${{ secrets.GH_TOKEN }}
58+
ref: develop
59+
- name: Install yq - portable yaml processor
60+
uses: mikefarah/[email protected]
61+
- name: Update deployment
62+
env:
63+
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
64+
run: |
65+
git config user.name "CSESoc CD"
66+
git config user.email "[email protected]"
67+
git checkout -b update/website-prod/${{ github.sha }}
68+
yq -i '.items[0].spec.template.spec.containers[0].image = "ghcr.io/csesoc/website-backend:${{ github.sha }}"' apps/projects/website/prod/deploy-backend.yml
69+
yq -i '.items[0].spec.template.spec.containers[0].image = "ghcr.io/csesoc/website-frontend:${{ github.sha }}"' apps/projects/website/prod/deploy-frontend.yml
70+
git add .
71+
git commit -m "feat(website/prod): update image"
72+
git push -u origin update/website-prod/${{ github.sha }}
73+
gh pr create -B develop --title "feat(website/prod): update image" --body "Updates the image for the website-prod deployment to commit csesoc/csesoc-website@${{ github.sha }}." > URL
74+
gh pr merge $(cat URL) --squash -d

.github/workflows/frontend-ci.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

frontend/public/data/events.ts

Lines changed: 32 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,55 @@
1-
21
export type eventInfo = {
32
title: string;
43
startTime: string;
54
endTime: string;
65
location: string;
7-
description: string;
6+
// description: string;
87
image: string;
98
link: string;
109
};
1110

1211
export const events: eventInfo[] = [
1312
{
14-
title: 'CSESoc Hoodie General Release 2024',
15-
startTime: 'Monday, 7 Oct 2024 12:00:00',
16-
endTime: 'Friday, 18 Oct 2024 23:59:59',
17-
location: 'Online',
18-
description: 'After much anticipated wait 🤩, from your design submissions and personal input, our 2024 CSESoc Shell hoodies are now available for order! 🥳',
19-
image: 'https://scontent.fsyd11-2.fna.fbcdn.net/v/t39.30808-6/462221120_1045429977366613_3924200758993686299_n.jpg?stp=dst-jpg_s960x960&_nc_cat=107&ccb=1-7&_nc_sid=75d36f&_nc_ohc=tt-N_Bd5fd4Q7kNvgFdY5yk&_nc_zt=23&_nc_ht=scontent.fsyd11-2.fna&_nc_gid=AG_QiCaGBWyXh0lwZdZZ73k&oh=00_AYD8zSJw_LFOHaIG7oOFtws9uIbXrCyRwIS0IZkh6ipInQ&oe=67182124',
20-
link: 'https://www.facebook.com/events/858016553106187',
21-
},
22-
{
23-
title: 'HUMANS OF CSE OCTOBER ARTICLE - TRANSFERRING DEGREES',
24-
startTime: 'Monday, 14 Oct 2024, 20:00:00',
25-
endTime: 'Monday, 21 Oct 2024, 23:00:00',
26-
location: 'Online',
27-
description: 'Come along with us in this month\'s article 🌎, as we follow the journey of CSE students who made the switch to these degrees! 🔄 We explore how they decided to transfer 📜 , what challenges there were getting started, and all the exciting things they\'re up to now! 🚀',
28-
image: 'https://scontent.fsyd11-2.fna.fbcdn.net/v/t39.30808-6/463321890_1051317113444566_587573735370794997_n.jpg?stp=dst-jpg_s960x960&_nc_cat=103&ccb=1-7&_nc_sid=75d36f&_nc_ohc=5o-MEkKeoecQ7kNvgEVDfXP&_nc_zt=23&_nc_ht=scontent.fsyd11-2.fna&_nc_gid=Ama2uSCPexSL8fx4vEvJSzh&oh=00_AYAwBP-EHTZUai43wHVQQZ7JRVGuZ4RdOih_C9ocLR1tqw&oe=67182C1D',
29-
link: 'https://www.facebook.com/events/544877388231818/'
13+
title: "Brawl Stars Tournament",
14+
startTime: "Thursday, 29 May 2025 20:00:00",
15+
endTime: "Thursday, 29 May 2025 22:30:00",
16+
location: "Online via Discord",
17+
image: "/images/events/brawl_stars.jpg",
18+
link: "https://www.facebook.com/events/1251081513377441"
3019
},
3120
{
32-
title: 'Meet the Arista Warriors - BBQ And Talk',
33-
startTime: 'Wednesday, 23 Oct 2024, 12:00:00',
34-
endTime: 'Wednesday, 23 Oct 2024, 16:00:00',
35-
location: 'John Lions Garden, UNSW',
36-
description: "Ready to meet the creators of the fastest switches in the world? ⚡ Join us for an interactive talk with the Arista Warriors! 👥 Get a behind-the-scenes look at their network switches 🖥️, learn how their advanced software drives the performance 💻, and meet the talented teams that make it all happen 👨‍💻!",
37-
image: 'https://scontent.fsyd11-1.fna.fbcdn.net/v/t39.30808-6/463219819_1051611690081775_3133232766646231661_n.jpg?stp=dst-jpg_s960x960&_nc_cat=110&ccb=1-7&_nc_sid=75d36f&_nc_ohc=DmRNYX-_AtQQ7kNvgFnwOCH&_nc_zt=23&_nc_ht=scontent.fsyd11-1.fna&_nc_gid=AqkzDMqF36HWZbR7hgWA7AK&oh=00_AYDepVjHbmg5wNZvnIh92P49ESA1i-MyUSBA7G09lSQd-g&oe=67181093',
38-
link: 'https://www.facebook.com/events/1739162536859227/'
39-
},
40-
{
41-
title: 'Nostalgia Night',
42-
startTime: 'Wednesday, 23 Oct 2024, 17:00:00',
43-
endTime: 'Wednesday, 23 Oct 2024, 19:00:00',
44-
location: 'Design Next Studio, Level 5, J17, UNSW',
45-
description: 'Feeling trapped in the endless cycle of assignments and uni commitments? 📚😓 Longing for simpler times when your biggest worry was whether you should watch Giggle and Hoot or make loom bands with your sibling? 📺🍭 Well, dust off your Pokémon cards and polish those yo-yos, because CSESoc is about to send you back to the past with NOSTALGIA NIGHT! 🚀⏰',
46-
image: 'https://scontent.fsyd11-1.fna.fbcdn.net/v/t39.30808-6/462701368_1048050000437944_2801863201980347260_n.jpg?stp=dst-jpg_s960x960&_nc_cat=104&ccb=1-7&_nc_sid=75d36f&_nc_ohc=m4Sy0L-V9i8Q7kNvgGYoF5X&_nc_zt=23&_nc_ht=scontent.fsyd11-1.fna&_nc_gid=A2nTAu82YR1NE7-13Zxaw3n&oh=00_AYAk4v2MHtB9pFASHYQe2wnY153oxVDZ8qaI_my6JMPL0Q&oe=671828EA',
47-
link: 'https://www.facebook.com/events/1244647416584933/',
48-
},
49-
{
50-
title: 'CSESoc x EngSoc: Hallo-Wasted',
51-
startTime: 'Friday, 1 Nov 2024, 19:00:00',
52-
endTime: 'Friday, 1 Nov 2024, 23:00:00',
53-
location: 'Scruffy Murphy\'s',
54-
description: 'Fear no more — or even more 🫣, as CSESoc and EngSoc invites you to crawl out 🐺🕷️ from your study dungeons for the most nerve-wrecking night you won’t forget — at the Hallo-Wasted Party! 🍾🙀',
55-
image: 'https://scontent.fsyd11-1.fna.fbcdn.net/v/t39.30808-6/462393945_1046485953927682_3594406987464705203_n.jpg?stp=dst-jpg_s960x960&_nc_cat=104&ccb=1-7&_nc_sid=75d36f&_nc_ohc=TlCztpaxbygQ7kNvgG9Iqn6&_nc_zt=23&_nc_ht=scontent.fsyd11-1.fna&_nc_gid=AYwaFSvxbBBT3KlbgOVDc1U&oh=00_AYC6aVx3Qlo-fxE8spGoEIAHE6rkAcguZivNCYKLy-d3hQ&oe=67182060',
56-
link: 'https://www.facebook.com/events/903031551735450/',
21+
title: "Rookie Code Rumble",
22+
startTime: "Friday, 30 May 2025 18:00:00",
23+
endTime: "Friday, 6 June 2025 23:59:59",
24+
location: "Online (kick-off location TBD)",
25+
image: "/images/events/rookie_code_rumble.jpg",
26+
link: "https://www.facebook.com/events/1062484559164505"
5727
}
5828
];
5929

6030
export const previousEvents: eventInfo[] = [
6131
{
62-
title: "Tech n' Tonic",
63-
startTime: 'Monday, 14 Oct 2024 18:00:00',
64-
endTime: 'Monday, 14 Oct 2024 20:00:00',
65-
location: 'Hilton Hotel Sydney George St',
66-
description: "Starry skies ✨ and business ties 👔 - are you ready for an evening of cocktails and connections at Tech 'n Tonic?",
67-
image: 'https://scontent.fsyd11-2.fna.fbcdn.net/v/t39.30808-6/462109432_1042899677619643_4447945625462875474_n.jpg?stp=dst-jpg_s960x960&_nc_cat=102&ccb=1-7&_nc_sid=75d36f&_nc_ohc=LldgnyrrPzoQ7kNvgEkT9rZ&_nc_zt=23&_nc_ht=scontent.fsyd11-2.fna&_nc_gid=A4abttUIAM0znnZ5DhCSuH6&oh=00_AYCoja001nrw11TBm65CTUy7YeC7qUDzLQWZvPb8pAGXLw&oe=6718235B',
68-
link: 'https://www.facebook.com/events/1078496197200589/'
69-
},
70-
{
71-
title: "CSESoc Director Recruitment 2025",
72-
startTime: 'Wednesday, 9 Oct 2024 23:00:00',
73-
endTime: 'Wednesday, 16 Oct 2024 23:59:59',
74-
location: 'Online',
75-
description: 'OUR DIRECTOR RECRUITMENT APPLICATIONS HAVE OPENED 📝 📭',
76-
image: 'https://scontent.fsyd11-1.fna.fbcdn.net/v/t39.30808-6/462491605_1047315693844708_8503531889535504643_n.jpg?stp=dst-jpg_s960x960&_nc_cat=106&ccb=1-7&_nc_sid=75d36f&_nc_ohc=lREBeWLY_uEQ7kNvgGzvZGT&_nc_zt=23&_nc_ht=scontent.fsyd11-1.fna&_nc_gid=AMGGaNEtlriGsleeiuMvJrs&oh=00_AYAeOSpSszxjzFvQsoLcT72TDooiJ27Ec9X-hhOU0RAnaA&oe=67183209',
77-
link: 'https://www.facebook.com/events/882759546829988/'
32+
title: "Flower Exchange",
33+
startTime: "Wednesday, 23 Apr 2025 13:00:00",
34+
endTime: "Wednesday, 23 Apr 2025 15:00:00",
35+
location: "The Quad, UNSW",
36+
image: "/images/events/flower_exchange.jpg",
37+
link: "https://www.facebook.com/events/623535984011063"
7838
},
7939
{
80-
title: '2024 FMAA STEM Alternative Pathways Evening',
81-
startTime: 'Wednesday, 9 Oct 2024 18:15:00',
82-
endTime: 'Wednesday, 9 Oct 2024 20:30:00',
83-
location: 'Roundhouse Room 3 & 4, UNSW',
84-
description: 'Join us for an engaging panel discussion featuring representatives from Australia’s top firms across industries such as quantitative trading, management consulting, investment banking, asset management, and professional services. Gain valuable insights into how a STEM background can open doors to a variety of business and finance careers, and develop meaningful connections with industry professionals.',
85-
image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/461261086_540208508398572_4261296480620587383_n.jpg?stp=dst-jpg_s960x960&_nc_cat=103&ccb=1-7&_nc_sid=75d36f&_nc_ohc=vf3IPe3_NPEQ7kNvgG_SxLX&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=ALtMsUxDU2QhcP8A5cS-tr7&oh=00_AYADt5ngFtSJsaT3YgKGjUHU8PHudDTb8eMHRu9JKuWuCw&oe=6713857F',
86-
link: 'https://www.facebook.com/events/428430126479506',
40+
title: "All the Stars Pubcrawl",
41+
startTime: "Friday, 28 Mar 2025 19:00:00",
42+
endTime: "Friday, 28 Mar 2025 23:30:00",
43+
location: "Meet at Hyde Park",
44+
image: "/images/events/all_the_stars.jpg",
45+
link: "https://www.facebook.com/events/1171496917957222"
8746
},
8847
{
89-
title: 'Cultural Sweet Treats',
90-
startTime: 'Wednesday, 9 Oct 2024 13:00:00',
91-
endTime: 'Wednesday, 9 Oct 2024 15:00:00',
92-
location: 'UNSW Quadrangle',
93-
description: 'Looking for a creative way to celebrate diversity?🤔🌟 Come along for an afternoon of fun where you’ll get to design and decorate your own gift box 🎁 filled with cultural sweets from around the world!🌏 Try new flavours and treats as you craft your masterpiece for a friend, family member or yourself 😋',
94-
image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/461677000_1040949901147954_3024711492723797720_n.jpg?stp=dst-jpg_s960x960&_nc_cat=100&ccb=1-7&_nc_sid=75d36f&_nc_ohc=zY_RqNGeg50Q7kNvgH4izQ8&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AEzNe6W68jyyD37bJY9us2s&oh=00_AYAwuI1WXfZjhpeWSbHT1clhl05xVZdo0E-3nMCXo-Ndkw&oe=67139F71',
95-
link: 'https://www.facebook.com/events/9261495757199727',
96-
},
48+
title: "Wheelchair Basketball Tournament",
49+
startTime: "Sunday, 13 Apr 2025 13:00:00",
50+
endTime: "Sunday, 13 Apr 2025 16:00:00",
51+
location: "UNSW Village Green (Multi-purpose caged courts near Sam Cracknell Pavilion)",
52+
image: "/images/events/wheelchair_basketball.jpg",
53+
link: "https://www.facebook.com/events/3852672894949394"
54+
}
9755
];

frontend/public/data/execs.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,39 @@ export type Exec = {
77

88
export const EXECS: Exec[] = [
99
{
10-
name: "Elizabeth Zhu Chan",
10+
name: "Joyce He",
1111
role: "Co-President",
1212
},
1313
{
14-
name: "Lesley Lu",
14+
name: "Susie Xia",
1515
role: "Co-President",
1616
},
1717
{
18-
name: "Ivan Chan",
18+
name: "Zitian Qin",
1919
role: "Secretary",
2020
},
2121
{
22-
name: "Justin Son",
22+
name: "Lisa Lin",
2323
role: "Treasurer",
2424
},
2525
{
26-
name: "Sophie Khov",
26+
name: "Leo Maisnam",
2727
role: "Arc Delegate",
2828
},
2929
{
30-
name: "Catherine Kim",
30+
name: "Aryan Chauhan",
3131
role: "Grievance, Equity, Diversity and Inclusion Officer",
3232
},
3333
{
34-
name: "Amy Liu",
35-
role: "Vice President (Internals)",
34+
name: "Emma Nguyen",
35+
role: "Vice President (External)",
3636
},
3737
{
38-
name: "Nicole Jiang",
39-
role: "Vice President (Externals)",
38+
name: "Jordan Djamaan",
39+
role: "Vice President (Internal)",
4040
},
4141
{
42-
name: "Matthew Lim",
43-
role: "Vice President (Technicals)",
42+
name: "JJ Roberts-White",
43+
role: "Vice President (Technical)",
4444
},
45-
];
45+
];

0 commit comments

Comments
 (0)