From 4af305ba3bc601b38ac10dd2e865ea91a414cbbf Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Wed, 15 Feb 2017 18:41:54 +0000
Subject: [PATCH] Refactor method names/views for Contacts

---
 app/Http/Controllers/ContactsController.php               | 8 ++++----
 .../{contacts.blade.php => contacts/index.blade.php}      | 0
 .../views/{contact.blade.php => contacts/show.blade.php}  | 0
 routes/web.php                                            | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename resources/views/{contacts.blade.php => contacts/index.blade.php} (100%)
 rename resources/views/{contact.blade.php => contacts/show.blade.php} (100%)

diff --git a/app/Http/Controllers/ContactsController.php b/app/Http/Controllers/ContactsController.php
index 7824ef62..46573423 100644
--- a/app/Http/Controllers/ContactsController.php
+++ b/app/Http/Controllers/ContactsController.php
@@ -12,7 +12,7 @@ class ContactsController extends Controller
      *
      * @return \Illuminate\View\Factory view
      */
-    public function showAll()
+    public function index()
     {
         $filesystem = new Filesystem();
         $contacts = Contact::all();
@@ -25,7 +25,7 @@ class ContactsController extends Controller
                 '/assets/profile-images/default-image';
         }
 
-        return view('contacts', compact('contacts'));
+        return view('contacts.index', compact('contacts'));
     }
 
     /**
@@ -33,7 +33,7 @@ class ContactsController extends Controller
      *
      * @return \Illuminate\View\Factory view
      */
-    public function showSingle($nick)
+    public function show($nick)
     {
         $filesystem = new Filesystem();
         $contact = Contact::where('nick', '=', $nick)->firstOrFail();
@@ -44,6 +44,6 @@ class ContactsController extends Controller
         :
             '/assets/profile-images/default-image';
 
-        return view('contact', ['contact' => $contact]);
+        return view('contacts.show', ['contact' => $contact]);
     }
 }
diff --git a/resources/views/contacts.blade.php b/resources/views/contacts/index.blade.php
similarity index 100%
rename from resources/views/contacts.blade.php
rename to resources/views/contacts/index.blade.php
diff --git a/resources/views/contact.blade.php b/resources/views/contacts/show.blade.php
similarity index 100%
rename from resources/views/contact.blade.php
rename to resources/views/contacts/show.blade.php
diff --git a/routes/web.php b/routes/web.php
index 53873c38..5f732f3e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -118,8 +118,8 @@ Route::group(['domain' => config('url.longurl')], function () {
     Route::post('webmention', 'WebMentionsController@receive');
 
     //Contacts
-    Route::get('contacts', 'ContactsController@showAll');
-    Route::get('contacts/{nick}', 'ContactsController@showSingle');
+    Route::get('contacts', 'ContactsController@index');
+    Route::get('contacts/{nick}', 'ContactsController@show');
 
     //Places
     Route::get('places', 'PlacesController@index');