From d18247e68dafd9006942bac01028e81814b4b09f Mon Sep 17 00:00:00 2001
From: "Christopher C. Wells" <git@chris-wells.net>
Date: Tue, 20 Apr 2021 15:21:36 -0700
Subject: [PATCH] Reorganize routes in to middleware groups

---
 routes/admin.php | 15 +++++++++++++++
 routes/auth.php  | 40 ++++++++++++++++++++++++++++++++--------
 routes/guest.php | 15 +++++++++++++++
 routes/web.php   | 33 ++-------------------------------
 4 files changed, 64 insertions(+), 39 deletions(-)
 create mode 100644 routes/admin.php
 create mode 100644 routes/guest.php

diff --git a/routes/admin.php b/routes/admin.php
new file mode 100644
index 0000000..42ff408
--- /dev/null
+++ b/routes/admin.php
@@ -0,0 +1,15 @@
+<?php
+
+use App\Http\Controllers\UserController;
+use Illuminate\Support\Facades\Route;
+
+/*
+|--------------------------------------------------------------------------
+| Admin Routes
+|--------------------------------------------------------------------------
+*/
+
+Route::middleware(['auth', 'can:administer'])->group(function () {
+    Route::resource('users', UserController::class);
+    Route::get('/users/{user}/delete', [UserController::class, 'delete'])->name('users.delete');
+});
diff --git a/routes/auth.php b/routes/auth.php
index de79ff2..3813b29 100644
--- a/routes/auth.php
+++ b/routes/auth.php
@@ -1,15 +1,39 @@
 <?php
 
+use App\Http\Controllers\FoodController;
+use App\Http\Controllers\GoalController;
+use App\Http\Controllers\IngredientPickerController;
+use App\Http\Controllers\JournalEntryController;
+use App\Http\Controllers\RecipeController;
 use App\Http\Controllers\Auth\AuthenticatedSessionController;
 use Illuminate\Support\Facades\Route;
 
-Route::get('/login', [AuthenticatedSessionController::class, 'create'])
-                ->middleware('guest')
-                ->name('login');
+/*
+|--------------------------------------------------------------------------
+| Authorized User Routes
+|--------------------------------------------------------------------------
+*/
 
-Route::post('/login', [AuthenticatedSessionController::class, 'store'])
-                ->middleware('guest');
+Route::middleware(['auth'])->group(function () {
+    Route::post('/logout', [AuthenticatedSessionController::class, 'destroy'])->name('logout');
+    // Foods.
+    Route::resource('foods', FoodController::class);
+    Route::get('/foods/{food}/delete', [FoodController::class, 'delete'])->name('foods.delete');
 
-Route::post('/logout', [AuthenticatedSessionController::class, 'destroy'])
-                ->middleware('auth')
-                ->name('logout');
+    // Goals.
+    Route::resource('goals', GoalController::class);
+    Route::get('/goals/{goal}/delete', [GoalController::class, 'delete'])->name('goals.delete');
+
+    // Ingredient picker.
+    Route::get('/ingredient-picker/search', [IngredientPickerController::class, 'search'])->name('ingredient-picker.search');
+
+    // Journal entries.
+    Route::get('/journal-entries/create/from-nutrients', [JournalEntryController::class, 'createFromNutrients'])->name('journal-entries.create.from-nutrients');
+    Route::post('/journal-entries/create/from-nutrients', [JournalEntryController::class, 'storeFromNutrients'])->name('journal-entries.store.from-nutrients');
+    Route::resource('journal-entries', JournalEntryController::class);
+    Route::get('/journal-entries/{journal_entry}/delete', [JournalEntryController::class, 'delete'])->name('journal-entries.delete');
+
+    // Recipes.
+    Route::resource('recipes', RecipeController::class);
+    Route::get('/recipes/{recipe}/delete', [RecipeController::class, 'delete'])->name('recipes.delete');
+});
diff --git a/routes/guest.php b/routes/guest.php
new file mode 100644
index 0000000..c866570
--- /dev/null
+++ b/routes/guest.php
@@ -0,0 +1,15 @@
+<?php
+
+use App\Http\Controllers\Auth\AuthenticatedSessionController;
+use Illuminate\Support\Facades\Route;
+
+/*
+|--------------------------------------------------------------------------
+| Guest Routes
+|--------------------------------------------------------------------------
+*/
+
+Route::middleware(['guest'])->group(function () {
+    Route::get('/login', [AuthenticatedSessionController::class, 'create'])->name('login');
+    Route::post('/login', [AuthenticatedSessionController::class, 'store']);
+});
diff --git a/routes/web.php b/routes/web.php
index abfb61c..6b056d0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,11 +1,5 @@
 <?php
 
-use App\Http\Controllers\FoodController;
-use App\Http\Controllers\GoalController;
-use App\Http\Controllers\IngredientPickerController;
-use App\Http\Controllers\JournalEntryController;
-use App\Http\Controllers\RecipeController;
-use App\Http\Controllers\UserController;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Route;
@@ -25,29 +19,6 @@ Route::get('/', function (): RedirectResponse {
     return new RedirectResponse(RouteServiceProvider::HOME);
 });
 
-// Foods.
-Route::resource('foods', FoodController::class)->middleware(['auth']);
-Route::get('/foods/{food}/delete', [FoodController::class, 'delete'])->middleware(['auth'])->name('foods.delete');
-
-// Goals.
-Route::resource('goals', GoalController::class)->middleware(['auth']);
-Route::get('/goals/{goal}/delete', [GoalController::class, 'delete'])->middleware(['auth'])->name('goals.delete');
-
-// Ingredient picker.
-Route::get('/ingredient-picker/search', [IngredientPickerController::class, 'search'])->middleware(['auth'])->name('ingredient-picker.search');
-
-// Journal entries.
-Route::get('/journal-entries/create/from-nutrients', [JournalEntryController::class, 'createFromNutrients'])->middleware(['auth'])->name('journal-entries.create.from-nutrients');
-Route::post('/journal-entries/create/from-nutrients', [JournalEntryController::class, 'storeFromNutrients'])->middleware(['auth'])->name('journal-entries.store.from-nutrients');
-Route::resource('journal-entries', JournalEntryController::class)->middleware(['auth']);
-Route::get('/journal-entries/{journal_entry}/delete', [JournalEntryController::class, 'delete'])->middleware(['auth'])->name('journal-entries.delete');
-
-// Recipes.
-Route::resource('recipes', RecipeController::class)->middleware(['auth']);
-Route::get('/recipes/{recipe}/delete', [RecipeController::class, 'delete'])->middleware(['auth'])->name('recipes.delete');
-
-// Users.
-Route::resource('users', UserController::class)->middleware(['auth']);
-Route::get('/users/{user}/delete', [UserController::class, 'delete'])->middleware(['auth'])->name('users.delete');
-
+require __DIR__.'/guest.php';
 require __DIR__.'/auth.php';
+require __DIR__.'/admin.php';