Merge pull request #210 from isd-sgcu/main

remove duplicate checkin
isd-sgcu · Aug 3, 2024 · cdba5cc · cdba5cc
2 parents 6692cf5 + 88dc77c
commit cdba5cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/src/components/rpkm/staff/home/qrscanner/QRScanner.tsx b/src/components/rpkm/staff/home/qrscanner/QRScanner.tsx
@@ -7,7 +7,6 @@ import ConfirmationModal from './confirmationModal';
 import FailureModal from './failureModal';
 import { createCheckIn } from '@/utils/checkin';
 import { CheckIn } from '@/types/checkIn';
-import dayjs from 'dayjs';
 import { getCurrentTime } from '@/utils/time';
 
 const Scan: React.FC = () => {
@@ -61,7 +60,7 @@ const Scan: React.FC = () => {
     localStorage.setItem('enable', 'false');
 
     if (newCheckInData) {
-      if (newCheckInData.checkIn.isDuplicate) {
+      /*  if (newCheckInData.checkIn.isDuplicate) {
         const date = dayjs(newCheckInData.checkIn.timestamp);
         setStatus('error');
         setError(
@@ -74,7 +73,7 @@ const Scan: React.FC = () => {
         setErrorTopic('Already taken!');
         setTaken(true);
         return;
-      }
+      } */
 
       setCheckInData(newCheckInData);
       setStatus('success');

diff --git a/src/context/AuthContext.tsx b/src/context/AuthContext.tsx
@@ -86,13 +86,6 @@ const AuthProvider: React.FC<{ children: ReactNode }> = ({
         if (!isStaffPage) {
           return router.push(homePage);
         }
-
-        if (
-          (isRpkm && !path.includes('rpkm')) ||
-          (!isRpkm && !path.includes('firstdate'))
-        ) {
-          return router.push(homePage);
-        }
       } else {
         // user route protection
         if (path == '/') {