diff --git a/fittrackee_client/package.json b/fittrackee_client/package.json index 0d380f5f..a6cc3759 100644 --- a/fittrackee_client/package.json +++ b/fittrackee_client/package.json @@ -22,7 +22,7 @@ "register-service-worker": "^1.7.1", "vue": "^3.0.0", "vue-chart-3": "^0.5.8", - "vue-i18n": "^9.1.0", + "vue-i18n": "^9.1.9", "vue-router": "^4.0.0-0", "vuex": "^4.0.0-0" }, diff --git a/fittrackee_client/src/components/Common/AlertMessage.vue b/fittrackee_client/src/components/Common/AlertMessage.vue index 6d17a37e..594de47c 100644 --- a/fittrackee_client/src/components/Common/AlertMessage.vue +++ b/fittrackee_client/src/components/Common/AlertMessage.vue @@ -1,22 +1,17 @@ diff --git a/fittrackee_client/src/components/Common/CustomTextArea.vue b/fittrackee_client/src/components/Common/CustomTextArea.vue index 25d798b5..ce7dd858 100644 --- a/fittrackee_client/src/components/Common/CustomTextArea.vue +++ b/fittrackee_client/src/components/Common/CustomTextArea.vue @@ -9,14 +9,13 @@ @input="updateText" />
- {{ t('workouts.REMAINING_CHARS') }}: {{ text.length }}/{{ charLimit }} + {{ $t('workouts.REMAINING_CHARS') }}: {{ text.length }}/{{ charLimit }}
diff --git a/fittrackee_client/src/components/Common/ErrorMessage.vue b/fittrackee_client/src/components/Common/ErrorMessage.vue index 508f9968..103cbe39 100644 --- a/fittrackee_client/src/components/Common/ErrorMessage.vue +++ b/fittrackee_client/src/components/Common/ErrorMessage.vue @@ -2,26 +2,21 @@
-
{{ t(message) }}
+
{{ $t(message) }}
diff --git a/fittrackee_client/src/components/Common/Images/EmailSent.vue b/fittrackee_client/src/components/Common/Images/EmailSent.vue new file mode 100644 index 00000000..c1468870 --- /dev/null +++ b/fittrackee_client/src/components/Common/Images/EmailSent.vue @@ -0,0 +1,63 @@ + + + diff --git a/fittrackee_client/src/components/Common/Images/Password.vue b/fittrackee_client/src/components/Common/Images/Password.vue new file mode 100644 index 00000000..9a1fb117 --- /dev/null +++ b/fittrackee_client/src/components/Common/Images/Password.vue @@ -0,0 +1,94 @@ + + + diff --git a/fittrackee_client/src/components/Common/SportImage/CyclingSport.vue b/fittrackee_client/src/components/Common/Images/SportImage/CyclingSport.vue similarity index 100% rename from fittrackee_client/src/components/Common/SportImage/CyclingSport.vue rename to fittrackee_client/src/components/Common/Images/SportImage/CyclingSport.vue diff --git a/fittrackee_client/src/components/Common/SportImage/CyclingTransport.vue b/fittrackee_client/src/components/Common/Images/SportImage/CyclingTransport.vue similarity index 100% rename from fittrackee_client/src/components/Common/SportImage/CyclingTransport.vue rename to fittrackee_client/src/components/Common/Images/SportImage/CyclingTransport.vue diff --git a/fittrackee_client/src/components/Common/SportImage/Hiking.vue b/fittrackee_client/src/components/Common/Images/SportImage/Hiking.vue similarity index 100% rename from fittrackee_client/src/components/Common/SportImage/Hiking.vue rename to fittrackee_client/src/components/Common/Images/SportImage/Hiking.vue diff --git a/fittrackee_client/src/components/Common/SportImage/MountainBiking.vue b/fittrackee_client/src/components/Common/Images/SportImage/MountainBiking.vue similarity index 100% rename from fittrackee_client/src/components/Common/SportImage/MountainBiking.vue rename to fittrackee_client/src/components/Common/Images/SportImage/MountainBiking.vue diff --git a/fittrackee_client/src/components/Common/SportImage/Running.vue b/fittrackee_client/src/components/Common/Images/SportImage/Running.vue similarity index 100% rename from fittrackee_client/src/components/Common/SportImage/Running.vue rename to fittrackee_client/src/components/Common/Images/SportImage/Running.vue diff --git a/fittrackee_client/src/components/Common/SportImage/Walking.vue b/fittrackee_client/src/components/Common/Images/SportImage/Walking.vue similarity index 100% rename from fittrackee_client/src/components/Common/SportImage/Walking.vue rename to fittrackee_client/src/components/Common/Images/SportImage/Walking.vue diff --git a/fittrackee_client/src/components/Common/SportImage/index.vue b/fittrackee_client/src/components/Common/Images/SportImage/index.vue similarity index 69% rename from fittrackee_client/src/components/Common/SportImage/index.vue rename to fittrackee_client/src/components/Common/Images/SportImage/index.vue index 3a364258..91cc9faa 100644 --- a/fittrackee_client/src/components/Common/SportImage/index.vue +++ b/fittrackee_client/src/components/Common/Images/SportImage/index.vue @@ -17,12 +17,12 @@ import { defineComponent } from 'vue' import { useI18n } from 'vue-i18n' - import CyclingSport from '@/components/Common/SportImage/CyclingSport.vue' - import CyclingTransport from '@/components/Common/SportImage/CyclingTransport.vue' - import Hiking from '@/components/Common/SportImage/Hiking.vue' - import MountainBiking from '@/components/Common/SportImage/MountainBiking.vue' - import Running from '@/components/Common/SportImage/Running.vue' - import Walking from '@/components/Common/SportImage/Walking.vue' + import CyclingSport from '@/components/Common/Images/SportImage/CyclingSport.vue' + import CyclingTransport from '@/components/Common/Images/SportImage/CyclingTransport.vue' + import Hiking from '@/components/Common/Images/SportImage/Hiking.vue' + import MountainBiking from '@/components/Common/Images/SportImage/MountainBiking.vue' + import Running from '@/components/Common/Images/SportImage/Running.vue' + import Walking from '@/components/Common/Images/SportImage/Walking.vue' import { sportColors } from '@/utils/sports' export default defineComponent({ diff --git a/fittrackee_client/src/components/Common/Modal.vue b/fittrackee_client/src/components/Common/Modal.vue index 92e118ff..e7befef4 100644 --- a/fittrackee_client/src/components/Common/Modal.vue +++ b/fittrackee_client/src/components/Common/Modal.vue @@ -10,10 +10,10 @@ @@ -24,7 +24,6 @@ diff --git a/fittrackee_client/src/components/Common/NotFound.vue b/fittrackee_client/src/components/Common/NotFound.vue index 81d68ef0..e4caa8fb 100644 --- a/fittrackee_client/src/components/Common/NotFound.vue +++ b/fittrackee_client/src/components/Common/NotFound.vue @@ -1,14 +1,13 @@ diff --git a/fittrackee_client/src/components/Common/StatsChart/index.vue b/fittrackee_client/src/components/Common/StatsChart/index.vue index 98c5a693..0a9a1af0 100644 --- a/fittrackee_client/src/components/Common/StatsChart/index.vue +++ b/fittrackee_client/src/components/Common/StatsChart/index.vue @@ -1,7 +1,7 @@