From 5d05437fed542871105d3eb3b0bb3ec4e6aa7ed5 Mon Sep 17 00:00:00 2001 From: Alexis <35.alexis.pele@gmail.com> Date: Thu, 4 May 2023 18:13:02 +0200 Subject: [PATCH 1/3] Added all foreign counties images --- public/regions/fr-etranger-1.svg | 315 ++++++++++++++++++++++++++++ public/regions/fr-etranger-10.svg | 36 ++++ public/regions/fr-etranger-11.svg | 334 ++++++++++++++++++++++++++++++ public/regions/fr-etranger-2.svg | 85 ++++++++ public/regions/fr-etranger-3.svg | 71 +++++++ public/regions/fr-etranger-4.svg | 1 + public/regions/fr-etranger-5.svg | 1 + public/regions/fr-etranger-6.svg | 1 + public/regions/fr-etranger-7.svg | 1 + public/regions/fr-etranger-8.svg | 1 + public/regions/fr-etranger-9.svg | 23 ++ 11 files changed, 869 insertions(+) create mode 100644 public/regions/fr-etranger-1.svg create mode 100644 public/regions/fr-etranger-10.svg create mode 100644 public/regions/fr-etranger-11.svg create mode 100644 public/regions/fr-etranger-2.svg create mode 100644 public/regions/fr-etranger-3.svg create mode 100644 public/regions/fr-etranger-4.svg create mode 100644 public/regions/fr-etranger-5.svg create mode 100644 public/regions/fr-etranger-6.svg create mode 100644 public/regions/fr-etranger-7.svg create mode 100644 public/regions/fr-etranger-8.svg create mode 100644 public/regions/fr-etranger-9.svg diff --git a/public/regions/fr-etranger-1.svg b/public/regions/fr-etranger-1.svg new file mode 100644 index 0000000..1566539 --- /dev/null +++ b/public/regions/fr-etranger-1.svg @@ -0,0 +1,315 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/regions/fr-etranger-10.svg b/public/regions/fr-etranger-10.svg new file mode 100644 index 0000000..8b14bec --- /dev/null +++ b/public/regions/fr-etranger-10.svg @@ -0,0 +1,36 @@ + + + + + + + + + diff --git a/public/regions/fr-etranger-11.svg b/public/regions/fr-etranger-11.svg new file mode 100644 index 0000000..d15708b --- /dev/null +++ b/public/regions/fr-etranger-11.svg @@ -0,0 +1,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/regions/fr-etranger-2.svg b/public/regions/fr-etranger-2.svg new file mode 100644 index 0000000..cb53fa1 --- /dev/null +++ b/public/regions/fr-etranger-2.svg @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/regions/fr-etranger-3.svg b/public/regions/fr-etranger-3.svg new file mode 100644 index 0000000..48570c0 --- /dev/null +++ b/public/regions/fr-etranger-3.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/public/regions/fr-etranger-4.svg b/public/regions/fr-etranger-4.svg new file mode 100644 index 0000000..53ae1a3 --- /dev/null +++ b/public/regions/fr-etranger-4.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/regions/fr-etranger-5.svg b/public/regions/fr-etranger-5.svg new file mode 100644 index 0000000..a779b63 --- /dev/null +++ b/public/regions/fr-etranger-5.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/regions/fr-etranger-6.svg b/public/regions/fr-etranger-6.svg new file mode 100644 index 0000000..bdba8e0 --- /dev/null +++ b/public/regions/fr-etranger-6.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/regions/fr-etranger-7.svg b/public/regions/fr-etranger-7.svg new file mode 100644 index 0000000..3c7df3a --- /dev/null +++ b/public/regions/fr-etranger-7.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/regions/fr-etranger-8.svg b/public/regions/fr-etranger-8.svg new file mode 100644 index 0000000..04a8f63 --- /dev/null +++ b/public/regions/fr-etranger-8.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/regions/fr-etranger-9.svg b/public/regions/fr-etranger-9.svg new file mode 100644 index 0000000..ad653a3 --- /dev/null +++ b/public/regions/fr-etranger-9.svg @@ -0,0 +1,23 @@ + + + + + + + + + From 43764cf0bd89ed805f6653e37d598378e2c7b06b Mon Sep 17 00:00:00 2001 From: Alexis <35.alexis.pele@gmail.com> Date: Thu, 4 May 2023 18:13:13 +0200 Subject: [PATCH 2/3] Fixed a bug where repMandate wasn't the correct data --- src/components/RepInfo.vue | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/components/RepInfo.vue b/src/components/RepInfo.vue index 12d743f..3790968 100644 --- a/src/components/RepInfo.vue +++ b/src/components/RepInfo.vue @@ -20,7 +20,7 @@ const repFullName = computed( const repMandate = computed(() => { const parliamentMandate = props.rep.acteur.mandats.mandat.find( - (mandate) => mandate["@xsi:type"] === "MandatParlementaire_type" + (mandate) => mandate.typeOrgane === "ASSEMBLEE" ); return parliamentMandate; }); @@ -55,12 +55,20 @@ const repLinkedin = computed(() => { return data; }); -const regionBgFile = computed( - () => - `regions/${String(repMandate.value?.election?.lieu.region) +const regionBgFile = computed(() => { + if ( + repMandate.value?.election?.lieu.departement === + "Français établis hors de France" + ) { + return `regions/fr-etranger-${String( + repMandate.value?.election?.lieu.numCirco + )}.svg`; + } else { + return `regions/${String(repMandate.value?.election?.lieu.region) .toLocaleLowerCase() - .replace(/\s/g, "-")}.svg` -); + .replace(/\s/g, "-")}.svg`; + } +});