Merge remote-tracking branch 'origin/master'

# Conflicts:
#	skolehjem/app/Http/Controllers/MenuPlanController.php
#	skolehjem/resources/views/admin/external-links/index.blade.php
This commit is contained in:
Vedde
2020-06-26 13:56:47 +02:00
31 changed files with 347 additions and 411 deletions
@@ -12,7 +12,6 @@
@section("content")
<table class="tbl">
<tr>
<th>ID</th>
<th>Fornavn</th>
<th>Efternavn</th>
<th>Email</th>
@@ -21,7 +20,6 @@
<th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
</tr>
<tr>
<td>{ID}</td>
<td>{Fornavn}</td>
<td>{Efternavn}</td>
<td>{Email}</td>
@@ -12,7 +12,6 @@
@section("content")
<table class="tbl">
<tr>
<th>ID</th>
<th>Fornavn</th>
<th>Efternavn</th>
<th>Email</th>
@@ -21,7 +20,6 @@
<th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
</tr>
<tr>
<td>{ID}</td>
<td>{Fornavn}</td>
<td>{Efternavn}</td>
<td>{Email}</td>
@@ -12,7 +12,6 @@
@section("content")
<table class="tbl">
<tr>
<th>ID</th>
<th>Event Navn</th>
<th>Event Beskrivelse</th>
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
@@ -20,7 +19,6 @@
</tr>
@foreach($events as $event)
<tr>
<td>{{ $event->id }}</td>
<td>{{ $event->name }}</td>
<td>{{ $event->description }}</td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
@@ -12,7 +12,6 @@
@section("content")
<table class="tbl">
<tr>
<th>ID</th>
<th>Fornavn</th>
<th>Efternavn</th>
<th>Email</th>
@@ -21,7 +20,6 @@
<th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
</tr>
<tr>
<td>{ID}</td>
<td>{Fornavn}</td>
<td>{Efternavn}</td>
<td>{Email}</td>
@@ -12,7 +12,6 @@
@section("content")
<table class="tbl">
<tr>
<th>ID</th>
<th>Fornavn</th>
<th>Efternavn</th>
<th>Email</th>
@@ -21,7 +20,6 @@
<th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
</tr>
<tr>
<td>{ID}</td>
<td>{Fornavn}</td>
<td>{Efternavn}</td>
<td>{Email}</td>
@@ -12,7 +12,6 @@
@section("content")
<table class="tbl">
<tr>
<th>ID</th>
<th>Fornavn</th>
<th>Efternavn</th>
<th>Email</th>
@@ -21,7 +20,6 @@
<th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
</tr>
<tr>
<td>{ID}</td>
<td>{Fornavn}</td>
<td>{Efternavn}</td>
<td>{Email}</td>
@@ -12,7 +12,6 @@
@section("content")
<table class="tbl">
<tr>
<th>ID</th>
<th>Title</th>
<th>Link</th>
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
@@ -20,9 +19,8 @@
</tr>
@foreach($links as $link)
<tr>
<th>{{ $link->id }}</th>
<th>{{$link->name}}</th>
<th><a href="{{$link->link}}"> {{$link->link}} </th>
<th>{Titel}</th>
<th>{Link}</th>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
</tr>
@@ -28,25 +28,16 @@
<a href="{{ route("menu-plans.create") }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Menuplan</a>
</div>
</div>
<div class="segment">
<h3 class="text-white">Booking</h3>
<div class="row">
<a href="{{ route("washing-reservations.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Bookings</a>
</div>
<div class="row">
<a href="{{ route('washing-reservations.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Booking</a>
</div>
</div>
<div class="segment">
<h3 class="text-white">Vaskemaskiner</h3>
<div class="row">
<a href="{{ route("washing-machines.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Vaskemaskiner</a>
</div>
<div class="row">
<a href="{{ route('washing-machines.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Vaskemaskine</a>
<a href="{{ route("washing-reservations.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vaske Reservationer</a>
</div>
<div class="row">
<a href="{{ route("washing-reservations.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Vaskemaskine Reservationer</a>
<a href="{{ route('washing-machines.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Vaskemaskine</a>
</div>
</div>
</div>
@@ -13,20 +13,20 @@
<h1>Opret Menuplan:</h1>
<form action="{{ action('MenuPlanController@store') }}" method="post">
@csrf
<label for="mandag">Mandag:</label>
<input type="text" name="mandag" id="mandag" required>
<label for="tirsdag">Tirsdag:</label>
<input type="text" name="tirsdag" id="tirsdag" required>
<label for="onsdag">Onsdag:</label>
<input type="text" name="onsdag" id="onsdag" required>
<label for="torsdag">Torsdag:</label>
<input type="text" name="torsdag" id="torsdag" required>
<label for="fredag">Fredag:</label>
<input type="text" name="fredag" id="fredag" required>
<label for="lørdag">Lørdag:</label>
<input type="text" name="lørdag" id="lørdag" required>
<label for="søndag">Søndag:</label>
<input type="text" name="søndag" id="søndag" required>
<label for="monday">Mandag:</label>
<input type="text" name="monday" id="monday" required>
<label for="tuesday">Tirsdag:</label>
<input type="text" name="tuesday" id="tuesday" required>
<label for="wednesday">Onsdag:</label>
<input type="text" name="wednesday" id="wednesday" required>
<label for="thursday">Torsdag:</label>
<input type="text" name="thursday" id="thursday" required>
<label for="friday">Fredag:</label>
<input type="text" name="friday" id="friday" required>
<label for="saturday">Lørdag:</label>
<input type="text" name="saturday" id="saturday" required>
<label for="sunday">Søndag:</label>
<input type="text" name="sunday" id="sunday" required>
<input type="submit" class="btn btn-dark text-white" value="Opret Menuplan">
</form>
@@ -12,7 +12,6 @@
@section("content")
<table class="tbl">
<tr>
<th>ID</th>
<th>Mandag</th>
<th>Tirsdag</th>
<th>Onsdag</th>
@@ -25,16 +24,15 @@
</tr>
@foreach($menuPlans as $menuplan)
<tr>
<th>{ID}</th>
<th>{Mandag}</th>
<th>{Tirsdag}</th>
<th>{Onsdag}</th>
<th>{Torsdag}</th>
<th>{Fredag}</th>
<th>{Lørdag}</th>
<th>{Søndag}</th>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
<td>{{$menuplan->monday}}</td>
<td>{{$menuplan->tuesday}}</td>
<td>{{$menuplan->wednesday}}</td>
<td>{{$menuplan->thursday}}</td>
<td>{{$menuplan->friday}}</td>
<td>{{$menuplan->saturday}}</td>
<td>{{$menuplan->sunday}}</td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
</tr>
@endforeach
</table>
@@ -6,13 +6,12 @@
@endsection
@section("path")
<a href="{{ route('menu-plans.show') }}" class="text-white">Vis Menuplan</a> /
<a href="{{ route('menu-plans.show', [ "id" => $menuplan->id ]) }}" class="text-white">Vis Menuplan</a> /
@endsection
@section("content")
<table class="tbl">
<tr>
<th>ID</th>
<th>Fredag</th>
<th>Tirsdag</th>
<th>Onsdag</th>
@@ -24,7 +23,6 @@
<th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
</tr>
<tr>
<td>{ID}</td>
<td>{Fredag}</td>
<td>{Tirsdag}</td>
<td>{Onsdag}</td>
@@ -12,7 +12,6 @@
@section("content")
<table class="tbl">
<tr>
<th>ID</th>
<th>Fornavn</th>
<th>Efternavn</th>
<th>Email</th>
@@ -22,7 +21,6 @@
</tr>
@foreach($users as $user)
<tr>
<td>{{ $user->id }}</td>
<td>{{ $user->name_first }}</td>
<td>{{ $user->name_last }}</td>
<td>{{ $user->email }}</td>
@@ -12,14 +12,12 @@
@section("content")
<table class="tbl">
<tr>
<th>ID</th>
<th>Navn</th>
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
</tr>
@foreach($machines as $machine)
<tr>
<td>{ID}</td>
<td>{Navn}</td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
@@ -12,13 +12,11 @@
@section("content")
<table class="tbl">
<tr>
<th>ID</th>
<th>Navn</th>
<th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
<th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
</tr>
<tr>
<td>{ID}</td>
<td>{Navn}</td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
@@ -12,7 +12,6 @@
@section("content")
<table class="tbl">
<tr>
<th>ID</th>
<th>Fornavn</th>
<th>Efternavn</th>
<th>Tlf nr</th>
@@ -22,7 +21,6 @@
</tr>
@foreach($reservations as $reservation)
<tr>
<td>{ID}</td>
<td>{Fornavn}</td>
<td>{Efternavn}</td>
<td>{Tlf Nr}</td>
@@ -12,7 +12,6 @@
@section("content")
<table class="tbl">
<tr>
<th>ID</th>
<th>Fornavn</th>
<th>Efternavn</th>
<th>Telefon Nr.</th>
@@ -21,7 +20,6 @@
<th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
</tr>
<tr>
<th>ID</th>
<th>Fornavn</th>
<th>Efternavn</th>
<th>Telefon Nr.</th>
@@ -10,11 +10,11 @@
<div class="col w-100 mt-auto">
<div class="calendar-container">
<div class="calendar-container__header">
<button id="month-previous" class="calendar-container__btn calendar-container__btn--left" title="Previous">
<button id="week-previous" class="calendar-container__btn calendar-container__btn--left" title="Previous">
<i class="icon ion-ios-arrow-back"></i>
</button>
<h2 id="month" class="calendar-container__title">{Måned} {År}</h2>
<button id="month-next" class="calendar-container__btn calendar-container__btn--right" title="Next">
<button id="week-next" class="calendar-container__btn calendar-container__btn--right" title="Next">
<i class="icon ion-ios-arrow-forward"></i>
</button>
</div>
@@ -223,22 +223,22 @@
</div>
<div class="events-container">
<span class="events__title">Tider</span>
<ul class="events__list">
<li class="events__item">
<div class="events__item--left">
<span class="events__name">Vaskemaskine Tid</span>
<span class="events__date">{Dato}</span>
</div>
<span class="events__tag">Book</span>
</li>
<li class="events__item">
<div class="events__item--left">
<span class="events__name">Vaskemaskine Tid</span>
<span class="events__date">{Dato}</span>
</div>
<span class="events__tag">Book</span>
</li>
</ul>
<select id="events" class="events__list">
{{-- <li class="events__item">--}}
{{-- <div class="events__item--left">--}}
{{-- <span class="events__name">Vaskemaskine Tid</span>--}}
{{-- <span class="events__date">{Dato}</span>--}}
{{-- </div>--}}
{{-- <span class="events__tag">Book</span>--}}
{{-- </li>--}}
{{-- <li class="events__item">--}}
{{-- <div class="events__item--left">--}}
{{-- <span class="events__name">Vaskemaskine Tid</span>--}}
{{-- <span class="events__date">{Dato}</span>--}}
{{-- </div>--}}
{{-- <span class="events__tag">Book</span>--}}
{{-- </li>--}}
</select>
</div>
</div>
</main>
@@ -0,0 +1,21 @@
@extends("app.layout.base")
@extends("app.layout.header")
@section("title")
Aktiviteter
@endsection
@section("content")
<main>
<h1 class="text-center sde-blue mb-0">Aktiviteter</h1>
<h3 class="sde-blue bold text-center mb-0">{Aktivitet}</h3>
<p class="text-center mt-0">{Dato}</p>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.</p>
<a class="btn text-center btn-sde-blue btn-disabled" id="tilmeld">Tilmeld</a>
<h3 class="sde-blue bold text-center mb-0">{Aktivitet2}</h3>
<p class="text-center mt-0">{Dato}</p>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.</p>
<a class="btn text-center btn-sde-blue btn-disabled" id="tilmeld">Tilmeld</a>
</main>
@endsection
@@ -16,27 +16,27 @@
</button>
</header>
<div class="d-none bg-sde-blue col" id="menu">
<a href="menu-plans">
<a href="{{ route("menu-plans.index") }}">
<img src="{{URL::asset('/images/icons/Menuplan.svg')}}" alt="Menuplan">
Menuplan
</a>
<a href="events">
<a href="{{ route("events.index") }}">
<img src="{{URL::asset('/images/icons/Aktiviteter.svg')}}" alt="Aktiviteter">
Aktiviteter
</a>
<a href="washing-reservations">
<img src="{{URL::asset('/images/icons/Vaske booking liste.svg')}}" alt="Vaske booking liste">
Vaske booking liste
<a href="{{ route("washing-reservations.index") }}">
<img src="{{URL::asset('/images/icons/Vaske booking liste.svg')}}" alt="Reservationer">
Reservationer
</a>
<a href="">
<a href="#">
<img src="{{URL::asset('/images/icons/Galleri.svg')}}" alt="Galleri">
Galleri
</a>
<a href="">
<a href="#">
<img src="{{URL::asset('/images/icons/Kontoret.svg')}}" alt="Kontoret">
Kontoret
</a>
<a href="">
<a href="#">
<img src="{{URL::asset('/images/icons/Vagttelefon-hvid.svg')}}" alt="Vagttelefon">
Vagttelefon
</a>
@@ -11,9 +11,11 @@
{{--Register--}}
{{--@extends("app.users.register")--}}
{{--Events--}}
{{----}}@extends("app.events.index")
{{--Vagttelefon--}}
{{----}}@extends("app.vagttelefons.index")
{{--@extends("app.vagttelefons.index")--}}
{{--Booking Liste--}}
{{--@extends("app.washing-reservations.index")--}}
@@ -0,0 +1,58 @@
@extends("app.layout.base")
@extends("app.layout.header")
@section("title")
Booking Liste
@endsection
@section("content")
<main>
<h1 class="text-center sde-blue mb-0">Booking Liste</h1>
<div class="col w-100 mt-auto">
<div class="calendar-container">
<div class="calendar-container__header">
<button id="week-previous" class="calendar-container__btn fas fa-arrow-left" title="Previous">
<i class="icon ion-ios-arrow-back"></i>
</button>
<h2 id="title" class="calendar-container__title">{Måned} {År}</h2>
<button id="week-next" class="calendar-container__btn fas fa-arrow-right" title="Next">
<i class="icon ion-ios-arrow-forward"></i>
</button>
</div>
<div class="calendar-container__body">
<div id="calendar" class="calendar-table">
<div class="calendar-table__body">
</div>
</div>
</div>
</div>
<div id="event-container" class="events-container">
<p>
Maskiner skal dynamisk opdateres alt efter om det er en fra bygning E eller en af de andre bygninger der vil vaske, da bygning E har egen vaskekælder!
</p>
{{-- <span class="events__title">Maskiner</span>--}}
{{-- <select id="washing-machines" class="events__list">--}}
{{-- </select>--}}
{{-- <span class="events__title">Tider</span>--}}
{{-- <select id="events" class="events__list">--}}
{{-- <li class="events__item">--}}
{{-- <div class="events__item--left">--}}
{{-- <span class="events__name">Vaskemaskine Tid</span>--}}
{{-- <span class="events__date">{Dato}</span>--}}
{{-- </div>--}}
{{-- <span class="events__tag">Book</span>--}}
{{-- </li>--}}
{{-- <li class="events__item">--}}
{{-- <div class="events__item--left">--}}
{{-- <span class="events__name">Vaskemaskine Tid</span>--}}
{{-- <span class="events__date">{Dato}</span>--}}
{{-- </div>--}}
{{-- <span class="events__tag">Book</span>--}}
{{-- </li>--}}
</select>
</div>
</div>
</main>
@endsection