From 53e398f69ead13feaf26cdd5ae0449fa6174e753 Mon Sep 17 00:00:00 2001
From: horus
Date: Mon, 13 May 2019 16:05:59 +0200
Subject: Refactores view to reuse offer template.

---
 app/Http/Controllers/ListOfferController.php |   2 +-
 resources/views/listoffer.blade.php          |  96 +++++++++++++++
 resources/views/offer.blade.php              | 167 ---------------------------
 resources/views/offers.blade.php             |  67 +++++++++++
 resources/views/search.blade.php             |  73 +-----------
 5 files changed, 165 insertions(+), 240 deletions(-)
 create mode 100644 resources/views/listoffer.blade.php
 delete mode 100644 resources/views/offer.blade.php
 create mode 100644 resources/views/offers.blade.php

diff --git a/app/Http/Controllers/ListOfferController.php b/app/Http/Controllers/ListOfferController.php
index 1fb846e..993bfcd 100644
--- a/app/Http/Controllers/ListOfferController.php
+++ b/app/Http/Controllers/ListOfferController.php
@@ -90,6 +90,6 @@ class ListOfferController extends Controller {
 		    $title = ucfirst($view_name) . "-Angebote";
 	    }
 	    
-	    return view('offer', ['data' => $data, 'count' => $count, 'spirit_type' => $view_name, 'rss_feed' => $rss_feed, 'title' => $title ]);
+	    return view('listoffer', ['data' => $data, 'count' => $count, 'spirit_type' => $view_name, 'rss_feed' => $rss_feed, 'title' => $title ]);
     }
 } 
diff --git a/resources/views/listoffer.blade.php b/resources/views/listoffer.blade.php
new file mode 100644
index 0000000..a2a52e1
--- /dev/null
+++ b/resources/views/listoffer.blade.php
@@ -0,0 +1,96 @@
+@extends('layouts.base')
+
+@section('header')
+{{ ucwords($title) }}
+@endsection
+
+@section('feed')
+	{!! Feed::link(secure_url($rss_feed) . "/", 'atom', 'Feed von ' . ucwords($spirit_type) . '-Angeboten', 'de') !!}
+@endsection
+
+@section('content')
+<main class="site-main" id="main">
+<?php
+	$header = "";
+	$header_text = "Du bist auf der Suche nach einer neuen Lieblingsspirituose? Hier sind alle aktuell reduzierten Angebote aufgelistet. Viel Spaß beim stöbern!";
+	if ( "Alle Angebote" == $spirit_type ) {
+		$header = "Alle aktuellen Sonderangebote";
+	} else if ( "Andere Angebote" == $spirit_type ){
+		$header = "Aktuelle Spirituosen-Sonderangebote";
+	} else {
+		$header = "Aktuelle " . ucwords($spirit_type) . "-Angebote";
+		$header_text = "Du bist auf der Suche nach einem neuen Lieblings" . $spirit_type . "? Hier sind alle aktuell reduzierten " . ucwords($spirit_type) . "s aufgelistet. Happy Dramming!";
+	}
+?>
+<div class="container">
+		<nav class="breadcrumbs" typeof="BreadcrumbList" vocab="https://schema.org/" aria-label="breadcrumb">
+		    <ol class="breadcrumb">
+			<!-- Breadcrumb NavXT 6.2.1 -->
+<li class="home breadcrumb-item"><span property="itemListElement" typeof="ListItem"><a property="item" typeof="WebPage" title="Gehe zur Startseite: Fuselkönig.de" href="https://www.fuselkoenig.de" class="home"><span property="name">Startseite</span></a><meta property="position" content="1"></span></li>
+<li class="post post-angebote-archive breadcrumb-item"><span property="itemListElement" typeof="ListItem"><a property="item" typeof="WebPage" title="Schau dir Angebote an." href="/angebote/" class="post post-angebote-archive"><span property="name">Angebote</span></a><meta property="position" content="2"></span></li>
+<li class="archive taxonomy type current-item breadcrumb-item active" aria-current="page"><span property="itemListElement" typeof="ListItem"><span property="name">{{ ucwords($spirit_type) }}</span><meta property="position" content="3"></span></li>
+		    </ol>
+		</nav>
+	</div>
+
+    <div class="container">
+
+<header class="page-header">
+	<div class="card taxonomy-card">
+		<div class="card-body">
+			<h1 class="card-title page-title">{{ $header }}</h1>
+			<p>
+			{{ $header_text }}
+			</p>
+			@include('snippets.sortbuttons')
+		</div>
+	</div>
+</header><!-- .page-header -->
+
+	{{ $data->appends(Input::except('page'))->links('paginate') }}
+
+<?php 
+if ( !$data->count() ) {
+	/* Keine Angebote */
+?>
+<div class="alert alert-secondary" data-track-content data-content-name="{{ ucwords($spirit_type) }}" data-content-piece="Keine Angebote" data-content-target="">
+	<h4 class="alert-heading">Keine Angebote</h4>
+	Momentan liegen keine {{ $title }} vor. Probieren Sie es später noch einmal.
+</div>
+<?php 
+	/* Ende Keine Angebote */
+} else {
+	/* Liste Angebote */
+
+?>
+@include('offers')
+
+	{{ $data->appends(Input::except('page'))->links('paginate') }}
+
+<?php
+	/* Ende Liste Angebote */
+}
+?>
+
+<!-- ./container -->
+    </div>
+</main>
+@endsection
+
+@section('scripts')
+<script>
+$(window).on("load", function(){
+	$("img.card-img-top").each( function(k, v){
+		
+		// sets style like with Drankdozijn
+		if ( (this.naturalWidth / this.naturalHeight) < 0.3 ) {
+			console.log("debug: changing css for " + this.title);
+			$(this).css("width", this.naturalWidth);
+			$(this).css("onject-fit", "cover");
+			$(this).css("margin-left", "auto");
+			$(this).css("margin-right", "25px");
+		}
+	});
+});
+</script>
+@endsection
diff --git a/resources/views/offer.blade.php b/resources/views/offer.blade.php
deleted file mode 100644
index 636f4ce..0000000
--- a/resources/views/offer.blade.php
+++ /dev/null
@@ -1,167 +0,0 @@
-@extends('layouts.base')
-
-@section('header')
-{{ ucwords($title) }}
-@endsection
-
-@section('feed')
-	{!! Feed::link(secure_url($rss_feed) . "/", 'atom', 'Feed von ' . ucwords($spirit_type) . '-Angeboten', 'de') !!}
-@endsection
-
-@section('content')
-<main class="site-main" id="main">
-<?php
-	$header = "";
-	$header_text = "Du bist auf der Suche nach einer neuen Lieblingsspirituose? Hier sind alle aktuell reduzierten Angebote aufgelistet. Viel Spaß beim stöbern!";
-	if ( "Alle Angebote" == $spirit_type ) {
-		$header = "Alle aktuellen Sonderangebote";
-	} else if ( "Andere Angebote" == $spirit_type ){
-		$header = "Aktuelle Spirituosen-Sonderangebote";
-	} else {
-		$header = "Aktuelle " . ucwords($spirit_type) . "-Angebote";
-		$header_text = "Du bist auf der Suche nach einem neuen Lieblings" . $spirit_type . "? Hier sind alle aktuell reduzierten " . ucwords($spirit_type) . "s aufgelistet. Happy Dramming!";
-	}
-?>
-<div class="container">
-		<nav class="breadcrumbs" typeof="BreadcrumbList" vocab="https://schema.org/" aria-label="breadcrumb">
-		    <ol class="breadcrumb">
-			<!-- Breadcrumb NavXT 6.2.1 -->
-<li class="home breadcrumb-item"><span property="itemListElement" typeof="ListItem"><a property="item" typeof="WebPage" title="Gehe zur Startseite: Fuselkönig.de" href="https://www.fuselkoenig.de" class="home"><span property="name">Startseite</span></a><meta property="position" content="1"></span></li>
-<li class="post post-angebote-archive breadcrumb-item"><span property="itemListElement" typeof="ListItem"><a property="item" typeof="WebPage" title="Schau dir Angebote an." href="/angebote/" class="post post-angebote-archive"><span property="name">Angebote</span></a><meta property="position" content="2"></span></li>
-<li class="archive taxonomy type current-item breadcrumb-item active" aria-current="page"><span property="itemListElement" typeof="ListItem"><span property="name">{{ ucwords($spirit_type) }}</span><meta property="position" content="3"></span></li>
-		    </ol>
-		</nav>
-	</div>
-
-    <div class="container">
-
-<header class="page-header">
-	<div class="card taxonomy-card">
-		<div class="card-body">
-			<h1 class="card-title page-title">{{ $header }}</h1>
-			<p>
-			{{ $header_text }}
-			</p>
-			@include('snippets.sortbuttons')
-		</div>
-	</div>
-</header><!-- .page-header -->
-
-	{{ $data->appends(Input::except('page'))->links('paginate') }}
-
-<?php 
-if ( !$data->count() ) {
-	/* Keine Angebote */
-?>
-<div class="alert alert-secondary" data-track-content data-content-name="{{ ucwords($spirit_type) }}" data-content-piece="Keine Angebote" data-content-target="">
-	<h4 class="alert-heading">Keine Angebote</h4>
-	Momentan liegen keine {{ $title }} vor. Probieren Sie es später noch einmal.
-</div>
-<?php 
-	/* Ende Keine Angebote */
-} else {
-	/* Liste Angebote */
-
-$css_border_left = "";
-
-foreach( $data as $offer) {
-?>
-
-
-
-
-
-	<div class="card <?php echo $css_border_left; ?>">
-      <div class="row ">
-        <div class="col-md-4">
-	    <div class="card-header-dp-none">
-		<p><strong>
-		<span style="visibility: hidden;">
-		{{ ucwords($offer->spirit_type) }} <span class="float-right">{{ $offer->shop }}</span>
-		</span>
-		</strong></p>
-	    </div>
-	    <div class="card-img-overlay card-img-overlay-badge" >
-	    <p class="card-text float-right rounded off-badge"  >{{ $offer->procent}} %</p>
-            </div>
-	    <img src="{{ $offer->image_url }}" class="card-img img-fluid mx-auto d-block" >
-          </div>
-          <div class="col-md-8 px-10">
-	    <div class="card-header">
-		<p><strong>
-		<a style="color: inherit;" href="/angebote/search?q={{ ucwords($offer->spirit_type) }}" title="Alle {{ ucwords($offer->spirit_type) }} anzeigen">{{ ucwords($offer->spirit_type) }}</a> <span class="float-right">{{ $offer->shop }}</span>
-		</strong></p>
-	    </div>
-            <div class="card-block card-body px-3">
-
-	    <h3 class="card-title">{{ $offer->name }}</h3>
-
-		<div class="row">
-		      <span class="card-text col-md-6">
-			<p>
-		              <strong class="new-price">Neuer Preis: {{ TF::fF($offer->discounted_price) }} €</strong>
-			      <br>
-			      statt <strong><del>{{ TF::fF($offer->original_price) }} €</del></strong>
-			      <br>
-			      {{ TF::fF($offer->base_price ) }} € / Liter
-			</p>
-		      </span>
-		      <p class="card-text col-md-6">
-		      	      Alkohol: {{ TF::fF($offer->abv) }} %
-			      <br>
-			      Volumen: {{ TF::fF($offer->volume) }} Liter
-			      <br>
-			      Versand: {{ TF::fF($offer->shipping_costs) }} €
-			      <br>
-			      <br>
-		      </p>
-                </div>
-            </div>
-            <div class="card-footer row">
-		<div class="col-md-6 col-sm-6">
-		    <a href="{{ $offer->url }}" class="btn btn-primary">Zum Shop</a>
-		</div>
-		<div class="col-md-6 col-sm-6">
-		<p>
-				Preis vom {{ strftime("%d. %B %Y", $offer->created_at) }}
-		</p>
-		</div>
-            </div>
-          </div>
-
-        </div>
-      </div>
-
-<?php
-	}
-?>
-
-	{{ $data->appends(Input::except('page'))->links('paginate') }}
-
-<?php
-	/* Ende Liste Angebote */
-}
-?>
-
-<!-- ./container -->
-    </div>
-</main>
-@endsection
-
-@section('scripts')
-<script>
-$(window).on("load", function(){
-	$("img.card-img-top").each( function(k, v){
-		
-		// sets style like with Drankdozijn
-		if ( (this.naturalWidth / this.naturalHeight) < 0.3 ) {
-			console.log("debug: changing css for " + this.title);
-			$(this).css("width", this.naturalWidth);
-			$(this).css("onject-fit", "cover");
-			$(this).css("margin-left", "auto");
-			$(this).css("margin-right", "25px");
-		}
-	});
-});
-</script>
-@endsection
diff --git a/resources/views/offers.blade.php b/resources/views/offers.blade.php
new file mode 100644
index 0000000..acf507a
--- /dev/null
+++ b/resources/views/offers.blade.php
@@ -0,0 +1,67 @@
+<?php
+foreach( $data as $offer) {
+?>
+	<div class="card">
+      <div class="row ">
+        <div class="col-md-4">
+	    <div class="card-header-dp-none">
+		<p><strong>
+		<span style="visibility: hidden;">
+		{{ ucwords($offer->spirit_type) }} <span class="float-right">{{ $offer->shop }}</span>
+		</span>
+		</strong></p>
+	    </div>
+	    <div class="card-img-overlay card-img-overlay-badge" >
+	    <p class="card-text float-right rounded off-badge"  >{{ $offer->procent}} %</p>
+            </div>
+	    <img src="{{ $offer->image_url }}" class="card-img img-fluid mx-auto d-block" >
+          </div>
+          <div class="col-md-8 px-10">
+	    <div class="card-header">
+		<p><strong>
+		<a style="color: inherit;" href="/angebote/search?q={{ ucwords($offer->spirit_type) }}" title="Alle {{ ucwords($offer->spirit_type) }} anzeigen">{{ ucwords($offer->spirit_type) }}</a> <span class="float-right">{{ $offer->shop }}</span>
+		</strong></p>
+	    </div>
+            <div class="card-block card-body px-3">
+
+	    <h3 class="card-title">{{ $offer->name }}</h3>
+
+		<div class="row">
+		      <span class="card-text col-md-6">
+			<p>
+		              <strong class="new-price">Neuer Preis: {{ TF::fF($offer->discounted_price) }} €</strong>
+			      <br>
+			      statt <strong><del>{{ TF::fF($offer->original_price) }} €</del></strong>
+			      <br>
+			      {{ TF::fF($offer->base_price ) }} € / Liter
+			</p>
+		      </span>
+		      <p class="card-text col-md-6">
+		      	      Alkohol: {{ TF::fF($offer->abv) }} %
+			      <br>
+			      Volumen: {{ TF::fF($offer->volume) }} Liter
+			      <br>
+			      Versand: {{ TF::fF($offer->shipping_costs) }} €
+			      <br>
+			      <br>
+		      </p>
+                </div>
+            </div>
+            <div class="card-footer row">
+		<div class="col-md-6 col-sm-6">
+		    <a href="{{ $offer->url }}" class="btn btn-primary">Zum Shop</a>
+		</div>
+		<div class="col-md-6 col-sm-6">
+		<p>
+				Preis vom {{ strftime("%d. %B %Y", $offer->created_at) }}
+		</p>
+		</div>
+            </div>
+          </div>
+
+        </div>
+      </div>
+
+<?php
+	}
+?>
diff --git a/resources/views/search.blade.php b/resources/views/search.blade.php
index 2f381d7..f715989 100644
--- a/resources/views/search.blade.php
+++ b/resources/views/search.blade.php
@@ -60,8 +60,6 @@ if ( $data->count() ) {
 
 	{{ $data->appends(Input::except('page'))->links('paginate') }}
 
-<?php
-
 <?php 
 if ( !$data->count() ) {
 	/* Keine Angebote */
@@ -71,78 +69,9 @@ if ( !$data->count() ) {
 } else {
 	/* Liste Angebote */
 
-//@include('snippets.sortbuttons')
-$css_border_left = "";
-
-foreach( $data as $offer) {
 ?>
 
-
-
-
-
-	<div class="card <?php echo $css_border_left; ?>">
-      <div class="row ">
-        <div class="col-md-4">
-	    <div class="card-header-dp-none">
-		<p><strong>
-		<span style="visibility: hidden;">
-		{{ ucwords($offer->spirit_type) }} <span class="float-right">{{ $offer->shop }}</span>
-		</span>
-		</strong></p>
-	    </div>
-	    <div class="card-img-overlay card-img-overlay-badge" >
-	    <p class="card-text float-right rounded off-badge"  >{{ $offer->procent}} %</p>
-            </div>
-	    <img src="{{ $offer->image_url }}" class="card-img img-fluid mx-auto d-block" >
-          </div>
-          <div class="col-md-8 px-10">
-	    <div class="card-header">
-		<p><strong>
-		{{ ucwords($offer->spirit_type) }} <span class="float-right">{{ $offer->shop }}</span>
-		</strong></p>
-	    </div>
-            <div class="card-block card-body px-3">
-
-	    <h3 class="card-title">{{ $offer->name }}</h3>
-
-		<div class="row">
-		      <p class="card-text col-md-6">
-		              <strong class="new-price">Neuer Preis: {{ TF::fF($offer->discounted_price) }} €</strong>
-			      <br>
-			      statt <strong><del>{{ TF::fF($offer->original_price) }} €</del></strong>
-			      <br>
-			      {{ TF::fF($offer->base_price ) }} € / Liter
-		      </p>
-		      <p class="card-text col-md-6">
-		      	      Alkohol: {{ TF::fF($offer->abv) }} %
-			      <br>
-			      Volumen: {{ TF::fF($offer->volume) }} Liter
-			      <br>
-			      Versand: {{ TF::fF($offer->shipping_costs) }} €
-			      <br>
-			      <br>
-		      </p>
-                </div>
-            </div>
-            <div class="card-footer row">
-		<div class="col-md-6 col-sm-6">
-		    <a href="{{ $offer->url }}" class="btn btn-primary">Zum Shop</a>
-		</div>
-		<div class="col-md-6 col-sm-6">
-		<p>
-				Preis vom {{ strftime("%d. %B", $offer->created_at) }}
-		</p>
-		</div>
-            </div>
-          </div>
-
-        </div>
-      </div>
-
-<?php
-	}
-?>
+	@include('offers')
 
 	{{ $data->appends(Input::except('page'))->links('paginate') }}
 
-- 
cgit v1.2.3