diff --git a/app/Http/Controllers/Shop/Auth/LoginController.php b/app/Http/Controllers/Shop/Auth/LoginController.php index 57d0c78e..54f22c22 100644 --- a/app/Http/Controllers/Shop/Auth/LoginController.php +++ b/app/Http/Controllers/Shop/Auth/LoginController.php @@ -41,7 +41,7 @@ class LoginController extends Controller return (back()->getTargetUrl() == route('Shop.login')) ? redirect()->intended(route('home')) : back(); } - return back()->withInput($request->only('email', 'remember')); + return back()->withErrors(['msg' => 'Identifiant ou mot de passe incorrect'])->withInput($request->only('email', 'remember')); } public function logout(Request $request) diff --git a/resources/views/Shop/Customers/partials/addresses.blade.php b/resources/views/Shop/Customers/partials/addresses.blade.php index e23580a0..8bdbf6a5 100644 --- a/resources/views/Shop/Customers/partials/addresses.blade.php +++ b/resources/views/Shop/Customers/partials/addresses.blade.php @@ -15,7 +15,12 @@
- @include('components.address', ['prefix' => 'deliveries', 'with_country' => false, 'with_tab' => true]) + @include('Shop.Customers.partials.address', [ + 'prefix' => 'deliveries', + 'with_country' => false, + 'with_tab' => true, + 'label' => 'Adresse', + ])
diff --git a/resources/views/Shop/auth/layout.blade.php b/resources/views/Shop/auth/layout.blade.php index 614e587c..aca18cb3 100644 --- a/resources/views/Shop/auth/layout.blade.php +++ b/resources/views/Shop/auth/layout.blade.php @@ -7,18 +7,23 @@ {{ $title }} | {{ config('app.name') }} + + @stack('css') -
+
- + +
+
+
+
+ @yield('content')
- - @yield('content') @stack('js') diff --git a/resources/views/Shop/auth/partials/login.blade.php b/resources/views/Shop/auth/partials/login.blade.php index a421619f..2d31e159 100644 --- a/resources/views/Shop/auth/partials/login.blade.php +++ b/resources/views/Shop/auth/partials/login.blade.php @@ -4,24 +4,31 @@
{{ Form::email('email', old('email'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.email'), 'required', 'autofocus']) }}
- +
{!! $errors->first('email','

:message

') !!}
- {{ Form::password('password', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password')]) }} + {{ Form::password('password', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password'), 'required']) }}
- +
- {!! $errors->first('password','

:message

') !!}
+ {!! $errors->first('password','

:message

') !!} + @if ($errors->any()) +
+

+ {{ $errors->first('msg') }} +

+
+ @endif
diff --git a/resources/views/Shop/auth/passwords/reset.blade.php b/resources/views/Shop/auth/passwords/reset.blade.php index a905c2c1..ea3b7474 100644 --- a/resources/views/Shop/auth/passwords/reset.blade.php +++ b/resources/views/Shop/auth/passwords/reset.blade.php @@ -4,27 +4,33 @@ ]) @section('content') - @component('boilerplate::auth.loginbox') - - {!! Form::open(['route' => 'Shop.password.update', 'method' => 'post', 'autocomplete'=> 'off']) !!} - {!! Form::hidden('token', $token) !!} -
- {{ Form::email('email', old('email', $email), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.email'), 'required', 'autofocus']) }} - {!! $errors->first('email','

:message

') !!} + +
+ @endsection diff --git a/resources/views/Shop/layout/partials/header-profile.blade.php b/resources/views/Shop/layout/partials/header-profile.blade.php index bb8443ad..c38280d8 100644 --- a/resources/views/Shop/layout/partials/header-profile.blade.php +++ b/resources/views/Shop/layout/partials/header-profile.blade.php @@ -1,44 +1,43 @@ diff --git a/routes/web.php b/routes/web.php index 2b462597..2cab5b3b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -13,8 +13,7 @@ // Auth::routes(); -Route::get('', 'Shop\HomeController@index')->name('welcome'); -Route::get('home', 'Shop\HomeController@index')->name('home'); +Route::get('', 'Shop\HomeController@index')->name('home'); include __DIR__.'/Admin/route.php'; include __DIR__.'/Shop/route.php';