Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CW2-24 Setup Backend #12

Merged
merged 47 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
3cb131f
Merge pull request #1 from csesoc/resources_and_contacts_v1
jamest0 Sep 10, 2023
cb0809e
fix compile issue
jamest0 Sep 10, 2023
6ad7061
add temporary loader
jamest0 Sep 10, 2023
6df65e1
make nav interactable
jamest0 Sep 10, 2023
aec1e58
Finished basic structure of sponsors page.
derek-ht Sep 10, 2023
a0100b9
fix sizing of landing
jamest0 Sep 11, 2023
03214fd
Finished sponsors part -responsiveness
derek-ht Sep 11, 2023
cd41c10
Merge branch 'sponsors' of https://github.com/csesoc/csesoc-website-2…
jamest0 Sep 11, 2023
36ddfb8
add responsiveness and clean up code
jamest0 Sep 11, 2023
1c4c8e9
Merge pull request #2 from csesoc/sponsors
jamest0 Sep 11, 2023
8e3d88a
fix heading size
jamest0 Sep 12, 2023
5beab07
add ollie
jamest0 Sep 25, 2023
120dc60
make it clickable
jamest0 Sep 25, 2023
0f7b4ad
add mobile link
jamest0 Sep 25, 2023
8fcfcff
Create README.md
derekxu04 Mar 23, 2024
da4b156
CW2-5 Sponsors Page Draft/Template
andrew-l3 Apr 2, 2024
a937062
[CW2-4] Add support for CI (#5)
derekxu04 Apr 7, 2024
22fc831
fix workflow
derekxu04 Apr 7, 2024
07ab049
lint fix
derekxu04 Apr 7, 2024
97db3fb
Update README.md
derekxu04 Apr 7, 2024
6e5962d
CW2-5 Request Changes
andrew-l3 Apr 8, 2024
7ba5f4a
Merge branch 'master' into CW2-5-Create-sponsors-page
derekxu04 Apr 8, 2024
091eb09
Merge pull request #3 from csesoc/CW2-5-Create-sponsors-page
andrew-l3 Apr 11, 2024
b236314
CW2-3 Add events section (#4)
QuadAces Apr 12, 2024
a6b15d6
social media to footer
andrew-l3 Apr 15, 2024
5c4bf03
run lint fixes
andrew-l3 Apr 17, 2024
48fcee9
image scale
andrew-l3 Apr 17, 2024
fccada0
remove unnecessary Image
andrew-l3 Apr 17, 2024
6484fff
Cw2-18 Improve Semantic HTML (#7)
QuadAces Apr 18, 2024
41ef2bf
Setup template pages (#9)
derekxu04 Apr 20, 2024
7804b28
Merge branch 'master' into CW2-7-move-social-media-to-footer
andrew-l3 May 19, 2024
ad5d321
Merge pull request #10 from csesoc/CW2-7-move-social-media-to-footer
andrew-l3 May 19, 2024
7123a16
Removed duplicate import Image bug (#11)
andrew-l3 May 20, 2024
5325297
move all frontend to same dir
PenTest-duck May 30, 2024
a69aead
working frontend docker
PenTest-duck May 30, 2024
4d44a94
remove .next and .node_modules
PenTest-duck May 30, 2024
40f5ebe
add .next to gitignore
PenTest-duck May 30, 2024
8576b85
spin up backend
PenTest-duck May 30, 2024
bdb4137
Merge branch 'CW2-24-Setup-backend' of github.com:csesoc/csesoc-websi…
PenTest-duck May 30, 2024
c502e93
cleanup
PenTest-duck May 30, 2024
5b460fd
more cleanup
PenTest-duck May 30, 2024
c81ab56
update github actions
PenTest-duck May 30, 2024
eecd5eb
minor fix
PenTest-duck May 30, 2024
ec671b0
setup communication
PenTest-duck May 30, 2024
e7e0cea
update gitignore and readme
derekxu04 Jun 4, 2024
b8e7eca
merge master and update readme
derekxu04 Jun 4, 2024
e171570
relax linting rules
derekxu04 Jun 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .github/workflows/backend-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Backend CI

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:
runs-on: ubuntu-latest

defaults:
run:
working-directory: ./backend

steps:
- uses: actions/checkout@v3

- name: Use Node.js 22
uses: actions/setup-node@v3
with:
node-version: 22

- name: Install dependencies
run: npm install

- name: Check types
run: npm run type-check

- name: Build Express app
run: npm run build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI
name: Frontend CI

on:
push:
Expand All @@ -10,8 +10,13 @@ jobs:
build:
runs-on: ubuntu-latest

defaults:
run:
working-directory: ./frontend

steps:
- uses: actions/checkout@v3

- name: Use Node.js 16
uses: actions/setup-node@v3
with:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

# production
/build
/frontend/.next
/backend/dist

# misc
.DS_Store
Expand Down
6 changes: 6 additions & 0 deletions backend/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
node_modules
npm-debug.log
build
.git
*.md
.gitignore
13 changes: 13 additions & 0 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FROM node:22-alpine

ENV NODE_ENV production

WORKDIR /app
COPY . .

RUN npm ci
RUN npm run build

EXPOSE 9000

CMD ["npm", "start"]
Loading
Loading