vict3459/Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v1.4.4 Made news expiration date, add category to app homepages, made small css things

Browse Source
This commit is contained in:
victor
2020-10-07 15:27:29 +02:00
parent f70d6a7a95
commit 22694bd0fb
15 changed files with 83 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/RootController.php
+11 -2
View File
@@ -7,6 +7,8 @@ use App\News;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
date_default_timezone_set('Europe/Copenhagen');
class RootController extends Controller
{
function __construct()
@@ -18,6 +20,13 @@ class RootController extends Controller
public function index() {
$perPage = 5;
//Delete news Articels
$news = News::query()->where('news_expiration_date', '<=', date('Y-m-d').'T'.date('H:i'))->get();
foreach ($news as $new) {
$new->delete();
}
//All news
$newsCollection = News::query()->orderBy('id', 'desc')->get();
@@ -34,12 +43,12 @@ class RootController extends Controller
if(Response::detect("root.index")->name() == "admin.root.index")
return view("admin.root.index");
else {
$news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->orderBy('news.id', 'desc')->get();
$news = News::query()->select(['news_types.type', 'news.subname', 'news.id', 'news.resource_id', 'news.created_at', 'news.arrangement_id', 'news.content' ])->join('news_types', 'news_types.id', '=', 'news.type_id')->orderBy('news.id', 'desc')->get();
return view("app.root.index", ["news" => $news]);
}
}
else {
$news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->orderBy('news.id', 'desc')->get();
$news = News::query()->select(['news_types.type', 'news.subname', 'news.id', 'news.resource_id', 'news.created_at' ])->join('news_types', 'news_types.id', '=', 'news.type_id')->orderBy('news.id', 'desc')->get();
return Response::detect('root.index', ["news" => $news]);
}