Skip to content

Commit

Permalink
feat: ready for demo (#26)
Browse files Browse the repository at this point in the history
* feat: add nginx config

* feat: WIP -- rewrite announcement endpoints

* feat: update err handling

* feat: WIP -- CRUD methods for announcements overhaul

* feat: update docs, clean up api routes

* refactor: organise service box and forms

* feat: add announcement display

* feat: support wildcards in route permissions

* feat: add support for mimetype saving

* feat: add announcement frontend

* fix: handle 0 file uploads

* feat: add tiptap and dropzone deps

* feat: allow wildcard parsing of routes

* feat: progess on announcements

* fix: use next/link for routing

* fix: styling and correct storage of mimetype

* fix: cleanup styling

* feat: add support for announcement completion

* fix: update half the announcement tests

* fix: fix remaining api tests

* feat: update express middleware

* feat: start on edit announcement

* fix: invalid names of minio objects to be deleted

* fix: editing removes all objects

* fix: frontend ui

* fix: failing tests

* fix: git ignorecasing false

* feat: add delete announcement

* fix: code smells

* fix: fix more smells

* feat: add support for notifications endpoint

* fix: missed test

* feat: notifications FE

* feat: add indicator for non empty notifs

* fix: fix smells

* fix: misc frontend fixes

* fix: code smells

* fix: ui improvements

* feat: bump bun version

* fix: incorrect bun version

* chore: clean up deps

* feat: template for homepage with example content, API not implemented yet

* feat: show different homepages for non-interact and interact members, added filler content for both of these pages

* feat: link latest announcement to backend

* feat: add recent attendance

* fix: filter out attendance that has not happened yet

* refactor: move fetch logic to outer page

* fix: use british tz

* feat: add next session

* fix: incorrect loading of homepage on first render

* fix: non members can see notifs

* feat: non-authorised homepage

---------

Co-authored-by: TRAINEDTURTLE <[email protected]>
  • Loading branch information
SebassNoob and TRAINEDTURTLE authored Jan 21, 2024
1 parent 298a5fe commit 027b0cd
Show file tree
Hide file tree
Showing 101 changed files with 3,808 additions and 768 deletions.
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][email protected]$"

Expand Down
Loading

0 comments on commit 027b0cd

Please sign in to comment.