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

Browse Source
This commit is contained in:
Neerholt
2020-08-17 10:31:41 +02:00
parent fe9eb4fd4d e82c793820
commit 773655c294
24 changed files with 618 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/resources/views/admin/events/edit.blade.php
+56 -3
View File
@@ -27,8 +27,9 @@
<form method="post" action="{{route("events.update", ["event" => $event])}}">
@csrf
@method("PUT")
<label for="event_title">Event Titel:</label>
<input value="{{$event->name}}" type="text" name="name" id="event_title" required>
<label for="name">Event Titel:</label>
<label hidden id="error" for="errormesseages">Dette Event navn findes allerede</label>
<input value="{{$event->name}}" type="text" name="name" id="name" required>
<label for="accountable">Event Ansvarlig:</label>
<input value="{{$event->accountable}}" type="text" name="accountable" id="accountable" required>
<label for="description">Beskrivelse</label>
@@ -42,7 +43,7 @@
<span class="toggle__text">Opret som nyhed</span>
</span>
</label>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
<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>
@@ -83,5 +84,57 @@
}
);
});
$(document).ready(function () {
$value = $('#name').val();
$.ajax({
type: 'get',
url: '{{route('events.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id':{{$event->id}}},
success:function (data) {
console.log(data);
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
});
$('#name').on('keyup', function () {
$value = $(this).val();
console.log($value);
$.ajax({
type: 'get',
url: '{{route('events.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id':{{$event->id}}},
success:function (data) {
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
})
</script>
@endsection
skolehjem/resources/views/admin/events/index.blade.php
-1
View File
@@ -18,7 +18,6 @@
<input type="text" class="form-controller" id="search" name="search" placeholder="Søg på Evt Navn, Evt Dato"></input>
</form>
</div>
{!! session()->get('EventNameExists') !!}
<table class="tbl mt-2">
<tr>
skolehjem/resources/views/admin/guides/edit.blade.php
+54 -1
View File
@@ -28,6 +28,7 @@
@csrf
@method("PUT")
<label for="title">Navn</label>
<label hidden id="error" for="errormesseages">Navn findes allerede</label>
<input value="{{$guide->name}}" type="text" name="name" id="title" required>
<label for="editor">Vejledning</label>
<div id="editor">{!! $guide->guide_articles !!}</div>
@@ -38,7 +39,7 @@
<span class="toggle__text">Opret som nyhed</span>
</span>
</label>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
<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>
@@ -79,5 +80,57 @@
}
);
});
$(document).ready(function () {
$value = $('#title').val();
console.log($value);
$.ajax({
type: 'get',
url: '{{route('guides.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id':{{$guide->id}}},
success:function (data) {
console.log(data);
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
});
$('#title').on('keyup', function () {
$value = $(this).val();
$.ajax({
type: 'get',
url: '{{route('guides.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id':{{$guide->id}}},
success:function (data) {
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
})
</script>
@endsection
skolehjem/resources/views/admin/index.blade.php
+150
View File
@@ -6,5 +6,155 @@
@endsection
@section("content")
<style>
.card {
min-width: 200px;
width: calc(25% - 16px);
margin: 0 8px 0 8px;
}
.content {
display: flex;
flex-wrap: wrap;
flex-direction: row;
}
.card > .head {
padding: 0 8px;
display: flex;
justify-content: center;
align-items: center;
width: calc(100% - 16px);
min-height: 170px;
}
.mr-2 {
margin-right: 1rem;
}
h3 {
margin-top: 0;
}
.event_card > .header {
padding-top: 1rem;
}
.ql-align-center {
text-align: center;
}
.ql-align-center > strong {
color: lightseagreen;
margin: auto;
}
</style>
{{-- Brugere --}}
<div class="card">
<div class="head" style="background-color: orange;">
<div>
<img style="width: 4rem;" src="{{ asset("/images/icons/users-hvid.svg") }}" alt="">
<h1 class="text-white">Brugere</h1>
</div>
<h1 class="text-white ml-auto mr-2" style="font-size: 3.5rem;">{{ count(\App\User::all()) }}</h1>
</div>
<table class="tbl mt-1">
<tr>
<th class="text-white text-center" style="background-color: orange;">Nyeste brugere</th>
</tr>
@for($i = 0; $i < 5 && $i < count(\App\User::query()->orderByDesc("id")->get()); $i++)
<tr>
<td>{{ ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_first)) . ' ' . ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_last)) }}</td>
</tr>
@endfor
</table>
</div>
{{-- Aktiviteter --}}
<div class="card">
<div class="head" style="background-color: red;">
<div>
<img style="margin-top: 8px;width: 3rem;" src="{{ asset("/images/icons/Aktiviteter.svg") }}" alt="">
<h1 class="text-white">Aktiviteter</h1>
</div>
<h1 class="text-white ml-auto mr-2" style="font-size: 3.5rem;">{{ count(\App\Event::all()) }}</h1>
</div>
<table class="tbl mt-1">
<tr>
<th class="text-white text-center" style="background-color: red;">Næste aktivitet</th>
</tr>
</table>
@if(\App\Event::query()->orderByDesc("date")->first() !== null)
<div class="event_card">
@if(\App\Event::query()->orderByDesc("date")->first()->resource_id !== null)
<div class="header" style="background-size: cover; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", \App\Event::query()->orderByDesc("date")->first()->resource_id)->first()->filename) }}');">
<h3 style="text-shadow: 2px 2px 2px #00788A;" class="text-white text-center">{{ \App\Event::query()->orderByDesc("date")->first()->name }}</h3>
<p style="text-shadow: 2px 2px 2px #00788A"; class="text-white text-center mt-0">{{__('msg.af')}}: {{ \App\Event::query()->orderByDesc("date")->first()->accountable }}</p>
<p style="text-shadow: 2px 2px 2px #00788A"; class="text-white text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime(\App\Event::query()->orderByDesc("date")->first()->date))->format('d/m/Y \k\l\. H:i') }}</p>
</div>
@else
<div class="header">
<h3>{{ \App\Event::query()->orderByDesc("date")->first()->name }}</h3>
<p class="text-center mt-0">Af: {{ \App\Event::query()->orderByDesc("date")->first()->accountable }}</p>
<p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime(\App\Event::query()->orderByDesc("date")->first()->date))->format('d/m/Y \k\l\. H:i') }}</p>
</div>
@endif
<div class="container" style="margin-top: 8px;">
{!! \App\Helpers::closetags(substr(\App\Event::query()->orderByDesc("date")->first()->description, 0, 300) )!!}
<input type="hidden" name="event_id" value="{{ \App\Event::query()->orderByDesc("date")->first()->id }}">
<div class="row" style="justify-content: space-between; margin-top: 16px;">
<a style="margin: 0; padding: 0; font-weight: 700;" class="sde-blue text-center" href="{{route("events.accountsignups", ["event" => \App\Event::query()->orderByDesc("date")->first()->id ])}}">{{__('msg.sedeltagere')}}</a>
</div>
</div>
</div>
@else
<p style="padding: 0 4px">Der er ingen aktiviteter</p>
@endif
</div>
<div class="card">
<div class="head" style="background-color: deepskyblue;">
<div>
<img style="width: 4rem;" src="{{ asset("/images/icons/Vejledninger.svg") }}" alt="">
<h1 class="text-white">Vejledninger</h1>
</div>
<h1 class="text-white ml-auto mr-2" style="font-size: 3.5rem;">{{ count(\App\Guide::all()) }}</h1>
</div>
<table class="tbl mt-1">
<tr>
<th class="text-white text-center" style="background-color: deepskyblue;">Seneste Vejledninger</th>
</tr>
@if(count(\App\Guide::all()) > 0)
@for($i = 0; $i < 5 && $i < count(\App\Guide::query()->orderByDesc("id")->get()); $i++)
<tr>
<td>{{ ucfirst(strtolower(\App\Guide::query()->orderByDesc("id")->get()[$i]->name)) }}</td>
</tr>
@endfor
@else
<tr>
<td class="text-center">Der er ingen vejledninger</td>
</tr>
@endif
</table>
</div>
<div class="card">
<div class="head" style="background-color: lightseagreen;">
<div>
<img style="width: 4rem;" src="{{ asset("/images/icons/Menuplan.svg") }}" alt="">
<h1 class="text-white">Menuplan</h1>
</div>
<h1 class="text-white ml-auto mr-2" style="font-size: 3.5rem;">{{ count(\App\MenuPlan::all()) }}</h1>
</div>
<table class="tbl mt-1">
<tr>
<th class="text-white text-center" style="background-color: lightseagreen;">Ugens Menuplan</th>
</tr>
</table>
@if(\App\MenuPlan::query()->where("week", "=", date('W'))->first() !== null)
{!! \App\MenuPlan::query()->where("week", "=", date('W'))->first()->menu !!}
@else
<p class="text-center">Der er ingen menuplan for denne uge</p>
@endif
</div>
@endsection
skolehjem/resources/views/admin/layout/header.blade.php
+1 -1
View File
@@ -1,6 +1,6 @@
@section("header")
<header class="row align-items-center" style="background-color: #00788a;">
<img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" class="brand" alt="Syddansk Erhvervsskole">
<img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" style="cursor: pointer;" onclick="window.location.href = '{{ route("root.index") }}';" class="brand" alt="Syddansk Erhvervsskole">
@auth
<a href="{{ route("users.account") }}" class="btn btn-dark text-white m-0 ml-auto">Bruger: {{ ucfirst(Auth::user()->name_first) }} {{ ucfirst(Auth::user()->name_last) }}</a>
skolehjem/resources/views/admin/menuplans/create.blade.php
-5
View File
@@ -108,9 +108,6 @@
}
change();
//Dont delete me, if the user reloads the pages with text in the text-box this code runs.
$(document).ready(function () {
$value = $('#week').val();
@@ -162,8 +159,6 @@
}
});
})
</script>
@endsection
skolehjem/resources/views/admin/menuplans/edit.blade.php
+54 -1
View File
@@ -28,6 +28,7 @@
@csrf
@method("PUT")
<label for="mandag">Uge:</label>
<label hidden id="error" for="errormesseages">Menuplan findes allerede</label>
<input type="number" name="week" id="week" min="1" max="53" value="{{ $menuplan->week }}" required>
<div id="editor">{!! $menuplan->menu !!}</div>
<textarea name="menu" class="d-none" id="hiddenArea"></textarea>
@@ -37,7 +38,7 @@
<span class="toggle__text">Opret som nyhed</span>
</span>
</label>
<input type="submit" class="btn btn-dark text-white" value="Rediger Menuplan">
<input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger Menuplan">
</form>
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
@@ -78,5 +79,57 @@
}
);
});
//Dont delete me, if the user reloads the pages with text in the text-box this code runs.
$(document).ready(function () {
$value = $('#week').val();
$.ajax({
type: 'get',
url: '{{route('menuplans.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id':{{$menuplan->id}}},
success:function (data) {
console.log(data);
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
});
$('#week').on('keyup', function () {
$value = $(this).val();
$.ajax({
type: 'get',
url: '{{route('menuplans.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id':{{$menuplan->id}}},
success:function (data) {
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
})
</script>
@endsection
skolehjem/resources/views/admin/menuplans/index.blade.php
+1 -2
View File
@@ -14,7 +14,6 @@
<div class="row align-items-center">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('menu-plans.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Menuplan</a>
</div>
{!! session()->get('WeekExists') !!}
<table class="tbl mt-2">
<tr>
@@ -26,7 +25,7 @@
@foreach($menuPlans as $menuplan)
<tr>
<td>{{$menuplan->week}}</td>
<td><a href="{{ route("pdf.genPDF", [ "menuPlan" => $menuplan ]) }}"><img class="w-100" src="{{ asset('/images/icons/print.svg') }}" alt="Print"></a></td>
<td><a href="{{ route("pdf.genPDF", [ "menuPlan" => $menuplan ]) }}" target="_blank"><img class="w-100" src="{{ asset('/images/icons/print.svg') }}" alt="Print"></a></td>
<td><a href="{{ route("menu-plans.edit", [ "menu_plan" => $menuplan ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><form method="post" action="{{ route("menu-plans.destroy", [ "menu_plan" => $menuplan ]) }}" class="w-100 nostyle">
@csrf
skolehjem/resources/views/admin/news/create.blade.php
-3
View File
@@ -67,7 +67,6 @@
);
});
//Dont delete me, if the user reloads the pages with text in the text-box this code runs.
$(document).ready(function () {
$value = $('#title').val();
@@ -119,7 +118,5 @@
}
});
})
</script>
@endsection
skolehjem/resources/views/admin/news/edit.blade.php
+55 -2
View File
@@ -21,10 +21,11 @@
@csrf
@method("PUT")
<label for="title">Navn</label>
<input value="{{$news->name}}" type="text" name="subname" id="title" required>
<label hidden id="error" for="errormesseages">Dette navn findes allerede</label>
<input value="{{$news->subname}}" type="text" name="subname" id="title" required>
<div id="editor">{!! $news->content !!}</div>
<textarea name="content" class="d-none" id="hiddenArea"></textarea>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
<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>
@@ -65,5 +66,57 @@
}
);
});
//Dont delete me, if the user reloads the pages with text in the text-box this code runs.
$(document).ready(function () {
$value = $('#title').val();
$.ajax({
type: 'get',
url: '{{route('news.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id': {{$news->id}}},
success:function (data) {
console.log(data);
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
});
$('#title').on('keyup', function () {
$value = $(this).val();
$.ajax({
type: 'get',
url: '{{route('news.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id': {{$news->id}}},
success:function (data) {
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
})
</script>
@endsection
skolehjem/resources/views/admin/roles/create.blade.php
+1 -4
View File
@@ -14,7 +14,7 @@
<form method="post" action="{{ route("roles.store") }}">
@csrf
<label for="name">Navn:</label>
<label hidden id="error" for="errormesseages">Role navnet findes allerede</label>
<label hidden id="error" for="errormesseages">Rolle navnet findes allerede</label>
<input type="text" name="name" id="name" placeholder="Admin" required>
<label for="name">Beskrivelse:</label>
<input type="text" name="description" id="description" placeholder="Admin rollen bruges til administratorene" required>
@@ -32,8 +32,6 @@
);
});
$(document).ready(function () {
$value = $('#name').val();
$.ajax({
@@ -83,6 +81,5 @@
}
});
})
</script>
@endsection
skolehjem/resources/views/admin/roles/edit.blade.php
+52 -1
View File
@@ -15,10 +15,11 @@
@csrf
@method("put")
<label for="name">Navn:</label>
<label hidden id="error" for="errormesseages">Rolle navnet findes allerede</label>
<input type="text" name="name" id="name" placeholder="Admin" value="{{ $role->name }}" required>
<label for="name">Beskrivelse:</label>
<input type="text" name="description" id="description" placeholder="Admin rollen bruges til administratorene" value="{{ $role->description }}" required>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
<input type="submit" id="disable" class="btn btn-dark text-white" value="Rediger">
</form>
@endsection
@section("scripts")
@@ -31,5 +32,55 @@
}
);
});
$(document).ready(function () {
$value = $('#name').val();
$.ajax({
type: 'get',
url: '{{route('roles.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id': {{$role->id}}},
success:function (data) {
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
});
$('#name').on('keyup', function () {
$value = $(this).val();
$.ajax({
type: 'get',
url: '{{route('roles.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id': {{$role->id}}},
success:function (data) {
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
})
</script>
@endsection
skolehjem/resources/views/admin/roles/index.blade.php
-1
View File
@@ -18,7 +18,6 @@
<input type="text" class="form-controller" id="search" name="search" placeholder="Søg efter navn"></input>
</form>
</div>
{!! session()->get('RoleNameExists') !!}
<table class="tbl mt-2">
<tr>