From 389e5c65234235c5e7b305a10d8108fd414ba760 Mon Sep 17 00:00:00 2001
From: NH Gooi <techniek@nhgooi.nl>
Date: Thu, 12 Sep 2024 15:47:20 +0200
Subject: [PATCH 1/2] Fix duplicate route

---
 app/Http/Controllers/HomeController.php | 2 +-
 routes/web.php                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 668adff1..c0f8cf98 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -14,7 +14,7 @@ class HomeController extends Controller
         $news = [];
         foreach ($apiResult->news as $newsItem) {
             $news[] = new \Model\NewsItem($newsItem);
-        }
+	}
 
         $populair = [];
         $apiResult = $this->API('nieuws/populair?pagina=' . (int)max(1, $page) . '&aantal=5');
diff --git a/routes/web.php b/routes/web.php
index 20a5ed6b..998599ca 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -72,7 +72,7 @@ Route::get('/gemist/programma/{programma}/{title}', 'RadioController@podcasts')-
 Route::get('/podcast/{programma}/{title}', 'PodcastController@podcasts')->where(['programma' => '\d+'])->name('podcast.overzicht');
 Route::get('/podcast/fragment/{id}/{title}', 'RadioController@podcast')->where(['id' => '\d+', 'title' => '.*']);
 Route::get('/podcast/aflevering/{id}/{title}', 'PodcastController@podcast')->where(['id' => '\d+']);
-Route::get('/podcast/zoeken/{query}', 'RadioController@searchpodcast')->name('gemist.zoeken');
+Route::get('/podcast/zoeken/{query}', 'RadioController@searchpodcast')->name('podcast.zoeken');
 Route::get('/podcast/zoeken', function(Illuminate\Http\Request $request) {
   if($query = $request->get('query', null)) {
     return redirect('/podcast/zoeken/' . urlencode($query));

From 0699269fb20bca55fa64e8e3a5158ad8d7ec6842 Mon Sep 17 00:00:00 2001
From: NH Gooi <techniek@nhgooi.nl>
Date: Thu, 19 Sep 2024 12:17:33 +0200
Subject: [PATCH 2/2] Verwijder blogs want die gaven een fout

---
 app/Http/Controllers/Controller.php      | 5 -----
 resources/views/layouts/master.blade.php | 7 -------
 2 files changed, 12 deletions(-)

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 398b135a..f956837b 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -39,11 +39,6 @@ class Controller extends BaseController
         View::share('apiUrl', $this->API_URL = env('API_URL', 'http://api.6fm.nl/'));
         View::share('imgBase', env('IMAGE_BASE_URL', '/'));
 
-        $blogs = $this->getDataFromFileAndConvert('blogs.json', [], '\Model\Blog', 1);
-        $activeBlog = count($blogs) && $blogs[0]->is_active ? $blogs[0] : null;
-        View::share('activeBlog', $activeBlog);
-
-
         //View::share('onAir', file_get_contents(url('onair')));
         View::composer('widgets.laatstenieuws', function ($view) {
             $view->with('data', $this->getDataFromFileAndConvert('laatste_nieuws.json', ['news'], '\Model\NewsItem'));
diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
index 70126eb5..3fb6e1cf 100644
--- a/resources/views/layouts/master.blade.php
+++ b/resources/views/layouts/master.blade.php
@@ -93,13 +93,6 @@
 
     <div class="page @yield('page_container_class')">
         <a name="top"></a>
-        @if($activeBlog != null)
-            <p style="float: left; border: solid 1px #1f3977; border-radius: 10px; padding: 0 10px 0.4em 10px; margin: 10px 0 10px 0; width: 100%;">
-                <b>Live-blog:</b> {{$activeBlog->title}}
-                <a href="{{$activeBlog->url}}" class="action_button" style="float: none; margin-left: 1em;"><span
-                            class="fa fa-rss"></span><span>Volg het live-blog</span></a>
-            </p>
-        @endif
         @yield('page')
     </div><!--/.page-->