From 61dfbfccdd5d4f7a0d363d97c549585493186ab4 Mon Sep 17 00:00:00 2001 From: Gasper Grom Date: Mon, 20 Feb 2023 14:45:28 +0100 Subject: [PATCH 1/2] Eagle eye 24h local time --- .github/workflows/lint-frontend.yml | 7 ++----- .../components/list/eagle-eye-email-digest-drawer.vue | 8 ++++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/lint-frontend.yml b/.github/workflows/lint-frontend.yml index c6669ecd0c..6fcb3e9594 100644 --- a/.github/workflows/lint-frontend.yml +++ b/.github/workflows/lint-frontend.yml @@ -13,8 +13,5 @@ jobs: uses: actions/checkout@v2 - name: Lint code - uses: reviewdog/action-eslint@v1 - with: - reporter: github-pr-review - fail_on_error: true - workdir: 'frontend/' \ No newline at end of file + run: npm run lint + working-directory: frontend diff --git a/frontend/src/premium/eagle-eye/components/list/eagle-eye-email-digest-drawer.vue b/frontend/src/premium/eagle-eye/components/list/eagle-eye-email-digest-drawer.vue index 93593e54f7..0ffefee723 100644 --- a/frontend/src/premium/eagle-eye/components/list/eagle-eye-email-digest-drawer.vue +++ b/frontend/src/premium/eagle-eye/components/list/eagle-eye-email-digest-drawer.vue @@ -343,9 +343,9 @@ const fillForm = (user) => { eagleEyeSettings.emailDigest?.frequency || 'daily' form.time = eagleEyeSettings.emailDigest?.time ? moment - .utc(eagleEyeSettings.emailDigest?.time, 'hh:mm') + .utc(eagleEyeSettings.emailDigest?.time, 'HH:mm') .local() - .format('hh:mm') + .format('HH:mm') : '09:00' form.updateResults = !eagleEyeSettings.emailDigest ? true @@ -363,9 +363,9 @@ const doSubmit = async () => { const data = { email: form.email, frequency: form.frequency, - time: moment(form.time, 'hh:mm') + time: moment(form.time, 'HH:mm') .utc() - .format('hh:mm'), + .format('HH:mm'), matchFeedSettings: form.updateResults, feed: !form.updateResults ? feed.value : undefined } From 11d0b3cc153b52ca4a82533455f86a38ec88f3f5 Mon Sep 17 00:00:00 2001 From: Gasper Grom Date: Mon, 20 Feb 2023 14:48:14 +0100 Subject: [PATCH 2/2] Add install to lint actions --- .github/workflows/lint-frontend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-frontend.yml b/.github/workflows/lint-frontend.yml index 6fcb3e9594..b4fe721381 100644 --- a/.github/workflows/lint-frontend.yml +++ b/.github/workflows/lint-frontend.yml @@ -13,5 +13,5 @@ jobs: uses: actions/checkout@v2 - name: Lint code - run: npm run lint + run: npm i && npm run lint working-directory: frontend