Merge pull request #1732 from ddm14159/#1680/profile-pagination-bug

#1680 tab switch bag fixed

Author: fey

app/Http/Controllers/Auth/LoginController.php

@@ -19,7 +19,7 @@ public function __construct()
     public function redirectTo()
     {
         flash(__('auth.logged_in'))->success();
-        return route('my');
+        return route('my.show');
     }
 
     public function devLogin()

app/Http/Controllers/Auth/RegisterController.php

@@ -20,7 +20,7 @@ public function __construct()
 
     public function redirectTo()
     {
-        return route('my');
+        return route('my.show');
     }
 
     protected function validator(array $data): ValidatorContract

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -17,7 +17,7 @@ public function __construct()
     public function redirectTo()
     {
         flash(__('passwords.reset'))->success();
-        return route('my');
+        return route('my.show');
     }
 
     protected function rules()

app/Http/Controllers/Auth/Social/GithubController.php

@@ -67,7 +67,7 @@ public function handleProviderCallback(): RedirectResponse
         Auth::login($user, true);
         flash()->success(__('auth.logged_in'));
 
-        return redirect()->route('my');
+        return redirect()->route('my.show');
     }
 
     private function sendFailedResponse($msg = null): RedirectResponse

app/Http/Controllers/Auth/VerificationController.php

@@ -21,7 +21,7 @@ public function __construct()
 
     public function redirectTo()
     {
-        return route('my');
+        return route('my.show');
     }
 
     public function verify(Request $request)

app/Http/Controllers/My/SolutionController.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Http\Controllers\My;
+
+use App\Http\Controllers\Controller;
+use App\Models\User;
+use Auth;
+use Illuminate\View\View;
+
+class SolutionController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function index(): View
+    {
+        /** @var User $user */
+        $user = Auth::user();
+        $user->load('exerciseMembers');
+
+        $exerciseMembers = $user->exerciseMembers->keyBy('exercise_id');
+        $savedSolutionsExercises = $user->solutions()
+            ->versioned()
+            ->with([
+                'exercise',
+                'exercise.chapter',
+            ])
+            ->paginate(10);
+
+        return view('my.solutions', compact(
+            'user',
+            'exerciseMembers',
+            'savedSolutionsExercises'
+        ));
+    }
+}

app/Http/Controllers/MyController.php

@@ -14,31 +14,23 @@ public function __construct()
         $this->middleware('auth');
     }
 
-    public function __invoke(): View
+    public function show(): View
     {
         /** @var User $user */
         $user = Auth::user();
-        $user->load('chapterMembers', 'exerciseMembers');
+        $user->load('exerciseMembers', 'chapterMembers');
 
         $chapters = Chapter::with('children', 'exercises')->get();
         $mainChapters = $chapters->where('parent_id', null);
         $chapterMembers = $user->chapterMembers->keyBy('chapter_id');
         $exerciseMembers = $user->exerciseMembers->keyBy('exercise_id');
-        $savedSolutionsExercises = $user->solutions()
-            ->versioned()
-            ->with([
-                'exercise',
-                'exercise.chapter',
-            ])
-            ->paginate(10);
 
         return view('my.index', compact(
             'user',
             'chapters',
+            'exerciseMembers',
             'mainChapters',
             'chapterMembers',
-            'exerciseMembers',
-            'savedSolutionsExercises'
         ));
     }
 }

resources/lang/ru/progresses.php

@@ -2,7 +2,7 @@
 
 return [
     'chapter' => 'Глава',
-    'сhapters' => 'Главы',
+    'chapters' => 'Главы',
     'my_solutions' => 'Мои Решения',
     'exercise' => 'Упражнение',
     'see_details' => 'Подробнее',

resources/views/home/index.blade.php

@@ -75,7 +75,7 @@
           <li>{{ __(sprintf('welcome.features_list.%s', $key)) }}</li>
         @endforeach
       </ul>
-      <a class="btn btn-primary btn-lg" href="{{ route('my') }}">{{ __('layout.welcome.start_learning') }}</a>
+      <a class="btn btn-primary btn-lg" href="{{ route('my.show') }}">{{ __('layout.welcome.start_learning') }}</a>
     </div>
   </div>
 

resources/views/layouts/_nav.blade.php

@@ -64,7 +64,7 @@ class="nav-link p-2">{{ __('layout.nav.register') }}</a>
                 <a class="dropdown-item" href="{{ route('settings.account.index') }}">{{ __('account.settings') }}</a>
               </li>
               <li>
-                <a class="dropdown-item" href="{{ route('my') }}">
+                <a class="dropdown-item" href="{{ route('my.show') }}">
                   {{ __('layout.nav.my_progress') }}
                 </a>
               </li>