From 5b36a523201a2c6946e06af1604c6d350b1cb28a Mon Sep 17 00:00:00 2001
From: Vedde <zelenvedran@gmail.com>
Date: Tue, 30 Jun 2020 10:57:25 +0200
Subject: [PATCH 01/22] worked on ResourceExtensionController.php
---
.../app/Http/Controllers/EventController.php | 4 +-
.../ResourceExtensionController.php | 41 +++++++++++++++----
.../resource-extensions/create.blade.php | 0
.../resource-extensions/delete.blade.php | 0
.../admin/resource-extensions/edit.blade.php | 0
.../admin/resource-extensions/index.blade.php | 0
.../admin/resource-extensions/show.blade.php | 0
.../admin/resource-extensions/store.blade.php | 0
.../resource-extensions/update.blade.php | 0
9 files changed, 34 insertions(+), 11 deletions(-)
create mode 100644 skolehjem/resources/views/admin/resource-extensions/create.blade.php
create mode 100644 skolehjem/resources/views/admin/resource-extensions/delete.blade.php
create mode 100644 skolehjem/resources/views/admin/resource-extensions/edit.blade.php
create mode 100644 skolehjem/resources/views/admin/resource-extensions/index.blade.php
create mode 100644 skolehjem/resources/views/admin/resource-extensions/show.blade.php
create mode 100644 skolehjem/resources/views/admin/resource-extensions/store.blade.php
create mode 100644 skolehjem/resources/views/admin/resource-extensions/update.blade.php
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..e5136e2 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,17 @@ class ResourceExtensionController extends Controller
*/
public function store(Request $request)
{
- //
+ $requestBody = $request->validate([
+ "name" => "required|unique:events|max:255",
+ "description" => "required|max:255",
+ "date" => "required"
+ ]);
+
+ $event = new ResourceExtension($requestBody);
+
+ $event->save();
+
+ return Response::detect("events.store");
}
/**
@@ -55,9 +68,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 +81,8 @@ class ResourceExtensionController extends Controller
*/
public function edit($id)
{
- //
+ $extension = ResourceExtension::find($id);
+ return Response::detect("resource-extensions.edit", ["extension" => $extension]);
}
/**
@@ -80,7 +94,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 +112,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/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
From f0132bee2c27dec590d6921860ebc0e127f463b3 Mon Sep 17 00:00:00 2001
From: Vedde <zelenvedran@gmail.com>
Date: Tue, 30 Jun 2020 11:27:39 +0200
Subject: [PATCH 02/22] worked on ResourceExtensionController.php and added
resource_extension migration
---
.../ResourceExtensionController.php | 5 ++-
...6_30_092130_create_resource_extensions.php | 33 +++++++++++++++++++
skolehjem/routes/web.php | 1 +
3 files changed, 36 insertions(+), 3 deletions(-)
create mode 100644 skolehjem/database/migrations/2020_06_30_092130_create_resource_extensions.php
diff --git a/skolehjem/app/Http/Controllers/ResourceExtensionController.php b/skolehjem/app/Http/Controllers/ResourceExtensionController.php
index e5136e2..422ecc5 100644
--- a/skolehjem/app/Http/Controllers/ResourceExtensionController.php
+++ b/skolehjem/app/Http/Controllers/ResourceExtensionController.php
@@ -50,9 +50,8 @@ class ResourceExtensionController extends Controller
public function store(Request $request)
{
$requestBody = $request->validate([
- "name" => "required|unique:events|max:255",
- "description" => "required|max:255",
- "date" => "required"
+ "extension" => "unique|required|max:255",
+ "description" => "required|max:255"
]);
$event = new ResourceExtension($requestBody);
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 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateResourceExtensions extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::create('resource_extensions', function (Blueprint $table) {
+ $table->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/routes/web.php b/skolehjem/routes/web.php
index ce578ac..b371e91 100644
--- a/skolehjem/routes/web.php
+++ b/skolehjem/routes/web.php
@@ -38,3 +38,4 @@ Route::resource("washing-machines", "WashingMachineController");
Route::resource("washing-reservations", "WashingReservationController");
Route::resource("feedbacks", "FeedbackController");
Route::resource("external-links", "ExternalLinkController");
+Route::resource("resource-extensions", "ResourceExtensionController");
From 6c020e36daa4ba526f9a64d04b7695c42956f13c Mon Sep 17 00:00:00 2001
From: Neerholt <vict3459@edu.sde.dk>
Date: Tue, 30 Jun 2020 11:30:12 +0200
Subject: [PATCH 03/22] Made role controller, added index and create
---
.idea/dataSources.xml | 10 +---------
.../2020_06_30_065154_create_albums_table.php | 1 +
skolehjem/database/seeds/UserSeeder.php | 2 ++
3 files changed, 4 insertions(+), 9 deletions(-)
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 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
- <data-source source="LOCAL" name="laravel" uuid="666d3dad-499f-4d99-8988-fd376e6db9e6">
+ <data-source source="LOCAL" name="laravel.sqlite" uuid="bf392a85-1584-4a27-a552-e491a55b9410">
<driver-ref>sqlite.xerial</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.sqlite.JDBC</jdbc-driver>
<jdbc-url>jdbc:sqlite:$PROJECT_DIR$/skolehjem/database/laravel.sqlite</jdbc-url>
- <libraries>
- <library>
- <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.31.1/license.txt</url>
- </library>
- <library>
- <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.31.1/sqlite-jdbc-3.31.1.jar</url>
- </library>
- </libraries>
</data-source>
</component>
</project>
\ No newline at end of file
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/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();
From df679536de2cd15183c2e042c827225849a6003f Mon Sep 17 00:00:00 2001
From: frederikpyt <frederikpyt@gmail.com>
Date: Tue, 30 Jun 2020 11:31:12 +0200
Subject: [PATCH 04/22] Role frontend
---
skolehjem/app/Staff.php | 45 -------------------
.../views/admin/roles/create.blade.php | 22 +++++++++
.../views/admin/roles/delete.blade.php | 13 ++++++
.../views/admin/roles/edit.blade.php | 23 ++++++++++
.../views/admin/roles/index.blade.php | 37 +++++++++++++++
.../views/admin/roles/show.blade.php | 14 ++++++
.../views/admin/roles/store.blade.php | 14 ++++++
.../views/admin/roles/update.blade.php | 14 ++++++
8 files changed, 137 insertions(+), 45 deletions(-)
delete mode 100644 skolehjem/app/Staff.php
create mode 100644 skolehjem/resources/views/admin/roles/create.blade.php
create mode 100644 skolehjem/resources/views/admin/roles/delete.blade.php
create mode 100644 skolehjem/resources/views/admin/roles/edit.blade.php
create mode 100644 skolehjem/resources/views/admin/roles/index.blade.php
create mode 100644 skolehjem/resources/views/admin/roles/show.blade.php
create mode 100644 skolehjem/resources/views/admin/roles/store.blade.php
create mode 100644 skolehjem/resources/views/admin/roles/update.blade.php
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 @@
-<?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);
- }
-}
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")
+ <a href="{{ route('roles.create') }}" class="text-white">Opret Rolle</a> /
+@endsection
+
+@section("content")
+ <h1>Opret Rolle:</h1>
+ <form method="post" action="{{ route("roles.store") }}">
+ @csrf
+ <label for="name">Navn:</label>
+ <input type="text" name="name" id="name" placeholder="Admin" required>
+ <label for="name">Beskrivelse:</label>
+ <input type="text" name="description" id="description" placeholder="Admin rollen bruges til administratorene" required>
+ <input type="submit" class="btn btn-dark text-white" value="Opret">
+ </form>
+@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")
+ <a href="{{ route('roles.delete') }}" class="text-white">Fjern Rolle</a> /
+@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..ad4aa9c
--- /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")
+ <a href="{{ route('roles.edit', ['role' => $role]) }}" class="text-white">Rediger Rolle</a> /
+@endsection
+
+@section("content")
+ <h1>Rediger Rolle:</h1>
+ <form method="post" action="{{ route("roles.update", ['role' => $role]) }}">
+ @csrf
+ @method("put")
+ <label for="name">Navn:</label>
+ <input type="text" name="name" id="name" placeholder="Admin" value="{{ role->name }}" required>
+ <label for="name">Beskrivelse:</label>
+ <input type="text" name="description" id="description" placeholder="Admin rollen bruges til administratorene" value="{{ role->description }}" required>
+ <input type="submit" class="btn btn-dark text-white" value="Rediger">
+ </form>
+@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..82a14c4
--- /dev/null
+++ b/skolehjem/resources/views/admin/roles/index.blade.php
@@ -0,0 +1,37 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+ Rolle - Vis
+@endsection
+
+@section("path")
+ <a href="{{ route('roles.index') }}" class="text-white">Vis Roller</a> /
+@endsection
+
+@section("content")
+ <table class="tbl">
+ <tr>
+ <th>Navn</th>
+ <th>Beskrivelse</th>
+ <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
+ <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
+ </tr>
+ @foreach($roles as $role)
+ <tr>
+ <td>{{ $role->name }}</td>
+ <td>{{ $role->description }}</td>
+ <td><a href="{{ route("roles.edit", [ "role" => $role->id ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
+ <td><form method="post" action="{{ route("roles.destroy", [ "role" => $role ]) }}" class="w-100 nostyle">
+ @csrf
+ @method("delete")
+
+ <button class="w-100 nostyle" type="submit"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
+ </form>
+ </td>
+ </tr>
+ @endforeach
+ </table>
+
+ {{ $users->links() }}
+@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")
+ <a href="{{ route('rolle.index') }}" class="text-white">Vis Brugere</a> /
+@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")
+ <a href="{{ route('roles.create') }}" class="text-white">Opret Roller</a> /
+@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..2d78b49
--- /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")
+ <a href="{{ route('roles.edit') }}" class="text-white">Rediger Rolle</a> /
+@endsection
+
+@section("content")
+ Din rolle blev (ikke) redigeret.
+@endsection
From 7f8fa8004f9eb43eaa7b58fc12e2fbb16dbba294 Mon Sep 17 00:00:00 2001
From: Neerholt <vict3459@edu.sde.dk>
Date: Tue, 30 Jun 2020 11:35:32 +0200
Subject: [PATCH 05/22] made the role controller done
---
.../app/Http/Controllers/rolesController.php | 107 ++++++++++++++++++
1 file changed, 107 insertions(+)
create mode 100644 skolehjem/app/Http/Controllers/rolesController.php
diff --git a/skolehjem/app/Http/Controllers/rolesController.php b/skolehjem/app/Http/Controllers/rolesController.php
new file mode 100644
index 0000000..154e345
--- /dev/null
+++ b/skolehjem/app/Http/Controllers/rolesController.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Spatie\Permission\Models\Role;
+
+class rolesController extends Controller
+{
+ /**
+ * Display a listing of the resource.
+ *
+ * @return \Illuminate\Http\Response
+ */
+ public function index(Request $request)
+ {
+ $roles = Role::query()->paginate($request->input("limit", 20));
+
+ return Response::detect("roles.index", [ "role" => $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([
+ "monday" => "required|max:255",
+ "tuesday" => "required|max:255",
+ "wednesday" => "required|max:255",
+ "thursday" => "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 = MenuPlan::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 = MenuPlan::find($id);
+ $role->delete();
+ return redirect()->route("roles.index");
+ }
+}
From b08422c520567d7511bb8dd2517f4f75d0b858ed Mon Sep 17 00:00:00 2001
From: frederikpyt <frederikpyt@gmail.com>
Date: Tue, 30 Jun 2020 11:38:28 +0200
Subject: [PATCH 06/22] Various fixes
---
.../resources/views/admin/contacts/create.blade.php | 2 +-
.../resources/views/admin/contacts/delete.blade.php | 2 +-
skolehjem/resources/views/admin/contacts/index.blade.php | 2 +-
skolehjem/resources/views/admin/contacts/show.blade.php | 2 +-
skolehjem/resources/views/admin/contacts/store.blade.php | 2 +-
skolehjem/resources/views/admin/layout/base.blade.php | 9 +++++++++
skolehjem/routes/web.php | 2 +-
7 files changed, 15 insertions(+), 6 deletions(-)
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")
- <a href="" class="text-white">Opret Kontakt</a> /
+ <a href="{{ route('contacts.create') }}" class="text-white">Opret Kontakt</a> /
@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")
- <a href="" class="text-white">Slet Kontakt</a> /
+ <a href="{{ route('contacts.destroy') }}" class="text-white">Slet Kontakt</a> /
@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")
- <a href="" class="text-white">Vis Kontakter</a> /
+ <a href="{{ route('contacts.index', [ 'contacts' => $contacts ]) }}" class="text-white">Vis Kontakter</a> /
@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")
- <a href="" class="text-white">Slet Kontakt</a> /
+ <a href="{{ route('contacts.destroy') }}" class="text-white">Slet Kontakt</a> /
@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")
- <a href="" class="text-white">Opbevar Kontakt</a> /
+ <a href="{{ route('contacts.store') }}" class="text-white">Opbevar Kontakt</a> /
@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..3ab088e 100644
--- a/skolehjem/resources/views/admin/layout/base.blade.php
+++ b/skolehjem/resources/views/admin/layout/base.blade.php
@@ -67,6 +67,15 @@
{{-- <a href="{{ route('staff.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Personal</a>--}}
{{-- </div>--}}
{{-- </div>--}}
+ <div class="segment">
+ <h3 class="text-white">Kontakter</h3>
+ <div class="row">
+ <a href="{{ route("contacts.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Kontakter</a>
+ </div>
+ <div class="row">
+ <a href="{{ route('contacts.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Kontakt</a>
+ </div>
+ </div>
<div class="segment">
<h3 class="text-white">Feedback</h3>
<div class="row">
diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php
index b371e91..434e4a6 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");
From e0142bf97735b5c99e4a0f1652dd481300b098d5 Mon Sep 17 00:00:00 2001
From: frederikpyt <frederikpyt@gmail.com>
Date: Tue, 30 Jun 2020 11:45:54 +0200
Subject: [PATCH 07/22] Fixed deletion
---
skolehjem/app/Http/Controllers/ContactController.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
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");
}
}
From 27414ade793a8c7691ff09c9f52b003c0e2a37f2 Mon Sep 17 00:00:00 2001
From: frederikpyt <frederikpyt@gmail.com>
Date: Tue, 30 Jun 2020 11:49:17 +0200
Subject: [PATCH 08/22] Role implementation
---
skolehjem/resources/views/admin/layout/base.blade.php | 9 +++++++++
skolehjem/routes/web.php | 1 +
2 files changed, 10 insertions(+)
diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php
index 3ab088e..41bb86b 100644
--- a/skolehjem/resources/views/admin/layout/base.blade.php
+++ b/skolehjem/resources/views/admin/layout/base.blade.php
@@ -19,6 +19,15 @@
<a href="{{ route('users.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Bruger</a>
</div>
</div>
+ <div class="segment">
+ <h3 class="text-white">Roller</h3>
+ <div class="row">
+ <a href="{{ route("roles.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Roller</a>
+ </div>
+ <div class="row">
+ <a href="{{ route('roles.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Rolle</a>
+ </div>
+ </div>
<div class="segment">
<h3 class="text-white">Menuplan</h3>
<div class="row">
diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php
index 434e4a6..0bf70be 100644
--- a/skolehjem/routes/web.php
+++ b/skolehjem/routes/web.php
@@ -39,3 +39,4 @@ Route::resource("washing-reservations", "WashingReservationController");
Route::resource("feedbacks", "FeedbackController");
Route::resource("external-links", "ExternalLinkController");
Route::resource("resource-extensions", "ResourceExtensionController");
+Route::resource("roles", "RolesController");
From c7c172c44b6c831d1bf487b1efe2bc99fca21c58 Mon Sep 17 00:00:00 2001
From: Neerholt <vict3459@edu.sde.dk>
Date: Tue, 30 Jun 2020 11:49:58 +0200
Subject: [PATCH 09/22] Controller fix small R
---
.../Http/Controllers/{rolesController.php => RolesController.php} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename skolehjem/app/Http/Controllers/{rolesController.php => RolesController.php} (100%)
diff --git a/skolehjem/app/Http/Controllers/rolesController.php b/skolehjem/app/Http/Controllers/RolesController.php
similarity index 100%
rename from skolehjem/app/Http/Controllers/rolesController.php
rename to skolehjem/app/Http/Controllers/RolesController.php
From e14ba7bdbd054604092c16cfc4019102f9691a7c Mon Sep 17 00:00:00 2001
From: Neerholt <vict3459@edu.sde.dk>
Date: Tue, 30 Jun 2020 11:51:20 +0200
Subject: [PATCH 10/22] Added s
---
skolehjem/app/Http/Controllers/RolesController.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php
index 154e345..79e1e86 100644
--- a/skolehjem/app/Http/Controllers/RolesController.php
+++ b/skolehjem/app/Http/Controllers/RolesController.php
@@ -17,7 +17,7 @@ class rolesController extends Controller
{
$roles = Role::query()->paginate($request->input("limit", 20));
- return Response::detect("roles.index", [ "role" => $roles]);
+ return Response::detect("roles.index", [ "roles" => $roles]);
}
/**
From 4b4b2b68de506eba171ede2649eb15a351ce99c0 Mon Sep 17 00:00:00 2001
From: frederikpyt <frederikpyt@gmail.com>
Date: Tue, 30 Jun 2020 11:54:17 +0200
Subject: [PATCH 11/22] Fix
---
skolehjem/resources/views/admin/roles/index.blade.php | 2 --
1 file changed, 2 deletions(-)
diff --git a/skolehjem/resources/views/admin/roles/index.blade.php b/skolehjem/resources/views/admin/roles/index.blade.php
index 82a14c4..47d2d5e 100644
--- a/skolehjem/resources/views/admin/roles/index.blade.php
+++ b/skolehjem/resources/views/admin/roles/index.blade.php
@@ -32,6 +32,4 @@
</tr>
@endforeach
</table>
-
- {{ $users->links() }}
@endsection
From af6222df97531526bcd582adf0c3c0ea495c3ce9 Mon Sep 17 00:00:00 2001
From: Neerholt <vict3459@edu.sde.dk>
Date: Tue, 30 Jun 2020 11:55:11 +0200
Subject: [PATCH 12/22] Fixed Store
---
skolehjem/app/Http/Controllers/RolesController.php | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php
index 79e1e86..0248cc3 100644
--- a/skolehjem/app/Http/Controllers/RolesController.php
+++ b/skolehjem/app/Http/Controllers/RolesController.php
@@ -40,10 +40,8 @@ class rolesController extends Controller
public function store(Request $request)
{
$requestRole = $request->validate([
- "monday" => "required|max:255",
- "tuesday" => "required|max:255",
- "wednesday" => "required|max:255",
- "thursday" => "required|max:255"
+ "name" => "required|max:255",
+ "description" => "required|max:255"
]);
$role = new Role($requestRole);
From 778315ff0b5a71dc94fa983d950167d153cfac53 Mon Sep 17 00:00:00 2001
From: frederikpyt <frederikpyt@gmail.com>
Date: Tue, 30 Jun 2020 11:56:31 +0200
Subject: [PATCH 13/22] Fix
---
skolehjem/resources/views/admin/roles/edit.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/skolehjem/resources/views/admin/roles/edit.blade.php b/skolehjem/resources/views/admin/roles/edit.blade.php
index ad4aa9c..5034a33 100644
--- a/skolehjem/resources/views/admin/roles/edit.blade.php
+++ b/skolehjem/resources/views/admin/roles/edit.blade.php
@@ -15,7 +15,7 @@
@csrf
@method("put")
<label for="name">Navn:</label>
- <input type="text" name="name" id="name" placeholder="Admin" value="{{ role->name }}" required>
+ <input type="text" name="name" id="name" placeholder="Admin" value="{{ $role->name }}" required>
<label for="name">Beskrivelse:</label>
<input type="text" name="description" id="description" placeholder="Admin rollen bruges til administratorene" value="{{ role->description }}" required>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
From cab97f1c0a9e5bf7ed57c012f2ee6c5605ceda6a Mon Sep 17 00:00:00 2001
From: frederikpyt <frederikpyt@gmail.com>
Date: Tue, 30 Jun 2020 11:58:00 +0200
Subject: [PATCH 14/22] Fix
---
skolehjem/resources/views/admin/roles/edit.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/skolehjem/resources/views/admin/roles/edit.blade.php b/skolehjem/resources/views/admin/roles/edit.blade.php
index 5034a33..976fdbc 100644
--- a/skolehjem/resources/views/admin/roles/edit.blade.php
+++ b/skolehjem/resources/views/admin/roles/edit.blade.php
@@ -17,7 +17,7 @@
<label for="name">Navn:</label>
<input type="text" name="name" id="name" placeholder="Admin" value="{{ $role->name }}" required>
<label for="name">Beskrivelse:</label>
- <input type="text" name="description" id="description" placeholder="Admin rollen bruges til administratorene" value="{{ role->description }}" required>
+ <input type="text" name="description" id="description" placeholder="Admin rollen bruges til administratorene" value="{{ $role->description }}" required>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
</form>
@endsection
From b586eceea9ec065f99f871e60836e471f2347e46 Mon Sep 17 00:00:00 2001
From: frederikpyt <frederikpyt@gmail.com>
Date: Tue, 30 Jun 2020 12:01:25 +0200
Subject: [PATCH 15/22] Fix
---
skolehjem/resources/views/admin/roles/update.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/skolehjem/resources/views/admin/roles/update.blade.php b/skolehjem/resources/views/admin/roles/update.blade.php
index 2d78b49..e9de582 100644
--- a/skolehjem/resources/views/admin/roles/update.blade.php
+++ b/skolehjem/resources/views/admin/roles/update.blade.php
@@ -6,7 +6,7 @@
@endsection
@section("path")
- <a href="{{ route('roles.edit') }}" class="text-white">Rediger Rolle</a> /
+ <a href="{{ route('roles.edit', ['role' => $role]) }}" class="text-white">Rediger Rolle</a> /
@endsection
@section("content")
From 05ec4e0228d59e3c36199f7feac68108212ba089 Mon Sep 17 00:00:00 2001
From: Neerholt <vict3459@edu.sde.dk>
Date: Tue, 30 Jun 2020 12:02:32 +0200
Subject: [PATCH 16/22] Fixed idk kev
---
skolehjem/app/Http/Controllers/RolesController.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php
index 0248cc3..6f58467 100644
--- a/skolehjem/app/Http/Controllers/RolesController.php
+++ b/skolehjem/app/Http/Controllers/RolesController.php
@@ -83,7 +83,7 @@ class rolesController extends Controller
public function update(Request $request, $id)
{
$data = $request->all();
- $role = MenuPlan::find($id);
+ $role = Role::find($id);
$role->update($data);
$role->save();
@@ -98,7 +98,7 @@ class rolesController extends Controller
*/
public function destroy($id)
{
- $role = MenuPlan::find($id);
+ $role = Role::find($id);
$role->delete();
return redirect()->route("roles.index");
}
From c49080f366ca39fa32501e00f771b51773832faf Mon Sep 17 00:00:00 2001
From: frederikpyt <frederikpyt@gmail.com>
Date: Tue, 30 Jun 2020 12:07:38 +0200
Subject: [PATCH 17/22] Dynamic roles in user create/edit frontend
---
skolehjem/resources/views/admin/users/create.blade.php | 6 +++---
skolehjem/resources/views/admin/users/edit.blade.php | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php
index 8ebac49..2723896 100644
--- a/skolehjem/resources/views/admin/users/create.blade.php
+++ b/skolehjem/resources/views/admin/users/create.blade.php
@@ -27,9 +27,9 @@
<input type="tel" name="phone" id="tel" placeholder="12345678" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required>
<label for="role">Rolle:</label>
<select name="role" id="role" class="mb-2" required>
- <option value="admin">Admin</option>
- <option value="staff">Personale</option>
- <option value="resident">Beboer</option>
+ @foreach($roles as $role)
+ <option value="{{ $role->name }}">{{ $role->name }}</option>
+ @endforeach
</select>
<input type="submit" class="btn btn-dark text-white" value="Opret">
</form>
diff --git a/skolehjem/resources/views/admin/users/edit.blade.php b/skolehjem/resources/views/admin/users/edit.blade.php
index 502e8cd..a2ead59 100644
--- a/skolehjem/resources/views/admin/users/edit.blade.php
+++ b/skolehjem/resources/views/admin/users/edit.blade.php
@@ -28,9 +28,9 @@
<input type="tel" name="phone" id="tel" value="{{ $user->phone }}" required>
<label for="role">Rolle:</label>
<select name="role" id="role" class="mb-2" required>
- <option value="admin">Admin</option>
- <option value="staff">Personale</option>
- <option value="resident">Beboer</option>
+ @foreach($roles as $role)
+ <option value="{{ $role->name }}">{{ $role->name }}</option>
+ @endforeach
</select>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
</form>
From f46062a9c4e2352ceb7d59270d17cce01614e2fd Mon Sep 17 00:00:00 2001
From: Neerholt <vict3459@edu.sde.dk>
Date: Tue, 30 Jun 2020 12:08:31 +0200
Subject: [PATCH 18/22] Made it so roles data
---
skolehjem/app/Http/Controllers/UserController.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php
index f84a7cf..783de73 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]);
+
}
/**
From 5bd37db3e2cdc3d0aa5e59878b81cdc944fc5bb4 Mon Sep 17 00:00:00 2001
From: Neerholt <vict3459@edu.sde.dk>
Date: Tue, 30 Jun 2020 12:11:18 +0200
Subject: [PATCH 19/22] Made it so roles data kev
---
skolehjem/app/Http/Controllers/UserController.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php
index 783de73..3687f33 100644
--- a/skolehjem/app/Http/Controllers/UserController.php
+++ b/skolehjem/app/Http/Controllers/UserController.php
@@ -105,10 +105,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,
]);
}
From 2ab54da3839a74c86fe538350b1d944fa0f0812a Mon Sep 17 00:00:00 2001
From: frederikpyt <frederikpyt@gmail.com>
Date: Tue, 30 Jun 2020 12:13:49 +0200
Subject: [PATCH 20/22] Fix
---
skolehjem/resources/views/admin/users/create.blade.php | 1 +
skolehjem/resources/views/admin/users/edit.blade.php | 1 +
2 files changed, 2 insertions(+)
diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php
index 2723896..6cc39a2 100644
--- a/skolehjem/resources/views/admin/users/create.blade.php
+++ b/skolehjem/resources/views/admin/users/create.blade.php
@@ -27,6 +27,7 @@
<input type="tel" name="phone" id="tel" placeholder="12345678" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required>
<label for="role">Rolle:</label>
<select name="role" id="role" class="mb-2" required>
+ <option disabled selected value> -- Vælg en Rolle -- </option>
@foreach($roles as $role)
<option value="{{ $role->name }}">{{ $role->name }}</option>
@endforeach
diff --git a/skolehjem/resources/views/admin/users/edit.blade.php b/skolehjem/resources/views/admin/users/edit.blade.php
index a2ead59..f369a60 100644
--- a/skolehjem/resources/views/admin/users/edit.blade.php
+++ b/skolehjem/resources/views/admin/users/edit.blade.php
@@ -28,6 +28,7 @@
<input type="tel" name="phone" id="tel" value="{{ $user->phone }}" required>
<label for="role">Rolle:</label>
<select name="role" id="role" class="mb-2" required>
+ <option disabled selected value> -- Vælg en Rolle -- </option>
@foreach($roles as $role)
<option value="{{ $role->name }}">{{ $role->name }}</option>
@endforeach
From 90ec2b9a688789f5a0051cc689a36567f4285ab1 Mon Sep 17 00:00:00 2001
From: Neerholt <vict3459@edu.sde.dk>
Date: Tue, 30 Jun 2020 12:17:47 +0200
Subject: [PATCH 21/22] Added roles to store
---
skolehjem/app/Http/Controllers/UserController.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php
index 3687f33..327dc66 100644
--- a/skolehjem/app/Http/Controllers/UserController.php
+++ b/skolehjem/app/Http/Controllers/UserController.php
@@ -66,6 +66,7 @@ class UserController extends Controller
"email" => "required|email|unique:users",
"password" => "required|max:60",
"phone" => "required|unique:users",
+ "roles" => "max:255"
]);
From e3c7204961b7f04340fbf9a0d145ab758bd6cef4 Mon Sep 17 00:00:00 2001
From: Neerholt <vict3459@edu.sde.dk>
Date: Tue, 30 Jun 2020 12:21:05 +0200
Subject: [PATCH 22/22] Added roles to fillable
---
skolehjem/app/User.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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"
];
/**