From 1b1e163c4f94c0a8852692dcb3c70a4d08135ff3 Mon Sep 17 00:00:00 2001
From: horus
Date: Wed, 21 Feb 2018 23:34:08 +0100
Subject: Adds link to rss feed on index page. (website)

---
 site/app/Http/Controllers/IndexController.php |  5 ++++-
 site/resources/views/index.blade.php          | 20 ++++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

(limited to 'site')

diff --git a/site/app/Http/Controllers/IndexController.php b/site/app/Http/Controllers/IndexController.php
index b82d2cd..9023ac2 100644
--- a/site/app/Http/Controllers/IndexController.php
+++ b/site/app/Http/Controllers/IndexController.php
@@ -23,14 +23,17 @@ class IndexController extends Controller {
 			$query .= " UNION ";
 		} 
 		# subquery to get procent, because cheap spirits don't look good
-		$query .= "(SELECT name, image_url, spirit_type, spirit_type AS url, spirit_type AS angebotsname, original_price, discounted_price, (SELECT MAX(procent) FROM " . $view . "_view) as procent, '' AS linktext FROM ". $view ."_view WHERE original_price > 19.98 ORDER BY procent DESC LIMIT 1)";
+		$query .= "(SELECT name, image_url, spirit_type, spirit_type AS url, spirit_type AS angebotsname, (SELECT MAX(procent) FROM " . $view . "_view) as procent, '' AS linktext FROM ". $view ."_view WHERE original_price > 19.98 ORDER BY procent DESC LIMIT 1)";
 	    }
+		$query .= " UNION (SELECT 'Alle Angebote' as name, '/img/paw-400-400.png' as image_url, 'RSS-Feeds' as spirit_type, 'feeds' AS url, 'RSS-Feeds' AS angebotsname, (SELECT MAX(procent) FROM all_view) as procent, 'Zu den RSS-Feeds' AS linktext FROM all_view LIMIT 1)";
 
 	    $data = DB::select($query);
 
 	    $count = DB::select("SELECT count(*) as count FROM all_view")[0];
 		#$data = DB::table('whisky_view')->orderBy('procent', 'DESC')->limit(100)->simplePaginate(20);
 
+	    #$views[] = "rss-feeds";
+
         return view('index', ['data' => $data, 'views' => $views, 'hits' => $count]);
     }
 } 
diff --git a/site/resources/views/index.blade.php b/site/resources/views/index.blade.php
index 578c667..54e37e5 100644
--- a/site/resources/views/index.blade.php
+++ b/site/resources/views/index.blade.php
@@ -8,8 +8,8 @@ Angebote
     <div class="container">
       <div class="jumbotron p-3 p-md-5 text-white rounded bg-dark">
         <div class="col-md-7 px-0">
-          <h1 class="display-4 font-italic">Sonderangebote</h1>
-          <p class="lead my-3">Finde immer die günstigsten Angebote im Bereich Spirituosen. Regelmäßig neue Schnäppchen. ({{$hits->count}} Angebote)</p>
+          <h1 class="display-4 font-italic">Sonderangebote <span class="ml-10">({{$hits->count}} Angebote)</span></h1>
+          <p class="lead my-3">Finde immer die günstigsten Angebote im Bereich Spirituosen. Regelmäßig neue Schnäppchen.</p>
           <!--p class="lead mb-0"><a href="/about" class="text-white font-weight-bold">Erfahre mehr...</a></p-->
         </div>
       </div>
@@ -34,7 +34,9 @@ if ( empty($data) ) {
 	foreach( $data as $offer) {
 
 
-		if ( !in_array(strtolower($offer->spirit_type), $views) ) {
+		if ($offer->spirit_type == "RSS-Feeds") {
+			#$offer->angebotsname = "dem " . $offer->angebotsname;
+		} else if ( !in_array(strtolower($offer->spirit_type), $views) ) {
 			$offer->url = "misc";
 			$offer->angebotsname = "anderen Angeboten";
 			$offer->linktext = "Weitere günstige Angebote entdecken.";
@@ -78,10 +80,20 @@ if ( empty($data) ) {
 					Hier geht es zu den {{ $offer->angebotsname }}
 				</a>
 			</h3>
+<?php
+		if ( "RSS-Feeds" == $offer->spirit_type) {
+?>
+		
+			<p class="card-text "><span class="rounded off-badge oi oi-rss-alt"></span></p>
+<?php
+		} else {
+?>
 			<p class="card-text ">Bis zu <span class="bg-danger rounded off-badge off-badge-small">{{ $offer->procent}}%</span> sparen!</p>
+<?php
+		}
+?>
 			
 			<a class="w-100 u" href="/{{ $offer->url }}" style="word-wrap: none;">{{ $offer->linktext }}</a>
-			<!--p class="card-text mb-auto text-success w-100"><del class="text-danger">{{ TF::fF($offer->original_price) . "€" }}</del> <strong class="float-right">{{ TF::fF($offer->discounted_price) . "€" }}</strong></p-->
 		</div>
 			<img data-href="/{{ $offer->url }}" class="card-img-right border-left-0 img-thumbnail d-none d-xs-none d-md-block float-right js-link-replacement" src="{{ $offer->image_url }}" alt="{{ $offer->name }}" title="{{ $offer->name }}">
 	</div>
-- 
cgit v1.2.3