diff --git a/client/components/Search/BaseList.js b/client/components/Search/BaseList.js index a9fc857..ad259bb 100644 --- a/client/components/Search/BaseList.js +++ b/client/components/Search/BaseList.js @@ -1,4 +1,4 @@ -import moment from 'moment'; +import dayjs from 'dayjs'; import _ from 'lodash'; import authorBooksStorage from './authorBooksStorage'; @@ -467,13 +467,13 @@ export default class BaseList { */ const sqlFormat = 'YYYY-MM-DD'; switch (date) { - case 'today': date = utils.dateFormat(moment(), sqlFormat); break; - case '3days': date = utils.dateFormat(moment().subtract(3, 'days'), sqlFormat); break; - case 'week': date = utils.dateFormat(moment().subtract(1, 'weeks'), sqlFormat); break; - case '2weeks': date = utils.dateFormat(moment().subtract(2, 'weeks'), sqlFormat); break; - case 'month': date = utils.dateFormat(moment().subtract(1, 'months'), sqlFormat); break; - case '2months': date = utils.dateFormat(moment().subtract(2, 'months'), sqlFormat); break; - case '3months': date = utils.dateFormat(moment().subtract(3, 'months'), sqlFormat); break; + case 'today': date = utils.dateFormat(dayjs(), sqlFormat); break; + case '3days': date = utils.dateFormat(dayjs().subtract(3, 'days'), sqlFormat); break; + case 'week': date = utils.dateFormat(dayjs().subtract(1, 'weeks'), sqlFormat); break; + case '2weeks': date = utils.dateFormat(dayjs().subtract(2, 'weeks'), sqlFormat); break; + case 'month': date = utils.dateFormat(dayjs().subtract(1, 'months'), sqlFormat); break; + case '2months': date = utils.dateFormat(dayjs().subtract(2, 'months'), sqlFormat); break; + case '3months': date = utils.dateFormat(dayjs().subtract(3, 'months'), sqlFormat); break; default: date = ''; } diff --git a/client/share/utils.js b/client/share/utils.js index 573cb6f..3607954 100644 --- a/client/share/utils.js +++ b/client/share/utils.js @@ -1,4 +1,4 @@ -import moment from 'moment'; +import dayjs from 'dayjs'; import {Buffer} from 'safe-buffer'; //import _ from 'lodash'; @@ -121,11 +121,11 @@ export function isDigit(c) { } export function dateFormat(date, format = 'DD.MM.YYYY') { - return moment(date).format(format); + return dayjs(date).format(format); } export function sqlDateFormat(date, format = 'DD.MM.YYYY') { - return moment(date, 'YYYY-MM-DD').format(format); + return dayjs(date, 'YYYY-MM-DD').format(format); } export function isManualDate(date) { diff --git a/package-lock.json b/package-lock.json index d61ac87..66b1eae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "@quasar/extras": "^1.15.0", "axios": "^0.27.2", "chardet": "^1.5.0", + "dayjs": "^1.11.6", "express": "^4.18.1", "fs-extra": "^10.1.0", "iconv-lite": "^0.6.3", @@ -20,7 +21,6 @@ "localforage": "^1.10.0", "lodash": "^4.17.21", "minimist": "^1.2.6", - "moment": "^2.29.4", "node-stream-zip": "^1.15.0", "quasar": "^2.7.5", "safe-buffer": "^5.2.1", @@ -3433,6 +3433,11 @@ "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz", "integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==" }, + "node_modules/dayjs": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.6.tgz", + "integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ==" + }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -5519,14 +5524,6 @@ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", "dev": true }, - "node_modules/moment": { - "version": "2.29.4", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", - "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", - "engines": { - "node": "*" - } - }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -11324,6 +11321,11 @@ "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz", "integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==" }, + "dayjs": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.6.tgz", + "integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ==" + }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -12879,11 +12881,6 @@ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", "dev": true }, - "moment": { - "version": "2.29.4", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", - "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==" - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", diff --git a/package.json b/package.json index 5015b26..931bcbe 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,7 @@ "@quasar/extras": "^1.15.0", "axios": "^0.27.2", "chardet": "^1.5.0", + "dayjs": "^1.11.6", "express": "^4.18.1", "fs-extra": "^10.1.0", "iconv-lite": "^0.6.3", @@ -59,7 +60,6 @@ "localforage": "^1.10.0", "lodash": "^4.17.21", "minimist": "^1.2.6", - "moment": "^2.29.4", "node-stream-zip": "^1.15.0", "quasar": "^2.7.5", "safe-buffer": "^5.2.1",