Upgrade Laravel from 5.6 to 8. Switch to subdomain instead of subfolder.

9 files changed, 32 insertions, 46 deletions

diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 8dfd47f..c542406 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -70,19 +70,19 @@ Angebote
 	    <div class="card-img-overlay card-img-overlay-badge" >
 	    <p class="card-text float-right rounded off-badge"  >{{ $offer->procent}} %</p>
             </div>
-	<a href="/angebote/{{ $offer->url }}">
+	<a href="{{ $offer->url }}">
 	    <img width=280 height=400 src="{{ TF::Camo($offer->image_url) }}" class="card-img img-fluid mx-auto d-block">
 	</a>
           </div>
           <div class="col-md-8 px-10">
 	    <div class="card-header">
 		<p><strong>
-		<a style="color: inherit;" href="/angebote/search?q={{ ucfirst($offer->spirit_type) }}" title="Alle {{ ucfirst($offer->spirit_type) }} anzeigen">{{ ucfirst($offer->spirit_type) }}</a>
+		<a style="color: inherit;" href="{{ route('search', [ 'q' => ucfirst($offer->spirit_type) ] ) }}" title="Alle {{ ucfirst($offer->spirit_type) }} anzeigen">{{ ucfirst($offer->spirit_type) }}</a>
 		</strong></p>
 	    </div>
             <div class="card-block card-body px-3">
 
-			<a class="text-dark card-link" href="/angebote/{{ $offer->url }}">
+			<a class="text-dark card-link" href="/{{ $offer->url }}">
 				<h3 class="card-title">Hier geht es zu {{ $offer->angebotsname }}</h3>
 				<p>{{ $offer->linktext }}</p>
 			</a>
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 406e52a..e8cbacb 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -7,28 +7,17 @@
         <meta name="description" content="@yield('description')">
         <meta name="author" content="Maximilian Möhring">
         <link rel="shortcut icon" href="https://www.fuselkoenig.de/wp-content/themes/fuselkoenig_de_v2/img/paw_with_glencairn.png">
+	<link rel="shortcut icon" href="https://www.fuselkoenig.de/wp-content/themes/fuselkoenig_de_v2/img/favicon.png">
         <link rel="canonical" href="{{ URL::current() }}">
 	<meta name="apple-mobile-web-app-capable" content="yes">
 	<meta name="apple-mobile-web-app-title" content="Fuselkönig - Finde den besten Deal">
 
         <title>@yield('header') | {{ env("APP_BRANDING") }}</title>
 
-	<link rel="alternate" type="application/rss+xml" title="Fuselkönig &raquo; Feed" href="https://www.fuselkoenig.de/feed/" />
-	<link rel="alternate" type="application/rss+xml" title="Fuselkönig &raquo; Kommentar-Feed" href="https://www.fuselkoenig.de/comments/feed/" />
-
-	<link rel='stylesheet' id='yarppWidgetCss-css'  href='https://www.fuselkoenig.de/wp-content/plugins/yet-another-related-posts-plugin/style/widget.css' type='text/css' media='all' />
-	<link rel='stylesheet' id='social-icons-widget-widget-css'  href='https://www.fuselkoenig.de/wp-content/plugins/social-media-icons-widget/css/social_icons_widget.css' type='text/css' media='all' />
-	<link rel='stylesheet' id='wp-block-library-css'  href='https://www.fuselkoenig.de/wp-includes/css/dist/block-library/style.min.css' type='text/css' media='all' />
-	<link rel='stylesheet' id='contact-form-7-css'  href='https://www.fuselkoenig.de/wp-content/plugins/contact-form-7/includes/css/styles.css' type='text/css' media='all' />
-	<link rel='stylesheet' id='cookie-law-info-css'  href='https://www.fuselkoenig.de/wp-content/plugins/cookie-law-info/public/css/cookie-law-info-public.css' type='text/css' media='all' />
-	<link rel='stylesheet' id='cookie-law-info-gdpr-css'  href='https://www.fuselkoenig.de/wp-content/plugins/cookie-law-info/public/css/cookie-law-info-gdpr.css' type='text/css' media='all' />
-	<link rel='stylesheet' id='theme-styles-css'  href='https://www.fuselkoenig.de/wp-content/themes/fuselkoenig_de_v2/css/theme.min.css' type='text/css' media='all' />
-	<link rel='stylesheet' id='recent-posts-widget-with-thumbnails-public-style-css'  href='https://www.fuselkoenig.de/wp-content/plugins/recent-posts-widget-with-thumbnails/public.css' type='text/css' media='all' />
-	<link rel='stylesheet' href="https://www.fuselkoenig.de/wp-content/themes/fuselkoenig_de_v2/css/open-iconic-bootstrap.css">
+	<link rel='stylesheet' id='theme-styles-css'  href='/css/theme.min.css' type='text/css' media='all' />
+	<link rel='stylesheet' href="/css/open-iconic-bootstrap.css">
 
-	<script type='text/javascript' src='https://www.fuselkoenig.de/wp-includes/js/jquery/jquery.js?ver=1.4.1'></script>
-	<script type='text/javascript' src='https://www.fuselkoenig.de/wp-includes/js/jquery/jquery-migrate.min.js?ver=1.4.1'></script>
-	<link rel="shortcut icon" href="https://www.fuselkoenig.de/wp-content/themes/fuselkoenig_de_v2/img/favicon.png">
+	<script type='text/javascript' src='/js/jquery.js'></script>
 	<style>
 	p { font-size: 18px; }
 	.main-header {
@@ -37,7 +26,6 @@
 	</style>
 
 
-
 	@yield('feed')
 	@yield('css')
 
@@ -82,10 +70,8 @@ if ( "" != env('PIWIK_URL') && "" != env('PIWIK_ID') ) {
 
 	@include('snippets.footer')
 
-<script type='text/javascript' src='https://www.fuselkoenig.de/wp-content/plugins/contact-form-7/includes/js/scripts.js'></script>
-<script type='text/javascript' src='https://www.fuselkoenig.de/wp-content/themes/fuselkoenig_de_v2/js/theme.min.js'></script>
-<script type='text/javascript' src='https://www.fuselkoenig.de/wp-includes/js/underscore.min.js'></script>
-<script type='text/javascript' src='https://www.fuselkoenig.de/wp-includes/js/wp-embed.min.js'></script>
+<!--script type='text/javascript' src='/js/theme.min.js'></script-->
+<script type='text/javascript' src='/js/underscore.min.js'></script>
 
 	@yield('scripts')
 </body>
diff --git a/resources/views/listoffer.blade.php b/resources/views/listoffer.blade.php
index 906c83a..05bdb9f 100644
--- a/resources/views/listoffer.blade.php
+++ b/resources/views/listoffer.blade.php
@@ -13,8 +13,8 @@
 <?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 ( "" != Input::get('type') ) {
-		$header = "Alle " . Input::get('type') . "-Angebote";
+	if ( "" != Request::get('type') ) {
+		$header = "Alle " . Request::get('type') . "-Angebote";
 	} else if ( "Alle Angebote" == $spirit_type ) {
 		$header = "Alle aktuellen Sonderangebote";
 	} else if ( "Andere Angebote" == $spirit_type ){
@@ -42,7 +42,7 @@
 
 	@include('snippets.spirittypesbuttons')
 
-	{{ $data->appends(Input::except('page'))->links('paginate') }}
+	{{ $data->appends(Request::except('page'))->links('paginate') }}
 
 @if ( !$data->count() )
 	<!-- /* Keine Angebote */ -->
@@ -56,7 +56,7 @@
 	<!-- /* Liste Angebote */ -->
 	@include('offers')
 
-	{{ $data->appends(Input::except('page'))->links('paginate') }}
+	{{ $data->appends(Request::except('page'))->links('paginate') }}
 
 	<!-- /* Ende Liste Angebote */ -->
 @endif
diff --git a/resources/views/offers.blade.php b/resources/views/offers.blade.php
index 9d806c9..dbd1970 100644
--- a/resources/views/offers.blade.php
+++ b/resources/views/offers.blade.php
@@ -17,7 +17,7 @@
           <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>
+		<a style="color: inherit;" href="{{ route('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">
diff --git a/resources/views/search.blade.php b/resources/views/search.blade.php
index 03047ea..231dd16 100644
--- a/resources/views/search.blade.php
+++ b/resources/views/search.blade.php
@@ -24,7 +24,7 @@ Finde den besten Deal
 	Leider hat Ihre Suche nach <strong>{{ ucwords($search_phrase) }}</strong> keine Ergebnisse ergeben. Bitte versuchen sie es erneut mit einem anderen Begriff.
 	</p>
 
-	<form action="/angebote/search">
+	<form action="{{ route('search') }}">
 	  <div class="form-group">
 	    <label for=""></label>
 	    <input type="text" class="form-control" name="q" id="front_search_form" aria-describedby="suchform-help" placeholder="Hier nach der gewünschten Spirituose suchen...">
@@ -56,11 +56,11 @@ Finde den besten Deal
 
 	@include('snippets.spirittypesbuttons')
 
-	{{ $data->appends(Input::except('page'))->links('paginate') }}
+	{{ $data->appends(Request::except('page'))->links('paginate') }}
 
 	@include('offers')
 
-	{{ $data->appends(Input::except('page'))->links('paginate') }}
+	{{ $data->appends(Request::except('page'))->links('paginate') }}
 
 	<!-- /* Ende Liste Angebote */ -->
 
diff --git a/resources/views/snippets/breadcrumbs.blade.php b/resources/views/snippets/breadcrumbs.blade.php
index c338729..19d18ee 100644
--- a/resources/views/snippets/breadcrumbs.blade.php
+++ b/resources/views/snippets/breadcrumbs.blade.php
@@ -21,20 +21,20 @@
 		</li>
 		<li class="post post-angebote-archive breadcrumb-item">
 			<span property="itemListElement" typeof="ListItem">
-				<a property="item" typeof="WebPage" title="Gehe zur Angebotsseite." href="/angebote/" class="post post-angebote-archive">
+				<a property="item" typeof="WebPage" title="Gehe zur Angebotsseite." href="/" class="post post-angebote-archive">
 					<span property="name">Angebote</span>
 				</a>
 				<meta property="position" content="2">
 			</span>
 		</li>
-@if ( 1 == Input::get('page') || "" == Input::get('page') )
+@if ( 1 == Request::get('page') || "" == Request::get('page') )
 		<li class="archive taxonomy type current-item breadcrumb-item active" aria-current="page">
 			<span property="itemListElement" typeof="ListItem">
 				<span property="name">{{ ucwords($breadcrumb) }}</span>
 				<meta property="position" content="3">
 			</span>
 		</li>
-@elseif ( 1 < Input::get('page') )
+@elseif ( 1 < Request::get('page') )
 		<li class="post post-angebote-archive breadcrumb-item active">
 			<span property="itemListElement" typeof="ListItem">
 				<a property="item" typeof="WebPage" title="{{ ucwords($breadcrumb) }}" href="?page=1" class="post post-angebote-archive">
@@ -45,7 +45,7 @@
 		</li>
 		<li class="archive taxonomy type current-item breadcrumb-item" aria-current="page">
 			<span property="itemListElement" typeof="ListItem">
-				<span property="name">Seite {{ Input::get('page') }}</span>
+				<span property="name">Seite {{ Request::get('page') }}</span>
 				<meta property="position" content="4">
 			</span>
 		</li>
diff --git a/resources/views/snippets/footer.blade.php b/resources/views/snippets/footer.blade.php
index a870301..397626b 100644
--- a/resources/views/snippets/footer.blade.php
+++ b/resources/views/snippets/footer.blade.php
@@ -9,16 +9,16 @@
 		<div class="col-xs col-sm">
 			<nav class="nav flex-column">
 				<h3 class="nav-item text-muted">Impressum</h3>
-				<a class="nav-link" rel="nofollow" title="Link zum Impressum" href="/impressum/">Impressum</a>
-				<a class="nav-link" rel="nofollow" title="Link zum Haftungsausschluss" href="/impressum/#haftungsausschluss">Haftungsausschluss</a>
-				<a class="nav-link" rel="nofollow" title="Link zur Datenschutzerklärung" href="/impressum/#datenschutz">Datenschutz</a>
+				<a class="nav-link" rel="nofollow" title="Link zum Impressum" href="https://www.fuselkoenig.de/impressum/">Impressum</a>
+				<a class="nav-link" rel="nofollow" title="Link zum Haftungsausschluss" href="https://www.fuselkoenig.de/impressum/#haftungsausschluss">Haftungsausschluss</a>
+				<a class="nav-link" rel="nofollow" title="Link zur Datenschutzerklärung" href="https://www.fuselkoenig.de/impressum/#datenschutz">Datenschutz</a>
 			</nav>
 		</div>
 		<div class="col-xs col-sm">
 			<nav class="nav flex-column ml-0">
 				<h3 class="nav-item text-muted">Kontakt</h3>
-				<a class="nav-link" title="Link zum Kontaktformular" href="/kontakt">Kontaktformular</a>
-				<a class="nav-link" rel="nofollow" title="Über mich" href="/ueber-diesen-blog/">Maximilian Möhring</a>
+				<a class="nav-link" title="Link zum Kontaktformular" href="https://www.fuselkoenig.de/kontakt">Kontaktformular</a>
+				<a class="nav-link" rel="nofollow" title="Über mich" href="https://www.fuselkoenig.de/ueber-diesen-blog/">Maximilian Möhring</a>
 			</nav>
 		</div>
 		<div class="col-xs-12 col-sm">
@@ -26,13 +26,13 @@
 				<h3 class="nav-item text-muted">Social Media</h3>
 				<ul class="icons-medium nav">
 					<li class="pinterest">
-						<a title="Pinterest" class="nav-link" href="https://pinterest.de/fuselkoenig" target="_blank"><img class="site-icon" src="/wp-content/plugins/social-media-icons-widget/icons/medium/pinterest.jpg" alt="Pinterest" title="Pinterest" height="32" width="32" /></a>
+						<a title="Pinterest" class="nav-link" href="https://pinterest.de/fuselkoenig" target="_blank"><img class="site-icon" src="https://www.fuselkoenig.de/wp-content/plugins/social-media-icons-widget/icons/medium/pinterest.jpg" alt="Pinterest" title="Pinterest" height="32" width="32" /></a>
 					</li>		
 					<li class="twitter nav-item">
-						<a title="Twitter" class="nav-link" href="https://twitter.com/fuselkoenig" target="_blank"><img class="site-icon" src="/wp-content/plugins/social-media-icons-widget/icons/medium/twitter.jpg" alt="Twitter" title="Twitter" height="32" width="32" /></a>
+						<a title="Twitter" class="nav-link" href="https://twitter.com/fuselkoenig" target="_blank"><img class="site-icon" src="https://www.fuselkoenig.de/wp-content/plugins/social-media-icons-widget/icons/medium/twitter.jpg" alt="Twitter" title="Twitter" height="32" width="32" /></a>
 					</li>
 					<li class="rss">
-						<a title="RSS-Feed" class="nav-link" href="/feed/" target="_blank"><img class="site-icon" src="/wp-content/plugins/social-media-icons-widget/icons/medium/rss.jpg" alt="RSS Feed" title="RSS Feed" height="32" width="32" /></a>
+						<a title="RSS-Feed" class="nav-link" href="https://www.fuselkoenig.de/feed/" target="_blank"><img class="site-icon" src="https://www.fuselkoenig.de/wp-content/plugins/social-media-icons-widget/icons/medium/rss.jpg" alt="RSS Feed" title="RSS Feed" height="32" width="32" /></a>
 					</li>
 				</ul>
 			</nav>
diff --git a/resources/views/snippets/navbar.blade.php b/resources/views/snippets/navbar.blade.php
index d9428bf..5278103 100644
--- a/resources/views/snippets/navbar.blade.php
+++ b/resources/views/snippets/navbar.blade.php
@@ -31,7 +31,7 @@
 	<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement" id="menu-item-4018" class="menu-item menu-item-type-taxonomy menu-item-object-category menu-item-4018 nav-item"><a title="Mezcal" href="https://www.fuselkoenig.de/mezcal-tequila/" class="dropdown-item">Mezcal</a></li>
 </ul>
 </li>
-<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement" id="menu-item-4012" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-4012 active nav-item"><a title="Sonderangebote" href="https://www.fuselkoenig.de/angebote/" class="nav-link">Sonderangebote</a></li>
+<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement" id="menu-item-4012" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-4012 active nav-item"><a title="Sonderangebote" href="/" class="nav-link">Sonderangebote</a></li>
 <li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement" id="menu-item-4014" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-4014 nav-item"><a title="Fuselfotos" href="https://www.fuselkoenig.de/fuselfotos/" class="nav-link">Fuselfotos</a></li>
 <li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement" id="menu-item-4015" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-4015 nav-item"><a title="Über mich" href="https://www.fuselkoenig.de/ueber-diesen-blog/" class="nav-link">Über mich</a></li>
 </ul></div>			
@@ -47,7 +47,7 @@
 				</div>
 				<div class="col-sm col-xl-4 align-self-center">
 					
-<form class="form-inline my-2 my-lg-0 float-none float-sm-right" method="get" id="searchform" action="https://www.fuselkoenig.de/angebote/search" role="search">
+<form class="form-inline my-2 my-lg-0 float-none float-sm-right" method="get" id="searchform" action="{{ route('search') }}" role="search">
 	<label class="sr-only" for="s">Search</label>
 	<div class="input-group">
 		<input class="field form-control" id="q" name="q" type="text"
diff --git a/resources/views/snippets/spirittypesbuttons.blade.php b/resources/views/snippets/spirittypesbuttons.blade.php
index 0f0a5a5..1f2cf5e 100644
--- a/resources/views/snippets/spirittypesbuttons.blade.php
+++ b/resources/views/snippets/spirittypesbuttons.blade.php
@@ -5,7 +5,7 @@ if ( isset($spirit_types) && 0 < count($spirit_types) ) {
 <?php
 	foreach( $spirit_types as $o ) {
 ?>
-		<a class="btn btn-white" href="/angebote/search?type={{ $o->spirit_type }}">{{ $o->spirit_type }}</a>
+		<a class="btn btn-white" href="{{ route('search', [ 'type' => $o->spirit_type]) }}">{{ $o->spirit_type }}</a>
 <?php
 	}
 ?>