diff --git a/skolehjem/app/ExternalLink.php b/skolehjem/app/ExternalLink.php index 63ffc06..02745fa 100644 --- a/skolehjem/app/ExternalLink.php +++ b/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" + ]; } diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 8c50905..f342297 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/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"); } } diff --git a/skolehjem/app/Http/Controllers/ExternalLinkController.php b/skolehjem/app/Http/Controllers/ExternalLinkController.php index 4580fa6..4bb77d7 100644 --- a/skolehjem/app/Http/Controllers/ExternalLinkController.php +++ b/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"); } /** diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 0791163..dc7ac64 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/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); diff --git a/skolehjem/resources/js/navmenu/menu.js b/skolehjem/resources/js/navmenu/menu.js index 3ab3947..06634aa 100644 --- a/skolehjem/resources/js/navmenu/menu.js +++ b/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); } diff --git a/skolehjem/resources/js/sites/menuplan.js b/skolehjem/resources/js/sites/menuplan.js index 2f14dea..52b23fb 100644 --- a/skolehjem/resources/js/sites/menuplan.js +++ b/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(); } diff --git a/skolehjem/resources/sass/admin/content/table.scss b/skolehjem/resources/sass/admin/content/table.scss index 54dff6e..552714b 100644 --- a/skolehjem/resources/sass/admin/content/table.scss +++ b/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 { diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index 77277fd..22794f3 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -22,10 +22,10 @@

Menuplan

- ReadVis Menuplan + ReadVis Menuplan
- CreateOpret Menuplan + CreateOpret Menuplan
diff --git a/skolehjem/resources/views/admin/menuplan/create.blade.php b/skolehjem/resources/views/admin/menuplans/create.blade.php similarity index 100% rename from skolehjem/resources/views/admin/menuplan/create.blade.php rename to skolehjem/resources/views/admin/menuplans/create.blade.php diff --git a/skolehjem/resources/views/admin/menuplan/show.blade.php b/skolehjem/resources/views/admin/menuplans/show.blade.php similarity index 100% rename from skolehjem/resources/views/admin/menuplan/show.blade.php rename to skolehjem/resources/views/admin/menuplans/show.blade.php diff --git a/skolehjem/resources/views/admin/menuplan/update.blade.php b/skolehjem/resources/views/admin/menuplans/update.blade.php similarity index 100% rename from skolehjem/resources/views/admin/menuplan/update.blade.php rename to skolehjem/resources/views/admin/menuplans/update.blade.php diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php index 487b3a8..d5d02ed 100644 --- a/skolehjem/resources/views/admin/users/create.blade.php +++ b/skolehjem/resources/views/admin/users/create.blade.php @@ -11,7 +11,7 @@ @section("content")

Opret Bruger:

-
+ @csrf diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index 83626c9..efa7f8b 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -20,8 +20,8 @@ Update Delete + @foreach($users as $user) - @foreach($users as $user) {{ $user->id }} {{ $user->name_first }} {{ $user->name_last }} @@ -29,7 +29,9 @@ {{ $user->phone }} Update Delete - @endforeach + @endforeach + + {{ $users->links() }} @endsection diff --git a/skolehjem/resources/views/admin/washing-machines/create.blade.php b/skolehjem/resources/views/admin/washing-machines/create.blade.php index e7c4ae2..e16decc 100644 --- a/skolehjem/resources/views/admin/washing-machines/create.blade.php +++ b/skolehjem/resources/views/admin/washing-machines/create.blade.php @@ -6,28 +6,36 @@ @endsection @section("path") - Vis Vaskemaskiner / + Opret Vaskemaskine / @endsection @section("content") - - - - - - - - - - - - - - - - - - - -
IDFornavnEfternavnEmailTlf nrUpdateDelete
{ID}{Fornavn}{Efternavn}{Email}{TLF}UpdateDelete
+

Opret Bruger:

+ + @csrf + + + +
+ +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{--
IDFornavnEfternavnEmailTlf nrUpdateDelete
{ID}{Fornavn}{Efternavn}{Email}{TLF}UpdateDelete
--}} @endsection diff --git a/skolehjem/resources/views/index.blade.php b/skolehjem/resources/views/index.blade.php index 840da1d..d83617f 100644 --- a/skolehjem/resources/views/index.blade.php +++ b/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")--}}