Merge pull request #221 from isd-sgcu/tee/use-moment-js

Tee/use moment js
isd-sgcu · Aug 4, 2024 · f91d7ac · f91d7ac
2 parents 9c1ddef + 6ba5403
commit f91d7ac
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -22,6 +22,7 @@
     "clsx": "^2.1.1",
     "dayjs": "^1.11.12",
     "framer-motion": "^11.3.8",
+    "moment": "^2.30.1",
     "next": "14.2.4",
     "next-image-zoom": "^1.1.7",
     "next-qrcode": "^2.5.1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/app/rpkm/staff/home/page.tsx b/src/app/rpkm/staff/home/page.tsx
@@ -10,8 +10,8 @@ import FailureModal from '@/components/rpkm/staff/home/qrscanner/failureModal';
 import ConfirmationModal from '@/components/rpkm/staff/home/qrscanner/confirmationModal';
 import { CheckIn } from '@/types/checkIn';
 import { FRESHYNIGHT_EVENT, RPKM_DAY_1, RPKM_DAY_2 } from '@/utils/date';
-import dayjs from 'dayjs';
 import StudentCodeInput from '@/components/rpkm/staff/home/qrscanner/StudentCodeInput';
+import moment from 'moment';
 
 function Page() {
   const [eventText, setEventText] = useState<string>('');
@@ -81,7 +81,7 @@ function Page() {
 
     if (newCheckInData) {
       if (newCheckInData.checkIn.isDuplicate) {
-        const date = dayjs(newCheckInData.checkIn.timestamp);
+        const date = moment(newCheckInData.checkIn.timestamp);
         setStatus('error');
         setError(
           <div>