Merge pull request #197 from isd-sgcu/main

update main to dev
isd-sgcu · Jul 30, 2024 · fdccd72 · fdccd72
2 parents f946fdb + 9634347
commit fdccd72
Show file tree

Hide file tree

Showing 13 changed files with 576 additions and 56 deletions.
diff --git a/public/rpkm/freshy-night/confirm-register/modal-bg.svg b/public/rpkm/freshy-night/confirm-register/modal-bg.svg
diff --git a/src/app/(main)/page.tsx b/src/app/(main)/page.tsx
@@ -62,7 +62,14 @@ function Login() {
     let newPath;
 
     if (isStaff) {
-      newPath = isRegistered ? '/firstdate/staff/home' : '/staff/register';
+      const isRpkm =
+        new Date(process.env.NEXT_PUBLIC_RPKM_DAY_1 as string) < new Date();
+
+      newPath = !isRegistered
+        ? '/staff/register'
+        : isRpkm
+          ? '/rpkm/staff/home'
+          : '/firstdate/staff/home';
     } else {
       newPath = isRegistered ? '/home' : '/register';
     }

diff --git a/src/app/(main)/staff/register/page.tsx b/src/app/(main)/staff/register/page.tsx
@@ -121,8 +121,10 @@ export default function Register() {
         if (!user) return;
         toast.success('ลงทะเบียนสำเร็จ');
 
-        const isStaff = user.role == 'staff';
-        const newPath = isStaff ? '/firstdate/staff/home' : '/register-done';
+        const isRpkm =
+          new Date(process.env.NEXT_PUBLIC_RPKM_DAY_1 as string) < new Date();
+
+        const newPath = isRpkm ? '/rpkm/staff/home' : '/firstdate/staff/home';
 
         await resetContext();
         router.push(newPath);