From fd4115ffcf4a140e3977d72ae62cbc2b051b0f80 Mon Sep 17 00:00:00 2001 From: Lyqst Date: Wed, 15 Dec 2021 11:48:57 -0300 Subject: [PATCH 1/2] Remove date from News title, add posting time in EST --- .../client/src/components/news/newsContent.vue | 18 ++++++++++++------ website/common/locales/en/npc.json | 1 + 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/website/client/src/components/news/newsContent.vue b/website/client/src/components/news/newsContent.vue index 70b7b64fa8..e946569f0b 100644 --- a/website/client/src/components/news/newsContent.vue +++ b/website/client/src/components/news/newsContent.vue @@ -20,9 +20,11 @@ class="draft" >DRAFT

- {{ getPostDate(post) }} - {{ post.title.toUpperCase() }} + {{ post.title.toUpperCase() }}

- + + {{ getPostedOn(post) }} +
@@ -51,7 +53,8 @@ h1 { } .title { - display: inline; + text-align: left; + margin-bottom: 4px; } .draft { @@ -105,9 +108,12 @@ export default { renderMarkdown (text) { return habiticaMarkdown.unsafeHTMLRender(text); }, - getPostDate (post) { - const format = this.user ? this.user.preferences.dateFormat.toUpperCase() : 'MM/DD/yyyy'; - return moment(post.publishDate).format(format); + getPostedOn (post) { + const publishDate = moment(post.publishDate) + .utcOffset(-300) + .format(this.user.preferences.dateFormat.toUpperCase()); + const publishTime = moment(post.publishDate).utcOffset(-300).format('LT'); + return this.$t('newStuffPostedOn', { publishDate, publishTime }); }, }, }; diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json index 5f0ac20e7d..b029f1c8b4 100644 --- a/website/common/locales/en/npc.json +++ b/website/common/locales/en/npc.json @@ -83,6 +83,7 @@ "invalidQuantity": "Quantity to purchase must be a positive whole number.", "USD": "(USD)", "newStuff": "New Stuff by Bailey", + "newStuffPostedOn": "Posted on <%= publishDate %>, <%= publishTime %> EST", "newBaileyUpdate": "New Bailey Update!", "tellMeLater": "Tell Me Later", "dismissAlert": "Dismiss This Alert", From 1a76ad5dca07755111495465c11953f8aaa2204e Mon Sep 17 00:00:00 2001 From: SabreCat Date: Thu, 27 Jan 2022 15:54:03 -0600 Subject: [PATCH 2/2] fix(news): use Moment timezone package --- website/client/package-lock.json | 133 +++++++++--------- website/client/package.json | 3 +- .../src/components/news/newsContent.vue | 4 +- website/common/locales/en/npc.json | 2 +- 4 files changed, 68 insertions(+), 74 deletions(-) diff --git a/website/client/package-lock.json b/website/client/package-lock.json index 7fce4153a9..de0a5815ef 100644 --- a/website/client/package-lock.json +++ b/website/client/package-lock.json @@ -13072,11 +13072,34 @@ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "optional": true + }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, + "loader-utils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", + "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, "minimist": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", @@ -13113,6 +13136,38 @@ "ansi-regex": "^5.0.1" } }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.8.3", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", + "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + } + } + }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -22537,6 +22592,14 @@ "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==" }, + "moment-timezone": { + "version": "0.5.34", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.34.tgz", + "integrity": "sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==", + "requires": { + "moment": ">= 2.9.0" + } + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", @@ -29183,76 +29246,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.8.3", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", - "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==" - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - }, - "loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-mugen-scroll": { "version": "0.2.6", "resolved": "https://registry.npmjs.org/vue-mugen-scroll/-/vue-mugen-scroll-0.2.6.tgz", diff --git a/website/client/package.json b/website/client/package.json index 58b930e91a..b3cd56c81c 100644 --- a/website/client/package.json +++ b/website/client/package.json @@ -13,11 +13,11 @@ "storybook:serve": "vue-cli-service storybook:serve -p 6006 -c config/storybook" }, "dependencies": { - "@storybook/addons": "6.4.14", "@storybook/addon-actions": "6.4.14", "@storybook/addon-knobs": "6.2.9", "@storybook/addon-links": "6.4.14", "@storybook/addon-notes": "5.3.21", + "@storybook/addons": "6.4.14", "@storybook/vue": "6.3.13", "@vue/cli-plugin-babel": "^4.5.15", "@vue/cli-plugin-eslint": "^4.5.15", @@ -44,6 +44,7 @@ "jquery": "^3.6.0", "lodash": "^4.17.21", "moment": "^2.29.1", + "moment-timezone": "^0.5.34", "nconf": "^0.11.3", "sass": "^1.34.0", "sass-loader": "^8.0.2", diff --git a/website/client/src/components/news/newsContent.vue b/website/client/src/components/news/newsContent.vue index e946569f0b..55e2cc3acb 100644 --- a/website/client/src/components/news/newsContent.vue +++ b/website/client/src/components/news/newsContent.vue @@ -68,7 +68,7 @@ h1 {