From ead4913514c9da8388e6d841f20a01fc02f78756 Mon Sep 17 00:00:00 2001
From: Bagasbanuna02 <bagasbanuna02@gmail.com>
Date: Mon, 9 Dec 2024 17:29:32 +0800
Subject: [PATCH 1/3] Fix event Deskripsi: - Fix konfirmasi event

---
 src/app_modules/event/_ui/konfirmasi.tsx | 67 ++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 3 deletions(-)

diff --git a/src/app_modules/event/_ui/konfirmasi.tsx b/src/app_modules/event/_ui/konfirmasi.tsx
index 2062d1b0..bc243cc1 100644
--- a/src/app_modules/event/_ui/konfirmasi.tsx
+++ b/src/app_modules/event/_ui/konfirmasi.tsx
@@ -20,6 +20,7 @@ import { Event_funJoinAndConfirmEvent } from "../fun/create/fun_join_and_confirm
 import { gs_event_hotMenu } from "../global_state";
 import { MODEL_EVENT } from "../model/interface";
 import { Event_funJoinEvent } from "../fun/create/fun_join_event";
+import "moment/locale/id";
 
 export default function Ui_Konfirmasi({
   userLoginId,
@@ -88,7 +89,7 @@ export default function Ui_Konfirmasi({
     );
   }
 
-  // Jika tanggal acara lewat
+  // Jika tanggal acara sudah lewat
   if (moment(data?.tanggalSelesai).diff(moment(), "minute") < 0) {
     return (
       <>
@@ -97,6 +98,15 @@ export default function Ui_Konfirmasi({
     );
   }
 
+  // Jika join true
+  if (isJoin == true && moment(data?.tanggal).diff(moment(), "minute") > 0) {
+    return (
+      <>
+        <UserJoinTrue title={data?.title} tanggal={data?.tanggal} />
+      </>
+    );
+  }
+
   // Jika belum join dan tanggal mulai acara belum lewat
   if (isJoin == false && moment(data?.tanggal).diff(moment(), "minute") > 0) {
     return (
@@ -125,8 +135,13 @@ export default function Ui_Konfirmasi({
     );
   }
 
-  // Jika sudah join, belum konfirm dan acara sudah mulai
-  if (isPresent && moment(data?.tanggal).diff(moment(), "minute") < 0) {
+  // Jika sudah join, sudah konfirmasi dan tanggal mulai acara sudah lewat
+  // if (isPresent && moment(data?.tanggal).diff(moment(), "minute") < 0)
+  if (
+    isPresent &&
+    isJoin &&
+    moment(data?.tanggal).diff(moment(), "minute") < 0
+  ) {
     return <UserAlreadyConfirm title={data.title} />;
   }
 
@@ -199,6 +214,52 @@ function SkeletonIsDataNull() {
   );
 }
 
+function UserJoinTrue({ title, tanggal }: { title: string; tanggal: Date }) {
+  const router = useRouter();
+  const [isLoading, setLoading] = useState(false);
+  const [hotMenu, setHotMenu] = useAtom(gs_event_hotMenu);
+
+  return (
+    <>
+      <UIGlobal_LayoutDefault>
+        <Stack h={"100vh"} justify="center">
+          <ComponentGlobal_CardStyles>
+            <Stack align="center" justify="center">
+              <Text align="center">
+                Terima kasih, Bapak/Ibu, Anda telah berhasil bergabung dalam
+                acara{" "}
+                <Text inherit span fw={"bold"}>
+                  {title}
+                </Text>{" "}
+                . Mohon ditunggu hingga tanggal{" "}
+                <Text inherit span fw={"bold"}>
+                  {moment(tanggal).format("DD-MM-YYYY")}
+                </Text>{" "}
+                untuk melakukan konfirmasi kehadiran melalui aplikasi HIPMI APP.
+              </Text>
+
+              <Button
+                loading={isLoading}
+                loaderPosition="center"
+                radius={"xl"}
+                color="green"
+                c={"black"}
+                onClick={() => {
+                  setHotMenu(0);
+                  setLoading(true);
+                  router.push(RouterEvent.beranda, { scroll: false });
+                }}
+              >
+                Beranda
+              </Button>
+            </Stack>
+          </ComponentGlobal_CardStyles>
+        </Stack>
+      </UIGlobal_LayoutDefault>
+    </>
+  );
+}
+
 function UserAllowToJoin({
   title,
   tanggal,

From a48a9ca99d05b91613db5d30dc4ae47d9a7740ed Mon Sep 17 00:00:00 2001
From: Bagasbanuna02 <bagasbanuna02@gmail.com>
Date: Mon, 9 Dec 2024 17:29:56 +0800
Subject: [PATCH 2/3] chore(release): 1.2.21

---
 CHANGELOG.md | 2 ++
 package.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbad195b..73e2314d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.2.21](https://github.com/bipproduction/hipmi/compare/v1.2.20...v1.2.21) (2024-12-09)
+
 ## [1.2.20](https://github.com/bipproduction/hipmi/compare/v1.2.19...v1.2.20) (2024-12-09)
 
 ## [1.2.19](https://github.com/bipproduction/hipmi/compare/v1.2.18...v1.2.19) (2024-12-06)
diff --git a/package.json b/package.json
index b47b092a..7f57f862 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hipmi",
-  "version": "1.2.20",
+  "version": "1.2.21",
   "private": true,
   "prisma": {
     "seed": "npx tsx prisma/seed.ts --yes"

From bfddf58caaaed1e5573a080c865e0614d9e433ad Mon Sep 17 00:00:00 2001
From: Bagasbanuna02 <bagasbanuna02@gmail.com>
Date: Mon, 9 Dec 2024 17:30:30 +0800
Subject: [PATCH 3/3] Fix version 1.2.21

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7f57f862..ae8b1fa2 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "prisma": {
     "seed": "npx tsx prisma/seed.ts --yes"
-  },
+  }, 
   "scripts": {
     "dev": "bun --bun run next dev --experimental-https",
     "build": "NODE_OPTIONS='--max-old-space-size=2048' bun --bun run next build",