From 738107515c28d04245118b63bf4ea2a1b08ab18e Mon Sep 17 00:00:00 2001
From: NH Gooi <techniek@nhgooi.nl>
Date: Sat, 15 Jun 2024 22:45:53 +0200
Subject: [PATCH] Wijzigingen voor nieuwe API

---
 app/Http/Controllers/NewsController.php |  9 ++++--
 public/css/style.css                    |  2 ++
 resources/views/home.blade.php          | 38 ++++++++++++-------------
 resources/views/newsitem.blade.php      | 34 ++++------------------
 resources/views/newslist.blade.php      | 15 ++++------
 routes/web.php                          |  1 +
 6 files changed, 39 insertions(+), 60 deletions(-)

diff --git a/app/Http/Controllers/NewsController.php b/app/Http/Controllers/NewsController.php
index f5678748..6e827c06 100644
--- a/app/Http/Controllers/NewsController.php
+++ b/app/Http/Controllers/NewsController.php
@@ -72,14 +72,19 @@ class NewsController extends Controller
         return view('partial/newslist_small', ['id' => $id, 'news' => $populair]);
     }
 
+    public function taglist(Request $request, $tag)
+    {
+        return $this->listNews($request, 'tag/' . $tag, ucfirst($tag));
+    }
+
     public function regionlist(Request $request, $region)
     {
-        return $this->listNews($request, 'regio/' . $region, ucfirst($region));
+        return $this->listNews($request, 'tag/' . $region, ucfirst($region));
     }
 
     public function themelist(Request $request, $theme)
     {
-        return $this->listNews($request, 'thema/' . $theme, ucfirst($theme));
+        return $this->listNews($request, 'tag/' . $theme, ucfirst($theme));
     }
 
     public function search(Request $request, $query)
diff --git a/public/css/style.css b/public/css/style.css
index 334eac24..73c9b2a1 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -725,6 +725,8 @@ div.pp_default .pp_close:hover {
   margin: 0;
   padding: 0;
   list-style: none;
+  display: flex;
+  gap: 3px;
 }
 .blog_grid .post .slider_content_box .post_details .category a {
   padding: 6px 11px 7px;
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index f2e19ffe..ab06f92f 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -24,13 +24,13 @@
                                 </a>
                                 <div class="slider_content_box">
                                     <ul class="post_details simple">
-                                        @if($item->region)
+                                        @foreach($item->tags as $tag)
                                             <li class="category">
-                                                <a title="Regio: {{$item->region->title}}"
-                                                   href="{{route('nieuws.regio', ['region' => $item->region->slug])}}"
-                                                   class="over_image">{{$item->region->title}}</a>
+                                                <a title="{{$tag->titel}}"
+                                                   href="{{route('nieuws.tag', ['tag' => $tag->slug])}}"
+                                                   class="over_image">{{$tag->titel}}</a>
                                             </li>
-                                        @endif
+                                        @endforeach
                                     </ul>
                                     <h2><a href="{{url($item->url)}}"
                                            title="{{$item->title}}">{!!$item->title!!}</a></h2>
@@ -61,13 +61,13 @@
                                     </a>
                                     <div class="slider_content_box">
                                         <ul class="post_details simple">
-                                            @if($item->region)
-                                                <li class="category">
-                                                    <a title="Regio: {{$item->region->title}}"
-                                                       href="{{route('nieuws.regio', ['region' => $item->region->slug])}}"
-                                                       class="over_image">{{$item->region->title}}</a>
-                                                </li>
-                                            @endif
+                                        @foreach($item->tags as $tag)
+                                            <li class="category">
+                                                <a title="{{$tag->titel}}"
+                                                   href="{{route('nieuws.tag', ['tag' => $tag->slug])}}"
+                                                   class="over_image">{{$tag->titel}}</a>
+                                            </li>
+                                        @endforeach
                                         </ul>
                                         <h2><a href="{{url($item->url)}}"
                                                title="{{$item->title}}">{!!$item->title!!}</a></h2>
@@ -102,13 +102,13 @@
                                     </a>
                                     <div class="slider_content_box">
                                         <ul class="post_details simple">
-                                            @if($item->region)
-                                                <li class="category">
-                                                    <a title="Regio: {{$item->region->title}}"
-                                                       href="{{route('nieuws.regio', ['region' => $item->region->slug])}}"
-                                                       class="over_image">{{$item->region->title}}</a>
-                                                </li>
-                                            @endif
+                                        @foreach($item->tags as $tag)
+                                            <li class="category">
+                                                <a title="{{$tag->titel}}"
+                                                   href="{{route('nieuws.tag', ['tag' => $tag->slug])}}"
+                                                   class="over_image">{{$tag->titel}}</a>
+                                            </li>
+                                        @endforeach
                                         </ul>
                                         <h5 class="post_title"><a href="{{url($item->url)}}"
                                                title="{{$item->title}}">{!!$item->title!!}</a></h5>
diff --git a/resources/views/newsitem.blade.php b/resources/views/newsitem.blade.php
index 79aedbcf..5ec55082 100644
--- a/resources/views/newsitem.blade.php
+++ b/resources/views/newsitem.blade.php
@@ -11,16 +11,18 @@
 		<li><a title="Home" href="/">Home</a></li>
 		<li class="separator"><i class="fa-solid fa-chevron-right"></i></li>
 		<li><a title="Nieuws" href="{{route('nieuws')}}">Nieuws</a></li>
-		<li class="separator"><i class="fa-solid fa-chevron-right"></i></li>
+{{--		<li class="separator"><i class="fa-solid fa-chevron-right"></i></li>
 		<li><a title="{{$news->region->title}}" href="{{route('nieuws.regio', $news->region->slug)}}">{{$news->region->title}}</a></li>
-		<li class="separator"><i class="fa-solid fa-chevron-right"></i></li>
+--}}		<li class="separator"><i class="fa-solid fa-chevron-right"></i></li>
 		<li>{!!$news->title!!}</li>
 	</ul>
 @endsection
 
 @section('tags')
 	<ul class="post_tags">
-		<li><a href="{{route('nieuws.regio', $news->region->slug)}}" title="{{$news->region->title}}">{{$news->region->title}}</a></li>
+		@foreach($news->tags as $tag)
+		<li><a href="{{route('nieuws.tag', $tag->slug)}}" title="{{$tag->titel}}">{{$tag->titel}}</a></li>
+		@endforeach
 	</ul>
 @endsection
 
@@ -28,12 +30,6 @@
 
 	<div class="post_body">
 		<ul class="post_details clearfix">
-			@if($news->region && $news->region->title != "Regio")
-			<li class="detail category"><i class="fa-solid fa-location-dot"></i> Regio <a href="{{route('nieuws.regio', $news->region->slug)}}" title="{{$news->region->title}}">{{$news->region->title}}</a></li>
-			@endif
-			@if($news->theme && $news->theme->title != "Overig")
-			<li class="detail category"><i class="fa-solid fa-tag fa-rotate-90"></i> Thema <a href="{{route('nieuws.thema', $news->theme->slug)}}" title="{{$news->theme->title}}">{{$news->theme->title}}</a></li>
-			@endif
 			<li class="detail date">
 				<i class="fa-regular fa-clock"></i>
 				{{Formatter::relativeDate($news->published)}} om {{$news->published->format('H:i')}}
@@ -133,26 +129,6 @@
 				@include('widgets/share')
 				--}}
 
-				{{--
-					<ul class="taxonomies tags left clearfix">
-						@if($news->keywords)
-						@foreach($news->keywords as $keyword)
-						<li>
-							<a href="{{route('nieuws/onderwerp/' . $keyword)}}" title="Zoek meer nieuws met het onderwerp {{$keyword}}">{{$keyword}}</a>
-						</li>
-						@endforeach
-						@endif
-					</ul>
-				--}}
-				<ul class="post_tags clearfix">
-					<li>Tags:</li>
-					<li>
-						<a href="{{route('nieuws.thema', $news->theme->slug)}}" title="Zoek meer nieuws met het thema {{$news->theme->title}}">{{$news->theme->title}}</a>
-					</li>
-					<li>
-						<a href="{{route('nieuws.regio', $news->region->slug)}}" title="Zoek meer nieuws uit de regio {{$news->region->title}}">{{$news->region->title}}</a>
-					</li>
-				</ul>
 				<div class="share_buttons row">
 					<div class="col-12 col-md-auto">
 						<a data-share="native" href="javascript:void(0)" class="btn">
diff --git a/resources/views/newslist.blade.php b/resources/views/newslist.blade.php
index 671eda3a..f03d7eda 100644
--- a/resources/views/newslist.blade.php
+++ b/resources/views/newslist.blade.php
@@ -51,16 +51,11 @@
                                                           title="{{strip_tags($item->title)}}">{!!$item->title!!}</a>
                                 </h2>
                                 <ul class="post_details clearfix">
-                                    @if($item->region)
-                                        <li class="detail category"><i class="fa-solid fa-location-dot"></i> Regio <a
-                                                    href="{{route('nieuws.regio', $item->region->slug)}}"
-                                                    title="{{$item->region->title}}">{{$item->region->title}}</a></li>
-                                    @endif
-                                    @if($item->theme)
-                                        <li class="detail category"><i class="fa-solid fa-tag fa-rotate-90"></i> Thema
-                                            <a href="{{route('nieuws.thema', $item->theme->slug)}}"
-                                               title="{{$item->theme->title}}">{{$item->theme->title}}</a></li>
-                                    @endif
+				    @foreach($item->tags as $tag) 
+                                        <li class="detail category"><i class="fa-solid fa-location-dot"></i> <a
+                                                    href="{{route('nieuws.tag', $tag->slug)}}"
+                                                    title="{{$tag->titel}}">{{$tag->titel}}</a></li>
+                                    @endforeach
                                     @if($item->edited && ($item->edited != $item->published))
                                         <li class="date edited">
                                             <i class="fa-regular fa-clock"></i>
diff --git a/routes/web.php b/routes/web.php
index 1ca74875..7511274f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -17,6 +17,7 @@ Route::get('/nieuws', 'NewsController@overview')->name('nieuws');
 Route::get('/nieuws/more', 'NewsController@more')->name('nieuws.more');
 Route::get('/nieuws/populair', 'NewsController@populair')->name('nieuws.populair');
 Route::get('/nieuws/regio/{region}', 'NewsController@regionlist' )->where(['region' => '[a-z0-9]+'])->name('nieuws.regio');
+Route::get('/nieuws/tag/{tag}', 'NewsController@taglist' )->where(['tag' => '[a-z0-9-]+'])->name('nieuws.tag');
 Route::get('/nieuws/thema/{theme}', 'NewsController@themelist' )->where(['themelist' => '[a-z0-9]+'])->name('nieuws.thema');
 Route::get('/nieuws/{id}/{title}', 'NewsController@show')->where(['id' => '\d+'])->name('nieuws.detail');
 Route::get('/nieuws/zoeken/{query}', 'NewsController@search')->name('nieuws.zoeken');