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

skolehjem/app/Http/Controllers/ResourceController.php

@@ -2,6 +2,8 @@
 
 namespace App\Http\Controllers;
 
+use App\Resource;
+use App\ResourceExtension;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
@@ -23,9 +25,11 @@ class ResourceController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
-    public function index()
+    public function index(Request $request)
     {
+        $resources = Resource::query()->paginate($request->input("limit", 20));
 
+        return Response::detect("resources.index", [ "resources" => $resources ]);
     }
 
     /**
@@ -35,7 +39,7 @@ class ResourceController extends Controller
      */
     public function create()
     {
-        //
+        return Response::detect("resources.create");
     }
 
     /**
@@ -46,7 +50,33 @@ class ResourceController extends Controller
      */
     public function store(Request $request)
     {
-        //
+//        $data = $request->validate([
+//            "" => ""
+//        ]);
+
+//        $resource = new Resource($data);
+
+        $file = $request->file("resource");
+
+
+
+        $resourceExtension = ResourceExtension::where("extension", "=", $file->extension())->first();
+
+        if($resourceExtension === null) {
+            //TODO: Create new resourceExtension!
+        }
+        else {
+
+            $resource = new Resource();
+
+            $resource->resourceExtension()->save($resourceExtension);
+
+
+
+            $resource->save();
+        }
+
+        return Response::detect("resources.store");
     }
 
     /**

skolehjem/app/Http/Controllers/UserController.php

@@ -76,6 +76,7 @@ class UserController extends Controller
 
 //        Log::debug("CREATED USER [NOT PERSISTED YET]");
 
+        $user->assignRole([ "R1", "R2" ]);
         $user->save();
 
 //        Log::debug("SAVED USER");

skolehjem/app/Http/Middleware/CheckAuth.php

@@ -10,9 +10,11 @@ class CheckAuth
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure $next
+     * @param $permissions
      * @return mixed
+     * @throws \Exception
      */
     public function handle($request, Closure $next, $permissions)
     {

skolehjem/app/Resource.php

@@ -11,5 +11,11 @@ use Illuminate\Database\Eloquent\Model;
 
 class Resource extends Model
 {
-    //
+    public function resourceExtension() {
+        return $this->belongsTo("App\ResourceExtension");
+    }
+
+    public function resourceCategory() {
+        return $this->hasOneThrough("App\ResourceCategory", "App\ResourceExtension");
+    }
 }

skolehjem/app/ResourceCategory.php

@@ -11,5 +11,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class ResourceCategory extends Model
 {
-    //
+    public function resourceExtensions() {
+        return $this->hasMany("App\ResourceExtension");
+    }
 }

skolehjem/app/ResourceExtension.php

@@ -11,5 +11,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class ResourceExtension extends Model
 {
-    //
+    public function resources() {
+        return $this->hasMany("App\Resource");
+    }
 }