Dev : Middleware & ETC. #81

neennera · 2025-07-17T19:45:47Z

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 <[email protected]> Co-authored-by: Thukdanai Thaothawin <[email protected]> Co-authored-by: Borworntat Dendumrongkul <[email protected]>

(cherry picked from commit 77bf8bf)

Fix/qr code not scan

Copilot

Pull Request Overview

This PR adds a full-featured staff event check-in page with QR scanning and manual entry, updates event API/middleware logic (including time-based route whitelisting and cufest support), and includes various UI tweaks and link fixes.

Introduce src/pages/staff/event/index.astro with <Tabs>, <QRScanner>, manual form, check-in modals, and associated client script.
Extend src/lib/eventAPI.ts to handle cufest timing and add staffQRScanRegister; update src/lib/api.ts to include auth headers.
Update src/middleware.ts for time‐based access to non‐started routes and make minor UI/link adjustments across several pages.

Reviewed Changes

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

Show a summary per file

File	Description
src/pages/staff/event/index.astro	New staff event check-in UI and logic
src/lib/eventAPI.ts	cufest timing logic, `staffQRScanRegister`, updated event configs
src/lib/api.ts	Added auth headers, improved error handling
src/middleware.ts	Time-based whitelist for pre-start routes
src/components/staff/QRScanner.tsx	New React QR scanner component
src/components/common/Tabs.astro	Tab UI component for QR vs manual entry
Various `src/pages/firstdate/...` and `src/pages/fest`	Minor link, text, and map refresh hints

Files not reviewed (1)

pnpm-lock.yaml: Language not supported

Comments suppressed due to low confidence (1)

src/lib/eventAPI.ts:133

The cufest branch returns only after the target date, but for dates before the target it falls through to backend calls rather than marking as coming soon. Consider returning an isComingSoon: true status for pre-target dates.

  if (eventType === "cufest") {

Copilot · 2025-07-17T19:47:48Z

src/pages/staff/event/index.astro

-  <div class="min-h-screen px-4 py-16">
-    <div class="mx-auto max-w-4xl">
-      <h1 class="mb-12 text-center text-2xl font-bold">
+<StaffWithNavbar>


The StaffWithNavbar layout is rendered without title and description props, resulting in an undefined <title> and meta description. Pass title and description or set defaults in the layout.

Suggested change

<StaffWithNavbar>

<StaffWithNavbar title="Event QR Scanner" description="Scan QR codes to register for events">

Copilot · 2025-07-17T19:47:49Z

src/pages/firstdate/events/[eventId]/index.astro

-              <p class="mt-4 font-bold text-red-500">
-                สถานะ: ยังไม่ได้ลงทะเบียน
-              </p>
+              {eventType != "cufest" && (


Use strict comparison (!==) instead of loose (!=) to avoid unintended type coercion.

Suggested change

{eventType != "cufest" && (

{eventType !== "cufest" && (

Copilot · 2025-07-17T19:47:49Z

src/lib/api.ts

      if (response.body) {
        try {
-          const raw: ApiResponseRaw = JSON.parse(await response.text());
+          const responseText = await response.text();
+          const raw: ApiResponseRaw = JSON.parse(responseText);
          errorMsg = raw.error || raw.message || errorMsg;
        } catch {
-          errorMsg = await response.text();
+          errorMsg = "Request failed";
        }
      }
      throw new ApiError(errorMsg, response.status, response);


[nitpick] On JSON parse failure the code falls back to a generic "Request failed" message, losing server-side error details. Consider logging the raw response or including it for easier debugging.

Copilot · 2025-07-17T19:47:49Z

src/components/staff/QRScanner.tsx

+        qrData.includes("id=7137ec7e-0f4b-4d65-88c4-982d36f7692f") &&
+        qrData.includes("userId=a8e7e644-ed12-4748-89fc-4599f868ab5d")
+      ) {
+        // Keep the old test QR support


Hardcoded test QR code values are embedded in production logic. Remove or guard this test data behind a debug flag or configuration.

Suggested change

qrData.includes("id=7137ec7e-0f4b-4d65-88c4-982d36f7692f") &&

qrData.includes("userId=a8e7e644-ed12-4748-89fc-4599f868ab5d")

) {

// Keep the old test QR support

process.env.DEBUG_MODE === "true" &&

qrData.includes("id=7137ec7e-0f4b-4d65-88c4-982d36f7692f") &&

qrData.includes("userId=a8e7e644-ed12-4748-89fc-4599f868ab5d")

) {

// Keep the old test QR support in debug mode

Copilot · 2025-07-17T19:47:50Z

src/components/common/Tabs.astro

@@ -0,0 +1,145 @@
+<div>
+  <div class="relative my-8 flex w-full px-4">


The tab component is missing ARIA roles and properties (e.g., role="tablist", role="tab", aria-selected). Add appropriate accessibility attributes for screen reader support.

Suggested change

<div class="relative my-8 flex w-full px-4">

<div class="relative my-8 flex w-full px-4" role="tablist">

Copilot · 2025-07-17T19:47:50Z

src/pages/staff/event/index.astro

+    createdAt: "",
+    updatedAt: "",
+  };
+  let currentActiveEvent: any = null;


Using any for currentActiveEvent loses type safety. Define and use a proper interface/type for this variable.

Suggested change

let currentActiveEvent: any = null;

interface ActiveEvent {

id: string;

name: string;

status: string;

startTime: string;

endTime: string;

}

let currentActiveEvent: ActiveEvent | null = null;

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

fix: fest content

0b94782

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

e0c6a73

add : checkin not found & remove freshmennight

f6e264a

add: fix event period

09d2d67

fix: staff with navbar

1c252d1

feat: add nonStartedRoutes time constraint whitelist

82d9fc3

(cherry picked from commit 77bf8bf)

fix : home & map unclickable

c3c7d6a

neennera and others added 2 commits July 18, 2025 02:39

fix: new Date()

8448136

Merge pull request #80 from isd-sgcu/fix/qr-code-not-scan

05e7123

Fix/qr code not scan

neennera requested review from RawSalmon69 and Copilot July 17, 2025 19:45

Copilot AI reviewed Jul 17, 2025

View reviewed changes

Taihenc approved these changes Jul 17, 2025

View reviewed changes

Taihenc merged commit 0874b69 into main Jul 17, 2025
10 checks passed

neennera added 3 commits July 19, 2025 16:03

fix: qrcode

96e5daf

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

6a6f02d

Merge branch 'feat/firstdate/staff-qr' into fix/qr-code-not-scan

ac39a95

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Dev : Middleware & ETC. #81

Dev : Middleware & ETC. #81

Uh oh!

neennera commented Jul 17, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Jul 17, 2025

Uh oh!

Copilot AI Jul 17, 2025

Uh oh!

Copilot AI Jul 17, 2025

Uh oh!

Copilot AI Jul 17, 2025

Uh oh!

Copilot AI Jul 17, 2025

Uh oh!

Copilot AI Jul 17, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

	<StaffWithNavbar>
	<StaffWithNavbar title="Event QR Scanner" description="Scan QR codes to register for events">

		@@ -0,0 +1,145 @@
		<div>
		<div class="relative my-8 flex w-full px-4">

-  let currentActiveEvent: any = null;
+  interface ActiveEvent {
+    id: string;
+    name: string;
+    status: string;
+    startTime: string;
+    endTime: string;
+  }
+  let currentActiveEvent: ActiveEvent | null = null;

Uh oh!

Dev : Middleware & ETC. #81

Dev : Middleware & ETC. #81

Uh oh!

Conversation

neennera commented Jul 17, 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 17, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 17, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 17, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 17, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 17, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 17, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants