diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php
index 60bcbda..f6f7814 100644
--- a/skolehjem/app/Http/Controllers/EventController.php
+++ b/skolehjem/app/Http/Controllers/EventController.php
@@ -3,6 +3,7 @@
namespace App\Http\Controllers;
use App\Event;
+use App\News;
use App\UserEvent;
use App\User;
use Illuminate\Http\Request;
@@ -74,8 +75,21 @@ class EventController extends Controller
return redirect()->route("events.index", ['events' => $event])->with('EventNameExists', '
Der findes allerede et event med det navn!
');
} else {
$event->save();
- $event = Event::query()->paginate($request->input("limit", 20));
- return redirect()->route("events.index", ['events' => $event]);
+ $events = Event::query()->paginate($request->input("limit", 20));
+
+ if($request->newsoption == true){
+ $news = new News();
+
+ $news->name = "Ny aktivitet";
+ $news->content = "" . $event->description . "
" .
+ '';
+ $news->save();
+ }
+
+ return redirect()->route('events.index', ['events' => $events]);
}
}
@@ -141,8 +155,21 @@ class EventController extends Controller
$event->update($data);
$event->save();
- $event = Event::query()->paginate($request->input("limit", 20));
- return redirect()->route("events.index", ['events' => $event]);
+ $events = Event::query()->paginate($request->input("limit", 20));
+
+ if($request->newsoption == true){
+ $news = new News();
+
+ $news->name = "Aktivitet opdateret";
+ $news->content = "" . $event->description . "
" .
+ '';
+ $news->save();
+ }
+
+ return redirect()->route("events.index", ['events' => $events]);
}
}
diff --git a/skolehjem/app/Http/Controllers/GuideController.php b/skolehjem/app/Http/Controllers/GuideController.php
index d452315..ee3a6f3 100644
--- a/skolehjem/app/Http/Controllers/GuideController.php
+++ b/skolehjem/app/Http/Controllers/GuideController.php
@@ -3,6 +3,7 @@
namespace App\Http\Controllers;
use App\Guide;
+use App\News;
use Illuminate\Http\Response;
use Illuminate\Http\Request;
@@ -67,8 +68,18 @@ class GuideController extends Controller
if(!$saved){
return redirect()->route("guides.store");
}else{
- $guide = Guide::query()->paginate($request->input("limit", 20));
- return redirect()->route("guides.index", ['guides' => $guide]);
+ $guides = Guide::query()->paginate($request->input("limit", 20));
+
+ if($request->newsoption == true){
+ $news = new News();
+
+ $news->name = "Ny Vejledning";
+ $news->content = $guide->guide_articles;
+
+ $news->save();
+ }
+
+ return redirect()->route("guides.index", ['guides' => $guides]);
}
}
@@ -117,6 +128,16 @@ class GuideController extends Controller
return redirect()->route("guides.update", [ "guide" => $guide ]);
}else{
$guide = Guide::query()->paginate($request->input("limit", 20));
+
+ if($request->newsoption == true){
+ $news = new News();
+
+ $news->name = "Vejledning opdateret";
+ $news->content = $guidee->guide_articles;
+
+ $news->save();
+ }
+
return redirect()->route("guides.index", ['guides' => $guide]);
}
}
diff --git a/skolehjem/app/Http/Controllers/UserEventController.php b/skolehjem/app/Http/Controllers/UserEventController.php
index 7273f03..500b2a8 100644
--- a/skolehjem/app/Http/Controllers/UserEventController.php
+++ b/skolehjem/app/Http/Controllers/UserEventController.php
@@ -18,7 +18,7 @@ class UserEventController extends Controller
*
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
- public function index()
+ public function index(Request $request)
{
$userevents = UserEvent::join('events', 'events.id', '=', 'user_events.event_id')->orderBY('date' , 'asc')->where('user_id', auth()->user()->id)->get();
diff --git a/skolehjem/resources/views/admin/events/create.blade.php b/skolehjem/resources/views/admin/events/create.blade.php
index e87292f..a3806ff 100644
--- a/skolehjem/resources/views/admin/events/create.blade.php
+++ b/skolehjem/resources/views/admin/events/create.blade.php
@@ -11,11 +11,16 @@
@section("content")
-
Opret Aktivitet:
diff --git a/skolehjem/resources/views/admin/events/edit.blade.php b/skolehjem/resources/views/admin/events/edit.blade.php
index 4007c19..2f01f5d 100644
--- a/skolehjem/resources/views/admin/events/edit.blade.php
+++ b/skolehjem/resources/views/admin/events/edit.blade.php
@@ -10,6 +10,14 @@
@endsection
@section("content")
+
Rediger Link:
@endsection
diff --git a/skolehjem/resources/views/admin/guides/create.blade.php b/skolehjem/resources/views/admin/guides/create.blade.php
index 34b682d..d43d662 100644
--- a/skolehjem/resources/views/admin/guides/create.blade.php
+++ b/skolehjem/resources/views/admin/guides/create.blade.php
@@ -14,6 +14,12 @@
.ck-editor__main {
margin-bottom: 1rem;
}
+ .toggle__label::before, .toggle__label::after {
+ border-color: black;
+ }
+ .toggle__text::before {
+ border-color: black;
+ }
Opret Vejledning
@@ -22,6 +28,12 @@
+
diff --git a/skolehjem/resources/views/admin/guides/edit.blade.php b/skolehjem/resources/views/admin/guides/edit.blade.php
index 00ad48f..da4afea 100644
--- a/skolehjem/resources/views/admin/guides/edit.blade.php
+++ b/skolehjem/resources/views/admin/guides/edit.blade.php
@@ -14,6 +14,12 @@
.ck-editor__main {
margin-bottom: 1rem;
}
+ .toggle__label::before, .toggle__label::after {
+ border-color: black;
+ }
+ .toggle__text::before {
+ border-color: black;
+ }
Rediger vejledning:
@@ -24,6 +30,12 @@
+
diff --git a/skolehjem/resources/views/app/news/index.blade.php b/skolehjem/resources/views/app/news/index.blade.php
index 781ad69..384e3bc 100644
--- a/skolehjem/resources/views/app/news/index.blade.php
+++ b/skolehjem/resources/views/app/news/index.blade.php
@@ -59,9 +59,14 @@
@foreach(\App\News::query()->orderBy("created_at", "desc")->get() as $new)
- {{ $new->name }}
- {!! $new->content !!}
+
+
{{ $new->name }}
+ {!! $new->content !!}
+
@endforeach
+ @if(count(\App\News::query()->orderBy("created_at", "desc")->get()) == 0)
+ Der er ingen nyheder.
+ @endif
@yield("scripts")