wip #5791 @5:00

diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index d74249277643f20350d17790b8c15cc677865c0c..3006a8b04b721aeacf70ba10c77e205f1a28b6e9 100644 (file)
--- a/app/Http/Controllers/AjaxController.php
+++ b/app/Http/Controllers/AjaxController.php
@@ -313,10 +313,11 @@ class AjaxController extends CubistFrontController
 
         $remember = $request->remember_me ? true : false;
 
+
         if (Auth::guard('web-clients')->attempt($data, $remember)) {
             $request->session()->regenerate();
             return Auth::guard('web-clients')->user();
-        }else{
+        } else {
             return false;
         }
     }
@@ -355,4 +356,17 @@ class AjaxController extends CubistFrontController
 
         return $data;
     }
+
+    public function update(Request $request) {
+        $clientId = Auth::guard('web-clients')->user()->id;
+        $client = Client::find($clientId);
+        $client->lastname = $request->lastname;
+        $client->firstname = $request->firstname;
+        $client->save();
+    }
+
+    public function getaddress() {
+        $clientAddress = Auth::guard('web-clients')->user()->address;
+        return $clientAddress;
+    }
 }

diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
index 6cc305a7b38c583a5f84678891e7cfc45fac2d69..7b2fdd992c7995eabfdc84e377141595661cc6f6 100644 (file)
--- a/app/Http/Controllers/ClientController.php
+++ b/app/Http/Controllers/ClientController.php
@@ -6,7 +6,6 @@ use Cubist\Backpack\app\Magic\Models\CMSPage;
 use Cubist\Backpack\app\Magic\Models\Locale;
 use Cubist\Backpack\app\Magic\Models\Settings;
 use Cubist\Backpack\Facades\App;
-use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Http\Request;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Auth;
@@ -17,6 +16,7 @@ class ClientController extends CubistPageController
 {
     public function logout(Request $request): RedirectResponse
     {
+        Auth::guard('web-clients')->user()->setRememberToken('');
         Auth::guard('web-clients')->logout();
 
         $request->session()->invalidate();

diff --git a/app/Models/Client.php b/app/Models/Client.php
index 52c3c3b9fdaa6dd1776bda2f948e807b41003d18..084e1afd691d38434e8e7b2e0b21de619a4979de 100644 (file)
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -26,12 +26,19 @@ class Client extends CubistMagicAbstractModel
             'label' => 'Password',
             'type' => 'Text']);
 
-        $this->addField(['name' => 'name',
+        $this->addField(['name' => 'lastname',
             'label' => 'Nom',
             'type' => 'Text',
             'column' => true,
             'tab' => 'Informations client']);
 
+        $this->addField(['name' => 'phone',
+            'label' => 'Téléphone',
+            'type' => 'text',
+            'column' => true,
+            'tab' => 'Informations client'
+        ]);
+
         $this->addField(['name' => 'firstname',
             'label' => 'Prénom',
             'type' => 'Text',

diff --git a/public/images/icon-trash.svg b/public/images/icon-trash.svg
new file mode 100644 (file)
index 0000000..de1d333
--- /dev/null
+++ b/public/images/icon-trash.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="17.5" height="18.833" viewBox="0 0 17.5 18.833">
+  <g id="Groupe_152" data-name="Groupe 152" transform="translate(-0.25 0.25)">
+    <line id="Ligne_176" data-name="Ligne 176" x2="16" transform="translate(1 4.5)" fill="none" stroke="#f81e60" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
+    <path id="Tracé_220" data-name="Tracé 220" d="M2.5,3.5h12v12a1.333,1.333,0,0,1-1.333,1.333H3.833A1.333,1.333,0,0,1,2.5,15.5Z" transform="translate(0.5 1)" fill="none" stroke="#f81e60" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
+    <path id="Tracé_221" data-name="Tracé 221" d="M4.5,4.5V3.833a3.333,3.333,0,1,1,6.667,0V4.5" transform="translate(1.167)" fill="none" stroke="#f81e60" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
+    <line id="Ligne_177" data-name="Ligne 177" y2="7.333" transform="translate(7 7.167)" fill="none" stroke="#f81e60" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
+    <line id="Ligne_178" data-name="Ligne 178" y2="7.333" transform="translate(11 7.167)" fill="none" stroke="#f81e60" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
+  </g>
+</svg>

diff --git a/resources/js/app.js b/resources/js/app.js
index ab3961453aec8a6ba274b605638ed39afcf7d959..d7c0ea3b1d97a8d3f8ac30013971def67c651c04 100644 (file)
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -31,6 +31,7 @@ window.Vue = require('vue');
 window.eventBus = new Vue();
 
 import PortalVue from 'portal-vue';
+import Ar from "../../public/vendor/adminlte/bower_components/moment/src/locale/ar";
 
 Vue.use(PortalVue);
 
@@ -63,11 +64,14 @@ const app = new Vue({
         emailExist: false,
         validateEmail: false,
         address_choice: true,
-        validateRegister: false
+        validateRegister: false,
+        tab: 'infos',
+        address: [{}]
     },
 
     beforeMount() {
         this.items = JSON.parse(this.$el.dataset.cartItems);
+        this.getAddress()
     },
 
     mounted() {
@@ -224,6 +228,45 @@ const app = new Vue({
                         }
                     }
                 })
+        },
+        activeTab(tab){
+            this.tab = tab
+        },
+        getAddress(){
+            let root = this
+
+            axios.post('/ajax/getaddress')
+                .then(function (response) {
+                    //
+                    root.address = response.data
+                })
+                .catch(function (error) {
+
+                })
+        },
+        addAddressToForm(){
+            this.address.push({})
+        },
+        update(id){
+            let root = this,
+                form = document.getElementById(id),
+                data = new FormData(form)
+
+            axios.post('/ajax/update', data)
+                .then(function (response) {
+                    //
+                    root.removeErrors()
+                    form.reset()
+
+                    window.scrollTo({
+                        top: 0,
+                        behavior: "smooth"
+                    })
+                    root.validateRegister = true
+                })
+                .catch(function (error) {
+
+                })
         }
     }
 

diff --git a/resources/styles/common/global.styl b/resources/styles/common/global.styl
index f22a69a75e67fc570d3c071dcff7ea2c48e8e503..cc8e266262230c6f99a1784c3c17a97b224b9f50 100644 (file)
--- a/resources/styles/common/global.styl
+++ b/resources/styles/common/global.styl
@@ -67,3 +67,4 @@ $overlap-amount = 10vw
 // VueJS styling to hide elements until they're ready
 [v-cloak]
   visibility: hidden
+  display: none

diff --git a/resources/views/components/address-form.blade.php b/resources/views/components/address-form.blade.php
new file mode 100644 (file)
index 0000000..4cf51fc
--- /dev/null
+++ b/resources/views/components/address-form.blade.php
@@ -0,0 +1,57 @@
+<form class="form-portal mb-12" @submit.prevent="update('address')">
+    <div class="form-group mb-12">
+        <div class="fields grid">
+            <label class="form-input text-navy">
+                {{ __('Donner un nom à cette adresse') }}<span>*</span>
+                <input class="py-3 mt-3" type="text" required="required" name="name" />
+            </label>
+            <label class="form-input text-navy">
+                {{ __('Société') }}<span>*</span>
+                <input class="py-3 mt-3" type="text" required="required" name="company" />
+            </label>
+            <label class="form-input half text-navy">
+                {{ __('Nom') }}<span>*</span>
+                <input class="py-3 mt-3" type="text" required="required" name="lastname" />
+            </label>
+            <label class="form-input half text-navy">
+                {{ __('Prénom') }}<span>*</span>
+                <input class="py-3 mt-3" type="text" required="required" name="firstname" />
+            </label>
+            <label class="form-input text-navy">
+                {{ __('Adresse de facturation') }}<span>*</span>
+                <textarea class="py-3 mt-3" required="required" name="address[billing][address]">
+                </textarea>
+            </label>
+            <label class="form-input half text-navy">
+                {{ __('Code postal') }}<span>*</span>
+                <input class="py-3 mt-3" type="text" required="required" name="address[billing][zipcode]" />
+            </label>
+            <label class="form-input half text-navy">
+                {{ __('Ville') }}<span>*</span>
+                <input class="py-3 mt-3" type="text" required="required" name="address[billing][city]" />
+            </label>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="label-checkbox flex">
+            <input type="checkbox" v-model="address_choice" checked name="same-address" class="w-4 h-4" />
+            <span class="ml-4">{{ __('Adresse de facturation par défaut') }}</span>
+        </label>
+        <label class="label-checkbox flex mb-6">
+            <input type="checkbox" v-model="address_choice" checked name="same-address" class="w-4 h-4" />
+            <span class="ml-4">{{ __('Adresse de livraison par défaut') }}</span>
+        </label>
+    </div>
+    <div class="form-footer flex flex-wrap-reverse justify-between items-center">
+        <span class="form-required-legend inline-block my-4 mr-3 text-grey-dark xs:self-start xs:mt-5">
+            *{{ __('Champs obligatoires') }}
+        </span>
+        <button id="checkemail" class="form-submit-button btn btn-custom xs:w-full">
+            {{ __('Enregistrer les modifications') }}
+        </button>
+    </div>
+</form>
+<button class="flex items-center" @click="deleteAddress(key)">
+    @svg('icon-trash')
+    <span class="ml-3">Supprimer cette adresse</span>
+</button>

diff --git a/resources/views/pages/sign_in.blade.php b/resources/views/pages/sign_in.blade.php
index 0edef208541d17ad6606f20c50ff787526050727..9450f80db801a4bf1ef3e169a25a1fbaeae60a20 100644 (file)
--- a/resources/views/pages/sign_in.blade.php
+++ b/resources/views/pages/sign_in.blade.php
@@ -23,7 +23,7 @@
                 </form>
             </div>
         </div>
-        <div class="signin-form hidden" :ref="(signin) => signin.classList.remove('hidden')" v-if="emailExist">
+        <div class="signin-form" v-cloak v-if="emailExist">
             <div class="ajax-form flex flex-col max-w-half">
                 <div class="form-info text-navy mb-10">
                     <h1 class="text-4xl m-0">Se connecter</h1>
@@ -42,12 +42,12 @@
                             <div class="relative">
                                 <input class="py-3 mt-3" :type="type" required="required" name="password" />
                                 <button class="btn-show-pwd bg-white w-12" @click.prevent="toggleType">
-                                        <span v-if="type === 'password' ">
-                                            @svg('icon-eye')
-                                        </span>
+                                    <span v-if="type === 'password' ">
+                                        @svg('icon-eye')
+                                    </span>
                                     <span v-else>
-                                            @svg('icon-eye-hidden')
-                                        </span>
+                                        @svg('icon-eye-hidden')
+                                    </span>
                                 </button>
                             </div>
                         </label>
@@ -72,7 +72,7 @@
                 </form>
             </div>
         </div>
-        <div class="signup-form hidden" :ref="(signup) => signup.classList.remove('hidden')" v-if="!emailExist && validateEmail">
+        <div class="signup-form" v-cloak v-if="!emailExist && validateEmail">
             <div class="ajax-form flex flex-col max-w-half">
                 <div class="form-info text-navy mb-10">
                     <h1 class="text-4xl m-0">Créer un compte</h1>

diff --git a/resources/views/partials/delete-address.blade.php b/resources/views/partials/delete-address.blade.php
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
+++ b/resources/views/partials/delete-address.blade.php
@@ -0,0 +1 @@
+

diff --git a/tailwind.config.js b/tailwind.config.js
index 92ef1084c0e57a454608abd9f01ef99577f7ba18..d435ecb3e003b0f18e72c48e4f19d469fad45ccb 100644 (file)
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -21,6 +21,7 @@ module.exports = {
                 'navy': '#152F4E',
                 'navy-dark': '#0C213A',
                 'red': '#F81E60',
+                'light-b': '#D5D7DF',
                 'grey': {
                     '100': '#F7F8FC',
                     '200': '#EEF1F8',
@@ -41,6 +42,7 @@ module.exports = {
             },
             maxWidth: {
                 'half': '768px', // Half a full-width content area
+                'half-form': '552px',
                 'text': '480px' // Or 30rem?
             },
             padding: {