diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php
index 1e80482..8cde5a5 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;
@@ -72,8 +73,21 @@ class EventController extends Controller
return redirect()->route("events.index", ['events' => $event])->with('EventNameExists', '<p><b>Der findes allerede et event med det navn!</b></p>');
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 = "<p>" . $event->description . "</p>" .
+ '<div class="row align-items-center">'.
+ '<a style="width: 50%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.store", ["event_id" => $event->id ]) .'">Tilmeld</a>'.
+ '<a style="width: 50%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.signups", ["event_id" => $event->id ]) .'">Se deltagere</a>'.
+ '</div>';
+ $news->save();
+ }
+
+ return redirect()->route('events.index', ['events' => $events]);
}
}
@@ -139,8 +153,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 = "<p>" . $event->description . "</p>" .
+ '<div class="row align-items-center">'.
+ '<a style="width: 50%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.store", ["event_id" => $event->id ]) .'">Tilmeld</a>'.
+ '<a style="width: 50%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.signups", ["event_id" => $event->id ]) .'">Se deltagere</a>'.
+ '</div>';
+ $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 d38de56..c6d43ec 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;
@@ -66,8 +67,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]);
}
}
@@ -116,6 +127,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 4303acb..8ff2408 100644
--- a/skolehjem/app/Http/Controllers/UserEventController.php
+++ b/skolehjem/app/Http/Controllers/UserEventController.php
@@ -20,7 +20,7 @@ class UserEventController extends Controller
return Response::detect("events.yourevents", [ "userevents" => $userevents ]);
}
- public function store() {
+ public function create() {
}
@@ -31,7 +31,7 @@ class UserEventController extends Controller
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
- public function create(Request $request)
+ public function store(Request $request)
{
// Get written data from events.index
$data = $request->validate([
@@ -51,7 +51,7 @@ class UserEventController extends Controller
$UserEvent->user_id = auth()->user()->id;
$UserEvent->save();
- return redirect()->route("events.index")->with('signup#' . $request->event_id, '<p class="text-center"><b>Du er hermed tilmeldt denne aktivitet!</b></p>');
+ return redirect()->back();
}
/**
diff --git a/skolehjem/resources/views/admin/events/create.blade.php b/skolehjem/resources/views/admin/events/create.blade.php
index 78c2df2..f5ebc92 100644
--- a/skolehjem/resources/views/admin/events/create.blade.php
+++ b/skolehjem/resources/views/admin/events/create.blade.php
@@ -10,6 +10,14 @@
@endsection
@section("content")
+ <style>
+ .toggle__label::before, .toggle__label::after {
+ border-color: black;
+ }
+ .toggle__text::before {
+ border-color: black;
+ }
+ </style>
<h1>Opret Aktivitet:</h1>
<form method="post" action="{{ route("events.store") }}">
@csrf
@@ -19,27 +27,12 @@
<input type="text" name="description" id="description" max="500" required>
<label for="date">Aktivitet dato:</label>
<input type="datetime-local" name="date" id="date" required>
+ <label class="toggle">
+ <input class="toggle__input" type="checkbox" name="newsoption">
+ <span class="toggle__label">
+ <span class="toggle__text">Opret som nyhed</span>
+ </span>
+ </label>
<input type="submit" class="btn btn-dark text-white" value="Opret">
</form>
-
-{{-- <table class="tbl">--}}
-{{-- <tr>--}}
-{{-- <th>ID</th>--}}
-{{-- <th>Fornavn</th>--}}
-{{-- <th>Efternavn</th>--}}
-{{-- <th>Email</th>--}}
-{{-- <th>Tlf nr</th>--}}
-{{-- <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>--}}
-{{-- <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>--}}
-{{-- </tr>--}}
-{{-- <tr>--}}
-{{-- <td>{ID}</td>--}}
-{{-- <td>{Fornavn}</td>--}}
-{{-- <td>{Efternavn}</td>--}}
-{{-- <td>{Email}</td>--}}
-{{-- <td>{TLF}</td>--}}
-{{-- <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>--}}
-{{-- <td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>--}}
-{{-- </tr>--}}
-{{-- </table>--}}
@endsection
diff --git a/skolehjem/resources/views/admin/events/edit.blade.php b/skolehjem/resources/views/admin/events/edit.blade.php
index 0234b54..8f1a286 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")
+ <style>
+ .toggle__label::before, .toggle__label::after {
+ border-color: black;
+ }
+ .toggle__text::before {
+ border-color: black;
+ }
+ </style>
<h1>Rediger Link:</h1>
<form method="post" action="{{route("events.update", ["event" => $event])}}">
@csrf
@@ -20,7 +28,12 @@
<input value="{{$event->description}}" type="text" name="description" id="description" required>
<label for="date">Beskrivelse</label>
<input value="{{$event->date}}" type="datetime-local" name="date" id="date" required>
-
+ <label class="toggle">
+ <input class="toggle__input" type="checkbox" name="newsoption">
+ <span class="toggle__label">
+ <span class="toggle__text">Opret som nyhed</span>
+ </span>
+ </label>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
</form>
@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;
+ }
</style>
<script src="https://cdn.ckeditor.com/ckeditor5/21.0.0/classic/ckeditor.js"></script>
<h1>Opret Vejledning</h1>
@@ -22,6 +28,12 @@
<label for="title">Titel på guiden</label>
<input type="text" name="name" id="title" required>
<textarea name="guide_articles" id="editor"></textarea>
+ <label class="toggle">
+ <input class="toggle__input" type="checkbox" name="newsoption">
+ <span class="toggle__label">
+ <span class="toggle__text">Opret som nyhed</span>
+ </span>
+ </label>
<input type="submit" class="btn btn-dark text-white" value="Opret">
</form>
diff --git a/skolehjem/resources/views/admin/guides/edit.blade.php b/skolehjem/resources/views/admin/guides/edit.blade.php
index 81bcd34..d29d692 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;
+ }
</style>
<script src="https://cdn.ckeditor.com/ckeditor5/21.0.0/classic/ckeditor.js"></script>
<h1>Rediger vejledning:</h1>
@@ -24,6 +30,12 @@
<input value="{{$guide->name}}" type="text" name="name" id="title" required>
<label for="editor">Vejledning</label>
<textarea name="guide_articles" id="editor">{{$guide->guide_articles}}</textarea>
+ <label class="toggle">
+ <input class="toggle__input" type="checkbox" name="newsoption">
+ <span class="toggle__label">
+ <span class="toggle__text">Opret som nyhed</span>
+ </span>
+ </label>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
</form>
diff --git a/skolehjem/resources/views/app/events/index.blade.php b/skolehjem/resources/views/app/events/index.blade.php
index b38e477..803418f 100644
--- a/skolehjem/resources/views/app/events/index.blade.php
+++ b/skolehjem/resources/views/app/events/index.blade.php
@@ -8,7 +8,7 @@
<h1 class="text-center sde-blue mb-0">Aktiviteter</h1>
@if(!$events->isEmpty())
@foreach($events as $event)
- <form method="get" action="{{ route("userevents.create") }}">
+ <form method="get" action="{{ route("userevents.store") }}">
<h3 class="sde-blue bold text-center mb-0">{{$event->name}}</h3>
<p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
<p class="text-center">{{$event->description}}</p>
diff --git a/skolehjem/resources/views/app/news/index.blade.php b/skolehjem/resources/views/app/news/index.blade.php
index 781ad69..e79ea1f 100644
--- a/skolehjem/resources/views/app/news/index.blade.php
+++ b/skolehjem/resources/views/app/news/index.blade.php
@@ -59,8 +59,10 @@
<main>
@foreach(\App\News::query()->orderBy("created_at", "desc")->get() as $new)
- <h2 class="sde-blue">{{ $new->name }}</h2>
- {!! $new->content !!}
+ <div style="border: 4px solid rgba(0,0,0, 0.4); padding: 4px; margin-top: 1rem">
+ <h2 class="sde-blue mt-0 text-center">{{ $new->name }}</h2>
+ {!! $new->content !!}
+ </div>
@endforeach
</main>
<script src="{{ mix("/js/app.js") }}"></script>