+ @if($article->url == '') + {{ $article->title }} + @else + {{ $article->title }} + @endif +
+ Posted - ⚓ +No articles exist for this time.
-@endif -@foreach ($data as $article) -@if ($article['url'] != '')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) +
No articles exist for this time.
+@endif + +@foreach ($articles as $article) + @if ($article->url != '')No articles exist for this time.
-@endif -@foreach ($data as $article) -@if ($article['url'] != '')