NH_Gooi/nhgooi.nl
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Pull new-api into release/dev #5

Merged
mischa.spelt merged 26 commits from new-api into release/dev 2024-09-12 15:04:12 +02:00
Conversation 0 Commits 26 Files Changed 37 +12 -12
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5ebf7f20be - Show all commits

10
app/Http/Controllers/StreamController.php
View File

@@ -50,11 +50,11 @@ class StreamController extends Controller
} }
return view('listen', [ return view('listen', [
'source' => $this->API_URL . 'podcast/download/' . $apiResult->url, 'source' => $this->API_URL . 'podcast/stream/' . $apiResult->url,
'title' => $podcast->title, 'title' => $podcast->title,
'content' => $podcast->title, 'content' => $podcast->title,
'isStream' => false, 'isStream' => false,
'canDownload' => true ]); 'canDownload' => $this->API_URL . 'podcast/download/' . $apiResult->url ]);
} }
public function program(Request $request, $year, $month, $day, $hour, $duration, $offset = 0) { public function program(Request $request, $year, $month, $day, $hour, $duration, $offset = 0) {
@@ -69,7 +69,7 @@ class StreamController extends Controller
} }
return view('listen', [ return view('listen', [
'source' => $this->API_URL . 'programma/download/' . $current->format('Y/m/d/H') . '/1', 'source' => $this->API_URL . 'programma/stream/' . $current->format('Y/m/d/H') . '/1',
'tabs' => $hours, 'tabs' => $hours,
'title' => 'Uitzending terugluisteren', 'title' => 'Uitzending terugluisteren',
'content' => 'de uitzending van ' . $current->format('d-m-Y, H') . ':00 uur', 'content' => 'de uitzending van ' . $current->format('d-m-Y, H') . ':00 uur',
@@ -88,10 +88,10 @@ class StreamController extends Controller
public function kerkdienst(Request $request) { public function kerkdienst(Request $request) {
return view('listen', [ return view('listen', [
'source' => $this->API_URL . 'kerkdienst/download', 'source' => $this->API_URL . 'kerkdienst/stream',
'title' => 'Kerkdienst gemist', 'title' => 'Kerkdienst gemist',
'content' => 'de kerkdienst van afgelopen zondag', 'content' => 'de kerkdienst van afgelopen zondag',
'isStream' => false, 'isStream' => false,
'canDownload' => true ]); 'canDownload' => $this->API_URL . 'kerkdienst/download' ]);
} }
} }

2
resources/views/calendarevent.blade.php
View File

@@ -41,7 +41,7 @@
<div class="announcement"> <div class="announcement">
<div> <div>
<audio controls> <audio controls>
<source src="{{ $url = url( $apiUrl . 'podcast/download/' . $event->podcast->url . "?auth=" . $event->podcast->auth )}}" type="audio/mpeg" /> <source src="{{ $url = url( $apiUrl . 'podcast/stream/' . $event->podcast->url . "?auth=" . $event->podcast->auth )}}" type="audio/mpeg" />
</audio> </audio>
</div> </div>
<ul class="post_details clearfix"> <ul class="post_details clearfix">

2
resources/views/kerkdienst.blade.php
View File

@@ -18,7 +18,7 @@
</p> </p>
<p> <p>
<audio controls> <audio controls>
<source src="{{ url( $apiUrl . 'kerkdienst/download' ) }}" type="audio/mpeg" /> <source src="{{ url( $apiUrl . 'kerkdienst/stream' ) }}" type="audio/mpeg" />
</audio> </audio>
</p> </p>
<p> <p>

5
resources/views/listen.blade.php
View File

@@ -42,8 +42,8 @@
</p> </p>
<p> <p>
@if(!$isStream && $canDownload) @if(!$isStream && $canDownload !== false)
<a href="{{$source}}" class="action_button"> <a href="{{$canDownload}}" class="action_button">
<span class="fa fa-download"></span><span>Download .mp3-bestand</span> <span class="fa fa-download"></span><span>Download .mp3-bestand</span>
</a> </a>
@endif @endif
@@ -52,7 +52,6 @@
<span class="fa fa-music"></span><span>Schakel naar live-uitzending</span> <span class="fa fa-music"></span><span>Schakel naar live-uitzending</span>
</a> </a>
@endif @endif
</p>
@endif @endif
</div> </div>
@endsection @endsection

2
resources/views/partial/blogitems.blade.php
View File

@@ -78,7 +78,7 @@
<div class="announcement"> <div class="announcement">
<div> <div>
<audio controls> <audio controls>
<source src="{{ $url = url( $apiUrl . "podcast/download" . $item->podcast->url . "?auth=" . $item->podcast->auth )}}" type="audio/mpeg" /> <source src="{{ $url = url( $apiUrl . "podcast/stream" . $item->podcast->url . "?auth=" . $item->podcast->auth )}}" type="audio/mpeg" />
</audio> </audio>
</div> </div>
</div> </div>

3
resources/views/podcastitem.blade.php
View File

@@ -90,6 +90,7 @@
@if ($podcast) @if ($podcast)
<?php <?php
$audioUrl = url($apiUrl . 'podcast/download' . $podcast->url . "?auth=" . $podcast->auth); $audioUrl = url($apiUrl . 'podcast/download' . $podcast->url . "?auth=" . $podcast->auth);
$streamUrl = url($apiUrl . 'podcast/stream' . $podcast->url . "?auth=" . $podcast->auth);
$popoutUrl = route('luister.podcast') . $podcast->url . '?auth=' . $podcast->auth; $popoutUrl = route('luister.podcast') . $podcast->url . '?auth=' . $podcast->auth;
?> ?>
@@ -112,7 +113,7 @@
<div class="announcement"> <div class="announcement">
<audio controls> <audio controls>
<source src="{{$audioUrl}}" type="audio/mpeg"/> <source src="{{$streamUrl}}" type="audio/mpeg"/>
</audio> </audio>
<div class="clearfix"> <div class="clearfix">
<a class="action_button btn" href="{{$audioUrl}}" title="Download dit fragment als MP3"> <a class="action_button btn" href="{{$audioUrl}}" title="Download dit fragment als MP3">