Merge branch 'dev' into css

fittrackee_client/package.json

@@ -2,6 +2,7 @@
   "name": "fittrackee_client",
   "version": "0.7.26",
   "private": true,
+  "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "run-p type-check \"build-only {@}\" --",
@@ -24,20 +25,20 @@
     "@zxcvbn-ts/language-it": "^3.0.2",
     "@zxcvbn-ts/language-pl": "^3.0.2",
     "axios": "^1.6.2",
-    "chart.js": "^4.4.0",
+    "chart.js": "^4.4.1",
     "chartjs-plugin-datalabels": "^2.2.0",
-    "core-js": "^3.33.2",
+    "core-js": "^3.34.0",
     "date-fns": "2.30.0",
     "date-fns-tz": "^2.0.0",
     "leaflet": "^1.9.4",
-    "linkify-html": "^4.1.2",
-    "linkifyjs": "^4.1.2",
+    "linkify-html": "^4.1.3",
+    "linkifyjs": "^4.1.3",
     "sanitize-html": "^2.11.0",
     "snarkdown": "^2.0.0",
-    "vue": "^3.3.8",
-    "vue-chartjs": "^5.2.0",
+    "vue": "^3.3.12",
+    "vue-chartjs": "^5.3.0",
     "vue-fullscreen": "^3.1.1",
-    "vue-i18n": "^9.7.0",
+    "vue-i18n": "^9.8.0",
     "vue-router": "^4.2.5",
     "vuex": "^4.1.0"
   },
@@ -48,22 +49,22 @@
     "@types/jsdom": "^21.1.3",
     "@types/node": "^20.9.0",
     "@types/sanitize-html": "^2.9.4",
-    "@vitejs/plugin-vue": "^4.4.0",
+    "@vitejs/plugin-vue": "^4.5.2",
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/eslint-config-typescript": "^12.0.0",
     "@vue/test-utils": "^2.4.1",
     "@vue/tsconfig": "^0.4.0",
-    "eslint": "^8.49.0",
+    "eslint": "8.53.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-vue": "^9.17.0",
     "jsdom": "^22.1.0",
     "npm-run-all2": "^6.1.1",
-    "prettier": "^3.1.0",
+    "prettier": "^3.1.1",
     "sass": "^1.69.5",
     "typescript": "~5.2.0",
-    "vite": "^4.4.11",
-    "vitest": "^0.34.6",
-    "vue-tsc": "^1.8.19"
+    "vite": "^5.0.10",
+    "vitest": "^1.0.4",
+    "vue-tsc": "^1.8.25"
   }
 }

fittrackee_client/src/components/User/ProfileDisplay/UserPreferences.vue

@@ -1,5 +1,6 @@
 <template>
   <div id="user-preferences" class="description-list">
+    <div class="preferences-section">{{ $t('user.PROFILE.INTERFACE') }}</div>
     <dl>
       <dt>{{ $t('user.PROFILE.LANGUAGE') }}:</dt>
       <dd>{{ userLanguage }}</dd>
@@ -9,6 +10,9 @@
       <dd>{{ getDateFormat(date_format, appLanguage) }}</dd>
       <dt>{{ $t('user.PROFILE.FIRST_DAY_OF_WEEK') }}:</dt>
       <dd>{{ $t(`user.PROFILE.${fistDayOfWeek}`) }}</dd>
+    </dl>
+    <div class="preferences-section">{{ $t('workouts.WORKOUT', 0) }}</div>
+    <dl>
       <dt>{{ $t('user.PROFILE.UNITS.LABEL') }}:</dt>
       <dd>
         {{
@@ -92,3 +96,17 @@
     props.user.display_ascent ? 'DISPLAYED' : 'HIDDEN'
   )
 </script>
+
+<style lang="scss" scoped>
+  @import '~@/scss/vars.scss';
+  #user-preferences {
+    .preferences-section {
+      font-weight: bold;
+      text-transform: uppercase;
+      border-bottom: 1px solid var(--card-border-color);
+    }
+    .raw-speed-help {
+      margin-top: -$default-margin * 0.5;
+    }
+  }
+</style>

fittrackee_client/src/components/User/ProfileEdition/UserPreferencesEdition.vue

@@ -3,6 +3,9 @@
     <div class="profile-form form-box">
       <ErrorMessage :message="errorMessages" v-if="errorMessages" />
       <form @submit.prevent="updateProfile">
+        <div class="preferences-section">
+          {{ $t('user.PROFILE.INTERFACE') }}
+        </div>
         <label class="form-items">
           {{ $t('user.PROFILE.LANGUAGE') }}
           <select id="language" v-model="userForm.language" :disabled="loading">
@@ -59,6 +62,7 @@
             </label>
           </div>
         </div>
+        <div class="preferences-section">{{ $t('workouts.WORKOUT', 0) }}</div>
         <div class="form-items form-checkboxes">
           <span class="checkboxes-label">
             {{ $t('user.PROFILE.UNITS.LABEL') }}
@@ -327,6 +331,13 @@
       }
     }
 
+    .preferences-section {
+      font-weight: bold;
+      text-transform: uppercase;
+      border-bottom: 1px solid var(--card-border-color);
+      margin-bottom: $default-padding * 0.5;
+    }
+
     #language,
     #date_format {
       padding: $default-padding * 0.5;

fittrackee_client/src/components/User/UserProfileTabs.vue

@@ -74,5 +74,6 @@
     justify-content: center;
     flex-wrap: wrap;
     gap: $default-margin * 0.5;
+    margin-bottom: $default-margin;
   }
 </style>

fittrackee_client/src/locales/en/user.json

@@ -79,6 +79,7 @@
     "ERRORED_EMAIL_UPDATE": "Please {0} to change your email address again or contact the administrator",
     "FIRST_DAY_OF_WEEK": "First day of week",
     "FIRST_NAME": "First name",
+    "INTERFACE": "Interface",
     "LANGUAGE": "Language",
     "LAST_NAME": "Last name",
     "LOCATION": "Location",

fittrackee_client/src/locales/es/user.json

@@ -122,7 +122,8 @@
       "LABEL": "Estrategia de velocidad máxima",
       "RAW_SPEED": "En bruto",
       "HELP": "Si se filtra, excluye los valores extremos (que pueden ser errores del GPS) al calcular la velocidad máxima."
-    }
+    },
+    "INTERFACE": "Interfaz"
   },
   "READ_AND_ACCEPT_PRIVACY_POLICY": "He leído y aceptado la {0}.",
   "REGISTER": "Crear cuenta",

fittrackee_client/src/locales/fr/user.json

@@ -79,6 +79,7 @@
     "ERRORED_EMAIL_UPDATE": "Veuillez vous {0} pour changer de nouveau votre adresse électronique ou contacter l'administrateur",
     "FIRST_DAY_OF_WEEK": "Premier jour de la semaine",
     "FIRST_NAME": "Prénom",
+    "INTERFACE": "Interface",
     "LANGUAGE": "Langue",
     "LAST_NAME": "Nom",
     "LOCATION": "Lieu",

fittrackee_client/src/locales/gl/user.json

@@ -122,7 +122,8 @@
       "LABEL": "Estratexia para velocidade máx. GPX",
       "RAW_SPEED": "En bruto",
       "HELP": "Se filtras, excluirá os valores extremos (que poderían deberse a erros do GPS) ao calcular a velocidade máxima."
-    }
+    },
+    "INTERFACE": "Interface"
   },
   "READ_AND_ACCEPT_PRIVACY_POLICY": "Lin e acepto a {0}.",
   "REGISTER": "Crear conta",