Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
dd16c0b
feat: getHousePref() + setHousePref()
BadLuckZ Jul 17, 2025
4657972
fix: adjust datatype
BadLuckZ 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
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
5cf263b
fix: Change Card's gap
BadLuckZ 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
ac4b188
Merge remote-tracking branch 'origin/dev' into feat/rpkm/groupAPI
BadLuckZ Jul 19, 2025
2df5102
fix: EZ Quick Math
BadLuckZ Jul 19, 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
4 changes: 2 additions & 2 deletions src/components/rpkm/components/house-picker.astro
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ const isPickAllMainHouses =
<div class="flex justify-between items-center">
<div class="flex items-center text-[8px] gap-[1px]">
<p class="text-[#313131E5]">
<span style="color: ${house.chosenCount == house.capacity ? "#FF1493" : "#68A987"};">${house.chosenCount}</span>/${house.capacity}
<span style="color: ${house.chosenCount * 2 >= house.capacity ? "#FF1493" : "#68A987"};">${house.chosenCount * 2}</span>/${house.capacity}
</p>
<img src="/images/rpkm/person-icon.svg" width="12" height="12" />
</div>
Expand Down Expand Up @@ -917,7 +917,7 @@ const isPickAllMainHouses =
const houseAmount = housePopup?.querySelector("#house-amount");
const houseCapacity = housePopup?.querySelector("#house-capacity");
if (houseAmount && houseCapacity) {
houseAmount.textContent = house.chosenCount;
houseAmount.textContent = house.chosenCount * 2;
houseCapacity.textContent = house.capacity;
houseAmount.style.color =
house.amount == house.capacity ? "#FF1493" : "#68A987";
Expand Down
4 changes: 2 additions & 2 deletions src/components/rpkm/elements/house-detail-card.astro
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ if (!colorData) {
<div class="flex items-center gap-[1px] text-[8px]">
<p class="text-[#313131E5]">
<span
style={`color: ${chosenCount == capacity ? "#FF1493" : "#68A987"};`}
>{chosenCount}</span
style={`color: ${chosenCount * 2 >= capacity ? "#FF1493" : "#68A987"};`}
>{chosenCount * 2}</span
>/{capacity}
</p>
<img src="/images/rpkm/person-icon.svg" width="12" height="12" />
Expand Down
Loading