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
This commit is contained in:
Vedde
2020-06-30 08:52:20 +02:00
parent 66e8b2e3d8 fd87e133e9
commit 3b2fec0e09
30 changed files with 291 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/resources/sass/app/forms/_forms.scss
Vendored
+1 -1
View File
@@ -37,7 +37,7 @@ form {
display: inline-flex;
}
input{
input, select{
border: grey solid 2px;
border-radius: 4px;
background-color: transparent;
skolehjem/resources/sass/app/general/_hide.scss
Vendored
+10
View File
@@ -1,3 +1,13 @@
.hide {
display: block !important;
}
.nostyle {
margin: 0 !important;
padding: 0 !important;
border: 0 !important;
outline: 0 !important;
font-size: 100% !important;
vertical-align: baseline !important;
background: transparent !important;
}
skolehjem/resources/sass/webapp/_default.scss
Vendored
+1 -1
View File
@@ -296,7 +296,7 @@ $primary-color: $blue;
}
@include mq(410) {
width: 54px;
width: 47.5px;
}
}
}
skolehjem/resources/views/admin/contacts/index.blade.php
+7 -1
View File
@@ -26,7 +26,13 @@
<td>{{ $contact->email }}</td>
<td>{{ $contact->phone }}</td>
<td><a href="{{ route("contacts.edit", [ "contact" => $contact ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><a href="{{ route("contacts.destroy", [ "contact" => $contact ]) }}"><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
<td><form method="post" action="{{ route("contacts.destroy", [ "contact" => $contact ]) }}" class="w-100 nostyle">
@csrf
@method("delete")
<button 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>
skolehjem/resources/views/admin/events/index.blade.php
+4 -3
View File
@@ -24,12 +24,13 @@
<td>{{ $event->description }}</td>
<td>{{ $event->date }}</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">
<td><form method="post" action="{{ route("events.destroy", [ "event" => $event ]) }}" class="w-100 nostyle">
@csrf
@method("delete")
<button class="w-100" type="submit"><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
</form></td>
<button 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>
skolehjem/resources/views/admin/external-links/index.blade.php
+4 -3
View File
@@ -22,12 +22,13 @@
<th>{{$link->name}}</th>
<th><a href="{{$link->link}}">{{$link->link}}</th>
<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">
<td><form method="post" action="{{ route("external-links.destroy", [ "external_link" => $link ]) }}" class="w-100 nostyle">
@csrf
@method("delete")
<button class="w-100" type="submit"><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
</form></td>
<button 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>
skolehjem/resources/views/admin/menuplans/index.blade.php
+7 -1
View File
@@ -26,7 +26,13 @@
<td>{{$menuplan->wednesday}}</td>
<td>{{$menuplan->thursday}}</td>
<td><a href="{{ route("menu-plans.edit", [ "menu_plan" => $menuplan ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><a href="{{ route("menu-plans.destroy", [ "menu_plan" => $menuplan ]) }}"><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
<td><form method="post" action="{{ route("menu-plans.destroy", [ "menu_plan" => $menuplan ]) }}" class="w-100 nostyle">
@csrf
@method("delete")
<button 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>
skolehjem/resources/views/admin/menuplans/store.blade.php
+3 -3
View File
@@ -2,13 +2,13 @@
@extends("admin.layout.header")
@section("title")
Vaskemaskiner - Opret
Menuplan - Opret
@endsection
@section("path")
<a href="{{ route('menu-plans.create') }}" class="text-white">Opret Vaskemaskiner</a> /
<a href="{{ route('menu-plans.create') }}" class="text-white">Opret Menuplan</a> /
@endsection
@section("content")
Vaskemaskinen blev (ikke) oprettet.
Menuplanen blev (ikke) oprettet.
@endsection
skolehjem/resources/views/admin/staff/index.blade.php
+12 -6
View File
@@ -21,12 +21,18 @@
</tr>
@foreach($staffs as $staff)
<tr>
<td>{{ $staff->name_first }}</td>
<td>{{ $staff->name_last }}</td>
<td>{{ $staff->email }}</td>
<td>{{ $staff->phone }}</td>
<td><a href="{{ route("staff.edit", [ "staff" => $staff->id ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><a href="{{ route("staff.destroy", [ "staff" => $staff->id ]) }}"><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
<td>{{ $staff->name_first }}</td>
<td>{{ $staff->name_last }}</td>
<td>{{ $staff->email }}</td>
<td>{{ $staff->phone }}</td>
<td><a href="{{ route("staff.edit", [ "staff" => $staff->id ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><form method="post" action="{{ route("staff.destroy", [ "staff" => $staff->id ]) }}" class="w-100 nostyle">
@csrf
@method("delete")
<button 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>
skolehjem/resources/views/admin/users/create.blade.php
+6
View File
@@ -25,6 +25,12 @@
<input type="password" id="password2" placeholder="Bekræft Password" required>
<label for="tel">Telefon nr:</label>
<input type="tel" name="phone" id="tel" placeholder="12345678" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required>
<label for="role">Rolle:</label>
<select name="role" id="role" class="mb-2" required>
<option value="admin">Admin</option>
<option value="staff">Personale</option>
<option value="resident">Beboer</option>
</select>
<input type="submit" class="btn btn-dark text-white" value="Opret">
</form>
@endsection
skolehjem/resources/views/admin/users/edit.blade.php
+12 -6
View File
@@ -15,17 +15,23 @@
@csrf
@method("put")
<label for="name_first">Fornavn:</label>
<input type="text" name="name_first" id="name_first" value="{{ $user->name_first }}" required>
<input type="text" name="name_first" id="name_first" value="{{ $user->name_first }}" required>
<label for="name_last">Efternavn:</label>
<input type="text" name="name_last" id="name_last" value="{{ $user->name_last }}" required>
<input type="text" name="name_last" id="name_last" value="{{ $user->name_last }}" required>
<label for="email">Email:</label>
<input type="email" name="email" id="email" value="{{ $user->name_email }}" required>
<input type="email" name="email" id="email" value="{{ $user->name_email }}" required>
<label for="password1">Password:</label>
<input type="password" name="password" id="password1" value="" required>
<input type="password" name="password" id="password1" value="" required>
<label for="password2">Confirm Password:</label>
<input type="password" id="password2" value="" required>
<input type="password" id="password2" value="" required>
<label for="tel">Telefon nr:</label>
<input type="tel" name="phone" id="tel" value="{{ $user->phone }}" required>
<input type="tel" name="phone" id="tel" value="{{ $user->phone }}" required>
<label for="role">Rolle:</label>
<select name="role" id="role" class="mb-2" required>
<option value="admin">Admin</option>
<option value="staff">Personale</option>
<option value="resident">Beboer</option>
</select>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
</form>
@endsection
skolehjem/resources/views/admin/users/index.blade.php
+11 -3
View File
@@ -16,18 +16,26 @@
<th>Efternavn</th>
<th>Email</th>
<th>Tlf nr</th>
<th>Rolle</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>
<tr>
<td>{{ $user->name_first }}</td>
<td>{{ $user->name_last }}</td>
<td>{{ $user->email }}</td>
<td>{{ $user->phone }}</td>
<td>{{ $user->roles }}</td>
<td><a href="{{ route("users.edit", [ "user" => $user->id ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><a href="{{ route("users.destroy", [ "user" => $user ]) }}"><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
</tr>
<td><form method="post" action="{{ route("users.destroy", [ "user" => $user ]) }}" class="w-100 nostyle">
@csrf
@method("delete")
<button 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>
skolehjem/resources/views/admin/washing-reservations/index.blade.php
+12 -6
View File
@@ -21,12 +21,18 @@
</tr>
@foreach($reservations as $reservation)
<tr>
<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>
<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><form method="post" action="" class="w-100 nostyle">
@csrf
@method("delete")
<button 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>
skolehjem/resources/views/app/feedbacks/index.blade.php
+5 -4
View File
@@ -6,14 +6,15 @@
@section("content")
<main class="h-100 text-center">
<form action="" method="post" required>
<form action="{{ action('FeedbackController@store') }}" method="post">
@csrf
<span>Ris el. Ros?</span>
<select name="choose_suggestion" class="mb-2">
<select name="suggestion_form" class="mb-2" required>
<option>Ros</option>
<option>Ris</option>
</select>
<textarea name="feedback_message" placeholder="Skriv Ris/Ros besked her" required></textarea>
<button class="btn btn-sde-blue mt-2" onclick="window.location = '';">Send Ris/Ros</button>
<textarea name="message" placeholder="Skriv Ris/Ros besked her" required></textarea>
<button type="submit" class="btn btn-sde-blue mt-2">Send Ris/Ros</button>
</form>
</main>
@endsection