Improves the layout. (website)

4 files changed, 14 insertions, 15 deletions

diff --git a/site/app/Http/Controllers/PageFeedController.php b/site/app/Http/Controllers/PageFeedController.php
index e29c8ca..ee4f3ec 100644
--- a/site/app/Http/Controllers/PageFeedController.php
+++ b/site/app/Http/Controllers/PageFeedController.php
@@ -15,19 +15,22 @@ class PageFeedController extends Controller {
     public function showPage(Request $request) {
   
 
-	    $views = array("whisky", "wodka", "gin", "rum", "misc", "all");
+	    $views = array("whisky", "wodka", "gin", "rum", "misc");
 	    $query = "";
 
 	    foreach($views as $view) {
 		if ($query != "") {
 			$query .= " UNION ";
 		} 
-		$query .= "(SELECT name, image_url, spirit_type, spirit_type AS url, spirit_type AS feedname, '' AS linktext, created_at FROM ". $view ."_view WHERE original_price > 19.98 ORDER BY created_at DESC LIMIT 1)";
+		$query .= "(SELECT spirit_type as name, image_url, spirit_type, spirit_type AS url, spirit_type AS feedname, '' AS linktext FROM ". $view ."_view WHERE original_price > 19.98 ORDER BY created_at DESC LIMIT 1)";
 	    }
-	    	# todo: schlägt manchmal fehl
-		$query .= " UNION (SELECT name, image_url, spirit_type, spirit_type AS url, spirit_type AS feedname, '' AS linktext, created_at FROM ". $view ."_view WHERE original_price > 19.98 AND (procent < (SELECT MAX(procent) FROM all_view)) ORDER BY procent LIMIT 1)";
+
+	    # query mit festen parametern
+		$query .= " UNION (SELECT 'Alle Angebote' as name, '/img/paw-400-400.png' as image_url, 'Alle Angebote' as spirit_type, 'all' AS url, 'Feed aller Angebote' AS feedname, 'Zum Feed aller Angebote' AS linktext FROM all_view LIMIT 1)";
 
 	    $data = DB::select($query);
+	    
+	    array_push($views, "alle angebote");
 
         return view('feeds', ['data' => $data, 'views' => $views]);
     }
diff --git a/site/public/img/paw-400-400.png b/site/public/img/paw-400-400.png
new file mode 100644
index 0000000..5fca4e0
--- /dev/null
+++ b/site/public/img/paw-400-400.png
diff --git a/site/resources/views/feeds.blade.php b/site/resources/views/feeds.blade.php
index 1fcbaf1..34cb091 100644
--- a/site/resources/views/feeds.blade.php
+++ b/site/resources/views/feeds.blade.php
@@ -1,5 +1,9 @@
 @extends('layouts.base')
 
+@section('header')
+RSS-Feeds
+@endsection
+
 @section('content')
     <div class="container">
       <div class="jumbotron p-3 p-md-5 text-white rounded bg-dark">
@@ -10,21 +14,13 @@
         </div>
       </div>
 
-
 <?php 
 
 $count = 0;
 
 foreach( $data as $offer) {
 
-
-	if ( $count == 5 ) {
-		// last card
-		$offer->feedname = "Feed aller Angebote"; 
-		$offer->linktext = "Zum Feed aller Angebote.";
-		$offer->url = "all";
-		$offer->spirit_type = "Alle Angebote";
-	} else if ( !in_array(strtolower($offer->spirit_type), $views) ) {
+	if ( !in_array(strtolower($offer->spirit_type), $views) ) {
 		// card of misc offers
 		$offer->url = "misc";
 		$offer->feedname = "Feed der weiteren Angebote"; 
diff --git a/site/resources/views/offer.blade.php b/site/resources/views/offer.blade.php
index e409d63..9ddd5a1 100644
--- a/site/resources/views/offer.blade.php
+++ b/site/resources/views/offer.blade.php
@@ -12,8 +12,8 @@
     <div class="container">
       <div class="jumbotron p-3 p-md-5 text-white rounded bg-dark bbg-white ttext-dark box-shadow">
         <div class="col-md-6 px-0">
-          <h1 class="display-4 font-italic">{{ ucfirst($spirit_type) }}</h1>
-          <!--p class="lead my-3">Finde immer die günstigsten Angebote im Bereich Spirituosen. Täglich neue Schnäppchen.</p-->
+	  <h1 class="display-4 font-italic">{{ ucfirst($spirit_type) }} <!-- ({{$data->count()}} Treffer)--></h1> 
+	  <!--p class="lead my-3">Finde immer die günstigsten Angebote im Bereich Spirituosen. Täglich neue Schnäppchen.</p-->
           <p class="lead mb-0"><a href="/" class="text-white font-weight-bold">Zurück zur Übersicht...</a></p>
         </div>
       </div>