summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/Http/Controllers/RSSController.php13
-rw-r--r--resources/views/index.blade.php2
-rw-r--r--resources/views/layouts/base.blade.php12
-rw-r--r--resources/views/snippets/footer.blade.php2
-rw-r--r--resources/views/snippets/navbar.blade.php2
5 files changed, 16 insertions, 15 deletions
diff --git a/app/Http/Controllers/RSSController.php b/app/Http/Controllers/RSSController.php
index 7853b32..5d23b65 100644
--- a/app/Http/Controllers/RSSController.php
+++ b/app/Http/Controllers/RSSController.php
@@ -8,6 +8,7 @@ use App\Http\Controllers\Controller;
use Carbon;
use App\Libraries\Utility;
+use App\Libraries\TemplateFunction;
class RSSController extends Controller {
/**
@@ -57,7 +58,6 @@ class RSSController extends Controller {
* Database query
*/
$view_name = str_replace("_feed", "", \Request::route()->getName());
- $view_name = str_replace("/angebote/", "", $view_name);
if ( "search" == $view_name ) {
if ( "" != $request->get("q") ) {
@@ -68,7 +68,7 @@ class RSSController extends Controller {
$data = DB::table('all_view')->where('spirit_type', '=', $request->get('type'))->whereNotNull('url')->orderBy($sort_by, $order_by)->limit(20)->get();
}
} else {
- $data = DB::table($view_name . '_view')->orderBy($sort_by, $order_by)->limit(20)->get();
+ $data = DB::table($view_name . '_view')->where('procent', '>=', 10)->orderBy($sort_by, $order_by)->limit(20)->get();
}
/*
@@ -110,8 +110,9 @@ class RSSController extends Controller {
$feed->description = 'Finde immer die günstigsten Angebote im Bereich Spirituosen. Regelmäßig neue Schnäppchen.';
$feed->logo = url('https://angebote.fuselkoenig.de/img/paw-400-400.png');
$feed->link = url( $request->fullUrl() );
- $feed->setDateFormat('timestamp'); // 'datetime', 'timestamp' or 'carbon'
- $feed->pubdate = $data[0]->created_at;
+ #$feed->setDateFormat('timestamp'); // 'datetime', 'timestamp' or 'carbon'
+ $feed->setDateFormat('datetime'); // 'datetime', 'timestamp' or 'carbon'
+ $feed->pubdate = strftime('%Y-%m-%d', $data[0]->created_at);
$feed->lang = 'de';
$feed->setShortening(true); // true or false
$feed->setTextLimit(5000); // maximum length of description text
@@ -125,14 +126,14 @@ class RSSController extends Controller {
//$piwik->doTrackContentImpression($offer->spirit_type, $offer->name, $offer->long_url);
}
- $desc = '<p><img src="'.$offer->image_url.'"></p><p><strong>'.$offer->spirit_type.'</strong><br>'. $offer->name . ' gesenkt auf <strong>' . \TF::fF($offer->discounted_price) . '€</strong> statt ' . \TF::fF($offer->original_price) . '€ ('.$offer->procent.'% Rabatt auf '. $offer->shop .').';
+ $desc = '<p><img src="'.TemplateFunction::Camo($offer->image_url).'"></p><p><strong>'.$offer->spirit_type.'</strong><br>'. $offer->name . ' gesenkt auf <strong>' . \TF::fF($offer->discounted_price) . '€</strong> statt ' . \TF::fF($offer->original_price) . '€ ('.$offer->procent.'% Rabatt auf '. $offer->shop .').';
$feed->addItem( [
'title' => $offer->name,
'author' => $offer->shop,
'url' => $offer->url,
'link' => $offer->url,
- 'pubdate' => $offer->created_at,
+ 'pubdate' => strftime('%Y-%m-%d', $offer->created_at),
'description' => $desc,
'content' => $desc ] );
}
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index c542406..9e680a3 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -75,7 +75,7 @@ Angebote
</a>
</div>
<div class="col-md-8 px-10">
- <div class="card-header">
+ <div class="card-header card-header-dp-none">
<p><strong>
<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>
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 3b30c65..43b0cce 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -10,7 +10,7 @@
<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">
+ <meta name="apple-mobile-web-app-title" content="Sonderangebote - Finde den besten Deal - Made by Fuselkönig">
<title>@yield('header') | {{ env("APP_BRANDING") }}</title>
@@ -41,10 +41,10 @@ if ( "" != env('PIWIK_URL') && "" != env('PIWIK_ID') ) {
_paq.push(['trackVisibleContentImpressions']);
(function() {
var u="{{ env('PIWIK_URL') }}";
- _paq.push(['setTrackerUrl', u+'js/']);
+ _paq.push(['setTrackerUrl', u+'jsp/']);
_paq.push(['setSiteId', '{{ env("PIWIK_ID") }}']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
- g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'js/'; s.parentNode.insertBefore(g,s);
+ g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'jsp/'; s.parentNode.insertBefore(g,s);
})();
</script>
<?php
@@ -57,9 +57,9 @@ if ( "" != env('PIWIK_URL') && "" != env('PIWIK_ID') ) {
<?php
if ( "" != env('PIWIK_URL') && "" != env('PIWIK_ID') ) {
?>
-<noscript>
-<img src="{{ env('PIWIK_URL') }}js/?idsite={{ env('PIWIK_ID') }}&rec=1" style="border:0" alt="" />
-</noscript>
+ <noscript>
+ <img src="{{ env('PIWIK_URL') }}jsp/?idsite={{ env('PIWIK_ID') }}&rec=1" style="border:0" alt="" />
+ </noscript>
<?php
}
?>
diff --git a/resources/views/snippets/footer.blade.php b/resources/views/snippets/footer.blade.php
index 397626b..9fca64c 100644
--- a/resources/views/snippets/footer.blade.php
+++ b/resources/views/snippets/footer.blade.php
@@ -18,7 +18,7 @@
<nav class="nav flex-column ml-0">
<h3 class="nav-item text-muted">Kontakt</h3>
<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>
+ <a class="nav-link" rel="nofollow" title="Über mich" href="https://www.fuselkoenig.de/ueber-diesen-blog/">Über mich</a>
</nav>
</div>
<div class="col-xs-12 col-sm">
diff --git a/resources/views/snippets/navbar.blade.php b/resources/views/snippets/navbar.blade.php
index f8aacb6..3a00a0b 100644
--- a/resources/views/snippets/navbar.blade.php
+++ b/resources/views/snippets/navbar.blade.php
@@ -42,7 +42,7 @@
<div class="container">
<div class="row">
<div class="col-sm col-xl-8 align-self-center">
- <h1 class="d-none d-lg-inline"><a class="brand-url" rel="home" href="/" title="Fuselkönig" itemprop="url">Fuselkönig</a></h1>
+ <h1 class="d-none d-lg-inline"><a class="brand-url" rel="home" href="/" title="Fuselkönig" itemprop="url">Sonderangebote</a></h1>
<p class="slogan">Finde den besten Deal in Sachen Spirituosen</p>
</div>
<div class="col-sm col-xl-4 align-self-center">