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

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 

 Conflicts:
	skolehjem/resources/views/app/news/index.blade.php
This commit is contained in:
frederikpyt 2020-08-31 14:44:15 +02:00
parent 34b078b21a 9b26e5f1af
commit 101be37dfe
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
skolehjem/app/Http/Controllers/RootController.php
View File

@ -31,12 +31,12 @@ class RootController extends Controller
if(Response::detect("root.index")->name() == "admin.root.index")
return view("admin.root.index");
else {
$news = News::query()->orderBy('id', 'desc')->get();
$news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->orderBy('id', 'desc')->get();
return view("app.root.index", ["news" => $news]);
}
}
else {
$news = News::query()->orderBy('id', 'desc')->get();
$news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->orderBy('id', 'desc')->get();
return Response::detect('root.index', ["news" => $news]);
}

1
skolehjem/resources/views/app/news/index.blade.php
View File

@ -9,7 +9,6 @@
margin-top: .5rem;
margin-bottom: 7px;
width: auto;
heigt: auto;
@if(request()->cookie("mode") == "dark")
background-color: rgba(0,0,0, 0.3);
@else