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

skolehjem/app/Http/Controllers/MenuPlanController.php

@@ -89,7 +89,7 @@ class MenuPlanController extends Controller
     public function update(Request $request, $id)
     {
         $data = $request->all();
-
+        //FORCED UPDATE
 
         $menuplan = MenuPlan::find($id);
         $menuplan->update($data);

skolehjem/app/Http/Controllers/UserController.php

@@ -117,35 +117,42 @@ class UserController extends Controller
      */
     public function update(Request $request, $id)
     {
-        $data = $request->validate([
+        $data = $request->all();
-            "name_first" => "max:255",
+
-            "name_last" => "max:255",
+//        $data = $request->validate([
-            "email" => "email|unique:users",
+//            "name_first" => "max:255",
-            "password" => "max:60",
+//            "name_last" => "max:255",
-            "phone" => "unique:users",
+//            "email" => "email|unique:users",
-        ]);
+//            "password" => "max:60",
+//            "phone" => "unique:users",
+//        ]);
 
         // Validates if the user is updating itself or another user.
-        if($id === Auth::id()) {
+//        if($id === Auth::id()) {
-            $user = Auth::user();
+//            $user = Auth::user();
-
-            $user->update($data);
-
-            $user->save();
-        }
-
-        //TODO: Implement when security's ready!!!
-//        else if(Auth::user()->hasPermissionTo("user.edit")) {
-//            $user = User::find($id);
 //
-//            /** @var User $user */
 //            $user->update($data);
 //
 //            $user->save();
+//            return Response::detect("users.edit", [
+//                "user" => $user
+//            ]);
 //        }
 
-        return Response::detect("users.edit", [
+        //TODO: Implement when security's ready!!!
-            "user" => $user
+//        else if(Auth::user()->hasPermissionTo("user.edit")) {
+            $user = User::find($id);
+
+            /** @var User $user */
+            $user->update($data);
+
+            $user->save();
+//        }
+
+        $users = User::query()->paginate(20);
+
+        return Response::detect("users.index", [
+            "users" => $users
         ]);
     }
 
@@ -157,17 +164,17 @@ class UserController extends Controller
      */
     public function destroy($id)
     {
-        if($id === Auth::id()) {
+//        if($id === Auth::id()) {
-            $user = Auth::user();
+//            $user = Auth::user();
-            $user->delete();
+//            $user->delete();
-        }
+//        }
-        else if(Auth::user()->hasPermissionTo("user.delete")) {
+//        else if(Auth::user()->hasPermissionTo("user.delete")) {
             $user = User::find($id);
 
             $user->delete();
-        }
+//        }
 
-        return view("users.delete");
+        return redirect()->route("users.index");
     }
 
     /*******************************************/

skolehjem/resources/views/admin/users/edit.blade.php

@@ -6,12 +6,12 @@
 @endsection
 
 @section("path")
-    <a href="{{ route('users.edit', ['id' => $user]) }}" class="text-white">Rediger Bruger</a> /
+    <a href="{{ route('users.edit', ['user' => $user]) }}" class="text-white">Rediger Bruger</a> /
 @endsection
 
 @section("content")
     <h1>Rediger Bruger:</h1>
-    <form method="post" action="{{ route("users.update", ['id' => $user]) }}">
+    <form method="post" action="{{ route("users.update", ['user' => $user]) }}">
         @csrf
         @method("put")
         <label for="name_first">Fornavn:</label>

skolehjem/resources/views/admin/users/index.blade.php

@@ -26,7 +26,14 @@
                 <td>{{ $user->email }}</td>
                 <td>{{ $user->phone }}</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=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
+                <td>
+                    <form method="post" action="{{ route("users.destroy", [ "user" => $user ]) }}" class="w-100">
+                        @csrf
+                        @method("delete")
+
+                        <button type="submit"><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
+                    </form>
+                </td>
         </tr>
         @endforeach
     </table>

skolehjem/resources/views/app/contact/index.blade.php

@@ -7,11 +7,42 @@
 @section("content")
     <main>
         <h1 class="text-center sde-blue mt-0">Kontakt</h1>
-        <h4 class="mt-0">Email: x@x.x</h4>
+        <h4 class="mt-0">Navn: Claus Trasbo</h4>
-        <span class="text-center sde-black-20 mt-1">+45 xx xx xx xx</span>
+        <h4 class="mt-0">Email: ctr@sde.dk</h4>
-        <a class="btn text-center btn-sde-blue" href="tel:+45" id="call">Tilkald x</a>
+        <h4 class="mt-0">Forstander for Erhvervskollegiet</h4>
-        <h4 class="mt-3">Email: x@x.x</h4>
+        <span class="text-center sde-black-20 mt-1">+45 40 88 65 15 og +45 63 12 65 15</span>
-        <span class="text-center sde-black-20 mt-1">+45 xx xx xx xx</span>
+        <a class="btn text-center btn-sde-blue mt-1" href="tel:+4540886515">Ring</a>
-        <a class="btn text-center btn-sde-blue" href="tel:+45" id="call">Tilkald x</a>
+
+        <h4 class="mt-2">Navn: Birgitte True</h4>
+        <h4 class="mt-0">Email: bit@sde.dk</h4>
+        <h4 class="mt-0">Telefontid:</h4>
+        <h4 class="mt-0">Mandag-Torsdag kl. 8.00-15.00</h4>
+        <h4 class="mt-0">Fredag kl. 8.00-12.00</h4>
+        <span class="text-center sde-black-20 mt-1">+45 63 12 67 15</span>
+        <a class="btn text-center btn-sde-blue mt-1" href="tel:+4563126715">Ring</a>
+
+        <h4 class="mt-2">Navn: Thomas Thomsen</h4>
+        <h4 class="mt-0">Email: thth@sde.dk</h4>
+        <h4 class="mt-0">Kollegieassistent</h4>
+        <span class="text-center sde-black-20 mt-1">+45 24 62 94 50</span>
+        <a class="btn text-center btn-sde-blue mt-1" href="tel:+4524629450">Ring</a>
+
+        <h4 class="mt-2">Navn: Anja Holm Brix</h4>
+        <h4 class="mt-0">Email: ahb@sde.dk</h4>
+        <h4 class="mt-0">Kollegieassistent</h4>
+        <span class="text-center sde-black-20 mt-1">+45 24 62 94 50</span>
+        <a class="btn text-center btn-sde-blue mt-1" href="tel:+4524629450">Ring</a>
+
+        <h4 class="mt-2">Navn: Britta Overgaard Brink Olsen</h4>
+        <h4 class="mt-0">Email: brio@sde.dk</h4>
+        <h4 class="mt-0">Kollegieassistent</h4>
+        <span class="text-center sde-black-20 mt-1">+45 24 62 94 50</span>
+        <a class="btn text-center btn-sde-blue mt-1" href="tel:+4524629450">Ring</a>
+
+        <h4 class="mt-2">Navn: Jesper Sandberg</h4>
+        <h4 class="mt-0">Email: jesa@sde.dk</h4>
+        <h4 class="mt-0">Kollegieassistent</h4>
+        <span class="text-center sde-black-20 mt-1">+45 24 62 94 50</span>
+        <a class="btn text-center btn-sde-blue mt-1" href="tel:+4524629450">Ring</a>
     </main>
 @endsection

skolehjem/resources/views/app/root/index.blade.php

@@ -12,7 +12,7 @@
 {{--@extends("app.users.register")--}}
 
 {{--Events--}}
-{{----}}@extends("app.events.index")
+{{--@extends("app.events.index")--}}
 
 {{--Vagttelefon--}}
 {{--@extends("app.vagttelefons.index")--}}
@@ -24,7 +24,7 @@
 {{--@extends("app.menuplans.index")--}}
 
 {{--Contact--}}
-{{--@extends("app.contact.index")--}}
+{{----}}@extends("app.contact.index")
 
 {{----}}
 {{------Admin Panel