From a23521a75d42637681c8c16b2c38a757c19e2f7f Mon Sep 17 00:00:00 2001 From: Mischa Spelt Date: Tue, 28 Jan 2020 01:30:57 +0100 Subject: [PATCH] Paar kleine fixes --- website/.env | 11 +++++- website/app/Http/Controllers/Controller.php | 7 ++-- website/public/css/nhgooi.css | 2 +- .../resources/views/calendarevent.blade.php | 1 - .../resources/views/calendarlist.blade.php | 1 - website/resources/views/newsitem.blade.php | 1 - website/resources/views/newslist.blade.php | 7 ++-- .../views/partial/newslist_small.blade.php | 1 - website/resources/views/podcastitem.blade.php | 34 ++++++++++++++----- .../views/widgets/laatstepodcasts.blade.php | 2 ++ .../resources/views/widgets/menu.blade.php | 1 - .../views/widgets/populairnieuws.blade.php | 1 - 12 files changed, 47 insertions(+), 22 deletions(-) diff --git a/website/.env b/website/.env index 75ef9ae7..dfb2cf0e 100644 --- a/website/.env +++ b/website/.env @@ -1,9 +1,10 @@ APP_NAME="NH Gooi" APP_ENV=development APP_KEY=I@#323ddu3dN(@#d(NU@#U2ij2dd4RJE -APP_DEBUG=true +APP_DEBUG=false APP_LOG_LEVEL=error APP_URL=http://localhost +IMAGE_BASE_URL=https://nhgooi.nl/ API_URL=http://api-dev.6fm.nl/ @@ -26,3 +27,11 @@ MAIL_ENCRYPTION=null PUSHER_APP_ID= PUSHER_APP_KEY= PUSHER_APP_SECRET= + +DB_CONNECTION=mysql +DB_HOST=www.6fm.nl +DB_PORT=3306 +DB_DATABASE=radio6fm_web +DB_USERNAME=6fmstats +DB_PASSWORD=C6h938EJ2cd5p4cT + diff --git a/website/app/Http/Controllers/Controller.php b/website/app/Http/Controllers/Controller.php index 97d8af6b..29942e39 100644 --- a/website/app/Http/Controllers/Controller.php +++ b/website/app/Http/Controllers/Controller.php @@ -15,7 +15,7 @@ class Controller extends BaseController { use AuthorizesRequests, DispatchesJobs, ValidatesRequests; - protected $API_URL; + protected $API_URL; private function getDataFromFileAndConvert($file, $path, $class, $maxItems = 0) { @@ -34,6 +34,7 @@ class Controller extends BaseController public function __construct() { View::share('apiUrl', $this->API_URL = env('API_URL', 'http://api.6fm.nl/')); + View::share('imgBase', env('IMAGE_BASE_URL', '/')); //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')); @@ -66,9 +67,9 @@ class Controller extends BaseController protected function registerView(Request $request, $type, $id) { - if(config('app.debug')) { + if(config('app.debug')) { return; - } + } app('db')->insert('INSERT INTO `pagestats`(`type`, `item_id`, `visitor_ip`, `session`, `referer`) VALUES(:type, :id, :ip, :session, :referer)', [ 'type' => $type, diff --git a/website/public/css/nhgooi.css b/website/public/css/nhgooi.css index 1f5b9504..9f5c1a8f 100644 --- a/website/public/css/nhgooi.css +++ b/website/public/css/nhgooi.css @@ -9,7 +9,7 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a } -@media screen and (max-width:1069px) { +@media screen and (max-width:767px) { .row .column { width: 100%; } diff --git a/website/resources/views/calendarevent.blade.php b/website/resources/views/calendarevent.blade.php index 271419f0..bc498374 100644 --- a/website/resources/views/calendarevent.blade.php +++ b/website/resources/views/calendarevent.blade.php @@ -13,7 +13,6 @@ @endsection @section('content') -@php($imgBase = 'https://nhgooi.nl')
diff --git a/website/resources/views/calendarlist.blade.php b/website/resources/views/calendarlist.blade.php index b07b127a..aaec1390 100644 --- a/website/resources/views/calendarlist.blade.php +++ b/website/resources/views/calendarlist.blade.php @@ -26,7 +26,6 @@

Komende week

    - @php($imgBase = 'https://nhgooi.nl') @php($nextWeek = new \DateTimeImmutable('midnight +7 days')) @php($heading = null) @php($month = 0) diff --git a/website/resources/views/newsitem.blade.php b/website/resources/views/newsitem.blade.php index 3f236be5..2b6bb09b 100644 --- a/website/resources/views/newsitem.blade.php +++ b/website/resources/views/newsitem.blade.php @@ -15,7 +15,6 @@ @endsection @section('content') -@php($imgBase = 'https://nhgooi.nl')
    diff --git a/website/resources/views/newslist.blade.php b/website/resources/views/newslist.blade.php index 33e44997..e03ef70f 100644 --- a/website/resources/views/newslist.blade.php +++ b/website/resources/views/newslist.blade.php @@ -16,9 +16,8 @@ @endsection @section('content') - @php($imgBase = 'https://nhgooi.nl') -@yield('breadcrumb') + @yield('breadcrumb')
    @@ -96,7 +95,9 @@ {{$item->region->title}}
-

{{$item->title}}

+

{{Formatter::excerpt($item->title, 50)}}

+
{{$item->title}}
+
@endforeach diff --git a/website/resources/views/partial/newslist_small.blade.php b/website/resources/views/partial/newslist_small.blade.php index 55374486..a2071e76 100644 --- a/website/resources/views/partial/newslist_small.blade.php +++ b/website/resources/views/partial/newslist_small.blade.php @@ -1,4 +1,3 @@ -@php($imgBase = 'https://nhgooi.nl') @foreach($news as $item) @if($loop->index % 3 == 0)
diff --git a/website/resources/views/podcastitem.blade.php b/website/resources/views/podcastitem.blade.php index b507792f..0adf3add 100644 --- a/website/resources/views/podcastitem.blade.php +++ b/website/resources/views/podcastitem.blade.php @@ -79,7 +79,7 @@ $(".vertical_carousel").each(function() {
-
+

Fragment gemist

    @if($podcast->program) @@ -88,15 +88,30 @@ $(".vertical_carousel").each(function() {
  • {{ Formatter::relativeDate($podcast->created) }}
-
+
+ +
+ +
+ + @if($podcast->image) +
+ + + +
+ {{$podcast->image->title}} +
+
+ @endif +

{!!$podcast->content!!}

- -

- -

+
+ +
+ + @if(count($related) > 1)

Meer uit deze uitzending

@@ -184,6 +201,7 @@ $(".vertical_carousel").each(function() { Meer {{$podcast->program->name}} @endif +

Meer fragmenten