From 14afc4c14a712d94358d7e3065d5c7ff861defec Mon Sep 17 00:00:00 2001 From: eug-vs Date: Tue, 28 Sep 2021 19:29:57 +0300 Subject: [PATCH 1/2] FIXME: fake year time --- src/components/DateString/compactDateString.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/DateString/compactDateString.ts b/src/components/DateString/compactDateString.ts index 8bff4b7..e0cca42 100644 --- a/src/components/DateString/compactDateString.ts +++ b/src/components/DateString/compactDateString.ts @@ -22,6 +22,8 @@ const resolve = (value: number, metricIndex = 0): string => { const ending = isPlural ? 's' : ''; return `${count} ${metric.name}${ending} ago`; } + + if (metric.name === 'year') return 'A year ago'; return resolve(newValue, metricIndex + 1); }; From 78fc41e32de368a1dc8d2f45bf92f182d4b7f0ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 16:31:01 +0000 Subject: [PATCH 2/2] chore(deps): bump axios from 0.19.2 to 0.21.2 Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.21.2. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.19.2...v0.21.2) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package-lock.json | 30 +++++++----------------------- package.json | 2 +- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 13ee706..8f06730 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2401,33 +2401,17 @@ "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==" }, "axios": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", - "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", + "version": "0.21.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.2.tgz", + "integrity": "sha512-87otirqUw3e8CzHTMO+/9kh/FSgXt/eVDvipijwDtEuwbkySWZ9SBm6VEubmJ/kLKEoLQV/POhxXFb66bfekfg==", "requires": { - "follow-redirects": "1.5.10" + "follow-redirects": "^1.14.0" }, "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - }, "follow-redirects": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", - "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", - "requires": { - "debug": "=3.1.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "version": "1.14.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz", + "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==" } } }, diff --git a/package.json b/package.json index 2e10559..5e62a3d 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "@material-ui/core": "^4.10.1", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "^4.0.0-alpha.56", - "axios": "^0.19.2", + "axios": "^0.21.2", "bluebird": "^3.7.2", "compressorjs": "^1.0.6", "formik": "^2.1.5",