From a8047fd89b81ada87cd69dc683a1cedf56d70d84 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 2 Aug 2021 15:27:18 +0200
Subject: [PATCH] make changes to avoid git conflict when we will merge
 bootstrap5 branch

---
 .../Resources/public/vuejs/Address/App.vue    | 31 ++++---
 .../vuejs/Address/components/AddAddress.vue   | 12 ++-
 .../vuejs/Address/components/ShowAddress.vue  | 80 ++++++++++++-------
 .../Resources/public/vuejs/Address/js/i18n.js |  2 +-
 4 files changed, 75 insertions(+), 50 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index c1d6fa5ac..47ca74182 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -1,20 +1,19 @@
 <template>
-   <div class='person-address__create'>
-      <div>
-         <h2 v-if="!edit">{{ $t('create_a_new_address') }}</h2>
-         <h2 v-else>{{ $t('edit_a_new_address') }}</h2>
-         <add-address
-            modalAddTitle="add_an_address_title"
-            modalEditTitle="edit_an_address_title"
-            @addNewAddress="addNewAddress">
-         </add-address>
-      </div>
-      <div>
-         <show-address
-            v-if="address"
-            v-bind:address="address">
-         </show-address>
-      </div>
+   <div class="chill-entity entity-address">
+
+      <h2 v-if="!edit">{{ $t('create_a_new_address') }}</h2>
+      <h2 v-else>{{ $t('edit_address') }}</h2>
+
+      <show-address
+         v-if="address"
+         v-bind:address="address">
+      </show-address>
+
+      <add-address
+         modalAddTitle="add_an_address_title"
+         modalEditTitle="edit_an_address_title"
+         @addNewAddress="addNewAddress">
+      </add-address>
    </div>
 
    <div v-if="!edit" class='person-address__valid'>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
index 13f767fe0..a0edb1091 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -1,8 +1,16 @@
 <template>
-   <button v-if="!edit" class="btn btn-create mt-4" @click="openModal">
+   <button v-if="!edit"
+      class="btn btn-create mt-4"
+      type="button"
+      name="button"
+      @click="openModal">
       {{ $t(modalAddTitle) }}
    </button>
-   <button v-else class="btn btn-create mt-4" @click="openModal">
+   <button v-else
+      class="btn btn-create mt-4"
+      type="button"
+      name="button"
+      @click="openModal">
       {{ $t(modalEditTitle) }}
    </button>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
index d76f7a056..786f0dce6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
@@ -1,36 +1,54 @@
 <template>
-  <div class="chill_address_address chill_address_address--multiline">
-   <div v-if="address.text">
-      {{ address.text }}
+   <div class="address multiline">
+      <p v-if="address.text"
+         class="street">
+         {{ address.text }}
+      </p>
+      <p v-if="address.postcode"
+         class="postcode">
+         {{ address.postcode.name }}
+      </p>
+      <p v-if="address.country"
+         class="country">
+         {{ address.country.name.fr }}
+      </p>
+
+      <div v-if="address.floor">
+         <span class="floor">
+            <b>{{ $t('floor') }}</b>: {{ address.floor }}
+         </span>
+      </div>
+      <div v-if="address.corridor">
+         <span class="corridor">
+            <b>{{ $t('corridor') }}</b>: {{ address.corridor }}
+         </span>
+      </div>
+      <div v-if="address.steps">
+         <span class="steps">
+            <b>{{ $t('steps') }}</b>: {{ address.steps }}
+         </span>
+      </div>
+      <div v-if="address.flat">
+         <span class="flat">
+            <b>{{ $t('flat') }}</b>: {{ address.flat }}
+         </span>
+      </div>
+      <div v-if="address.buildingName">
+         <span class="buildingName">
+            <b>{{ $t('buildingName') }}</b>: {{ address.buildingName }}
+         </span>
+      </div>
+      <div v-if="address.extra">
+         <span class="extra">
+            <b>{{ $t('extra') }}</b>: {{ address.extra }}
+         </span>
+      </div>
+      <div v-if="address.distribution">
+         <span class="distribution">
+            <b>{{ $t('distribution') }}</b>: {{ address.distribution }}
+         </span>
+      </div>
    </div>
-   <div v-if="address.postcode">
-      {{ address.postcode.name }}
-   </div>
-   <div v-if="address.country">
-      {{ address.country.name.fr }}
-   </div>
-   <div v-if="address.floor">
-      <span>{{ $t('floor') }}</span>: {{ address.floor }}
-   </div>
-   <div v-if="address.corridor">
-      <span>{{ $t('corridor') }}</span>: {{ address.corridor }}
-   </div>
-   <div v-if="address.steps">
-      <span>{{ $t('steps') }}</span>: {{ address.steps }}
-   </div>
-   <div v-if="address.flat">
-      <span>{{ $t('flat') }}</span>: {{ address.flat }}
-   </div>
-   <div v-if="address.buildingName">
-      <span>{{ $t('buildingName') }}</span>: {{ address.buildingName }}
-   </div>
-   <div v-if="address.extra">
-      <span>{{ $t('extra') }}</span>: {{ address.extra }}
-   </div>
-   <div v-if="address.distribution">
-      <span>{{ $t('distribution') }}</span>: {{ address.distribution }}
-    </div>
-  </div>
 </template>
 
 <script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
index 395c0edf8..f8a7ea4d2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
@@ -3,7 +3,7 @@ const addressMessages = {
       add_an_address_title: 'Créer une adresse',
       edit_an_address_title: 'Modifier une adresse',
       create_a_new_address: 'Créer une nouvelle adresse',
-      edit_a_new_address: 'Modifier l\'adresse',
+      edit_address: 'Modifier l\'adresse',
       select_an_address_title: 'Sélectionner une adresse',
       fill_an_address: 'Compléter l\'adresse',
       select_country: 'Choisir le pays',