From ef47e845ebf438f13ed9b681c22ed59c87f00719 Mon Sep 17 00:00:00 2001
From: Mischa Spelt <mischa.spelt@nhgooi.nl>
Date: Sat, 19 Feb 2022 17:10:26 +0100
Subject: [PATCH] Oude evenementen weg, debatten toegevoegd

---
 app/Console/Kernel.php                        |  2 +-
 app/Http/Controllers/RadioController.php      |  1 -
 composer.json                                 |  2 +-
 resources/views/layouts/sidebar.blade.php     |  2 +-
 resources/views/widgets/mediaplayer.blade.php |  4 ++--
 resources/views/widgets/menu.blade.php        |  5 +++--
 routes/web.php                                | 10 +++++++---
 vendor/composer/autoload_classmap.php         | 16 ++++++++--------
 vendor/composer/autoload_psr4.php             |  2 +-
 vendor/composer/autoload_static.php           | 18 +++++++++---------
 10 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index f7a9b845..8658e15b 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', 'https://api-dev.nhgooi.nl/');
+		$this->API_URL = env('API_URL', 'https://api.nhgooi.nl/');
 
 		// Update latest news (3 items)
 		$schedule->call(function() {
diff --git a/app/Http/Controllers/RadioController.php b/app/Http/Controllers/RadioController.php
index 95cd27e3..32790d00 100644
--- a/app/Http/Controllers/RadioController.php
+++ b/app/Http/Controllers/RadioController.php
@@ -12,7 +12,6 @@ class RadioController extends Controller
         $apiResult = $this->API('programma/schema/week/' . (int)$shiftWeeks);
         $start = self::JsonToDateTime($apiResult->startdate);
         $end = self::JsonToDateTime($apiResult->enddate);
-    
         $schedule = [];
         foreach($apiResult->schedule as $program)
         {
diff --git a/composer.json b/composer.json
index 53d4b468..1ff539f1 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
         "psr-4": {
             "App\\": "app/",
             "Helpers\\": "app/Helpers/",
-            "Model\\": "../api-dev/common/classes/"
+            "Model\\": "../api/common/classes/"
         }
     },
     "autoload-dev": {
diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php
index d514d62a..0aba53d0 100644
--- a/resources/views/layouts/sidebar.blade.php
+++ b/resources/views/layouts/sidebar.blade.php
@@ -19,7 +19,7 @@
             <div class="column column_1_3">
               <div class="kennismakingsdag">
                     <h4 class="box_header">Kennismaken?</h4>
-                    <p>Wil je radio, tv of podcasts maken, techniek leren of je marketingskills inzetten? De bijeenkomst van 27 november gaat niet door, maar <a href="/vacatures/ontmoet-ons">meld je aan en we nemen persoonlijk contact met je op</a> voor een kennismaking!</p>
+                    <p>Wil je radio, tv of podcasts maken, techniek leren of je marketingskills inzetten? <a href="/vacatures/ontmoet-ons">Meld je aan en we nemen persoonlijk contact met je op</a> voor een kennismaking!</p>
                     <a class="read_more" href="/vacatures" title="Bekijk alle vacatures"><span class="arrow"></span><span>Bekijk vacatures</span></a>
                 </div>
                 <div class="clearfix"></div>
diff --git a/resources/views/widgets/mediaplayer.blade.php b/resources/views/widgets/mediaplayer.blade.php
index e6904812..70175416 100644
--- a/resources/views/widgets/mediaplayer.blade.php
+++ b/resources/views/widgets/mediaplayer.blade.php
@@ -15,10 +15,10 @@ if(!isset($MEDIAPLAYER_INCLUDED)):
 	}
 ?>
 	@push('scripts')
-	<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/mediaelement/5.0.4/mediaelement-and-player.min.js"></script>
+	<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/mediaelement/5.0.5/mediaelement-and-player.min.js"></script>
         <script type="text/javascript" src="/js/mediaplayer_plugins.min.js"></script>
 	<script type="text/javascript">
-	  var pluginPath = 'https://cdnjs.cloudflare.com/ajax/libs/mediaelement/5.0.4/';
+	  var pluginPath = 'https://cdnjs.cloudflare.com/ajax/libs/mediaelement/5.0.5/';
           var features = ['playpause','skipback','jumpforward','current','progress','duration','volume','airplay','chromecast','fullscreen'];
 	  $("audio").mediaelementplayer({
 	    pluginPath: pluginPath,
diff --git a/resources/views/widgets/menu.blade.php b/resources/views/widgets/menu.blade.php
index 561d8e13..7ad5c67b 100644
--- a/resources/views/widgets/menu.blade.php
+++ b/resources/views/widgets/menu.blade.php
@@ -12,9 +12,10 @@
 	"Kijk live" => "/kijk/live",
 	"NHGOOI TV @ YouTube" => "https://www.youtube.com/channel/UC0qLwqmXiLoL5PrLlgB6B4Q"),
 "Evenementen" => array(
+          "Debatten gemeenteraad" => "/debat"),
 //        "24 uur Scherp de Zeis (4 december)" => "/programma/1030/scherp-zeis",
-          "Winterse 50 (25 december)" => "/programma/1080/winterse-50",
-          "Vroeger of Later Luisterlijst (2 januari)" => "/vol-luisterlijst"),
+//          "Winterse 50 (25 december)" => "/programma/1080/winterse-50",
+//          "Vroeger of Later Luisterlijst (2 januari)" => "/vol-luisterlijst"),
 "Podcast" => array(
         "Duurzaam Gooi" => "/podcast/1076/podcast-duurzaam-gooi"),
 "Regioagenda" => "/agenda",
diff --git a/routes/web.php b/routes/web.php
index d4734525..98b057b7 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -93,9 +93,13 @@ Route::get('/vacatures/{id}/{title}', 'JobsController@show')->where(['id' => '\d
 
 Route::any('/winterse50', function() { return redirect('/programma/1080/winterse-50'); });
 
-Route::any('/vol-luisterlijst', 'SpecialController@luisterlijst_stem');
-Route::any('/luisterlijst/2019', 'Controller@view_luisterlijst_lijst');
-Route::any('/luisterlijst', 'SpecialController@luisterlijst_stem');
+// Route::any('/vol-luisterlijst', 'SpecialController@luisterlijst_stem');
+Route::any('/vol-luisterlijst', 'Controller@view_luisterlijst_2021');
+Route::any('/luisterlijst/2019', 'Controller@view_luisterlijst_2019');
+Route::any('/luisterlijst/2021', 'Controller@view_luisterlijst_2021');
+Route::any('/luisterlijst', 'Controller@view_luisterlijst_2021');
+
+Route::any('/debat', 'Controller@view_debat');
 
 //Route::get('/special/stmaarten', function() { return file_get_contents('http://api-dev.6fm.nl/special/stmaarten'); });
 //Route::get('/kabelkrant', function() { return view('kabelkrant'); });
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index bdec5354..efa75a4c 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -1373,14 +1373,14 @@ return array(
     'Mockery\\Undefined' => $vendorDir . '/mockery/mockery/library/Mockery/Undefined.php',
     'Mockery\\VerificationDirector' => $vendorDir . '/mockery/mockery/library/Mockery/VerificationDirector.php',
     'Mockery\\VerificationExpectation' => $vendorDir . '/mockery/mockery/library/Mockery/VerificationExpectation.php',
-    'Model\\CalendarEvent' => $baseDir . '/../api-dev/common/classes/CalendarEvent.php',
-    'Model\\Model' => $baseDir . '/../api-dev/common/classes/Model.php',
-    'Model\\NewsImage' => $baseDir . '/../api-dev/common/classes/NewsImage.php',
-    'Model\\NewsItem' => $baseDir . '/../api-dev/common/classes/NewsItem.php',
-    'Model\\NewsSource' => $baseDir . '/../api-dev/common/classes/NewsSource.php',
-    'Model\\Podcast' => $baseDir . '/../api-dev/common/classes/Podcast.php',
-    'Model\\Program' => $baseDir . '/../api-dev/common/classes/Program.php',
-    'Model\\ProgramHost' => $baseDir . '/../api-dev/common/classes/ProgramHost.php',
+    'Model\\CalendarEvent' => $baseDir . '/../api/common/classes/CalendarEvent.php',
+    'Model\\Model' => $baseDir . '/../api/common/classes/Model.php',
+    'Model\\NewsImage' => $baseDir . '/../api/common/classes/NewsImage.php',
+    'Model\\NewsItem' => $baseDir . '/../api/common/classes/NewsItem.php',
+    'Model\\NewsSource' => $baseDir . '/../api/common/classes/NewsSource.php',
+    'Model\\Podcast' => $baseDir . '/../api/common/classes/Podcast.php',
+    'Model\\Program' => $baseDir . '/../api/common/classes/Program.php',
+    'Model\\ProgramHost' => $baseDir . '/../api/common/classes/ProgramHost.php',
     'Monolog\\ErrorHandler' => $vendorDir . '/monolog/monolog/src/Monolog/ErrorHandler.php',
     'Monolog\\Formatter\\ChromePHPFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php',
     'Monolog\\Formatter\\ElasticaFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php',
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 0376ee67..9f63f231 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -29,7 +29,7 @@ return array(
     'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
     'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
     'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
-    'Model\\' => array($baseDir . '/../api-dev/common/classes'),
+    'Model\\' => array($baseDir . '/../api/common/classes'),
     'League\\Flysystem\\' => array($vendorDir . '/league/flysystem/src'),
     'Laravel\\Tinker\\' => array($vendorDir . '/laravel/tinker/src'),
     'Illuminate\\' => array($vendorDir . '/laravel/framework/src/Illuminate'),
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 57fee69b..c34d5937 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -199,7 +199,7 @@ class ComposerStaticInit5216a35d72a5119d2f4646cd700f802d
         ),
         'Model\\' => 
         array (
-            0 => __DIR__ . '/../..' . '/../api-dev/common/classes',
+            0 => __DIR__ . '/../..' . '/../api/common/classes',
         ),
         'League\\Flysystem\\' => 
         array (
@@ -1658,14 +1658,14 @@ class ComposerStaticInit5216a35d72a5119d2f4646cd700f802d
         'Mockery\\Undefined' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Undefined.php',
         'Mockery\\VerificationDirector' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/VerificationDirector.php',
         'Mockery\\VerificationExpectation' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/VerificationExpectation.php',
-        'Model\\CalendarEvent' => __DIR__ . '/../..' . '/../api-dev/common/classes/CalendarEvent.php',
-        'Model\\Model' => __DIR__ . '/../..' . '/../api-dev/common/classes/Model.php',
-        'Model\\NewsImage' => __DIR__ . '/../..' . '/../api-dev/common/classes/NewsImage.php',
-        'Model\\NewsItem' => __DIR__ . '/../..' . '/../api-dev/common/classes/NewsItem.php',
-        'Model\\NewsSource' => __DIR__ . '/../..' . '/../api-dev/common/classes/NewsSource.php',
-        'Model\\Podcast' => __DIR__ . '/../..' . '/../api-dev/common/classes/Podcast.php',
-        'Model\\Program' => __DIR__ . '/../..' . '/../api-dev/common/classes/Program.php',
-        'Model\\ProgramHost' => __DIR__ . '/../..' . '/../api-dev/common/classes/ProgramHost.php',
+        'Model\\CalendarEvent' => __DIR__ . '/../..' . '/../api/common/classes/CalendarEvent.php',
+        'Model\\Model' => __DIR__ . '/../..' . '/../api/common/classes/Model.php',
+        'Model\\NewsImage' => __DIR__ . '/../..' . '/../api/common/classes/NewsImage.php',
+        'Model\\NewsItem' => __DIR__ . '/../..' . '/../api/common/classes/NewsItem.php',
+        'Model\\NewsSource' => __DIR__ . '/../..' . '/../api/common/classes/NewsSource.php',
+        'Model\\Podcast' => __DIR__ . '/../..' . '/../api/common/classes/Podcast.php',
+        'Model\\Program' => __DIR__ . '/../..' . '/../api/common/classes/Program.php',
+        'Model\\ProgramHost' => __DIR__ . '/../..' . '/../api/common/classes/ProgramHost.php',
         'Monolog\\ErrorHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/ErrorHandler.php',
         'Monolog\\Formatter\\ChromePHPFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php',
         'Monolog\\Formatter\\ElasticaFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php',