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

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

 Conflicts:
	skolehjem/resources/views/app/root/index.blade.php
This commit is contained in:
Sebastian Davaris 2020-06-25 14:56:45 +02:00
parent 3d9cc63241 7f083860f1
commit b55fd18c71
27 changed files with 319 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
skolehjem/app/Booking.php
View File

@ -1,10 +0,0 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class Booking extends Model
{
//
}

100
skolehjem/app/Http/Controllers/BookingController.php
View File

@ -1,100 +0,0 @@
<?php
namespace App\Http\Controllers;
use App\Booking;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
class BookingController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index(Request $request)
{
$booking = Booking::query()->paginate($request->input("limit", 20));
return Response::detect("bookings.index", [ "bookings" => $booking]);
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
return Response::detect("bookings.create");
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
$requestBooking = $request->validate([
"name_first" => "required|max:255",
"name_last" => "required|max:255",
"phone" => "required|unique:users",
"machine_choice" => "required|max:255",
]);
$booking = new Booking($requestBooking);
$booking->save();
return Response::detect("bookings.store");
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id)
{
return Response::detect("bookings.show", [ "bookings" => $id]);
}
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function edit($id)
{
return Response::detect("bookings.show", [ "bookings" => $id]);
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
//
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
//
}
}

14
skolehjem/app/Http/Controllers/WashingReservationController.php
View File

@ -19,7 +19,7 @@ class WashingReservationController extends Controller
{
$reservations = WashingReservation::query()->paginate($request->query("page", 1));
return Response::detect("washing-reservation.index");
return Response::detect("washing-reservations.index", [ "reservations" => $reservations]);
}
/**
@ -29,7 +29,7 @@ class WashingReservationController extends Controller
*/
public function create()
{
return Response::detect("washing-reservation.create");
return Response::detect("washing-reservations.create");
}
/**
@ -47,7 +47,7 @@ class WashingReservationController extends Controller
$machineReservation = new WashingReservation($data);
$machineReservation->save();
return Response::detect("washing-reservation.store");
return Response::detect("washing-reservations.store");
}
/**
@ -60,7 +60,7 @@ class WashingReservationController extends Controller
{
$machineReservation = WashingReservation::find($id);
return Response::detect("washing-reservation.show", [
return Response::detect("washing-reservations.show", [
"machineReservation" => $machineReservation
]);
}
@ -73,7 +73,7 @@ class WashingReservationController extends Controller
*/
public function edit($id)
{
return Response::detect("washing-reservation.edit");
return Response::detect("washing-reservations.edit");
}
/**
@ -95,7 +95,7 @@ class WashingReservationController extends Controller
$machineReservation->save();
return Response::detect("washing-reservation.edit", [
return Response::detect("washing-reservations.edit", [
"washingReservation" => $machineReservation
]);
}
@ -111,6 +111,6 @@ class WashingReservationController extends Controller
$machineReservation = WashingReservation::find($id);
$machineReservation->delete();
return Response::detect("washing-reservation.delete");
return Response::detect("washing-reservations.delete");
}
}

28
skolehjem/public/css/admin.css vendored
View File

@ -307,6 +307,34 @@ a {
background-color: #00788a;
}
.block-container {
padding: 0 8px;
}
.block {
color: white;
padding: 1em 2em;
border-radius: 4px;
background-color: #00788a;
}
.links {
position: absolute;
width: 100%;
bottom: 8px;
height: 2rem;
justify-content: center;
}
.link {
height: 2rem;
display: inline-flex;
align-items: center;
align-content: center;
align-self: center;
margin-left: 8px;
}
.toggle {
--uiToggleSize: var(--toggleSize, 20px);
--uiToggleIndent: var(--toggleIndent, .4em);

28
skolehjem/public/css/webapp.css vendored
View File

@ -307,6 +307,34 @@ a {
background-color: #00788a;
}
.block-container {
padding: 0 8px;
}
.block {
color: white;
padding: 1em 2em;
border-radius: 4px;
background-color: #00788a;
}
.links {
position: absolute;
width: 100%;
bottom: 8px;
height: 2rem;
justify-content: center;
}
.link {
height: 2rem;
display: inline-flex;
align-items: center;
align-content: center;
align-self: center;
margin-left: 8px;
}
.toggle {
--uiToggleSize: var(--toggleSize, 20px);
--uiToggleIndent: var(--toggleIndent, .4em);

BIN
skolehjem/public/images/icons/facebook-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
skolehjem/public/images/icons/instagram.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

BIN
skolehjem/public/images/icons/yt.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.6 KiB

28
skolehjem/resources/sass/app/general/_sizes.scss vendored
View File

@ -57,3 +57,31 @@ a {
.bg-sde-blue {
background-color: $sde-blue;
}
.block-container {
padding: 0 8px;
}
.block {
color: white;
padding: 1em 2em;
border-radius: 4px;
background-color: $sde-blue;
}
.links{
position: absolute;
width: 100%;
bottom: 8px;
height: 2rem;
justify-content: center;
}
.link{
height: 2rem;
display: inline-flex;
align-items: center;
align-content: center;
align-self: center;
margin-left: 8px;
}

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

4
skolehjem/resources/views/admin/external-links/index.blade.php
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>

7
skolehjem/resources/views/admin/layout/base.blade.php
View File

@ -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;">

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

6
skolehjem/resources/views/admin/root/index.blade.php
View File

@ -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")--}}

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

4
skolehjem/resources/views/admin/washing-machines/index.blade.php
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>

27
skolehjem/resources/views/admin/washing-reservations/create.blade.php Normal file
View File

@ -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

13
skolehjem/resources/views/admin/washing-reservations/delete.blade.php Normal file
View File

@ -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

28
skolehjem/resources/views/admin/washing-reservations/edit.blade.php Normal file
View File

@ -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

37
skolehjem/resources/views/admin/washing-reservations/index.blade.php Normal file
View File

@ -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

33
skolehjem/resources/views/admin/washing-reservations/show.blade.php Normal file
View File

@ -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

14
skolehjem/resources/views/admin/washing-reservations/store.blade.php Normal file
View File

@ -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

14
skolehjem/resources/views/admin/washing-reservations/update.blade.php Normal file
View File

@ -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

17
skolehjem/resources/views/app/contact/index.blade.php Normal file
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

14
skolehjem/resources/views/app/root/index.blade.php
View File

@ -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")--}}

17
skolehjem/resources/views/app/users/index.blade.php
View File

@ -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

1
skolehjem/routes/web.php
View File

@ -32,4 +32,3 @@ Route::resource("washing-machines", "WashingMachineController");
Route::resource("washing-reservations", "WashingReservationController");
Route::resource("feedbacks", "FeedbackController");
Route::resource("external-links", "ExternalLinkController");
Route::resource("bookings", "BookingController");