From 15e301b889e5950e91b3f827a2ec171de781cae1 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 11 May 2021 15:32:02 +0200
Subject: [PATCH] address selection: add more fields

---
 .../Resources/public/vuejs/Address/index.js   |  3 --
 .../Resources/public/vuejs/Address/js/i18n.js | 16 ++++--
 .../public/vuejs/_components/AddAddress.vue   | 49 +++++++++++++------
 .../vuejs/_components/AddressSelection.vue    |  1 -
 .../vuejs/_components/CitySelection.vue       |  1 -
 .../vuejs/_components/CountrySelection.vue    |  3 +-
 6 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index ba3da0e86..b362f3f17 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -3,11 +3,8 @@ import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
 import { addressMessages } from './js/i18n'
 import { getDataPromise } from './store'
 
-
 import App from './App.vue';
 
-
-
 getDataPromise.then(store => {
 
    const i18n = _createI18n(addressMessages);
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 b085ec498..87ee9a5c0 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
@@ -1,16 +1,22 @@
-// import { mainMessages } from 'ChillMainAssets/vuejs/_js/i18n' //TODO
-
 const addressMessages = {
    fr: {
       add_an_address: 'Ajouter une adresse',
+      select_an_address: 'Sélectionner une adresse',
+      fill_an_address: 'Compléter l\'adresse',
       select_country: 'Choisir le pays',
       select_city: 'Choisir une localité',
-      select_address: 'Choisir une adresse'
+      select_address: 'Choisir une adresse',
+      isNoAddress: 'L\'adresse n\'est pas celle d\'un domicile fixe ?',
+      floor: 'Étage',
+      corridor: 'Couloir',
+      steps: 'Escalier',
+      flat: 'Appartement',
+      buildingName: 'Nom du batiment',
+      extra: 'Complément d\'adresse',
+      distribution: 'Service particulier de distribution'
    }
 };
 
-// Object.assign(appMessages.fr, mainMessages.fr);
-
 export {
    addressMessages
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
index 5816f3e8b..821456a26 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
@@ -14,32 +14,48 @@
 
          <template v-slot:body>
 
-            <div class="address_form__fields">
+            <div class="address_form__fields__isNoAddress">
                <input type="checkbox" name="isNoAddress" :placeholder="$t('isNoAddress')" v-model="isNoAddress"/>
+               <label for="isNoAddress">{{ $t('isNoAddress') }}</label>
             </div>
 
-            <div class="address_form__left">
+            <div class="address_form__select">
+               <div class="address_form__select__header">
+                  <h4>{{ $t('select_an_address') }}</h4>
+               </div>
+               <div class="address_form__select__left">
 
-               <country-selection>
-               </country-selection>
+                  <country-selection>
+                  </country-selection>
 
-               <city-selection>
-               </city-selection>
+                  <city-selection>
+                  </city-selection>
 
-               <address-selection>
-               </address-selection>
+                  <address-selection>
+                  </address-selection>
 
-            </div>
-            <div class="address_form__map">
-               <address-map ref="addressMap">
-               </address-map>
+               </div>
+               <div class="address_form__map">
+                  <address-map ref="addressMap">
+                  </address-map>
+               </div>
             </div>
 
             <div v-if="!isNoAddress" class="address_form__fields">
-               <input type="text" name="floor" :placeholder="$t('floor')" v-model="floor"/>
-               <input type="text" name="corridor" :placeholder="$t('corridor')" v-model="corridor"/>
-               <input type="text" name="steps" :placeholder="$t('steps')" v-model="steps"/>
-
+               <div class="address_form__fields__header">
+                  <h4>{{ $t('fill_an_address') }}</h4>
+               </div>
+               <div class="address_form__fields__left">
+                  <input type="text" name="floor" :placeholder="$t('floor')" v-model="floor"/>
+                  <input type="text" name="corridor" :placeholder="$t('corridor')" v-model="corridor"/>
+                  <input type="text" name="steps" :placeholder="$t('steps')" v-model="steps"/>
+                  <input type="text" name="flat" :placeholder="$t('flat')" v-model="flat"/>
+               </div>
+               <div class="address_form__fields__right">
+                  <input type="text" name="buildingName" :placeholder="$t('buildingName')" v-model="buildingName"/>
+                  <input type="text" name="extra" :placeholder="$t('extra')" v-model="extra"/>
+                  <input type="text" name="distribution" :placeholder="$t('distribution')" v-model="distribution"/>
+               </div>
 
             </div>
 
@@ -91,6 +107,7 @@ export default {
             return this.$store.state.form.isNoAddress; //TODO could be this.add_address.form.isNoAddress
          }
       },
+      //TODO define setter and getter for form input (floor, steps, ...)
    },
    methods: {
       openModal() {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressSelection.vue
index 5eeba016b..36c9f0b9e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressSelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressSelection.vue
@@ -12,7 +12,6 @@
 
 export default {
    name: 'AddressSelection',
-   props: ['item'], //TODO useful?
    data() {
    },//TODO useful?
    computed: {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/CitySelection.vue
index 986a7cc38..76e922346 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/CitySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/CitySelection.vue
@@ -12,7 +12,6 @@
 
 export default {
    name: 'CitySelection',
-   props: ['item'], //TODO useful?
    data() {
    },//TODO useful?
    computed: {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/CountrySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/CountrySelection.vue
index d4844699f..4981916b6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/CountrySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/CountrySelection.vue
@@ -12,14 +12,13 @@
 
 export default {
    name: 'CountrySelection',
-   props: ['item'],//TODO useful?
    data() {
    },//TODO useful?
    computed: {
       countries() { return this.$store.getters.getCountries; },
       selected: {
          set(value) {
-            this.$store.commit('setSelectedCountry', value);
+            this.$store.commit('setSelectedCountry', value); //TODO we should not change the state here (https://stackoverflow.com/questions/39299042/vuex-action-vs-mutations)
          },
          get() {
             return this.$store.state.selectedCountry;