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

Conflicts: skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php skolehjem/resources/views/admin/users/index.blade.php
2020-06-30 08:25:18 +02:00
parent 4a0840b104 2f22ae275e
commit f638777878
18 changed files with 120 additions and 47 deletions
@@ -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>
@@ -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>
@@ -22,12 +22,13 @@
                <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">
+                <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>
@@ -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>
@@ -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
@@ -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>
@@ -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
@@ -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
@@ -16,25 +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>
-                    <form method="post" action="{{ route("users.destroy", [ "user" => $user ]) }}"  class="w-100">
+                <td><form method="post" action="{{ route("users.destroy", [ "user" => $user ]) }}" class="w-100 nostyle">
                        @csrf
                        @method("delete")

-                        <button class="w-100"><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
+                        <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>
+            </tr>
        @endforeach
    </table>

@@ -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>