fix route protect bug and change Sidebar

isd-sgcu · Jul 24, 2024 · 6be846f · 6be846f
1 parent 75fc890
commit 6be846f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/src/app/rpkm/activities/details/community/page.tsx b/src/app/rpkm/activities/details/community/page.tsx
@@ -88,6 +88,7 @@ const Page = () => {
           href="https://lin.ee/i9Ezhg7"
           borderClassName="bg-rpkm-cream"
           backgroundClassName="bg-rpkm-green text-center text-lg text-rpkm-gray w-[60vw]"
+          target="_self"
         >
           Line OA ของกิจกรรม
         </ActivityButton>

diff --git a/src/app/rpkm/activities/map/page.tsx b/src/app/rpkm/activities/map/page.tsx
@@ -28,7 +28,7 @@ const page = () => {
                 '1.5px 1.5px 0 #000, -1.5px -1.5px 0 #000, 1.5px -1.5px 0 #000, -1.5px 1.5px 0 #000',
             }}
           >
-            ข้อมูลที่จัดแต่ละกิจกรรม
+            กิจกรรมชุมชน
           </h2>
         </div>
       </div>

diff --git a/src/components/rpkm/Sidebar/Menu.tsx b/src/components/rpkm/Sidebar/Menu.tsx
@@ -9,8 +9,8 @@ function Menu() {
   return (
     <div className="w-full h-full text-left  font-medium flex flex-col pb-[5vh]">
       <Link
-        href="/rpkm/baan/home"
-        className="text-left"
+        href=""
+        className="text-left cursor-not-allowed text-gray-400"
       >
         ลงทะเบียนเลือกบ้าน
       </Link>
@@ -82,19 +82,19 @@ function Menu() {
             aria-label="Accordion 2"
             title={<div>แผนที่</div>}
           >
-            <div className="flex flex-col w-full justify-items-start text-sm px-2 -mt-2">
+            <div className="flex flex-col w-full justify-items-start text-sm px-2 -mt-2 ">
+              <div
+                //href="/rpkm/activities/map"
+                className="text-left text-gray-400 cursor-not-allowed"
+              >
+                ข้อมูลที่จัดแต่ละกิจกรรม
+              </div>
               <Link
                 href="/rpkm/activities/map"
                 className="text-left"
-              >
-                ข้อมูลที่จัดแต่ละกิจกรรม
-              </Link>
-              <div
-                // href="/rpkm/activities/"
-                className="text-left text-gray-400 cursor-not-allowed"
               >
                 กิจกรรมชุมชน
-              </div>
+              </Link>
             </div>
           </AccordionItem>
         </Accordion>

diff --git a/src/context/AuthContext.tsx b/src/context/AuthContext.tsx
@@ -121,6 +121,18 @@ const AuthProvider: React.FC<{ children: ReactNode }> = ({
           );
           const now = (await getCurrentTime()).currentTime;
 
+          console.log(
+            'now',
+            now,
+            'firstdate',
+            firstdate,
+            'startRPKM',
+            startRPKM,
+            'endBannSelect',
+            endBannSelect,
+            'freshyNight',
+            freshyNight
+          );
           //firstdate
           if (path.includes('firstdate')) {
             if (now < firstdate) {
@@ -135,7 +147,7 @@ const AuthProvider: React.FC<{ children: ReactNode }> = ({
             }
 
             // end baan select
-            if (path.includes('/baan')) {
+            if (path.includes('rpkm/baan')) {
               if (now > endBannSelect) {
                 return router.push('/rpkm/activities/home');
               }
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ const page = () => { @@
                     '1.5px 1.5px 0 #000, -1.5px -1.5px 0 #000, 1.5px -1.5px 0 #000, -1.5px 1.5px 0 #000',
                 }}
               >
-                ข้อมูลที่จัดแต่ละกิจกรรม
+                กิจกรรมชุมชน
               </h2>
             </div>
           </div>
@@ Expand Down @@