diff --git a/app/Http/Controllers/Auth/ConfirmPasswordController.php b/app/Http/Controllers/Shop/Auth/ConfirmPasswordController.php similarity index 95% rename from app/Http/Controllers/Auth/ConfirmPasswordController.php rename to app/Http/Controllers/Shop/Auth/ConfirmPasswordController.php index 5869409c..038cbf3b 100644 --- a/app/Http/Controllers/Auth/ConfirmPasswordController.php +++ b/app/Http/Controllers/Shop/Auth/ConfirmPasswordController.php @@ -1,6 +1,6 @@ guard()->attempt($credentials, $request->get('remember'))) { $request->session()->regenerate(); - return (back()->getTargetUrl() == route('Shop.login')) ? redirect()->intended(route('home')) : back(); + return (back()->getTargetUrl() == route('login')) ? redirect()->intended(route('home')) : back(); } return back()->withInput($request->only('email', 'remember')); } diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Shop/Auth/RegisterController.php similarity index 98% rename from app/Http/Controllers/Auth/RegisterController.php rename to app/Http/Controllers/Shop/Auth/RegisterController.php index ea683363..7a40a159 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Shop/Auth/RegisterController.php @@ -1,6 +1,6 @@ 'Admin.Shop.Invoices.index', ])->activeIfRoute(['Admin.Shop.Invoices.*'])->order(2); - $menu->addTo('orders', 'Avoirs', [ - 'route' => 'Admin.Shop.Invoices.index', - ])->activeIfRoute(['Admin.Shop.Invoices.*'])->order(3); - - $menu->addTo('orders', 'Bons de livraison', [ - 'route' => 'Admin.Shop.Invoices.index', - ])->activeIfRoute(['Admin.Shop.Invoices.*'])->order(4); } } diff --git a/app/Repositories/Shop/Customers.php b/app/Repositories/Shop/Customers.php index b5fefe1b..3665f242 100644 --- a/app/Repositories/Shop/Customers.php +++ b/app/Repositories/Shop/Customers.php @@ -15,11 +15,14 @@ class Customers public static function editProfile($id = false) { $id = $id ? $id : self::getId(); + dump($id); + exit; $data = [ - 'customer' => self::get($id, ['addresses', 'deliveries', 'orders'])->toArray(), + 'customer' => self::get($id, ['addresses', 'deliveries', 'orders']), 'deliveries' => Deliveries::getAll('sale_channel')->toArray(), ]; dump($data); + exit; return $data; } diff --git a/resources/views/auth/firstlogin.blade.php b/resources/views/Shop/auth/firstlogin.blade.php similarity index 100% rename from resources/views/auth/firstlogin.blade.php rename to resources/views/Shop/auth/firstlogin.blade.php diff --git a/resources/views/auth/layout.blade.php b/resources/views/Shop/auth/layout.blade.php similarity index 100% rename from resources/views/auth/layout.blade.php rename to resources/views/Shop/auth/layout.blade.php diff --git a/resources/views/auth/login.blade.php b/resources/views/Shop/auth/login.blade.php similarity index 89% rename from resources/views/auth/login.blade.php rename to resources/views/Shop/auth/login.blade.php index 38d31cda..c0aec836 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/Shop/auth/login.blade.php @@ -5,7 +5,7 @@ @section('content') - @include('auth.partials.login') + @include('Shop.auth.partials.login')

Vous n'avez pas encore de compte ? diff --git a/resources/views/auth/partials/login.blade.php b/resources/views/Shop/auth/partials/login.blade.php similarity index 100% rename from resources/views/auth/partials/login.blade.php rename to resources/views/Shop/auth/partials/login.blade.php diff --git a/resources/views/auth/partials/lost_password.blade.php b/resources/views/Shop/auth/partials/lost_password.blade.php similarity index 100% rename from resources/views/auth/partials/lost_password.blade.php rename to resources/views/Shop/auth/partials/lost_password.blade.php diff --git a/resources/views/auth/partials/register.blade.php b/resources/views/Shop/auth/partials/register.blade.php similarity index 100% rename from resources/views/auth/partials/register.blade.php rename to resources/views/Shop/auth/partials/register.blade.php diff --git a/resources/views/auth/passwords/change_password.blade.php b/resources/views/Shop/auth/passwords/change_password.blade.php similarity index 100% rename from resources/views/auth/passwords/change_password.blade.php rename to resources/views/Shop/auth/passwords/change_password.blade.php diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/Shop/auth/passwords/email.blade.php similarity index 100% rename from resources/views/auth/passwords/email.blade.php rename to resources/views/Shop/auth/passwords/email.blade.php diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/Shop/auth/passwords/reset.blade.php similarity index 100% rename from resources/views/auth/passwords/reset.blade.php rename to resources/views/Shop/auth/passwords/reset.blade.php diff --git a/resources/views/auth/register.blade.php b/resources/views/Shop/auth/register.blade.php similarity index 76% rename from resources/views/auth/register.blade.php rename to resources/views/Shop/auth/register.blade.php index 0606d302..af1ea2b2 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/Shop/auth/register.blade.php @@ -4,5 +4,5 @@ ]) @section('content') - @include('auth.partials.register') + @include('Shop.auth.partials.register') @endsection diff --git a/resources/views/auth/verify.blade.php b/resources/views/Shop/auth/verify.blade.php similarity index 100% rename from resources/views/auth/verify.blade.php rename to resources/views/Shop/auth/verify.blade.php diff --git a/routes/Shop/route.php b/routes/Shop/route.php index 21476733..a1918367 100644 --- a/routes/Shop/route.php +++ b/routes/Shop/route.php @@ -1,5 +1,17 @@ namespace('Shop')->name('')->group(function () { + Route::get('login', 'Auth\LoginController@showLoginForm')->name('login'); + Route::post('login', 'Auth\LoginController@login')->name('login.post'); + Route::post('logout', 'Auth\LoginController@logout')->name('logout'); + Route::post('password/email', 'Auth\ForgotPasswordController@sendResetLinkEmail')->name('password.email'); + Route::get('password/request', 'Auth\ForgotPasswordController@showLinkRequestForm')->name('password.request'); + Route::post('password/reset', 'Auth\ResetPasswordController@reset')->name('password.update'); + Route::get('password/reset/{token?}', 'Auth\ResetPasswordController@showResetForm')->name('password.reset'); + Route::get('register', 'Auth\RegisterController@showRegistrationForm')->name('register'); + Route::post('register', 'Auth\RegisterController@register')->name('register.post'); +}); + Route::prefix('')->namespace('Shop')->name('Shop.')->group(function () { include __DIR__ . '/Articles.php'; include __DIR__ . '/Baskets.php'; diff --git a/routes/web.php b/routes/web.php index 05663fba..20993daf 100644 --- a/routes/web.php +++ b/routes/web.php @@ -13,19 +13,6 @@ // Auth::routes(); -Route::prefix('')->namespace('')->name('')->group(function () { - Route::get('login', 'Auth\LoginController@showLoginForm')->name('login'); - Route::post('login', 'Auth\LoginController@login')->name('login.post'); - Route::post('logout', 'Auth\LoginController@logout')->name('logout'); - Route::post('password/email', 'Auth\ForgotPasswordController@sendResetLinkEmail')->name('password.email'); - Route::get('password/request', 'Auth\ForgotPasswordController@showLinkRequestForm')->name('password.request'); - Route::post('password/reset', 'Auth\ResetPasswordController@reset')->name('password.update'); - Route::get('password/reset/{token?}', 'Auth\ResetPasswordController@showResetForm')->name('password.reset'); - Route::get('register', 'Auth\RegisterController@showRegistrationForm')->name('register'); - Route::post('register', 'Auth\RegisterController@register')->name('register.post'); -}); - - Route::get('', 'Shop\HomeController@index')->name('welcome'); Route::get('home', 'Shop\HomeController@index')->name('home');