From c0944676d7ada66a9ff228e533b9c55517afbd0d Mon Sep 17 00:00:00 2001 From: Jakub Dobes Date: Tue, 10 May 2022 10:45:15 -0700 Subject: [PATCH 01/11] Make dates sticky on phones --- src/styles/components/ReleaseDay.scss | 26 +++++++++++++++++--------- src/styles/datepicker.scss | 4 ++-- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/styles/components/ReleaseDay.scss b/src/styles/components/ReleaseDay.scss index 9710375..24c1edf 100644 --- a/src/styles/components/ReleaseDay.scss +++ b/src/styles/components/ReleaseDay.scss @@ -17,32 +17,36 @@ &__date { flex: 0 0 225px; margin-top: 25px !important; - color: $grey; + top: 16px; + color: $grey-light; display: flex; align-items: center; justify-content: flex-end; font-size: 1.5rem; + position: sticky; + background: $black; + z-index: 2; @include theme(compact) { margin-top: 16px !important; font-size: 1.25rem; } - @include desktop { - position: sticky; - top: 16px; - } - @include desktop-only { flex: 0 0 170px; } @include touch { + width: fit-content; + margin: 0 auto !important; flex: none; - } + top: 10px; + border-radius: 9999px; + filter: drop-shadow(0px 0px 6px $black); - @include mobile { - justify-content: center; + .columns.is-gapless & { + padding: 2px 16px !important; + } } } @@ -50,6 +54,10 @@ color: $blue; font-size: 8px; margin-right: 2px; + + @include touch { + margin-left: -8px; + } } &__albums { diff --git a/src/styles/datepicker.scss b/src/styles/datepicker.scss index e4f066e..3c55813 100644 --- a/src/styles/datepicker.scss +++ b/src/styles/datepicker.scss @@ -14,7 +14,7 @@ } .DateRangePickerInput { - border-radius: 290486px; + border-radius: 9999px; padding: 0; background-color: $darkest; border: 1px solid $darkest; @@ -44,7 +44,7 @@ color: $white-ter; background: none; border: none; - border-radius: 290486px; + border-radius: 9999px; line-height: 1.5; border-bottom: none; padding: 7px 17px; From 6dc4e30bc6fef02442780fb288352f7ab129bc11 Mon Sep 17 00:00:00 2001 From: Jakub Dobes Date: Tue, 10 May 2022 10:59:41 -0700 Subject: [PATCH 02/11] Set min property for saved tracks requirement --- src/components/common/Input.js | 15 ++++++++++----- .../settings/MinimumSavedTracksField.js | 1 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/components/common/Input.js b/src/components/common/Input.js index 5763c32..deb61c6 100644 --- a/src/components/common/Input.js +++ b/src/components/common/Input.js @@ -13,6 +13,8 @@ import classNames from 'classnames' * defaultValue?: string * placeholder?: string * step?: string + * min?: string + * max?: string * pattern?: string * disabled?: boolean * onChange?: React.ChangeEventHandler @@ -20,8 +22,8 @@ import classNames from 'classnames' * }} props * @param {React.Ref} ref */ -function Input( - { +function Input(props, ref) { + const { type = 'text', id, name, @@ -30,12 +32,13 @@ function Input( defaultValue, placeholder, step, + min, + max, pattern, disabled, onChange, - }, - ref -) { + } = props + return ( Date: Tue, 10 May 2022 13:55:58 -0700 Subject: [PATCH 03/11] Fix date range shortcuts display condition --- src/components/filters/DateRangeShortcuts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/filters/DateRangeShortcuts.js b/src/components/filters/DateRangeShortcuts.js index 82256fa..cdbfd6b 100644 --- a/src/components/filters/DateRangeShortcuts.js +++ b/src/components/filters/DateRangeShortcuts.js @@ -54,7 +54,7 @@ function getShortcuts() { function DateRangeShortcuts({ setValues }) { const { minDate, maxDate } = useSelector(getReleasesMinMaxDates) const validShortcuts = getShortcuts().filter( - ({ start, end }) => start.isBefore(maxDate) && end.isAfter(minDate) + ({ start, end }) => start.isSameOrBefore(maxDate) && end.isAfter(minDate) ) return ( From 29db3a3effb0a696e26a02da17cb9107fdd75de7 Mon Sep 17 00:00:00 2001 From: Jakub Dobes Date: Tue, 10 May 2022 14:01:11 -0700 Subject: [PATCH 04/11] Delay check for waiting service worker --- src/sagas/update.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sagas/update.js b/src/sagas/update.js index 9400993..257a33b 100644 --- a/src/sagas/update.js +++ b/src/sagas/update.js @@ -1,4 +1,4 @@ -import { call, fork, put, spawn, take, takeLeading } from 'redux-saga/effects' +import { call, delay, fork, put, spawn, take, takeLeading } from 'redux-saga/effects' import { triggerUpdate, updateReady } from 'state/actions' import { serviceWorkerEventChannel, throttle, windowEventChannel } from './helpers' @@ -7,6 +7,7 @@ import { serviceWorkerEventChannel, throttle, windowEventChannel } from './helpe */ export function* updateSaga() { yield takeLeading(triggerUpdate.type, update) + yield delay(2000) yield fork(appFocusCheck) yield fork(waitingCheck) } From 248f2b57caf9f0f199d5eed0067c717009d11e1d Mon Sep 17 00:00:00 2001 From: Jakub Dobes Date: Tue, 10 May 2022 14:22:48 -0700 Subject: [PATCH 05/11] Update Ukraine link --- public/index.html | 7 ------- src/components/releases/ReleasesHeader.js | 9 +++++++++ src/styles/base.scss | 17 +++++------------ src/styles/components/Header.scss | 4 ---- src/styles/components/SyncButton.scss | 1 - 5 files changed, 14 insertions(+), 24 deletions(-) diff --git a/public/index.html b/public/index.html index 6a7b13b..ad5e918 100644 --- a/public/index.html +++ b/public/index.html @@ -83,13 +83,6 @@ -
diff --git a/src/components/releases/ReleasesHeader.js b/src/components/releases/ReleasesHeader.js index 12e1a77..b487e1b 100644 --- a/src/components/releases/ReleasesHeader.js +++ b/src/components/releases/ReleasesHeader.js @@ -98,6 +98,15 @@ function ReleasesHeader() { )}
+ + πŸ‡ΊπŸ‡¦ + {lastSyncDate && hasReleases && !syncing && (