diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index 2227e89..1bad499 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -1,19 +1,11 @@
-
+
sqlite.xerial
true
org.sqlite.JDBC
jdbc:sqlite:$PROJECT_DIR$/skolehjem/database/laravel.sqlite
-
-
- file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.31.1/license.txt
-
-
- file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.31.1/sqlite-jdbc-3.31.1.jar
-
-
\ No newline at end of file
diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php
index 6cea983..f71dc01 100644
--- a/skolehjem/app/Http/Controllers/ContactController.php
+++ b/skolehjem/app/Http/Controllers/ContactController.php
@@ -113,9 +113,10 @@ class ContactController extends Controller
* @return \Illuminate\Http\RedirectResponse
* @throws \Exception
*/
- public function destroy(Contact $id)
+ public function destroy($id)
{
- $id->delete();
+ $contact = Contact::find($id);
+ $contact->delete();
return redirect()->route("contacts.index");
}
}
diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php
index 1fae1ab..0e98754 100644
--- a/skolehjem/app/Http/Controllers/EventController.php
+++ b/skolehjem/app/Http/Controllers/EventController.php
@@ -114,8 +114,8 @@ class EventController extends Controller
*/
public function destroy($id)
{
- $link = Event::find($id);
- $link->delete();
+ $event = Event::find($id);
+ $event->delete();
return redirect()->route("events.index");
}
}
diff --git a/skolehjem/app/Http/Controllers/ResourceExtensionController.php b/skolehjem/app/Http/Controllers/ResourceExtensionController.php
index 314bf9a..422ecc5 100644
--- a/skolehjem/app/Http/Controllers/ResourceExtensionController.php
+++ b/skolehjem/app/Http/Controllers/ResourceExtensionController.php
@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
+use App\ResourceExtension;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
@@ -23,9 +24,11 @@ class ResourceExtensionController extends Controller
*
* @return \Illuminate\Http\Response
*/
- public function index()
+ public function index(Request $request)
{
- //
+ $extensions = ResourceExtension::query()->paginate($request->input("limit", 20));
+
+ return Response::detect("resource-extensions.index", ["extension" => $extensions]);
}
/**
@@ -35,7 +38,7 @@ class ResourceExtensionController extends Controller
*/
public function create()
{
- //
+ return Response::detect("resource-extensions.create");
}
/**
@@ -46,7 +49,16 @@ class ResourceExtensionController extends Controller
*/
public function store(Request $request)
{
- //
+ $requestBody = $request->validate([
+ "extension" => "unique|required|max:255",
+ "description" => "required|max:255"
+ ]);
+
+ $event = new ResourceExtension($requestBody);
+
+ $event->save();
+
+ return Response::detect("events.store");
}
/**
@@ -55,9 +67,9 @@ class ResourceExtensionController extends Controller
* @param int $id
* @return \Illuminate\Http\Response
*/
- public function show($id)
+ public function show(ResourceExtension $id)
{
- //
+ return Response::detect("resource-extensions.show", ["extension" => $id]);
}
/**
@@ -68,7 +80,8 @@ class ResourceExtensionController extends Controller
*/
public function edit($id)
{
- //
+ $extension = ResourceExtension::find($id);
+ return Response::detect("resource-extensions.edit", ["extension" => $extension]);
}
/**
@@ -80,7 +93,14 @@ class ResourceExtensionController extends Controller
*/
public function update(Request $request, $id)
{
- //
+ $data = $request->all();
+
+ $extension = ResourceExtension::find($id);
+ $extension->update($data);
+ $extension->save();
+
+ return Response::detect("resource-extensions.update", [ "extension" => $extension]);
+
}
/**
@@ -91,6 +111,8 @@ class ResourceExtensionController extends Controller
*/
public function destroy($id)
{
- //
+ $extension = ResourceExtension::find($id);
+ $extension->delete();
+ return redirect()->route("resource-extensions.index");
}
}
diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php
new file mode 100644
index 0000000..6f58467
--- /dev/null
+++ b/skolehjem/app/Http/Controllers/RolesController.php
@@ -0,0 +1,105 @@
+paginate($request->input("limit", 20));
+
+ return Response::detect("roles.index", [ "roles" => $roles]);
+ }
+
+ /**
+ * Show the form for creating a new resource.
+ *
+ * @return \Illuminate\Http\Response
+ */
+ public function create()
+ {
+ return Response::detect("roles.create");
+
+ }
+
+ /**
+ * Store a newly created resource in storage.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return \Illuminate\Http\Response
+ */
+ public function store(Request $request)
+ {
+ $requestRole = $request->validate([
+ "name" => "required|max:255",
+ "description" => "required|max:255"
+ ]);
+
+ $role = new Role($requestRole);
+ $role->save();
+
+ return Response::detect("roles.store");
+ }
+
+ /**
+ * Display the specified resource.
+ *
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function show($id)
+ {
+ return Response::detect("roles.show", [ "role" => $id]);
+ }
+
+ /**
+ * Show the form for editing the specified resource.
+ *
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function edit($id)
+ {
+ $role = Role::find($id);
+ return Response::detect("roles.edit", ["role" => $role]);
+ }
+
+ /**
+ * Update the specified resource in storage.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function update(Request $request, $id)
+ {
+ $data = $request->all();
+ $role = Role::find($id);
+ $role->update($data);
+ $role->save();
+
+ return Response::detect("roles.update", [ "role" => $role ]);
+ }
+
+ /**
+ * Remove the specified resource from storage.
+ *
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function destroy($id)
+ {
+ $role = Role::find($id);
+ $role->delete();
+ return redirect()->route("roles.index");
+ }
+}
diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php
index f84a7cf..327dc66 100644
--- a/skolehjem/app/Http/Controllers/UserController.php
+++ b/skolehjem/app/Http/Controllers/UserController.php
@@ -8,6 +8,7 @@ use Illuminate\Http\Response;
use App\User;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log;
+use Spatie\Permission\Models\Role;
class UserController extends Controller
@@ -44,7 +45,9 @@ class UserController extends Controller
*/
public function create()
{
- return Response::detect("users.create");
+ $roles = Role::all();
+ return Response::detect("users.create", ['roles' => $roles]);
+
}
/**
@@ -63,6 +66,7 @@ class UserController extends Controller
"email" => "required|email|unique:users",
"password" => "required|max:60",
"phone" => "required|unique:users",
+ "roles" => "max:255"
]);
@@ -102,10 +106,12 @@ class UserController extends Controller
*/
public function edit($id)
{
+ $roles = Role::all();
$user = User::find($id);
return Response::detect("users.edit", [
- "user" => $user
+ "user" => $user,
+ "roles" => $roles,
]);
}
diff --git a/skolehjem/app/Staff.php b/skolehjem/app/Staff.php
deleted file mode 100644
index 841134d..0000000
--- a/skolehjem/app/Staff.php
+++ /dev/null
@@ -1,45 +0,0 @@
- 'datetime',
- ];
-
- public function setPasswordAttribute($password) {
- $this->attributes["password"] = Hash::make($password);
- }
-}
diff --git a/skolehjem/app/User.php b/skolehjem/app/User.php
index ac8b735..a7a7023 100644
--- a/skolehjem/app/User.php
+++ b/skolehjem/app/User.php
@@ -21,7 +21,7 @@ class User extends Authenticatable
* @var array
*/
protected $fillable = [
- 'name_first', "name_last", 'email', 'password', "phone"
+ 'name_first', "name_last", 'email', 'password', "phone", "roles"
];
/**
diff --git a/skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php b/skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php
index 5efab97..bfe0dab 100644
--- a/skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php
+++ b/skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php
@@ -16,6 +16,7 @@ class CreateAlbumsTable extends Migration
Schema::create('albums', function (Blueprint $table) {
$table->id();
$table->timestamps();
+ $table->foreignId('user_id')->constrained();
});
}
diff --git a/skolehjem/database/migrations/2020_06_30_092130_create_resource_extensions.php b/skolehjem/database/migrations/2020_06_30_092130_create_resource_extensions.php
new file mode 100644
index 0000000..3f1abb5
--- /dev/null
+++ b/skolehjem/database/migrations/2020_06_30_092130_create_resource_extensions.php
@@ -0,0 +1,33 @@
+id();
+ $table->string("extension")->unique();
+ $table->text("description");
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('resource_extensions');
+ }
+}
diff --git a/skolehjem/database/seeds/UserSeeder.php b/skolehjem/database/seeds/UserSeeder.php
index d90fae8..029d2d4 100644
--- a/skolehjem/database/seeds/UserSeeder.php
+++ b/skolehjem/database/seeds/UserSeeder.php
@@ -21,11 +21,13 @@ class UserSeeder extends Seeder
Log::debug("YEET");
+
if(User::where("name_first", "admin"))
{
return;
}
+
Log::debug("OPRET");
$user = new \App\User();
diff --git a/skolehjem/resources/views/admin/contacts/create.blade.php b/skolehjem/resources/views/admin/contacts/create.blade.php
index 9e95044..f9f485e 100644
--- a/skolehjem/resources/views/admin/contacts/create.blade.php
+++ b/skolehjem/resources/views/admin/contacts/create.blade.php
@@ -6,7 +6,7 @@
@endsection
@section("path")
- Opret Kontakt /
+ Opret Kontakt /
@endsection
@section("content")
diff --git a/skolehjem/resources/views/admin/contacts/delete.blade.php b/skolehjem/resources/views/admin/contacts/delete.blade.php
index b126821..b16bf25 100644
--- a/skolehjem/resources/views/admin/contacts/delete.blade.php
+++ b/skolehjem/resources/views/admin/contacts/delete.blade.php
@@ -6,7 +6,7 @@
@endsection
@section("path")
- Slet Kontakt /
+ Slet Kontakt /
@endsection
@section("content")
diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php
index f990b7a..2d39848 100644
--- a/skolehjem/resources/views/admin/contacts/index.blade.php
+++ b/skolehjem/resources/views/admin/contacts/index.blade.php
@@ -6,7 +6,7 @@
@endsection
@section("path")
- Vis Kontakter /
+ Vis Kontakter /
@endsection
@section("content")
diff --git a/skolehjem/resources/views/admin/contacts/show.blade.php b/skolehjem/resources/views/admin/contacts/show.blade.php
index 08e64ab..d6c04cf 100644
--- a/skolehjem/resources/views/admin/contacts/show.blade.php
+++ b/skolehjem/resources/views/admin/contacts/show.blade.php
@@ -6,7 +6,7 @@
@endsection
@section("path")
- Slet Kontakt /
+ Slet Kontakt /
@endsection
@section("content")
diff --git a/skolehjem/resources/views/admin/contacts/store.blade.php b/skolehjem/resources/views/admin/contacts/store.blade.php
index d6adde7..0ad3adf 100644
--- a/skolehjem/resources/views/admin/contacts/store.blade.php
+++ b/skolehjem/resources/views/admin/contacts/store.blade.php
@@ -6,7 +6,7 @@
@endsection
@section("path")
- Opbevar Kontakt /
+ Opbevar Kontakt /
@endsection
@section("content")
diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php
index 616e97a..41bb86b 100644
--- a/skolehjem/resources/views/admin/layout/base.blade.php
+++ b/skolehjem/resources/views/admin/layout/base.blade.php
@@ -19,6 +19,15 @@
Opret Bruger
+
--}}
+
Feedback
diff --git a/skolehjem/resources/views/admin/resource-extensions/create.blade.php b/skolehjem/resources/views/admin/resource-extensions/create.blade.php
new file mode 100644
index 0000000..e69de29
diff --git a/skolehjem/resources/views/admin/resource-extensions/delete.blade.php b/skolehjem/resources/views/admin/resource-extensions/delete.blade.php
new file mode 100644
index 0000000..e69de29
diff --git a/skolehjem/resources/views/admin/resource-extensions/edit.blade.php b/skolehjem/resources/views/admin/resource-extensions/edit.blade.php
new file mode 100644
index 0000000..e69de29
diff --git a/skolehjem/resources/views/admin/resource-extensions/index.blade.php b/skolehjem/resources/views/admin/resource-extensions/index.blade.php
new file mode 100644
index 0000000..e69de29
diff --git a/skolehjem/resources/views/admin/resource-extensions/show.blade.php b/skolehjem/resources/views/admin/resource-extensions/show.blade.php
new file mode 100644
index 0000000..e69de29
diff --git a/skolehjem/resources/views/admin/resource-extensions/store.blade.php b/skolehjem/resources/views/admin/resource-extensions/store.blade.php
new file mode 100644
index 0000000..e69de29
diff --git a/skolehjem/resources/views/admin/resource-extensions/update.blade.php b/skolehjem/resources/views/admin/resource-extensions/update.blade.php
new file mode 100644
index 0000000..e69de29
diff --git a/skolehjem/resources/views/admin/roles/create.blade.php b/skolehjem/resources/views/admin/roles/create.blade.php
new file mode 100644
index 0000000..d80dc23
--- /dev/null
+++ b/skolehjem/resources/views/admin/roles/create.blade.php
@@ -0,0 +1,22 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+ Rolle - Opret
+@endsection
+
+@section("path")
+
Opret Rolle /
+@endsection
+
+@section("content")
+
Opret Rolle:
+
+@endsection
diff --git a/skolehjem/resources/views/admin/roles/delete.blade.php b/skolehjem/resources/views/admin/roles/delete.blade.php
new file mode 100644
index 0000000..86267f7
--- /dev/null
+++ b/skolehjem/resources/views/admin/roles/delete.blade.php
@@ -0,0 +1,13 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+ Rolle - Fjern
+@endsection
+
+@section("path")
+
Fjern Rolle /
+@endsection
+
+@section("content")
+@endsection
diff --git a/skolehjem/resources/views/admin/roles/edit.blade.php b/skolehjem/resources/views/admin/roles/edit.blade.php
new file mode 100644
index 0000000..976fdbc
--- /dev/null
+++ b/skolehjem/resources/views/admin/roles/edit.blade.php
@@ -0,0 +1,23 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+ Rolle - Rediger
+@endsection
+
+@section("path")
+
Rediger Rolle /
+@endsection
+
+@section("content")
+
Rediger Rolle:
+
+@endsection
diff --git a/skolehjem/resources/views/admin/roles/index.blade.php b/skolehjem/resources/views/admin/roles/index.blade.php
new file mode 100644
index 0000000..47d2d5e
--- /dev/null
+++ b/skolehjem/resources/views/admin/roles/index.blade.php
@@ -0,0 +1,35 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+ Rolle - Vis
+@endsection
+
+@section("path")
+
Vis Roller /
+@endsection
+
+@section("content")
+
+
+ Navn |
+ Beskrivelse |
+  }}) |
+  }}) |
+
+ @foreach($roles as $role)
+
+ {{ $role->name }} |
+ {{ $role->description }} |
+ $role->id ]) }}"> }}) |
+
+ |
+
+ @endforeach
+
+@endsection
diff --git a/skolehjem/resources/views/admin/roles/show.blade.php b/skolehjem/resources/views/admin/roles/show.blade.php
new file mode 100644
index 0000000..ad98ce8
--- /dev/null
+++ b/skolehjem/resources/views/admin/roles/show.blade.php
@@ -0,0 +1,14 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+ Rolle - Vis
+@endsection
+
+@section("path")
+
Vis Brugere /
+@endsection
+
+@section("content")
+ show.blade.php
+@endsection
diff --git a/skolehjem/resources/views/admin/roles/store.blade.php b/skolehjem/resources/views/admin/roles/store.blade.php
new file mode 100644
index 0000000..c09de0e
--- /dev/null
+++ b/skolehjem/resources/views/admin/roles/store.blade.php
@@ -0,0 +1,14 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+ Rolle - Opret
+@endsection
+
+@section("path")
+
Opret Roller /
+@endsection
+
+@section("content")
+ Rollen blev (ikke) oprettet.
+@endsection
diff --git a/skolehjem/resources/views/admin/roles/update.blade.php b/skolehjem/resources/views/admin/roles/update.blade.php
new file mode 100644
index 0000000..e9de582
--- /dev/null
+++ b/skolehjem/resources/views/admin/roles/update.blade.php
@@ -0,0 +1,14 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+ Rolle - Rediger
+@endsection
+
+@section("path")
+
Rediger Rolle /
+@endsection
+
+@section("content")
+ Din rolle blev (ikke) redigeret.
+@endsection
diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php
index 8ebac49..6cc39a2 100644
--- a/skolehjem/resources/views/admin/users/create.blade.php
+++ b/skolehjem/resources/views/admin/users/create.blade.php
@@ -27,9 +27,10 @@
diff --git a/skolehjem/resources/views/admin/users/edit.blade.php b/skolehjem/resources/views/admin/users/edit.blade.php
index 502e8cd..f369a60 100644
--- a/skolehjem/resources/views/admin/users/edit.blade.php
+++ b/skolehjem/resources/views/admin/users/edit.blade.php
@@ -28,9 +28,10 @@
diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php
index ce578ac..0bf70be 100644
--- a/skolehjem/routes/web.php
+++ b/skolehjem/routes/web.php
@@ -18,7 +18,7 @@ use Illuminate\Support\Facades\Route;
//});
Route::get("/", "RootController@index")->name("root.index");
-
+Route::get("/home", "RootController@index")->name("root.index");
Route::get("/login", "UserController@showLogin")->name("users.show-login");
Route::post("/login", "UserController@login")->name("users.login");
@@ -38,3 +38,5 @@ Route::resource("washing-machines", "WashingMachineController");
Route::resource("washing-reservations", "WashingReservationController");
Route::resource("feedbacks", "FeedbackController");
Route::resource("external-links", "ExternalLinkController");
+Route::resource("resource-extensions", "ResourceExtensionController");
+Route::resource("roles", "RolesController");