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

 Conflicts:

	skolehjem/app/Http/Controllers/ContactController.php

skolehjem/app/Http/Controllers/ContactController.php

@@ -95,9 +95,16 @@ class ContactController extends Controller
         return Response::detect("contacts.update", [ "contacts" => $contact ]);
     }
 
-
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param int $id
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Exception
+     */
     public function destroy(Contact $id)
     {
         $id->delete();
-        return Response::detect("contacts.destroy");}
+        return redirect()->route("contacts.index");
+    }
 }

skolehjem/app/Http/Controllers/FeedbackController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Feedback;
+use App\Feedbacks;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
@@ -17,9 +17,9 @@ class FeedbackController extends Controller
      */
     public function index(Request $request)
     {
-        $feedback = Feedback::query()->paginate($request->input("limit", 20));
+        $feedback = Feedbacks::query()->paginate($request->input("limit", 20));
 
-        return Response::detect("feedback.index", [ "feedback" => $feedback ]);
+        return Response::detect("feedbacks.index", [ "feedback" => $feedback ]);
     }
 
     /**
@@ -45,7 +45,7 @@ class FeedbackController extends Controller
             "link" => "required|max:255"
         ]);
 
-        $feedback = new Feedback($requestBody);
+        $feedback = new Feedbacks($requestBody);
         $feedback->save();
 
         return Response::detect("feedback.store");
@@ -70,7 +70,7 @@ class FeedbackController extends Controller
      */
     public function edit($id)
     {
-        $feedback = Feedback::find($id);
+        $feedback = Feedbacks::find($id);
 
         return Response::detect("feedbacks.edit", [
             "feedback" => $feedback
@@ -90,7 +90,7 @@ class FeedbackController extends Controller
             "time" => "required"
         ]);
 
-        $feedback = Feedback::find($id);
+        $feedback = Feedbacks::find($id);
 
         $feedback->update($data);
 
@@ -109,7 +109,7 @@ class FeedbackController extends Controller
      */
     public function destroy($id)
     {
-        $feedback = Feedback::find($id);
+        $feedback = Feedbacks::find($id);
         $feedback->delete();
 
         return Response::detect("feedbacks.destroy");

skolehjem/app/Http/Controllers/StaffController.php

@@ -53,28 +53,19 @@ class StaffController extends Controller
      */
     public function store(Request $request)
     {
-        Log::debug("STORE FUNCTION");
-
         $data = $request->validate([
             "name_first" => "required|max:255",
             "name_last" => "required|max:255",
             "email" => "required|email|unique:staff",
             "password" => "required|max:60",
-            "phone" => "required|unique:staff",
+            "phone" => "required|unique:staff"
 
         ]);
 
-        Log::debug("FINISHED VALIDATION?");
-
         $staff = new Staff($data);
-
-        Log::debug("CREATED STAFF [NOT PERSISTED YET]");
-
         $staff->save();
 
-        Log::debug("SAVED STAFF");
-
-        return view("staff.store");
+        return Response::detect("staff.store");
     }
 
     /**
@@ -161,18 +152,9 @@ class StaffController extends Controller
      * @param  int  $id
      * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function destroy($id)
+    public function destroy(Staff $id)
     {
-//        if($id === Auth::id()) {
-//            $user = Auth::user();
-//            $user->delete();
-//        }
-//        else if(Auth::user()->hasPermissionTo("user.delete")) {
-            $staff = Staff::find($id);
-
-            $staff->delete();
-//        }
-
+        $id->delete();
         return redirect()->route("staff.index");
     }
 

skolehjem/app/Http/Controllers/UserController.php

@@ -75,7 +75,7 @@ class UserController extends Controller
 
         Log::debug("SAVED USER");
 
-        return view("users.store");
+        return Response::detect("users.store");
     }
 
     /**