From d1b10e558d24ee8d9e859352d607265d9e4fc9f6 Mon Sep 17 00:00:00 2001 From: Mischa Spelt Date: Tue, 5 Oct 2021 20:06:01 +0200 Subject: [PATCH] Vacatures en beelden toegevoegd --- app/Console/Kernel.php | 7 ++- app/Http/Controllers/Controller.php | 3 ++ app/Http/Controllers/JobsController.php | 42 ++++++++++++++++++ resources/views/app.blade.php | 22 ++++++++++ resources/views/jobsitem.blade.php | 12 ++++-- resources/views/jobslist.blade.php | 10 ++++- resources/views/layouts/sidebar.blade.php | 2 + resources/views/widgets/beelden.blade.php | 52 +++++++++++++++++++++++ 8 files changed, 144 insertions(+), 6 deletions(-) create mode 100644 app/Http/Controllers/JobsController.php create mode 100644 resources/views/app.blade.php create mode 100644 resources/views/widgets/beelden.blade.php diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 4a6b0091..f7a9b845 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -27,7 +27,7 @@ class Kernel extends ConsoleKernel */ protected function schedule(Schedule $schedule) { - $this->API_URL = env('API_URL', 'http://api.6fm.nl/'); + $this->API_URL = env('API_URL', 'https://api-dev.nhgooi.nl/'); // Update latest news (3 items) $schedule->call(function() { @@ -55,6 +55,11 @@ class Kernel extends ConsoleKernel $schedule->call(function() { Storage::disk('local')->put('blogs.json', file_get_contents($this->API_URL . 'blog/overzicht')); })->everyMinute(); + + // Update featured images + $schedule->call(function() { + Storage::disk('local')->put('beelden.json', file_get_contents($this->API_URL . 'beelden/overzicht')); + })->everyMinute(); } /** diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 36e12b99..44b9f717 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -81,6 +81,9 @@ class Controller extends BaseController View::composer('widgets.regioagenda', function($view) { $view->with('data', $this->getDataFromFileAndConvert('regioagenda.json', [], '\Model\CalendarEvent')); }); + View::composer('widgets.beelden', function($view) { + $view->with('data', $this->getDataFromFileAndConvert('beelden.json', ['items'], '\Model\NewsItem')); + }); View::composer('widgets.menu', function($view) { $view->with('news', $this->getDataFromFileAndConvert('laatste_nieuws.json', ['news'], '\Model\NewsItem')) ->with('popular', $this->getDataFromFileAndConvert('populair_nieuws.json', [], '\Model\NewsItem', 3)) diff --git a/app/Http/Controllers/JobsController.php b/app/Http/Controllers/JobsController.php new file mode 100644 index 00000000..d63820d1 --- /dev/null +++ b/app/Http/Controllers/JobsController.php @@ -0,0 +1,42 @@ +setTimestamp($timestamp); + return $result; + } + + public function show(Request $request, $id) + { + parent::registerView($request, 'nieuws', $id); + $apiResult = $this->API('vacatures/details/' . $id); + $jobsItem = new \Model\JobOpening($apiResult->item); + return view('jobsitem', ['job' => $jobsItem, 'metadata' => $jobsItem->metadata]); + } + + public function overview(Request $request) + { + return $this->listJobs($request, 'overzicht'); + } + + private function listJobs(Request $request, $url, $title = null) + { + $page = (int)$request->get('pagina', 1); + $apiResult = $this->API('vacatures/' . $url . '?pagina=' . (int)max(1, $page)); + $jobs = []; + foreach($apiResult->jobs as $jobsItem) + { + $jobs[] = new \Model\JobOpening($jobsItem); + } + + return view('jobslist', ['title' => $title, 'jobs' => $jobs]); + //return view($request->ajax() ? 'partial/jobslist_small' : ($title == null ? 'home' : 'jobslist'), ['title' => $title, 'jobs' => $jobs, 'searchURL' => 'vacatures/zoeken']); + } +} diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php new file mode 100644 index 00000000..ca0a663e --- /dev/null +++ b/resources/views/app.blade.php @@ -0,0 +1,22 @@ +@extends('layouts.sidebar') + +@section('title') + NH Gooi App +@endsection + +@section('content') + +

Download de NH Gooi app via de App Store of Google Play. + +

+ +
+
googleplay4
+
+ +
+
apple4
+
+
+ +@endsection diff --git a/resources/views/jobsitem.blade.php b/resources/views/jobsitem.blade.php index 56e9ba40..1ca2a7ad 100644 --- a/resources/views/jobsitem.blade.php +++ b/resources/views/jobsitem.blade.php @@ -4,15 +4,16 @@ {{$job->title}} @endsection + @section('breadcrumb') @endsection + @section('content')
@@ -59,6 +60,11 @@
{!!$job->content!!} + +
+

Interesse?

+

Mail een korte introductie met motivatie naar meebouwen@nhgooi.nl en we nemen contact met je op voor een vrijblijvend kennismakingsgesprek.

+ Reageer nu!
{{-- diff --git a/resources/views/jobslist.blade.php b/resources/views/jobslist.blade.php index 94c34a8b..385a2857 100644 --- a/resources/views/jobslist.blade.php +++ b/resources/views/jobslist.blade.php @@ -37,11 +37,12 @@ als vrijwilligers die op professioneel niveau werken.

{!!$job->title!!}

@if(count($job->images)) - + {{$job->images[0]->title}} - @endif + @else

{!! Formatter::excerpt($job->content, 200) !!}

+ @endif Bekijk vacature
@@ -54,4 +55,9 @@ als vrijwilligers die op professioneel niveau werken.

@endif +
+

Niet wat je zoekt?

+

Staan in de lijst hierboven geen interessante vacatures voor je, maar lijkt het je wel leuk om (als vrijwilliger) mee te bouwen aan NH Gooi? Mail dan een korte introductie met motivatie naar meebouwen@nhgooi.nl en we nemen contact met je op voor een vrijblijvend kennismakingsgesprek.

+Reageer nu! + @endsection diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php index 10ab2541..4b421044 100644 --- a/resources/views/layouts/sidebar.blade.php +++ b/resources/views/layouts/sidebar.blade.php @@ -19,6 +19,8 @@
@include('widgets.banners') + @include('widgets.beelden') + @include('widgets.nustraks')
diff --git a/resources/views/widgets/beelden.blade.php b/resources/views/widgets/beelden.blade.php new file mode 100644 index 00000000..872617cc --- /dev/null +++ b/resources/views/widgets/beelden.blade.php @@ -0,0 +1,52 @@ + + +

  Beelden uit 't Gooi

+ +
+

+ {{$img->images[0]->title}} + {{ $img->title }} + {{ $img->images[0]->title }} +

+

Uw foto hier? Mail naar beelden@nhgooi.nl!

+
+ + + + @push('scripts') + + @endpush +