diff --git a/public/images/rpkm/houses/BaanJaew.png b/public/images/rpkm/houses/BaanJaew.png index d61ee1e..3f2cd08 100644 Binary files a/public/images/rpkm/houses/BaanJaew.png and b/public/images/rpkm/houses/BaanJaew.png differ diff --git a/src/components/rpkm/components/house-display.astro b/src/components/rpkm/components/house-display.astro index 7749c98..220ab95 100644 --- a/src/components/rpkm/components/house-display.astro +++ b/src/components/rpkm/components/house-display.astro @@ -1,9 +1,13 @@ --- +import { getHouses } from "@rpkm/data/house"; + import Frame from "@/components/common/Frame.astro"; import { getGroupByGroupId } from "@/lib/groupAPI"; import { getProfile } from "@/lib/profileAPI"; import type { Group, User } from "@/types/common"; +import type { HouseDisplayType } from "../data/house"; + const token = Astro.cookies.get("token")?.value; let groupData: Group | null = null; @@ -36,20 +40,24 @@ if (!groupData || !user) { return Astro.redirect("/login"); } -const assignedHouse = null; // Replace with actual house attribute +const houses = await getHouses(token); +let resultHouse: HouseDisplayType | null = null; + +const resultHouseId = groupData.resultHouseId; +if (resultHouseId) { + resultHouse = houses.find((house) => house.id === resultHouseId) || null; +} ---
{ - !assignedHouse ? ( + !resultHouse ? ( {/* Title */} -

- บ้านรับเพื่อนที่เลือกไว้ -

+

บ้านรับเพื่อนที่ได้

{/* Empty Houses */} -
+

คุณไม่ได้เลือกบ้าน

@@ -64,25 +72,32 @@ const assignedHouse = null; // Replace with actual house attribute {/* House Image */} - {/* House Name */} -

บ้าน xxx

+ {/* House TH Name */} +

+ {resultHouse.nameThai} +

+ + {/* House EN Name */} +

+ ({resultHouse.nameEng}) +

{/* House Instagram */}

- baan.something + {resultHouse.instagramName}

diff --git a/src/components/rpkm/data/date.ts b/src/components/rpkm/data/date.ts index d39c4c7..593b90c 100644 --- a/src/components/rpkm/data/date.ts +++ b/src/components/rpkm/data/date.ts @@ -1,2 +1,2 @@ export const disablePickingDate = new Date("2025-07-24T00:00:00+07:00"); -export const displayHouseDate = new Date("2025-07-27T19:00:00+07:00"); \ No newline at end of file +export const displayHouseDate = new Date("2025-07-27T19:00:00+07:00"); diff --git a/src/types/common.d.ts b/src/types/common.d.ts index e71ddac..91635f9 100644 --- a/src/types/common.d.ts +++ b/src/types/common.d.ts @@ -59,6 +59,7 @@ export interface Group { houseRank4: House | null; houseRank5: House | null; houseRankSub: House | null; + resultHouseId: string | null; owner: User; users: User[]; house1: House | null;