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:
frederikpyt
2020-08-24 10:17:15 +02:00
parent 7a02f4a48f e60c386b0e
commit 9a1b6873d2
12 changed files with 66 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/resources/views/admin/events/index.blade.php
+18 -13
View File
@@ -10,6 +10,9 @@
@endsection
@section("content")
<?php
date_default_timezone_set('Europe/Copenhagen');
?>
<div class="row align-items-center">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('events.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Aktivitet</a>
@@ -29,20 +32,22 @@
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
</tr>
@foreach($events as $event)
<tr>
<td>{{ $event->name }}</td>
<td>{{ $event->accountable }}</td>
<td>{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</td>
<td><a href="{{ route("events.signups", [ "event" => $event ]) }}"><img class="w-100" src="{{ asset('/images/icons/eye-dark.svg') }}" alt="Show"></a></td>
<td><a href="{{ route("events.edit", [ "event" => $event ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><form method="post" action="{{ route("events.destroy", [ "event" => $event ]) }}" class="w-100 nostyle">
@csrf
@method("delete")
@if (date('Y-m-d H:i', strtotime('-1 day')) < date('Y-m-d H:i', strtotime($event->date)))
<tr>
<td>{{ $event->name }}</td>
<td>{{ $event->accountable }}</td>
<td>{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</td>
<td><a href="{{ route("events.signups", [ "event" => $event ]) }}"><img class="w-100" src="{{ asset('/images/icons/eye-dark.svg') }}" alt="Show"></a></td>
<td><a href="{{ route("events.edit", [ "event" => $event ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><form method="post" action="{{ route("events.destroy", [ "event" => $event ]) }}" class="w-100 nostyle">
@csrf
@method("delete")
<button class="w-100 nostyle" onclick="return confirm('Are you sure you want to delete?');" type="submit"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
</form>
</td>
</tr>
<button class="w-100 nostyle" onclick="return confirm('Are you sure you want to delete?');" type="submit"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
</form>
</td>
</tr>
@endif
@endforeach
</table>
skolehjem/resources/views/admin/events/signups.blade.php
+1 -9
View File
@@ -10,15 +10,7 @@
@endsection
@section("content")
<div class="row align-items-center">
<form method="post" action="{{ route("events.store") }}">
@csrf
<input type="text" class="form-controller" id="search" name="search" placeholder="//TODO: Søg på navn, efternavn, tlf"></input>
</form>
</div>
<table class="tbl mt-2">
<table class="tbl mt-1">
<tr>
<th>Tilmeldtes Fornavn</th>
<th>Tilmeldtes Efternavn</th>
skolehjem/resources/views/admin/feedbacks/index.blade.php
+6
View File
@@ -20,6 +20,12 @@
<option name="ris" value="Ris">Ris</option>
<option name="ros" value="Ros">Ros</option>
</select>
<!-- Dont delete me sir :(
<input class="checkbox-inline" type="checkbox" name="checkbox" id="ris" value="ris">
<label for="efternavn">Ris</label>
<input class="checkbox-inline" type="checkbox" name="checkbox" id="ros" value="ros">
<label for="efternavn">Ros</label>
-->
</div>
skolehjem/resources/views/admin/layout/base.blade.php
+22 -11
View File
@@ -77,80 +77,91 @@
</div>
@if(\Illuminate\Support\Facades\Request::route()->getName() == "users.index")
<div class="segment active">
<h3 class="text-white"><a href="#" class="text-white"><img src="{{asset("/images/icons/users-hvid.svg")}}" class="fa"><span style="margin-left: 4px;">Brugere</span></a></h3>
@else
<div class="segment">
@endif
<h3 class="text-white"><a href="{{ route('users.index') }}" class="text-white"><img src="{{asset("/images/icons/users-hvid.svg")}}" class="fa"><span style="margin-left: 4px;">Brugere</span></a></h3>
@endif
</div>
@if(\Illuminate\Support\Facades\Request::route()->getName() == "roles.index")
<div class="segment active">
<h3 class="text-white"><a href="#" class="text-white"><img src="{{asset("/images/icons/role.svg")}}" class="fa"><span style="margin-left: 4px;">Roller</span></a></h3>
@else
<div class="segment">
@endif
<h3 class="text-white"><a href="{{ route("roles.index") }}" class="text-white"><img src="{{asset("/images/icons/role.svg")}}" class="fa"><span style="margin-left: 4px;">Roller</span></a></h3>
@endif
</div>
@if(\Illuminate\Support\Facades\Request::route()->getName() == "news.index")
<div class="segment active">
<h3 class="text-white"><a href="#" class="text-white"><img src="{{asset("/images/icons/news.svg")}}" class="fa"><span style="margin-left: 4px;">Nyheder</span></a></h3>
@else
<div class="segment">
@endif
<h3 class="text-white"><a href="{{ route("news.index")}}" class="text-white"><img src="{{asset("/images/icons/news.svg")}}" class="fa"><span style="margin-left: 4px;">Nyheder</span></a></h3>
@endif
</div>
@if(\Illuminate\Support\Facades\Request::route()->getName() == "menu-plans.index")
<div class="segment active">
<h3 class="text-white"><a href="#" class="text-white"><img src="{{asset("/images/icons/Menuplan.svg")}}" class="fa"><span style="margin-left: 4px;">Menuplan</span></a></h3>
@else
<div class="segment">
@endif
<h3 class="text-white"><a href="{{ route("menu-plans.index")}}" class="text-white"><img src="{{asset("/images/icons/Menuplan.svg")}}" class="fa"><span style="margin-left: 4px;">Menuplan</span></a></h3>
@endif
</div>
@if(\Illuminate\Support\Facades\Request::route()->getName() == "events.index")
<div class="segment active">
<h3 class="text-white"><a href="#" class="text-white"><img src="{{asset("/images/icons/Aktiviteter.svg")}}" class="fa"><span style="margin-left: 4px;">Aktiviteter</span></a></h3>
@else
<div class="segment">
@endif
<h3 class="text-white"><a href="{{ route("events.index") }}" class="text-white"><img src="{{asset("/images/icons/Aktiviteter.svg")}}" class="fa"><span style="margin-left: 4px;">Aktiviteter</span></a></h3>
@endif
</div>
@if(\Illuminate\Support\Facades\Request::route()->getName() == "locations.index")
<div class="segment active">
<h3 class="text-white"><a href="#" class="text-white"><img src="{{asset("/images/icons/location.svg")}}" class="fa"><span style="margin-left: 4px;">Lokationer</span></a></h3>
@else
<div class="segment">
@endif
<h3 class="text-white"><a href="{{ route("locations.index") }}" class="text-white"><img src="{{asset("/images/icons/location.svg")}}" class="fa"><span style="margin-left: 4px;">Lokationer</span></a></h3>
@endif
</div>
@if(\Illuminate\Support\Facades\Request::route()->getName() == "washing-machines.index")
<div class="segment active">
<h3 class="text-white"><a href="#" class="text-white"><img src="{{asset("/images/icons/wash.svg")}}" class="fa"><span style="margin-left: 4px;">Vaskemaskiner</span></a></h3>
@else
<div class="segment">
@endif
<h3 class="text-white"><a href="{{ route("washing-machines.index") }}" class="text-white"><img src="{{asset("/images/icons/wash.svg")}}" class="fa"><span style="margin-left: 4px;">Vaskemaskiner</span></a></h3>
@endif
</div>
@if(\Illuminate\Support\Facades\Request::route()->getName() == "washing-reservations.index")
<div class="segment active">
<h3 class="text-white"><a href="#" class="text-white"><img src="{{asset("/images/icons/wash_res.svg")}}" class="fa"><span style="margin-left: 4px;">Reservationer</span></a></h3>
@else
<div class="segment">
@endif
<h3 class="text-white"><a href="{{ route("washing-reservations.index") }}" class="text-white"><img src="{{asset("/images/icons/wash_res.svg")}}" class="fa"><span style="margin-left: 4px;">Reservationer</span></a></h3>
@endif
</div>
@if(\Illuminate\Support\Facades\Request::route()->getName() == "contacts.index")
<div class="segment active">
<h3 class="text-white"><a href="#" class="text-white"><img src="{{asset("/images/icons/phone.svg")}}" class="fa"><span style="margin-left: 4px;">Kontakter</span></a></h3>
@else
<div class="segment">
@endif
<h3 class="text-white"><a href="{{ route("contacts.index") }}" class="text-white"><img src="{{asset("/images/icons/phone.svg")}}" class="fa"><span style="margin-left: 4px;">Kontakter</span></a></h3>
@endif
</div>
@if(\Illuminate\Support\Facades\Request::route()->getName() == "guides.index")
<div class="segment active">
<h3 class="text-white"><a href="#" class="text-white"><img src="{{asset("/images/icons/Vejledninger.svg")}}" class="fa"><span style="margin-left: 4px;">Vejledning</span></a></h3>
@else
<div class="segment">
@endif
<h3 class="text-white"><a href="{{ route('guides.index') }}" class="text-white"><img src="{{asset("/images/icons/Vejledninger.svg")}}" class="fa"><span style="margin-left: 4px;">Vejledning</span></a></h3>
@endif
</div>
@if(\Illuminate\Support\Facades\Request::route()->getName() == "feedbacks.index")
<div class="segment active">
<h3 class="text-white"><a href="#" class="text-white"><img src="{{asset("/images/icons/feedback.svg")}}" class="fa"><span style="margin-left: 4px;">Feedback</span></a></h3>
@else
<div class="segment">
@endif
<h3 class="text-white"><a href="{{ route('feedbacks.index') }}" class="text-white"><img src="{{asset("/images/icons/feedback.svg")}}" class="fa"><span style="margin-left: 4px;">Feedback</span></a></h3>
@endif
</div>
</div>
<div class="w-85" style="background-color: #cccccc;">
skolehjem/resources/views/admin/users/index.blade.php
+1 -1
View File
@@ -32,7 +32,7 @@
<input class="checkbox-inline" type="checkbox" id="rolle" name="checkbox"value="rolle">
<label for="rolle">Rolle</label>
</div>
<div id="showHideCheckboxs" style="margin-bottom: -36px">
<div id="showHideCheckboxs" style="margin-bottom: -38px">
</div>
<table class="tbl mt-2">