Skip to content

💥 #108

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.

Sign up for GitHub

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

Merged
merged 138 commits into from
Aug 4, 2025
Merged

💥 #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
3631609
feat: added staff scan qr page
dhanavadh Jul 13, 2025
fe86339
Merge branch 'dev' into feat/firstdate/staff-qr
dhanavadh Jul 13, 2025
076210b
fix: firstdate staff bg
dhanavadh Jul 13, 2025
a25dc69
Merge branch 'dev' into feat/firstdate/staff-qr
dhanavadh Jul 14, 2025
2eb62c2
feat: add @yudiel/react-qr-scanner
dhanavadh Jul 14, 2025
4cbcbd3
Merge branch 'dev' into feat/firstdate/staff-qr
dhanavadh Jul 14, 2025
a70b642
Merge branch 'dev' into feat/firstdate/staff-qr
dhanavadh Jul 14, 2025
2fa23d2
Merge branch 'dev' into feat/firstdate/staff-qr
dhanavadh Jul 14, 2025
560d6a0
Feat: added staff-qr page
dhanavadh Jul 14, 2025
382c2c8
Merge branch 'dev' into feat/firstdate/staff-qr
neennera Jul 15, 2025
a5e278f
chore: fix middleware doesn't work
Dpyde Jul 16, 2025
9846fda
feat: Implement qr scan with api
Dpyde Jul 16, 2025
6b9742a
Merge branch 'dev' into feat/firstdate/staff-qr
dhanavadh Jul 16, 2025
9447040
fix: staff-qr code
dhanavadh Jul 16, 2025
d3ac27c
Merge branch 'feat/firstdate/staff-qr' of https://github.com/isd-sgcu…
neennera Jul 16, 2025
cd6e983
Merge branch 'dev' into feat/firstdate/staff-qr
neennera Jul 17, 2025
e53584f
fix: conflicts
MasterIceZ Jul 17, 2025
707f4a7
fix: qr scan error, body stream err, cannot send cookie to backend err
dhanavadh Jul 17, 2025
8395fc4
Fix: alternative form handle error
dhanavadh Jul 17, 2025
919a945
fix: no event active layout
dhanavadh Jul 17, 2025
9523a05
Merge branch 'dev' into feat/firstdate/staff-qr
dhanavadh Jul 17, 2025
7878eff
Merge branch 'feat/firstdate/staff-qr' of https://github.com/isd-sgcu…
neennera Jul 17, 2025
4104be7
[Fix] Staff-QR (#71)
dhanavadh Jul 17, 2025
80569df
feat: getGroupByInviteCode
BadLuckZ Jul 17, 2025
0b94782
fix: fest content
neennera Jul 17, 2025
e0c6a73
fix: qrcode in /events go to /firstdate/qrcode
neennera Jul 17, 2025
f6e264a
add : checkin not found & remove freshmennight
neennera Jul 17, 2025
d0acd9f
feat: joinGroup and leaveGroup
BadLuckZ Jul 17, 2025
09d2d67
add: fix event period
neennera Jul 17, 2025
1c252d1
fix: staff with navbar
neennera Jul 17, 2025
0bd0a31
Update Routes.ts
BadLuckZ Jul 17, 2025
82d9fc3
feat: add nonStartedRoutes time constraint whitelist
Taihenc Jul 17, 2025
c3c7d6a
fix : home & map unclickable
neennera Jul 17, 2025
8448136
fix: new Date()
neennera Jul 17, 2025
05e7123
Merge pull request #80 from isd-sgcu/fix/qr-code-not-scan
neennera Jul 17, 2025
dd16c0b
feat: getHousePref() + setHousePref()
BadLuckZ Jul 17, 2025
375308a
fix: qr load
Taihenc Jul 17, 2025
be3ec12
Merge branch 'main' into dev
Taihenc Jul 17, 2025
4657972
fix: adjust datatype
BadLuckZ Jul 18, 2025
366cf26
fix: check in not found event
neennera Jul 18, 2025
c56c4d6
fix: qa profile , firstdate register
neennera Jul 18, 2025
2b8d55e
Merge branch 'main' into dev
neennera Jul 18, 2025
b8cf671
Merge pull request #79 from isd-sgcu/feat/rpkm/groupAPI
RawSalmon69 Jul 18, 2025
05e413a
fix: Adjust data type again based on backend
BadLuckZ Jul 18, 2025
9646dcd
fix: Trust me - 0.5s delay can't avoid -1 people in the houses
BadLuckZ Jul 18, 2025
7e4ae70
Merge branch 'dev' into feat/rpkm/houseAPI
BadLuckZ Jul 18, 2025
81acaf5
feat: Can get housePref
BadLuckZ Jul 18, 2025
bce2b41
feat: Get Houses with API
BadLuckZ Jul 18, 2025
cee3abe
feat: Submit Houses
BadLuckZ Jul 18, 2025
35f12cb
feat: Loading Icon
BadLuckZ Jul 18, 2025
5e26cb2
fix: สำรองโคตรเล็ก พึ่งเห็น
BadLuckZ Jul 18, 2025
475d205
fix: Route.ts
BadLuckZ Jul 18, 2025
86c9d78
fix: edit profile
MasterIceZ Jul 18, 2025
3f2f88b
chore: remove ig
MasterIceZ Jul 18, 2025
aa7423e
Merge branch 'main' into dev
MasterIceZ Jul 18, 2025
750a5be
nothing: parse to <script>
BadLuckZ Jul 18, 2025
f54f419
Merge branch 'dev' into feat/rpkm/houseAPI
BadLuckZ Jul 18, 2025
800b2bb
fix: Custom Size's color not only black
BadLuckZ Jul 18, 2025
3637bed
fix: quest-3-x banner path
BadLuckZ Jul 18, 2025
5cf263b
fix: Change Card's gap
BadLuckZ Jul 18, 2025
1a0cd73
[Feat][RPKM] Houses (#84)
BadLuckZ Jul 18, 2025
8d6e30c
Merge branch 'main' into dev
RawSalmon69 Jul 18, 2025
f39eb56
Merge branch 'dev' into feat/rpkm/groupAPI
BadLuckZ Jul 18, 2025
02eb4cf
Merge branch 'feat/rpkm/houseAPI' into feat/rpkm/groupAPI
BadLuckZ Jul 18, 2025
65269ed
feat: Hidden Buttons for non-owner (Not sure for members)
BadLuckZ Jul 18, 2025
49270cb
fix: Bugs from PM
BadLuckZ Jul 18, 2025
72c2ba9
fix: Bugs Again
BadLuckZ Jul 18, 2025
83accf5
fix: Bugs Again...
BadLuckZ Jul 18, 2025
1a8d9b5
feat: Join Group
BadLuckZ Jul 18, 2025
95a5c7f
fix: Remove things
BadLuckZ Jul 18, 2025
138bdaf
feat: leaveGroup
BadLuckZ Jul 18, 2025
b2891b2
fix: Group UI
BadLuckZ Jul 18, 2025
4afd871
fix: Route.ts
BadLuckZ Jul 18, 2025
15edd80
Merge branch 'dev' into feat/rpkm/groupAPI
BadLuckZ Jul 18, 2025
fc70ce2
fix: reload
BadLuckZ Jul 18, 2025
f1e2b41
Merge branch 'feat/rpkm/groupAPI' of https://github.com/isd-sgcu/fdrp…
BadLuckZ Jul 18, 2025
1e6bfe7
fix: Show that members can't pick group
BadLuckZ Jul 19, 2025
2c4ea81
[Fix][RPKM] ฝันดีครับน้อง อุอิอิอา (#87)
BadLuckZ Jul 19, 2025
b5e2297
feat: added Freshmen night regis
dhanavadh Jul 19, 2025
07881af
feat: added FM night link in navbar
dhanavadh Jul 19, 2025
96e5daf
fix: qrcode
neennera Jul 19, 2025
6a6f02d
Merge branch 'dev' into feat/firstdate/staff-qr
neennera Jul 19, 2025
ac39a95
Merge branch 'feat/firstdate/staff-qr' into fix/qr-code-not-scan
neennera Jul 17, 2025
ac4b188
Merge remote-tracking branch 'origin/dev' into feat/rpkm/groupAPI
BadLuckZ Jul 19, 2025
2df5102
fix: EZ Quick Math
BadLuckZ Jul 19, 2025
becbb76
fix: fix middleware potential bug
Taihenc Jul 19, 2025
784401c
chore: update workshops data
Taihenc Jul 19, 2025
4da50d4
feat: update workshop components
Taihenc Jul 19, 2025
33138f5
feat: integrate workshops registration
Taihenc Jul 19, 2025
e260e3a
fix: fd bg to webp and staff home button
dhanavadh Jul 19, 2025
ec27317
feat: impl UI for user's registered workshops
Taihenc Jul 19, 2025
3cca08a
Merge pull request #89 from isd-sgcu/feat/rpkm/groupAPI
MasterIceZ Jul 19, 2025
9bd4c79
fix: changed to hardcoded event-period
dhanavadh Jul 19, 2025
a27d81a
feat: integrate get participant count from be
Taihenc Jul 19, 2025
3c840f9
fix: Changing By PM
BadLuckZ Jul 19, 2025
9a81506
fix: Route.ts
BadLuckZ Jul 19, 2025
3e7dc2e
Merge pull request #91 from isd-sgcu/feat/workshop-integrate-backend
MasterIceZ Jul 19, 2025
b44f991
Merge pull request #88 from isd-sgcu/feat/firstdate/fmnight
MasterIceZ Jul 19, 2025
4e1c296
Merge pull request #90 from isd-sgcu/fix/firstdate/bg
MasterIceZ Jul 19, 2025
cec92d3
chore: update rpkm date
Taihenc Jul 19, 2025
d2a4c26
feat: add workshop img, & minor stype fix
Taihenc Jul 19, 2025
10df88e
refactor: use .webp instead
Taihenc Jul 19, 2025
526e72f
Merge remote-tracking branch 'origin/dev' into feat/workshop-minor-st…
Taihenc Jul 19, 2025
cad26f0
feat: intagrate bottle of choice dialog
Taihenc Jul 19, 2025
8668389
refactor: fix typo
Taihenc Jul 19, 2025
c9d0c1c
Merge pull request #96 from isd-sgcu:feat/workshop-minor-style-fix
Taihenc Jul 19, 2025
5d4dc0b
Merge pull request #97 from isd-sgcu:feat/integrate-bottle-of-choice
Taihenc Jul 19, 2025
61254f2
feat: add shadow to divider component
Taihenc Jul 20, 2025
72451c1
Merge remote-tracking branch 'origin/main' into dev
Taihenc Jul 20, 2025
1ec5209
Merge branch 'main' into dev
Taihenc Jul 20, 2025
24cce65
hot: member visualization
BadLuckZ Jul 20, 2025
3dc52e8
Merge branch 'main' into dev
RawSalmon69 Jul 20, 2025
333dac8
fix: Remove *2
BadLuckZ Jul 20, 2025
da6da87
fix: update goback href navbar for rpkm home
Taihenc Jul 20, 2025
8bce893
feat: map error to message
Taihenc Jul 20, 2025
3939045
feat: change err msg to thai
Taihenc Jul 20, 2025
d553bb9
Merge remote-tracking branch 'origin/main' into dev
Taihenc Jul 20, 2025
e7adb11
chore: bro when is real final data?
RawSalmon69 Jul 21, 2025
ae88bf4
Merge branch 'main' into dev
RawSalmon69 Jul 21, 2025
e6d7901
feat: House Display
BadLuckZ Jul 23, 2025
b9b4efa
feat: Update House Disable Picking
BadLuckZ Jul 23, 2025
15c90d0
fix: More Disable
BadLuckZ Jul 23, 2025
0c2cb56
fix: Forget IG
BadLuckZ Jul 23, 2025
8126d78
fix: More Disable
BadLuckZ Jul 23, 2025
1ac9488
[Feat][RPKM] House Display (#103)
BadLuckZ Jul 23, 2025
047dc2f
Merge branch 'main' into dev
RawSalmon69 Jul 23, 2025
8ff1681
fix: Remove YT
BadLuckZ Jul 23, 2025
e55591f
fix: House Date
BadLuckZ Jul 25, 2025
c204a5b
Merge branch 'main' into dev
BadLuckZ Jul 26, 2025
278d9c9
Merge branch 'dev' into feat/rpkm/houseDisplay
BadLuckZ Jul 26, 2025
42b8d02
feat: Prepare to display group's house
BadLuckZ Jul 26, 2025
b175a9e
fix: Rename Field
BadLuckZ Jul 26, 2025
01671bb
Merge pull request #106 from isd-sgcu/feat/rpkm/houseDisplay
MasterIceZ Jul 26, 2025
c3e3020
Merge branch 'main' into dev
MasterIceZ Jul 26, 2025
463a36e
chore: remove everything :boom:
MasterIceZ Aug 4, 2025
80def48
chore: :boom:
MasterIceZ Aug 4, 2025
d869a36
fix: button
MasterIceZ Aug 4, 2025
59f7924
Merge branch 'main' into dev
MasterIceZ Aug 4, 2025
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
3 changes: 0 additions & 3 deletions public/firstdate/home/qrcode.svg
View file
Open in desktop

This file was deleted.

Binary file removed public/firstdate/main-bg.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/firstdate/register-bg.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/firstdate/register/checked-no.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/firstdate/register/checked-yes.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/firstdate/register/divider.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/firstdate/register/freshmen-fest-logo.png
View file
Open in desktop
Binary file not shown.
33 changes: 0 additions & 33 deletions public/firstdate/register/glob.svg
View file
Open in desktop

This file was deleted.

Binary file removed public/firstdate/register/registered-bg.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/firstdate/register/sgcu-logo.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/firstdate/register/staff/form-bg.png
View file
Open in desktop
Binary file not shown.
33 changes: 0 additions & 33 deletions public/firstdate/register/staff/glob.svg
View file
Open in desktop

This file was deleted.

Binary file removed public/firstdate/register/staff/registered-bg.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/firstdate/register/student-form-bg.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/firstdate/register/success/divider.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/firstdate/register/success/success-frame.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/firstdate/register/success/time-travel.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/firstdate/register/unchecked-no.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/firstdate/register/unchecked-yes.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/background/bg-all-1.webp
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/background/bg-blue-1.webp
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/background/bg-blue-2.webp
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/background/bg-purple-1.webp
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/background/bg-welcome.png
View file
Open in desktop
Binary file not shown.
0 ...round/firstdate/bg-firstdate-landing.webp → ...te 23-41-12-348/bg-firstdate-landing.webp
View file
Open in desktop
File renamed without changes
0 ...ckground/firstdate/bg-firstdate-main.webp → ...tdate 23-41-12-348/bg-firstdate-main.webp
View file
Open in desktop
File renamed without changes
0 ...round/firstdate/bg-firstdate-profile.webp → ...te 23-41-12-348/bg-firstdate-profile.webp
View file
Open in desktop
File renamed without changes
26 changes: 0 additions & 26 deletions public/images/frame-profile-image/frame-profile-image-blue-star.svg
View file
Open in desktop
Diff not rendered.
Loading
Loading