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-24 10:17:15 +02:00
parent 7a02f4a48f e60c386b0e
commit 9a1b6873d2
12 changed files with 66 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,8 +145,8 @@ class ContactController extends Controller
"<th>Titel</th>".
"<th>E-mail</th>".
"<th>Tlf</th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/pencil.svg\" alt=\"Update\"></th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/trashcan.svg\" alt=\"Delete\"></th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan-dark.svg')." alt=\"Update\"></th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
"</tr>";

6
skolehjem/app/Http/Controllers/EventController.php
View File

@ -244,9 +244,9 @@ class EventController extends Controller
"<th>Event Navn</th>".
"<th>Event Ansvarlig</th>".
"<th>Event Dato</th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/eye.svg\" alt=\"Update\"></th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/pencil.svg\" alt=\"Update\"></th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/trashcan.svg\" alt=\"Delete\"></th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/eye.svg')." alt=\"see\"></th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan-dark.svg')." alt=\"Update\"></th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
"</tr>";
$events = DB::table('events')->orderBY('date' , 'asc')->where('name', 'LIKE',$request->search.'%')
->orWhere('date','LIKE', $request->search.'%')

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

@ -133,8 +133,9 @@ class FeedbackController extends Controller
public function search(Request $request){
if($request->ajax()){
$output = "<tr>".
"<th style='width: 6em;'>Dato</th>".
"<th>Feedback Besked</th>".
"<th>Ris el. Ros</th>".
"<th style='width: 5em;'>Ris el. Ros</th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/trashcan.svg\" alt=\"Delete\"></th>".
"</tr>";
@ -149,6 +150,7 @@ class FeedbackController extends Controller
if(count($feedbacks) !== 0){
foreach ($feedbacks as $key => $feedback){
$output.='<tr>'.
'<td>' . date('d-m-Y', strtotime($feedback->created_at)) . '</td>'.
'<td>' . $feedback->message . '</td>'.
'<td>' . $feedback->suggestion_form . '</td>'.
'<td><form method="post" action="' .route("feedbacks.destroy", [ "feedback" => $feedback ]). '" class="w-100 nostyle">'.

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

@ -174,8 +174,8 @@ class LocationController extends Controller
$output = "<tr>".
"<th>Navn</th>".
"<th>Lokation</th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/pencil.svg\" alt=\"Update\"></th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/trashcan.svg\" alt=\"Delete\"></th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan-dark.svg')." alt=\"Update\"></th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
"</tr>";
if($request->option !== 'all') {

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

@ -140,8 +140,8 @@ class rolesController extends Controller
$output = "<tr>".
"<th>Navn</th>".
"<th>Beskrivelse</th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/pencil.svg\" alt=\"Update\"></th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/trashcan.svg\" alt=\"Delete\"></th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan-dark.svg')." alt=\"Update\"></th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
"</tr>";
$roles = DB::table('roles')->where('name', 'LIKE',$request->search.'%')->get();

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

@ -414,8 +414,8 @@ class UserController extends Controller
"<th>Email</th>".
"<th>Tlf nr</th>".
"<th>Rolle(r)</th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/pencil.svg\" alt=\"Update\"></th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=\"http://127.0.0.1:8000/images/icons/trashcan.svg\" alt=\"Delete\"></th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan-dark.svg')." alt=\"Update\"></th>".
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
"</tr>";

5
skolehjem/resources/views/admin/events/index.blade.php
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,6 +32,7 @@
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
</tr>
@foreach($events as $event)
@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>
@ -43,6 +47,7 @@
</form>
</td>
</tr>
@endif
@endforeach
</table>

10
skolehjem/resources/views/admin/events/signups.blade.php
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>

6
skolehjem/resources/views/admin/feedbacks/index.blade.php
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>

33
skolehjem/resources/views/admin/layout/base.blade.php
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;">

2
skolehjem/resources/views/admin/users/index.blade.php
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">

8
skolehjem/resources/views/app/about/index.blade.php
View File

@ -12,9 +12,9 @@
<p>Denne app er udviklet til Odense erhvervskollegie.</p>
<h4 class="mb-1 mt-1">{{__("msg.programmedby")}}:</h4>
<span style="margin-bottom: 0.2rem;"><span style="float: left;">Anders Rasmussen,</span><span style="float: right;">anders164a@gmail.com</span></span>
<span style="margin-bottom: 0.2rem;">Frederik Milling Pytlick, frederikpyt@gmail.com</span>
<span style="margin-bottom: 0.2rem;">Vedran Zelen, vedr0021@gmail.com</span>
<span style="margin-bottom: 0.2rem;">Victor Neerholt, victorneerholt@gmail.com</span>
<span style="margin-bottom: 0.2rem;">Sebastian Davaris, seba4928@edu.sde.dk</span>
<span style="margin-bottom: 0.2rem;">Frederik Milling Pytlick,<span style="float: right;">frederikpyt@gmail.com</span></span>
<span style="margin-bottom: 0.2rem;">Vedran Zelen,<span style="float: right;">vedr0021@gmail.com</span></span>
<span style="margin-bottom: 0.2rem;">Victor Neerholt,<span style="float: right;">victorneerholt@gmail.com</span></span>
<span style="margin-bottom: 0.2rem;">Sebastian Davaris,<span style="float: right;">seba4928@edu.sde.dk</span></span>
</main>
@endsection