Skip to content

Conversation

@BadLuckZ
Copy link
Contributor

  • เพิ่มการ Disable การเลือกบ้านและการ Join กลุ่มเมื่อถึงวันที่ 24
  • เพิ่ม UI แสดงบ้านที่ได้เมื่อถึงวันที่ 27

@BadLuckZ BadLuckZ self-assigned this Jul 23, 2025
Copy link
Member

@MasterIceZ MasterIceZ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

เห็นด้วยเลยพี่

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

บอกกุทีว่าไอนี่แค่ placeholder ไม่ใช่ของจริง

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😭 💀

Copy link
Contributor Author

@BadLuckZ BadLuckZ Jul 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ก็ไม่รู้จะใส่ไรอ่ะพี่ xd (ลืมไปละเอาจริงว่าใส่ไว้ 555)

@RawSalmon69
Copy link
Member

เคพี่ เห็นด้วยก็ดี

@RawSalmon69 RawSalmon69 merged commit 1ac9488 into dev Jul 23, 2025
7 checks passed
@RawSalmon69 RawSalmon69 deleted the feat/rpkm/houseDisplay branch July 23, 2025 12:28
@RawSalmon69
Copy link
Member

อ่าวเฮีย มาพร้อมกันเกิน

RawSalmon69 added a commit that referenced this pull request Jul 23, 2025
* 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] Staff-QR (#71)

* 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]>

* feat: getGroupByInviteCode

* fix: fest content

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

* add : checkin not found & remove freshmennight

* feat: joinGroup and leaveGroup

* add: fix event period

* fix: staff with navbar

* Update Routes.ts

* feat: add nonStartedRoutes time constraint whitelist

(cherry picked from commit 77bf8bf)

* fix : home & map unclickable

* fix: new Date()

* feat: getHousePref() + setHousePref()

* fix: qr load

* fix: adjust datatype

* fix: check in not found event

* fix: qa profile , firstdate register

* fix: Adjust data type again based on backend

* fix: Trust me - 0.5s delay can't avoid -1 people in the houses

* feat: Can get housePref

* feat: Get Houses with API

* feat: Submit Houses

* feat: Loading Icon

* fix: สำรองโคตรเล็ก พึ่งเห็น

* fix: Route.ts

* fix: edit profile

* chore: remove ig

* nothing: parse to <script>

* fix: Custom Size's color not only black

* fix: quest-3-x banner path

* fix: Change Card's gap

* [Feat][RPKM] Houses (#84)

* feat: getHousePref() + setHousePref()

* fix: adjust datatype

* fix: Adjust data type again based on backend

* fix: Trust me - 0.5s delay can't avoid -1 people in the houses

* feat: Can get housePref

* feat: Get Houses with API

* feat: Submit Houses

* feat: Loading Icon

* fix: สำรองโคตรเล็ก พึ่งเห็น

* fix: Route.ts

* fix: Custom Size's color not only black

* feat: Hidden Buttons for non-owner (Not sure for members)

* fix: Bugs from PM

* fix: Bugs Again

* fix: Bugs Again...

* feat: Join Group

* fix: Remove things

* feat: leaveGroup

* fix: Group UI

* fix: Route.ts

* fix: reload

* fix: Show that members can't pick group

* [Fix][RPKM] ฝันดีครับน้อง อุอิอิอา (#87)

* feat: getHousePref() + setHousePref()

* fix: adjust datatype

* fix: Adjust data type again based on backend

* fix: Trust me - 0.5s delay can't avoid -1 people in the houses

* feat: Can get housePref

* feat: Get Houses with API

* feat: Submit Houses

* feat: Loading Icon

* fix: สำรองโคตรเล็ก พึ่งเห็น

* fix: Route.ts

* nothing: parse to <script>

* fix: Custom Size's color not only black

* fix: Change Card's gap

* feat: Hidden Buttons for non-owner (Not sure for members)

* fix: Bugs from PM

* fix: Bugs Again

* fix: Bugs Again...

* feat: Join Group

* fix: Remove things

* feat: leaveGroup

* fix: Group UI

* fix: Route.ts

* fix: reload

* fix: Show that members can't pick group

* feat: added Freshmen night regis

- added fm night regis button for student role
- cleared hardcode for checking the opening event

* feat: added FM night link in navbar

- added fm night link to navbar

* fix: qrcode

* fix: EZ Quick Math

* fix: fix middleware potential bug

* chore: update workshops data

* feat: update workshop components

* feat: integrate workshops registration

* fix: fd bg to webp and staff home button

- changed firstdate bg to webp
- changed button in staff page

* feat: impl UI for user's registered workshops

* fix: changed to hardcoded event-period

- changed to hardcode event-period

```
const eventPeriods = {
      FIRSTDATE: {
        start: new Date("2025-08-19T00:00:00+07:00"),
        end: new Date("2025-08-19T23:59:59+07:00"),
      },
      RPKM: {
        start: new Date("2025-08-02T00:00:00+07:00"),
        end: new Date("2025-08-02T23:59:59+07:00"),
      },
      FRESHMENNIGHT: {
        start: new Date("2025-08-03T00:00:00+07:00"),
        end: new Date("2025-08-03T23:59:59+07:00"),
      },
    };
```

* feat: integrate get participant count from be

* fix: Changing By PM

* fix: Route.ts

* chore: update rpkm date

* feat: add workshop img, & minor stype fix

* refactor: use .webp instead

* feat: intagrate bottle of choice dialog

* refactor: fix typo

* feat: add shadow to divider component

* hot: member visualization

* fix: Remove *2

* fix: update goback href navbar for rpkm home

* feat: map error to message

* feat: change err msg to thai

* chore: bro when is real final data?

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

* feat: House Display

* feat: Update House Disable Picking

* fix: More Disable

* fix: Forget IG

* fix: More Disable

* fix: Remove YT

---------

Co-authored-by: Dhanavadh T. Saito <[email protected]>
Co-authored-by: neennera <[email protected]>
Co-authored-by: Thukdanai Thaothawin <[email protected]>
Co-authored-by: Borworntat Dendumrongkul <[email protected]>
Co-authored-by: BadLuckZ <[email protected]>
Co-authored-by: Peerapat Patcharamontree <[email protected]>
Co-authored-by: Naphat Seirak <[email protected]>
Co-authored-by: Peerapat Patcharamontree <[email protected]>
Co-authored-by: Borworntat Dendumrongkul <[email protected]>
BadLuckZ added a commit that referenced this pull request Jul 26, 2025
* 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] Staff-QR (#71)

* 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]>

* feat: getGroupByInviteCode

* fix: fest content

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

* add : checkin not found & remove freshmennight

* feat: joinGroup and leaveGroup

* add: fix event period

* fix: staff with navbar

* Update Routes.ts

* feat: add nonStartedRoutes time constraint whitelist

(cherry picked from commit 77bf8bf)

* fix : home & map unclickable

* fix: new Date()

* feat: getHousePref() + setHousePref()

* fix: qr load

* fix: adjust datatype

* fix: check in not found event

* fix: qa profile , firstdate register

* fix: Adjust data type again based on backend

* fix: Trust me - 0.5s delay can't avoid -1 people in the houses

* feat: Can get housePref

* feat: Get Houses with API

* feat: Submit Houses

* feat: Loading Icon

* fix: สำรองโคตรเล็ก พึ่งเห็น

* fix: Route.ts

* fix: edit profile

* chore: remove ig

* nothing: parse to <script>

* fix: Custom Size's color not only black

* fix: quest-3-x banner path

* fix: Change Card's gap

* [Feat][RPKM] Houses (#84)

* feat: getHousePref() + setHousePref()

* fix: adjust datatype

* fix: Adjust data type again based on backend

* fix: Trust me - 0.5s delay can't avoid -1 people in the houses

* feat: Can get housePref

* feat: Get Houses with API

* feat: Submit Houses

* feat: Loading Icon

* fix: สำรองโคตรเล็ก พึ่งเห็น

* fix: Route.ts

* fix: Custom Size's color not only black

* feat: Hidden Buttons for non-owner (Not sure for members)

* fix: Bugs from PM

* fix: Bugs Again

* fix: Bugs Again...

* feat: Join Group

* fix: Remove things

* feat: leaveGroup

* fix: Group UI

* fix: Route.ts

* fix: reload

* fix: Show that members can't pick group

* [Fix][RPKM] ฝันดีครับน้อง อุอิอิอา (#87)

* feat: getHousePref() + setHousePref()

* fix: adjust datatype

* fix: Adjust data type again based on backend

* fix: Trust me - 0.5s delay can't avoid -1 people in the houses

* feat: Can get housePref

* feat: Get Houses with API

* feat: Submit Houses

* feat: Loading Icon

* fix: สำรองโคตรเล็ก พึ่งเห็น

* fix: Route.ts

* nothing: parse to <script>

* fix: Custom Size's color not only black

* fix: Change Card's gap

* feat: Hidden Buttons for non-owner (Not sure for members)

* fix: Bugs from PM

* fix: Bugs Again

* fix: Bugs Again...

* feat: Join Group

* fix: Remove things

* feat: leaveGroup

* fix: Group UI

* fix: Route.ts

* fix: reload

* fix: Show that members can't pick group

* feat: added Freshmen night regis

- added fm night regis button for student role
- cleared hardcode for checking the opening event

* feat: added FM night link in navbar

- added fm night link to navbar

* fix: qrcode

* fix: EZ Quick Math

* fix: fix middleware potential bug

* chore: update workshops data

* feat: update workshop components

* feat: integrate workshops registration

* fix: fd bg to webp and staff home button

- changed firstdate bg to webp
- changed button in staff page

* feat: impl UI for user's registered workshops

* fix: changed to hardcoded event-period

- changed to hardcode event-period

```
const eventPeriods = {
      FIRSTDATE: {
        start: new Date("2025-08-19T00:00:00+07:00"),
        end: new Date("2025-08-19T23:59:59+07:00"),
      },
      RPKM: {
        start: new Date("2025-08-02T00:00:00+07:00"),
        end: new Date("2025-08-02T23:59:59+07:00"),
      },
      FRESHMENNIGHT: {
        start: new Date("2025-08-03T00:00:00+07:00"),
        end: new Date("2025-08-03T23:59:59+07:00"),
      },
    };
```

* feat: integrate get participant count from be

* fix: Changing By PM

* fix: Route.ts

* chore: update rpkm date

* feat: add workshop img, & minor stype fix

* refactor: use .webp instead

* feat: intagrate bottle of choice dialog

* refactor: fix typo

* feat: add shadow to divider component

* hot: member visualization

* fix: Remove *2

* fix: update goback href navbar for rpkm home

* feat: map error to message

* feat: change err msg to thai

* chore: bro when is real final data?

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

* feat: House Display

* feat: Update House Disable Picking

* fix: More Disable

* fix: Forget IG

* fix: More Disable

* fix: Remove YT

* fix: House Date

---------

Co-authored-by: Dhanavadh T. Saito <[email protected]>
Co-authored-by: neennera <[email protected]>
Co-authored-by: Thukdanai Thaothawin <[email protected]>
Co-authored-by: Borworntat Dendumrongkul <[email protected]>
Co-authored-by: Peerapat Patcharamontree <[email protected]>
Co-authored-by: Naphat Seirak <[email protected]>
Co-authored-by: Peerapat Patcharamontree <[email protected]>
Co-authored-by: RawSalmon <[email protected]>
Co-authored-by: Borworntat Dendumrongkul <[email protected]>
Co-authored-by: RawSalmon <[email protected]>
neennera added a commit that referenced this pull request Aug 4, 2025
* 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] Staff-QR (#71)

* 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]>

* feat: getGroupByInviteCode

* fix: fest content

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

* add : checkin not found & remove freshmennight

* feat: joinGroup and leaveGroup

* add: fix event period

* fix: staff with navbar

* Update Routes.ts

* feat: add nonStartedRoutes time constraint whitelist

(cherry picked from commit 77bf8bf)

* fix : home & map unclickable

* fix: new Date()

* feat: getHousePref() + setHousePref()

* fix: qr load

* fix: adjust datatype

* fix: check in not found event

* fix: qa profile , firstdate register

* fix: Adjust data type again based on backend

* fix: Trust me - 0.5s delay can't avoid -1 people in the houses

* feat: Can get housePref

* feat: Get Houses with API

* feat: Submit Houses

* feat: Loading Icon

* fix: สำรองโคตรเล็ก พึ่งเห็น

* fix: Route.ts

* fix: edit profile

* chore: remove ig

* nothing: parse to <script>

* fix: Custom Size's color not only black

* fix: quest-3-x banner path

* fix: Change Card's gap

* [Feat][RPKM] Houses (#84)

* feat: getHousePref() + setHousePref()

* fix: adjust datatype

* fix: Adjust data type again based on backend

* fix: Trust me - 0.5s delay can't avoid -1 people in the houses

* feat: Can get housePref

* feat: Get Houses with API

* feat: Submit Houses

* feat: Loading Icon

* fix: สำรองโคตรเล็ก พึ่งเห็น

* fix: Route.ts

* fix: Custom Size's color not only black

* feat: Hidden Buttons for non-owner (Not sure for members)

* fix: Bugs from PM

* fix: Bugs Again

* fix: Bugs Again...

* feat: Join Group

* fix: Remove things

* feat: leaveGroup

* fix: Group UI

* fix: Route.ts

* fix: reload

* fix: Show that members can't pick group

* [Fix][RPKM] ฝันดีครับน้อง อุอิอิอา (#87)

* feat: getHousePref() + setHousePref()

* fix: adjust datatype

* fix: Adjust data type again based on backend

* fix: Trust me - 0.5s delay can't avoid -1 people in the houses

* feat: Can get housePref

* feat: Get Houses with API

* feat: Submit Houses

* feat: Loading Icon

* fix: สำรองโคตรเล็ก พึ่งเห็น

* fix: Route.ts

* nothing: parse to <script>

* fix: Custom Size's color not only black

* fix: Change Card's gap

* feat: Hidden Buttons for non-owner (Not sure for members)

* fix: Bugs from PM

* fix: Bugs Again

* fix: Bugs Again...

* feat: Join Group

* fix: Remove things

* feat: leaveGroup

* fix: Group UI

* fix: Route.ts

* fix: reload

* fix: Show that members can't pick group

* feat: added Freshmen night regis

- added fm night regis button for student role
- cleared hardcode for checking the opening event

* feat: added FM night link in navbar

- added fm night link to navbar

* fix: qrcode

* fix: EZ Quick Math

* fix: fix middleware potential bug

* chore: update workshops data

* feat: update workshop components

* feat: integrate workshops registration

* fix: fd bg to webp and staff home button

- changed firstdate bg to webp
- changed button in staff page

* feat: impl UI for user's registered workshops

* fix: changed to hardcoded event-period

- changed to hardcode event-period

```
const eventPeriods = {
      FIRSTDATE: {
        start: new Date("2025-08-19T00:00:00+07:00"),
        end: new Date("2025-08-19T23:59:59+07:00"),
      },
      RPKM: {
        start: new Date("2025-08-02T00:00:00+07:00"),
        end: new Date("2025-08-02T23:59:59+07:00"),
      },
      FRESHMENNIGHT: {
        start: new Date("2025-08-03T00:00:00+07:00"),
        end: new Date("2025-08-03T23:59:59+07:00"),
      },
    };
```

* feat: integrate get participant count from be

* fix: Changing By PM

* fix: Route.ts

* chore: update rpkm date

* feat: add workshop img, & minor stype fix

* refactor: use .webp instead

* feat: intagrate bottle of choice dialog

* refactor: fix typo

* feat: add shadow to divider component

* hot: member visualization

* fix: Remove *2

* fix: update goback href navbar for rpkm home

* feat: map error to message

* feat: change err msg to thai

* chore: bro when is real final data?

* feat: House Display

* feat: Update House Disable Picking

* fix: More Disable

* fix: Forget IG

* fix: More Disable

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

* feat: House Display

* feat: Update House Disable Picking

* fix: More Disable

* fix: Forget IG

* fix: More Disable

* fix: Remove YT

* fix: House Date

* feat: Prepare to display group's house

* fix: Rename Field

* chore: remove everything 💥

* chore: 💥

* fix: button

---------

Co-authored-by: Dhanavadh T. Saito <[email protected]>
Co-authored-by: neennera <[email protected]>
Co-authored-by: Thukdanai Thaothawin <[email protected]>
Co-authored-by: BadLuckZ <[email protected]>
Co-authored-by: Peerapat Patcharamontree <[email protected]>
Co-authored-by: Naphat Seirak <[email protected]>
Co-authored-by: Peerapat Patcharamontree <[email protected]>
Co-authored-by: RawSalmon <[email protected]>
Co-authored-by: RawSalmon <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants