Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts: skolehjem/resources/views/app/root/index.blade.php
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -31,10 +31,10 @@
|
||||
<div class="segment">
|
||||
<h3 class="text-white">Booking</h3>
|
||||
<div class="row">
|
||||
<a href="{{ route("bookings.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Bookings</a>
|
||||
<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('bookings.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Booking</a>
|
||||
<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">
|
||||
@@ -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;">
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
{{--@extends("app.vagttelefons.index")--}}
|
||||
|
||||
{{--Booking Liste--}}
|
||||
{{--@extends("app.bookings.index")--}}
|
||||
{{--@extends("app.washing-reservations.index")--}}
|
||||
|
||||
{{--Menuplan--}}
|
||||
{{--@extends("app.menuplans.index")--}}
|
||||
@@ -44,10 +44,10 @@
|
||||
{{--@extends("admin.menuplans.update")--}}
|
||||
|
||||
{{--Create booking--}}
|
||||
{{--@extends("admin.bookings.create")--}}
|
||||
{{--@extends("admin.washing-reservations.create")--}}
|
||||
|
||||
{{--Read booking--}}
|
||||
{{--@extends("admin.bookings.show")--}}
|
||||
{{--@extends("admin.washing-reservations.show")--}}
|
||||
|
||||
{{--Create washing-machine--}}
|
||||
{{--@extends("admin.washing-machines.create")--}}
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
@extends("admin.layout.base")
|
||||
@extends("admin.layout.header")
|
||||
|
||||
@section("title")
|
||||
Booking - Opret
|
||||
@endsection
|
||||
|
||||
@section("path")
|
||||
<a href="{{ route('washing-reservations.create') }}" class="text-white">Opret Booking</a> /
|
||||
@endsection
|
||||
|
||||
@section("content")
|
||||
<h1>Opret Booking:</h1>
|
||||
<form method="post" action="{{ route("washing-reservations.store") }}">
|
||||
@csrf
|
||||
<label for="name_first">Fornavn:</label>
|
||||
<input type="text" name="name_first" id="name_first" required>
|
||||
<label for="name_last">Efternavn:</label>
|
||||
<input type="text" name="name_last" id="name_last" required>
|
||||
<label for="tel">Telefon nr:</label>
|
||||
<input type="tel" name="phone" id="tel" required>
|
||||
<select name="machine_choice">
|
||||
<option>Vaskemaskine 1</option>
|
||||
</select>
|
||||
<input type="submit" class="btn btn-dark text-white" value="Opret">
|
||||
</form>
|
||||
@endsection
|
||||
@@ -0,0 +1,13 @@
|
||||
@extends("admin.layout.base")
|
||||
@extends("admin.layout.header")
|
||||
|
||||
@section("title")
|
||||
Booking - Fjern
|
||||
@endsection
|
||||
|
||||
@section("path")
|
||||
<a href="" class="text-white">Fjern Booking</a> /
|
||||
@endsection
|
||||
|
||||
@section("content")
|
||||
@endsection
|
||||
@@ -0,0 +1,28 @@
|
||||
@extends("admin.layout.base")
|
||||
@extends("admin.layout.header")
|
||||
|
||||
@section("title")
|
||||
Booking - Rediger
|
||||
@endsection
|
||||
|
||||
@section("path")
|
||||
<a href="{{ route('washing-reservations.edit', ['id' => $reservations->id]) }}" class="text-white">Rediger Booking</a> /
|
||||
@endsection
|
||||
|
||||
@section("content")
|
||||
<h1>Rediger Booking:</h1>
|
||||
<form method="post" action="">
|
||||
@csrf
|
||||
<label for="name_first">Fornavn:</label>
|
||||
<input type="text" name="name_first" id="name_first" value="{Fornavn}" required>
|
||||
<label for="name_last">Efternavn:</label>
|
||||
<input type="text" name="name_last" id="name_last" value="{Efternavn}" required>
|
||||
<input type="password" id="password2" value="{Password}" required>
|
||||
<label for="tel">Telefon nr:</label>
|
||||
<input type="tel" name="phone" id="tel" value="{Telefon}" required>
|
||||
<select>
|
||||
<option>Vaskemaskine 1</option>
|
||||
</select>
|
||||
<input type="submit" class="btn btn-dark text-white" value="Rediger">
|
||||
</form>
|
||||
@endsection
|
||||
@@ -0,0 +1,37 @@
|
||||
@extends("admin.layout.base")
|
||||
@extends("admin.layout.header")
|
||||
|
||||
@section("title")
|
||||
Booking - Vis
|
||||
@endsection
|
||||
|
||||
@section("path")
|
||||
<a href="{{ route('washing-reservations.index') }}" class="text-white">Vis Booking</a> /
|
||||
@endsection
|
||||
|
||||
@section("content")
|
||||
<table class="tbl">
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
<th>Fornavn</th>
|
||||
<th>Efternavn</th>
|
||||
<th>Tlf nr</th>
|
||||
<th>Vaskemaskine</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>
|
||||
<td>{ID}</td>
|
||||
<td>{Fornavn}</td>
|
||||
<td>{Efternavn}</td>
|
||||
<td>{Tlf Nr}</td>
|
||||
<td>{Vaskemaskine Nr.}</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>
|
||||
|
||||
{{ $reservations->links() }}
|
||||
@endsection
|
||||
@@ -0,0 +1,33 @@
|
||||
@extends("admin.layout.base")
|
||||
@extends("admin.layout.header")
|
||||
|
||||
@section("title")
|
||||
Booking - Vis
|
||||
@endsection
|
||||
|
||||
@section("path")
|
||||
<a href="{{ route('washing-reservations.index') }}" class="text-white">Vis Booking</a> /
|
||||
@endsection
|
||||
|
||||
@section("content")
|
||||
<table class="tbl">
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
<th>Fornavn</th>
|
||||
<th>Efternavn</th>
|
||||
<th>Telefon 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>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
<th>Fornavn</th>
|
||||
<th>Efternavn</th>
|
||||
<th>Telefon 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>
|
||||
</tr>
|
||||
</table>
|
||||
@endsection
|
||||
@@ -0,0 +1,14 @@
|
||||
@extends("admin.layout.base")
|
||||
@extends("admin.layout.header")
|
||||
|
||||
@section("title")
|
||||
Booking - Opret
|
||||
@endsection
|
||||
|
||||
@section("path")
|
||||
<a href="{{ route('washing-reservations.create') }}" class="text-white">Opret Booking</a> /
|
||||
@endsection
|
||||
|
||||
@section("content")
|
||||
Booking blev (ikke) oprettet.
|
||||
@endsection
|
||||
@@ -0,0 +1,14 @@
|
||||
@extends("admin.layout.base")
|
||||
@extends("admin.layout.header")
|
||||
|
||||
@section("title")
|
||||
Booking - Rediger
|
||||
@endsection
|
||||
|
||||
@section("path")
|
||||
<a href="{{ route('washing-reservations.edit') }}" class="text-white">Rediger Booking</a> /
|
||||
@endsection
|
||||
|
||||
@section("content")
|
||||
Din booking blev (ikke) redigeret.
|
||||
@endsection
|
||||
@@ -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
|
||||
@@ -2,6 +2,9 @@
|
||||
{{------app
|
||||
{{----}}
|
||||
|
||||
{{--Index--}}
|
||||
{{--@extends("app.users.index")--}}
|
||||
|
||||
{{--Login--}}
|
||||
{{--@extends("app.users.login")--}}
|
||||
|
||||
@@ -13,17 +16,20 @@
|
||||
{{--@extends("app.vagttelefons.index")--}}
|
||||
|
||||
{{--Booking Liste--}}
|
||||
@extends("app.bookings.index")
|
||||
{{--@extends("app.washing-reservations.index")--}}
|
||||
|
||||
{{--Menuplan--}}
|
||||
{{--@extends("app.menuplans.index")--}}
|
||||
|
||||
{{--Contact--}}
|
||||
{{----}}@extends("app.contact.index")
|
||||
|
||||
{{----}}
|
||||
{{------Admin Panel
|
||||
{{----}}
|
||||
|
||||
{{--Index--}}
|
||||
{{----}}@extends("admin.index")
|
||||
{{--@extends("admin.index")--}}
|
||||
|
||||
{{--Create User--}}
|
||||
{{--@extends("admin.users.create")--}}
|
||||
@@ -44,10 +50,10 @@
|
||||
{{--@extends("admin.menuplans.update")--}}
|
||||
|
||||
{{--Create booking--}}
|
||||
{{--@extends("admin.bookings.create")--}}
|
||||
{{--@extends("admin.washing-reservations.create")--}}
|
||||
|
||||
{{--Read booking--}}
|
||||
{{--@extends("admin.bookings.show")--}}
|
||||
{{--@extends("admin.washing-reservations.show")--}}
|
||||
|
||||
{{--Create washing-machine--}}
|
||||
{{--@extends("admin.washing-machines.create")--}}
|
||||
|
||||
@@ -1,4 +1,21 @@
|
||||
@extends('app.layout.base')
|
||||
|
||||
@section('content')
|
||||
<div class="d-flex col block-container mt-2">
|
||||
<a href="" class="block text-center mb-1">Menu</a>
|
||||
<a href="" class="block text-center mb-1">Aktiviteter</a>
|
||||
<a href="" class="block text-center mb-1">Kalender</a>
|
||||
</div>
|
||||
<div class="links row">
|
||||
<a href="" class="link">
|
||||
<img src="{{ URL::asset('/images/icons/facebook-icon.png') }}" class="h-100" alt="Facebook">
|
||||
</a>
|
||||
<a href="" class="link">
|
||||
<img src="{{ URL::asset('/images/icons/yt.png') }}" class="h-100" alt="Youtube">
|
||||
</a>
|
||||
<a href="" class="link">
|
||||
<img src="{{ URL::asset('/images/icons/instagram.png') }}" class="h-100" alt="Instagram">
|
||||
</a>
|
||||
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
Reference in New Issue
Block a user