Merge branch 'development' of https://gitlab.metager3.de/open-source/MetaGer into development

resources/views/key.blade.php

+@extends('layouts.subPages', ['page' => 'key'])
+
+@section('title', $title )
+
+@section('content')
+<link type="text/css" rel="stylesheet" href="{{ mix('/css/key.css') }}" />
+<div id="key-site">
+    <div class="section">
+        <h1>{{ trans('key.h1')}}</h1>
+        <p>{!! trans('key.p1', ['url1' => LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), '/beitritt'), 'url2' => LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), '/spende')])!!}</p>
+        <p>{{ trans('key.p2') }}</p>
+        <p>{{ trans('key.p3') }}</p>
+        <p>{{ trans('key.p4') }}</p>
+    </div>
+    <div class="section">
+        <div id="form-wrapper">
+            <form method="post">
+                <input type="hidden" name="redirUrl" value="{{ Request::input('redirUrl', '') }}" />
+                <input type="text" name="key" value="{{Cookie::get('key')}}" placeholder="@lang('key.placeholder1')" autofocus>
+                <button type="submit" class="btn btn-success">OK</button>
+            </form>
+            @if(Cookie::get('key') !== NULL)
+            <form method="post" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('KeyController@removeKey', ['redirUrl' => url()->full()])) }}">
+                <input type="hidden" name="redirUrl" value="{{ Request::input('redirUrl', '') }}" />
+                <button type="submit" class="btn btn-error">@lang('key.removeKey')</button>
+            </form>
+            @endif
+        </div>
+        @if(isset($keyValid) && $keyValid === false)
+        <p class="error">@lang('key.invalidKey')</p>
+        @endif
+        @if(Request::input('redirUrl', '') !== '')
+        <div id="back-link"><a href="{{Request::input('redirUrl')}}">@lang('key.backLink')</a></div>
+        @endif
+    </div>
+</div>
+@endsection

resources/views/parts/searchbar.blade.php

@@ -4,10 +4,9 @@
 		<div class="searchbar {{$class ?? ''}}">
 			<div class="search-input-submit">
 				<div id="search-key">
-					<input id="input-key" type="text" name="key" placeholder="{{ trans ('index.key.placeholder') }}" tabindex="1">
-					<label id="key-label" for="input-key" data-tooltip="{{ trans ('index.key.tooltip') }}">
+					<a id="key-link" @if(isset($apiAuthorized) && $apiAuthorized)class="authorized" @else class="unauthorized"@endif href="{{ action('KeyController@index', ['redirUrl' => url()->full() ]) }}" data-tooltip="{{ trans ('index.key.tooltip') }}">
 						<i class="fa fa-key" aria-hidden="true"></i>
-					</label>
+					</a>
 				</div>
 				<div class="search-input">
 					<input type="search" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif" required=""  @if(\Request::is('/')) autofocus @endif autocomplete="off" class="form-control" placeholder="{{ trans('index.placeholder') }}" tabindex="2">

routes/cookie.php

+<?php
+
+Route::group(
+    [
+        'prefix' => LaravelLocalization::setLocale(), /*,
+    'middleware' => [ 'localeSessionRedirect', 'localizationRedirect' ]*/
+    ],
+    function () {
+        Route::get('meta/key', "KeyController@index");
+        Route::post('meta/key', 'KeyController@setKey');
+        Route::post('meta/key/remove', 'KeyController@removeKey');
+    }
+);

routes/web.php

@@ -203,7 +203,6 @@ Route::group(
         Route::post('synoptic/{exclude?}/{chosenFile?}', 'LanguageController@processSynopticPageInput');
         Route::get('languages/edit/{from}/{to}/{exclude?}/{email?}', 'LanguageController@createEditPage');
         Route::post('languages/edit/{from}/{to}/{exclude?}/{email?}', 'MailController@sendLanguageFile');
-        Route::get('berlin', 'StartpageController@berlin');
 
         Route::group(['prefix' => 'app'], function () {
             Route::get('/', function () {

webpack.mix.js

@@ -37,6 +37,12 @@ mix
       strictMath: true
     }
   )
+  .less(
+    "resources/less/metager/pages/key.less",
+    "public/css/key.css", {
+      strictMath: true
+    }
+  )
   .less("resources/less/utility.less", "public/css/utility.css", {
     strictMath: true
   })