From cd21cb72f05251da67dded3b72673a17659cb521 Mon Sep 17 00:00:00 2001
From: Borworntat Dendurongkul <mastericez890@gmail.com>
Date: Sun, 21 Jul 2024 14:04:42 +0700
Subject: [PATCH 1/7] fix: typo

---
 src/app/rpkm/activities/details/community/page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/rpkm/activities/details/community/page.tsx b/src/app/rpkm/activities/details/community/page.tsx
index 8245d094..a8adf793 100644
--- a/src/app/rpkm/activities/details/community/page.tsx
+++ b/src/app/rpkm/activities/details/community/page.tsx
@@ -71,7 +71,7 @@ const Page = () => {
           </p>
           <h3 className="font-semibold pt-2"> การแลกรับของที่ระลึก</h3>
           <p>
-            &emsp;การแลกกแต้มเพื่อรับของที่ระลึก เมื่อเเต้มครบ 10 เเต้ม
+            &emsp;การแลกแต้มเพื่อรับของที่ระลึก เมื่อเเต้มครบ 10 เเต้ม
             สามารถกดเเลกเป็นคูปองไว้ได้เลย เมื่อจะเเลกคูปอง
             ก็ให้ไปที่บูธกิจกรรมชุมชนในงานรับเพื่อนก้าวใหม่ (3-4 สิงหาคม)
             เเละศาลเจ้าเเม่ทับทิมสะพานเหลือง

From 841581af0e1716425cc68eb704f3d5fff2461510 Mon Sep 17 00:00:00 2001
From: Borworntat Dendurongkul <mastericez890@gmail.com>
Date: Sun, 21 Jul 2024 14:10:20 +0700
Subject: [PATCH 2/7] chore: enable sidebar

---
 src/components/rpkm/Sidebar/Menu.tsx | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/components/rpkm/Sidebar/Menu.tsx b/src/components/rpkm/Sidebar/Menu.tsx
index 439013af..d2500bf0 100644
--- a/src/components/rpkm/Sidebar/Menu.tsx
+++ b/src/components/rpkm/Sidebar/Menu.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-// import { Accordion, AccordionItem } from '@nextui-org/accordion';
+import { Accordion, AccordionItem } from '@nextui-org/accordion';
 import Link from 'next/link';
 import { Icon } from '@iconify/react/dist/iconify.js';
 import { useAuth } from '@/context/AuthContext';
@@ -21,7 +21,7 @@ function Menu() {
         ลงทะเบียน Freshy Night
       </Link> */}
       <div className="w-full h-px bg-black"></div>
-      <Link
+      {/* <Link
         href={'/rpkm/activities/home'}
         className="mt-2"
       >
@@ -32,9 +32,9 @@ function Menu() {
         className=""
       >
         เเผนที่
-      </Link>
+      </Link> */}
       <div className="w-full -px-2">
-        {/* <Accordion
+        <Accordion
           selectionMode="multiple"
           className="text-start self-start px-0"
         >
@@ -44,18 +44,18 @@ function Menu() {
             title={<div className="py-0">กิจกรรม</div>}
           >
             <div className="flex flex-col w-full justify-items-start text-sm px-xs">
-              <Link
+              {/* <Link
                 href="/rpkm/activities/"
                 className="text-left"
               >
                 กิจกรรมในงาน
               </Link>
               <Link
-                href="/rpkm/baan/home"
+                href="/rpkm/activities/"
                 className="text-left"
               >
-                ข้อมูลแต่ละบ้าน
-              </Link>
+                กิจกรรม Walk Rally
+              </Link> */}
               <Link
                 href="/rpkm/activities/"
                 className="text-left"
@@ -63,10 +63,10 @@ function Menu() {
                 กิจกรรมชุมชน
               </Link>
               <Link
-                href="/rpkm/activities/"
+                href="/rpkm/baan/home"
                 className="text-left"
               >
-                กิจกรรม Walk Rally
+                ข้อมูลแต่ละบ้าน
               </Link>
             </div>
           </AccordionItem>
@@ -77,20 +77,20 @@ function Menu() {
           >
             <div className="flex flex-col w-full justify-items-start text-sm px-xs">
               <Link
-                href="/"
+                href="/rpkm/activities/map"
                 className="text-left"
               >
                 ข้อมูลที่จัดแต่ละกิจกรรม
               </Link>
-              <Link
+              {/* <Link
                 href="/rpkm/activities/"
                 className="text-left"
               >
                 กิจกรรมชุมชน
-              </Link>
+              </Link> */}
             </div>
           </AccordionItem>
-        </Accordion> */}
+        </Accordion>
       </div>
       <div className="mt-auto">
         <div className="w-full h-px bg-black"></div>

From 43da95094702cbbb3ecbd55d0382800dddb3793e Mon Sep 17 00:00:00 2001
From: Borworntat Dendurongkul <mastericez890@gmail.com>
Date: Sun, 21 Jul 2024 14:18:10 +0700
Subject: [PATCH 3/7] feat: gray disabled

---
 src/components/rpkm/Sidebar/Menu.tsx | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/rpkm/Sidebar/Menu.tsx b/src/components/rpkm/Sidebar/Menu.tsx
index d2500bf0..3a3d3a36 100644
--- a/src/components/rpkm/Sidebar/Menu.tsx
+++ b/src/components/rpkm/Sidebar/Menu.tsx
@@ -44,18 +44,18 @@ function Menu() {
             title={<div className="py-0">กิจกรรม</div>}
           >
             <div className="flex flex-col w-full justify-items-start text-sm px-xs">
-              {/* <Link
-                href="/rpkm/activities/"
-                className="text-left"
+              <div
+                // href="/rpkm/activities/"
+                className="text-left text-gray-400 cursor-not-allowed"
               >
                 กิจกรรมในงาน
-              </Link>
-              <Link
-                href="/rpkm/activities/"
-                className="text-left"
+              </div>
+              <div
+                // href="/rpkm/activities/"
+                className="text-left text-gray-400 cursor-not-allowed"
               >
                 กิจกรรม Walk Rally
-              </Link> */}
+              </div>
               <Link
                 href="/rpkm/activities/"
                 className="text-left"
@@ -82,12 +82,12 @@ function Menu() {
               >
                 ข้อมูลที่จัดแต่ละกิจกรรม
               </Link>
-              {/* <Link
-                href="/rpkm/activities/"
-                className="text-left"
+              <div
+                // href="/rpkm/activities/"
+                className="text-left text-gray-400 cursor-not-allowed"
               >
                 กิจกรรมชุมชน
-              </Link> */}
+              </div>
             </div>
           </AccordionItem>
         </Accordion>

From b599c1cebc146d946b426dfffe9aeb77b55f52e4 Mon Sep 17 00:00:00 2001
From: Borworntat Dendurongkul <mastericez890@gmail.com>
Date: Sun, 21 Jul 2024 14:26:52 +0700
Subject: [PATCH 4/7] fix: accordian size

---
 src/components/rpkm/Sidebar/Menu.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/rpkm/Sidebar/Menu.tsx b/src/components/rpkm/Sidebar/Menu.tsx
index 3a3d3a36..24174ea3 100644
--- a/src/components/rpkm/Sidebar/Menu.tsx
+++ b/src/components/rpkm/Sidebar/Menu.tsx
@@ -37,6 +37,7 @@ function Menu() {
         <Accordion
           selectionMode="multiple"
           className="text-start self-start px-0"
+          isCompact={true}
         >
           <AccordionItem
             key="1"
@@ -57,7 +58,7 @@ function Menu() {
                 กิจกรรม Walk Rally
               </div>
               <Link
-                href="/rpkm/activities/"
+                href="/rpkm/activities/details/community"
                 className="text-left"
               >
                 กิจกรรมชุมชน

From 0876339311825b4b7ff7fc68f5f79f5731527bd6 Mon Sep 17 00:00:00 2001
From: Borworntat Dendurongkul <mastericez890@gmail.com>
Date: Sun, 21 Jul 2024 14:32:03 +0700
Subject: [PATCH 5/7] fix: map title padding

---
 src/app/rpkm/activities/map/page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/rpkm/activities/map/page.tsx b/src/app/rpkm/activities/map/page.tsx
index 686be50d..b8d1a25c 100644
--- a/src/app/rpkm/activities/map/page.tsx
+++ b/src/app/rpkm/activities/map/page.tsx
@@ -11,7 +11,7 @@ const page = () => {
     <section className="min-h-screen bg-[url('/rpkm/activities/small-background.png')] bg-cover bg-[#EAE3C3] text-black">
       <Navbar />
       <div className="flex justify-center -mb-20">
-        <div className="flex flex-col items-center gap-y-1 pt-16">
+        <div className="flex flex-col items-center gap-y-1 pt-4">
           <h1
             className="font-sopha text-[20vh] text-rpkm-pink tracking-wide"
             style={{

From 0689d5cc85ec07ea372ec53695a75ea6e9a1e0cd Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Mon, 22 Jul 2024 00:48:19 +0700
Subject: [PATCH 6/7] use ntp time

---
 src/app/rpkm/activities/details/baan/page.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/rpkm/activities/details/baan/page.tsx b/src/app/rpkm/activities/details/baan/page.tsx
index 48467e73..a85e75ad 100644
--- a/src/app/rpkm/activities/details/baan/page.tsx
+++ b/src/app/rpkm/activities/details/baan/page.tsx
@@ -9,13 +9,14 @@ import ActivityButton from '@/components/rpkm/Activities/ActivityButton';
 
 import BackButton from '@public/rpkm/activities/back.svg';
 import BaanImage from '@public/rpkm/activities/baanbackground.png';
+import { getCurrentTime } from '@/utils/time';
 
 const Page = () => {
   const [selectBannAble, setSelectBannAble] = useState<boolean>(false);
 
   useEffect(() => {
-    const interval = setInterval(() => {
-      const currentTime = new Date();
+    const interval = setInterval(async () => {
+      const currentTime = (await getCurrentTime()).currentTime;
       const eventTime = new Date('2024-07-24T23:59:59+07:00');
       if (currentTime <= eventTime) {
         setSelectBannAble(true);

From cf24b7e97f7a0480c98a73b353c9fae8d0c531e7 Mon Sep 17 00:00:00 2001
From: teegoood <teegooodgood@gmail.com>
Date: Mon, 22 Jul 2024 00:50:05 +0700
Subject: [PATCH 7/7] add community activities

---
 src/app/rpkm/activities/home/page.tsx |  8 ++++----
 src/components/rpkm/Sidebar/Menu.tsx  | 14 ++++++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/app/rpkm/activities/home/page.tsx b/src/app/rpkm/activities/home/page.tsx
index 1df0e81e..de202e2e 100644
--- a/src/app/rpkm/activities/home/page.tsx
+++ b/src/app/rpkm/activities/home/page.tsx
@@ -6,7 +6,7 @@ import Divider from '@/components/rpkm/Activities/Divider';
 
 // import ActivitiesBanner from '@public/rpkm/activities/activities.png';
 // import WalkRallyBanner from '@public/rpkm/activities/walkrally.png';
-// import CommunityBanner from '@public/rpkm/activities/community.png';
+import CommunityBanner from '@public/rpkm/activities/community.png';
 import BaanBanner from '@public/rpkm/activities/baan.png';
 
 // import activities from '@/data/activities';
@@ -81,8 +81,8 @@ const page = () => {
           >
             ดูทั้งหมด
           </Link> */}
-          {/* <Divider /> */}
-          {/* <Banner image={CommunityBanner} />
+          <Divider />
+          <Banner image={CommunityBanner} />
           <div className="justify-center flex">
             <Card
               name="กิจกรรมชุมชน"
@@ -94,7 +94,7 @@ const page = () => {
               className="w-[80vw]"
               contentClassName="line-clamp-3"
             />
-          </div> */}
+          </div>
           {/* <Link
             className="text-sm font-semibold flex justify-end underline mr-4 mt-2"
             href="/rpkm/activities/community"
diff --git a/src/components/rpkm/Sidebar/Menu.tsx b/src/components/rpkm/Sidebar/Menu.tsx
index 24174ea3..79d764eb 100644
--- a/src/components/rpkm/Sidebar/Menu.tsx
+++ b/src/components/rpkm/Sidebar/Menu.tsx
@@ -42,9 +42,15 @@ function Menu() {
           <AccordionItem
             key="1"
             aria-label="Accordion 1"
-            title={<div className="py-0">กิจกรรม</div>}
+            title={<div className="">กิจกรรม</div>}
           >
-            <div className="flex flex-col w-full justify-items-start text-sm px-xs">
+            <div className="flex flex-col w-full justify-items-start text-sm px-2 -mt-2">
+              <Link
+                href={'/rpkm/activities/home'}
+                className="py-0"
+              >
+                หน้าหลัก
+              </Link>
               <div
                 // href="/rpkm/activities/"
                 className="text-left text-gray-400 cursor-not-allowed"
@@ -64,7 +70,7 @@ function Menu() {
                 กิจกรรมชุมชน
               </Link>
               <Link
-                href="/rpkm/baan/home"
+                href="/rpkm/baan/baan-select"
                 className="text-left"
               >
                 ข้อมูลแต่ละบ้าน
@@ -76,7 +82,7 @@ function Menu() {
             aria-label="Accordion 2"
             title={<div>แผนที่</div>}
           >
-            <div className="flex flex-col w-full justify-items-start text-sm px-xs">
+            <div className="flex flex-col w-full justify-items-start text-sm px-2 -mt-2">
               <Link
                 href="/rpkm/activities/map"
                 className="text-left"