Menu styling tweak

Reviewed-on: #17

app/Http/Controllers/CalendarController.php

@@ -10,14 +10,14 @@ class CalendarController extends Controller
     {
         parent::registerView($request, 'agenda', $id);
         $apiResult = $this->API('agenda/item/' . (int)$id);
-        $calendarEvent = new \Model\CalendarEvent($apiResult);
+        $calendarEvent = new \Model\CalendarEvent($apiResult->news);
 
         return view('calendarevent', array_merge($this->getSidebareData(), ['event' => $calendarEvent, 'metadata' => $calendarEvent->metadata]));
     }
 
     public function overview(Request $request)
     {
-        $apiResult = $this->API('agenda/overzicht');
+        $apiResult = $this->API('agenda/overzicht?aantal=100');
         $calendar = [];
         foreach($apiResult->events as $calendarItem)
         {

app/Http/Controllers/Controller.php

@@ -19,17 +19,17 @@ class Controller extends BaseController
 
     private function getDataFromFileAndConvert($file, $path, $class, $maxItems = 0)
     {
-        $data = json_decode(Storage::disk('local')->get($file));
+        $data = json_decode(Storage::get($file));
         foreach ($path as $subobject) {
-            $data = $data->$subobject;
-	}
+            $data = $data->$subobject ?? [];
+        }
         $items = [];
         foreach ($data as $item_data) {
             $items[] = new $class($item_data);
             if ($maxItems && count($items) == $maxItems) {
                 break;
             }
-	}
+        }
 
         return $items;
     }
@@ -47,7 +47,7 @@ class Controller extends BaseController
             $view->with('data', $this->getDataFromFileAndConvert('populair_nieuws.json', ['news'], '\Model\NewsItem'));
         });
         View::composer('widgets.nustraks', function ($view) {
-            $data = json_decode(Storage::disk('local')->get('nu_straks.json'))->schedule;
+            $data = json_decode(Storage::get('nu_straks.json'))->schedule;
             $programs = [];
             foreach ($data as $item_data) {
                 $programs[] = $program = new \Model\Program($item_data->program);
@@ -57,7 +57,7 @@ class Controller extends BaseController
 
             // Need a bit of slack here, otherwise the current program may show up
             $now = new \DateTimeImmutable('2 minutes ago');
-            $data = json_decode(Storage::disk('local')->get('zojuist.json'))->schedule;
+            $data = json_decode(Storage::get('zojuist.json'))->schedule;
             $i = 0;
             foreach (array_reverse($data) as $item_data) {
                 $recent = $program = new \Model\Program($item_data->program);
@@ -72,8 +72,10 @@ class Controller extends BaseController
             $view->with('data', $programs);
         });
         View::composer('widgets.laatstepodcasts', function ($view) {
-            $view->with('data',
-                $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast'));
+            $view->with(
+                'data',
+                $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast')
+            );
         });
         View::composer('widgets.regioagenda', function ($view) {
             $view->with('data', $this->getDataFromFileAndConvert('regioagenda.json', [], '\Model\CalendarEvent'));
@@ -84,11 +86,16 @@ class Controller extends BaseController
         View::composer('widgets.menu', function ($view) {
             $view->with('news', $this->getDataFromFileAndConvert('laatste_nieuws.json', ['news'], '\Model\NewsItem'))
                 ->with('popular', $this->getDataFromFileAndConvert('populair_nieuws.json', ['news'], '\Model\NewsItem', 3))
-                ->with('podcasts',
-                    $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast'));
+                ->with(
+                    'podcasts',
+                    $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast')
+                );
+        });
+        View::composer('widgets.menu', function($view) { 
+	    $view->with('items', json_decode(Storage::get('static/menu.json')));
         });
 
-        View::share('disableBanners', env('DISABLE_BANNERS', true));
+        View::share('disableBanners', env('DISABLE_BANNERS', false));
     }
 
     protected function registerView(Request $request, $type, $id)
@@ -97,14 +104,16 @@ class Controller extends BaseController
             return;
         }
 
-        app('db')->insert('INSERT INTO `pagestats`(`type`, `item_id`, `visitor_ip`, `session`, `referer`) VALUES(:type, :id, :ip, :session, :referer)',
+        app('db')->insert(
+            'INSERT INTO `pagestats`(`type`, `item_id`, `visitor_ip`, `session`, `referer`) VALUES(:type, :id, :ip, :session, :referer)',
             [
                 'type' => $type,
                 'id' => $id,
                 'ip' => $request->server('REMOTE_ADDR'),
                 'session' => md5(Session::getId()),
                 'referer' => $request->server('HTTP_REFERRER')
-            ]);
+            ]
+        );
     }
 
     protected function API($url)
@@ -113,15 +122,16 @@ class Controller extends BaseController
             'ssl' => [
                 "verify_peer" => false,
                 "verify_peer_name" => false,
-	    ],
-	    'http' => [
-		'method' => 'GET',
+            ],
+            'http' => [
+                'method' => 'GET',
                 'header' => 'X-Api-Key: ' . sha1(request()->server('REMOTE_ADDR')) . "\r\n"
-                         . 'X-User-Agent: ' . request()->server('HTTP_USER_AGENT') . "\r\n"
-	    ]
+                    . 'X-User-Agent: ' . request()->server('HTTP_USER_AGENT') . "\r\n"
+            ]
         ];
-
-        return json_decode(file_get_contents($this->API_URL . $url, false, stream_context_create($arrContextOptions)));
+        //\dump($http_response_header);
+        $result = @file_get_contents($this->API_URL . $url, false, stream_context_create($arrContextOptions));
+        return $result ? json_decode($result) : null;
     }
 
     protected function checkAPI($url)
@@ -142,6 +152,7 @@ class Controller extends BaseController
         return is_object($obj) ? new \DateTime($obj->date, new \DateTimeZone($obj->timezone)) : \Carbon\Carbon::parse($obj)->setTimezone(date_default_timezone_get());
     }
 
+    /*
     public function __call($method, $arguments)
     {
         if (substr($method, 0, 5) == 'view_') {
@@ -151,13 +162,14 @@ class Controller extends BaseController
             }
         }
 
-        return abort(404);
+         return abort(404);
     }
+     */
 
     public function getSidebareData()
     {
         $populair = [];
-	$apiResult = $this->API('nieuws/populair?aantal=5');
+        $apiResult = $this->API('nieuws/populair?aantal=5');
         foreach ($apiResult->news as $_newsItem) {
             $populair[] = new \Model\NewsItem($_newsItem);
         }
@@ -170,4 +182,23 @@ class Controller extends BaseController
 
         return ['newsItems' => $newsItems, 'populair' => $populair];
     }
+
+    public function static_page($slug)
+    {
+	    if (view()->exists($slug)) {
+          return view($slug);
+	}
+
+        $page = $this->API('statisch/' . $slug);
+        if ($page == null) {
+            return abort(404);
+        }
+
+        $page->published = Controller::JsonToDateTime($page->published);
+        if ($page->edited) {
+            $page->edited = Controller::JsonToDateTime($page->edited);
+        }
+        
+        return view('static', compact('page'));
+    }
 }

app/Http/Controllers/NewsController.php

@@ -17,27 +17,30 @@ class NewsController extends Controller
     public function show(Request $request, $id)
     {
         parent::registerView($request, 'nieuws', $id);
-        $apiResult = $this->API('nieuws/bericht/' . $id);
+        $preview = "";
+        if(request()->get('preview', null) != null) {
+            $preview = "?preview=" . request()->get('preview');
+        }
+        $apiResult = $this->API('nieuws/bericht/' . $id . $preview);
         $newsItem = new \Model\NewsItem($apiResult->news);
 
         switch ($apiResult->version) {
             case 1:
-                if (!$newsItem->content) return redirect('//nhnieuws.nl/gooi');
-                return view('newsitem', ['news' => $newsItem, 'metadata' => $newsItem->metadata]);
-                break;
+	        if (!$newsItem->content) return redirect('//nhnieuws.nl/gooi');
 
-            case 2:
+	    case 2:
+		    if(isset($apiResult->source->article)) {
                 $source = $apiResult->source->article;
                 $newsItem->published = self::TimestampToDateTime($source->created);
                 $newsItem->edited = self::TimestampToDateTime($source->updated);
                 $newsItem->author = $source->author;
                 $newsItem->images = null; // Images will be embedded
                 $newsItem->video = null; // Videos will be embedded
-                $newsItem->content = $source->blocks;
-
-
-
-                return view('newsitem', array_merge($this->getSidebareData(), ['news' => $newsItem, 'metadata' => $newsItem->metadata, 'searchURL' => 'nieuws/zoeken']));
+		        $newsItem->content = $source->blocks;
+		    } elseif(isset($apiResult->source->blocks)) {
+			    $newsItem->content = $apiResult->source->blocks;
+		    }
+            return view('newsitem', array_merge($this->getSidebareData(), ['type' => $apiResult->type, 'news' => $newsItem, 'metadata' => $newsItem->metadata, 'searchURL' => 'nieuws/zoeken']));
         }
     }
 
@@ -138,9 +141,12 @@ class NewsController extends Controller
             $total = 5;
         }
         $page = (int)$request->get('pagina', 1);
+        if ($url == 'overzicht' && $request->get('dateStart', null) && $request->get('dateEnd', null)) {
+            $url = 'datum/' . $request->get('dateStart', null) . '/' . $request->get('dateEnd', null);
+        }
         $apiResult = $this->API('nieuws/' . $url . '?pagina=' . (int)max(1, $page) . ($total ? '&aantal=' . $total : ''));
         $news = [];
-        foreach ($apiResult->news as $newsItem) {
+        foreach ($apiResult->news ?? [] as $newsItem) {
             $news[] = new \Model\NewsItem($newsItem);
         }
 
@@ -186,11 +192,15 @@ class NewsController extends Controller
 
     public function regionieuws()
     {
+	$data = $this->API('nieuws/regionieuws.json');
         return view('listen', [
-            'source' => $this->API_URL . 'nieuws/regionieuws',
+            'source' => $this->API_URL . 'nieuws/regionieuws.mp3',
             'title' => 'Regionieuws',
             'content' => 'het laatste nieuws uit de regio',
             'isStream' => false,
-            'canDownload' => true]);
+	    'canDownload' => true,
+	    'lengte' => $data->length * 0.25,
+	    'waveform' => $data
+	]);
     }
 }

app/Http/Controllers/RadioController.php

@@ -49,7 +49,10 @@ class RadioController extends Controller
 
     public function program($id)
     {
-        $apiResult = $this->API('programma/details/' . (int)$id);
+	$apiResult = $this->API('programma/details/' . (int)$id);
+	if($apiResult == null) {
+		return abort(404);
+	}
         return view('radioprogram', ['program' => new \Model\Program($apiResult)]);
     }
 
@@ -95,7 +98,7 @@ class RadioController extends Controller
 	{
 		$programs = [];
 		$now = new \DateTimeImmutable('2 minutes ago');
-        $page = (int)$request->get('pagina', 1);
+        	$page = (int)$request->get('pagina', 1);
 		$apiResult = $this->API('programma/schema/recent?pagina=' . (int)max(1, $page) . '&aantal=12');
 		foreach($apiResult->schedule as $item) {
 			if(!$item->program->nonstop && !$item->program->rerun) {

app/Http/Controllers/StreamController.php

@@ -14,6 +14,8 @@ class StreamController extends Controller
         return view('listen', [
             'source' => self::$STREAM_URL . 'mp3live',
             'title' => 'Luister live',
+            'lengte' => 0,
+            'waveform' => null,
             'content' => 'de live-uitzending van NH Gooi.',
             'isStream' => true ]);
     }
@@ -53,13 +55,20 @@ class StreamController extends Controller
             'source' => $this->API_URL . 'podcast/stream/' . $apiResult->url,
             'title' => $podcast->title,
             'content' => $podcast->title,
+            'lengte' => $podcast->duration / 1000,
+            'waveform' => $podcast->waveform,
             'isStream' => false,
             'canDownload' => $this->API_URL . 'podcast/download/' . $apiResult->url ]);
     }
 
     public function program(Request $request, $year, $month, $day, $hour, $duration, $offset = 0) {
         $date = (new \DateTimeImmutable())->setDate($year, $month, $day)->setTime($hour, 0, 0);
-        $current = $date->add(\DateInterval::createFromDateString($offset . ' hours'));
+        $current = $date->add(\DateInterval::createFromDateString($offset . ' hours'));                
+
+        $programma = $this->API("programma/details/" . $current->Format("Y/m/d/H"));
+        if(!$programma->is_beschikbaar) {
+            return view('listen', ['notAvailable' => true]);
+        }
 
         $hours = [];
         for($i = 0; $i < $duration; $i++) {
@@ -72,7 +81,9 @@ class StreamController extends Controller
             'source' => $this->API_URL . 'programma/stream/' . $current->format('Y/m/d/H'),
             'tabs' => $hours,
             'title' => 'Uitzending terugluisteren',
-            'content' => 'de uitzending van ' . $current->format('d-m-Y, H') . ':00 uur',
+            'lengte' => $programma->waveform->length,
+            'waveform' => $programma->waveform,
+            'content' => $programma->programma->name . ' van ' . $current->format('d-m-Y, H') . ':00 uur',
             'isStream' => false,
             'canDownload' => false ]);
     }

config/filesystems.php

@@ -48,12 +48,12 @@ return [
             'root' => storage_path('app'),
         ],
 
-        'public' => [
-            'driver' => 'local',
-            'root' => storage_path('app/public'),
-            'url' => env('APP_URL').'/storage',
-            'visibility' => 'public',
-        ],
+        //'public' => [
+        //    'driver' => 'local',
+        //    'root' => storage_path('app/public'),
+        //    'url' => env('APP_URL').'/storage',
+        //    'visibility' => 'public',
+        //],
 
         's3' => [
             'driver' => 's3',