Improves styling, rss feeds and pagination.

11 files changed, 171 insertions, 15 deletions

diff --git a/site/resources/views/index.blade.php b/site/resources/views/index.blade.php
index 07027dd..6b4fc7c 100644
--- a/site/resources/views/index.blade.php
+++ b/site/resources/views/index.blade.php
@@ -10,7 +10,7 @@ Angebote
         <div class="col-md-6 px-0">
           <h1 class="display-4 font-italic">Sonderangebote</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">Erfahre mehr...</a></p>
+          <p class="lead mb-0"><a href="/about" class="text-white font-weight-bold">Erfahre mehr...</a></p>
         </div>
       </div>
 
diff --git a/site/resources/views/layouts/base.blade.php b/site/resources/views/layouts/base.blade.php
index 86fda65..0f862ec 100644
--- a/site/resources/views/layouts/base.blade.php
+++ b/site/resources/views/layouts/base.blade.php
@@ -13,12 +13,14 @@
 <link rel="stylesheet" href="https://unpkg.com/bootstrap-material-design@4.1.1/dist/css/bootstrap-material-design.min.css">
 -->
         <link href="/css/bootstrap-material-design.min.css" rel="stylesheet">
+	<link href="/font/css/open-iconic-bootstrap.css" rel="stylesheet">
         <link href="/css/sticky-footer-navbar.css" rel="stylesheet">
         <link href="/css/blog.css" rel="stylesheet">
         <link href="/css/custom.css" rel="stylesheet">
         <link href="/css/colors.css" rel="stylesheet">
 
 
+
 	@yield('feed')
 	@yield('css')
 </head>
diff --git a/site/resources/views/offer.blade.php b/site/resources/views/offer.blade.php
index 9ddd5a1..98693c8 100644
--- a/site/resources/views/offer.blade.php
+++ b/site/resources/views/offer.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @section('feed')
-	{!! Feed::link(url($spirit_type . '/feed'), 'atom', 'Feed von ' . $spirit_type, 'de') !!}
+	{!! Feed::link(url($rss_feed), 'atom', 'Feed von ' . $spirit_type, 'de') !!}
 @endsection
 
 @section('content')
@@ -18,8 +18,6 @@
         </div>
       </div>
 
-@include('snippets.sortbuttons')
-
 <?php 
 if ( !$data->count() ) {
 	/* Keine Angebote */
@@ -32,6 +30,11 @@ if ( !$data->count() ) {
 	/* Ende Keine Angebote */
 } else {
 	/* Liste Angebote */
+
+?>
+
+@include('snippets.sortbuttons')
+<?php
 	$count = 0;
 	foreach( $data as $offer) {
 
@@ -155,7 +158,7 @@ if ( !$data->count() ) {
 
 ?>
 
-	{{ $data->links() }}
+	{{ $data->appends(Input::except('page'))->links() }}
 
 <?php
 	/* Ende Liste Angebote */
diff --git a/site/resources/views/search.blade.php b/site/resources/views/search.blade.php
index 14903a5..1bec961 100644
--- a/site/resources/views/search.blade.php
+++ b/site/resources/views/search.blade.php
@@ -64,6 +64,7 @@ if ( "" == $search_phrase || !$data->count()) {
 	/* Zeigt Suchergebnisse */
 
 ?>
+
 @include('snippets.sortbuttons')
 <?php
 
@@ -190,7 +191,7 @@ if ( "" == $search_phrase || !$data->count()) {
 
 ?>
 
-	{{ $data->links() }}
+	{{ $data->appends(Input::except('page'))->links() }}
 
 <?php
 /* Ende Suchergebnisse */
diff --git a/site/resources/views/snippets/footer.blade.php b/site/resources/views/snippets/footer.blade.php
index 1d52914..eb9d115 100644
--- a/site/resources/views/snippets/footer.blade.php
+++ b/site/resources/views/snippets/footer.blade.php
@@ -8,27 +8,30 @@
 				
 				<ul class="list-group">
 					<li class="list-group-item footer-link"> 
-				<a href="/feeds/">Feeds</a>
+				<a href="/feeds/" title="Übersicht über die RSS-Feeds">RSS-Feeds</a>
 					</li>
 					<li class="list-group-item footer-link"> 
-				<a href="https://www.fuselkoenig.de//">Blog</a>
+				<a href="https://www.fuselkoenig.de/" title="Der Blog auf www.fuselkoenig.de">Blog</a>
 					</li>
 					<li class="list-group-item footer-link"> 
-				<a href="https://www.fuselkoenig.de/impressum">Impressum</a>
+				<a href="https://www.fuselkoenig.de/impressum" rel="nofollow" title="Impressum">Impressum</a>
 					</li>
 					<li class="list-group-item footer-link"> 
-				<a href="https://www.fuselkoenig.de/kontakt">Kontakt</a>
+				<a href="https://www.fuselkoenig.de/kontakt" title="Link zum Kontaktformular">Kontakt</a>
 					</li>
 			</div>
 			</div>
 			<div class="col ffooter-col">
 			<div class="card-body">
 				<h4>Über</h4>
-				<p class="ttext-muted">
-				Hi, bla bla bla
+				<p class="ttext-muted mb-0">
+				Hallo, ich bin der Autor von <a href="https://www.fuselkoenig.de">Fuselkönig.de</a>. Auf dieser Seite sammle ich Sonderangebote im Bereich Spirituosen. Wenn Sie mehr erfahren wollen, klicken sie <a href="/about">hier</a>.
 				</p>
-				<!--img src="https://www.maximilianmoehring.com/wp-content/uploads/sites/12/2017/12/180x180xPortrait_klein4.png.pagespeed.ic.qidt2UvDcW.png"-->
+<!--
+				<img src="https://www.maximilianmoehring.com/wp-content/uploads/sites/12/2017/12/180x180xPortrait_klein4.png.pagespeed.ic.qidt2UvDcW.png">
+-->
 			</div>
+				<!--img src="https://www.maximilianmoehring.com/wp-content/uploads/sites/12/2017/12/180x180xPortrait_klein4.png.pagespeed.ic.qidt2UvDcW.png"-->
 			</div>
 	<!--span class="text-muted">Place sticky footer content here.</span-->
 		</div>
diff --git a/site/resources/views/snippets/sortbuttons.blade.php b/site/resources/views/snippets/sortbuttons.blade.php
index 22f7f02..98abc9f 100644
--- a/site/resources/views/snippets/sortbuttons.blade.php
+++ b/site/resources/views/snippets/sortbuttons.blade.php
@@ -1,7 +1,7 @@
 
 <div class="container">
 <div class="row">
-<div class="btn-toolbar mb-2 align-top " role="toolbar" aria-label="Sortieren">
+<div class="btn-toolbar mb-2 align-top w-100" role="toolbar" aria-label="Sortieren">
 	<div class="btn-group" role="group" aria-label="Sortieren">
 		<div class="dropdown mr-2">
 		  <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -31,7 +31,7 @@
 		  </div>
 		</div>
 	</div>
-	<div class="btn-group" role="group" aria-label="Sortieren">
+	<div class="btn-group mr-auto" role="group" aria-label="Sortieren">
 		<div class="dropdown mr-2">
 		  <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 		Preisnachlass
@@ -51,6 +51,11 @@
 		  </div>
 		</div>
 	</div>
+	<div class="btn-group " role="group" aria-label="Sortieren" style="justify-content: flex-end;">
+		  <a class="btn btn-rss text-white" href={{ url($rss_feed) }} title="Link zum RSS-Feed">
+			<span class="oi oi-rss-alt" title="RSS-Feed" aria-hidden="true"></span>
+		  </a>
+	</div>
 </div>
 </div>
 </div>
diff --git a/site/resources/views/vendor/pagination/bootstrap-4.blade.php b/site/resources/views/vendor/pagination/bootstrap-4.blade.php
new file mode 100644
index 0000000..3f98455
--- /dev/null
+++ b/site/resources/views/vendor/pagination/bootstrap-4.blade.php
@@ -0,0 +1,36 @@
+@if ($paginator->hasPages())
+    <ul class="pagination">
+        {{-- Previous Page Link --}}
+        @if ($paginator->onFirstPage())
+            <li class="page-item disabled"><span class="page-link">&laquo;</span></li>
+        @else
+            <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
+        @endif
+
+        {{-- Pagination Elements --}}
+        @foreach ($elements as $element)
+            {{-- "Three Dots" Separator --}}
+            @if (is_string($element))
+                <li class="page-item disabled"><span class="page-link">{{ $element }}</span></li>
+            @endif
+
+            {{-- Array Of Links --}}
+            @if (is_array($element))
+                @foreach ($element as $page => $url)
+                    @if ($page == $paginator->currentPage())
+                        <li class="page-item active"><span class="page-link">{{ $page }}</span></li>
+                    @else
+                        <li class="page-item"><a class="page-link" href="{{ $url }}">{{ $page }}</a></li>
+                    @endif
+                @endforeach
+            @endif
+        @endforeach
+
+        {{-- Next Page Link --}}
+        @if ($paginator->hasMorePages())
+            <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
+        @else
+            <li class="page-item disabled"><span class="page-link">&raquo;</span></li>
+        @endif
+    </ul>
+@endif
diff --git a/site/resources/views/vendor/pagination/default.blade.php b/site/resources/views/vendor/pagination/default.blade.php
new file mode 100644
index 0000000..4e795ff
--- /dev/null
+++ b/site/resources/views/vendor/pagination/default.blade.php
@@ -0,0 +1,36 @@
+@if ($paginator->hasPages())
+    <ul class="pagination">
+        {{-- Previous Page Link --}}
+        @if ($paginator->onFirstPage())
+            <li class="disabled"><span>&laquo;</span></li>
+        @else
+            <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
+        @endif
+
+        {{-- Pagination Elements --}}
+        @foreach ($elements as $element)
+            {{-- "Three Dots" Separator --}}
+            @if (is_string($element))
+                <li class="disabled"><span>{{ $element }}</span></li>
+            @endif
+
+            {{-- Array Of Links --}}
+            @if (is_array($element))
+                @foreach ($element as $page => $url)
+                    @if ($page == $paginator->currentPage())
+                        <li class="active"><span>{{ $page }}</span></li>
+                    @else
+                        <li><a href="{{ $url }}">{{ $page }}</a></li>
+                    @endif
+                @endforeach
+            @endif
+        @endforeach
+
+        {{-- Next Page Link --}}
+        @if ($paginator->hasMorePages())
+            <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
+        @else
+            <li class="disabled"><span>&raquo;</span></li>
+        @endif
+    </ul>
+@endif
diff --git a/site/resources/views/vendor/pagination/semantic-ui.blade.php b/site/resources/views/vendor/pagination/semantic-ui.blade.php
new file mode 100644
index 0000000..c6e0d21
--- /dev/null
+++ b/site/resources/views/vendor/pagination/semantic-ui.blade.php
@@ -0,0 +1,36 @@
+@if ($paginator->hasPages())
+    <div class="ui pagination menu">
+        {{-- Previous Page Link --}}
+        @if ($paginator->onFirstPage())
+            <a class="icon item disabled"> <i class="left chevron icon"></i> </a>
+        @else
+            <a class="icon item" href="{{ $paginator->previousPageUrl() }}" rel="prev"> <i class="left chevron icon"></i> </a>
+        @endif
+
+        {{-- Pagination Elements --}}
+        @foreach ($elements as $element)
+            {{-- "Three Dots" Separator --}}
+            @if (is_string($element))
+                <a class="icon item disabled">{{ $element }}</a>
+            @endif
+
+            {{-- Array Of Links --}}
+            @if (is_array($element))
+                @foreach ($element as $page => $url)
+                    @if ($page == $paginator->currentPage())
+                        <a class="item active" href="{{ $url }}">{{ $page }}</a>
+                    @else
+                        <a class="item" href="{{ $url }}">{{ $page }}</a>
+                    @endif
+                @endforeach
+            @endif
+        @endforeach
+
+        {{-- Next Page Link --}}
+        @if ($paginator->hasMorePages())
+            <a class="icon item" href="{{ $paginator->nextPageUrl() }}" rel="next"> <i class="right chevron icon"></i> </a>
+        @else
+            <a class="icon item disabled"> <i class="right chevron icon"></i> </a>
+        @endif
+    </div>
+@endif
diff --git a/site/resources/views/vendor/pagination/simple-bootstrap-4.blade.php b/site/resources/views/vendor/pagination/simple-bootstrap-4.blade.php
new file mode 100644
index 0000000..a9a18d3
--- /dev/null
+++ b/site/resources/views/vendor/pagination/simple-bootstrap-4.blade.php
@@ -0,0 +1,17 @@
+@if ($paginator->hasPages())
+    <ul class="pagination">
+        {{-- Previous Page Link --}}
+        @if ($paginator->onFirstPage())
+            <li class="page-item disabled"><span class="page-link">@lang('pagination.previous')</span></li>
+        @else
+            <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">@lang('pagination.previous')</a></li>
+        @endif
+
+        {{-- Next Page Link --}}
+        @if ($paginator->hasMorePages())
+            <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">@lang('pagination.next')</a></li>
+        @else
+            <li class="page-item disabled"><span class="page-link">@lang('pagination.next')</span></li>
+        @endif
+    </ul>
+@endif
diff --git a/site/resources/views/vendor/pagination/simple-default.blade.php b/site/resources/views/vendor/pagination/simple-default.blade.php
new file mode 100644
index 0000000..1801609
--- /dev/null
+++ b/site/resources/views/vendor/pagination/simple-default.blade.php
@@ -0,0 +1,17 @@
+@if ($paginator->hasPages())
+    <ul class="pagination">
+        {{-- Previous Page Link --}}
+        @if ($paginator->onFirstPage())
+            <li class="disabled"><span>@lang('pagination.previous')</span></li>
+        @else
+            <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">@lang('pagination.previous')</a></li>
+        @endif
+
+        {{-- Next Page Link --}}
+        @if ($paginator->hasMorePages())
+            <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">@lang('pagination.next')</a></li>
+        @else
+            <li class="disabled"><span>@lang('pagination.next')</span></li>
+        @endif
+    </ul>
+@endif