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

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

This commit is contained in:
frederikpyt 2020-08-03 15:02:36 +02:00
parent 4fe015a74c 20d73c047f
commit 84a1045747
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
skolehjem/resources/views/admin/events/create.blade.php
View File

@ -18,7 +18,7 @@
<label for="description">Beskrivelse:</label> <label for="description">Beskrivelse:</label>
<input type="text" name="description" id="description" max="500" required> <input type="text" name="description" id="description" max="500" required>
<label for="date">Aktivitet dato:</label> <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"> <input type="submit" class="btn btn-dark text-white" value="Opret">
</form> </form>

2
skolehjem/resources/views/admin/events/edit.blade.php
View File

@ -19,7 +19,7 @@
<label for="description">Beskrivelse</label> <label for="description">Beskrivelse</label>
<input value="{{$event->description}}" type="text" name="description" id="description" required> <input value="{{$event->description}}" type="text" name="description" id="description" required>
<label for="date">Beskrivelse</label> <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"> <input type="submit" class="btn btn-dark text-white" value="Rediger">
</form> </form>

2
skolehjem/resources/views/admin/events/index.blade.php
View File

@ -32,7 +32,7 @@
<tr> <tr>
<td>{{ $event->name }}</td> <td>{{ $event->name }}</td>
<td>{{ $event->description }}</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.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><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"> <td><form method="post" action="{{ route("events.destroy", [ "event" => $event ]) }}" class="w-100 nostyle">

2
skolehjem/resources/views/admin/washing-reservations/index.blade.php
View File

@ -38,7 +38,7 @@
@foreach($reservations as $reservation) @foreach($reservations as $reservation)
<tr> <tr>
<td>{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}</td> <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>{{ ucfirst(\App\User::query()->find($reservation->user_id)->name_first) }} {{ ucfirst(\App\User::query()->find($reservation->user_id)->name_last) }}</td>
<td><form method="post" action="{{ route('washing-reservations.destroy', ['washing_reservation' => $reservation]) }}" class="w-100 nostyle"> <td><form method="post" action="{{ route('washing-reservations.destroy', ['washing_reservation' => $reservation]) }}" class="w-100 nostyle">
@csrf @csrf

2
skolehjem/resources/views/app/events/index.blade.php
View File

@ -10,7 +10,7 @@
@foreach($events as $event) @foreach($events as $event)
<form method="get" action="{{ route("userevents.create") }}"> <form method="get" action="{{ route("userevents.create") }}">
<h3 class="sde-blue bold text-center mb-0">{{$event->name}}</h3> <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> <p class="text-center">{{$event->description}}</p>
<input type="hidden" name="event_id" value="{{ $event->id }}"> <input type="hidden" name="event_id" value="{{ $event->id }}">
{!! session()->get('error#' . $event->id) !!} {!! session()->get('error#' . $event->id) !!}

2
skolehjem/resources/views/app/events/yourevents.blade.php
View File

@ -13,7 +13,7 @@
@csrf @csrf
@method("delete") @method("delete")
<h3 class="sde-blue bold text-center mb-0">{{$userevent->name}}</h3> <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> <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> <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> </form>

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

@ -5,7 +5,7 @@
<div class="d-flex col block-container mt-2"> <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('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('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('contacts.index') }}" class="block text-center mb-1">Kontoret</a>
<a href="{{ route('phones.index') }}" class="block text-center mb-1">Vagttelefon</a> <a href="{{ route('phones.index') }}" class="block text-center mb-1">Vagttelefon</a>
</div> </div>