Merge branch '238-confidential-issue' into 'development'

Produktwidget eingebaut

Closes #238

See merge request !395

app/MetaGer.php

@@ -30,6 +30,7 @@ class MetaGer
     protected $engines         = [];
     protected $results         = [];
     protected $ads             = [];
+    protected $products        = [];
     protected $warnings        = [];
     protected $errors          = [];
     protected $addedHosts      = [];
@@ -90,7 +91,6 @@ class MetaGer
     public function createView()
     {
         $viewResults = [];
-
         # Wir extrahieren alle notwendigen Variablen und geben Sie an unseren View:
         foreach ($this->results as $result) {
             $viewResults[] = get_object_vars($result);
@@ -173,6 +173,9 @@ class MetaGer
             foreach ($engine->ads as $ad) {
                 $this->ads[] = $ad;
             }
+            foreach ($engine->products as $product) {
+                $this->products[] = $product;
+            }
         }
 
         uasort($this->results, function ($a, $b) {
@@ -383,6 +386,7 @@ class MetaGer
                         && ($suma["name"]->__toString() === "qualigo"
                             || $suma["name"]->__toString() === "similar_product_ads"
                             || (!$overtureEnabled && $suma["name"]->__toString() === "overtureAds")
+                            || $suma["name"]->__toString() == "rlvproduct"
                         )
                     )
                 ) {
@@ -404,6 +408,7 @@ class MetaGer
                         && ($suma["name"]->__toString() === "qualigo"
                             || $suma["name"]->__toString() === "similar_product_ads"
                             || (!$overtureEnabled && $suma["name"]->__toString() === "overtureAds")
+                            || $suma["name"]->__toString() == "rlvproduct"
                         )
                     )
                 ) {
@@ -894,6 +899,26 @@ class MetaGer
 
     }
 
+    public function hasProducts()
+    {
+        if (count($this->products) > 0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public function getProducts()
+    {
+        $return = [];
+        foreach ($this->products as $product) {
+            $return[] = get_object_vars($product);
+        }
+        #die(var_dump($return));
+        return $return;
+
+    }
+
     public function canCache()
     {
         return $this->canCache;

app/Models/Result.php

@@ -60,6 +60,7 @@ class Result
         $this->rank           = 0;
         $this->partnershop    = $partnershop;
         $this->image          = $image;
+        $this->price          = $price;
     }
 
     /* Ranked das Ergebnis nach folgenden Aspekten:

app/Models/Searchengine.php

@@ -16,11 +16,12 @@ abstract class Searchengine
     protected $ch; # Curl Handle zum erhalten der Ergebnisse
     protected $getString = ""; # Der String für die Get-Anfrage
     protected $engine; # Die ursprüngliche Engine XML
-    public $enabled = true; # true, wenn die Suchmaschine nicht explizit disabled ist
-    public $results = []; # Die geladenen Ergebnisse
-    public $ads     = []; # Die geladenen Werbungen
-    public $loaded  = false; # wahr, sobald die Ergebnisse geladen wurden
-    public $cached  = false;
+    public $enabled  = true; # true, wenn die Suchmaschine nicht explizit disabled ist
+    public $results  = []; # Die geladenen Ergebnisse
+    public $ads      = []; # Die geladenen Werbungen
+    public $products = []; # Die geladenen Produkte
+    public $loaded   = false; # wahr, sobald die Ergebnisse geladen wurden
+    public $cached   = false;
 
     public $ip; # Die IP aus der metager
     public $gefVon; # Der HTML-Code für die Verlinkung des Suchanbieters

app/Models/parserSkripte/Rlvproduct.php

+<?php
+
+namespace app\Models\parserSkripte;
+
+use App\Models\Searchengine;
+
+class RlvProduct extends Searchengine
+{
+    public $results = [];
+
+    public function __construct(\SimpleXMLElement $engine, \App\MetaGer $metager)
+    {
+        parent::__construct($engine, $metager);
+    }
+
+    public function loadResults($result)
+    {
+        # try
+        # {
+        $results = json_decode($result, true);
+        $counter = 0;
+        foreach ($results["products"] as $result) {
+            $counter++;
+            $image            = $result["productImage"];
+            $image            = str_replace("//", "https://", $image);
+            $this->products[] = new \App\Models\Result(
+                $this->engine,
+                $result["productTitle"],
+                $result["shopLink"],
+                $result["shopLink"],
+                "",
+                $result["shopTitle"],
+                $counter,
+                $partnershop = false,
+                $image,
+                $result["price"]
+            );
+        }
+    }
+}

public/css/lightslider.css

+/*! lightslider - v1.1.3 - 2015-04-14
+* https://github.com/sachinchoolur/lightslider
+* Copyright (c) 2015 Sachin N; Licensed MIT */
+
+
+/** /!!! core css Should not edit !!!/**/
+
+.lSSlideOuter {
+    overflow: hidden;
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none
+}
+
+.lightSlider:before, .lightSlider:after {
+    content: " ";
+    display: table;
+}
+
+.lightSlider {
+    /* overflow: hidden;*/
+    margin: 0;
+}
+
+.lSSlideWrapper {
+    max-width: 100%;
+    overflow: hidden;
+    position: relative;
+}
+
+.lSSlideWrapper > .lightSlider:after {
+    clear: both;
+}
+
+.lSSlideWrapper .lSSlide {
+    -webkit-transform: translate(0px, 0px);
+    -ms-transform: translate(0px, 0px);
+    transform: translate(0px, 0px);
+    -webkit-transition: all 1s;
+    -webkit-transition-property: -webkit-transform, height;
+    -moz-transition-property: -moz-transform, height;
+    transition-property: transform, height;
+    -webkit-transition-duration: inherit !important;
+    transition-duration: inherit !important;
+    -webkit-transition-timing-function: inherit !important;
+    transition-timing-function: inherit !important;
+}
+
+.lSSlideWrapper .lSFade {
+    position: relative;
+}
+
+.lSSlideWrapper .lSFade > * {
+    position: absolute !important;
+    top: 0;
+    left: 0;
+    z-index: 9;
+    margin-right: 0;
+    width: 100%;
+}
+
+.lSSlideWrapper.usingCss .lSFade > * {
+    opacity: 0;
+    -webkit-transition-delay: 0s;
+    transition-delay: 0s;
+    -webkit-transition-duration: inherit !important;
+    transition-duration: inherit !important;
+    -webkit-transition-property: opacity;
+    transition-property: opacity;
+    -webkit-transition-timing-function: inherit !important;
+    transition-timing-function: inherit !important;
+}
+
+.lSSlideWrapper .lSFade > *.active {
+    z-index: 10;
+}
+
+.lSSlideWrapper.usingCss .lSFade > *.active {
+    opacity: 1;
+}
+
+
+/** /!!! End of core css Should not edit !!!/**/
+
+
+/* Pager */
+
+.lSSlideOuter .lSPager.lSpg {
+    margin: 10px 0 0;
+    padding: 0;
+    text-align: center;
+}
+
+.lSSlideOuter .lSPager.lSpg > li {
+    cursor: pointer;
+    display: inline-block;
+    padding: 0 5px;
+}
+
+.lSSlideOuter .lSPager.lSpg > li a {
+    background-color: #222222;
+    border-radius: 30px;
+    display: inline-block;
+    height: 8px;
+    overflow: hidden;
+    text-indent: -999em;
+    width: 8px;
+    position: relative;
+    z-index: 99;
+    -webkit-transition: all 0.5s linear 0s;
+    transition: all 0.5s linear 0s;
+}
+
+.lSSlideOuter .lSPager.lSpg > li:hover a, .lSSlideOuter .lSPager.lSpg > li.active a {
+    background-color: #428bca;
+}
+
+.lSSlideOuter .media {
+    opacity: 0.8;
+}
+
+.lSSlideOuter .media.active {
+    opacity: 1;
+}
+
+
+/* End of pager */
+
+
+/** Gallery */
+
+.lSSlideOuter .lSPager.lSGallery {
+    list-style: none outside none;
+    padding-left: 0;
+    margin: 0;
+    overflow: hidden;
+    transform: translate3d(0px, 0px, 0px);
+    -moz-transform: translate3d(0px, 0px, 0px);
+    -ms-transform: translate3d(0px, 0px, 0px);
+    -webkit-transform: translate3d(0px, 0px, 0px);
+    -o-transform: translate3d(0px, 0px, 0px);
+    -webkit-transition-property: -webkit-transform;
+    -moz-transition-property: -moz-transform;
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+.lSSlideOuter .lSPager.lSGallery li {
+    overflow: hidden;
+    -webkit-transition: border-radius 0.12s linear 0s 0.35s linear 0s;
+    transition: border-radius 0.12s linear 0s 0.35s linear 0s;
+}
+
+.lSSlideOuter .lSPager.lSGallery li.active, .lSSlideOuter .lSPager.lSGallery li:hover {
+    border-radius: 5px;
+}
+
+.lSSlideOuter .lSPager.lSGallery img {
+    display: block;
+    height: auto;
+    max-width: 100%;
+}
+
+.lSSlideOuter .lSPager.lSGallery:before, .lSSlideOuter .lSPager.lSGallery:after {
+    content: " ";
+    display: table;
+}
+
+.lSSlideOuter .lSPager.lSGallery:after {
+    clear: both;
+}
+
+
+/* End of Gallery*/
+
+
+/* slider actions */
+
+.lSAction > a {
+    width: 32px;
+    display: block;
+    top: 50%;
+    height: 32px;
+    background-image: url('../img/controls.png');
+    cursor: pointer;
+    position: absolute;
+    z-index: 99;
+    margin-top: -16px;
+    opacity: 0.5;
+    -webkit-transition: opacity 0.35s linear 0s;
+    transition: opacity 0.35s linear 0s;
+}
+
+.lSAction > a:hover {
+    opacity: 1;
+}
+
+.lSAction > .lSPrev {
+    background-position: 0 0;
+    left: 10px;
+}
+
+.lSAction > .lSNext {
+    background-position: -32px 0;
+    right: 10px;
+}
+
+.lSAction > a.disabled {
+    pointer-events: none;
+}
+
+.cS-hidden {
+    height: 1px;
+    opacity: 0;
+    filter: alpha(opacity=0);
+    overflow: hidden;
+}
+
+
+/* vertical */
+
+.lSSlideOuter.vertical {
+    position: relative;
+}
+
+.lSSlideOuter.vertical.noPager {
+    padding-right: 0px !important;
+}
+
+.lSSlideOuter.vertical .lSGallery {
+    position: absolute !important;
+    right: 0;
+    top: 0;
+}
+
+.lSSlideOuter.vertical .lightSlider > * {
+    width: 100% !important;
+    max-width: none !important;
+}
+
+
+/* vertical controlls */
+
+.lSSlideOuter.vertical .lSAction > a {
+    left: 50%;
+    margin-left: -14px;
+    margin-top: 0;
+}
+
+.lSSlideOuter.vertical .lSAction > .lSNext {
+    background-position: 31px -31px;
+    bottom: 10px;
+    top: auto;
+}
+
+.lSSlideOuter.vertical .lSAction > .lSPrev {
+    background-position: 0 -31px;
+    bottom: auto;
+    top: 10px;
+}
+
+
+/* vertical */
+
+
+/* Rtl */
+
+.lSSlideOuter.lSrtl {
+    direction: rtl;
+}
+
+.lSSlideOuter .lightSlider, .lSSlideOuter .lSPager {
+    padding-left: 0;
+    list-style: none outside none;
+}
+
+.lSSlideOuter.lSrtl .lightSlider, .lSSlideOuter.lSrtl .lSPager {
+    padding-right: 0;
+}
+
+.lSSlideOuter .lightSlider > *, .lSSlideOuter .lSGallery li {
+    float: left;
+}
+
+.lSSlideOuter.lSrtl .lightSlider > *, .lSSlideOuter.lSrtl .lSGallery li {
+    float: right !important;
+}
+
+
+/* Rtl */
+
+@-webkit-keyframes rightEnd {
+    0% {
+        left: 0;
+    }
+    50% {
+        left: -15px;
+    }
+    100% {
+        left: 0;
+    }
+}
+
+@keyframes rightEnd {
+    0% {
+        left: 0;
+    }
+    50% {
+        left: -15px;
+    }
+    100% {
+        left: 0;
+    }
+}
+
+@-webkit-keyframes topEnd {
+    0% {
+        top: 0;
+    }
+    50% {
+        top: -15px;
+    }
+    100% {
+        top: 0;
+    }
+}
+
+@keyframes topEnd {
+    0% {
+        top: 0;
+    }
+    50% {
+        top: -15px;
+    }
+    100% {
+        top: 0;
+    }
+}
+
+@-webkit-keyframes leftEnd {
+    0% {
+        left: 0;
+    }
+    50% {
+        left: 15px;
+    }
+    100% {
+        left: 0;
+    }
+}
+
+@keyframes leftEnd {
+    0% {
+        left: 0;
+    }
+    50% {
+        left: 15px;
+    }
+    100% {
+        left: 0;
+    }
+}
+
+@-webkit-keyframes bottomEnd {
+    0% {
+        bottom: 0;
+    }
+    50% {
+        bottom: -15px;
+    }
+    100% {
+        bottom: 0;
+    }
+}
+
+@keyframes bottomEnd {
+    0% {
+        bottom: 0;
+    }
+    50% {
+        bottom: -15px;
+    }
+    100% {
+        bottom: 0;
+    }
+}
+
+.lSSlideOuter .rightEnd {
+    -webkit-animation: rightEnd 0.3s;
+    animation: rightEnd 0.3s;
+    position: relative;
+}
+
+.lSSlideOuter .leftEnd {
+    -webkit-animation: leftEnd 0.3s;
+    animation: leftEnd 0.3s;
+    position: relative;
+}
+
+.lSSlideOuter.vertical .rightEnd {
+    -webkit-animation: topEnd 0.3s;
+    animation: topEnd 0.3s;
+    position: relative;
+}
+
+.lSSlideOuter.vertical .leftEnd {
+    -webkit-animation: bottomEnd 0.3s;
+    animation: bottomEnd 0.3s;
+    position: relative;
+}
+
+.lSSlideOuter.lSrtl .rightEnd {
+    -webkit-animation: leftEnd 0.3s;
+    animation: leftEnd 0.3s;
+    position: relative;
+}
+
+.lSSlideOuter.lSrtl .leftEnd {
+    -webkit-animation: rightEnd 0.3s;
+    animation: rightEnd 0.3s;
+    position: relative;
+}
+
+
+/*/  GRab cursor */
+
+.lightSlider.lsGrab > * {
+    cursor: -webkit-grab;
+    cursor: -moz-grab;
+    cursor: -o-grab;
+    cursor: -ms-grab;
+    cursor: grab;
+}
+
+.lightSlider.lsGrabbing > * {
+    cursor: move;
+    cursor: -webkit-grabbing;
+    cursor: -moz-grabbing;
+    cursor: -o-grabbing;
+    cursor: -ms-grabbing;
+    cursor: grabbing;
+}
\ No newline at end of file

public/css/styleResultPage.css

@@ -400,7 +400,7 @@ a:hover {
 
 .popover-content {
     /*padding-left: 0;
-	padding-right:0;*/
+    padding-right:0;*/
 }
 
 .options-list > li {}
@@ -524,4 +524,58 @@ footer a {
     #searchplugin {
         display: initial;
     }
+}
+
+.product {
+    text-align: center;
+    border: 1px dotted lightgrey;
+    padding: 5px;
+    max-width: 150px;
+}
+
+.product a {
+    color: #333;
+}
+
+.product .price {
+    position: relative;
+    top: 20px;
+    background-color: rgba(255, 255, 255, 0.9);
+    color: #333;
+    text-align: left;
+    width: 80px;
+}
+
+.product .title {
+    font-size: 12px;
+    font-weight: bold;
+    text-align: left;
+    max-height: 31px;
+    overflow: hidden;
+    margin-bottom: 4px;
+}
+
+.product .shop {
+    font-size: 10px;
+    text-align: left;
+    color: green;