make changes to avoid git conflict when we will merge bootstrap5 branch

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue

@@ -1,21 +1,20 @@
 <template>
-   <div class='person-address__create'>
+   <div class="chill-entity entity-address">
-      <div>
+
       <h2 v-if="!edit">{{ $t('create_a_new_address') }}</h2>
-         <h2 v-else>{{ $t('edit_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>
-         <show-address
-            v-if="address"
-            v-bind:address="address">
-         </show-address>
-      </div>
-   </div>
 
    <div v-if="!edit" class='person-address__valid'>
       <h2>{{ $t('date') }}</h2>

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>
 

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue

@@ -1,34 +1,52 @@
 <template>
-  <div class="chill_address_address chill_address_address--multiline">
+   <div class="address multiline">
-   <div v-if="address.text">
+      <p v-if="address.text"
+         class="street">
          {{ address.text }}
-   </div>
+      </p>
-   <div v-if="address.postcode">
+      <p v-if="address.postcode"
+         class="postcode">
          {{ address.postcode.name }}
-   </div>
+      </p>
-   <div v-if="address.country">
+      <p v-if="address.country"
+         class="country">
          {{ address.country.name.fr }}
-   </div>
+      </p>
+
       <div v-if="address.floor">
-      <span>{{ $t('floor') }}</span>: {{ address.floor }}
+         <span class="floor">
+            <b>{{ $t('floor') }}</b>: {{ address.floor }}
+         </span>
       </div>
       <div v-if="address.corridor">
-      <span>{{ $t('corridor') }}</span>: {{ address.corridor }}
+         <span class="corridor">
+            <b>{{ $t('corridor') }}</b>: {{ address.corridor }}
+         </span>
       </div>
       <div v-if="address.steps">
-      <span>{{ $t('steps') }}</span>: {{ address.steps }}
+         <span class="steps">
+            <b>{{ $t('steps') }}</b>: {{ address.steps }}
+         </span>
       </div>
       <div v-if="address.flat">
-      <span>{{ $t('flat') }}</span>: {{ address.flat }}
+         <span class="flat">
+            <b>{{ $t('flat') }}</b>: {{ address.flat }}
+         </span>
       </div>
       <div v-if="address.buildingName">
-      <span>{{ $t('buildingName') }}</span>: {{ address.buildingName }}
+         <span class="buildingName">
+            <b>{{ $t('buildingName') }}</b>: {{ address.buildingName }}
+         </span>
       </div>
       <div v-if="address.extra">
-      <span>{{ $t('extra') }}</span>: {{ address.extra }}
+         <span class="extra">
+            <b>{{ $t('extra') }}</b>: {{ address.extra }}
+         </span>
       </div>
       <div v-if="address.distribution">
-      <span>{{ $t('distribution') }}</span>: {{ address.distribution }}
+         <span class="distribution">
+            <b>{{ $t('distribution') }}</b>: {{ address.distribution }}
+         </span>
       </div>
    </div>
 </template>

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',