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 
 Conflicts:
	skolehjem/app/Http/Controllers/WashingReservationController.php
This commit is contained in:
frederikpyt
2020-08-04 16:52:42 +02:00
parent 1011165ca0 4f1ff3a823
commit 64d1f785f9
15 changed files with 52 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/resources/views/admin/contacts/index.blade.php
+31 -3
View File
@@ -2,7 +2,7 @@
@extends("admin.layout.header")
@section("title")
Events - Vis
Kontakt - Vis
@endsection
@section("path")
@@ -15,9 +15,18 @@
<form method="post" action="{{ route("users.store") }}">
@csrf
<input type="text" class="form-controller" id="search" name="search" placeholder="Søg på Navn, Email, Telefon"></input>
<input type="text" class="form-controller" id="search" name="search" placeholder="Søg på navn,titel,email,tf"></input>
</form>
<input class="checkbox-inline" type="checkbox" name="checkbox" id="navn" value="navn">
<label for="navn">Navn</label>
<input class="checkbox-inline" type="checkbox" name="checkbox" id="titel" value="titel">
<label for="efternavn">Titel</label>
<input class="checkbox-inline" type="checkbox" name="checkbox" id="email" value="email">
<label for="efternavn">Email</label>
<input class="checkbox-inline" type="checkbox" name="checkbox" id="tf" value="tf">
<label for="efternavn">Telefon</label>
<p></p>
</div>
@@ -51,11 +60,13 @@
<script>
$('#search').on('keyup', function () {
$value = $(this).val();
$checkboxValue = $( "input:checked" ).val();
$.ajax({
type: 'get',
url: '{{route('contacts.search')}}',
data: {'search':$value},
data: {'search':$value, 'isCheck': $checkboxValue},
success:function (data) {
console.log($checkboxValue);
$('tbody').html(data);
},
error:function (data) {
@@ -66,5 +77,22 @@
</script>
<script>
$(document).ready(function(){
$("input:checkbox").on('click', function() {
var $box = $(this);
if ($box.is(":checked")) {
var group = "input:checkbox[name='" + $box.attr("name") + "']";
$(group).prop("checked", false);
$box.prop("checked", true);
} else {
$box.prop("checked", false);
}
});
});
</script>
@endsection
skolehjem/resources/views/admin/external-links/create.blade.php
-22
View File
@@ -1,22 +0,0 @@
@extends("admin.layout.base")
@extends("admin.layout.header")
@section("title")
Link - Opret
@endsection
@section("path")
<a href="{{ route('external-links.create') }}" class="text-white">Opret Link</a> /
@endsection
@section("content")
<h1>Opret Link:</h1>
<form method="post" action="{{ route("external-links.store") }}">
@csrf
<label for="title">Titel:</label>
<input type="text" name="name" id="title" required>
<label for="link">Linket:</label>
<input type="text" name="link" id="link" required>
<input type="submit" class="btn btn-dark text-white" value="Opret">
</form>
@endsection
skolehjem/resources/views/admin/external-links/delete.blade.php
-13
View File
@@ -1,13 +0,0 @@
@extends("admin.layout.base")
@extends("admin.layout.header")
@section("title")
Link - Fjern
@endsection
@section("path")
<a href="{{ route('external-links.delete') }}" class="text-white">Fjern Link</a> /
@endsection
@section("content")
@endsection
skolehjem/resources/views/admin/external-links/edit.blade.php
-23
View File
@@ -1,23 +0,0 @@
@extends("admin.layout.base")
@extends("admin.layout.header")
@section("title")
Link - Rediger
@endsection
@section("path")
<a href="{{route('external-links.edit', ['external_link' => $link])}}" class="text-white">Rediger Link</a> /
@endsection
@section("content")
<h1>Rediger Link:</h1>
<form method="post" action="{{route("external-links.update", ["external_link" => $link])}}">
@csrf
@method("PUT")
<label for="title">Titel:</label>
<input value="{{$link->name}}" type="text" name="name" id="title" required>
<label for="link">Linket:</label>
<input value="{{$link->link}}" type="text" name="link" id="link" required>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
</form>
@endsection
skolehjem/resources/views/admin/external-links/index.blade.php
-40
View File
@@ -1,40 +0,0 @@
@extends("admin.layout.base")
@extends("admin.layout.header")
@section("title")
Link - Vis
@endsection
@section("path")
<a href="{{ route('external-links.index') }}" class="text-white">Vis Link</a> /
@endsection
@section("content")
<div class="row align-items-center">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('external-links.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Ektern Link</a>
</div>
<table class="tbl mt-2">
<tr>
<th>Title</th>
<th>Link</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>
<td>{{$link->name}}</td>
<td><a href="{{$link->link}}">{{$link->link}}</td>
<td><a href="{{ route("external-links.edit", [ "external_link" => $link ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><form method="post" action="{{ route("external-links.destroy", [ "external_link" => $link ]) }}" class="w-100 nostyle">
@csrf
@method("delete")
<button onclick="return confirm('Are you sure you want to delete?');" class="w-100 nostyle" type="submit"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
</form>
</td>
</tr>
@endforeach
</table>
{{ $links->links() }}
@endsection
skolehjem/resources/views/admin/external-links/store.blade.php
-14
View File
@@ -1,14 +0,0 @@
@extends("admin.layout.base")
@extends("admin.layout.header")
@section("title")
Link - Opret
@endsection
@section("path")
<a href="{{ route('external-links.create') }}" class="text-white">Opret External Link</a> /
@endsection
@section("content")
Link blev (ikke) oprettet.
@endsection
skolehjem/resources/views/admin/external-links/update.blade.php
-14
View File
@@ -1,14 +0,0 @@
@extends("admin.layout.base")
@extends("admin.layout.header")
@section("title")
link - Rediger
@endsection
@section("path")
<a href="{{ route('external-links.edit', ["external_link" => $link]) }}" class="text-white">External link</a> /
@endsection
@section("content")
Din link blev (ikke) redigeret.
@endsection
skolehjem/resources/views/admin/layout/base.blade.php
-3
View File
@@ -29,9 +29,6 @@
<div class="segment">
<h3 class="text-white"><a href="{{ route("washing-reservations.index") }}" class="text-white"><i class="fa fa-link"></i><span style="margin-left: 4px;">Reservationer</span></a></h3>
</div>
<div class="segment">
<h3 class="text-white"><a href="{{ route("external-links.index") }}" class="text-white"><i class="fa fa-link"></i><span style="margin-left: 4px;">Eksterne Links</span></a></h3>
</div>
<div class="segment">
<h3 class="text-white"><a href="{{ route("contacts.index") }}" class="text-white"><i class="fa fa-link"></i><span style="margin-left: 4px;">Kontakter</span></a></h3>
</div>
skolehjem/resources/views/admin/washing-reservations/index.blade.php
+2 -2
View File
@@ -15,14 +15,14 @@
<form method="post" action="{{ route("washing-reservations.store") }}">
@csrf
<input type="text" class="form-controller" id="search" name="search" placeholder="Søg på Navn, Telefon"></input>
<input type="text" class="form-controller" id="search" name="search" placeholder="Søg på vaskemaskine, tid"></input>
</form>
<input class="checkbox-inline" type="checkbox" name="checkbox" id="vaskemaskine" value="vaskemaskine">
<label for="navn">Vaskemaskine</label>
<input class="checkbox-inline" type="checkbox" name="checkbox" id="tidspunkt" value="tidspunkt">
<label for="efternavn">Tispunkt</label>
<label for="efternavn">Tidspunkt</label>
<input class="checkbox-inline" type="checkbox" name="checkbox" id="bruger" value="bruger">
<label for="email">Bruger</label>
skolehjem/resources/views/app/washing-reservations/create.blade.php
+1
View File
@@ -7,6 +7,7 @@
@section("content")
<main>
<h1 class="text-center sde-blue mb-0">Booking Liste</h1>
{!! session()->get('ReservationExists') !!}
<div class="col w-100 mt-auto">
<div class="calendar-container">
<div class="calendar-container__header">