reorganize

app/Http/Controllers/Shop/Auth/ConfirmPasswordController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace App\Http\Controllers\Shop\Auth;
 
 use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;

app/Http/Controllers/Shop/Auth/ForgotPasswordController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace App\Http\Controllers\Shop\Auth;
 
 use App\Http\Controllers\Controller;
 

app/Http/Controllers/Shop/Auth/LoginController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace App\Http\Controllers\Shop\Auth;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
@@ -37,7 +37,7 @@ class LoginController extends Controller
 
         if ($this->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'));
     }

app/Http/Controllers/Shop/Auth/RegisterController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace App\Http\Controllers\Shop\Auth;
 
 use App\Http\Controllers\Controller;
 use Carbon\Carbon;

app/Http/Controllers/Shop/Auth/ResetPasswordController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace App\Http\Controllers\Shop\Auth;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;

app/Http/Controllers/Shop/Auth/VerificationController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace App\Http\Controllers\Shop\Auth;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\VerifiesEmails;

app/Menu/Orders.php

@@ -20,12 +20,5 @@ class Orders
             'route' => '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);
     }
 }

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;
     }
 

resources/views/Shop/auth/login.blade.php

@@ -5,7 +5,7 @@
 
 @section('content')
 
-    @include('auth.partials.login')
+    @include('Shop.auth.partials.login')
 
     <p class="mt-3">
         Vous n'avez pas encore de compte ? 

resources/views/Shop/auth/register.blade.php

@@ -4,5 +4,5 @@
 ])
 
 @section('content')
-    @include('auth.partials.register')
+    @include('Shop.auth.partials.register')
 @endsection

routes/Shop/route.php

@@ -1,5 +1,17 @@
 <?php
 
+Route::prefix('')->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';

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');