Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
ac2417c
feat: add nginx config
SebassNoob Jan 8, 2024
6a9a756
feat: WIP -- rewrite announcement endpoints
SebassNoob Jan 6, 2024
2229fd4
feat: update err handling
SebassNoob Jan 7, 2024
963537c
feat: WIP -- CRUD methods for announcements overhaul
SebassNoob Jan 7, 2024
256d82d
feat: update docs, clean up api routes
SebassNoob Jan 9, 2024
6aee827
refactor: organise service box and forms
SebassNoob Jan 11, 2024
a5e8395
feat: add announcement display
SebassNoob Jan 11, 2024
20f90ff
feat: support wildcards in route permissions
SebassNoob Jan 12, 2024
2949772
feat: add support for mimetype saving
SebassNoob Jan 12, 2024
6ac3057
feat: add announcement frontend
SebassNoob Jan 12, 2024
5060380
fix: handle 0 file uploads
SebassNoob Jan 14, 2024
983f21d
feat: add tiptap and dropzone deps
SebassNoob Jan 14, 2024
d97e14b
feat: allow wildcard parsing of routes
SebassNoob Jan 14, 2024
8966b47
feat: progess on announcements
SebassNoob Jan 14, 2024
e5698f9
fix: use next/link for routing
SebassNoob Jan 14, 2024
1568de9
fix: styling and correct storage of mimetype
SebassNoob Jan 14, 2024
9695e35
fix: cleanup styling
SebassNoob Jan 14, 2024
672a405
feat: add support for announcement completion
SebassNoob Jan 14, 2024
9b0fe80
fix: update half the announcement tests
SebassNoob Jan 15, 2024
a95daff
fix: fix remaining api tests
SebassNoob Jan 15, 2024
7d6f0d1
feat: update express middleware
SebassNoob Jan 15, 2024
de94f7f
feat: start on edit announcement
SebassNoob Jan 16, 2024
4d78554
fix: invalid names of minio objects to be deleted
SebassNoob Jan 16, 2024
3c31304
fix: editing removes all objects
SebassNoob Jan 16, 2024
163c4bd
fix: frontend ui
SebassNoob Jan 16, 2024
915fdf9
fix: failing tests
SebassNoob Jan 16, 2024
e45b849
fix: git ignorecasing false
SebassNoob Jan 16, 2024
7d4d953
feat: add delete announcement
SebassNoob Jan 17, 2024
4dfb9fe
fix: code smells
SebassNoob Jan 17, 2024
a5fe478
fix: fix more smells
SebassNoob Jan 17, 2024
a559c47
feat: add support for notifications endpoint
SebassNoob Jan 17, 2024
e89de31
fix: missed test
SebassNoob Jan 17, 2024
79846c8
feat: notifications FE
SebassNoob Jan 18, 2024
ae1efe6
feat: add indicator for non empty notifs
SebassNoob Jan 18, 2024
47664d6
fix: fix smells
SebassNoob Jan 18, 2024
5a348fb
fix: misc frontend fixes
SebassNoob Jan 19, 2024
dfcd9a9
fix: code smells
SebassNoob Jan 19, 2024
f36ff7e
fix: ui improvements
SebassNoob Jan 19, 2024
7aa8f90
feat: bump bun version
SebassNoob Jan 21, 2024
5078360
fix: incorrect bun version
SebassNoob Jan 21, 2024
9632951
chore: clean up deps
SebassNoob Jan 21, 2024
56188ad
feat: template for homepage with example content, API not implemented…
TRAINEDTURTLE Jan 5, 2024
ba6cb9f
feat: show different homepages for non-interact and interact members,…
TRAINEDTURTLE Jan 14, 2024
d93a4fa
feat: link latest announcement to backend
SebassNoob Jan 19, 2024
4dbed80
feat: add recent attendance
SebassNoob Jan 20, 2024
401b146
fix: filter out attendance that has not happened yet
SebassNoob Jan 20, 2024
3f2deba
refactor: move fetch logic to outer page
SebassNoob Jan 20, 2024
2a5bfd3
fix: use british tz
SebassNoob Jan 20, 2024
54c5f01
feat: add next session
SebassNoob Jan 20, 2024
460e340
fix: incorrect loading of homepage on first render
SebassNoob Jan 20, 2024
ae85548
fix: non members can see notifs
SebassNoob Jan 21, 2024
2f232e5
feat: non-authorised homepage
SebassNoob Jan 21, 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
2 changes: 1 addition & 1 deletion .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Setup bun
uses: oven-sh/setup-bun@v1
with:
bun-version: latest
bun-version: 1.0.24

- name: Install dependencies
run: cd interapp-backend && bun install
Expand Down
13 changes: 13 additions & 0 deletions docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,19 @@ services:
depends_on:
- backend
- postgres

nginx:
container_name: interapp-nginx
build:
context: ./nginx
dockerfile: prod.Dockerfile
restart: always
ports:
- 80:80
networks:
- interapp-network
depends_on:
- frontend

networks:
interapp-network:
Expand Down
12 changes: 10 additions & 2 deletions docker-compose.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ services:
condition: service_healthy
redis:
condition: service_healthy

redis:
container_name: interapp-redis-test
image: redis:alpine
Expand All @@ -55,7 +55,7 @@ services:
start_period: 60s

minio:
container_name: interapp-minio
container_name: interapp-minio-test
image: minio/minio
restart: on-failure
command: minio server /data
Expand Down Expand Up @@ -95,6 +95,14 @@ services:
condition: service_healthy
minio:
condition: service_healthy
develop:
watch:
- path: ./interapp-backend/api
action: sync
target: /app/api
- path: ./interapp-backend/db
action: sync
target: /app/db


networks:
Expand Down
2 changes: 1 addition & 1 deletion interapp-backend/.env.production
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ POSTGRES_PORT=5432
API_PORT=8000

REDIS_URL=redis://interapp-redis:6379
FRONTEND_URL=http://localhost:3000 # TODO: Change this to the actual frontend URL
FRONTEND_URL=http://localhost # TODO: Change this to the actual frontend URL

SCHOOL_EMAIL_REGEX="^[A-Za-z0-9]+@student\.ri\.edu\.sg|[A-Za-z0-9]+@rafflesgirlssch.edu.sg$"

Expand Down
Loading