From 246004ebfd28ed4086401a946595d7a314662216 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Fri, 7 Aug 2020 09:47:23 +0200 Subject: [PATCH 1/3] v0.5.8 - Added create news option on guide and event create/edit --- .../app/Http/Controllers/EventController.php | 35 ++++++++++++++++--- .../app/Http/Controllers/GuideController.php | 25 +++++++++++-- .../Http/Controllers/UserEventController.php | 6 ++-- .../views/admin/events/create.blade.php | 35 ++++++++----------- .../views/admin/events/edit.blade.php | 15 +++++++- .../views/admin/guides/create.blade.php | 12 +++++++ .../views/admin/guides/edit.blade.php | 12 +++++++ .../views/app/events/index.blade.php | 2 +- .../resources/views/app/news/index.blade.php | 6 ++-- 9 files changed, 114 insertions(+), 34 deletions(-) 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', '

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 . "

" . + '
'. + ' $event->id ]) .'">Tilmeld'. + ' $event->id ]) .'">Se deltagere'. + '
'; + $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 = "

" . $event->description . "

" . + '
'. + ' $event->id ]) .'">Tilmeld'. + ' $event->id ]) .'">Se deltagere'. + '
'; + $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, '

Du er hermed tilmeldt denne aktivitet!

'); + 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") +

Opret Aktivitet:

@csrf @@ -19,27 +27,12 @@ +
- -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{-- --}} -{{--
IDFornavnEfternavnEmailTlf nrUpdateDelete
{ID}{Fornavn}{Efternavn}{Email}{TLF}UpdateDelete
--}} @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") +

Rediger Link:

$event])}}"> @csrf @@ -20,7 +28,12 @@ - +
@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 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; + }

Rediger vejledning:

@@ -24,6 +30,12 @@ + 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 @@

Aktiviteter

@if(!$events->isEmpty()) @foreach($events as $event) -
+

{{$event->name}}

{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}

{{$event->description}}

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 @@
@foreach(\App\News::query()->orderBy("created_at", "desc")->get() as $new) -

{{ $new->name }}

- {!! $new->content !!} +
+

{{ $new->name }}

+ {!! $new->content !!} +
@endforeach
From f7941841fe877cf7c1c6f7e38df18813030e5198 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Fri, 7 Aug 2020 10:25:46 +0200 Subject: [PATCH 2/3] v0.5.8a - Fix --- skolehjem/app/Http/Controllers/EventController.php | 4 ++-- skolehjem/app/Http/Controllers/UserEventController.php | 8 ++++---- skolehjem/resources/views/app/events/index.blade.php | 2 +- skolehjem/resources/views/app/news/index.blade.php | 3 +++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index ebd202a..f326cfc 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -83,7 +83,7 @@ class EventController extends Controller $news->name = "Ny aktivitet"; $news->content = "

" . $event->description . "

" . '
'. - ' $event->id ]) .'">Tilmeld'. + ' $event->id ]) .'">Tilmeld'. ' $event->id ]) .'">Se deltagere'. '
'; $news->save(); @@ -163,7 +163,7 @@ class EventController extends Controller $news->name = "Aktivitet opdateret"; $news->content = "

" . $event->description . "

" . '
'. - ' $event->id ]) .'">Tilmeld'. + ' $event->id ]) .'">Tilmeld'. ' $event->id ]) .'">Se deltagere'. '
'; $news->save(); diff --git a/skolehjem/app/Http/Controllers/UserEventController.php b/skolehjem/app/Http/Controllers/UserEventController.php index bb760dd..cfcc3b9 100644 --- a/skolehjem/app/Http/Controllers/UserEventController.php +++ b/skolehjem/app/Http/Controllers/UserEventController.php @@ -18,14 +18,14 @@ 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(); return Response::detect("events.yourevents", [ "userevents" => $userevents ]); } - public function create() { + public function store() { } @@ -36,7 +36,7 @@ class UserEventController extends Controller * @param \Illuminate\Http\Request $request * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View */ - public function store(Request $request) + public function create(Request $request) { // Get written data from events.index $data = $request->validate([ @@ -56,7 +56,7 @@ class UserEventController extends Controller $UserEvent->user_id = auth()->user()->id; $UserEvent->save(); - return redirect()->back(); + //return redirect()->back(); } /** diff --git a/skolehjem/resources/views/app/events/index.blade.php b/skolehjem/resources/views/app/events/index.blade.php index 403c7b2..debaba0 100644 --- a/skolehjem/resources/views/app/events/index.blade.php +++ b/skolehjem/resources/views/app/events/index.blade.php @@ -8,7 +8,7 @@

{{ __('msg.aktiviteter') }}

@if(!$events->isEmpty()) @foreach($events as $event) - +

{{$event->name}}

Af: {{ $event->accountable }}

{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}

diff --git a/skolehjem/resources/views/app/news/index.blade.php b/skolehjem/resources/views/app/news/index.blade.php index e79ea1f..384e3bc 100644 --- a/skolehjem/resources/views/app/news/index.blade.php +++ b/skolehjem/resources/views/app/news/index.blade.php @@ -64,6 +64,9 @@ {!! $new->content !!} @endforeach + @if(count(\App\News::query()->orderBy("created_at", "desc")->get()) == 0) +

Der er ingen nyheder.

+ @endif @yield("scripts") From c02c1aacd31962db1b9b106236caf1fdd5dac0c8 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Fri, 7 Aug 2020 10:36:08 +0200 Subject: [PATCH 3/3] v0.5.8b - Fix --- skolehjem/app/Http/Controllers/UserEventController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/app/Http/Controllers/UserEventController.php b/skolehjem/app/Http/Controllers/UserEventController.php index cfcc3b9..3dd01f6 100644 --- a/skolehjem/app/Http/Controllers/UserEventController.php +++ b/skolehjem/app/Http/Controllers/UserEventController.php @@ -56,7 +56,7 @@ class UserEventController extends Controller $UserEvent->user_id = auth()->user()->id; $UserEvent->save(); - //return redirect()->back(); + return redirect()->back(); } /**