jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Tweaking of code, along with deleting cached view files have got tests working locally again

Browse source
This commit is contained in:
Jonny Barnes 2017-02-15 15:21:14 +00:00
parent 721cbc541b
commit c50d8a7b51
10 changed files with 56 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/Http/Controllers/ArticlesController.php
View file

@ -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');
}
}