Dev by RawSalmon69 · Pull Request #104 · isd-sgcu/fdrpkm68-frontend

RawSalmon69 · 2025-07-23T12:30:20Z

No description provided.

-added staff scan qr page

added staff-qr page

- Fixed Staff-qr handling error - Fix error type assertions in staff/event/index.astro - Remove unused imports and variables

…/fdrpkm68-frontend into feat/firstdate/staff-qr

- Added auth functions getAuthToken() and getAuthHeaders() in api.ts - Fixed body stream error when scan qr code - Added handle error when user is not exist and when user scan wrong qr

- fix ButtonFd not send data

- Fixed no events active layout

…/fdrpkm68-frontend into feat/firstdate/staff-qr

* feat: added staff scan qr page -added staff scan qr page * fix: firstdate staff bg * feat: add @yudiel/react-qr-scanner * Feat: added staff-qr page added staff-qr page * chore: fix middleware doesn't work * feat: Implement qr scan with api * fix: staff-qr code - Fixed Staff-qr handling error - Fix error type assertions in staff/event/index.astro - Remove unused imports and variables * fix: qr scan error, body stream err, cannot send cookie to backend err - Added auth functions getAuthToken() and getAuthHeaders() in api.ts - Fixed body stream error when scan qr code - Added handle error when user is not exist and when user scan wrong qr * Fix: alternative form handle error - fix ButtonFd not send data * fix: no event active layout - Fixed no events active layout * fix: qrcode --------- Co-authored-by: neennera <neennera@gmail.com> Co-authored-by: Thukdanai Thaothawin <arkaza2547@gmail.com> Co-authored-by: Borworntat Dendumrongkul <mastericez890@gmail.com>

…yle-fix

[Feature][RPKM] Workshop & styling minor

[Feature][RPKM] intagrate bottle of choice

* feat: House Display * feat: Update House Disable Picking * fix: More Disable * fix: Forget IG * fix: More Disable

Copilot

Pull Request Overview

This PR implements time-based feature gating for an RPKM (house picking) system, introducing date-controlled transitions between house selection and display phases. The changes add configuration dates to control when house picking becomes disabled and when to switch from selection to display mode.

Adds date configuration constants to control feature availability
Implements conditional UI rendering based on current date vs configured dates
Updates Google Maps links for two shop entries

Reviewed Changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
src/data/fest/quest2-shops.ts	Updates Google Maps URLs for two shop entries
src/components/rpkm/sample.astro	Adds conditional rendering to switch between HousePicker and HouseDisplay based on date
src/components/rpkm/data/date.ts	Defines date constants for controlling picking and display phases
src/components/rpkm/components/house-picker.astro	Implements date-based disabling of house picking functionality
src/components/rpkm/components/house-display.astro	Creates new component for displaying house results after picking phase
src/components/rpkm/components/group-picker.astro	Adds date-based disabling of group picking functionality

Copilot · 2025-07-23T12:31:13Z

+  return Astro.redirect("/login");
+}
+
+const assignedHouse = null; // Replace with actual house attribute


The assignedHouse variable is hardcoded to null with a TODO comment. This will always render the 'no house selected' state regardless of actual data. The logic should be implemented to fetch the actual assigned house from the group data.

Suggested change

const assignedHouse = null; // Replace with actual house attribute

const assignedHouse = groupData?.assignedHouse || null; // Fetch assigned house from groupData

Copilot · 2025-07-23T12:31:13Z

      const instagramLink = housePopup?.querySelector("#house-instagram-link");
      if (instagramLink) {
-        instagramLink.href = house.instagramURL;
+        instagramLink.href = house.instagram;


The property name changed from 'instagramURL' to 'instagram' without context. This could indicate an inconsistent API change that might cause runtime errors if the house object doesn't have an 'instagram' property.

Suggested change

instagramLink.href = house.instagram;

instagramLink.href = house.instagram || house.instagramURL || "#";

Copilot · 2025-07-23T12:31:14Z

+        {/* House Instagram */}
+        <a
+          id="house-instagram-link-final"
+          href="https://youtu.be/dQw4w9WgXcQ?si=To9bwNaRw7cl03NT"


The Instagram link is hardcoded to a YouTube URL (appears to be a Rick Roll). This should be replaced with actual Instagram URL logic or removed if this is placeholder code.

Copilot · 2025-07-23T12:31:14Z

+        >
+          <img src="/images/rpkm/instagram-icon.svg" width="20" height="20" />
+          <p id="house-instagram-final" class="font-medium text-white">
+            baan.something


The Instagram handle is hardcoded to 'baan.something' placeholder text. This should display the actual Instagram handle from the house data.

Suggested change

baan.something

{assignedHouse?.instagramHandle || "Instagram handle not available"}

MasterIceZ

positive

MasterIceZ

Jing P

dhanavadh and others added 30 commits July 13, 2025 22:27

feat: added staff scan qr page

3631609

-added staff scan qr page

Merge branch 'dev' into feat/firstdate/staff-qr

fe86339

fix: firstdate staff bg

076210b

Merge branch 'dev' into feat/firstdate/staff-qr

a25dc69

feat: add @yudiel/react-qr-scanner

2eb62c2

Merge branch 'dev' into feat/firstdate/staff-qr

4cbcbd3

Merge branch 'dev' into feat/firstdate/staff-qr

a70b642

Merge branch 'dev' into feat/firstdate/staff-qr

2fa23d2

Feat: added staff-qr page

560d6a0

added staff-qr page

Merge branch 'dev' into feat/firstdate/staff-qr

382c2c8

chore: fix middleware doesn't work

a5e278f

feat: Implement qr scan with api

9846fda

Merge branch 'dev' into feat/firstdate/staff-qr

6b9742a

fix: staff-qr code

9447040

- Fixed Staff-qr handling error - Fix error type assertions in staff/event/index.astro - Remove unused imports and variables

Merge branch 'feat/firstdate/staff-qr' of https://github.com/isd-sgcu…

d3ac27c

…/fdrpkm68-frontend into feat/firstdate/staff-qr

Merge branch 'dev' into feat/firstdate/staff-qr

cd6e983

fix: conflicts

e53584f

fix: qr scan error, body stream err, cannot send cookie to backend err

707f4a7

- Added auth functions getAuthToken() and getAuthHeaders() in api.ts - Fixed body stream error when scan qr code - Added handle error when user is not exist and when user scan wrong qr

Fix: alternative form handle error

8395fc4

- fix ButtonFd not send data

fix: no event active layout

919a945

- Fixed no events active layout

Merge branch 'dev' into feat/firstdate/staff-qr

9523a05

Merge branch 'feat/firstdate/staff-qr' of https://github.com/isd-sgcu…

7878eff

…/fdrpkm68-frontend into feat/firstdate/staff-qr

feat: getGroupByInviteCode

80569df

fix: fest content

0b94782

fix: qrcode in /events go to /firstdate/qrcode

e0c6a73

add : checkin not found & remove freshmennight

f6e264a

feat: joinGroup and leaveGroup

d0acd9f

add: fix event period

09d2d67

fix: staff with navbar

1c252d1

Taihenc and others added 20 commits July 20, 2025 00:54

feat: add workshop img, & minor stype fix

d2a4c26

refactor: use .webp instead

10df88e

Merge remote-tracking branch 'origin/dev' into feat/workshop-minor-st…

526e72f

…yle-fix

feat: intagrate bottle of choice dialog

cad26f0

refactor: fix typo

8668389

Merge pull request #96 from isd-sgcu:feat/workshop-minor-style-fix

c9d0c1c

[Feature][RPKM] Workshop & styling minor

Merge pull request #97 from isd-sgcu:feat/integrate-bottle-of-choice

5d4dc0b

[Feature][RPKM] intagrate bottle of choice

feat: add shadow to divider component

61254f2

Merge remote-tracking branch 'origin/main' into dev

72451c1

Merge branch 'main' into dev

1ec5209

hot: member visualization

24cce65

Merge branch 'main' into dev

3dc52e8

fix: Remove *2

333dac8

fix: update goback href navbar for rpkm home

da6da87

feat: map error to message

8bce893

feat: change err msg to thai

3939045

Merge remote-tracking branch 'origin/main' into dev

d553bb9

chore: bro when is real final data?

e7adb11

Merge branch 'main' into dev

ae88bf4

[Feat][RPKM] House Display (#103)

1ac9488

* feat: House Display * feat: Update House Disable Picking * fix: More Disable * fix: Forget IG * fix: More Disable

Copilot AI review requested due to automatic review settings July 23, 2025 12:30

Merge branch 'main' into dev

047dc2f

RawSalmon69 requested review from MasterIceZ and Taihenc July 23, 2025 12:31

Copilot AI reviewed Jul 23, 2025

View reviewed changes

MasterIceZ previously approved these changes Jul 23, 2025

View reviewed changes

fix: Remove YT

8ff1681

BadLuckZ dismissed MasterIceZ’s stale review via 8ff1681 July 23, 2025 12:43

MasterIceZ approved these changes Jul 23, 2025

View reviewed changes

RawSalmon69 merged commit 2ab3a48 into main Jul 23, 2025
10 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dev#104

Dev#104
RawSalmon69 merged 122 commits into
mainfrom
dev

RawSalmon69 commented Jul 23, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Jul 23, 2025

Uh oh!

Copilot AI Jul 23, 2025

Uh oh!

Copilot AI Jul 23, 2025

Uh oh!

Copilot AI Jul 23, 2025

Uh oh!

MasterIceZ left a comment

Uh oh!

MasterIceZ left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

	const assignedHouse = null; // Replace with actual house attribute
	const assignedHouse = groupData?.assignedHouse \|\| null; // Fetch assigned house from groupData

	instagramLink.href = house.instagram;
	instagramLink.href = house.instagram \|\| house.instagramURL \|\| "#";

	baan.something
	{assignedHouse?.instagramHandle \|\| "Instagram handle not available"}

Conversation

RawSalmon69 commented Jul 23, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Jul 23, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 23, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 23, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 23, 2025

Choose a reason for hiding this comment

Uh oh!

MasterIceZ left a comment

Choose a reason for hiding this comment

Uh oh!

MasterIceZ left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants