From 0a21cec5134fdccbc2bf8c41027faeaf2b977c8a Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 3 Nov 2021 19:20:38 +0100 Subject: [PATCH] Client - [PR84/93] add new sports --- .../SportImage/MountainBikingElectric.vue | 71 +++++++++++++++++++ .../Common/Images/SportImage/Rowing.vue | 38 ++++++++++ .../Common/Images/SportImage/SkiingAlpine.vue | 42 +++++++++++ .../Images/SportImage/SkiingCrossCountry.vue | 38 ++++++++++ .../Common/Images/SportImage/Trail.vue | 44 ++++++++++++ .../Common/Images/SportImage/index.vue | 17 +++++ .../components/Statistics/StatsSportsMenu.vue | 2 +- fittrackee_client/src/locales/en/sports.json | 15 ++++ fittrackee_client/src/locales/fr/sports.json | 15 ++++ fittrackee_client/src/utils/sports.ts | 5 ++ 10 files changed, 286 insertions(+), 1 deletion(-) create mode 100644 fittrackee_client/src/components/Common/Images/SportImage/MountainBikingElectric.vue create mode 100644 fittrackee_client/src/components/Common/Images/SportImage/Rowing.vue create mode 100644 fittrackee_client/src/components/Common/Images/SportImage/SkiingAlpine.vue create mode 100644 fittrackee_client/src/components/Common/Images/SportImage/SkiingCrossCountry.vue create mode 100644 fittrackee_client/src/components/Common/Images/SportImage/Trail.vue diff --git a/fittrackee_client/src/components/Common/Images/SportImage/MountainBikingElectric.vue b/fittrackee_client/src/components/Common/Images/SportImage/MountainBikingElectric.vue new file mode 100644 index 00000000..e3de7841 --- /dev/null +++ b/fittrackee_client/src/components/Common/Images/SportImage/MountainBikingElectric.vue @@ -0,0 +1,71 @@ + + + diff --git a/fittrackee_client/src/components/Common/Images/SportImage/Rowing.vue b/fittrackee_client/src/components/Common/Images/SportImage/Rowing.vue new file mode 100644 index 00000000..c2a40559 --- /dev/null +++ b/fittrackee_client/src/components/Common/Images/SportImage/Rowing.vue @@ -0,0 +1,38 @@ + + + diff --git a/fittrackee_client/src/components/Common/Images/SportImage/SkiingAlpine.vue b/fittrackee_client/src/components/Common/Images/SportImage/SkiingAlpine.vue new file mode 100644 index 00000000..70810140 --- /dev/null +++ b/fittrackee_client/src/components/Common/Images/SportImage/SkiingAlpine.vue @@ -0,0 +1,42 @@ + + + diff --git a/fittrackee_client/src/components/Common/Images/SportImage/SkiingCrossCountry.vue b/fittrackee_client/src/components/Common/Images/SportImage/SkiingCrossCountry.vue new file mode 100644 index 00000000..4d724f4e --- /dev/null +++ b/fittrackee_client/src/components/Common/Images/SportImage/SkiingCrossCountry.vue @@ -0,0 +1,38 @@ + + + diff --git a/fittrackee_client/src/components/Common/Images/SportImage/Trail.vue b/fittrackee_client/src/components/Common/Images/SportImage/Trail.vue new file mode 100644 index 00000000..d13375ab --- /dev/null +++ b/fittrackee_client/src/components/Common/Images/SportImage/Trail.vue @@ -0,0 +1,44 @@ + + + diff --git a/fittrackee_client/src/components/Common/Images/SportImage/index.vue b/fittrackee_client/src/components/Common/Images/SportImage/index.vue index 826701ba..233df447 100644 --- a/fittrackee_client/src/components/Common/Images/SportImage/index.vue +++ b/fittrackee_client/src/components/Common/Images/SportImage/index.vue @@ -8,7 +8,14 @@ + + + + + @@ -20,7 +27,12 @@ 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 MountainBikingElectric from '@/components/Common/Images/SportImage/MountainBikingElectric.vue' + import Rowing from '@/components/Common/Images/SportImage/Rowing.vue' import Running from '@/components/Common/Images/SportImage/Running.vue' + import SkiingAlpine from '@/components/Common/Images/SportImage/SkiingAlpine.vue' + import SkiingCrossCountry from '@/components/Common/Images/SportImage/SkiingCrossCountry.vue' + import Trail from '@/components/Common/Images/SportImage/Trail.vue' import Walking from '@/components/Common/Images/SportImage/Walking.vue' export default defineComponent({ @@ -30,7 +42,12 @@ CyclingTransport, Hiking, MountainBiking, + MountainBikingElectric, + Rowing, Running, + SkiingAlpine, + SkiingCrossCountry, + Trail, Walking, }, props: { diff --git a/fittrackee_client/src/components/Statistics/StatsSportsMenu.vue b/fittrackee_client/src/components/Statistics/StatsSportsMenu.vue index 8de3ec84..587e4399 100644 --- a/fittrackee_client/src/components/Statistics/StatsSportsMenu.vue +++ b/fittrackee_client/src/components/Statistics/StatsSportsMenu.vue @@ -63,10 +63,10 @@ .sports-menu { display: flex; justify-content: space-between; + flex-wrap: wrap; padding: $default-padding; @media screen and (max-width: $medium-limit) { justify-content: normal; - flex-wrap: wrap; } label { diff --git a/fittrackee_client/src/locales/en/sports.json b/fittrackee_client/src/locales/en/sports.json index 99423762..a06f079a 100644 --- a/fittrackee_client/src/locales/en/sports.json +++ b/fittrackee_client/src/locales/en/sports.json @@ -11,9 +11,24 @@ "Mountain Biking": { "LABEL": "Mountain Biking" }, + "Mountain Biking (Electric)": { + "LABEL": "Mountain Biking (Electric)" + }, + "Rowing": { + "LABEL": "Rowing" + }, "Running": { "LABEL": "Running" }, + "Skiing (Alpine)": { + "LABEL": "Skiing (Alpine)" + }, + "Skiing (Cross Country)": { + "LABEL": "Skiing (Cross Country)" + }, + "Trail": { + "LABEL": "Trail" + }, "Walking": { "LABEL": "Walking" } diff --git a/fittrackee_client/src/locales/fr/sports.json b/fittrackee_client/src/locales/fr/sports.json index 0a7440f9..87ce638c 100644 --- a/fittrackee_client/src/locales/fr/sports.json +++ b/fittrackee_client/src/locales/fr/sports.json @@ -11,9 +11,24 @@ "Mountain Biking": { "LABEL": "VTT" }, + "Mountain Biking (Electric)": { + "LABEL": "VTT (Electrique)" + }, + "Rowing": { + "LABEL": "Aviron" + }, "Running": { "LABEL": "Course" }, + "Skiing (Alpine)": { + "LABEL": "Ski (Alpin)" + }, + "Skiing (Cross Country)": { + "LABEL": "Ski (Randonnée)" + }, + "Trail": { + "LABEL": "Trail" + }, "Walking": { "LABEL": "Marche" } diff --git a/fittrackee_client/src/utils/sports.ts b/fittrackee_client/src/utils/sports.ts index a92f8386..5453bad5 100644 --- a/fittrackee_client/src/utils/sports.ts +++ b/fittrackee_client/src/utils/sports.ts @@ -7,7 +7,12 @@ export const sportColors: Record = { 'Cycling (Transport)': '#88af98', Hiking: '#bb757c', 'Mountain Biking': '#d4b371', + 'Mountain Biking (Electric)': '#fc9d6f', + Rowing: '#fcce72', Running: '#835b83', + 'Skiing (Alpine)': '#67a4bd', + 'Skiing (Cross Country)': '#9498d0', + Trail: '#09a98a', Walking: '#838383', }