Skip to content
Snippets Groups Projects
Commit 195ef1d0 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '35-settings-seite-bereitstellen' into 'master'

Resolve "Settings Seite bereitstellen"

Closes #35

See merge request !57
parents 18a61e3b 7f77ce20
No related branches found
No related tags found
No related merge requests found
Showing with 269 additions and 88 deletions
......@@ -3,6 +3,7 @@
namespace App\Http\Controllers;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
class StartpageController extends Controller
{
......@@ -12,12 +13,35 @@ class StartpageController extends Controller
* @param int $id
* @return Response
*/
public function loadStartPage($locale = "de")
/* public function loadStartPage($locale = "de")
{
\App::setLocale($locale);
return view('index', [
'title' => 'MetaGer: Sicher suchen & finden, Privatsphäre schützen',
'homeIcon']);
} */
public function loadStartPage(Request $request)
{
$focusPages = [];
foreach($request->all() as $key => $value)
{
if($value === 'on' && $key != 'param_sprueche' && $key != 'param_tab')
{
$focusPages[] = str_replace('param_', '', $key);
}
}
return view('index')
->with('title', trans('titles.index'))
->with('homeIcon')
->with('focus', $request->input('focus', 'web'))
->with('lang', $request->input('param_lang', 'all'))
->with('resultCount', $request->input('param_resultCount', '20'))
->with('time', $request->input('param_time', '1000'))
->with('sprueche', $request->input('param_sprueche', 'off'))
->with('tab', $request->input('param_sprueche', 'off'))
->with('focusPages', $focusPages);
}
public function loadPage($subpage)
......
......@@ -14,12 +14,14 @@
Route::group(['prefix' => LaravelLocalization::setLocale()], function()
{
/** ADD ALL LOCALIZED ROUTES INSIDE THIS GROUP **/
Route::get('/', function()
/* Route::get('/', function()
{
return view('index', [
'title' => trans('titles.index'),
'homeIcon']);
});
}); */
Route::get('/', 'StartpageController@loadStartPage');
Route::get('impressum', function()
{
......@@ -84,7 +86,16 @@
->with('title', trans('titles.widget'))
->with('css', 'widget.css');
});
Route::get('settings', function()
{
return view('settings')
->with('title', 'Einstellungen') // TODO Titel übersetzen
->with('css', 'settings.css')
->with('js', ['settings.js']);
});
Route::get('meta/meta.ger3', 'MetaGerSearch@search');
Route::get('qt', 'MetaGerSearch@quicktips');
......
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
......@@ -587,16 +587,16 @@
},
{
"name": "laravel/framework",
"version": "v5.2.35",
"version": "v5.2.36",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "d2b6b0fe32fab610d356c22e74a6ffd101b0f513"
"reference": "236d7c0c5b67a2348ac7831391031d93000de3ab"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/d2b6b0fe32fab610d356c22e74a6ffd101b0f513",
"reference": "d2b6b0fe32fab610d356c22e74a6ffd101b0f513",
"url": "https://api.github.com/repos/laravel/framework/zipball/236d7c0c5b67a2348ac7831391031d93000de3ab",
"reference": "236d7c0c5b67a2348ac7831391031d93000de3ab",
"shasum": ""
},
"require": {
......@@ -712,20 +712,20 @@
"framework",
"laravel"
],
"time": "2016-05-30 17:42:01"
"time": "2016-06-06 15:18:48"
},
{
"name": "league/flysystem",
"version": "1.0.22",
"version": "1.0.24",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "bd73a91703969a2d20ab4bfbf971d6c2cbe36612"
"reference": "9aca859a303fdca30370f42b8c611d9cf0dedf4b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/bd73a91703969a2d20ab4bfbf971d6c2cbe36612",
"reference": "bd73a91703969a2d20ab4bfbf971d6c2cbe36612",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/9aca859a303fdca30370f42b8c611d9cf0dedf4b",
"reference": "9aca859a303fdca30370f42b8c611d9cf0dedf4b",
"shasum": ""
},
"require": {
......@@ -795,7 +795,7 @@
"sftp",
"storage"
],
"time": "2016-04-28 06:53:12"
"time": "2016-06-03 19:11:39"
},
{
"name": "mcamara/laravel-localization",
......@@ -1381,16 +1381,16 @@
},
{
"name": "symfony/console",
"version": "v3.0.6",
"version": "v3.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "34a214710e0714b6efcf40ba3cd1e31373a97820"
"reference": "382fc9ed852edabd6133e34f8549d7a7d99db115"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/34a214710e0714b6efcf40ba3cd1e31373a97820",
"reference": "34a214710e0714b6efcf40ba3cd1e31373a97820",
"url": "https://api.github.com/repos/symfony/console/zipball/382fc9ed852edabd6133e34f8549d7a7d99db115",
"reference": "382fc9ed852edabd6133e34f8549d7a7d99db115",
"shasum": ""
},
"require": {
......@@ -1437,20 +1437,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2016-04-28 09:48:42"
"time": "2016-06-06 15:08:35"
},
{
"name": "symfony/debug",
"version": "v3.0.6",
"version": "v3.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "a06d10888a45afd97534506afb058ec38d9ba35b"
"reference": "e67e1552dd7313df1cf6535cb606751899e0e727"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/a06d10888a45afd97534506afb058ec38d9ba35b",
"reference": "a06d10888a45afd97534506afb058ec38d9ba35b",
"url": "https://api.github.com/repos/symfony/debug/zipball/e67e1552dd7313df1cf6535cb606751899e0e727",
"reference": "e67e1552dd7313df1cf6535cb606751899e0e727",
"shasum": ""
},
"require": {
......@@ -1494,7 +1494,7 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2016-03-30 10:41:14"
"time": "2016-06-06 15:08:35"
},
{
"name": "symfony/event-dispatcher",
......@@ -1558,16 +1558,16 @@
},
{
"name": "symfony/finder",
"version": "v3.0.6",
"version": "v3.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "c54e407b35bc098916704e9fd090da21da4c4f52"
"reference": "39e5f3d533d07b5416b9d7aad53a27f939d4f811"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/c54e407b35bc098916704e9fd090da21da4c4f52",
"reference": "c54e407b35bc098916704e9fd090da21da4c4f52",
"url": "https://api.github.com/repos/symfony/finder/zipball/39e5f3d533d07b5416b9d7aad53a27f939d4f811",
"reference": "39e5f3d533d07b5416b9d7aad53a27f939d4f811",
"shasum": ""
},
"require": {
......@@ -1603,20 +1603,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
"time": "2016-03-10 11:13:05"
"time": "2016-05-13 18:03:36"
},
{
"name": "symfony/http-foundation",
"version": "v3.0.6",
"version": "v3.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "18b24bc32d2495ae79d76e777368786a6536fe31"
"reference": "d268a643884f85e91d6ba11ca68de96833f3f6e5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/18b24bc32d2495ae79d76e777368786a6536fe31",
"reference": "18b24bc32d2495ae79d76e777368786a6536fe31",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/d268a643884f85e91d6ba11ca68de96833f3f6e5",
"reference": "d268a643884f85e91d6ba11ca68de96833f3f6e5",
"shasum": ""
},
"require": {
......@@ -1656,20 +1656,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
"time": "2016-04-12 18:09:53"
"time": "2016-06-06 11:33:26"
},
{
"name": "symfony/http-kernel",
"version": "v3.0.6",
"version": "v3.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "6a5010978edf0a9646342232531e53bfc7abbcd3"
"reference": "97cc1c15e3406e7a2adf14ad6b0e41a04d4a6fc4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/6a5010978edf0a9646342232531e53bfc7abbcd3",
"reference": "6a5010978edf0a9646342232531e53bfc7abbcd3",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/97cc1c15e3406e7a2adf14ad6b0e41a04d4a6fc4",
"reference": "97cc1c15e3406e7a2adf14ad6b0e41a04d4a6fc4",
"shasum": ""
},
"require": {
......@@ -1738,7 +1738,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
"time": "2016-05-09 22:13:13"
"time": "2016-06-06 16:52:35"
},
{
"name": "symfony/polyfill-mbstring",
......@@ -1909,16 +1909,16 @@
},
{
"name": "symfony/process",
"version": "v3.0.6",
"version": "v3.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "53f9407c0bb1c5a79127db8f7bfe12f0f6f3dcdb"
"reference": "bf6e2d1fa8b93fdd7cca6b684c0ea213cf0255dd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/53f9407c0bb1c5a79127db8f7bfe12f0f6f3dcdb",
"reference": "53f9407c0bb1c5a79127db8f7bfe12f0f6f3dcdb",
"url": "https://api.github.com/repos/symfony/process/zipball/bf6e2d1fa8b93fdd7cca6b684c0ea213cf0255dd",
"reference": "bf6e2d1fa8b93fdd7cca6b684c0ea213cf0255dd",
"shasum": ""
},
"require": {
......@@ -1954,20 +1954,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2016-04-14 15:30:28"
"time": "2016-06-06 11:33:26"
},
{
"name": "symfony/routing",
"version": "v3.0.6",
"version": "v3.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "a6cd168310066176599442aa21f5da86c3f8e0b3"
"reference": "c780454838a1131adc756d737a4b4cc1d18f8c64"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/a6cd168310066176599442aa21f5da86c3f8e0b3",
"reference": "a6cd168310066176599442aa21f5da86c3f8e0b3",
"url": "https://api.github.com/repos/symfony/routing/zipball/c780454838a1131adc756d737a4b4cc1d18f8c64",
"reference": "c780454838a1131adc756d737a4b4cc1d18f8c64",
"shasum": ""
},
"require": {
......@@ -2029,20 +2029,20 @@
"uri",
"url"
],
"time": "2016-05-03 12:23:49"
"time": "2016-05-30 06:58:27"
},
{
"name": "symfony/translation",
"version": "v3.0.6",
"version": "v3.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "f7a07af51ea067745a521dab1e3152044a2fb1f2"
"reference": "2b0aacaa613c0ec1ad8046f972d8abdcb19c1db7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/f7a07af51ea067745a521dab1e3152044a2fb1f2",
"reference": "f7a07af51ea067745a521dab1e3152044a2fb1f2",
"url": "https://api.github.com/repos/symfony/translation/zipball/2b0aacaa613c0ec1ad8046f972d8abdcb19c1db7",
"reference": "2b0aacaa613c0ec1ad8046f972d8abdcb19c1db7",
"shasum": ""
},
"require": {
......@@ -2093,20 +2093,20 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
"time": "2016-03-25 01:41:20"
"time": "2016-06-06 11:33:26"
},
{
"name": "symfony/var-dumper",
"version": "v3.0.6",
"version": "v3.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "0e918c269093ba4c77fca14e9424fa74ed16f1a6"
"reference": "d8bb851da153d97abe7c2b71a65dee19f324bcf7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/0e918c269093ba4c77fca14e9424fa74ed16f1a6",
"reference": "0e918c269093ba4c77fca14e9424fa74ed16f1a6",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/d8bb851da153d97abe7c2b71a65dee19f324bcf7",
"reference": "d8bb851da153d97abe7c2b71a65dee19f324bcf7",
"shasum": ""
},
"require": {
......@@ -2156,7 +2156,7 @@
"debug",
"dump"
],
"time": "2016-04-25 11:17:47"
"time": "2016-05-24 10:03:10"
},
{
"name": "vlucas/phpdotenv",
......@@ -2422,39 +2422,136 @@
],
"time": "2016-05-22 21:52:33"
},
{
"name": "phpdocumentor/reflection-common",
"version": "1.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionCommon.git",
"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
"shasum": ""
},
"require": {
"php": ">=5.5"
},
"require-dev": {
"phpunit/phpunit": "^4.6"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
"phpDocumentor\\Reflection\\": [
"src"
]
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Jaap van Otterdijk",
"email": "opensource@ijaap.nl"
}
],
"description": "Common reflection classes used by phpdocumentor to reflect the code structure",
"homepage": "http://www.phpdoc.org",
"keywords": [
"FQSEN",
"phpDocumentor",
"phpdoc",
"reflection",
"static analysis"
],
"time": "2015-12-27 11:43:31"
},
{
"name": "phpdocumentor/reflection-docblock",
"version": "2.0.4",
"version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
"reference": "45ada3e3fd09789fbfbd6d65b3f0901f0030dc61"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
"reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/45ada3e3fd09789fbfbd6d65b3f0901f0030dc61",
"reference": "45ada3e3fd09789fbfbd6d65b3f0901f0030dc61",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": ">=5.5",
"phpdocumentor/reflection-common": "^1.0@dev",
"phpdocumentor/type-resolver": "^0.1.5",
"webmozart/assert": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
"mockery/mockery": "^0.9.4",
"phpunit/phpunit": "^4.4"
},
"suggest": {
"dflydev/markdown": "~1.0",
"erusev/parsedown": "~1.0"
"type": "library",
"autoload": {
"psr-4": {
"phpDocumentor\\Reflection\\": [
"src/"
]
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Mike van Riel",
"email": "me@mikevanriel.com"
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2016-06-06 06:44:13"
},
{
"name": "phpdocumentor/type-resolver",
"version": "0.1.8",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "9891754231e55d42f0d16988ffb799af39f31a12"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9891754231e55d42f0d16988ffb799af39f31a12",
"reference": "9891754231e55d42f0d16988ffb799af39f31a12",
"shasum": ""
},
"require": {
"php": ">=5.5",
"phpdocumentor/reflection-common": "^1.0"
},
"require-dev": {
"mockery/mockery": "^0.9.4",
"phpunit/phpunit": "^5.2"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-0": {
"phpDocumentor": [
"psr-4": {
"phpDocumentor\\Reflection\\": [
"src/"
]
}
......@@ -2466,39 +2563,39 @@
"authors": [
{
"name": "Mike van Riel",
"email": "mike.vanriel@naenius.com"
"email": "me@mikevanriel.com"
}
],
"time": "2015-02-03 12:10:50"
"time": "2016-03-28 10:02:29"
},
{
"name": "phpspec/prophecy",
"version": "v1.6.0",
"version": "v1.6.1",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
"reference": "3c91bdf81797d725b14cb62906f9a4ce44235972"
"reference": "58a8137754bc24b25740d4281399a4a3596058e0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/3c91bdf81797d725b14cb62906f9a4ce44235972",
"reference": "3c91bdf81797d725b14cb62906f9a4ce44235972",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0",
"reference": "58a8137754bc24b25740d4281399a4a3596058e0",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "~2.0",
"sebastian/comparator": "~1.1",
"sebastian/recursion-context": "~1.0"
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
"sebastian/comparator": "^1.1",
"sebastian/recursion-context": "^1.0"
},
"require-dev": {
"phpspec/phpspec": "~2.0"
"phpspec/phpspec": "^2.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.5.x-dev"
"dev-master": "1.6.x-dev"
}
},
"autoload": {
......@@ -2531,7 +2628,7 @@
"spy",
"stub"
],
"time": "2016-02-15 07:46:21"
"time": "2016-06-07 08:13:47"
},
{
"name": "phpunit/php-code-coverage",
......@@ -3327,16 +3424,16 @@
},
{
"name": "symfony/css-selector",
"version": "v3.0.6",
"version": "v3.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "65e764f404685f2dc20c057e889b3ad04b2e2db0"
"reference": "e8a66c51bf65f188c02f8120c0748b2291d3a2d0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/65e764f404685f2dc20c057e889b3ad04b2e2db0",
"reference": "65e764f404685f2dc20c057e889b3ad04b2e2db0",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/e8a66c51bf65f188c02f8120c0748b2291d3a2d0",
"reference": "e8a66c51bf65f188c02f8120c0748b2291d3a2d0",
"shasum": ""
},
"require": {
......@@ -3376,11 +3473,11 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
"time": "2016-03-04 07:55:57"
"time": "2016-06-06 11:33:26"
},
{
"name": "symfony/dom-crawler",
"version": "v3.0.6",
"version": "v3.0.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
......@@ -3482,6 +3579,55 @@
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2016-05-26 21:46:24"
},
{
"name": "webmozart/assert",
"version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
"reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
"reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"phpunit/phpunit": "^4.6"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"autoload": {
"psr-4": {
"Webmozart\\Assert\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Bernhard Schussek",
"email": "bschussek@gmail.com"
}
],
"description": "Assertions to validate method input/output with nice error messages.",
"keywords": [
"assert",
"check",
"validate"
],
"time": "2015-08-24 13:29:44"
}
],
"aliases": [],
......
File mode changed from 100644 to 100755
config/app.php 100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment