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

skolehjem/app/Contact.php

@@ -6,5 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class Contact extends Model
 {
-    //
+    protected $fillable = [
+        'name_first', "name_last", 'email', 'phone'
+    ];
 }

skolehjem/app/Http/Controllers/ContactController.php

@@ -18,7 +18,7 @@ class ContactController extends Controller
 
         $contact = Contact::query()->paginate($request->input("limit", 20));
 
-        return Response::detect("contact.index", [ "contact" => $contact]);
+        return Response::detect("contacts.index", [ "contacts" => $contact]);
     }
 
     /**
@@ -28,7 +28,8 @@ class ContactController extends Controller
      */
     public function create()
     {
-        //
+        return Response::detect("contacts.create");
+
     }
 
     /**
@@ -39,7 +40,17 @@ class ContactController extends Controller
      */
     public function store(Request $request)
     {
-        //
+        $requestContact = $request->validate([
+            "name_first" => "required|max:255",
+            "name_last" => "required|max:255",
+            "email" => "required|max:255",
+            "phone" => "required|max:255",
+        ]);
+
+        $contact = new Contact($requestContact);
+        $contact->save();
+
+        return Response::detect("contacts.store");
     }
 
     /**
@@ -50,7 +61,8 @@ class ContactController extends Controller
      */
     public function show($id)
     {
-        //
+        return Response::detect("contacts.show", [ "contacts" => $id]);
+
     }
 
     /**
@@ -61,7 +73,8 @@ class ContactController extends Controller
      */
     public function edit($id)
     {
-        //
+        $contact = Contact::find($id);
+        return Response::detect("contacts.edit", ["contact" => $contact]);
     }
 
     /**
@@ -73,7 +86,13 @@ class ContactController extends Controller
      */
     public function update(Request $request, $id)
     {
-        //
+
+        $data = $request->all();
+        $contact = Contact::find($id);
+        $contact->update($data);
+        $contact->save();
+
+        return Response::detect("contacts.update", [ "contacts" => $contact ]);
     }
 
     /**
@@ -84,6 +103,9 @@ class ContactController extends Controller
      */
     public function destroy($id)
     {
-        //
+
+        $contact = Contact::find($id);
+        $contact->delete();
+        return redirect()->route("contacts.index");
     }
 }

skolehjem/app/Http/Controllers/StaffController.php

@@ -0,0 +1,203 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Staff;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
+
+
+class StaffController extends Controller
+{
+    public function __construct()
+    {
+//        $this->middleware([ "auth" ])->only("logout");
+//        $this->middleware([ "guest" ])->only("login");
+//
+//        $this->middleware([ "permission:staff.list", "role:admin" ])->only("index");
+//        $this->middleware([ "permission:staff.show", "role:admin" ])->only("show");
+//        $this->middleware([ "permission:staff.edit", "role:admin" ])->only([ "edit", "update" ]);
+//        $this->middleware([ "permission:staff.delete", "role:admin" ])->only("delete");
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function index(Request $request)
+    {
+        $staffs = Staff::query()->paginate($request->query("page", 20));
+
+        return Response::detect("staff.index", [ "staffs" => $staffs ]);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function create()
+    {
+        return Response::detect("staff.create");
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    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",
+
+        ]);
+
+        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");
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function show($id)
+    {
+        $staff = Staff::find($id);
+
+        return Response::detect("staff.show", [
+            "staff" => $staff
+        ]);
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function edit($id)
+    {
+        $staff = Staff::find($id);
+
+        return Response::detect("staff.edit", [
+            "staff" => $staff
+        ]);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function update(Request $request, $id)
+    {
+        $data = $request->all();
+
+//        $data = $request->validate([
+//            "name_first" => "max:255",
+//            "name_last" => "max:255",
+//            "email" => "email|unique:staff",
+//            "password" => "max:60",
+//            "phone" => "unique:staff",
+//        ]);
+
+        // Validates if the staff is updating itself or another staff.
+//        if($id === Auth::id()) {
+//            $staff = Auth::staff();
+//
+//            $staff->update($data);
+//
+//            $staff->save();
+//            return Response::detect("staff.edit", [
+//                "staff" => $staff
+//            ]);
+//        }
+
+        //TODO: Implement when security's ready!!!
+//        else if(Auth::staff()->hasPermissionTo("staff.edit")) {
+            $staff = Staff::find($id);
+
+            /** @var Staff $staff */
+            $staff->update($data);
+
+            $staff->save();
+//        }
+
+        $staffs = Staff::query()->paginate(20);
+
+        return Response::detect("staff.index", [
+            "staffs" => $staffs
+        ]);
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function destroy($id)
+    {
+//        if($id === Auth::id()) {
+//            $user = Auth::user();
+//            $user->delete();
+//        }
+//        else if(Auth::user()->hasPermissionTo("user.delete")) {
+            $staff = Staff::find($id);
+
+            $staff->delete();
+//        }
+
+        return redirect()->route("staff.index");
+    }
+
+    /*******************************************/
+    /*              Authentication             */
+    /*******************************************/
+
+    public function showLogin() {
+        return view("admin.staff.login");
+    }
+
+    public function login(Request $request) {
+        $data = $request->only("email", "password");
+
+        if(Auth::attempt($data)) {
+            //TODO: Implement home?
+            return redirect()->route("staff.index");
+        }
+
+        return redirect()->back(303);
+    }
+
+    public function logout(Request $request) {
+        Auth::logout();
+
+        return redirect()->to("/");
+    }
+}

skolehjem/app/Staff.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Facades\Hash;
+use Spatie\Permission\Traits\HasRoles;
+
+class Staff extends Model
+{
+    use Notifiable;
+    use HasRoles;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'name_first', "name_last", 'email', 'password', "phone"
+    ];
+
+    /**
+     * The attributes that should be hidden for arrays.
+     *
+     * @var array
+     */
+    protected $hidden = [
+        'password', 'remember_token',
+    ];
+
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'email_verified_at' => 'datetime',
+    ];
+
+    public function setPasswordAttribute($password) {
+        $this->attributes["password"] = Hash::make($password);
+    }
+}