Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
This commit is contained in:
commit
cca543bf4a
|
@ -31,7 +31,7 @@ class NewsController extends Controller
|
|||
*/
|
||||
public function index(Request $request)
|
||||
{
|
||||
$news = News::query()->orderBy('id', 'asc')->paginate(2);
|
||||
$news = News::query()->orderBy('id', 'asc')->paginate(20);
|
||||
|
||||
return Response::detect("news.index", [ "news" => $news ]);
|
||||
}
|
||||
|
|
|
@ -26,7 +26,7 @@ class RootController extends Controller
|
|||
}
|
||||
}
|
||||
else {
|
||||
$news = News::query()->orderBy('id', 'asc')->paginate($perPage);
|
||||
$news = News::query()->orderBy('id', 'asc')->paginate($perPage, ['*'], "page");
|
||||
|
||||
return view('app.root.index', ["news" => $news]);
|
||||
}
|
||||
|
|
|
@ -193,6 +193,10 @@ nav > .pagination {
|
|||
font-size: 24px;
|
||||
}
|
||||
|
||||
nav {
|
||||
margin-top: auto;
|
||||
}
|
||||
|
||||
.text-white {
|
||||
color: #ffffff;
|
||||
}
|
||||
|
|
|
@ -193,6 +193,10 @@ nav > .pagination {
|
|||
font-size: 24px;
|
||||
}
|
||||
|
||||
nav {
|
||||
margin-top: auto;
|
||||
}
|
||||
|
||||
.text-white {
|
||||
color: #ffffff;
|
||||
}
|
||||
|
|
|
@ -193,6 +193,10 @@ nav > .pagination {
|
|||
font-size: 24px;
|
||||
}
|
||||
|
||||
nav {
|
||||
margin-top: auto;
|
||||
}
|
||||
|
||||
.text-white {
|
||||
color: #ffffff;
|
||||
}
|
||||
|
|
|
@ -64,3 +64,7 @@ nav > .pagination {
|
|||
.pagination > .page-item.disabled > .page-link {
|
||||
font-size: 24px;
|
||||
}
|
||||
|
||||
nav {
|
||||
margin-top: auto;
|
||||
}
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
margin-bottom: 1rem;
|
||||
}
|
||||
</style>
|
||||
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
|
||||
<link href="{{ asset("/css/quill/quill.snow.css") }}" rel="stylesheet">
|
||||
<h1 id="errormesseages" >Opret Aktivitet:</h1>
|
||||
<form method="post" action="{{ route("events.store") }}" enctype="multipart/form-data">
|
||||
@csrf
|
||||
|
@ -47,7 +47,7 @@
|
|||
|
||||
<input id="disable" type="submit" class="btn btn-dark text-white" value="Opret">
|
||||
</form>
|
||||
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
|
||||
<script src="{{ asset("/js/quill/quill.js") }}"></script>
|
||||
<script>
|
||||
var container = document.getElementById("editor");
|
||||
var fullEditor = new Quill(container, {
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
margin-bottom: 1rem;
|
||||
}
|
||||
</style>
|
||||
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
|
||||
<link href="{{ asset("/css/quill/quill.snow.css") }}" rel="stylesheet">
|
||||
<h1>Rediger Aktivitet:</h1>
|
||||
<form method="post" action="{{route("events.update", ["event" => $event])}}">
|
||||
@csrf
|
||||
|
@ -46,7 +46,7 @@
|
|||
<input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger">
|
||||
</form>
|
||||
|
||||
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
|
||||
<script src="{{ asset("/js/quill/quill.js") }}"></script>
|
||||
<script>
|
||||
var container = document.getElementById("editor");
|
||||
var fullEditor = new Quill(container, {
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
margin-bottom: 1rem;
|
||||
}
|
||||
</style>
|
||||
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
|
||||
<link href="{{ asset("/css/quill/quill.snow.css") }}" rel="stylesheet">
|
||||
<h1 id="errormesseages" >Opret Vejledning</h1>
|
||||
<form method="post" action="{{ route("guides.store") }}" enctype="multipart/form-data">
|
||||
@csrf
|
||||
|
@ -42,7 +42,7 @@
|
|||
<input type="submit" id="disable" class="btn btn-dark text-white" value="Opret">
|
||||
</form>
|
||||
|
||||
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
|
||||
<script src="{{ asset("/js/quill/quill.js") }}"></script>
|
||||
<script>
|
||||
var container = document.getElementById("editor");
|
||||
var fullEditor = new Quill(container, {
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
margin-bottom: 1rem;
|
||||
}
|
||||
</style>
|
||||
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
|
||||
<link href="{{ asset("/css/quill/quill.snow.css") }}" rel="stylesheet">
|
||||
<h1>Rediger vejledning:</h1>
|
||||
<form method="post" action="{{route("guides.update", ["guide" => $guide])}}">
|
||||
@csrf
|
||||
|
@ -42,7 +42,7 @@
|
|||
<input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger">
|
||||
</form>
|
||||
|
||||
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
|
||||
<script src="{{ asset("/js/quill/quill.js") }}"></script>
|
||||
<script>
|
||||
var container = document.getElementById("editor");
|
||||
var fullEditor = new Quill(container, {
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
margin-bottom: 1rem;
|
||||
}
|
||||
</style>
|
||||
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
|
||||
<h1 id="errormesseages" >Opret Menuplan:</h1>
|
||||
<form action="{{ action('MenuPlanController@store') }}" method="post" enctype="multipart/form-data">
|
||||
@csrf
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
margin-bottom: 1rem;
|
||||
}
|
||||
</style>
|
||||
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
|
||||
<h1>Rediger Menuplan:</h1>
|
||||
<form method="post" action="{{ route("menu-plans.update", [ "menu_plan" => $menuplan ]) }}">
|
||||
@csrf
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
margin-bottom: 1rem;
|
||||
}
|
||||
</style>
|
||||
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
|
||||
<link href="{{ asset("/css/quill/quill.snow.css") }}" rel="stylesheet">
|
||||
<h1 id="errormesseages" >Opret Nyhed</h1>
|
||||
<form method="post" action="{{ route("news.store") }}">
|
||||
@csrf
|
||||
|
@ -27,7 +27,7 @@
|
|||
<input type="submit" id="disable" class="btn btn-dark text-white" value="Opret">
|
||||
</form>
|
||||
|
||||
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
|
||||
<script src="{{ asset("/js/quill/quill.js") }}"></script>
|
||||
<script>
|
||||
var container = document.getElementById("editor");
|
||||
var fullEditor = new Quill(container, {
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
margin-bottom: 1rem;
|
||||
}
|
||||
</style>
|
||||
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
|
||||
<link href="{{ asset("/css/quill/quill.snow.css") }}" rel="stylesheet">
|
||||
<h1>Rediger nyhed:</h1>
|
||||
<form method="post" action="{{route("news.update", ["news" => $news])}}">
|
||||
@csrf
|
||||
|
@ -28,7 +28,7 @@
|
|||
<input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger">
|
||||
</form>
|
||||
|
||||
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
|
||||
<script src="{{ asset("/js/quill/quill.js") }}"></script>
|
||||
<script>
|
||||
var container = document.getElementById("editor");
|
||||
var fullEditor = new Quill(container, {
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
}
|
||||
</style>
|
||||
<main style="justify-content: unset;">
|
||||
@foreach(\App\News::query()->orderBy("created_at", "desc")->get() as $new)
|
||||
@foreach($news as $new)
|
||||
<div class="card">
|
||||
@if($new->resource_id !== null)
|
||||
<div class="header" style="background-size: cover; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $new->resource_id)->first()->filename) }}');">
|
||||
|
|
Loading…
Reference in New Issue