vict3459/Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

Browse Source
This commit is contained in:
Anders
2020-06-25 15:02:06 +02:00
parent bad4196e95 b55fd18c71
commit 8bda01c1dc
16 changed files with 363 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/resources/views/admin/events/index.blade.php
+2 -2
View File
@@ -15,8 +15,8 @@
<th>ID</th>
<th>Event Navn</th>
<th>Event Beskrivelse</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>
<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($events as $event)
<tr>
skolehjem/resources/views/admin/external-links/index.blade.php
+2 -2
View File
@@ -15,8 +15,8 @@
<th>ID</th>
<th>Title</th>
<th>Link</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>
<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($links as $link)
<tr>
skolehjem/resources/views/admin/layout/base.blade.php
+3
View File
@@ -45,6 +45,9 @@
<div class="row">
<a href="{{ route('washing-machines.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Vaskemaskine</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>
</div>
</div>
</div>
<div class="w-85" style="background-color: #cccccc;">
skolehjem/resources/views/admin/menuplans/index.blade.php
+2 -2
View File
@@ -20,8 +20,8 @@
<th>Fredag</th>
<th>Lørdag</th>
<th>Søndag</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>
<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($menuplans as $menuplan)
<tr>
skolehjem/resources/views/admin/users/index.blade.php
+2 -2
View File
@@ -17,8 +17,8 @@
<th>Efternavn</th>
<th>Email</th>
<th>Tlf nr</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>
<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($users as $user)
<tr>
skolehjem/resources/views/admin/washing-machines/index.blade.php
+2 -2
View File
@@ -14,8 +14,8 @@
<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>
<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>
skolehjem/resources/views/admin/washing-reservations/index.blade.php
+2 -2
View File
@@ -17,8 +17,8 @@
<th>Efternavn</th>
<th>Tlf nr</th>
<th>Vaskemaskine</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>
<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($reservations as $reservation)
<tr>
skolehjem/resources/views/app/bookings/index.blade.php
+14 -14
View File
@@ -10,26 +10,26 @@
<div class="col w-100 mt-auto">
<div class="calendar-container">
<div class="calendar-container__header">
<button class="calendar-container__btn calendar-container__btn--left" title="Previous">
<button id="month-previous" class="calendar-container__btn calendar-container__btn--left" title="Previous">
<i class="icon ion-ios-arrow-back"></i>
</button>
<h2 class="calendar-container__title">{Måned} {År}</h2>
<button class="calendar-container__btn calendar-container__btn--right" title="Next">
<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">
<i class="icon ion-ios-arrow-forward"></i>
</button>
</div>
<div class="calendar-container__body">
<div class="calendar-table">
<div class="calendar-table__header">
<div class="calendar-table__row">
<div class="calendar-table__col">Man</div>
<div class="calendar-table__col">Tir</div>
<div class="calendar-table__col">Ons</div>
<div class="calendar-table__col">Tor</div>
<div class="calendar-table__col">Fre</div>
<div class="calendar-table__col">Lør</div>
<div class="calendar-table__col">Søn</div>
</div>
<div id="calendar" class="calendar-table">
<div class="calendar-table__header calendar-table__row">
{{-- <div class="">--}}
<div class="calendar-table__col">Mon</div>
<div class="calendar-table__col">Tue</div>
<div class="calendar-table__col">Wed</div>
<div class="calendar-table__col">Thu</div>
<div class="calendar-table__col">Fri</div>
<div class="calendar-table__col">Sat</div>
<div class="calendar-table__col">Sun</div>
{{-- </div>--}}
</div>
<div class="calendar-table__body">
<div class="calendar-table__row">
skolehjem/resources/views/app/contact/index.blade.php
+17
View File
@@ -0,0 +1,17 @@
@extends("app.layout.base")
@extends("app.layout.header")
@section("title")
Kontakt
@endsection
@section("content")
<main>
<h1 class="text-center sde-blue mt-0">Kontakt</h1>
<h4 class="mt-0">Email: x@x.x</h4>
<span class="text-center sde-black-20 mt-1">+45 xx xx xx xx</span>
<a class="btn text-center btn-sde-blue" href="tel:+45" id="call">Tilkald x</a>
<h4 class="mt-3">Email: x@x.x</h4>
<span class="text-center sde-black-20 mt-1">+45 xx xx xx xx</span>
<a class="btn text-center btn-sde-blue" href="tel:+45" id="call">Tilkald x</a>
</main>
@endsection
skolehjem/resources/views/app/root/index.blade.php
+4 -1
View File
@@ -3,7 +3,7 @@
{{----}}
{{--Index--}}
{{----}}@extends("app.users.index")
{{--@extends("app.users.index")--}}
{{--Login--}}
{{--@extends("app.users.login")--}}
@@ -21,6 +21,9 @@
{{--Menuplan--}}
{{--@extends("app.menuplans.index")--}}
{{--Contact--}}
{{----}}@extends("app.contact.index")
{{----}}
{{------Admin Panel
{{----}}