From a3e90af62b61ddcb5fde60a44e0aa0a3e3e4c8ae Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 22 Nov 2023 10:43:36 +0100 Subject: [PATCH 01/42] CI - remove PGSQL 11 job --- .github/workflows/.tests-python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/.tests-python.yml b/.github/workflows/.tests-python.yml index 8de726d1..7f37cae2 100644 --- a/.github/workflows/.tests-python.yml +++ b/.github/workflows/.tests-python.yml @@ -77,7 +77,7 @@ jobs: --health-retries 5 strategy: matrix: - psql-version: [ "11", "12", "13", "14", "16" ] + psql-version: [ "12", "13", "14", "16" ] steps: - uses: actions/checkout@v3 - name: Install Poetry and Dependencies From fec1a41a27830f143a646222e0c6624ebfb9d1fd Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 22 Nov 2023 10:43:52 +0100 Subject: [PATCH 02/42] Docs - update requirements --- docsrc/source/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docsrc/source/installation.rst b/docsrc/source/installation.rst index 3e620e27..2147cc67 100644 --- a/docsrc/source/installation.rst +++ b/docsrc/source/installation.rst @@ -23,7 +23,7 @@ Prerequisites - mandatory - Python >= 3.8.1 - - PostgreSQL 11+ + - PostgreSQL 12+ - optional - Redis for task queue (if email sending is enabled and for data export requests) and API rate limits - SMTP provider (if email sending is enabled) From 13b8dd04f83d80d594257ba51d4868051da8184a Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 13 Dec 2023 18:07:30 +0100 Subject: [PATCH 03/42] Client - update user preferences display --- .../User/ProfileDisplay/UserPreferences.vue | 18 ++++++++++++++++++ .../ProfileEdition/UserPreferencesEdition.vue | 11 +++++++++++ .../src/components/User/UserProfileTabs.vue | 1 + fittrackee_client/src/locales/en/user.json | 1 + fittrackee_client/src/locales/fr/user.json | 1 + 5 files changed, 32 insertions(+) diff --git a/fittrackee_client/src/components/User/ProfileDisplay/UserPreferences.vue b/fittrackee_client/src/components/User/ProfileDisplay/UserPreferences.vue index 90799c21..3adb34d2 100644 --- a/fittrackee_client/src/components/User/ProfileDisplay/UserPreferences.vue +++ b/fittrackee_client/src/components/User/ProfileDisplay/UserPreferences.vue @@ -1,5 +1,6 @@ diff --git a/fittrackee_client/src/components/Workout/WorkoutCard.vue b/fittrackee_client/src/components/Workout/WorkoutCard.vue index 796049b5..2b00f720 100644 --- a/fittrackee_client/src/components/Workout/WorkoutCard.vue +++ b/fittrackee_client/src/components/Workout/WorkoutCard.vue @@ -238,6 +238,7 @@ height: 150px; .no-map { line-height: 150px; + filter: var(--no-map-filter); } ::v-deep(.bg-map-image) { height: 150px; diff --git a/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutMap/index.vue b/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutMap/index.vue index 60357ad4..a9a85c91 100644 --- a/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutMap/index.vue +++ b/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutMap/index.vue @@ -213,6 +213,7 @@ } .no-map { line-height: 400px; + filter: var(--no-map-filter); } .leaflet-container { .map { diff --git a/fittrackee_client/src/components/Workouts/WorkoutsList.vue b/fittrackee_client/src/components/Workouts/WorkoutsList.vue index 38e0e4c6..03c2360c 100644 --- a/fittrackee_client/src/components/Workouts/WorkoutsList.vue +++ b/fittrackee_client/src/components/Workouts/WorkoutsList.vue @@ -354,7 +354,7 @@ } .static-map { display: none; - box-shadow: 3px 3px 3px 1px var(--app-shadow-color); + box-shadow: 3px 3px 3px 1px var(--workout-static-map-shadow-color); } } .workout-title:hover .static-map { diff --git a/fittrackee_client/src/scss/colors-dark.scss b/fittrackee_client/src/scss/colors-dark.scss index 33769d26..7981016b 100644 --- a/fittrackee_client/src/scss/colors-dark.scss +++ b/fittrackee_client/src/scss/colors-dark.scss @@ -84,10 +84,15 @@ --map-control-color: #000000; --map-control-bg-color: #ffffff; --map-control-border-color: #bfc0ab; - --map-attribution-text: rgba(255, 255, 255, 0.7); + --map-attribution-text: #e8e8e8; + --map-display-hover-attribution-text: #444444; + --map-attribution-bg-color: none; --map-filter: invert(1) hue-rotate(180deg) brightness(0.8) contrast(0.8); + --map-display-hover-filter: invert(1) hue-rotate(180deg) brightness(1.5) contrast(0.6); --map-layers-overlays: var(--app-color); --map-control-bar: var(--app-color); + --no-map-filter: invert(1) brightness(1.5) contrast(.9); + --workout-static-map-shadow-color: #d2d2d2; --mountains-filter: invert(90%) sepia(19%) saturate(0%) hue-rotate(39deg) brightness(86%) contrast(102%); diff --git a/fittrackee_client/src/scss/colors.scss b/fittrackee_client/src/scss/colors.scss index 205144e3..a26306ef 100644 --- a/fittrackee_client/src/scss/colors.scss +++ b/fittrackee_client/src/scss/colors.scss @@ -81,10 +81,15 @@ --map-control-color: #000000; --map-control-bg-color: #ffffff; --map-control-border-color: #bfc0ab; - --map-attribution-text: rgba(255, 255, 255, 0.7); + --map-attribution-text: var(--app-color); + --map-display-hover-attribution-text: initial; + --map-attribution-bg-color: rgba(255, 255, 255, 0.7); --map-filter: initial; + --map-display-hover-filter: initial; --map-layers-overlays: initial; --map-control-bar: #bfc0ab; + --no-map-filter: initial; + --workout-static-map-shadow-color: var(--app-shadow-color); --mountains-filter: invert(19%) sepia(9%) saturate(2921%) hue-rotate(169deg) brightness(85%) contrast(80%); From 82d7001e1584c5536dd20b01f575b4848dc97927 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 17 Dec 2023 11:31:37 +0100 Subject: [PATCH 24/42] Client - display cell heading with dark mode on mobile --- fittrackee_client/src/scss/colors-dark.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fittrackee_client/src/scss/colors-dark.scss b/fittrackee_client/src/scss/colors-dark.scss index 7981016b..e84534fa 100644 --- a/fittrackee_client/src/scss/colors-dark.scss +++ b/fittrackee_client/src/scss/colors-dark.scss @@ -97,8 +97,8 @@ --mountains-filter: invert(90%) sepia(19%) saturate(0%) hue-rotate(39deg) brightness(86%) contrast(102%); - --cell-heading-bg-color: #eeeeee; - --cell-heading-color: #696969; + --cell-heading-bg-color: #383838; + --cell-heading-color: #eeeeee; --svg-filter: drop-shadow(10px 10px 10px var(--app-shadow-color)); From 6be93dae1279e043a31018d811155b36024473d2 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 17 Dec 2023 11:32:31 +0100 Subject: [PATCH 25/42] Client - update icon for ligth theme mode --- fittrackee_client/src/components/NavBar.vue | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/fittrackee_client/src/components/NavBar.vue b/fittrackee_client/src/components/NavBar.vue index 171db642..35412a1d 100644 --- a/fittrackee_client/src/components/NavBar.vue +++ b/fittrackee_client/src/components/NavBar.vue @@ -83,8 +83,15 @@ :title="$t('user.TOGGLE_THEME')" >