Merge branch 'development' into 798-redesign-the-assoziator

app/Http/Controllers/StartpageController.php

@@ -7,6 +7,8 @@ use Illuminate\Http\Request;
 use Jenssegers\Agent\Agent;
 use LaravelLocalization;
 use Response;
+use DB;
+use Log;
 
 class StartpageController extends Controller
 {
@@ -41,6 +43,14 @@ class StartpageController extends Controller
         if ($lang === 'de' || $lang === "en") {
             $lang = 'all';
         }
+        
+        # Sponsorenlinks
+        $sponsors = [];
+        try{
+            $sponsors = DB::table('sponsorenlinks')->where('langcode', 'de')->orderByRaw('LENGTH(linktext)', 'ASC')->get();
+        } catch(\Illuminate\Database\QueryException $e){
+            Log::info($e);
+        }
 
         return view('index')
             ->with('title', trans('titles.index'))
@@ -52,6 +62,7 @@ class StartpageController extends Controller
             ->with('request', $request->input('request', 'GET'))
             ->with('option_values', $option_values)
             ->with('autocomplete', $autocomplete)
+            ->with('sponsors', $sponsors)
             ->with('pluginmodal', $request->input('plugin-modal', 'off'));
     }
 

app/Http/Middleware/HumanVerification.php

@@ -126,7 +126,8 @@ class HumanVerification
         } catch (\Illuminate\Database\QueryException $e) {
             // Failure in contacting metager3.de
         }
-        $request->request->add(['verification_id' => $uid, 'verification_count' => $unusedResultPages]);
+        if(isset($uid) && isset($unusedResultPages))
+            $request->request->add(['verification_id' => $uid, 'verification_count' => $unusedResultPages]);
         return $next($request);
     }
 }

resources/assets/js/lib/imagesloaded.js

-/*!
- * imagesLoaded PACKAGED v3.1.8
- * JavaScript is all like "You images are done yet or what?"
- * MIT License
- */
-
-(function(){function e(){}function t(e,t){for(var n=e.length;n--;)if(e[n].listener===t)return n;return-1}function n(e){return function(){return this[e].apply(this,arguments)}}var i=e.prototype,r=this,o=r.EventEmitter;i.getListeners=function(e){var t,n,i=this._getEvents();if("object"==typeof e){t={};for(n in i)i.hasOwnProperty(n)&&e.test(n)&&(t[n]=i[n])}else t=i[e]||(i[e]=[]);return t},i.flattenListeners=function(e){var t,n=[];for(t=0;e.length>t;t+=1)n.push(e[t].listener);return n},i.getListenersAsObject=function(e){var t,n=this.getListeners(e);return n instanceof Array&&(t={},t[e]=n),t||n},i.addListener=function(e,n){var i,r=this.getListenersAsObject(e),o="object"==typeof n;for(i in r)r.hasOwnProperty(i)&&-1===t(r[i],n)&&r[i].push(o?n:{listener:n,once:!1});return this},i.on=n("addListener"),i.addOnceListener=function(e,t){return this.addListener(e,{listener:t,once:!0})},i.once=n("addOnceListener"),i.defineEvent=function(e){return this.getListeners(e),this},i.defineEvents=function(e){for(var t=0;e.length>t;t+=1)this.defineEvent(e[t]);return this},i.removeListener=function(e,n){var i,r,o=this.getListenersAsObject(e);for(r in o)o.hasOwnProperty(r)&&(i=t(o[r],n),-1!==i&&o[r].splice(i,1));return this},i.off=n("removeListener"),i.addListeners=function(e,t){return this.manipulateListeners(!1,e,t)},i.removeListeners=function(e,t){return this.manipulateListeners(!0,e,t)},i.manipulateListeners=function(e,t,n){var i,r,o=e?this.removeListener:this.addListener,s=e?this.removeListeners:this.addListeners;if("object"!=typeof t||t instanceof RegExp)for(i=n.length;i--;)o.call(this,t,n[i]);else for(i in t)t.hasOwnProperty(i)&&(r=t[i])&&("function"==typeof r?o.call(this,i,r):s.call(this,i,r));return this},i.removeEvent=function(e){var t,n=typeof e,i=this._getEvents();if("string"===n)delete i[e];else if("object"===n)for(t in i)i.hasOwnProperty(t)&&e.test(t)&&delete i[t];else delete this._events;return this},i.removeAllListeners=n("removeEvent"),i.emitEvent=function(e,t){var n,i,r,o,s=this.getListenersAsObject(e);for(r in s)if(s.hasOwnProperty(r))for(i=s[r].length;i--;)n=s[r][i],n.once===!0&&this.removeListener(e,n.listener),o=n.listener.apply(this,t||[]),o===this._getOnceReturnValue()&&this.removeListener(e,n.listener);return this},i.trigger=n("emitEvent"),i.emit=function(e){var t=Array.prototype.slice.call(arguments,1);return this.emitEvent(e,t)},i.setOnceReturnValue=function(e){return this._onceReturnValue=e,this},i._getOnceReturnValue=function(){return this.hasOwnProperty("_onceReturnValue")?this._onceReturnValue:!0},i._getEvents=function(){return this._events||(this._events={})},e.noConflict=function(){return r.EventEmitter=o,e},"function"==typeof define&&define.amd?define("eventEmitter/EventEmitter",[],function(){return e}):"object"==typeof module&&module.exports?module.exports=e:this.EventEmitter=e}).call(this),function(e){function t(t){var n=e.event;return n.target=n.target||n.srcElement||t,n}var n=document.documentElement,i=function(){};n.addEventListener?i=function(e,t,n){e.addEventListener(t,n,!1)}:n.attachEvent&&(i=function(e,n,i){e[n+i]=i.handleEvent?function(){var n=t(e);i.handleEvent.call(i,n)}:function(){var n=t(e);i.call(e,n)},e.attachEvent("on"+n,e[n+i])});var r=function(){};n.removeEventListener?r=function(e,t,n){e.removeEventListener(t,n,!1)}:n.detachEvent&&(r=function(e,t,n){e.detachEvent("on"+t,e[t+n]);try{delete e[t+n]}catch(i){e[t+n]=void 0}});var o={bind:i,unbind:r};"function"==typeof define&&define.amd?define("eventie/eventie",o):e.eventie=o}(this),function(e,t){"function"==typeof define&&define.amd?define(["eventEmitter/EventEmitter","eventie/eventie"],function(n,i){return t(e,n,i)}):"object"==typeof exports?module.exports=t(e,require("wolfy87-eventemitter"),require("eventie")):e.imagesLoaded=t(e,e.EventEmitter,e.eventie)}(window,function(e,t,n){function i(e,t){for(var n in t)e[n]=t[n];return e}function r(e){return"[object Array]"===d.call(e)}function o(e){var t=[];if(r(e))t=e;else if("number"==typeof e.length)for(var n=0,i=e.length;i>n;n++)t.push(e[n]);else t.push(e);return t}function s(e,t,n){if(!(this instanceof s))return new s(e,t);"string"==typeof e&&(e=document.querySelectorAll(e)),this.elements=o(e),this.options=i({},this.options),"function"==typeof t?n=t:i(this.options,t),n&&this.on("always",n),this.getImages(),a&&(this.jqDeferred=new a.Deferred);var r=this;setTimeout(function(){r.check()})}function f(e){this.img=e}function c(e){this.src=e,v[e]=this}var a=e.jQuery,u=e.console,h=u!==void 0,d=Object.prototype.toString;s.prototype=new t,s.prototype.options={},s.prototype.getImages=function(){this.images=[];for(var e=0,t=this.elements.length;t>e;e++){var n=this.elements[e];"IMG"===n.nodeName&&this.addImage(n);var i=n.nodeType;if(i&&(1===i||9===i||11===i))for(var r=n.querySelectorAll("img"),o=0,s=r.length;s>o;o++){var f=r[o];this.addImage(f)}}},s.prototype.addImage=function(e){var t=new f(e);this.images.push(t)},s.prototype.check=function(){function e(e,r){return t.options.debug&&h&&u.log("confirm",e,r),t.progress(e),n++,n===i&&t.complete(),!0}var t=this,n=0,i=this.images.length;if(this.hasAnyBroken=!1,!i)return this.complete(),void 0;for(var r=0;i>r;r++){var o=this.images[r];o.on("confirm",e),o.check()}},s.prototype.progress=function(e){this.hasAnyBroken=this.hasAnyBroken||!e.isLoaded;var t=this;setTimeout(function(){t.emit("progress",t,e),t.jqDeferred&&t.jqDeferred.notify&&t.jqDeferred.notify(t,e)})},s.prototype.complete=function(){var e=this.hasAnyBroken?"fail":"done";this.isComplete=!0;var t=this;setTimeout(function(){if(t.emit(e,t),t.emit("always",t),t.jqDeferred){var n=t.hasAnyBroken?"reject":"resolve";t.jqDeferred[n](t)}})},a&&(a.fn.imagesLoaded=function(e,t){var n=new s(this,e,t);return n.jqDeferred.promise(a(this))}),f.prototype=new t,f.prototype.check=function(){var e=v[this.img.src]||new c(this.img.src);if(e.isConfirmed)return this.confirm(e.isLoaded,"cached was confirmed"),void 0;if(this.img.complete&&void 0!==this.img.naturalWidth)return this.confirm(0!==this.img.naturalWidth,"naturalWidth"),void 0;var t=this;e.on("confirm",function(e,n){return t.confirm(e.isLoaded,n),!0}),e.check()},f.prototype.confirm=function(e,t){this.isLoaded=e,this.emit("confirm",this,t)};var v={};return c.prototype=new t,c.prototype.check=function(){if(!this.isChecked){var e=new Image;n.bind(e,"load",this),n.bind(e,"error",this),e.src=this.src,this.isChecked=!0}},c.prototype.handleEvent=function(e){var t="on"+e.type;this[t]&&this[t](e)},c.prototype.onload=function(e){this.confirm(!0,"onload"),this.unbindProxyEvents(e)},c.prototype.onerror=function(e){this.confirm(!1,"onerror"),this.unbindProxyEvents(e)},c.prototype.confirm=function(e,t){this.isConfirmed=!0,this.isLoaded=e,this.emit("confirm",this,t)},c.prototype.unbindProxyEvents=function(e){n.unbind(e.target,"load",this),n.unbind(e.target,"error",this)},s});
\ No newline at end of file

resources/assets/less/metager/general.less

 /* Default Font */
 
-* {
+body {
     font-family: Liberation Sans, sans-serif;
 }
 
@@ -82,7 +82,7 @@ p {
     .first-last-child-margin-fix;
 }
 
-* {
+body {
     font-size: @default-font-size;
     .first-last-child-margin-fix;
 }

resources/views/index.blade.php

@@ -11,8 +11,8 @@
 	<div id="show-plugin-modal">
 		<label for="plugin-modal-checkbox" class="btn btn-default open-plugin-modal" title="{{ trans('index.plugin.open-modal.title') }}"><i class="fa fa-plug" aria-hidden="true"></i> {{ trans('index.plugin.open-modal') }}</label>
 	</div>
-	<script src="{{ mix('js/scriptStartPage.js') }}"></script>
-	<script src="{{ mix('js/searchbar.js') }}"></script>
+	<script src="{{ mix('js/scriptStartPage.js') }}" defer></script>
+	<script src="{{ mix('js/searchbar.js') }}" defer></script>
 @endsection
 
 @section('optionalContent')
@@ -25,7 +25,7 @@
 		<div id="sponsors">
 			<h2>{{ trans('index.sponsors.head.2') }}</h2>
 			<ul class="startpage">
-				@foreach(DB::table('sponsorenlinks')->where('langcode', 'de')->orderByRaw('LENGTH(linktext)', 'ASC')->get() as $link)
+				@foreach($sponsors as $link)
 				<li class="sponsor">
 					<a href="{{ $link->link }}" target="_blank" rel="noopener"><p>{{ $link->linktext }}</p> <i class="fa fa-external-link"></i></a>
 				</li>

resources/views/layouts/resultPage.blade.php

@@ -13,7 +13,6 @@
 		<meta name="mn" content="{{ $metager->getVerificationCount() }}" />
 		<link rel="search" type="application/opensearchdescription+xml" title="{!! trans('resultPage.opensearch') !!}" href="{{  LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}">
 		<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/default.css') }}" />
-		<link type="text/css" rel="stylesheet" href="/font-awesome/css/font-awesome.min.css" />
 		<link type="text/css" rel="stylesheet" href="/fonts/liberation-fonts/liberation-fonts.css" />
 		<link id="theme" type="text/css" rel="stylesheet" href="/css/theme.css.php" />
 		<meta name="referrer" content="origin">
@@ -43,8 +42,8 @@
 		@include('parts.footer', ['type' => 'resultpage', 'id' => 'resultPageFooter'])
 		<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" alt=""/>
 		<script src="{{ mix('js/lib.js') }}"></script>
-		<script src="{{ mix('js/scriptResultPage.js') }}"></script>
-		<script src="{{ mix('js/focus-creator.js') }}"></script>
-		<script src="{{ mix('js/searchbar.js') }}"></script>
+		<script src="{{ mix('js/scriptResultPage.js') }}" defer></script>
+		<script src="{{ mix('js/focus-creator.js') }}" defer></script>
+		<script src="{{ mix('js/searchbar.js') }}" defer></script>
 	</body>
 </html>

webpack.mix.js

-let mix = require('laravel-mix');
+let mix = require("laravel-mix");
 
 /*
  |--------------------------------------------------------------------------
@@ -13,31 +13,57 @@ let mix = require('laravel-mix');
 
 mix
   // css
-  .less('resources/assets/less/default.less', 'public/css/themes/default.css', {
+  .less("resources/assets/less/default.less", "public/css/themes/default.css", {
     strictMath: true
   })
-  .less('resources/assets/less/metager/beitritt.less', 'public/css/beitritt.css', {
-    strictMath: true
-  })
-  .less('resources/assets/less/utility.less', 'public/css/utility.css', {
+  .less(
+    "resources/assets/less/metager/beitritt.less",
+    "public/css/beitritt.css",
+    {
+      strictMath: true
+    }
+  )
+  .less("resources/assets/less/utility.less", "public/css/utility.css", {
     strictMath: true
   })
   // js
-  .babel(['resources/assets/js/lib/jquery.js', 'resources/assets/js/lib/jquery-ui.min.js', 'resources/assets/js/lib/bootstrap.js',
-    'resources/assets/js/lib/masonry.js', 'resources/assets/js/lib/imagesloaded.js', 'resources/assets/js/lib/openpgp.min.js', 'resources/assets/js/lib/iframeResizer.min.js',
-    'resources/assets/js/lib/md5.js'
-  ], 'public/js/lib.js')
-  .babel(['resources/assets/js/scriptStartPage.js', 'resources/assets/js/result-saver.js'], 'public/js/scriptStartPage.js')
-  .babel(['resources/assets/js/scriptResultPage.js', 'resources/assets/js/result-saver.js', 'resources/assets/js/translations.js'], 'public/js/scriptResultPage.js')
-  .babel('resources/assets/js/searchbar.js', 'public/js/searchbar.js')
-  .babel('resources/assets/js/focus-creator.js', 'public/js/focus-creator.js')
-  .babel('resources/assets/js/focus-creator.js', 'public/js/focus-creator.js')
-  .babel('resources/assets/js/editLanguage.js', 'public/js/editLanguage.js')
+  .babel(
+    [
+      "resources/assets/js/lib/jquery.js",
+      "resources/assets/js/lib/jquery-ui.min.js",
+      "resources/assets/js/lib/bootstrap.js",
+      "resources/assets/js/lib/iframeResizer.min.js",
+      "resources/assets/js/lib/md5.js"
+    ],
+    "public/js/lib.js"
+  )
+  .babel(
+    [
+      "resources/assets/js/scriptStartPage.js",
+      "resources/assets/js/result-saver.js"
+    ],
+    "public/js/scriptStartPage.js"
+  )
+  .babel(
+    [
+      "resources/assets/js/scriptResultPage.js",
+      "resources/assets/js/result-saver.js",
+      "resources/assets/js/translations.js"
+    ],
+    "public/js/scriptResultPage.js"
+  )
+  .babel("resources/assets/js/searchbar.js", "public/js/searchbar.js")
+  .babel("resources/assets/js/focus-creator.js", "public/js/focus-creator.js")
+  .babel("resources/assets/js/focus-creator.js", "public/js/focus-creator.js")
+  .babel("resources/assets/js/editLanguage.js", "public/js/editLanguage.js")
   // utility
-  .babel(['resources/assets/js/utility.js', 'resources/assets/js/translations.js'], 'public/js/utility.js')
-  .babel('resources/assets/js/widgets.js', 'public/js/widgets.js')
-  .babel('resources/assets/js/scriptJoinPage.js', 'public/js/scriptJoinPage.js')
+  .babel(
+    ["resources/assets/js/utility.js", "resources/assets/js/translations.js"],
+    "public/js/utility.js"
+  )
+  .babel("resources/assets/js/widgets.js", "public/js/widgets.js")
+  .babel("resources/assets/js/scriptJoinPage.js", "public/js/scriptJoinPage.js")
   // source maps
-  .sourceMaps(false, 'inline-source-map')
+  .sourceMaps(false, "inline-source-map")
   // versioning
   .version();