Adds layout if no offers are available. (website)

3 files changed, 85 insertions, 37 deletions

diff --git a/site/app/Http/Controllers/OfferController.php b/site/app/Http/Controllers/OfferController.php
index 30a9da6..39c181d 100644
--- a/site/app/Http/Controllers/OfferController.php
+++ b/site/app/Http/Controllers/OfferController.php
@@ -66,12 +66,24 @@ class OfferController extends Controller {
 	     * Database query
 	     */
 	    $view_name = \Request::route()->getName();
-	    $data = DB::table($view_name . '_view')->orderBy($sort_by, $order_by)->limit(100)->simplePaginate(20);
+	    $data = DB::table($view_name . '_view')->orderBy($sort_by, $order_by)->simplePaginate(20);
 
 	    if ( "misc" == $view_name ) {
 		    $view_name = "Andere Angebote";
+		    if ( $data->count() ) {
+			    $title = "andere Angebote";
+		    } else {
+			    $title = "anderen Angebote";
+		    }
 	    } else if ( "all" == $view_name ) {
 		    $view_name = "Alle Angebote";
+		    if ( $data->count() ) {
+			    $title = "alle Angebote";
+		    } else {
+			    $title = "Angebote";
+		    }
+	    } else {
+		    $title = ucfirst($view_name) . "-Angebote";
 	    }
 
 	    /*
@@ -79,6 +91,6 @@ class OfferController extends Controller {
 	     */
 	    setlocale(LC_TIME, 'de_DE.utf8');
 	    
-	    return view('offer', ['data' => $data, 'spirit_type' => $view_name]);
+	    return view('offer', ['data' => $data, 'spirit_type' => $view_name, 'title' => $title ]);
     }
 } 
diff --git a/site/resources/views/index.blade.php b/site/resources/views/index.blade.php
index 792a343..07027dd 100644
--- a/site/resources/views/index.blade.php
+++ b/site/resources/views/index.blade.php
@@ -1,5 +1,9 @@
 @extends('layouts.base')
 
+@section('header')
+Angebote
+@endsection
+
 @section('content')
     <div class="container">
       <div class="jumbotron p-3 p-md-5 text-white rounded bg-dark">
@@ -13,26 +17,38 @@
 
 <?php 
 
-$count = 0;
+if ( empty($data) ) {
+	/* Keine Angebote */
+?>
+<div class="alert alert-secondary">
+	<h4 class="alert-heading">Keine Angebote</h4>
+	Momentan liegen keine Angebote vor. Probieren Sie es später noch einmal.
+</div>
+<?php 
+	/* Ende Keine Angebote */
+} else {
+	/* Liste Angebote */
 
-foreach( $data as $offer) {
+	$count = 0;
 
+	foreach( $data as $offer) {
 
-	if ( !in_array(strtolower($offer->spirit_type), $views) ) {
-		$offer->url = "misc";
-		$offer->angebotsname = "anderen Angeboten";
-		$offer->linktext = "Weitere günstige Angebote entdecken.";
-	} else {
-		$offer->url = lcfirst($offer->url) ;
-		$offer->angebotsname = $offer->angebotsname . "-Angeboten";
-		$offer->linktext = "Den günstigsten ". $offer->spirit_type ." finden.";
-	}
 
-	if ( $count % 2 == 0) {
+		if ( !in_array(strtolower($offer->spirit_type), $views) ) {
+			$offer->url = "misc";
+			$offer->angebotsname = "anderen Angeboten";
+			$offer->linktext = "Weitere günstige Angebote entdecken.";
+		} else {
+			$offer->url = lcfirst($offer->url) ;
+			$offer->angebotsname = $offer->angebotsname . "-Angeboten";
+			$offer->linktext = "Den günstigsten ". $offer->spirit_type ." finden.";
+		}
+
+		if ( $count % 2 == 0) {
 ?>
  <div class="row mb-2">
 <?php
-	}
+		}
 
 ?>
 	
@@ -73,21 +89,22 @@ foreach( $data as $offer) {
 <?php
 
 	
-	if ( $count % 2 == 1) {
+		if ( $count % 2 == 1) {
 ?>
  </div>
 <?php
-	}
+		}
 
-	$count++;
+		$count++;
 
 }
 
-// schließt den row div wieder bei ungerade anzahl
-if ( $count % 2 == 1) {
+	// schließt den row div wieder bei ungerade anzahl
+	if ( $count % 2 == 1) {
 ?>
  </div>
 <?php
+	}
 }
 ?>
 
diff --git a/site/resources/views/offer.blade.php b/site/resources/views/offer.blade.php
index 387949f..e409d63 100644
--- a/site/resources/views/offer.blade.php
+++ b/site/resources/views/offer.blade.php
@@ -1,5 +1,9 @@
 @extends('layouts.base')
 
+@section('header')
+{{ ucfirst($title) }}
+@endsection
+
 @section('feed')
 	{!! Feed::link(url($spirit_type . '/feed'), 'atom', 'Feed von ' . $spirit_type, 'de') !!}
 @endsection
@@ -17,11 +21,21 @@
 @include('snippets.sortbuttons')
 
 <?php 
+if ( !$data->count() ) {
+	/* Keine Angebote */
+?>
+<div class="alert alert-secondary">
+	<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 */
+	$count = 0;
+	foreach( $data as $offer) {
 
-$count = 0;
-foreach( $data as $offer) {
-
-	if ( $count % 2 == 0) {
+		if ( $count % 2 == 0) {
 ?>
 <!-- .row -->
  <div class="row mb-2">
@@ -119,29 +133,34 @@ foreach( $data as $offer) {
 
 <?php
 
-	
-	if ( $count % 2 == 1) {
+		
+		if ( $count % 2 == 1) {
 ?>
-<!-- ./row -->
- </div>
+	<!-- ./row -->
+	 </div>
 <?php
-	}
+		}
 
-	$count++;
+		$count++;
 
-}
+	}
 
-// schließt den div bei ungerade einträgen
-if ( $count % 2 == 1) {
+	// schließt den div bei ungerade einträgen
+	if ( $count % 2 == 1) {
 ?>
-<!-- ./row -->
- </div>
+	<!-- ./row -->
+	 </div>
 <?php
-}
+	}
 
 ?>
 
-{{ $data->links() }}
+	{{ $data->links() }}
+
+<?php
+	/* Ende Liste Angebote */
+}
+?>
 
 <!-- ./container -->
     </div>