vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	skolehjem/app/Http/Controllers/UserEventController.php
This commit is contained in:
Anders 2020-08-07 10:52:25 +02:00
parent a23337b9d4 c02c1aacd3
commit e0b998dec0
8 changed files with 112 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
skolehjem/app/Http/Controllers/EventController.php
View File

@ -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', '<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.create", ["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]);
}
}
@ -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 = "<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.create", ["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]);
}
}

25
skolehjem/app/Http/Controllers/GuideController.php
View File

@ -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]);
}
}

2
skolehjem/app/Http/Controllers/UserEventController.php
View File

@ -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();

13
skolehjem/resources/views/admin/events/create.blade.php
View File

@ -11,11 +11,16 @@
@section("content")
<style>
.toggle__label::before, .toggle__label::after {
border-color: black;
}
.toggle__text::before {
border-color: black;
}
.ck-editor__main {
margin-bottom: 1rem;
}
</style>
<script src="https://cdn.ckeditor.com/ckeditor5/21.0.0/classic/ckeditor.js"></script>
<h1>Opret Aktivitet:</h1>
<form method="post" action="{{ route("events.store") }}">
@csrf
@ -27,6 +32,12 @@
<textarea name="description" id="editor"></textarea>
<label for="date">Event 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>

15
skolehjem/resources/views/admin/events/edit.blade.php
View File

@ -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
@ -22,7 +30,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

12
skolehjem/resources/views/admin/guides/create.blade.php
View File

@ -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>

12
skolehjem/resources/views/admin/guides/edit.blade.php
View File

@ -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>

7
skolehjem/resources/views/app/news/index.blade.php
View File

@ -59,9 +59,14 @@
<main>
@foreach(\App\News::query()->orderBy("created_at", "desc")->get() as $new)
<h2 class="sde-blue">{{ $new->name }}</h2>
<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
@if(count(\App\News::query()->orderBy("created_at", "desc")->get()) == 0)
<p class="text-center">Der er ingen nyheder.</p>
@endif
</main>
<script src="{{ mix("/js/app.js") }}"></script>
@yield("scripts")