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/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php
index edfcf5a..d6e334b 100644
--- a/skolehjem/app/Http/Controllers/MenuPlanController.php
+++ b/skolehjem/app/Http/Controllers/MenuPlanController.php
@@ -52,6 +52,7 @@ class MenuPlanController extends Controller
public function store(Request $request)
{
$requestMenuPlanCreate = $request->validate([
+ "week" => "required|max:2",
"monday" => "required|max:255",
"tuesday" => "required|max:255",
"wednesday" => "required|max:255",
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..d39c252 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,
]);
}
@@ -147,6 +153,13 @@ class UserController extends Controller
/** @var User $user */
$user->update($data);
+ $user->roles()->detach();
+ $user->forgetCachedPermissions();
+
+ foreach ($request->roles as $role){
+ $user->assignRole($role);
+ }
+
$user->save();
// }
@@ -224,5 +237,13 @@ class UserController extends Controller
return redirect()->route('users.login');
}
+ public function account()
+ {
+ return Response::detect("users.account");
+ }
+ public function accountedit()
+ {
+ return Response::detect("users.edit");
+ }
}
diff --git a/skolehjem/app/MenuPlan.php b/skolehjem/app/MenuPlan.php
index c8131e1..cef6c24 100644
--- a/skolehjem/app/MenuPlan.php
+++ b/skolehjem/app/MenuPlan.php
@@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model;
class MenuPlan extends Model
{
protected $fillable = [
- 'monday', "tuesday", 'wednesday', 'thursday'
+ 'week', 'monday', "tuesday", 'wednesday', 'thursday'
];
}
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/database/migrations/2020_06_23_070657_create_menu_plans.php b/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php
index 254328c..e60532f 100644
--- a/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php
+++ b/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php
@@ -15,6 +15,7 @@ class CreateMenuPlans extends Migration
{
Schema::create('menu_plans', function (Blueprint $table) {
$table->id();
+ $table->string('week', 2);
$table->string('monday', 255);
$table->string('tuesday', 255);
$table->string('wednesday', 255);
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();
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..dc0d212 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")
@@ -30,7 +30,7 @@
@csrf
@method("delete")
-
+
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/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php
index 8a6c273..95e6bb1 100644
--- a/skolehjem/resources/views/admin/events/index.blade.php
+++ b/skolehjem/resources/views/admin/events/index.blade.php
@@ -28,7 +28,7 @@
@csrf
@method("delete")
-
+
diff --git a/skolehjem/resources/views/admin/external-links/index.blade.php b/skolehjem/resources/views/admin/external-links/index.blade.php
index e9f726b..069db81 100644
--- a/skolehjem/resources/views/admin/external-links/index.blade.php
+++ b/skolehjem/resources/views/admin/external-links/index.blade.php
@@ -26,7 +26,7 @@
@csrf
@method("delete")
-
+
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/menuplans/create.blade.php b/skolehjem/resources/views/admin/menuplans/create.blade.php
index 925a315..254f76e 100644
--- a/skolehjem/resources/views/admin/menuplans/create.blade.php
+++ b/skolehjem/resources/views/admin/menuplans/create.blade.php
@@ -13,6 +13,8 @@
Opret Menuplan:
@endsection
diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php
index 1ddbfbb..e1f75d2 100644
--- a/skolehjem/resources/views/admin/menuplans/index.blade.php
+++ b/skolehjem/resources/views/admin/menuplans/index.blade.php
@@ -12,6 +12,7 @@
@section("content")
+ Uge
Mandag
Tirsdag
Onsdag
@@ -21,6 +22,7 @@
@foreach($menuPlans as $menuplan)
+ {{$menuplan->week}}
{{$menuplan->monday}}
{{$menuplan->tuesday}}
{{$menuplan->wednesday}}
@@ -30,7 +32,7 @@
@csrf
@method("delete")
-
+
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/staff/logout.blade.php b/skolehjem/resources/views/admin/roles/delete.blade.php
similarity index 61%
rename from skolehjem/resources/views/admin/staff/logout.blade.php
rename to skolehjem/resources/views/admin/roles/delete.blade.php
index d364bbd..86267f7 100644
--- a/skolehjem/resources/views/admin/staff/logout.blade.php
+++ b/skolehjem/resources/views/admin/roles/delete.blade.php
@@ -2,13 +2,12 @@
@extends("admin.layout.header")
@section("title")
- Home - Logud
+ Rolle - Fjern
@endsection
@section("path")
- Logud /
+ 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..29aab0d
--- /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/staff/show.blade.php b/skolehjem/resources/views/admin/roles/show.blade.php
similarity index 64%
rename from skolehjem/resources/views/admin/staff/show.blade.php
rename to skolehjem/resources/views/admin/roles/show.blade.php
index 5563064..ad98ce8 100644
--- a/skolehjem/resources/views/admin/staff/show.blade.php
+++ b/skolehjem/resources/views/admin/roles/show.blade.php
@@ -2,11 +2,11 @@
@extends("admin.layout.header")
@section("title")
- Personal - Vis
+ Rolle - Vis
@endsection
@section("path")
- Vis Personal /
+ Vis Brugere /
@endsection
@section("content")
diff --git a/skolehjem/resources/views/admin/staff/delete.blade.php b/skolehjem/resources/views/admin/roles/store.blade.php
similarity index 54%
rename from skolehjem/resources/views/admin/staff/delete.blade.php
rename to skolehjem/resources/views/admin/roles/store.blade.php
index 4c3f81e..c09de0e 100644
--- a/skolehjem/resources/views/admin/staff/delete.blade.php
+++ b/skolehjem/resources/views/admin/roles/store.blade.php
@@ -2,12 +2,13 @@
@extends("admin.layout.header")
@section("title")
- Personal - Fjern
+ Rolle - Opret
@endsection
@section("path")
- Fjern Personal /
+ Opret Roller /
@endsection
@section("content")
+ Rollen blev (ikke) oprettet.
@endsection
diff --git a/skolehjem/resources/views/admin/staff/update.blade.php b/skolehjem/resources/views/admin/roles/update.blade.php
similarity index 50%
rename from skolehjem/resources/views/admin/staff/update.blade.php
rename to skolehjem/resources/views/admin/roles/update.blade.php
index 7f7a25f..e9de582 100644
--- a/skolehjem/resources/views/admin/staff/update.blade.php
+++ b/skolehjem/resources/views/admin/roles/update.blade.php
@@ -2,13 +2,13 @@
@extends("admin.layout.header")
@section("title")
- Personal - Rediger
+ Rolle - Rediger
@endsection
@section("path")
- Rediger Personal /
+ Rediger Rolle /
@endsection
@section("content")
- Din Personal blev (ikke) redigeret.
+ Din rolle blev (ikke) redigeret.
@endsection
diff --git a/skolehjem/resources/views/admin/staff/create.blade.php b/skolehjem/resources/views/admin/staff/create.blade.php
deleted file mode 100644
index 3430725..0000000
--- a/skolehjem/resources/views/admin/staff/create.blade.php
+++ /dev/null
@@ -1,30 +0,0 @@
-@extends("admin.layout.base")
-@extends("admin.layout.header")
-
-@section("title")
- Personal - Opret
-@endsection
-
-@section("path")
- Opret Personal /
-@endsection
-
-@section("content")
- Opret Personal:
-
-@endsection
diff --git a/skolehjem/resources/views/admin/staff/edit.blade.php b/skolehjem/resources/views/admin/staff/edit.blade.php
deleted file mode 100644
index aa0b337..0000000
--- a/skolehjem/resources/views/admin/staff/edit.blade.php
+++ /dev/null
@@ -1,31 +0,0 @@
-@extends("admin.layout.base")
-@extends("admin.layout.header")
-
-@section("title")
- Personal - Rediger
-@endsection
-
-@section("path")
- Rediger Personal /
-@endsection
-
-@section("content")
- Rediger Personal:
-
-@endsection
diff --git a/skolehjem/resources/views/admin/staff/index.blade.php b/skolehjem/resources/views/admin/staff/index.blade.php
deleted file mode 100644
index 52c333d..0000000
--- a/skolehjem/resources/views/admin/staff/index.blade.php
+++ /dev/null
@@ -1,41 +0,0 @@
-@extends("admin.layout.base")
-@extends("admin.layout.header")
-
-@section("title")
- Personal - Vis
-@endsection
-
-@section("path")
- Vis Personal /
-@endsection
-
-@section("content")
-
-
- Fornavn
- Efternavn
- Email
- Tlf nr
-
-
-
- @foreach($staffs as $staff)
-
- {{ $staff->name_first }}
- {{ $staff->name_last }}
- {{ $staff->email }}
- {{ $staff->phone }}
- $staff->id ]) }}">
-
-
-
- @endforeach
-
-
- {{ $staffs->links() }}
-@endsection
diff --git a/skolehjem/resources/views/admin/staff/login.blade.php b/skolehjem/resources/views/admin/staff/login.blade.php
deleted file mode 100644
index 5accdac..0000000
--- a/skolehjem/resources/views/admin/staff/login.blade.php
+++ /dev/null
@@ -1,27 +0,0 @@
-@extends("app.layout.base")
-
-@section("title")
- Login
-@endsection
-
-@section("content")
-
-
-
-
-
- Forgot password?
-
-@endsection
diff --git a/skolehjem/resources/views/admin/staff/store.blade.php b/skolehjem/resources/views/admin/staff/store.blade.php
deleted file mode 100644
index 43ae210..0000000
--- a/skolehjem/resources/views/admin/staff/store.blade.php
+++ /dev/null
@@ -1,14 +0,0 @@
-@extends("admin.layout.base")
-@extends("admin.layout.header")
-
-@section("title")
- Personal - Opret
-@endsection
-
-@section("path")
- Opret Personal /
-@endsection
-
-@section("content")
- Personal blev (ikke) oprettet.
-@endsection
diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php
index 8ebac49..0802da9 100644
--- a/skolehjem/resources/views/admin/users/create.blade.php
+++ b/skolehjem/resources/views/admin/users/create.blade.php
@@ -25,11 +25,12 @@
Telefon nr:
- Rolle:
-
- Admin
- Personale
- Beboer
+ Rolle:
+
+ -- Vælg Rolle(r) --
+ @foreach($roles as $role)
+ {{ $role->name }}
+ @endforeach
diff --git a/skolehjem/resources/views/admin/users/edit.blade.php b/skolehjem/resources/views/admin/users/edit.blade.php
index 502e8cd..7025b63 100644
--- a/skolehjem/resources/views/admin/users/edit.blade.php
+++ b/skolehjem/resources/views/admin/users/edit.blade.php
@@ -27,10 +27,11 @@
Telefon nr:
Rolle:
-
- Admin
- Personale
- Beboer
+
+ -- Vælg Rolle(r) --
+ @foreach($roles as $role)
+ {{ $role->name }}
+ @endforeach
diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php
index d40a09c..f778fe1 100644
--- a/skolehjem/resources/views/admin/users/index.blade.php
+++ b/skolehjem/resources/views/admin/users/index.blade.php
@@ -16,7 +16,7 @@
Efternavn
Email
Tlf nr
- Rolle
+ Rolle(r)
@@ -26,13 +26,21 @@
{{ $user->name_last }}
{{ $user->email }}
{{ $user->phone }}
- {{ $user->roles }}
+
+ @for($i = 0; $i < count($user->roles); $i++)
+ @if(count($user->roles)-1 != $i)
+ {{$user->roles[$i]->name}},
+ @else
+ {{$user->roles[$i]->name}}
+ @endif
+ @endfor
+
$user->id ]) }}">
diff --git a/skolehjem/resources/views/admin/washing-machines/index.blade.php b/skolehjem/resources/views/admin/washing-machines/index.blade.php
index 07d7b95..f7a9d97 100644
--- a/skolehjem/resources/views/admin/washing-machines/index.blade.php
+++ b/skolehjem/resources/views/admin/washing-machines/index.blade.php
@@ -20,7 +20,13 @@
{Navn}
-
+
+
@endforeach
diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php
index 7818ca2..cc31d74 100644
--- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php
+++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php
@@ -30,7 +30,7 @@
@csrf
@method("delete")
-
+
diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php
index 18a4713..38a9ea8 100644
--- a/skolehjem/resources/views/app/layout/base.blade.php
+++ b/skolehjem/resources/views/app/layout/base.blade.php
@@ -45,10 +45,13 @@
Vagttelefon
-
+
Konto
+
+ Log Ud
+
@yield("content")
diff --git a/skolehjem/resources/views/app/menuplans/index.blade.php b/skolehjem/resources/views/app/menuplans/index.blade.php
index f66d484..3f4514a 100644
--- a/skolehjem/resources/views/app/menuplans/index.blade.php
+++ b/skolehjem/resources/views/app/menuplans/index.blade.php
@@ -5,26 +5,39 @@
@endsection
@section("content")
-
- Menuplan
- Uge x
-
-
-
Mandag
-
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.
-
-
-
Tirsdag
-
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.
-
-
-
Onsdag
-
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.
-
-
-
Torsdag
-
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.
-
-
+
+
+ @if($menuPlans->contains('week', $Week)) {{-- If any of the menues in the menu table has the number of the week in the 'week' column, do this --}}
+ @foreach($menuPlans as $menuplan)
+ @if($menuplan->week == $Week)
+ Menuplan
+ Uge: {{$menuplan->week}}
+
+
+
Mandag
+
{{$menuplan->monday}}
+
+
+
Tirsdag
+
{{$menuplan->tuesday}}
+
+
+
Onsdag
+
{{$menuplan->wednesday}}
+
+
+
Torsdag
+
{{$menuplan->thursday}}
+
+
+ @endif
+ @endforeach
+ @else
+ Menuplan
+ Der er ingen menuplaner denne uge!
+ @endif
+ {{ $menuPlans->links() }}
@endsection
diff --git a/skolehjem/resources/views/app/users/account.blade.php b/skolehjem/resources/views/app/users/account.blade.php
new file mode 100644
index 0000000..1572b8f
--- /dev/null
+++ b/skolehjem/resources/views/app/users/account.blade.php
@@ -0,0 +1,15 @@
+@extends("app.layout.base")
+
+@section("title")
+ Account
+@endsection
+
+@section("content")
+
+ Konto
+ Navn: {{ Auth::user()->name_first . " " . Auth::user()->name_last }}
+ Email: {{ Auth::user()->email }}
+ Telefon Nr.: {{ Auth::user()->phone }}
+ Rediger Oplysninger
+
+@endsection
diff --git a/skolehjem/resources/views/app/users/edit.blade.php b/skolehjem/resources/views/app/users/edit.blade.php
new file mode 100644
index 0000000..73ee773
--- /dev/null
+++ b/skolehjem/resources/views/app/users/edit.blade.php
@@ -0,0 +1,20 @@
+@extends("app.layout.base")
+
+@section("title")
+ Account
+@endsection
+
+@section("content")
+
+ Konto
+
+
+@endsection
diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php
index 317bd3b..38e1ae5 100644
--- a/skolehjem/routes/web.php
+++ b/skolehjem/routes/web.php
@@ -18,14 +18,15 @@ 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");
Route::get("/logout", "UserController@logout")->name("users.logout");
Route::get("/forgot", "UserController@showForgot")->name("users.show-forgot");
Route::post("/forgot", "UserController@forgot")->name("users.forgot");
-
+Route::get("/account", "UserController@account")->name("users.account");
+Route::get("/account/edit", "UserController@accountedit")->name("users.accountedit");
Route::get("phones", "PhoneController@index")->name("phones.index");
@@ -39,4 +40,4 @@ Route::resource("washing-reservations", "WashingReservationController");
Route::resource("feedbacks", "FeedbackController");
Route::resource("external-links", "ExternalLinkController");
Route::resource("resource-extensions", "ResourceExtensionController");
-Route::resource("resource-categories", "ResourceCategoryController");
+Route::resource("roles", "RolesController");