Merge remote-tracking branch 'origin/master'

skolehjem/app/ExternalLink.php

@@ -6,5 +6,12 @@ use Illuminate\Database\Eloquent\Model;
 
 class ExternalLink extends Model
 {
-    //
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'name', "link"
+    ];
 }

skolehjem/app/Http/Controllers/EventController.php

@@ -17,7 +17,7 @@ class EventController extends Controller
     {
         $events = Event::query()->paginate($request->input("limit", 20));
 
-        return view("admin.event.index", [ "events" => $events]);
+        return view("admin.events.index", [ "events" => $events]);
     }
 
     /**
@@ -27,7 +27,7 @@ class EventController extends Controller
      */
     public function create()
     {
-        return view("admin.event.create");
+        return view("admin.events.create");
     }
 
     /**
@@ -47,7 +47,7 @@ class EventController extends Controller
 
         $event->save();
 
-        return view("admin.event.store");
+        return view("admin.events.store");
     }
 
     /**
@@ -58,7 +58,7 @@ class EventController extends Controller
      */
     public function show(Event $id)
     {
-        return view("admin.event.show", [ "event" => $id ]);
+        return view("admin.events.show", [ "event" => $id ]);
     }
 
     /**
@@ -69,7 +69,7 @@ class EventController extends Controller
      */
     public function edit(Event $id)
     {
-        return view("admin.event.edit", [ "event" => $id ]);
+        return view("admin.events.edit", [ "event" => $id ]);
     }
 
     /**
@@ -89,7 +89,7 @@ class EventController extends Controller
         $id->update($requestBody);
         $id->save();
 
-        return view("admin.event.update");
+        return view("admin.events.update");
     }
 
     /**
@@ -103,6 +103,6 @@ class EventController extends Controller
     {
         $id->delete();
 
-        return view("admin.event.destroy");
+        return view("admin.events.destroy");
     }
 }

skolehjem/app/Http/Controllers/ExternalLinkController.php

@@ -17,28 +17,36 @@ class ExternalLinkController extends Controller
     {
         $externalLink = ExternalLink::query()->paginate($request->input("limit", 20));
 
-        return view("external-link.index", [ "externalLink" => $externalLink ]);
+        return view("external-links.index", [ "externalLink" => $externalLink ]);
     }
 
     /**
      * Show the form for creating a new resource.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function create()
     {
-        //
+        return view("external-links.create");
     }
 
     /**
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function store(Request $request)
     {
-        //
+        $requestBody = $request->validate([
+            "name" => "required|max:255",
+            "link" => "required|max:255"
+        ]);
+
+        $externalLink = new ExternalLink($requestBody);
+        $externalLink->save();
+
+        return view("external-links.store");
     }
 
     /**

skolehjem/app/Http/Controllers/UserController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use Illuminate\Http\Request;
 use App\User;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
 
 
 class UserController extends Controller
@@ -28,7 +29,7 @@ class UserController extends Controller
      */
     public function index(Request $request)
     {
-        $users = User::query()->paginate($request->query("page", 1));
+        $users = User::query()->paginate($request->query("page", 20));
 
         return view("admin.users.index", [ "users" => $users ]);
     }
@@ -51,6 +52,8 @@ class UserController extends Controller
      */
     public function store(Request $request)
     {
+        Log::debug("STORE FUNCTION");
+
         $data = $request->validate([
             "name_first" => "required|max:255",
             "name_last" => "required|max:255",
@@ -60,9 +63,16 @@ class UserController extends Controller
 
         ]);
 
+        Log::debug("FINISHED VALIDATION?");
+
         $user = new User($data);
+
+        Log::debug("CREATED USER [NOT PERSISTED YET]");
+
         $user->save();
 
+        Log::debug("SAVED USER");
+
         return view("admin.users.store");
     }
 
@@ -169,7 +179,7 @@ class UserController extends Controller
 
         if(Auth::attempt($data)) {
             //TODO: Implement home?
-            return view("admin.users.index", [ "user" => Auth::user() ]);
+            return redirect()->route("users.index");
         }
 
         return redirect()->back(303);

skolehjem/resources/js/navmenu/menu.js

@@ -2,7 +2,7 @@ document.addEventListener("DOMContentLoaded", function(){
     // Handler when the DOM is fully loaded
     var path = window.location.pathname;
 
-    if(path === "/menuplan" || path === "/vagttelefon" || path === "/")
+    if(path === "/menuplans" || path === "/vagttelefon" || path === "/")
     {
         document.getElementById ('toggle').addEventListener ('click', toggleMenu, false);
     }

skolehjem/resources/js/sites/menuplan.js

@@ -2,7 +2,7 @@ document.addEventListener("DOMContentLoaded", function(){
     // Handler when the DOM is fully loaded
     var path = window.location.pathname;
 
-    if(path === "/menuplan")
+    if(path === "/menuplans")
     {
         updateWeek();
     }

skolehjem/resources/sass/admin/content/table.scss

@@ -22,7 +22,7 @@
 
 .tbl > tbody > tr > td > a {
     width: 100%;
-    display: flex;
+    //display: flex;
 }
 
 .tbl > tbody > tr > td > a > img {

skolehjem/resources/views/admin/layout/base.blade.php

@@ -22,10 +22,10 @@
         <div class="segment">
             <h3 class="text-white">Menuplan</h3>
             <div class="row">
-                <a href="" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Menuplan</a>
+                <a href="{{ route("menu-plans.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Menuplan</a>
             </div>
             <div class="row">
-                <a href="" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Menuplan</a>
+                <a href="{{ route("menu-plans.create") }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Menuplan</a>
             </div>
         </div>
     </div>

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

@@ -11,7 +11,7 @@
 
 @section("content")
     <h1>Opret Bruger:</h1>
-    <form method="post" action="/users">
+    <form method="post" action="{{ route("users.store") }}">
         @csrf
         <label for="name_first">Fornavn:</label>
             <input type="text" name="name_first" id="name_first" required>

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

@@ -20,8 +20,8 @@
             <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
             <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
         </tr>
-        <tr>
         @foreach($users as $user)
+        <tr>
                 <td>{{ $user->id }}</td>
                 <td>{{ $user->name_first }}</td>
                 <td>{{ $user->name_last }}</td>
@@ -29,7 +29,9 @@
                 <td>{{ $user->phone }}</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>
-            @endforeach
         </tr>
+        @endforeach
     </table>
+
+    {{ $users->links() }}
 @endsection

skolehjem/resources/views/admin/washing-machines/create.blade.php

@@ -6,28 +6,36 @@
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Vis Vaskemaskiner</a> /
+    <a href="" class="text-white">Opret Vaskemaskine</a> /
 @endsection
 
 @section("content")
-    <table class="tbl">
-        <tr>
-            <th>ID</th>
-            <th>Fornavn</th>
-            <th>Efternavn</th>
-            <th>Email</th>
-            <th>Tlf nr</th>
-            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
-            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
-        </tr>
-        <tr>
-            <td>{ID}</td>
-            <td>{Fornavn}</td>
-            <td>{Efternavn}</td>
-            <td>{Email}</td>
-            <td>{TLF}</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>
-        </tr>
-    </table>
+    <h1>Opret Bruger:</h1>
+    <form method="post" action="{{ route("washing-machines.store") }}">
+        @csrf
+        <label for="name_first">Navn:</label>
+        <input type="text" name="name" id="name" max="60" required>
+        <input type="submit" class="btn btn-dark text-white" value="Opret">
+    </form>
+
+{{--    <table class="tbl">--}}
+{{--        <tr>--}}
+{{--            <th>ID</th>--}}
+{{--            <th>Fornavn</th>--}}
+{{--            <th>Efternavn</th>--}}
+{{--            <th>Email</th>--}}
+{{--            <th>Tlf nr</th>--}}
+{{--            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>--}}
+{{--            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>{ID}</td>--}}
+{{--            <td>{Fornavn}</td>--}}
+{{--            <td>{Efternavn}</td>--}}
+{{--            <td>{Email}</td>--}}
+{{--            <td>{TLF}</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>--}}
+{{--        </tr>--}}
+{{--    </table>--}}
 @endsection

skolehjem/resources/views/index.blade.php

@@ -29,10 +29,10 @@
 {{--@extends("admin.users.update")--}}
 
 {{--Create Menuplan--}}
-{{--@extends("admin.menuplan.create")--}}
+{{--@extends("admin.menuplans.create")--}}
 
 {{--Read Menuplan--}}
-{{--@extends("admin.menuplan.show")--}}
+{{--@extends("admin.menuplans.show")--}}
 
 {{--Update Menuplan--}}
-{{--@extends("admin.menuplan.update")--}}
+{{--@extends("admin.menuplans.update")--}}