From d1d9ecb4ec4da6f4ee99c842cae14ce789c7585a Mon Sep 17 00:00:00 2001 From: BaniHillabi Date: Thu, 11 Jul 2024 17:24:50 +0700 Subject: [PATCH] fix(frontend): fix ui bugs --- next.config.mjs | 8 +++++++- src/actions/registrationForm.ts | 2 +- .../dashboard/components/ProfileTim.tsx | 19 ++++++++++++------- .../components/parts/AnggotaCard.tsx | 2 +- .../dashboard/components/parts/Countdown.tsx | 2 +- src/app/(main)/dashboard/page.tsx | 2 ++ src/app/(main)/layout.tsx | 1 + src/app/components/global/Navbar.tsx | 2 +- src/app/components/global/SubmitButton.tsx | 4 ++-- 9 files changed, 28 insertions(+), 14 deletions(-) diff --git a/next.config.mjs b/next.config.mjs index 4678774..69dfa57 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -1,4 +1,10 @@ /** @type {import('next').NextConfig} */ -const nextConfig = {}; +const nextConfig = { + experimental:{ + serverActions:{ + bodySizeLimit:'5mb' + } + } +}; export default nextConfig; diff --git a/src/actions/registrationForm.ts b/src/actions/registrationForm.ts index 09c7d80..41bde04 100644 --- a/src/actions/registrationForm.ts +++ b/src/actions/registrationForm.ts @@ -19,7 +19,7 @@ export default async function submitFormRegistrasi( const tipe_pembayaran = data.get("tipe-pembayaran") as string; const no_pelatih = data.get("no-pelatih") as string; - const timCount = (await findTims({ jenjang: jenjang })).length; + const timCount = (await findTims({ jenjang: jenjang, confirmed: true })).length; if (timCount >= 30) return { success: false, message: `Kuota jenjang ${jenjang} telah penuh!` }; diff --git a/src/app/(main)/dashboard/components/ProfileTim.tsx b/src/app/(main)/dashboard/components/ProfileTim.tsx index 05739c1..9de3700 100644 --- a/src/app/(main)/dashboard/components/ProfileTim.tsx +++ b/src/app/(main)/dashboard/components/ProfileTim.tsx @@ -5,6 +5,7 @@ import SectionWrapper from "@/app/components/global/Wrapper"; import { TimWithRelations } from "@/types/entityRelations"; import { ReactNode, useState } from "react"; import { AnggotaCard } from "./parts/AnggotaCard"; +import cn from "@/lib/clsx"; const rowsMapNormal = [ ["b1s1", "b1s2", "b1s3"], @@ -24,9 +25,9 @@ const sizeMap = { NORMAL: 15, }; -function AnggotaCardsWrapper({ children }: Readonly<{ children: ReactNode }>) { +function AnggotaCardsWrapper({ children,className }: Readonly<{ children: ReactNode,className?:string }>) { return ( -
{children}
+
{children}
); } @@ -61,7 +62,7 @@ function TimLayout({ tim }: Readonly<{ tim: TimWithRelations }>) {
{tim.jenjang === "SMP" && ( - + ) { )}
- + ) { {tim.tipe_tim === "NORMAL" ? rowsMapNormal.map((row, i) => ( - + {row.map((pos, i) => { const anggotaInPos = anggotas.find( (value) => value.posisi === pos.toUpperCase() @@ -126,7 +127,7 @@ function TimLayout({ tim }: Readonly<{ tim: TimWithRelations }>) { )) : rowsMapSmall.map((row, i) => ( - + {row.map((pos, i) => { const anggotaInPos = anggotas.find( (value) => value.posisi === pos.toUpperCase() @@ -188,7 +189,11 @@ export default function ProfileTim({ {tim.confirmed ? "Sudah" : "Belum"}

- + {tim.confirmed ? : ( + +

Silahkan untuk menunggu konfirmasi pembayaran dari admin

+ + )} ); diff --git a/src/app/(main)/dashboard/components/parts/AnggotaCard.tsx b/src/app/(main)/dashboard/components/parts/AnggotaCard.tsx index a749e1a..bef8e1e 100644 --- a/src/app/(main)/dashboard/components/parts/AnggotaCard.tsx +++ b/src/app/(main)/dashboard/components/parts/AnggotaCard.tsx @@ -19,7 +19,7 @@ export function AnggotaCard({ return (

Waktu Tersisa Sebelum Hari-H

-
+
diff --git a/src/app/(main)/dashboard/page.tsx b/src/app/(main)/dashboard/page.tsx index 8d35adb..c08cd4b 100644 --- a/src/app/(main)/dashboard/page.tsx +++ b/src/app/(main)/dashboard/page.tsx @@ -4,6 +4,8 @@ import { redirect } from "next/navigation"; import Heading from "./components/Heading"; import ProfileTim from "./components/ProfileTim"; import { TimWithRelations } from "@/types/entityRelations"; +import { H3 } from "@/app/components/global/Text"; +import SectionWrapper from "@/app/components/global/Wrapper"; export default async function TimDashboard() { const session = await getServerSession(); diff --git a/src/app/(main)/layout.tsx b/src/app/(main)/layout.tsx index b7e8f87..fb2b3b2 100644 --- a/src/app/(main)/layout.tsx +++ b/src/app/(main)/layout.tsx @@ -9,6 +9,7 @@ export default function MainLayout({ return ( <> + {/*
*/}
{children}