From c50d8a7b515345c24f41aa86a68d5fa177840591 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Wed, 15 Feb 2017 15:21:14 +0000
Subject: [PATCH] Tweaking of code, along with deleting cached view files have
 got tests working locally again

---
 app/Http/Controllers/ArticlesController.php   | 16 ++++-----
 app/Http/Controllers/ContactsController.php   |  2 +-
 app/Http/Controllers/NotesController.php      | 11 ++----
 ...singlepost.blade.php => article.blade.php} |  0
 resources/views/articles.blade.php            | 36 +++++++++++++++++++
 resources/views/contacts.blade.php            |  4 +--
 resources/views/multipost.blade.php           | 30 ----------------
 .../{singlenote.blade.php => note.blade.php}  |  0
 .../{allnotes.blade.php => notes.blade.php}   |  0
 resources/views/rss.blade.php                 |  7 +++-
 10 files changed, 56 insertions(+), 50 deletions(-)
 rename resources/views/{singlepost.blade.php => article.blade.php} (100%)
 create mode 100644 resources/views/articles.blade.php
 delete mode 100644 resources/views/multipost.blade.php
 rename resources/views/{singlenote.blade.php => note.blade.php} (100%)
 rename resources/views/{allnotes.blade.php => notes.blade.php} (100%)

diff --git a/app/Http/Controllers/ArticlesController.php b/app/Http/Controllers/ArticlesController.php
index 95ee9453..be0d500c 100644
--- a/app/Http/Controllers/ArticlesController.php
+++ b/app/Http/Controllers/ArticlesController.php
@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Article;
-use Illuminate\Http\Response;
 use Jonnybarnes\IndieWeb\Numbers;
 
 class ArticlesController extends Controller
@@ -16,11 +15,11 @@ class ArticlesController extends Controller
     public function showAllArticles($year = null, $month = null)
     {
         $articles = Article::where('published', '1')
-                    ->date($year, $month)
-                    ->orderBy('updated_at', 'desc')
-                    ->simplePaginate(5);
+                        ->date($year, $month)
+                        ->orderBy('updated_at', 'desc')
+                        ->simplePaginate(5);
 
-        return view('multipost', ['data' => $articles]);
+        return view('articles', compact('articles'));
     }
 
     /**
@@ -35,7 +34,7 @@ class ArticlesController extends Controller
             throw new \Exception;
         }
 
-        return view('singlepost', ['article' => $article]);
+        return view('article', compact('article'));
     }
 
     /**
@@ -62,8 +61,9 @@ class ArticlesController extends Controller
     {
         $articles = Article::where('published', '1')->orderBy('updated_at', 'desc')->get();
         $buildDate = $articles->first()->updated_at->toRssString();
-        $contents = (string) view('rss', ['articles' => $articles, 'buildDate' => $buildDate]);
 
-        return (new Response($contents, '200'))->header('Content-Type', 'application/rss+xml');
+        return response()
+                    ->view('rss', compact('articles', 'buildDate'), 200)
+                    ->header('Content-Type', 'application/rss+xml');
     }
 }
diff --git a/app/Http/Controllers/ContactsController.php b/app/Http/Controllers/ContactsController.php
index 19e67356..7824ef62 100644
--- a/app/Http/Controllers/ContactsController.php
+++ b/app/Http/Controllers/ContactsController.php
@@ -25,7 +25,7 @@ class ContactsController extends Controller
                 '/assets/profile-images/default-image';
         }
 
-        return view('contacts', ['contacts' => $contacts]);
+        return view('contacts', compact('contacts'));
     }
 
     /**
diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php
index ee25f641..f964e52e 100644
--- a/app/Http/Controllers/NotesController.php
+++ b/app/Http/Controllers/NotesController.php
@@ -63,7 +63,7 @@ class NotesController extends Controller
 
         $homepage = ($request->path() == '/');
 
-        return view('allnotes', ['notes' => $notes, 'homepage' => $homepage]);
+        return view('notes', compact('notes', 'homepage'));
     }
 
     /**
@@ -161,12 +161,7 @@ class NotesController extends Controller
         }
         $note->photoURLs = $photoURLs;
 
-        return view('singlenote', [
-            'note' => $note,
-            'replies' => $replies,
-            'reposts' => $reposts,
-            'likes' => $likes,
-        ]);
+        return view('note', compact('note', 'replies', 'reposts', 'likes'));
     }
 
     /**
@@ -201,7 +196,7 @@ class NotesController extends Controller
             $note->human_time = $note->updated_at->diffForHumans();
         }
 
-        return view('taggednotes', ['notes' => $notes, 'tag' => $tag]);
+        return view('taggednotes', compact('notes', 'tag'));
     }
 
     /**
diff --git a/resources/views/singlepost.blade.php b/resources/views/article.blade.php
similarity index 100%
rename from resources/views/singlepost.blade.php
rename to resources/views/article.blade.php
diff --git a/resources/views/articles.blade.php b/resources/views/articles.blade.php
new file mode 100644
index 00000000..19b57894
--- /dev/null
+++ b/resources/views/articles.blade.php
@@ -0,0 +1,36 @@
+@extends('master')
+
+@section('title')
+Articles «
+@stop
+
+@section('content')
+
+@if (count($articles) == 0)
+<p>No articles exist for this time.</p>
+@endif
+
+@foreach ($articles as $article)
+    @if ($article->url != '')<article class="link h-entry">@else<article class="h-entry">@endif
+        <header>
+            <h1 class="p-name">
+            @if($article->url == '')
+                <a href="{{ $article->link }}">{{ $article->title }}</a>
+            @else
+                <a href="{{ $article->url }}">{{ $article->title }}</a>
+            @endif
+            </h1>
+            <span class="post-info">Posted <time class="dt-published" title="{{ $article->tooltip_time }}" datetime="{{ $article->w3c_time }}">{{ $article->human_time }}</time> - <a title="Permalink" href="{{ $article->link }}">⚓</a></span>
+        </header>
+        <div class="e-content">
+            {!! $article['main'] !!}
+        </div>
+    </article>
+@endforeach
+{{ $articles->links() }}
+@stop
+
+@section('scripts')
+<script src="/assets/prism/prism.js"></script>
+<link rel="stylesheet" href="/assets/prism/prism.css">
+@stop
diff --git a/resources/views/contacts.blade.php b/resources/views/contacts.blade.php
index 5238aa74..31427ad5 100644
--- a/resources/views/contacts.blade.php
+++ b/resources/views/contacts.blade.php
@@ -1,11 +1,11 @@
 @extends('master')
 
 @section('title')
-Contacts « 
+Contacts «
 @stop
 
 @section('content')
 @foreach($contacts as $contact)
-@include('templates.contact', array('contact' => $contact))
+    @include('templates.contact', ['contact' => $contact])
 @endforeach
 @stop
diff --git a/resources/views/multipost.blade.php b/resources/views/multipost.blade.php
deleted file mode 100644
index 144b3a3e..00000000
--- a/resources/views/multipost.blade.php
+++ /dev/null
@@ -1,30 +0,0 @@
-@extends('master')
-
-@section('title')
-Articles « 
-@stop
-
-@section('content')
-@if (count($data) == 0)
-<p>No articles exist for this time.</p>
-@endif
-@foreach ($data as $article)
-@if ($article['url'] != '')<article class="link h-entry">@else<article class="h-entry">@endif
-<header>
-<h1 class="p-name">
-<a href="@if($article['url'] == ''){{ $article['link'] }}@else{{ $article['url'] }}@endif">{{ $article['title'] }}</a>
-</h1>
-<span class="post-info">Posted <time class="dt-published" title="{{ $article['tooltip_time'] }}" datetime="{{ $article['w3c_time'] }}">{{ $article['human_time'] }}</time> - <a title="Permalink" href="{{ $article['link'] }}">⚓</a></span>
-</header>
-<div class="e-content">
-{!! $article['main'] !!}
-</div>
-</article>
-@endforeach
-{!! $data->render() !!}
-@stop
-
-@section('scripts')
-<script src="/assets/prism/prism.js"></script>
-<link rel="stylesheet" href="/assets/prism/prism.css">
-@stop
diff --git a/resources/views/singlenote.blade.php b/resources/views/note.blade.php
similarity index 100%
rename from resources/views/singlenote.blade.php
rename to resources/views/note.blade.php
diff --git a/resources/views/allnotes.blade.php b/resources/views/notes.blade.php
similarity index 100%
rename from resources/views/allnotes.blade.php
rename to resources/views/notes.blade.php
diff --git a/resources/views/rss.blade.php b/resources/views/rss.blade.php
index 58aa50d2..f6c0253f 100644
--- a/resources/views/rss.blade.php
+++ b/resources/views/rss.blade.php
@@ -11,7 +11,12 @@
   @foreach($articles as $article)
   <item>
     <title>{{ strip_tags($article->title) }}</title>
-    <description><![CDATA[{{ $article->main }}@if($article->url)<p><a href="{{ config('app.url') }}{{ $article->link }}">Permalink</a></p>@endif]]></description>
+    <description>
+        <![CDATA[
+            {{ $article->main }}
+            @if($article->url)<p><a href="{{ config('app.url') }}{{ $article->link }}">Permalink</a></p>@endif
+        ]]>
+    </description>
     <link>@if($article->url != ''){{ $article->url }}@else{{ config('app.url') }}{{ $article->link }}@endif</link>
     <guid>{{ config('app.url') }}{{ $article->link }}</guid>
     <pubDate>{{ $article->pubdate }}</pubDate>