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

This commit is contained in:
frederikpyt 2020-08-19 14:59:20 +02:00
parent 41af387399 ec4fdca414
commit cca543bf4a
15 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
skolehjem/app/Http/Controllers/NewsController.php
View File

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

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

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

4
skolehjem/public/css/admin.css vendored
View File

@ -193,6 +193,10 @@ nav > .pagination {
font-size: 24px;
}
nav {
margin-top: auto;
}
.text-white {
color: #ffffff;
}

4
skolehjem/public/css/webapp.css vendored
View File

@ -193,6 +193,10 @@ nav > .pagination {
font-size: 24px;
}
nav {
margin-top: auto;
}
.text-white {
color: #ffffff;
}

4
skolehjem/public/css/webappdark.css vendored
View File

@ -193,6 +193,10 @@ nav > .pagination {
font-size: 24px;
}
nav {
margin-top: auto;
}
.text-white {
color: #ffffff;
}

4
skolehjem/resources/sass/app/general/_displays.scss vendored
View File

@ -64,3 +64,7 @@ nav > .pagination {
.pagination > .page-item.disabled > .page-link {
font-size: 24px;
}
nav {
margin-top: auto;
}

4
skolehjem/resources/views/admin/events/create.blade.php
View File

@ -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, {

4
skolehjem/resources/views/admin/events/edit.blade.php
View File

@ -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, {

4
skolehjem/resources/views/admin/guides/create.blade.php
View File

@ -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, {

4
skolehjem/resources/views/admin/guides/edit.blade.php
View File

@ -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, {

1
skolehjem/resources/views/admin/menuplans/create.blade.php
View File

@ -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

1
skolehjem/resources/views/admin/menuplans/edit.blade.php
View File

@ -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

4
skolehjem/resources/views/admin/news/create.blade.php
View File

@ -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, {

4
skolehjem/resources/views/admin/news/edit.blade.php
View File

@ -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, {

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

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