diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php
index f71dc01..e649834 100644
--- a/skolehjem/app/Http/Controllers/ContactController.php
+++ b/skolehjem/app/Http/Controllers/ContactController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\Contact;
+use phpDocumentor\Reflection\Types\Context;
class ContactController extends Controller
{
@@ -59,9 +60,15 @@ class ContactController extends Controller
]);
$contact = new Contact($requestContact);
- $contact->save();
+ $saved = $contact->save();
+
+ if(!$saved){
+ return Response::detect("contacts.store");
+ }else{
+ $contact = Contact::query()->paginate($request->input("limit", 20));
+ return Response::detect("contacts.index", ['contacts' => $contact]);
+ }
- return Response::detect("contacts.store");
}
/**
@@ -101,9 +108,15 @@ class ContactController extends Controller
$data = $request->all();
$contact = Contact::find($id);
$contact->update($data);
- $contact->save();
+ $saved = $contact->save();
+
+ if(!$saved){
+ return Response::detect("contacts.update", [ "contacts" => $contact ]);
+ }else{
+ $contact = Contact::query()->paginate($request->input("limit", 20));
+ return Response::detect("contacts.index", ['contacts' => $contact]);
+ }
- return Response::detect("contacts.update", [ "contacts" => $contact ]);
}
/**
diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php
index 0e98754..55866ba 100644
--- a/skolehjem/app/Http/Controllers/EventController.php
+++ b/skolehjem/app/Http/Controllers/EventController.php
@@ -59,9 +59,15 @@ class EventController extends Controller
$event = new Event($requestBody);
- $event->save();
+ $saved = $event->save();
+
+ if(!$saved){
+ return Response::detect("events.store");
+ }else{
+ $event = Event::query()->paginate($request->input("limit", 20));
+ return Response::detect("events.index", ['events' => $event]);
+ }
- return Response::detect("events.store");
}
/**
@@ -100,9 +106,15 @@ class EventController extends Controller
$event = Event::find($id);
$event->update($data);
- $event->save();
+ $saved = $event->save();
+
+ if(!$saved){
+ return Response::detect("events.update", [ "event" => $event]);
+ }else{
+ $event = Event::query()->paginate($request->input("limit", 20));
+ return Response::detect("events.index", ['events' => $event]);
+ }
- return Response::detect("events.update", [ "event" => $event]);
}
/**
diff --git a/skolehjem/app/Http/Controllers/ExternalLinkController.php b/skolehjem/app/Http/Controllers/ExternalLinkController.php
index 8f99398..3b3b9a7 100644
--- a/skolehjem/app/Http/Controllers/ExternalLinkController.php
+++ b/skolehjem/app/Http/Controllers/ExternalLinkController.php
@@ -55,9 +55,15 @@ class ExternalLinkController extends Controller
]);
$externalLink = new ExternalLink($requestBody);
- $externalLink->save();
+ $saved = $externalLink->save();
+
+ if(!$saved){
+ return Response::detect("external-links.store");
+ }else{
+ $externalLink = ExternalLink::query()->paginate($request->input("limit", 20));
+ return Response::detect("external-links.index", ['links' => $externalLink]);
+ }
- return Response::detect("external-links.store");
}
/**
@@ -96,9 +102,15 @@ class ExternalLinkController extends Controller
$link = ExternalLink::find($id);
$link->update($data);
- $link->save();
+ $saved = $link->save();
+
+ if(!$saved){
+ return Response::detect("external-links.update", [ "link" => $link]);
+ }else{
+ $externalLink = ExternalLink::query()->paginate($request->input("limit", 20));
+ return Response::detect("external-links.index", ['links' => $externalLink]);
+ }
- return Response::detect("external-links.update", [ "link" => $link]);
}
/**
diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php
index d6e334b..27db7c0 100644
--- a/skolehjem/app/Http/Controllers/MenuPlanController.php
+++ b/skolehjem/app/Http/Controllers/MenuPlanController.php
@@ -60,9 +60,14 @@ class MenuPlanController extends Controller
]);
$menuPlans = new MenuPlan($requestMenuPlanCreate);
- $menuPlans->save();
+ $saved = $menuPlans->save();
- return Response::detect("menuplans.store");
+ if(!$saved){
+ return Response::detect("menuplans.store");
+ }else{
+ $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
+ return Response::detect("menuplans.index", ['menuPlans' => $menuPlans]);
+ }
}
/**
@@ -102,9 +107,15 @@ class MenuPlanController extends Controller
$menuplan = MenuPlan::find($id);
$menuplan->update($data);
- $menuplan->save();
+ $saved = $menuplan->save();
+
+ if(!$saved){
+ return Response::detect("menuplans.update", [ "menuplan" => $menuplan ]);
+ }else{
+ $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
+ return Response::detect("menuplans.index", ['menuPlans' => $menuPlans]);
+ }
- return Response::detect("menuplans.update", [ "menuplan" => $menuplan ]);
}
/**
diff --git a/skolehjem/app/Http/Controllers/ResourceCategoryController.php b/skolehjem/app/Http/Controllers/ResourceCategoryController.php
index eec6519..657c6ec 100644
--- a/skolehjem/app/Http/Controllers/ResourceCategoryController.php
+++ b/skolehjem/app/Http/Controllers/ResourceCategoryController.php
@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
+use App\ResourceCategory;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
@@ -23,9 +24,11 @@ class ResourceCategoryController extends Controller
*
* @return \Illuminate\Http\Response
*/
- public function index()
+ public function index(Request $request)
{
- //
+ $categories = ResourceCategory::query()->paginate($request->input("limit", 20));
+
+ return Response::detect("resource-categories.index", ["category"=> $categories]);
}
/**
@@ -35,7 +38,7 @@ class ResourceCategoryController extends Controller
*/
public function create()
{
- //
+ return Response::detect("resource-categories.create");
}
/**
@@ -46,7 +49,15 @@ class ResourceCategoryController extends Controller
*/
public function store(Request $request)
{
- //
+ $requestBody = $request->validate([
+ "name" => "unique|required|max:255",
+ "description" => "required|max:255",
+ "slug" => "unique|required|max:255"
+ ]);
+ $category = new ResourceCategory($requestBody);
+ $category->save();
+
+ return Response::detect("resource-categories.store");
}
/**
@@ -55,9 +66,9 @@ class ResourceCategoryController extends Controller
* @param int $id
* @return \Illuminate\Http\Response
*/
- public function show($id)
+ public function show(ResourceCategory $id)
{
- //
+ return Response::detect("resource-categories.show", ["category" => $id]);
}
/**
@@ -68,7 +79,8 @@ class ResourceCategoryController extends Controller
*/
public function edit($id)
{
- //
+ $category = ResourceCategory::find($id);
+ return Response::detect("resource-categories.edit", ["category" => $category]);
}
/**
@@ -80,7 +92,13 @@ class ResourceCategoryController extends Controller
*/
public function update(Request $request, $id)
{
- //
+ $data = $request->all();
+
+ $category = ResourceCategory::find($id);
+ $category->update($data);
+ $category->save();
+
+ return Response::detect("resource-categories.update", ["category" => $category]);
}
/**
@@ -91,6 +109,8 @@ class ResourceCategoryController extends Controller
*/
public function destroy($id)
{
- //
+ $category = ResourceCategory::find($id);
+ $category->delete();
+ return redirect()->route("resource-categories.index");
}
}
diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php
index 6f58467..093cbe8 100644
--- a/skolehjem/app/Http/Controllers/RolesController.php
+++ b/skolehjem/app/Http/Controllers/RolesController.php
@@ -45,9 +45,16 @@ class rolesController extends Controller
]);
$role = new Role($requestRole);
- $role->save();
+ $saved = $role->save();
+
+ if(!$saved){
+ return Response::detect("roles.store");
+ }else{
+ $roles = Role::query()->paginate($request->input("limit", 20));
+ return Response::detect("roles.index", ['roles' => $roles]);
+ }
+
- return Response::detect("roles.store");
}
/**
@@ -85,9 +92,15 @@ class rolesController extends Controller
$data = $request->all();
$role = Role::find($id);
$role->update($data);
- $role->save();
+ $saved = $role->save();
+
+ if(!$saved){
+ return Response::detect("roles.update", [ "role" => $role ]);
+ }else{
+ $roles = Role::query()->paginate($request->input("limit", 20));
+ return Response::detect("roles.index", ['roles' => $roles]);
+ }
- return Response::detect("roles.update", [ "role" => $role ]);
}
/**
diff --git a/skolehjem/database/migrations/2020_07_01_064330_create_resource_categories.php b/skolehjem/database/migrations/2020_07_01_064330_create_resource_categories.php
new file mode 100644
index 0000000..290931b
--- /dev/null
+++ b/skolehjem/database/migrations/2020_07_01_064330_create_resource_categories.php
@@ -0,0 +1,34 @@
+id();
+ $table->string("name")->unique();
+ $table->text("description");
+ $table->string("slug")->unique();
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('resource_categories');
+ }
+}
diff --git a/skolehjem/public/css/admin.css b/skolehjem/public/css/admin.css
index c6b3a23..c1e0293 100644
--- a/skolehjem/public/css/admin.css
+++ b/skolehjem/public/css/admin.css
@@ -6588,16 +6588,18 @@ main {
min-width: 194px;
}
-.segment {
- margin-bottom: 1.25rem;
-}
-
.segment > h3 {
margin-left: -1rem;
margin-top: 0;
- width: calc(100% + 2rem);
- background-color: rgba(0, 0, 0, 0.2);
+ width: calc(100% + 1rem);
text-align: center;
+ margin-bottom: 0;
+ font-size: 1.15em;
+}
+
+.segment > h3 > a {
+ padding: 1rem 2rem;
+ display: block;
}
.segment > div {
@@ -6607,7 +6609,7 @@ main {
margin-bottom: 0.5rem;
}
-.segment > div:hover {
+.segment > h3:hover {
background-color: rgba(0, 0, 0, 0.2);
}
@@ -6616,6 +6618,16 @@ main {
padding-right: 8px;
}
+.btn-inline {
+ display: inline-flex;
+ align-items: center;
+}
+
+.btn-inline > img {
+ height: 1em;
+ margin-right: 4px;
+}
+
.directorypath {
border-radius: 2px;
background-color: #333333;
diff --git a/skolehjem/resources/sass/admin/nav/nav.scss b/skolehjem/resources/sass/admin/nav/nav.scss
index f200ee7..d46b2b1 100644
--- a/skolehjem/resources/sass/admin/nav/nav.scss
+++ b/skolehjem/resources/sass/admin/nav/nav.scss
@@ -4,16 +4,18 @@
min-width: 194px;
}
-.segment {
- margin-bottom: 1.25rem;
-}
-
.segment > h3 {
margin-left: -1rem;
margin-top: 0;
- width: calc(100% + 2rem);
- background-color: rgba(0,0,0, 0.2);
+ width: calc(100% + 1rem);
text-align: center;
+ margin-bottom: 0;
+ font-size: 1.15em;
+}
+
+.segment > h3 > a {
+ padding: 1rem 2rem;
+ display: block;
}
.segment > div {
@@ -23,8 +25,8 @@
margin-bottom: .5rem;
}
-.segment > div:hover {
- background-color: rgba(0,0,0,0.2);
+.segment > h3:hover {
+ background-color: rgba(0,0,0, 0.2);
}
.segment > div > a > img {
@@ -35,3 +37,13 @@
.segment > div > a {
}
+
+.btn-inline {
+ display: inline-flex;
+ align-items: center;
+}
+
+.btn-inline > img {
+ height: 1em;
+ margin-right: 4px;
+}
diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php
index dc0d212..f180b26 100644
--- a/skolehjem/resources/views/admin/contacts/index.blade.php
+++ b/skolehjem/resources/views/admin/contacts/index.blade.php
@@ -10,7 +10,10 @@
@endsection
@section("content")
-
+
+
Kontakt Navn |
Titel |
diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php
index 95e6bb1..f27f4c1 100644
--- a/skolehjem/resources/views/admin/events/index.blade.php
+++ b/skolehjem/resources/views/admin/events/index.blade.php
@@ -10,7 +10,10 @@
@endsection
@section("content")
-
+
+
Event Navn |
Event Beskrivelse |
diff --git a/skolehjem/resources/views/admin/external-links/edit.blade.php b/skolehjem/resources/views/admin/external-links/edit.blade.php
index 027e71e..250ec21 100644
--- a/skolehjem/resources/views/admin/external-links/edit.blade.php
+++ b/skolehjem/resources/views/admin/external-links/edit.blade.php
@@ -15,7 +15,7 @@
@csrf
@method("PUT")
-
+
diff --git a/skolehjem/resources/views/admin/external-links/index.blade.php b/skolehjem/resources/views/admin/external-links/index.blade.php
index 069db81..4e4dcad 100644
--- a/skolehjem/resources/views/admin/external-links/index.blade.php
+++ b/skolehjem/resources/views/admin/external-links/index.blade.php
@@ -10,7 +10,10 @@
@endsection
@section("content")
-
+
+
Title |
Link |
diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php
index 41bb86b..36e1a71 100644
--- a/skolehjem/resources/views/admin/layout/base.blade.php
+++ b/skolehjem/resources/views/admin/layout/base.blade.php
@@ -11,85 +11,34 @@
+
{{--
--}}
-{{--
Personale
--}}
-{{--
--}}
-{{--
--}}
+{{--
--}}
{{--
--}}
diff --git a/skolehjem/resources/views/admin/layout/header.blade.php b/skolehjem/resources/views/admin/layout/header.blade.php
index a093951..432a487 100644
--- a/skolehjem/resources/views/admin/layout/header.blade.php
+++ b/skolehjem/resources/views/admin/layout/header.blade.php
@@ -3,7 +3,7 @@
 }})
@auth
-
User: {{ Auth::user()->name }}
+
Bruger: {{ ucfirst(Auth::user()->name_first) }} {{ ucfirst(Auth::user()->name_last) }}
Log ud
@else
Log ind
diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php
index e1f75d2..d63d272 100644
--- a/skolehjem/resources/views/admin/menuplans/index.blade.php
+++ b/skolehjem/resources/views/admin/menuplans/index.blade.php
@@ -10,7 +10,10 @@
@endsection
@section("content")
-
+
+
Uge |
Mandag |
diff --git a/skolehjem/resources/views/admin/resource-categories/create.blade.php b/skolehjem/resources/views/admin/resource-categories/create.blade.php
new file mode 100644
index 0000000..e69de29
diff --git a/skolehjem/resources/views/admin/resource-categories/delete.blade.php b/skolehjem/resources/views/admin/resource-categories/delete.blade.php
new file mode 100644
index 0000000..e69de29
diff --git a/skolehjem/resources/views/admin/resource-categories/edit.blade.php b/skolehjem/resources/views/admin/resource-categories/edit.blade.php
new file mode 100644
index 0000000..e69de29
diff --git a/skolehjem/resources/views/admin/resource-categories/index.blade.php b/skolehjem/resources/views/admin/resource-categories/index.blade.php
new file mode 100644
index 0000000..e69de29
diff --git a/skolehjem/resources/views/admin/resource-categories/show.blade.php b/skolehjem/resources/views/admin/resource-categories/show.blade.php
new file mode 100644
index 0000000..e69de29
diff --git a/skolehjem/resources/views/admin/resource-categories/store.blade.php b/skolehjem/resources/views/admin/resource-categories/store.blade.php
new file mode 100644
index 0000000..e69de29
diff --git a/skolehjem/resources/views/admin/resource-categories/update.blade.php b/skolehjem/resources/views/admin/resource-categories/update.blade.php
new file mode 100644
index 0000000..e69de29
diff --git a/skolehjem/resources/views/admin/roles/index.blade.php b/skolehjem/resources/views/admin/roles/index.blade.php
index 29aab0d..fe3e3e7 100644
--- a/skolehjem/resources/views/admin/roles/index.blade.php
+++ b/skolehjem/resources/views/admin/roles/index.blade.php
@@ -10,7 +10,10 @@
@endsection
@section("content")
-
+
+
Navn |
Beskrivelse |
diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php
index 0802da9..0216fe0 100644
--- a/skolehjem/resources/views/admin/users/create.blade.php
+++ b/skolehjem/resources/views/admin/users/create.blade.php
@@ -28,6 +28,7 @@