diff --git a/server/package-lock.json b/server/package-lock.json index c144a96..b1df44c 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -33,6 +33,8 @@ "helmet": "^8.1.0", "image-size": "^2.0.2", "lodash": "^4.17.21", + "moment": "^2.30.1", + "moment-timezone": "^0.6.0", "multer": "^2.0.2", "mysql2": "^3.14.3", "nestjs-paginate": "^12.5.0", @@ -5988,9 +5990,9 @@ } }, "node_modules/dayjs": { - "version": "1.11.13", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz", - "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==", + "version": "1.11.18", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.18.tgz", + "integrity": "sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==", "license": "MIT", "peer": true }, @@ -9648,6 +9650,27 @@ "mkdirp": "bin/cmd.js" } }, + "node_modules/moment": { + "version": "2.30.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", + "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/moment-timezone": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.6.0.tgz", + "integrity": "sha512-ldA5lRNm3iJCWZcBCab4pnNL3HSZYXVb/3TYr75/1WCTWYuTqYUb5f/S384pncYjJ88lbO8Z4uPDvmoluHJc8Q==", + "license": "MIT", + "dependencies": { + "moment": "^2.29.4" + }, + "engines": { + "node": "*" + } + }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", diff --git a/server/package.json b/server/package.json index 414a074..a67740b 100644 --- a/server/package.json +++ b/server/package.json @@ -49,6 +49,8 @@ "helmet": "^8.1.0", "image-size": "^2.0.2", "lodash": "^4.17.21", + "moment": "^2.30.1", + "moment-timezone": "^0.6.0", "multer": "^2.0.2", "mysql2": "^3.14.3", "nestjs-paginate": "^12.5.0", diff --git a/server/src/features/format-time-au.ts b/server/src/features/format-time-au.ts index 69c3fa0..255ba5f 100644 --- a/server/src/features/format-time-au.ts +++ b/server/src/features/format-time-au.ts @@ -1,10 +1,7 @@ -import dayjs from 'dayjs'; -import utc from 'dayjs/plugin/utc'; -import timezone from 'dayjs/plugin/timezone'; - -dayjs.extend(utc); -dayjs.extend(timezone); +import moment from 'moment-timezone'; export function formatTimeAU(timestamp: number) { - return dayjs(timestamp).tz('Australia/Sydney').format('DD/MM/YYYY, h:mm A'); + return moment(timestamp) + .tz('Australia/Sydney') // Đặt timezone + .format('DD/MM/YYYY, h:mm A'); }