From 9baa4a8556b591aead2922913f8f5321cf1b7ebf Mon Sep 17 00:00:00 2001 From: Mischa Spelt Date: Sat, 15 Feb 2020 15:25:04 +0100 Subject: [PATCH] Aanpassingen layout na feedback --- website/app/Console/Kernel.php | 5 ++- website/app/Http/Controllers/Controller.php | 12 ++++++ website/resources/views/contact.blade.php | 17 ++++++-- website/resources/views/frequenties.blade.php | 24 ++++++++++++ website/resources/views/home.blade.php | 10 ++--- .../resources/views/layouts/master.blade.php | 39 ++++++++----------- .../resources/views/layouts/sidebar.blade.php | 12 ------ website/resources/views/newsitem.blade.php | 4 +- .../views/widgets/laatstepodcasts.blade.php | 19 ++------- .../resources/views/widgets/menu.blade.php | 3 +- .../views/widgets/nustraks.blade.php | 13 +++++++ .../views/widgets/regioagenda.blade.php | 20 ++-------- website/routes/web.php | 1 + 13 files changed, 96 insertions(+), 83 deletions(-) create mode 100644 website/resources/views/frequenties.blade.php diff --git a/website/app/Console/Kernel.php b/website/app/Console/Kernel.php index 3fbab2c0..24e9dfc7 100644 --- a/website/app/Console/Kernel.php +++ b/website/app/Console/Kernel.php @@ -38,11 +38,12 @@ class Kernel extends ConsoleKernel // Update now / later $schedule->call(function() { Storage::disk('local')->put('nu_straks.json', file_get_contents($this->API_URL . 'programma/schema/nustraks')); + Storage::disk('local')->put('zojuist.json', file_get_contents($this->API_URL . 'programma/schema/recent')); })->everyMinute(); - // Update latest podcasts (3 items) + // Update latest podcasts (6 items) $schedule->call(function() { - Storage::disk('local')->put('laatste_podcasts.json', file_get_contents($this->API_URL . 'podcast/overzicht?pagina=1&aantal=3')); + Storage::disk('local')->put('laatste_podcasts.json', file_get_contents($this->API_URL . 'podcast/overzicht?pagina=1&aantal=6')); })->everyMinute(); // Update calendar items diff --git a/website/app/Http/Controllers/Controller.php b/website/app/Http/Controllers/Controller.php index 34fe9d0b..ff3350ce 100644 --- a/website/app/Http/Controllers/Controller.php +++ b/website/app/Http/Controllers/Controller.php @@ -52,6 +52,18 @@ class Controller extends BaseController $program->end = new \DateTimeImmutable($item_data->end->date, new \DateTimeZone($item_data->end->timezone)); } + $now = new \DateTimeImmutable(); + $data = json_decode(Storage::disk('local')->get('zojuist.json'))->schedule; + foreach(array_reverse($data) as $item_data) + { + $recent = $program = new \Model\Program($item_data->program); + $recent->start = new \DateTimeImmutable($item_data->start->date, new \DateTimeZone($item_data->start->timezone)); + $recent->end = new \DateTimeImmutable($item_data->end->date, new \DateTimeZone($item_data->end->timezone)); + if(($recent->end < $now) && (!$recent->nonstop) && (!$recent->rerun)) { + $view->with('recent', $recent); + break; + } + } $view->with('data', $programs); }); diff --git a/website/resources/views/contact.blade.php b/website/resources/views/contact.blade.php index 0c9c421f..d6b51365 100644 --- a/website/resources/views/contact.blade.php +++ b/website/resources/views/contact.blade.php @@ -5,15 +5,24 @@ @endsection @section('content') -

Contact

-Neem contact op met NH Gooi. De streekomroep voor Hilversum, Huizen, Blaricum, Eemnes en Laren. NH Gooi hoor je in heel Gooi en Eemland op 92.0 FM, 105.1 FM en 106.2 FM.

+

Contact

+

Neem contact op met NH Gooi. De streekomroep voor Hilversum, Huizen, Blaricum, Eemnes en Laren.

-Het postadres van NH Gooi is:
+

+Wij zijn te ontvangen in heel Gooi en Eemland.
+ + +Frequenties + +

+ +

+Het postadres van NH Gooi is:
Postbus 83
1270 AB Huizen

-Bezoekadres / Studio:
+Bezoekadres / Studio:
IJsselmeerstraat 3B
1271 AA Huizen

diff --git a/website/resources/views/frequenties.blade.php b/website/resources/views/frequenties.blade.php new file mode 100644 index 00000000..be4ed7fb --- /dev/null +++ b/website/resources/views/frequenties.blade.php @@ -0,0 +1,24 @@ +@extends('layouts.sidebar') + +@section('title') + Frequenties +@endsection + +@section('content') + +

NH Gooi Radio

+

NH Gooi Radio hoor je in heel Gooi en Eemland op FM:

+ + + +

NH Gooi TV

+

NH Gooi TV zie je op de kabel:

+ + +@endsection diff --git a/website/resources/views/home.blade.php b/website/resources/views/home.blade.php index e3d598cd..4ed7c56c 100644 --- a/website/resources/views/home.blade.php +++ b/website/resources/views/home.blade.php @@ -171,13 +171,9 @@ @include('widgets.nustraks') -

  Fragment gemist

- @include('widgets.laatstepodcasts') - Meer Fragment Gemist - -

  Regioagenda

- @include('widgets.regioagenda') - Regio-agenda +

  Iets gemist?

+

Fragment gemist + Programma terugluisteren

@if(!$title)

  Recente berichten

diff --git a/website/resources/views/layouts/master.blade.php b/website/resources/views/layouts/master.blade.php index 27b69049..7a75db13 100644 --- a/website/resources/views/layouts/master.blade.php +++ b/website/resources/views/layouts/master.blade.php @@ -273,28 +273,12 @@

NH Gooi

- NH Gooi is de streekomroep voor het Gooi in samenwerking met NH Media. - NH Gooi hoor je in heel Gooi en Eemland op 92.0 FM, 105.1 FM en 106.2 FM. + NH Gooi is de streekomroep voor het Gooi in samenwerking met NH Media. + NH Gooi Radio hoor je in heel Gooi en Eemland op 92.0 FM, 105.1 FM en 106.2 FM. + NH Gooi TV kijk je op KPN kanaal 1379 of Ziggo kanaal 40. Meer frequenties?

-
Redactie
-

- Neuweg 12
- 1211 LW Hilversum
- 035 642 4774 -

-
-
-
Postadres
-

- Postbus 83
- 1270 AB Huizen
-

-
-
-
-
Bezoekadres / Studio

IJsselmeerstraat 3B
@@ -305,6 +289,13 @@ KvK: 41194132

+
+
Postadres
+

+ Postbus 83
+ 1270 AB Huizen
+

+
{{--

Get In Touch With Us

@@ -433,7 +424,8 @@ artist: $(".now-playing-header .artist"), controls: $(".now-playing-header .controls"), programLink: $(".now-playing-header .program-link a"), - programLabel: $(".now-playing-header .program-link a > label") + programLabel: $(".now-playing-header .program-link a > label"), + first: true }; $(document).on('onAirUpdated', function(evt, data) { if(data.inProgram) { @@ -445,9 +437,12 @@ $nowPlaying.artist.text(data.current.artist).attr('title', data.current.artist); } $nowPlaying.programLink.attr('href', '{{route("programma")}}' + data.program.url); - $nowPlaying.controls.hide(); + if($nowPlaying.first) { $nowPlaying.controls.hide(); } $nowPlaying.container.slideDown(function() { - $nowPlaying.controls.fadeIn('slow'); + if($nowPlaying.first) { + $nowPlaying.controls.fadeIn('slow'); + $nowPlaying.first = false; + } }); // Now playing may have moved the menu diff --git a/website/resources/views/layouts/sidebar.blade.php b/website/resources/views/layouts/sidebar.blade.php index ad9142ba..10ab2541 100644 --- a/website/resources/views/layouts/sidebar.blade.php +++ b/website/resources/views/layouts/sidebar.blade.php @@ -20,18 +20,6 @@ @include('widgets.banners') @include('widgets.nustraks') - -

  Fragment gemist

- @include('widgets.laatstepodcasts') - Meer Fragment Gemist - -

  Meest gelezen

- @include('widgets.populairnieuws') - Laatste nieuws - -

  Regioagenda

- @include('widgets.regioagenda') - Regio-agenda
diff --git a/website/resources/views/newsitem.blade.php b/website/resources/views/newsitem.blade.php index 5985aa61..7a235d99 100644 --- a/website/resources/views/newsitem.blade.php +++ b/website/resources/views/newsitem.blade.php @@ -28,9 +28,9 @@
  • {{Formatter::relativeDate($news->published)}} om {{$news->published->format('H:i')}} @if($news->edited && ($news->edited->format('d m H i') != $news->published->format('d m H i'))) - | bijgewerkt om + | bijgewerkt: @if($news->edited->format('d m') != $news->published->format('d m')) - op {{Formatter::relativeDate($news->edited)}} + {{strtolower(Formatter::relativeDate($news->edited))}} @endif om {{$news->edited->format('H:i')}} uur @endif diff --git a/website/resources/views/widgets/laatstepodcasts.blade.php b/website/resources/views/widgets/laatstepodcasts.blade.php index eae543d4..c75cf583 100644 --- a/website/resources/views/widgets/laatstepodcasts.blade.php +++ b/website/resources/views/widgets/laatstepodcasts.blade.php @@ -1,22 +1,9 @@ - + +@if(isset($recent)) +
    Net gemist?
    +

    {{$recent->name}}

    +{{Formatter::relativeDate($recent->start)}} om {{$recent->start->format('H:i')}}. +

    +@php($duration = $recent->end->diff($recent->start)->h) + + + Terugluisteren + +

    +@endif diff --git a/website/resources/views/widgets/regioagenda.blade.php b/website/resources/views/widgets/regioagenda.blade.php index 38183054..3e28eae2 100644 --- a/website/resources/views/widgets/regioagenda.blade.php +++ b/website/resources/views/widgets/regioagenda.blade.php @@ -1,24 +1,10 @@ -
    -
      +
        @foreach($data as $item) @if($loop->index >= 5) @break @endif -
      • - - {{$item->title}} - -
        +
      • - {{$item->title}} + {{$item->title}}
        -
          -
        • {{$item->region}}
          • -
        • - {{Formatter::relativeDate($item->starts)}} -
          • -
        -
    • @endforeach - - diff --git a/website/routes/web.php b/website/routes/web.php index b25fe885..270178af 100644 --- a/website/routes/web.php +++ b/website/routes/web.php @@ -63,6 +63,7 @@ Route::get('/kerkdienst', 'KerkdienstController@main')->name('kerkdienst'); Route::get('/kerkdienst/luister', 'StreamController@kerkdienst')->name('luister.kerkdienst'); Route::get('/contact', 'Controller@view_contact')->name('contact'); +Route::get('/frequenties', 'Controller@view_frequenties')->name('frequenties'); Route::get('/adverteren', 'Controller@view_adverteren')->name('adverteren'); //Route::get('/special/stmaarten', function() { return file_get_contents('http://api-dev.6fm.nl/special/stmaarten'); });