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:
victor 2020-07-29 13:59:59 +02:00
parent a779b7325d 13c2e56e34
commit 0dd262d50c
4 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6693,3 +6693,8 @@ main {
margin: auto;
}
.checkbox-inline {
margin: 0 8px;
transform: scale(1.5);
}

5
skolehjem/resources/sass/admin/content/table.scss vendored
View File

@ -33,3 +33,8 @@
width: 1em;
margin: auto;
}
.checkbox-inline{
margin: 0 8px;
transform: scale(1.5);
}

38
skolehjem/resources/views/admin/users/index.blade.php
View File

@ -10,34 +10,26 @@
@endsection
@section("content")
<div class="row align-items-center">
<div class="row align-items-center">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('users.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Bruger</a>
<form method="post" action="{{ route("users.store") }}">
@csrf
<input type="text" class="form-controller" id="search" name="search" placeholder="Søg efter navn,email,tf"></input>
</form>
<form method="post" action="{{ route("users.store") }}">
@csrf
<input type="text" class="form-controller" id="search" name="search" placeholder="Søg efter navn,email,tlf"></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="efternavn" value="efternavn">
<label for="efternavn">Efternavn</label>
<input class="checkbox-inline" type="checkbox" name="checkbox" id="email" value="email">
<label for="email">Email</label>
<input class="checkbox-inline" type="checkbox" id="telefon" name="checkbox" value="telefon">
<label for="telefon">Telefon</label>
<input class="checkbox-inline" type="checkbox" id="rolle" name="checkbox"value="rolle">
<label for="rolle">Rolle</label>
</div>
<div id="filterSearch">
<form action="" method="POST">
<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="efternavn" value="efternavn">
<label for="efternavn">Efternavn</label>
<input class="checkbox-inline" type="checkbox" name="checkbox" id="email" value="email">
<label for="efternavn">Email</label>
<input class="gem" type="checkbox" id="telefon" name="checkbox" value="telefon">
<label for="telefon">Telefon</label>
<input class="gem" type="checkbox" id="rolle" name="checkbox"value="rolle">
<label for="rolle">Rolle</label>
</form>
</div>
<table class="tbl mt-2">
<tr>
<th>Fornavn</th>

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

@ -22,7 +22,8 @@
<table class="tbl mt-2">
<tr>
<th>Vaskemaskine</th>
<th>Time</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>
@ -30,6 +31,7 @@
<tr>
<td>{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}</td>
<td>{{ $reservation->time }}</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