make articles tab active by default in admin dashboard (laravelio#755)

* make articles tab active by default in admin dashboard * reorder tabs * update admin tests
bhushan · Nov 18, 2021 · ce5a768 · ce5a768
1 parent a58dc4b
commit ce5a768
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/resources/views/admin/articles.blade.php b/resources/views/admin/articles.blade.php
@@ -5,7 +5,7 @@
 @section('content')
     <div class="container mx-auto px-4 pt-6">
         @include('admin.partials._navigation', [
-            'query' => route('admin.articles'),
+            'query' => route('admin'),
             'search' => $adminSearch,
             'placeholder' => 'Search for articles...',
         ])

diff --git a/resources/views/admin/partials/_navigation.blade.php b/resources/views/admin/partials/_navigation.blade.php
@@ -7,12 +7,12 @@
 
             <div class="mt-4 sm:mt-0 sm:ml-10">
                 <nav class="-mb-px flex space-x-8">
-                    <a href="{{ route('admin') }}" class="{{ is_active('admin') ? 'border-lio-500 text-lio-600' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300' }} whitespace-nowrap pb-4 px-1 border-b-2 font-medium text-sm" aria-current="page">
-                        Users
+                    <a href="{{ route('admin') }}" class="{{ is_active('admin') ? 'border-lio-500 text-lio-600' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300' }} whitespace-nowrap pb-4 px-1 border-b-2 font-medium text-sm">
+                        Articles
                     </a>
 
-                    <a href="{{ route('admin.articles') }}" class="{{ is_active('admin.articles') ? 'border-lio-500 text-lio-600' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300' }} whitespace-nowrap pb-4 px-1 border-b-2 font-medium text-sm">
-                        Articles
+                    <a href="{{ route('admin.users') }}" class="{{ is_active('admin.users') ? 'border-lio-500 text-lio-600' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300' }} whitespace-nowrap pb-4 px-1 border-b-2 font-medium text-sm" aria-current="page">
+                        Users
                     </a>
                 </nav>
             </div>

diff --git a/resources/views/admin/users.blade.php b/resources/views/admin/users.blade.php
@@ -5,7 +5,7 @@
 @section('content')
     <div class="container mx-auto px-4 pt-6">
         @include('admin.partials._navigation', [
-            'query' => route('admin'),
+            'query' => route('admin.users'),
             'search' => $adminSearch,
             'placeholder' => 'Search for users...',
         ])

diff --git a/routes/web.php b/routes/web.php
@@ -116,15 +116,15 @@
 
 // Admin
 Route::prefix('admin')->name('admin')->group(function () {
-    Route::get('/', [UsersController::class, 'index']);
+    Route::get('/', [AdminArticlesController::class, 'index']);
 
     // Users
+    Route::get('users', [UsersController::class, 'index'])->name('.users');
     Route::put('users/{username}/ban', [UsersController::class, 'ban'])->name('.users.ban');
     Route::put('users/{username}/unban', [UsersController::class, 'unban'])->name('.users.unban');
     Route::delete('users/{username}', [UsersController::class, 'delete'])->name('.users.delete');
 
     // Articles
-    Route::get('articles', [AdminArticlesController::class, 'index'])->name('.articles');
     Route::put('articles/{article}/approve', [AdminArticlesController::class, 'approve'])->name('.articles.approve');
     Route::put('articles/{article}/disapprove', [AdminArticlesController::class, 'disapprove'])->name('.articles.disapprove');
     Route::put('articles/{article}/decline', [AdminArticlesController::class, 'decline'])->name('.articles.decline');

diff --git a/tests/Feature/AdminTest.php b/tests/Feature/AdminTest.php
@@ -121,7 +121,7 @@
 
     $this->loginAsAdmin();
 
-    $this->get('admin/articles')
+    $this->get('admin')
         ->see($submittedArticle->title())
         ->dontSee($draftArticle->title())
         ->dontSee($liveArticle->title());
@@ -134,7 +134,7 @@
 
     $this->loginAsModerator();
 
-    $this->get('admin/articles')
+    $this->get('admin')
         ->see($submittedArticle->title())
         ->dontSee($draftArticle->title())
         ->dontSee($liveArticle->title());
@@ -143,12 +143,12 @@
 test('users cannot list submitted articles', function () {
     $this->login();
 
-    $this->get('admin/articles')
+    $this->get('admin')
         ->assertForbidden();
 });
 
 test('guests cannot list submitted articles', function () {
-    $this->get('admin/articles')
+    $this->get('admin')
         ->assertRedirectedTo('login');
 });
 
@@ -335,7 +335,7 @@ function assertCanSeeTheUserOverview()
     User::factory()->create(['name' => 'Freek Murze']);
     User::factory()->create(['name' => 'Frederick Vanbrabant']);
 
-    test()->visit('/admin')
+    test()->visit('/admin/users')
         ->see('Freek Murze')
         ->see('Frederick Vanbrabant');
 }