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

skolehjem/app/Http/Controllers/ExternalLinkController.php

@@ -19,7 +19,7 @@ class ExternalLinkController extends Controller
     {
         $externalLink = ExternalLink::query()->paginate($request->input("limit", 20));
 
-        return Response::detect("external-links.index", [ "externalLink" => $externalLink ]);
+        return Response::detect("external-links.index", [ "externalLinks" => $externalLink ]);
     }
 
     /**
@@ -59,7 +59,7 @@ class ExternalLinkController extends Controller
      */
     public function show($id)
     {
-        //
+        return Response::detect("external-links.show", [ "externallink" => $id]);
     }
 
     /**

skolehjem/app/Http/Controllers/MenuPlanController.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class MenuPlanController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}

skolehjem/app/Http/Controllers/UserController.php

@@ -43,7 +43,7 @@ class UserController extends Controller
      */
     public function create()
     {
-        return Response::detect("admin.users.create");
+        return Response::detect("users.create");
     }
 
     /**
@@ -75,7 +75,7 @@ class UserController extends Controller
 
         Log::debug("SAVED USER");
 
-        return view("admin.users.store");
+        return view("users.store");
     }
 
     /**
@@ -88,7 +88,7 @@ class UserController extends Controller
     {
         $user = User::find($id);
 
-        return Respone::detect("admin.users.show", [
+        return Respone::detect("users.show", [
             "user" => $user
         ]);
     }
@@ -103,7 +103,7 @@ class UserController extends Controller
     {
         $user = User::find($id);
 
-        return Response::detect("admin.users.edit", [
+        return Response::detect("users.edit", [
             "user" => $user
         ]);
     }
@@ -142,7 +142,7 @@ class UserController extends Controller
             $user->save();
         }
 
-        return Response::detect("admin.users.edit", [
+        return Response::detect("users.edit", [
             "user" => $user
         ]);
     }
@@ -165,7 +165,7 @@ class UserController extends Controller
             $user->delete();
         }
 
-        return view("admin.users.delete");
+        return view("users.delete");
     }
 
     /*******************************************/

skolehjem/app/Http/Controllers/WashingMachineController.php

@@ -19,7 +19,7 @@ class WashingMachineController extends Controller
     {
         $machines = WashingMachine::query()->paginate($request->query("page", 1));
 
-        return Response::detect("admin.washing-machines.index", [ "machines" => $machines ]);
+        return Response::detect("washing-machines.index", [ "machines" => $machines ]);
     }
 
     /**
@@ -29,7 +29,7 @@ class WashingMachineController extends Controller
      */
     public function create()
     {
-        return Response::detect("admin.washing-machines.create");
+        return Response::detect("washing-machines.create");
     }
 
     /**
@@ -47,7 +47,7 @@ class WashingMachineController extends Controller
         $machine = new WashingMachine($data);
         $machine->save();
 
-        return Response::detect("admin.washing-machines.store");
+        return Response::detect("washing-machines.store");
     }
 
     /**
@@ -60,7 +60,7 @@ class WashingMachineController extends Controller
     {
         $machine = WashingMachine::find($id);
 
-        return Response::detect("admin.washing-machines.show", [
+        return Response::detect("washing-machines.show", [
             "machine" => $machine
         ]);
     }
@@ -75,7 +75,7 @@ class WashingMachineController extends Controller
     {
         $machine = WashingMachine::find($id);
 
-        return Response::detect("admin.washing-machines.edit", [
+        return Response::detect("washing-machines.edit", [
             "machine" => $machine
         ]);
     }
@@ -99,7 +99,7 @@ class WashingMachineController extends Controller
 
         $machine->save();
 
-        return Response::detect("admin.washing-machines.edit", [
+        return Response::detect("washing-machines.edit", [
             "machine" => $machine
         ]);
     }
@@ -115,6 +115,6 @@ class WashingMachineController extends Controller
         $machine = WashingMachine::find($id);
         $machine->delete();
 
-        return Response::detect("admin.washing-machines.destroy");
+        return Response::detect("washing-machines.destroy");
     }
 }