Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added public/images/rpkm/diffuser-workshop.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/rpkm/keychain-workshop.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 20 additions & 18 deletions src/components/common/Footer.astro
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ const footerGradient = bgGradient[variant].classes;
variant === "rpkm_summary" ||
variant === "rpkm_workshops" ||
variant === "rpkm_rubpuen") && (
<div class="flex h-fit min-h-[120px] w-full flex-col items-center bg-white p-4 pb-6">
<p class="font-semibold text-black">PRESENTED BY</p>
<div class="flex h-fit min-h-[120px] w-full flex-col items-center p-4 pb-6 backdrop-blur-sm">
<p class="font-semibold text-[rgba(255,255,255,0.5)]">PRESENTED BY</p>
<img
src="/images/rpkm/sponsor/logo-gangnam.png"
class="mt-2 mb-6 h-[60px] w-auto object-contain"
Expand Down Expand Up @@ -86,21 +86,23 @@ const footerGradient = bgGradient[variant].classes;
</div>

<!-- Contact -->
<div
class="flex w-full flex-col items-center justify-center bg-white py-4 text-black"
>
<p class="text-xl font-semibold">Contact Us</p>
<div class="flex flex-row gap-x-2">
<div class="mt-3 flex flex-col gap-y-1">
<img src="/common/isd-logo.svg" alt="ISD Logo" class="h-8 w-auto" />
<a
href="https://isd.sgcu.in.th"
target="_blank"
class="font-semibold underline"
>
Website
</a>
{
variant === "firstdate" && (
<div class="flex w-full flex-col items-center justify-center bg-white py-4 text-black">
<p class="text-xl font-semibold">Contact Us</p>
<div class="flex flex-row gap-x-2">
<div class="mt-3 flex flex-col gap-y-1">
<img src="/common/isd-logo.svg" alt="ISD Logo" class="h-8 w-auto" />
<a
href="https://isd.sgcu.in.th"
target="_blank"
class="font-semibold underline"
>
Website
</a>
</div>
</div>
</div>
</div>
</div>
)
}
</footer>
2 changes: 1 addition & 1 deletion src/components/rpkm/workshop/MyWorkshops.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default function MyWorkshops({
<h1 className="text-center text-3xl font-bold text-nowrap">
รอบกิจกรรมของคุณ
</h1>
<div className="flex gap-2">
<div className="flex gap-4">
{myWorkshopsData
.map((workshop) => getMyWorkshopByRpkmWorkshop(workshop))
.map((workshop, index) => (
Expand Down
5 changes: 4 additions & 1 deletion src/components/rpkm/workshop/WorkshopCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,10 @@ export default function WorkshopCard(workshop: WorkshopData): JSX.Element {
<RegisterSuccess
{...workshop}
workshopForm={formData}
onDismiss={dialogSuccess.closeAll}
onDismiss={() => {
dialogSuccess.closeAll();
window.location.reload();
}}
/>
</DialogBody>
</Dialog>
Expand Down
4 changes: 2 additions & 2 deletions src/data/rpkm-workshop/workshops.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export function getMyWorkshopByRpkmWorkshop(
case WorkshopType.KEYCHAIN:
return {
title: "Keychain",
imgUrl: "/images/rpkm/house-blank.png",
imgUrl: "/images/rpkm/keychain-workshop.webp",
date: keychainWorkshop.metaDate,
location: keychainWorkshop.metaLocation,
time:
Expand All @@ -74,7 +74,7 @@ export function getMyWorkshopByRpkmWorkshop(
case WorkshopType.DIFFUSER:
return {
title: "Diffuser",
imgUrl: "/images/rpkm/house-blank.png",
imgUrl: "/images/rpkm/diffuser-workshop.webp",
date: diffuserWorkshop.metaDate,
location: diffuserWorkshop.metaLocation,
time:
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/rpkm/WithNavbar.astro
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const backgroundImage = rpkmThemeConfigs[variant]?.backgroundImage;
class="mx-auto h-[136px] w-[301.182px]"
/>

<main class="flex-grow px-3 pb-12">
<main class="flex-grow px-3 pb-6">
<slot />
</main>
<Footer variant={variant} />
Expand Down
4 changes: 2 additions & 2 deletions src/pages/rpkm/home/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import Layout from "@/layouts/rpkm/WithNavbar.astro";
<div class="gap flex min-h-full w-full flex-col gap-8">
<h1 class="text-center text-4xl font-bold">รับเพื่อนก้าวใหม่ 2025</h1>

<div class="flex w-full flex-col items-center gap-5 pb-12">
<div class="flex w-full flex-col items-center gap-5 py-8">
<div class="flex flex-col items-center text-white">
<p class="text-2xl font-semibold">20 กรกฎาคม</p>
<p class="text-xl font-medium">เปิดลงทะเบียนบ้านรับเพื่อน</p>
</div>
<Divider />
<div class="flex flex-col items-center text-white">
<p class="text-2xl font-semibold">26 กรกฎาคม</p>
<p class="text-2xl font-semibold">27 กรกฎาคม</p>
<p class="text-xl font-medium">ประกาศผลบ้านรับเพื่อน</p>
</div>
<Divider />
Expand Down
8 changes: 7 additions & 1 deletion src/styles/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@
@import "tailwindcss";

@import "@fontsource-variable/orbitron";
@import "@fontsource/ibm-plex-sans-thai";
@import "@fontsource/ibm-plex-sans-thai/100.css";
@import "@fontsource/ibm-plex-sans-thai/200.css";
@import "@fontsource/ibm-plex-sans-thai/300.css";
@import "@fontsource/ibm-plex-sans-thai/400.css";
@import "@fontsource/ibm-plex-sans-thai/500.css";
@import "@fontsource/ibm-plex-sans-thai/600.css";
@import "@fontsource/ibm-plex-sans-thai/700.css";
@import "@fontsource/zen-dots";

@layer theme {
Expand Down
Loading