From 37f701b105056cd25e2944591900df72b101aa29 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Fri, 3 Mar 2017 14:23:56 +0000
Subject: [PATCH] Remove route closures to allow route caching

---
 app/Http/Controllers/Admin/HomeController.php | 13 ++++++++++++
 app/Http/Controllers/AuthController.php       |  5 +++++
 .../Controllers/StaticRoutesController.php    | 18 +++++++++++++++++
 .../Controllers/WebMentionsController.php     |  5 +++++
 routes/api.php                                |  4 ++--
 routes/web.php                                | 20 +++++--------------
 6 files changed, 48 insertions(+), 17 deletions(-)
 create mode 100644 app/Http/Controllers/Admin/HomeController.php
 create mode 100644 app/Http/Controllers/StaticRoutesController.php

diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php
new file mode 100644
index 00000000..c48a79a4
--- /dev/null
+++ b/app/Http/Controllers/Admin/HomeController.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class HomeController extends Controller
+{
+    public function welcome()
+    {
+        return view('welcome', ['name' => config('admin.user')]);
+    }
+}
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 36be2076..b58ed184 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -6,6 +6,11 @@ use Illuminate\Http\Request;
 
 class AuthController extends Controller
 {
+    public function showLogin()
+    {
+        return view('login');
+    }
+
     /**
      * Log in a user, set a sesion variable, check credentials against
      * the .env file.
diff --git a/app/Http/Controllers/StaticRoutesController.php b/app/Http/Controllers/StaticRoutesController.php
new file mode 100644
index 00000000..44ceb1d8
--- /dev/null
+++ b/app/Http/Controllers/StaticRoutesController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class StaticRoutesController extends Controller
+{
+    public function projects()
+    {
+        return view('projects');
+    }
+
+    public function colophon()
+    {
+        return view('colophon');
+    }
+}
diff --git a/app/Http/Controllers/WebMentionsController.php b/app/Http/Controllers/WebMentionsController.php
index 105c22b5..41d8cc9b 100644
--- a/app/Http/Controllers/WebMentionsController.php
+++ b/app/Http/Controllers/WebMentionsController.php
@@ -11,6 +11,11 @@ use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 class WebMentionsController extends Controller
 {
+    public function get()
+    {
+        return view('webmention-endpoint');
+    }
+
     /**
      * Receive and process a webmention.
      *
diff --git a/routes/api.php b/routes/api.php
index c641ca5e..ae7df4d5 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -13,6 +13,6 @@ use Illuminate\Http\Request;
 |
 */
 
-Route::middleware('auth:api')->get('/user', function (Request $request) {
+/*Route::middleware('auth:api')->get('/user', function (Request $request) {
     return $request->user();
-});
+});*/
diff --git a/routes/web.php b/routes/web.php
index 2df0cbe2..357de369 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -15,19 +15,13 @@ Route::group(['domain' => config('url.longurl')], function () {
     Route::get('/', 'NotesController@index');
 
     //Static project page
-    Route::get('projects', function () {
-        return view('projects');
-    });
+    Route::get('projects', 'StaticRoutesController@projects');
 
     //Static colophon page
-    Route::get('colophon', function () {
-        return view('colophon');
-    });
+    Route::get('colophon', 'StaticRoutesController@colophon');
 
     //The login routes to get authe'd for admin
-    Route::get('login', ['as' => 'login', function () {
-        return view('login');
-    }]);
+    Route::get('login', 'AuthController@showLogin')->name('login');
     Route::post('login', 'AuthController@login');
 
     //Admin pages grouped for filter
@@ -36,9 +30,7 @@ Route::group(['domain' => config('url.longurl')], function () {
         'namespace' => 'Admin',
         'prefix' => 'admin',
     ], function () {
-        Route::get('/', function () {
-            return view('admin.welcome', ['name' => config('admin.user')]);
-        });
+        Route::get('/', 'HomeConrtoller@welcome');
 
         //Articles
         Route::group(['prefix' => 'blog'], function () {
@@ -125,9 +117,7 @@ Route::group(['domain' => config('url.longurl')], function () {
     Route::post('api/post', 'MicropubController@post');
 
     //webmention
-    Route::get('webmention', function () {
-        return view('webmention-endpoint');
-    });
+    Route::get('webmention', 'WebMentionsController@get');
     Route::post('webmention', 'WebMentionsController@receive');
 
     //Contacts