Move admin controllers to own namespace, and give better method names

app/Http/Controllers/Admin/AdminController.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
 
 class AdminController extends Controller
 {

app/Http/Controllers/Admin/ArticlesAdminController.php

@@ -1,30 +1,19 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Admin;
 
 use App\Article;
 use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
 
 class ArticlesAdminController extends Controller
 {
-    /**
-     * Show the new article form.
-     *
-     * @return \Illuminate\View\Factory view
-     */
-    public function newArticle()
-    {
-        $message = session('message');
-
-        return view('admin.newarticle', ['message' => $message]);
-    }
-
     /**
      * List the articles that can be edited.
      *
      * @return \Illuminate\View\Factory view
      */
-    public function listArticles()
+    public function index()
     {
         $posts = Article::select('id', 'title', 'published')->orderBy('id', 'desc')->get();
 
@@ -32,32 +21,15 @@ class ArticlesAdminController extends Controller
     }
 
     /**
-     * Show the edit form for an existing article.
+     * Show the new article form.
      *
-     * @param  string  The article id
      * @return \Illuminate\View\Factory view
      */
-    public function editArticle($articleId)
+    public function create()
     {
-        $post = Article::select(
+        $message = session('message');
-            'title',
-            'main',
-            'url',
-            'published'
-        )->where('id', $articleId)->get();
 
-        return view('admin.editarticle', ['id' => $articleId, 'post' => $post]);
+        return view('admin.newarticle', ['message' => $message]);
-    }
-
-    /**
-     * Show the delete confirmation form for an article.
-     *
-     * @param  string  The article id
-     * @return \Illuminate\View\Factory view
-     */
-    public function deleteArticle($articleId)
-    {
-        return view('admin.deletearticle', ['id' => $articleId]);
     }
 
     /**
@@ -66,7 +38,7 @@ class ArticlesAdminController extends Controller
      * @param  \Illuminate\Http\Request $request
      * @return \Illuminate\View\Factory view
      */
-    public function postNewArticle(Request $request)
+    public function store(Request $request)
     {
         $published = $request->input('published');
         if ($published == null) {
@@ -102,14 +74,32 @@ class ArticlesAdminController extends Controller
         return view('admin.newarticlesuccess', ['id' => $article->id, 'title' => $article->title]);
     }
 
+    /**
+     * Show the edit form for an existing article.
+     *
+     * @param  string  The article id
+     * @return \Illuminate\View\Factory view
+     */
+    public function edit($articleId)
+    {
+        $post = Article::select(
+            'title',
+            'main',
+            'url',
+            'published'
+        )->where('id', $articleId)->get();
+
+        return view('admin.editarticle', ['id' => $articleId, 'post' => $post]);
+    }
+
     /**
      * Process an incoming request to edit an article.
      *
-     * @param  string
      * @param  \Illuminate\Http\Request $request
+     * @param  string
      * @return \Illuminate|View\Factory view
      */
-    public function postEditArticle($articleId, Request $request)
+    public function update(Request $request, $articleId)
     {
         $published = $request->input('published');
         if ($published == null) {
@@ -125,13 +115,24 @@ class ArticlesAdminController extends Controller
         return view('admin.editarticlesuccess', ['id' => $articleId]);
     }
 
+    /**
+     * Show the delete confirmation form for an article.
+     *
+     * @param  string  The article id
+     * @return \Illuminate\View\Factory view
+     */
+    public function delete($articleId)
+    {
+        return view('admin.deletearticle', ['id' => $articleId]);
+    }
+
     /**
      * Process a request to delete an aricle.
      *
      * @param  string The article id
      * @return \Illuminate\View\Factory view
      */
-    public function postDeleteArticle($articleId)
+    public function destroy($articleId)
     {
         Article::where('id', $articleId)->delete();
 

app/Http/Controllers/Admin/ClientsAdminController.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Admin;
 
 use App\MicropubClient;
+use App\Http\Controllers\Controller;
 
 class ClientsAdminController extends Controller
 {
@@ -11,7 +12,7 @@ class ClientsAdminController extends Controller
      *
      * @return \Illuminate\View\Factory view
      */
-    public function listClients()
+    public function index()
     {
         $clients = MicropubClient::all();
 
@@ -23,34 +24,18 @@ class ClientsAdminController extends Controller
      *
      * @return \Illuminate\View\Factory view
      */
-    public function newClient()
+    public function create()
     {
         return view('admin.newclient');
     }
 
-    /**
-     * Process the request to adda new client name.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return \Illuminate\View\Factory view
-     */
-    public function postNewClient(Request $request)
-    {
-        MicropubClient::create([
-            'client_url' => $request->input('client_url'),
-            'client_name' => $request->input('client_name'),
-        ]);
-
-        return view('admin.newclientsuccess');
-    }
-
     /**
      * Show a form to edit a client name.
      *
      * @param  string The client id
      * @return \Illuminate\View\Factory view
      */
-    public function editClient($clientId)
+    public function edit($clientId)
     {
         $client = MicropubClient::findOrFail($clientId);
 
@@ -61,6 +46,22 @@ class ClientsAdminController extends Controller
         ]);
     }
 
+    /**
+     * Process the request to adda new client name.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\View\Factory view
+     */
+    public function store(Request $request)
+    {
+        MicropubClient::create([
+            'client_url' => $request->input('client_url'),
+            'client_name' => $request->input('client_name'),
+        ]);
+
+        return view('admin.newclientsuccess');
+    }
+
     /**
      * Process the request to edit a client name.
      *
@@ -68,7 +69,7 @@ class ClientsAdminController extends Controller
      * @param  \Illuminate\Http\Request $request
      * @return \Illuminate\View\Factory view
      */
-    public function postEditClient($clientId, Request $request)
+    public function update($clientId, Request $request)
     {
         $client = MicropubClient::findOrFail($clientId);
         if ($request->input('edit')) {

app/Http/Controllers/Admin/ContactsAdminController.php

@@ -1,43 +1,44 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Admin;
 
 use App\Contact;
 use GuzzleHttp\Client;
 use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
 use Illuminate\Filesystem\Filesystem;
 
 class ContactsAdminController extends Controller
 {
-    /**
-     * Display the form to add a new contact.
-     *
-     * @return \Illuminate\View\Factory view
-     */
-    public function newContact()
-    {
-        return view('admin.newcontact');
-    }
-
     /**
      * List the currect contacts that can be edited.
      *
      * @return \Illuminate\View\Factory view
      */
-    public function listContacts()
+    public function index()
     {
         $contacts = Contact::all();
 
         return view('admin.listcontacts', ['contacts' => $contacts]);
     }
 
+    /**
+     * Display the form to add a new contact.
+     *
+     * @return \Illuminate\View\Factory view
+     */
+    public function create()
+    {
+        return view('admin.newcontact');
+    }
+
     /**
      * Show the form to edit an existing contact.
      *
      * @param  string  The contact id
      * @return \Illuminate\View\Factory view
      */
-    public function editContact($contactId)
+    public function edit($contactId)
     {
         $contact = Contact::findOrFail($contactId);
 
@@ -49,7 +50,7 @@ class ContactsAdminController extends Controller
      *
      * @return \Illuminate\View\Factory view
      */
-    public function deleteContact($contactId)
+    public function delete($contactId)
     {
         return view('admin.deletecontact', ['id' => $contactId]);
     }
@@ -60,7 +61,7 @@ class ContactsAdminController extends Controller
      * @param  \Illuminate\Http|request $request
      * @return \Illuminate\View\Factory view
      */
-    public function postNewContact(Request $request)
+    public function store(Request $request)
     {
         $contact = new Contact();
         $contact->name = $request->input('name');
@@ -82,7 +83,7 @@ class ContactsAdminController extends Controller
      * @param  \Illuminate\Http\Request $request
      * @return \Illuminate\View\Factory view
      */
-    public function postEditContact($contactId, Request $request)
+    public function update($contactId, Request $request)
     {
         $contact = Contact::findOrFail($contactId);
         $contact->name = $request->input('name');
@@ -113,7 +114,7 @@ class ContactsAdminController extends Controller
      * @param  string  The contact id
      * @return \Illuminate\View\Factory view
      */
-    public function postDeleteContact($contactId)
+    public function destroy($contactId)
     {
         $contact = Contact::findOrFail($contactId);
         $contact->delete();

app/Http/Controllers/Admin/NotesAdminController.php

@@ -1,12 +1,13 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Admin;
 
 use App\Note;
 use Validator;
 use Illuminate\Http\Request;
 use App\Jobs\SendWebMentions;
 use App\Services\NoteService;
+use App\Http\Controllers\Controller;
 
 class NotesAdminController extends Controller
 {
@@ -17,22 +18,12 @@ class NotesAdminController extends Controller
         $this->noteService = $noteService ?? new NoteService();
     }
 
-    /**
-     * Show the form to make a new note.
-     *
-     * @return \Illuminate\View\Factory view
-     */
-    public function newNotePage()
-    {
-        return view('admin.newnote');
-    }
-
     /**
      * List the notes that can be edited.
      *
      * @return \Illuminate\View\Factory view
      */
-    public function listNotesPage()
+    public function index()
     {
         $notes = Note::select('id', 'note')->orderBy('id', 'desc')->get();
         foreach ($notes as $note) {
@@ -43,14 +34,13 @@ class NotesAdminController extends Controller
     }
 
     /**
-     * The delete note page.
+     * Show the form to make a new note.
      *
-     * @param  int id
+     * @return \Illuminate\View\Factory view
-     * @return view
      */
-    public function deleteNotePage($id)
+    public function create()
     {
-        return view('admin.deletenote', ['id' => $id]);
+        return view('admin.newnote');
     }
 
     /**
@@ -59,7 +49,7 @@ class NotesAdminController extends Controller
      * @param  string The note id
      * @return \Illuminate\View\Factory view
      */
-    public function editNotePage($noteId)
+    public function edit($noteId)
     {
         $note = Note::find($noteId);
         $note->originalNote = $note->getOriginal('note');
@@ -67,13 +57,24 @@ class NotesAdminController extends Controller
         return view('admin.editnote', ['id' => $noteId, 'note' => $note]);
     }
 
+    /**
+     * The delete note page.
+     *
+     * @param  int id
+     * @return view
+     */
+    public function delete($noteId)
+    {
+        return view('admin.deletenote', ['id' => $id]);
+    }
+
     /**
      * Process a request to make a new note.
      *
      * @param Illuminate\Http\Request $request
      * @todo  Sort this mess out
      */
-    public function createNote(Request $request)
+    public function store(Request $request)
     {
         $validator = Validator::make(
             $request->all(),
@@ -101,7 +102,7 @@ class NotesAdminController extends Controller
      * @param  \Illuminate\Http\Request $request
      * @return \Illuminate\View\Factory view
      */
-    public function editNote($noteId, Request $request)
+    public function update($noteId, Request $request)
     {
         //update note data
         $note = Note::findOrFail($noteId);
@@ -122,7 +123,7 @@ class NotesAdminController extends Controller
      * @param  int id
      * @return view
      */
-    public function deleteNote($id)
+    public function destroy($id)
     {
         $note = Note::findOrFail($id);
         $note->delete();

app/Http/Controllers/Admin/PlacesAdminController.php

@@ -1,9 +1,10 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Admin;
 
 use App\Place;
 use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
 use Phaza\LaravelPostgis\Geometries\Point;
 
 class PlacesAdminController extends Controller
@@ -13,7 +14,7 @@ class PlacesAdminController extends Controller
      *
      * @return \Illuminate\View\Factory view
      */
-    public function listPlacesPage()
+    public function index()
     {
         $places = Place::all();
 
@@ -25,7 +26,7 @@ class PlacesAdminController extends Controller
      *
      * @return \Illuminate\View\Factory view
      */
-    public function newPlacePage()
+    public function create()
     {
         return view('admin.newplace');
     }
@@ -36,7 +37,7 @@ class PlacesAdminController extends Controller
      * @param  string The place id
      * @return \Illuminate\View\Factory view
      */
-    public function editPlacePage($placeId)
+    public function edit($placeId)
     {
         $place = Place::findOrFail($placeId);
 
@@ -58,7 +59,7 @@ class PlacesAdminController extends Controller
      * @param  Illuminate\Http\Request $request
      * @return Illuminate\View\Factory view
      */
-    public function createPlace(Request $request)
+    public function store(Request $request)
     {
         $this->placeService->createPlace($request);
 
@@ -72,7 +73,7 @@ class PlacesAdminController extends Controller
      * @param Illuminate\Http\Request $request
      * @return Illuminate\View\Factory view
      */
-    public function editPlace($placeId, Request $request)
+    public function update($placeId, Request $request)
     {
         $place = Place::findOrFail($placeId);
         $place->name = $request->name;

routes/web.php

@@ -31,26 +31,26 @@ Route::group(['domain' => config('url.longurl')], function () {
     Route::post('login', 'AuthController@login');
 
     //Admin pages grouped for filter
-    Route::group(['middleware' => 'myauth'], function () {
+    Route::group(['middleware' => 'myauth', 'namespace' => 'Admin'], function () {
         Route::get('admin', 'AdminController@showWelcome');
 
         //Articles
-        Route::get('admin/blog/new', 'ArticlesAdminController@newArticle');
+        Route::get('admin/blog/new', 'ArticlesAdminController@create');
-        Route::get('admin/blog/edit', 'ArticlesAdminController@listArticles');
+        Route::get('admin/blog/edit', 'ArticlesAdminController@index');
-        Route::get('admin/blog/edit/{id}', 'ArticlesAdminController@editArticle');
+        Route::get('admin/blog/edit/{id}', 'ArticlesAdminController@edit');
-        Route::get('admin/blog/delete/{id}', 'ArticlesAdminController@deleteArticle');
+        Route::get('admin/blog/delete/{id}', 'ArticlesAdminController@delete');
-        Route::post('admin/blog/new', 'ArticlesAdminController@postNewArticle');
+        Route::post('admin/blog/new', 'ArticlesAdminController@store');
-        Route::post('admin/blog/edit/{id}', 'ArticlesAdminController@postEditArticle');
+        Route::post('admin/blog/edit/{id}', 'ArticlesAdminController@update');
-        Route::post('admin/blog/delete/{id}', 'ArticlesAdminController@postDeleteArticle');
+        Route::post('admin/blog/delete/{id}', 'ArticlesAdminController@detroy');
 
         //Notes
-        Route::get('admin/note/new', 'NotesAdminController@newNotePage');
+        Route::get('admin/note/edit', 'NotesAdminController@index');
-        Route::get('admin/note/edit', 'NotesAdminController@listNotesPage');
+        Route::get('admin/note/new', 'NotesAdminController@create');
-        Route::get('admin/note/edit/{id}', 'NotesAdminController@editNotePage');
+        Route::get('admin/note/edit/{id}', 'NotesAdminController@edit');
-        Route::get('admin/note/delete/{id}', 'NotesAdminController@deleteNotePage');
+        Route::get('admin/note/delete/{id}', 'NotesAdminController@delete');
-        Route::post('admin/note/new', 'NotesAdminController@createNote');
+        Route::post('admin/note/new', 'NotesAdminController@store');
-        Route::post('admin/note/edit/{id}', 'NotesAdminController@editNote');
+        Route::post('admin/note/edit/{id}', 'NotesAdminController@update');
-        Route::post('admin/note/delete/{id}', 'NotesAdminController@deleteNote');
+        Route::post('admin/note/delete/{id}', 'NotesAdminController@destroy');
 
         //Tokens
         Route::get('admin/tokens', 'TokensController@showTokens');
@@ -58,28 +58,28 @@ Route::group(['domain' => config('url.longurl')], function () {
         Route::post('admin/tokens/delete/{id}', 'TokensController@postDeleteToken');
 
         //Micropub Clients
-        Route::get('admin/clients', 'ClientsAdminController@listClients');
+        Route::get('admin/clients', 'ClientsAdminController@index');
-        Route::get('admin/clients/new', 'ClientsAdminController@newClient');
+        Route::get('admin/clients/new', 'ClientsAdminController@create');
-        Route::get('admin/clients/edit/{id}', 'ClientsAdminController@editClient');
+        Route::get('admin/clients/edit/{id}', 'ClientsAdminController@edit');
-        Route::post('admin/clients/new', 'ClientsAdminController@postNewClient');
+        Route::post('admin/clients/new', 'ClientsAdminController@store');
-        Route::post('admin/clients/edit/{id}', 'ClientsAdminController@postEditClient');
+        Route::post('admin/clients/edit/{id}', 'ClientsAdminController@update');
 
         //Contacts
-        Route::get('admin/contacts/new', 'ContactsAdminController@newContact');
+        Route::get('admin/contacts/edit', 'ContactsAdminController@index');
-        Route::get('admin/contacts/edit', 'ContactsAdminController@listContacts');
+        Route::get('admin/contacts/new', 'ContactsAdminController@create');
-        Route::get('admin/contacts/edit/{id}', 'ContactsAdminController@editContact');
+        Route::get('admin/contacts/edit/{id}', 'ContactsAdminController@edit');
+        Route::get('admin/contacts/delete/{id}', 'ContactsAdminController@delete');
+        Route::post('admin/contacts/new', 'ContactsAdminController@store');
+        Route::post('admin/contacts/edit/{id}', 'ContactsAdminController@update');
+        Route::post('admin/contacts/delete/{id}', 'ContactsAdminController@destroy');
         Route::get('admin/contacts/edit/{id}/getavatar', 'ContactsAdminController@getAvatar');
-        Route::get('admin/contacts/delete/{id}', 'ContactsAdminController@deleteContact');
-        Route::post('admin/contacts/new', 'ContactsAdminController@postNewContact');
-        Route::post('admin/contacts/edit/{id}', 'ContactsAdminController@postEditContact');
-        Route::post('admin/contacts/delete/{id}', 'ContactsAdminController@postDeleteContact');
 
         //Places
-        Route::get('admin/places/new', 'PlacesAdminController@newPlacePage');
+        Route::get('admin/places/edit', 'PlacesAdminController@index');
-        Route::get('admin/places/edit', 'PlacesAdminController@listPlacesPage');
+        Route::get('admin/places/new', 'PlacesAdminController@create');
-        Route::get('admin/places/edit/{id}', 'PlacesAdminController@editPlacePage');
+        Route::get('admin/places/edit/{id}', 'PlacesAdminController@edit');
-        Route::post('admin/places/new', 'PlacesAdminController@createPlace');
+        Route::post('admin/places/new', 'PlacesAdminController@store');
-        Route::post('admin/places/edit/{id}', 'PlacesAdminController@editPlace');
+        Route::post('admin/places/edit/{id}', 'PlacesAdminController@update');
     });
 
     //Blog pages using ArticlesController