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

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

Browse Source
This commit is contained in:
Neerholt
2020-08-04 13:21:39 +02:00
parent c223cb967c 408eb7090b
commit 210aa00fc6
85 changed files with 1502 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/resources/views/admin/events/create.blade.php
+1 -1
View File
@@ -18,7 +18,7 @@
<label for="description">Beskrivelse:</label>
<input type="text" name="description" id="description" max="500" required>
<label for="date">Aktivitet dato:</label>
<input type="date" name="date" id="date" required>
<input type="datetime-local" name="date" id="date" required>
<input type="submit" class="btn btn-dark text-white" value="Opret">
</form>
skolehjem/resources/views/admin/events/edit.blade.php
+1 -1
View File
@@ -19,7 +19,7 @@
<label for="description">Beskrivelse</label>
<input value="{{$event->description}}" type="text" name="description" id="description" required>
<label for="date">Beskrivelse</label>
<input value="{{$event->date}}" type="date" name="date" id="date" required>
<input value="{{$event->date}}" type="datetime-local" name="date" id="date" required>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
</form>
skolehjem/resources/views/admin/events/index.blade.php
+3 -2
View File
@@ -17,8 +17,9 @@
@csrf
<input type="text" class="form-controller" id="search" name="search" placeholder="Søg på Evt Navn, Evt Dato"></input>
</form>
</div>
{!! session()->get('EventNameExists') !!}
<table class="tbl mt-2">
<tr>
<th>Event Navn</th>
@@ -32,7 +33,7 @@
<tr>
<td>{{ $event->name }}</td>
<td>{{ $event->description }}</td>
<td>{{ $event->date }}</td>
<td>{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</td>
<td><a href="{{ route("events.signups", [ "event" => $event ]) }}"><img class="w-100" src="{{ asset('/images/icons/eye-dark.svg') }}" alt="Update"></a></td>
<td><a href="{{ route("events.edit", [ "event" => $event ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><form method="post" action="{{ route("events.destroy", [ "event" => $event ]) }}" class="w-100 nostyle">
skolehjem/resources/views/admin/feedbacks/index.blade.php
-1
View File
@@ -47,7 +47,6 @@
url: '{{route('feedbacks.search')}}',
data: {'option':$value},
success:function (data) {
console.log($value);
$('tbody').html(data);
},
error:function (data) {
skolehjem/resources/views/admin/menuplans/index.blade.php
+2 -1
View File
@@ -18,8 +18,9 @@
@csrf
<input type="number" class="form-controller" id="search" name="search" pattern="[0-9]{2}" placeholder="Søg efter ugenummer"></input>
</form>
</div>
{!! session()->get('WeekExists') !!}
<table class="tbl mt-2">
<tr>
<th>Uge</th>
skolehjem/resources/views/admin/roles/index.blade.php
+2 -2
View File
@@ -17,9 +17,9 @@
@csrf
<input type="text" class="form-controller" id="search" name="search" placeholder="Søg efter navn"></input>
</form>
</div>
{!! session()->get('RoleNameExists') !!}
<table class="tbl mt-2">
<tr>
<th>Navn</th>
skolehjem/resources/views/admin/users/create.blade.php
+2
View File
@@ -12,6 +12,8 @@
@section("content")
<h1>Opret Bruger:</h1>
{!! session()->get('error#notsamepass') !!}
{!! session()->get('EmailExists') !!}
{!! session()->get('PhoneExists') !!}
<form method="post" action="{{ route("users.store") }}">
@csrf
<label for="name_first">Fornavn:</label>
skolehjem/resources/views/admin/users/edit.blade.php
+2
View File
@@ -12,6 +12,8 @@
@section("content")
<h1>Rediger Bruger:</h1>
{!! session()->get('error#notsamepass') !!}
{!! session()->get('EmailExists') !!}
{!! session()->get('PhoneExists') !!}
<form method="post" action="{{ route("users.update", ['user' => $user]) }}">
@csrf
@method("put")
skolehjem/resources/views/admin/washing-machines/index.blade.php
+1
View File
@@ -13,6 +13,7 @@
<div class="row align-items-center">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('washing-machines.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Vaskemaskine</a>
</div>
{!! session()->get('WashingNameExists') !!}
<table class="tbl mt-2">
<tr>
<th>Navn</th>
skolehjem/resources/views/admin/washing-reservations/index.blade.php
+1 -4
View File
@@ -33,15 +33,13 @@
<th>Vaskemaskine</th>
<th>Tidspunkt</th>
<th>Bruger</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>{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}</td>
<td>{{ $reservation->time }}</td>
<td>{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }}</td>
<td>{{ ucfirst(\App\User::query()->find($reservation->user_id)->name_first) }} {{ ucfirst(\App\User::query()->find($reservation->user_id)->name_last) }}</td>
<td><a href="{{ route('washing-reservations.edit', ['washing_reservation' => $reservation]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><form method="post" action="{{ route('washing-reservations.destroy', ['washing_reservation' => $reservation]) }}" class="w-100 nostyle">
@csrf
@method("delete")
@@ -65,7 +63,6 @@
url: '{{route('washing-reservations.search')}}',
data: {'search':$value, 'isCheck': $checkboxValue},
success:function (data) {
console.log($checkboxValue);
$('tbody').html(data);
},
error:function (data) {
skolehjem/resources/views/app/events/index.blade.php
+1 -1
View File
@@ -10,7 +10,7 @@
@foreach($events as $event)
<form method="get" action="{{ route("userevents.create") }}">
<h3 class="sde-blue bold text-center mb-0">{{$event->name}}</h3>
<p class="text-center mt-0">{{$event->date}}</p>
<p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
<p class="text-center">{{$event->description}}</p>
<input type="hidden" name="event_id" value="{{ $event->id }}">
{!! session()->get('error#' . $event->id) !!}
skolehjem/resources/views/app/events/yourevents.blade.php
+2 -2
View File
@@ -5,7 +5,7 @@
@section("content")
<main>
<h1 class="text-center sde-blue mb-0">Aktiviteter</h1>
<h1 class="text-center sde-blue mb-0">Tilmeldte Aktiviteter</h1>
{!! session()->get('eventunsubscribed') !!}
@if(!$userevents->isEmpty())
@foreach($userevents as $userevent)
@@ -13,7 +13,7 @@
@csrf
@method("delete")
<h3 class="sde-blue bold text-center mb-0">{{$userevent->name}}</h3>
<p class="text-center mt-0">{{$userevent->date}}</p>
<p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}</p>
<p class="text-center">{{$userevent->description}}</p>
<button type="submit" class="btn text-center btn-sde-blue" onclick="return confirm('Are you sure you want to remove this event?');">Afmeld</button>
</form>
skolehjem/resources/views/app/users/index.blade.php
+2 -2
View File
@@ -5,11 +5,11 @@
<div class="d-flex col block-container mt-2">
<a href="{{ route('menu-plans.index') }}" class="block text-center mb-1">Menuplan</a>
<a href="{{ route('events.index') }}" class="block text-center mb-1">Aktiviteter</a>
<a href="{{ route('washing-reservations.index') }}" class="block text-center mb-1">Reservationer</a>
<a href="{{ route('washing-reservations.appindex') }}" class="block text-center mb-1">Reservationer</a>
<a href="{{ route('contacts.index') }}" class="block text-center mb-1">Kontoret</a>
<a href="{{ route('phones.index') }}" class="block text-center mb-1">Vagttelefon</a>
</div>
<div class="links row">
<div class="row" style="position: absolute; bottom: 8px; align-self: center;">
<a href="https://www.facebook.com" target="_blank" class="link">
<img src="{{ URL::asset('/images/icons/facebook-icon.png') }}" class="h-100" alt="Facebook">
</a>
skolehjem/resources/views/app/vagttelefons/index.blade.php
+14 -2
View File
@@ -9,7 +9,7 @@
<h1 class="text-center sde-blue mt-0">Vagttelefon</h1>
<p class="mt-0">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.</p>
<label class="toggle">
<input class="toggle__input" type="checkbox" name="accept" id="input">
<input class="toggle__input" type="checkbox" name="accept" id="input" onclick="check()">
<span class="toggle__label sde-blue">
<span class="toggle__text sde-blue semi-bold">Accepterer</span>
</span>
@@ -20,5 +20,17 @@
@endsection
@section("scripts")
<script>
function check() {
var checkBox = document.getElementById("input");
var btn = document.getElementById("call");
if (checkBox.checked == true){
btn.href = "";
btn.classList.remove("btn-disabled");
} else {
btn.href = "tel:+4556304566";
btn.classList.add("btn-disabled");
}
}
</script>
@endsection