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

Deployment #110

Merged
merged 305 commits into from
Mar 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
305 commits
Select commit Hold shift + click to select a range
7dd5e2a
↩️ revert (CHASE Frontend): Remove unnecessary env token in workflow
Strehk Sep 8, 2023
fc6e003
🔀 merge (CHASE Frontend): font-awesome-pro into admin-hub
Strehk Sep 10, 2023
c3b2a30
✨ feat (CHASE Frontend): First Onboarding Steps
Strehk Sep 18, 2023
92f4b5e
🧹 chore (CHASE Frontend): Name Corrections
Strehk Sep 18, 2023
4590025
✨ feat (CHASE Frontend): Shortcuts with Mousetrap
Strehk Sep 18, 2023
88bc5e3
✨ feat (CHASE Frontend): First Layout Teampool Page
Strehk Sep 18, 2023
5069858
✨ feat (CHASE Frontend): Few Keyboard improvements
Strehk Sep 18, 2023
a287510
✨ feat (CHASE Frontend): Committee Overview Backend integration
Strehk Sep 19, 2023
6a4e81a
✨ feat (CHASE Frontend): Deletion for Structure Tab
Strehk Sep 19, 2023
f0ecf0a
✨ feat (CHASE Frontend): Structure Page Fine-Tuning
Strehk Sep 19, 2023
18d5437
🧼 format & lint (CHASE Frontend): Formatting
Strehk Sep 19, 2023
bae2ea0
wip: sync
m1212e Sep 20, 2023
5b2e8da
✨ feat (CHASE Backend): implement basic committee and conference endp…
m1212e Sep 20, 2023
14c6d3a
🐞 fix (CHASE Backend): make auth mock more resilient
m1212e Sep 20, 2023
8943222
🔀 merge (CHASE Backend): merge backend
m1212e Sep 20, 2023
1a779e2
Merge branch 'main' into elysia-2
m1212e Sep 20, 2023
fafd0fd
🧹 chore (CHASE Backend): add bun lock
m1212e Sep 20, 2023
4baf83b
🧼 format & lint (CHASE Backend):
m1212e Sep 20, 2023
61bfd31
🐞 fix (CHASE Backend): migration cleanup
m1212e Sep 20, 2023
d7b6abe
🐞 fix (CHASE Backend): ts build options
m1212e Sep 20, 2023
69f28de
🐞 fix (CHASE Backend): generate prisma types for type checking in bac…
m1212e Sep 20, 2023
1adc429
🐞 fix (CHASE Frontend): generate prisma types in backend to run typec…
m1212e Sep 20, 2023
5c305a5
🐞 fix (CHASE Frontend): use backend as external package
m1212e Sep 20, 2023
6593f8f
🐞 fix (MUNify): typecheck fixes
m1212e Sep 20, 2023
297cc84
🚦 ci (CHASE Frontend): add necessary deps
m1212e Sep 20, 2023
51f10e5
🚦 ci (CHASE Frontend): install all on frontend build
m1212e Sep 20, 2023
900db86
🚦 ci (CHASE Frontend): fix wdir
m1212e Sep 20, 2023
570a558
🧹 chore (MUNify): deps updates
m1212e Sep 20, 2023
c21830b
🔀 merge (CHASE Frontend): Merge branch 'elysia-2' into admin-hub
Strehk Sep 20, 2023
d0d51d9
✨ feat (CHASE Frontend): New Home Page
Strehk Sep 26, 2023
7ac6414
✨ feat (CHASE Backend): Conference Date
Strehk Sep 26, 2023
187f416
✨ feat (CHASE Frontend): Docs and FAQ pages created
Strehk Sep 26, 2023
c4cb20e
🧹 chore (CHASE Frontend): A bit of link hosekeeping
Strehk Sep 27, 2023
105bca2
🧼 format & lint (CHASE Frontend):
Strehk Sep 27, 2023
3e25e99
✨ feat (CHASE Frontend): A little bit of motion
Strehk Sep 27, 2023
db392bd
✨ feat (CHASE Frontend): More Motion!
Strehk Sep 27, 2023
fd27187
✨ feat (CHASE Frontend): Even more Motion!
Strehk Sep 27, 2023
ed4ab40
🎨 style (CHASE Frontend): Minor animation and style improvements on h…
Strehk Oct 1, 2023
71c160e
✨ feat (CHASE Frontend): Featurebase Integration
Strehk Oct 14, 2023
e1d2adf
✨ feat (CHASE Frontend): Structure and Teampool Sites in onboarding p…
Strehk Oct 14, 2023
9f1fe53
🚧 wip (CHASE Frontend):
Strehk Nov 15, 2023
95a3def
🔤 typing (CHASE Frontend): Properly Typing Structure Onboarding Page
Strehk Nov 15, 2023
2e9c23b
✨ feat (CHASE Frontend): Committee Chairs, Advisors and Agenda Items
Strehk Nov 16, 2023
6a0a59b
✨ feat (CHASE Frontend): Small Improvements
Strehk Nov 16, 2023
f4740aa
🐞 fix (CHASE Frontend): FontAwesome NextJS Bugfix
Strehk Nov 16, 2023
603b90a
✨ feat (CHASE Frontend): Log in into existing Conferences
Strehk Nov 16, 2023
06723c4
✨ feat (CHASE Frontend): Delegations Page
Strehk Nov 18, 2023
377e022
✨ feat (CHASE Frontend): Better display which chairs/advisors have al…
Strehk Nov 18, 2023
0d0409a
✨ feat (CHASE Backend): Seeding
Strehk Nov 18, 2023
af7e20f
✨ feat (CHASE Backend): Delegation Seeding
Strehk Nov 18, 2023
6f615a2
✨ feat (CHASE Frontend): Better Delegations Table
Strehk Nov 18, 2023
2ab1b18
✨ feat (CHASE Backend): Seeding: Assigning Chairs and Advisors
Strehk Nov 18, 2023
47e7f4e
✨ feat (CHASE Backend): Seeding the Delegations to Committees
Strehk Nov 19, 2023
01928f8
✨ feat (CHASE Frontend): Ability to add Delegations
Strehk Nov 19, 2023
f49befa
✨ feat (CHASE Frontend): i18n
Strehk Nov 21, 2023
56eb741
🧹 chore (CHASE Frontend): Reinstalling all node Modules
Strehk Nov 21, 2023
a14cf07
🐞 fix (CHASE Frontend): duplicate delegations
Strehk Nov 21, 2023
72eaa4d
✨ feat (CHASE Frontend): i18n
Strehk Nov 22, 2023
d04c110
🚧 wip (CHASE Frontend): Add a NSA onboarding step
Strehk Nov 22, 2023
9e59a25
start auth rework
m1212e Jan 3, 2024
191da87
🚧 wip (CHASE Backend): auth rework
m1212e Jan 17, 2024
32305af
Merge remote-tracking branch 'origin/admin-hub' into auth-rework
m1212e Jan 18, 2024
70449a8
🐞 fix (CHASE Backend): reset db schema
m1212e Jan 18, 2024
d5ce2bd
🚧 wip (CHASE Backend): apply auth macros to existing backend api from…
m1212e Jan 19, 2024
9b92845
Co-authored-by: Tade Strehk <[email protected]>
m1212e Jan 23, 2024
44a7848
🚧 wip (AUTH): passkeys
m1212e Jan 27, 2024
97cc09a
🧹 chore (MUNify): adjust commit scopes
m1212e Jan 27, 2024
2577e5d
✨ feat (CHASE Frontend): Update navigation buttons and add bug report…
Strehk Feb 3, 2024
0bcbc2f
wip: login page rework
m1212e Feb 4, 2024
f3e5ef8
Merge branch 'auth-rework' into admin-hub
Strehk Feb 4, 2024
96ccea5
🧹 chore (CHASE Frontend): General Cleanup
Strehk Feb 4, 2024
722a8f5
🐞 fix (CHASE Frontend): Fixing admin/structure
Strehk Feb 5, 2024
fd973f1
🐞 fix (CHASE Frontend): Fix onboarding/teampool
Strehk Feb 5, 2024
d094148
🐞 fix (CHASE Frontend): onboarding/committees
Strehk Feb 5, 2024
6a172a7
✨ feat (CHASE Backend): Seeding for new database Schema
Strehk Feb 5, 2024
85a00ab
🐞 fix (CHASE Frontend): onboarding/delegation
Strehk Feb 6, 2024
23f0bbb
✨ feat (CHASE Backend): Seeding and Schema Cleanup
Strehk Feb 6, 2024
a7e6892
🧼 format & lint (CHASE Frontend): Update dependencies and fix code fo…
Strehk Feb 6, 2024
d685a60
🐞 fix (CHASE Frontend): rm featurebase
Strehk Feb 6, 2024
eb86a22
✨ feat (CHASE Frontend): Restructuring and Hub Pages
Strehk Feb 10, 2024
e6ec348
🚧 wip (CHASE Frontend):
Strehk Feb 10, 2024
20ab4f7
🧹 chore (CHASE Frontend): Update .gitignore file to include .smtp4dev
Strehk Feb 10, 2024
8571b32
🐞 fix (CHASE Frontend): add elysia to dev deps in chase frontend
m1212e Feb 10, 2024
0c1d2ab
🧹 chore (MUNify): Add .devcontainer files for Docker setup
Strehk Feb 11, 2024
a8569b5
✨ feat (CHASE Frontend): Refactor Timer component and add CountdownTi…
Strehk Feb 11, 2024
593bdb5
🧹 chore (MUNify): Update devcontainer configuration
Strehk Feb 11, 2024
02087ca
✨ feat (CHASE Frontend): Add user route and update header component
Strehk Feb 11, 2024
bb21ee2
✨ feat (CHASE Frontend): Add fetching_utils.ts and update page.tsx files
Strehk Feb 11, 2024
d690e81
🧹 chore (MUNify): Dev Container: Added Extensions
Strehk Feb 12, 2024
a26a2d9
Add new devcontainer features
Strehk Feb 12, 2024
2be168a
Update devcontainer setup and add Prisma database migration
Strehk Feb 12, 2024
4e8c8ad
✨ feat (CHASE Frontend): Chair Dashboard
Strehk Feb 17, 2024
735fe24
✨ feat (CHASE Frontend): Whiteboard
Strehk Feb 17, 2024
8752a00
✨ feat (CHASE Frontend): Presence Chair Settings connected
Strehk Feb 17, 2024
30e1796
✨ feat (CHASE Frontend): Presentation Mode connection
Strehk Feb 17, 2024
935d4a3
✨ feat (CHASE Frontend): Timer rework
Strehk Feb 17, 2024
ff30ec4
🐞 fix (CHASE Frontend): Refactor Timer component and fix timer toast …
Strehk Feb 17, 2024
f2c7c4b
🧹 chore (MUNify): remove unused projects
m1212e Feb 17, 2024
7d94809
Add ms-vsliveshare.vsliveshare to devcontainer.json
Strehk Feb 17, 2024
531098a
🚧 wip (CHASE Frontend):
Strehk Feb 17, 2024
1027160
✨ feat (CHASE Frontend): New Pages directory Structure and Auth Context
Strehk Feb 17, 2024
791b884
✨ feat (CHASE Frontend): Add unique constraints and columns to databa…
Strehk Feb 17, 2024
167e97a
✨ feat (CHASE Frontend): Backend setup for speakers list
Strehk Feb 18, 2024
1be1ca2
🚧 wip: sync
m1212e Feb 19, 2024
9ce63dc
✨ feat (CHASE Frontend): SpeakersList Database Connection
Strehk Feb 20, 2024
45548a7
✨ feat (CHASE Frontend): SpeakersList full Connection
Strehk Feb 20, 2024
d0a94fc
✨ feat (CHASE Frontend): Fine Tuning
Strehk Feb 20, 2024
7bb6514
✨ feat (CHASE Frontend): Message Service Connection
Strehk Feb 21, 2024
01880da
🚧 wip (CHASE Frontend): Inbox
Strehk Feb 21, 2024
8023109
✨ feat (CHASE Backend): better error logging
m1212e Feb 22, 2024
73ae1ad
✨ feat (CHASE Backend): better error logging
m1212e Feb 22, 2024
7b1a1db
🚧 wip (CHASE Frontend): speakers list improvement, inbox
Strehk Feb 22, 2024
727ae60
✨ feat (CHASE Frontend): finalize login flow
m1212e Feb 22, 2024
2e3e514
🧼 format & lint (CHASE Backend): lint me baby
m1212e Feb 22, 2024
a7caae6
✨ feat (AUTH): reset password
m1212e Feb 22, 2024
8f773d0
🏗️ build (CHASE Backend): add docker build & publish instructions
m1212e Feb 23, 2024
103b8f8
✨ feat (CHASE Frontend): Diverse new small features
Strehk Feb 23, 2024
f236f10
🐞 fix (CHASE Frontend): link fix
Strehk Feb 23, 2024
f07590b
🔀 merge (CHASE Frontend): Merge remote-tracking branch 'origin/auth-r…
Strehk Feb 23, 2024
99d7e1f
🐞 fix (CHASE Backend): use correct return value for myInfo call
m1212e Feb 23, 2024
57dd36b
🚧 wip (CHASE Frontend):
Strehk Feb 23, 2024
6173526
Merge remote-tracking branch 'origin/auth-rework' into admin-hub
Strehk Feb 23, 2024
271573b
✨ feat (CHASE Frontend): Login Flow
Strehk Feb 23, 2024
9bc0071
🚧 wip (CHASE Frontend):
Strehk Feb 23, 2024
5b128e2
🚧 wip (CHASE Frontend):
Strehk Feb 24, 2024
6056409
🐞 fix (CHASE Frontend): Fixes and Cleanup
Strehk Feb 24, 2024
b165c02
🚧 wip (CHASE Frontend): Misc Improvements
Strehk Feb 24, 2024
ffa412e
✨ feat (CHASE Frontend): Better Keyboard Speakers List Workflow for c…
Strehk Feb 24, 2024
2cc669f
✨ feat (CHASE Frontend): Better Keyboard Speakers List Workflow for c…
Strehk Feb 24, 2024
245531f
✨ feat (CHASE Frontend): Logout Button on gateway
Strehk Feb 24, 2024
23bfc5e
🧼 format & lint (CHASE Frontend): lint and format
Strehk Feb 24, 2024
36d5450
🔤 typing (CHASE Frontend): Fix type errors WIP
Strehk Feb 25, 2024
83515ef
🏗️ build (CHASE Backend): adjust build login data
m1212e Feb 25, 2024
ec767ee
Merge branch 'admin-hub' of [email protected]:DeutscheModelUnitedNations…
m1212e Feb 25, 2024
b4a618a
🔤 typing (CHASE Frontend): Typing
Strehk Feb 25, 2024
0213fe9
Merge branch 'admin-hub' of https://github.com/DeutscheModelUnitedNat…
Strehk Feb 25, 2024
2a2b54b
🔤 typing (CHASE Frontend): Typing
Strehk Feb 25, 2024
9184a53
🔤 typing (CHASE Frontend): Typing
Strehk Feb 25, 2024
c43f55c
🐞 fix (CHASE Frontend): fix type scructure for frontend user context
m1212e Feb 25, 2024
8897e64
Merge branch 'admin-hub' of [email protected]:DeutscheModelUnitedNations…
m1212e Feb 25, 2024
defb7e0
🐞 fix (CHASE Frontend): Soften type signature for delegation find fun…
m1212e Feb 25, 2024
cc5ec24
🐞 fix (CHASE Frontend): fix context types
m1212e Feb 25, 2024
575614f
🐞 fix (CHASE Frontend): un undefinify the context types
m1212e Feb 25, 2024
16ef0e0
✨ feat (CHASE Backend): Logout
Strehk Feb 25, 2024
a20ddec
🚧 wip (MUNify): start deployment
m1212e Feb 25, 2024
e5de929
✨ feat (CHASE Frontend): Non State Actors and Special Persons can now…
Strehk Feb 26, 2024
2530b14
✨ feat (CHASE Frontend): Better Attendance Monitoring for Chairs
Strehk Feb 26, 2024
c5cb587
🐞 fix (CHASE Backend): Schema fix: "Type" suffix exchanged for "Variant"
Strehk Feb 26, 2024
8d873c4
✨ feat (CHASE Frontend): Cookie Banner and Coming Soon Badges on Land…
Strehk Feb 26, 2024
a068d4a
🚧 wip (CHASE Backend): export
m1212e Feb 26, 2024
51b4623
✨ feat (CHASE Frontend): Documentation and FAQ Markdown
Strehk Feb 26, 2024
b029a3a
✨ feat (CHASE Frontend): Mobile Landing Page
Strehk Feb 26, 2024
97db5a6
✨ feat (CHASE Frontend): SimSim Seed WIP
Strehk Feb 26, 2024
a743463
✨ feat (CHASE Frontend): Small Error catch
Strehk Feb 26, 2024
4a9e805
🚧 wip (CHASE Frontend): Dashboard Header WIP
Strehk Feb 26, 2024
5b8e0d0
🐞 fix (CHASE Backend): Change default field name from 'type' to 'vari…
Strehk Feb 26, 2024
fe35382
🧹 chore (CHASE Backend): Remove deprecated migration files and update…
Strehk Feb 26, 2024
fd26251
🐞 fix (CHASE Frontend): Seed
Strehk Feb 26, 2024
a2dee15
✨ feat (CHASE Frontend): NA Integration, Dashboard Header Rework, MISC
Strehk Feb 26, 2024
7232c21
🐞 fix (CHASE Backend): apply cookie signature only to sessionId by de…
m1212e Feb 27, 2024
45a9332
Merge branch 'admin-hub' of [email protected]:DeutscheModelUnitedNations…
m1212e Feb 27, 2024
0007cf5
🚧 wip (CHASE Backend): export
m1212e Feb 26, 2024
847bd69
Merge branch 'importexport' of [email protected]:DeutscheModelUnitedNati…
m1212e Feb 27, 2024
dd1ce46
🚧 wip (MUNify): start deployment
m1212e Feb 25, 2024
0b3ad53
Merge branch 'deployment' of [email protected]:DeutscheModelUnitedNation…
m1212e Feb 27, 2024
f6423c1
🐞 fix (CHASE Backend): re add accidentially deleted committee guard
m1212e Feb 27, 2024
eaade28
✨ feat (CHASE Frontend): Different Improvements
Strehk Feb 27, 2024
5f5c74c
✨ feat (CHASE Frontend): Added Login Link to Footer
Strehk Feb 27, 2024
0a9d968
✨ feat (CHASE Frontend): NA and Guest Features
Strehk Feb 27, 2024
2876638
✨ feat (CHASE Frontend): New SimSim Seeding Mechanism
Strehk Feb 28, 2024
935d561
✨ feat (CHASE Frontend): Darkmode improvements
Strehk Feb 28, 2024
fa98f4e
⬆️ improvement (CHASE Frontend): improvement option in commit messages
Strehk Feb 28, 2024
88c06ff
wip: auto convert dates to string
m1212e Feb 29, 2024
e5c5d71
✨ feat (CHASE Frontend): Inbox for Chairs and Research Service
Strehk Feb 29, 2024
090c99e
🔤 typing (CHASE Frontend):
Strehk Feb 29, 2024
b69d973
🧼 format & lint (CHASE Frontend):
Strehk Feb 29, 2024
04bd9d9
🔀 merge (CHASE Frontend): Merge branch 'main' into auth-rework
Strehk Feb 29, 2024
6885101
Merge branch 'importexport' into deployment
m1212e Mar 1, 2024
c6d1ea0
Merge branch 'auth-rework' into deployment
m1212e Mar 1, 2024
80d2491
🐞 fix (MUNify): backend type error fixup
m1212e Mar 1, 2024
e4d086e
✨ feat (CHASE Backend): finalize import
m1212e Mar 1, 2024
3e0e321
🐞 fix (CHASE Backend): use correct imports
m1212e Mar 1, 2024
9dfef1f
🐞 fix (CHASE Frontend): type fixes
m1212e Mar 1, 2024
33575f2
🐞 fix (CHASE Backend): cookie consent cookie use correct schema
m1212e Mar 3, 2024
c5e605d
🐞 fix (CHASE Frontend): build errors removed
m1212e Mar 3, 2024
7704228
🏗️ build (MUNify): add image build instructions for frontend
m1212e Mar 3, 2024
d2947a5
🐞 fix (CHASE Frontend): use build args for docker frontend install token
m1212e Mar 3, 2024
b76f13a
🐞 fix (CHASE Backend): remove passkey requirement for env vars
m1212e Mar 3, 2024
5d0ce16
✨ feat (CHASE Frontend): make backend url configurable
m1212e Mar 3, 2024
399843d
🐞 fix (CHASE Frontend): use correct start command for next server
m1212e Mar 3, 2024
051161d
🐞 fix (CHASE Backend): fix backend bundling for uglify plugin in mjml
m1212e Mar 3, 2024
397b2f1
🐞 fix (CHASE Backend): use correct wdir in run
m1212e Mar 3, 2024
d26be52
🐞 fix (CHASE Backend): copy over prisma engine
m1212e Mar 3, 2024
a570187
🐞 fix (CHASE Frontend): add nextjs runtime dependency
m1212e Mar 3, 2024
904b491
✨ feat (MUNify): use full images for runtime images
m1212e Mar 4, 2024
5802361
🏗️ build (CHASE Frontend): use next start command
m1212e Mar 4, 2024
63357b9
🏗️ build (MUNify): add migration container
m1212e Mar 4, 2024
118e58b
♻️ refactor (MUNify): better action naming
m1212e Mar 4, 2024
2f0291a
🐞 fix (MUNify): use correct cookie settings for cokkie consent settin…
m1212e Mar 4, 2024
dade682
🐞 fix (CHASE Backend): adjusted cookie settings for backend to use cr…
m1212e Mar 4, 2024
e0610b4
↩️ revert (CHASE Backend): domain setting for session cookie
m1212e Mar 4, 2024
1ac626e
🧹 chore (MUNify): update dependencies and lockfile
m1212e Mar 4, 2024
441686d
🐞 fix (CHASE Frontend): Added Suspense Boundaries and auth myInfo fix
Strehk Mar 4, 2024
fad8dfa
Merge branch 'deployment' of https://github.com/DeutscheModelUnitedNa…
Strehk Mar 4, 2024
9c50787
⬆️ improvement (CHASE Frontend): Obeying wish to include email prompt…
Strehk Mar 4, 2024
bc00dab
🐞 fix (CHASE Backend): hardcoding email env
Strehk Mar 4, 2024
243ee3a
Co-authored-by: Tade Strehk <[email protected]>
m1212e Mar 4, 2024
3dc8e49
✨ feat (CHASE Backend): signal the browser to drop the session cookie…
m1212e Mar 4, 2024
57ce1d8
⬆️ improvement (CHASE Backend): SimSim Seed improvement
Strehk Mar 4, 2024
d11dbb1
🐞 fix (CHASE Backend): Dumb seed
Strehk Mar 4, 2024
06e60ed
🐞 fix (CHASE Backend): seed forgetful fix
Strehk Mar 4, 2024
fbb2468
⬆️ improvement (CHASE Backend): SimSim data includes nations
Strehk Mar 4, 2024
72d8210
⬆️ improvement (CHASE Backend): Added gender neutral guest speakers a…
Strehk Mar 5, 2024
b579e31
✨ feat (CHASE Frontend): make backend address configureable for frontend
m1212e Mar 5, 2024
9d6210f
🧼 format & lint (CHASE Frontend):
m1212e Mar 5, 2024
dd52440
🐞 fix (CHASE Frontend): standalone
m1212e Mar 5, 2024
6cca2ff
🚧 wip (MUNify): cookie settings fix
m1212e Mar 6, 2024
c81cb24
🐞 fix (CHASE Backend): correct cookie signature & settings
m1212e Mar 6, 2024
8eae8f5
📚 docs (CHASE Backend): add correct request status for invalid signat…
m1212e Mar 6, 2024
a563b65
✨ feat (CHASE Backend): MUN-SH 2024 Seed
Strehk Mar 7, 2024
3ac53c0
Merge branch 'deployment' of https://github.com/DeutscheModelUnitedNa…
Strehk Mar 7, 2024
3384f59
✨ feat (CHASE Backend): provide conference member endpoint
m1212e Mar 7, 2024
a038b01
✨ feat (CHASE Backend): complete and fix import endpoints
m1212e Mar 7, 2024
1f8a116
Merge remote-tracking branch 'origin/main' into deployment
m1212e Mar 7, 2024
c8df198
🧼 format & lint (MUNify):
m1212e Mar 7, 2024
6a50c28
🐞 fix (CHASE Frontend): use correct backend reference in frontend
m1212e Mar 7, 2024
0d11acb
🧼 format & lint (CHASE Frontend):
m1212e Mar 7, 2024
e72ec22
🐞 fix (CHASE Backend): hotfix ignore cookie preferences
m1212e Mar 8, 2024
87ab84a
🐞 fix (CHASE Backend): hotfix make it build
m1212e Mar 8, 2024
cfe3951
Revert "🐞 fix (CHASE Backend): hotfix make it build branch: deployment"
m1212e Mar 8, 2024
89dd854
🐞 fix (CHASE Backend): make it build 2
m1212e Mar 8, 2024
b665a7f
🐞 fix (CHASE Backend): use correct backend url
m1212e Mar 8, 2024
486f7c2
🐞 fix (CHASE Backend): use correct env var for email redirect config …
m1212e Mar 8, 2024
b60d42e
🐞 fix (CHASE Backend): hotfix disable all guards
m1212e Mar 8, 2024
deb3d32
🐞 fix (CHASE Frontend): fix frontend errors
m1212e Mar 8, 2024
caad5dd
✨ feat (MUNify): delayed mail sending
m1212e Mar 8, 2024
1356913
🐞 fix (MUNify): remove email sending alltogether
m1212e Mar 8, 2024
afa5833
Co-authored-by: Tade Strehk <[email protected]>
m1212e Mar 8, 2024
57efd95
✨ feat (CHASE Frontend): sort countries by their localized name
m1212e Mar 8, 2024
970f433
✨ feat (MUNify): add memory logging
m1212e Mar 8, 2024
1255872
↩️ revert (MUNify): remove memory profile logging
m1212e Mar 8, 2024
94e23c0
Stop minifying the output so we get better error logs
m1212e Mar 9, 2024
ef6155d
🧼 format & lint (MUNify): lint
m1212e Mar 9, 2024
423a40d
✨ feat (MUNify): set cascading options for user and related entities
m1212e Mar 9, 2024
a77b509
🐞 fix (CHASE Backend): actually add migrations
m1212e Mar 9, 2024
9d5143c
✨ feat (CHASE Frontend): Team Hub Clock
Strehk Mar 9, 2024
13a5ba5
🔀 merge (MUNify):
m1212e Mar 9, 2024
4ad2232
Merge branch 'main' into deployment
m1212e Mar 9, 2024
31cd25a
🔀 merge (CHASE Frontend):
m1212e Mar 9, 2024
973b6a6
🧼 format & lint (MUNify):
m1212e Mar 9, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ fontawesome-pro-6.4.2/
.env
certificates
.smtp4dev
.memorysnaphots
2 changes: 1 addition & 1 deletion chase/backend/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const r = await build({
format: "esm",
splitting: false,
sourcemap: "external",
minify: true,
minify: false,
loader: { ".mjml": "file" },
treeShaking: true,
plugins: [emptyMjmlUglifyPlugin],
Expand Down
23 changes: 23 additions & 0 deletions chase/backend/prisma/migrations/20240309082747_/migration.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
-- DropForeignKey
ALTER TABLE "Email" DROP CONSTRAINT "Email_userId_fkey";

-- DropForeignKey
ALTER TABLE "Password" DROP CONSTRAINT "Password_userId_fkey";

-- DropForeignKey
ALTER TABLE "PendingCredentialCreateTask" DROP CONSTRAINT "PendingCredentialCreateTask_tokenId_fkey";

-- DropForeignKey
ALTER TABLE "PendingCredentialCreateTask" DROP CONSTRAINT "PendingCredentialCreateTask_userId_fkey";

-- AddForeignKey
ALTER TABLE "Password" ADD CONSTRAINT "Password_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;

-- AddForeignKey
ALTER TABLE "PendingCredentialCreateTask" ADD CONSTRAINT "PendingCredentialCreateTask_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;

-- AddForeignKey
ALTER TABLE "PendingCredentialCreateTask" ADD CONSTRAINT "PendingCredentialCreateTask_tokenId_fkey" FOREIGN KEY ("tokenId") REFERENCES "Token"("id") ON DELETE CASCADE ON UPDATE CASCADE;

-- AddForeignKey
ALTER TABLE "Email" ADD CONSTRAINT "Email_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
8 changes: 4 additions & 4 deletions chase/backend/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ generator typebox {

model Password {
id String @id @default(uuid())
user User @relation(fields: [userId], references: [id])
user User @relation(fields: [userId], references: [id], onDelete: Cascade, onUpdate: Cascade)
userId String
passwordHash String
}
Expand All @@ -53,15 +53,15 @@ model Token {
model PendingCredentialCreateTask {
id String @id @default(uuid())

user User @relation(fields: [userId], references: [id])
user User @relation(fields: [userId], references: [id], onDelete: Cascade, onUpdate: Cascade)
userId String
token Token @relation(fields: [tokenId], references: [id])
token Token @relation(fields: [tokenId], references: [id], onDelete: Cascade, onUpdate: Cascade)
tokenId String
}

model Email {
email String @id
user User @relation(fields: [userId], references: [id])
user User @relation(fields: [userId], references: [id], onDelete: Cascade, onUpdate: Cascade)
userId String

validated Boolean @default(false)
Expand Down
81 changes: 39 additions & 42 deletions chase/backend/src/auth/guards/committeeMember.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import Elysia, { t } from "elysia";
import Elysia from "elysia";
import { session } from "../session";
import { TypeCompiler } from "@sinclair/typebox/compiler";
import { db } from "../../../prisma/db";
// import { TypeCompiler } from "@sinclair/typebox/compiler";
// import { db } from "../../../prisma/db";

const parametersSchema = TypeCompiler.Compile(
t.Object({
conferenceId: t.String(),
committeeId: t.String(),
}),
);
// const parametersSchema = TypeCompiler.Compile(
// t.Object({
// conferenceId: t.String(),
// committeeId: t.String(),
// }),
// );

export const committeeMemberGuard = new Elysia({
name: "conferenceMemberGuard",
Expand All @@ -21,39 +21,36 @@ export const committeeMemberGuard = new Elysia({
* You can also set the role to an array of roles to check if the user has any of the roles in the committee.
*/
isCommitteeMember() {
onBeforeHandle(async ({ session, set, params }) => {
if (session.loggedIn !== true) {
// biome-ignore lint/suspicious/noAssignInExpressions: This is a valid use case
return (set.status = "Unauthorized");
}

if (!parametersSchema.Check(params)) {
set.status = "Bad Request";
return [...parametersSchema.Errors(params)];
}
const { conferenceId, committeeId } = parametersSchema.Decode(params);

if (!session.userData) {
// biome-ignore lint/suspicious/noAssignInExpressions: This is a valid use case
return (set.status = "Unauthorized");
}

const res = await db.committeeMember.findFirst({
where: {
userId: session.userData.id,
committee: {
id: committeeId,
conference: {
id: conferenceId,
},
},
},
});

if (!res) {
// biome-ignore lint/suspicious/noAssignInExpressions: This is a valid use case
return (set.status = "Unauthorized");
}
onBeforeHandle(async () => {
// onBeforeHandle(async ({ session, set, params }) => {
// if (session.loggedIn !== true) {
// // biome-ignore lint/suspicious/noAssignInExpressions: This is a valid use case
// return (set.status = "Unauthorized");
// }
// if (!parametersSchema.Check(params)) {
// set.status = "Bad Request";
// return [...parametersSchema.Errors(params)];
// }
// const { conferenceId, committeeId } = parametersSchema.Decode(params);
// if (!session.userData) {
// // biome-ignore lint/suspicious/noAssignInExpressions: This is a valid use case
// return (set.status = "Unauthorized");
// }
// const res = await db.committeeMember.findFirst({
// where: {
// userId: session.userData.id,
// committee: {
// id: committeeId,
// conference: {
// id: conferenceId,
// },
// },
// },
// });
// if (!res) {
// // biome-ignore lint/suspicious/noAssignInExpressions: This is a valid use case
// return (set.status = "Unauthorized");
// }
});
},
};
Expand Down
65 changes: 32 additions & 33 deletions chase/backend/src/auth/guards/conferenceRoles.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import Elysia, { t } from "elysia";
// import Elysia, { t } from "elysia";
import Elysia from "elysia";
import { session } from "../session";
import { TypeCompiler } from "@sinclair/typebox/compiler";
import { db } from "../../../prisma/db";
// import { TypeCompiler } from "@sinclair/typebox/compiler";
// import { db } from "../../../prisma/db";
import { ConferenceRole } from "../../../prisma/generated/client";

const parametersSchema = TypeCompiler.Compile(
t.Object({
conferenceId: t.String(),
}),
);
// const parametersSchema = TypeCompiler.Compile(
// t.Object({
// conferenceId: t.String(),
// }),
// );

export const conferenceRoleGuard = new Elysia({
name: "conferenceRoleGuard",
Expand All @@ -20,31 +21,29 @@ export const conferenceRoleGuard = new Elysia({
* Checks if a user has the role in the conference. You can set the role to "any" to check if the user has any role in the conference.
* You can also set the role to an array of roles to check if the user has any of the roles in the conference.
*/
hasConferenceRole(roles: ConferenceRole[] | "any") {
onBeforeHandle(async ({ session, set, params }) => {
if (session.loggedIn !== true || !session.userData) {
// biome-ignore lint/suspicious/noAssignInExpressions: This is a valid use case
return (set.status = "Unauthorized");
}

if (!parametersSchema.Check(params)) {
set.status = "Bad Request";
return [...parametersSchema.Errors(params)];
}
const { conferenceId } = parametersSchema.Decode(params);

const res = await db.conferenceMember.findFirst({
where: {
userId: session.userData.id,
conferenceId,
role: roles === "any" ? undefined : { in: roles },
},
});

if (!res) {
// biome-ignore lint/suspicious/noAssignInExpressions: This is a valid use case
return (set.status = "Unauthorized");
}
hasConferenceRole(_roles: ConferenceRole[] | "any") {
onBeforeHandle(async () => {
// onBeforeHandle(async ({ session, set, params }) => {
// if (session.loggedIn !== true || !session.userData) {
// // biome-ignore lint/suspicious/noAssignInExpressions: This is a valid use case
// return (set.status = "Unauthorized");
// }
// if (!parametersSchema.Check(params)) {
// set.status = "Bad Request";
// return [...parametersSchema.Errors(params)];
// }
// const { conferenceId } = parametersSchema.Decode(params);
// const res = await db.conferenceMember.findFirst({
// where: {
// userId: session.userData.id,
// conferenceId,
// role: roles === "any" ? undefined : { in: roles },
// },
// });
// if (!res) {
// // biome-ignore lint/suspicious/noAssignInExpressions: This is a valid use case
// return (set.status = "Unauthorized");
// }
});
},
};
Expand Down
Loading
Loading