wip #5790 @1:00

diff --git a/resources/styles/components/my-account.styl b/resources/styles/components/my-account.styl
index ae9790dd6497b10d6cd9d8e933c0009f23308558..bf5b5afb6c04e665595789d457efe757cd1f1e30 100644 (file)
--- a/resources/styles/components/my-account.styl
+++ b/resources/styles/components/my-account.styl
@@ -27,6 +27,9 @@
     padding: 46px 96px
 
   &-address
+    .ajax-form:not(:last-child)
+      padding-bottom: 48px
+      border-bottom: 1px solid theme('colors.light-b')
     form
       label:first-child
         padding-top: 0 !important

diff --git a/resources/views/pages/my_account.blade.php b/resources/views/pages/my_account.blade.php
index 5e0180b71e98af660485c594ccff90422177ffa1..90366176a5599892e0d78eedec6d542c64c3553f 100644 (file)
--- a/resources/views/pages/my_account.blade.php
+++ b/resources/views/pages/my_account.blade.php
@@ -26,29 +26,29 @@
                             </p>
                             <a href="">{{ __('Signaler une modification') }}</a>
                         </div>
-                        <div class="ajax-form flex flex-col max-w-half-form pt-12">
+                        <div class="ajax-form flex flex-col pt-12">
                             <h2 class="text-2xl m-0">{{ __('Mes coordonnées') }}</h2>
-                            <form id="update-details" class="form-portal" @submit.prevent="update('update-details')">
+                            <form id="update-details" class="form-portal max-w-half-form" @submit.prevent="update('update-details')">
                                 <div class="form-group fields grid">
                                     <label class="form-input half text-navy">
                                         {{ __('Nom') }}<span>*</span>
-                                        <input class="py-3 mt-3" type="text" value="{{ $client->lastname }}" required="required" name="lastname" />
+                                        <input class="py-3 mt-3" type="text"  v-model="user.lastname" required="required" name="lastname" />
                                     </label>
                                     <label class="form-input half text-navy">
                                         {{ __('Prénom') }}<span>*</span>
-                                        <input class="py-3 mt-3" type="text" value="{{ $client->firstname }}" required="required" name="firstname" />
+                                        <input class="py-3 mt-3" type="text" v-model="user.firstname" required="required" name="firstname" />
                                     </label>
                                 </div>
                                 <div class="form-group">
                                     <label class="form-input half text-navy">
                                         {{ __('Adresse email') }}<span>*</span>
-                                        <input class="py-3 mt-3" type="email" value="" required="required" name="email" />
+                                        <input class="py-3 mt-3" type="email" v-model="user.email" required="required" name="email" />
                                     </label>
                                 </div>
                                 <div class="form-group">
                                     <label class="form-input half text-navy">
                                         {{ __('Téléphone') }}<span></span>
-                                        <input class="py-3 mt-3" type="text" value="{{ $client->phone }}" required="required" name="password" />
+                                        <input class="py-3 mt-3" type="text" v-model="user.phone" required="required" name="phone" />
                                     </label>
                                 </div>
                                 <div class="form-footer flex flex-wrap-reverse justify-between items-center mt-12">
@@ -71,8 +71,10 @@
                                 @svg('icon-white-add')
                             </button>
                         </div>
-                        <div class="ajax-form flex flex-col max-w-half-form pt-8" v-for="add in address">
-                            <address-form />
+                        <div>
+                            <div class="ajax-form flex flex-col pt-12" v-for="(address, key) in addresses" :key="key">
+                                <address-form />
+                            </div>
                         </div>
                     </div>
 

diff --git a/resources/views/partials/account.blade.php b/resources/views/partials/account.blade.php
index 54bc12b6c2fed7fac816d3d4d13400a663077c21..02ef123f071e0bca4defcfa355e8aa705b785872 100644 (file)
--- a/resources/views/partials/account.blade.php
+++ b/resources/views/partials/account.blade.php
@@ -1,9 +1,12 @@
 <span class="account-header-title">
-    @if(Auth::guard('web-clients')->check())
-        {{ Auth::guard('web-clients')->user()->firstname }}
+    @auth('web-clients')
+        <span v-if="!user.firstname">{{ Auth::guard('web-clients')->user()->firstname }}</span>
+        <span v-cloak>@{{ user.firstname }}</span>&nbsp
+        <span v-if="!user.lastname">{{ Auth::guard('web-clients')->user()->lastname }}</span>
+        <span v-cloak>@{{ user.lastname }}</span>&nbsp
     @else
         {{ __('Se connecter') }}
-    @endif
+    @endauth
 </span>
 <span class="header-icon-wrapper account-icon-wrapper">
     @svg('icon-account', 'account-header-icon header-icon')

diff --git a/resources/views/partials/nav-account.blade.php b/resources/views/partials/nav-account.blade.php
index 7f1ba9cff3c6165645e5c715694d26bfc5325745..22862709935488dd89998820c4122c098a304116 100644 (file)
--- a/resources/views/partials/nav-account.blade.php
+++ b/resources/views/partials/nav-account.blade.php
@@ -1,7 +1,7 @@
-@if(Auth::guard('web-clients')->check())
+@auth('web-clients')
     <ul class="account-header-list">
         <li>
-            <a href="">
+            <a href="/mon-compte">
                 <span>{{ __('Mon compte') }}</span>
             </a>
         </li>
@@ -21,4 +21,4 @@
             </a>
         </li>
     </ul>
-@endif
+@endauth