Merge remote-tracking branch 'origin/master'

skolehjem/app/Http/Controllers/ExternalLinkController.php

@@ -70,7 +70,8 @@ class ExternalLinkController extends Controller
      */
     public function edit($id)
     {
-        //
+        $link = ExternalLink::find($id);
+        return Response::detect("external-links.edit", ["externallink" => $link]);
     }
 
     /**
@@ -82,7 +83,15 @@ class ExternalLinkController extends Controller
      */
     public function update(Request $request, $id)
     {
-        //
+        $data = $request->validate([
+            "name" => "",
+            "link" => ""
+            ]);
+
+        $id->update($data);
+        $id->save();
+
+        return Response::detect("external-links.update");
     }
 
     /**
@@ -93,6 +102,7 @@ class ExternalLinkController extends Controller
      */
     public function destroy($id)
     {
-        //
+        $id->delete();
+        return Response::detect("external-links.destroy");
     }
 }

skolehjem/app/Http/Controllers/MenuPlanController.php

@@ -2,7 +2,10 @@
 
 namespace App\Http\Controllers;
 
+use App\MenuPlan;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
 
 class MenuPlanController extends Controller
 {
@@ -11,9 +14,11 @@ class MenuPlanController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
-    public function index()
+    public function index(Request $request)
     {
-        //
+        $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
+
+        return Response::detect("menuplans.index", [ "menuplans" => $menuPlans]);
     }
 
     /**

skolehjem/app/Http/Controllers/UserController.php

@@ -88,7 +88,7 @@ class UserController extends Controller
     {
         $user = User::find($id);
 
-        return Respone::detect("users.show", [
+        return Response::detect("users.show", [
             "user" => $user
         ]);
     }

skolehjem/database/migrations/2020_06_24_064840_create_external_links.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateExternalLink extends Migration
+class CreateExternalLinks extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateExternalLink extends Migration
      */
     public function up()
     {
-        Schema::create('external_link', function (Blueprint $table) {
+        Schema::create('external_links', function (Blueprint $table) {
             $table->id();
             $table->string("name");
             $table->string("link");
@@ -28,6 +28,6 @@ class CreateExternalLink extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('external_link');
+        Schema::dropIfExists('external_links');
     }
 }

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

@@ -6,7 +6,7 @@
 @endsection
 
 @section("path")
-    <a href="{{ route('menuplans.index') }}" class="text-white">Vis Menuplan</a> /
+    <a href="{{ route('menu-plans.index') }}" class="text-white">Vis Menuplan</a> /
 @endsection
 
 @section("content")

skolehjem/routes/web.php

@@ -25,10 +25,10 @@ Route::post("/login", "UserController@login")->name("users.login");
 Route::get("/logout", "UserController@logout")->name("users.logout");
 
 
-Route::resource("menu-plans", "");
+Route::resource("menu-plans", "MenuPlanController");
 Route::resource("users", "UserController");
 Route::resource("events", "EventController");
 Route::resource("washing-machines", "WashingMachineController");
 Route::resource("washing-reservations", "WashingReservationController");
 Route::resource("feedbacks", "FeedbackController");
-Route::resource("externallinks", "ExternalLinkController");
+Route::resource("external-links", "ExternalLinkController");