From 76160b48bd4bc99478cd8d8534248eedb9d08907 Mon Sep 17 00:00:00 2001
From: Judith <jpoulvel@student.42.fr>
Date: Thu, 11 Jun 2020 14:31:25 +0200
Subject: [PATCH 1/7] _colors.scss: added dark-grey for more contrasted texts

---
 app/assets/stylesheets/new_design/_colors.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/new_design/_colors.scss b/app/assets/stylesheets/new_design/_colors.scss
index 052e2a51b..b896e47f6 100644
--- a/app/assets/stylesheets/new_design/_colors.scss
+++ b/app/assets/stylesheets/new_design/_colors.scss
@@ -5,6 +5,7 @@ $black: #333333;
 $white: #FFFFFF;
 $grey: #888888;
 $light-grey: #F8F8F8;
+$dark-grey: #666666;
 $border-grey: #CCCCCC;
 $dark-red: #A10005;
 $medium-red: rgba(161, 0, 5, 0.9);

From 75b1642c0d4ba4ed626119eb208ac455cb9fce7d Mon Sep 17 00:00:00 2001
From: Judith <jpoulvel@student.42.fr>
Date: Thu, 11 Jun 2020 14:33:15 +0200
Subject: [PATCH 2/7] changed grey by dark-grey for texts

---
 app/assets/stylesheets/new_design/autosave.scss    |  2 +-
 app/assets/stylesheets/new_design/avis.scss        | 14 +++++++-------
 app/assets/stylesheets/new_design/buttons.scss     |  6 +++---
 .../stylesheets/new_design/demarches_index.scss    |  4 ++--
 .../stylesheets/new_design/dossier_champs.scss     |  2 +-
 .../stylesheets/new_design/dossier_show.scss       |  2 +-
 app/assets/stylesheets/new_design/forms.scss       |  4 ++--
 .../new_design/france-connect-login.scss           |  2 +-
 app/assets/stylesheets/new_design/instructeur.scss |  2 +-
 app/assets/stylesheets/new_design/labels.scss      |  2 +-
 app/assets/stylesheets/new_design/message.scss     |  2 +-
 app/assets/stylesheets/new_design/motivation.scss  |  2 +-
 app/assets/stylesheets/new_design/new_header.scss  |  2 +-
 app/assets/stylesheets/new_design/print.scss       |  2 +-
 .../stylesheets/new_design/procedure_list.scss     |  2 +-
 .../stylesheets/new_design/status_overview.scss    |  2 +-
 16 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/assets/stylesheets/new_design/autosave.scss b/app/assets/stylesheets/new_design/autosave.scss
index a12582635..c5f92e842 100644
--- a/app/assets/stylesheets/new_design/autosave.scss
+++ b/app/assets/stylesheets/new_design/autosave.scss
@@ -7,7 +7,7 @@
 }
 
 .autosave-explanation {
-  color: $grey;
+  color: $dark-grey;
   margin-left: 4px;
 }
 
diff --git a/app/assets/stylesheets/new_design/avis.scss b/app/assets/stylesheets/new_design/avis.scss
index fa8876b1d..642d11537 100644
--- a/app/assets/stylesheets/new_design/avis.scss
+++ b/app/assets/stylesheets/new_design/avis.scss
@@ -20,14 +20,14 @@
   }
 
   .confidentiel {
-    color: $grey;
+    color: $dark-grey;
     font-weight: normal;
     margin-bottom: 2 * $default-padding;
   }
 
   .date {
     font-size: 12px;
-    color: $grey;
+    color: $dark-grey;
     float: right;
   }
 }
@@ -37,7 +37,7 @@
 
   .avis-notice {
     font-size: 14px;
-    color: $grey;
+    color: $dark-grey;
     margin-bottom: 2 * $default-padding;
   }
 
@@ -50,7 +50,7 @@
   }
 
   .confidentiel {
-    color: $grey;
+    color: $dark-grey;
     font-weight: normal;
     margin-bottom: 2 * $default-padding;
   }
@@ -68,7 +68,7 @@
 
   .confidentiel-explanation {
     font-size: 14px;
-    color: $grey;
+    color: $dark-grey;
     margin-top: - $default-padding;
     margin-bottom: 2 * $default-padding;
   }
@@ -116,7 +116,7 @@
     }
 
     .confidentiel {
-      color: $grey;
+      color: $dark-grey;
       font-size: 12px;
 
       .lock {
@@ -131,7 +131,7 @@
   .date,
   .waiting {
     font-size: 12px;
-    color: $grey;
+    color: $dark-grey;
   }
 
   .date {
diff --git a/app/assets/stylesheets/new_design/buttons.scss b/app/assets/stylesheets/new_design/buttons.scss
index ba5804564..f7bfe4ea1 100644
--- a/app/assets/stylesheets/new_design/buttons.scss
+++ b/app/assets/stylesheets/new_design/buttons.scss
@@ -195,7 +195,7 @@
 
     .attestation {
       margin: $default-padding 0;
-      color: $grey;
+      color: $dark-grey;
     }
   }
 }
@@ -204,7 +204,7 @@
   li {
     display: flex;
     padding: $default-padding;
-    color: $grey;
+    color: $dark-grey;
     border-bottom: 1px solid $border-grey;
     font-size: 12px;
     min-width: 300px;
@@ -246,7 +246,7 @@
     }
 
     a {
-      color: $grey;
+      color: $dark-grey;
     }
 
     // Make child links fill the whole clickable area
diff --git a/app/assets/stylesheets/new_design/demarches_index.scss b/app/assets/stylesheets/new_design/demarches_index.scss
index 808095ee2..ab58d5502 100644
--- a/app/assets/stylesheets/new_design/demarches_index.scss
+++ b/app/assets/stylesheets/new_design/demarches_index.scss
@@ -10,7 +10,7 @@
 }
 
 .list-header {
-  color: $grey;
+  color: $dark-grey;
   font-weight: bold;
   margin-bottom: 10px;
 }
@@ -32,5 +32,5 @@
 }
 
 .service-name {
-  color: $grey;
+  color: $dark-grey;
 }
diff --git a/app/assets/stylesheets/new_design/dossier_champs.scss b/app/assets/stylesheets/new_design/dossier_champs.scss
index 883a37e72..86808d340 100644
--- a/app/assets/stylesheets/new_design/dossier_champs.scss
+++ b/app/assets/stylesheets/new_design/dossier_champs.scss
@@ -13,7 +13,7 @@
 
   td.updated-at {
     font-size: 13px;
-    color: $grey;
+    color: $dark-grey;
     text-align: right;
     width: 190px;
 
diff --git a/app/assets/stylesheets/new_design/dossier_show.scss b/app/assets/stylesheets/new_design/dossier_show.scss
index e26367a75..94781e8e6 100644
--- a/app/assets/stylesheets/new_design/dossier_show.scss
+++ b/app/assets/stylesheets/new_design/dossier_show.scss
@@ -28,7 +28,7 @@
     }
 
     h2 {
-      color: $grey;
+      color: $dark-grey;
       font-weight: bold;
     }
 
diff --git a/app/assets/stylesheets/new_design/forms.scss b/app/assets/stylesheets/new_design/forms.scss
index 031c11f83..f7774389c 100644
--- a/app/assets/stylesheets/new_design/forms.scss
+++ b/app/assets/stylesheets/new_design/forms.scss
@@ -23,7 +23,7 @@
 
   @mixin notice-text-style {
     font-size: 16px;
-    color: $grey;
+    color: $dark-grey;
   }
 
   .mandatory {
@@ -346,7 +346,7 @@
   }
 
   input.aa-hint {
-    color: $grey;
+    color: $dark-grey;
   }
 
   .datetime {
diff --git a/app/assets/stylesheets/new_design/france-connect-login.scss b/app/assets/stylesheets/new_design/france-connect-login.scss
index 020352b09..779b800fc 100644
--- a/app/assets/stylesheets/new_design/france-connect-login.scss
+++ b/app/assets/stylesheets/new_design/france-connect-login.scss
@@ -24,5 +24,5 @@
 .france-connect-login-separator {
   margin: 24px 0;
   font-size: 14px;
-  color: $grey;
+  color: $dark-grey;
 }
diff --git a/app/assets/stylesheets/new_design/instructeur.scss b/app/assets/stylesheets/new_design/instructeur.scss
index 36b92c37f..d9b102670 100644
--- a/app/assets/stylesheets/new_design/instructeur.scss
+++ b/app/assets/stylesheets/new_design/instructeur.scss
@@ -66,7 +66,7 @@
     .menu-item {
       align-items: center;
       padding: 14px;
-      color: $grey;
+      color: $dark-grey;
       overflow: hidden;
       text-overflow: ellipsis;
 
diff --git a/app/assets/stylesheets/new_design/labels.scss b/app/assets/stylesheets/new_design/labels.scss
index 9b0e797b3..2d3252355 100644
--- a/app/assets/stylesheets/new_design/labels.scss
+++ b/app/assets/stylesheets/new_design/labels.scss
@@ -4,7 +4,7 @@
 .label {
   display: inline-block;
   padding: 4px $default-spacer;
-  background: $grey;
+  background: $dark-grey;
   border: 1px solid transparent;
   color: #FFFFFF;
   border-radius: 4px;
diff --git a/app/assets/stylesheets/new_design/message.scss b/app/assets/stylesheets/new_design/message.scss
index 4edc672ac..a11507ede 100644
--- a/app/assets/stylesheets/new_design/message.scss
+++ b/app/assets/stylesheets/new_design/message.scss
@@ -28,7 +28,7 @@
   .guest,
   .date {
     font-size: 12px;
-    color: $grey;
+    color: $dark-grey;
   }
 
   .date {
diff --git a/app/assets/stylesheets/new_design/motivation.scss b/app/assets/stylesheets/new_design/motivation.scss
index a8244b1f4..32e076dff 100644
--- a/app/assets/stylesheets/new_design/motivation.scss
+++ b/app/assets/stylesheets/new_design/motivation.scss
@@ -22,7 +22,7 @@
   }
 
   .help {
-    color: $grey;
+    color: $dark-grey;
     font-size: 11px;
     margin-bottom: $default-spacer * 2;
   }
diff --git a/app/assets/stylesheets/new_design/new_header.scss b/app/assets/stylesheets/new_design/new_header.scss
index 37e403aa7..597bfd52e 100644
--- a/app/assets/stylesheets/new_design/new_header.scss
+++ b/app/assets/stylesheets/new_design/new_header.scss
@@ -224,7 +224,7 @@ $header-mobile-breakpoint: 550px;
     .menu-item {
       align-items: center;
       padding: 14px;
-      color: $grey;
+      color: $dark-grey;
       overflow: hidden;
       text-overflow: ellipsis;
 
diff --git a/app/assets/stylesheets/new_design/print.scss b/app/assets/stylesheets/new_design/print.scss
index 2a6ebd178..cbb30fc56 100644
--- a/app/assets/stylesheets/new_design/print.scss
+++ b/app/assets/stylesheets/new_design/print.scss
@@ -21,7 +21,7 @@ body {
 
 .subtitle {
   margin-top: -20px;
-  color: $grey;
+  color: $dark-grey;
 }
 
 th,
diff --git a/app/assets/stylesheets/new_design/procedure_list.scss b/app/assets/stylesheets/new_design/procedure_list.scss
index b025e0889..cc7f09898 100644
--- a/app/assets/stylesheets/new_design/procedure_list.scss
+++ b/app/assets/stylesheets/new_design/procedure_list.scss
@@ -71,7 +71,7 @@
 
       .stats-legend {
         font-size: 12px;
-        color: $grey;
+        color: $dark-grey;
       }
     }
 
diff --git a/app/assets/stylesheets/new_design/status_overview.scss b/app/assets/stylesheets/new_design/status_overview.scss
index 1503d10cb..e577c0983 100644
--- a/app/assets/stylesheets/new_design/status_overview.scss
+++ b/app/assets/stylesheets/new_design/status_overview.scss
@@ -31,7 +31,7 @@
     }
 
     &.active ~ li {
-      color: $grey;
+      color: $dark-grey;
     }
 
     // Arrows

From 65d6f12958a92c25a3e6ed24c12f49df3e6a5450 Mon Sep 17 00:00:00 2001
From: Judith <jpoulvel@student.42.fr>
Date: Thu, 11 Jun 2020 17:48:55 +0200
Subject: [PATCH 3/7] added new green for higher contrasts. Previous green
 remains accessible as old-green

---
 app/assets/stylesheets/new_design/_colors.scss | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/new_design/_colors.scss b/app/assets/stylesheets/new_design/_colors.scss
index b896e47f6..b59289e2f 100644
--- a/app/assets/stylesheets/new_design/_colors.scss
+++ b/app/assets/stylesheets/new_design/_colors.scss
@@ -12,10 +12,11 @@ $medium-red: rgba(161, 0, 5, 0.9);
 $light-red: #ED1C24;
 $lighter-red: #F52A2A;
 $background-red: #FFDFDF;
-$green: #15AD70;
-$lighter-green: lighten($green, 30%);
-$light-green: lighten($green, 25%);
-$dark-green: darken($green, 20%);
+$green: darken(#169862, 5%);
+$old-green: #15AD70;
+$lighter-green: lighten($old-green, 30%);
+$light-green: lighten($old-green, 25%);
+$dark-green: darken($old-green, 20%);
 $orange: #F28900;
 $orange-bg: lighten($orange, 35%);
 $yellow: #FEF3B8;

From af60b1dddc99d3ae7c2129a6d0510f88bece3d4c Mon Sep 17 00:00:00 2001
From: Judith <jpoulvel@student.42.fr>
Date: Thu, 18 Jun 2020 11:17:39 +0200
Subject: [PATCH 4/7] help_dropdown_procedure contains now a <button> and not a
 <div>, which makes it accessible for keyboard navigation

---
 app/views/shared/help/_help_dropdown_procedure.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/help/_help_dropdown_procedure.html.haml b/app/views/shared/help/_help_dropdown_procedure.html.haml
index d8defbfbd..333e59bac 100644
--- a/app/views/shared/help/_help_dropdown_procedure.html.haml
+++ b/app/views/shared/help/_help_dropdown_procedure.html.haml
@@ -1,5 +1,5 @@
 .dropdown.help-dropdown
-  .button.primary.dropdown-button Aide
+  %button.button.primary.dropdown-button Aide
   .dropdown-content.fade-in-down
     %ul.dropdown-items
       - if procedure.service.present?

From 3dacff19d53b9393acbb8be28bbe027d116ff095 Mon Sep 17 00:00:00 2001
From: kara Diaby <kdiaby.pro@gmail.com>
Date: Thu, 18 Jun 2020 16:28:46 +0200
Subject: [PATCH 5/7] [CARTO] fix the GPX and KML imports in order to manage
 multiples draw types in the same file

---
 app/javascript/components/MapEditor/index.js | 23 ++++++++++----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/javascript/components/MapEditor/index.js b/app/javascript/components/MapEditor/index.js
index 7d3921fc7..e23172d47 100644
--- a/app/javascript/components/MapEditor/index.js
+++ b/app/javascript/components/MapEditor/index.js
@@ -152,19 +152,20 @@ function MapEditor({ featureCollection, url, preview, hasCadastres }) {
         featureCollection,
         'post'
       );
-
       let inputs = [...importInputs];
       const setInputs = inputs.map((input) => {
         if (input.id === inputId) {
           input.disabled = true;
           input.hasValue = true;
-          resultFeatureCollection.features.forEach((feature) => {
-            if (
-              JSON.stringify(feature.geometry) ===
-              JSON.stringify(featureCollection.features[0].geometry)
-            ) {
-              input.featureId = feature.properties.id;
-            }
+          resultFeatureCollection.features.forEach((resultFeature) => {
+            featureCollection.features.forEach((feature) => {
+              if (
+                JSON.stringify(resultFeature.geometry) ===
+                JSON.stringify(feature.geometry)
+              ) {
+                input.featureIds.push(resultFeature.properties.id);
+              }
+            });
           });
         }
         return input;
@@ -189,7 +190,7 @@ function MapEditor({ featureCollection, url, preview, hasCadastres }) {
     inputs.push({
       id: generateId(),
       disabled: false,
-      featureId: null,
+      featureIds: [],
       hasValue: false
     });
     setImportInputs(inputs);
@@ -203,9 +204,9 @@ function MapEditor({ featureCollection, url, preview, hasCadastres }) {
     const inputToRemove = inputs.find((input) => input.id === inputId);
 
     for (const feature of featureCollection.features) {
-      if (inputToRemove.featureId === feature.properties.id) {
+      if (inputToRemove.featureIds.includes(feature.properties.id)) {
         const featureToRemove = draw.get(feature.id);
-        await getJSON(`${url}/${inputToRemove.featureId}`, null, 'delete');
+        await getJSON(`${url}/${feature.properties.id}`, null, 'delete');
         draw.delete(feature.id).getAll();
         updateFeaturesList([featureToRemove]);
       }

From 319655482f9149fc9c2b4e46d47668dab8a7576a Mon Sep 17 00:00:00 2001
From: clemkeirua <clement@keiruaprod.fr>
Date: Thu, 18 Jun 2020 20:59:18 +0200
Subject: [PATCH 6/7] clean config for keystone v3

---
 config/env.example | 2 --
 config/storage.yml | 2 --
 2 files changed, 4 deletions(-)

diff --git a/config/env.example b/config/env.example
index 64d3a8f6a..3bf2397ca 100644
--- a/config/env.example
+++ b/config/env.example
@@ -30,11 +30,9 @@ BASIC_AUTH_USERNAME=""
 BASIC_AUTH_PASSWORD=""
 
 # Object Storage pour les pièces jointes
-FOG_OPENSTACK_TENANT=""
 FOG_OPENSTACK_API_KEY=""
 FOG_OPENSTACK_USERNAME=""
 FOG_OPENSTACK_URL=""
-FOG_OPENSTACK_IDENTITY_API_VERSION=""
 FOG_OPENSTACK_REGION=""
 FOG_ENABLED="" # valeur attendue: enabled
 DS_PROXY_URL=""
diff --git a/config/storage.yml b/config/storage.yml
index 0427a3f7a..c55561eee 100644
--- a/config/storage.yml
+++ b/config/storage.yml
@@ -8,10 +8,8 @@ openstack:
   service: OpenStack
   container: "<%= ENV['FOG_ACTIVESTORAGE_DIRECTORY'] %>"
   credentials:
-    openstack_tenant: "<%= ENV['FOG_OPENSTACK_TENANT'] %>"
     openstack_api_key: "<%= ENV['FOG_OPENSTACK_API_KEY'] %>"
     openstack_username: "<%= ENV['FOG_OPENSTACK_USERNAME'] %>"
     openstack_auth_url: "<%= ENV['FOG_OPENSTACK_URL'] %>"
-    openstack_identity_api_version: "<%= ENV['FOG_OPENSTACK_IDENTITY_API_VERSION'] %>"
     openstack_region: "<%= ENV['FOG_OPENSTACK_REGION'] %>"
     openstack_temp_url_key: "<%= ENV['FOG_OPENSTACK_TEMP_URL_KEY'] %>"

From 6a3811a4e2f8868e1764e77598dcdbe5e678f810 Mon Sep 17 00:00:00 2001
From: clemkeirua <clement@keiruaprod.fr>
Date: Fri, 19 Jun 2020 08:09:42 +0200
Subject: [PATCH 7/7] fix catalog v3

---
 config/initializers/active_storage.rb | 2 +-
 config/storage.yml                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/initializers/active_storage.rb b/config/initializers/active_storage.rb
index 364050bd0..c5cef6e7f 100644
--- a/config/initializers/active_storage.rb
+++ b/config/initializers/active_storage.rb
@@ -45,7 +45,7 @@ require 'fog/openstack/auth/catalog/v3'
 module Fog::OpenStack::Auth::Catalog
   class V3
     def endpoint_url(endpoint, interface)
-      url = endpoint["#{interface}URL"]
+      url = endpoint["url"]
 
       if interface == 'public'
         publicize(url)
diff --git a/config/storage.yml b/config/storage.yml
index c55561eee..99173ad6f 100644
--- a/config/storage.yml
+++ b/config/storage.yml
@@ -8,8 +8,8 @@ openstack:
   service: OpenStack
   container: "<%= ENV['FOG_ACTIVESTORAGE_DIRECTORY'] %>"
   credentials:
+    openstack_auth_url: "https://auth.cloud.ovh.net"
     openstack_api_key: "<%= ENV['FOG_OPENSTACK_API_KEY'] %>"
     openstack_username: "<%= ENV['FOG_OPENSTACK_USERNAME'] %>"
-    openstack_auth_url: "<%= ENV['FOG_OPENSTACK_URL'] %>"
     openstack_region: "<%= ENV['FOG_OPENSTACK_REGION'] %>"
     openstack_temp_url_key: "<%= ENV['FOG_OPENSTACK_TEMP_URL_KEY'] %>"