Merge branch '15-routing-fur-die-unterseiten-andern' into 'master'

Routing für die Unterseiten ändern

Ich habe die Laravel Erweiterung "mcamara/laravel-localization" installiert.
Diese Erweiterung erreicht alles, was wir für das Routing haben wollten und noch mehr.

Closes #15

See merge request !5

app/Http/routes.php

@@ -11,20 +11,22 @@
 |
 */
 
-# Unsere Startseite. Hier fängt alles an
-Route::get('{locale?}', 	
-	[ 'uses' => 'StartpageController@loadStartPage']
-)->where('locale', '[a-z]{1,2}');
+    Route::group(['prefix' => LaravelLocalization::setLocale()], function()
+    {
+        /** ADD ALL LOCALIZED ROUTES INSIDE THIS GROUP **/
+        Route::get('/', function()
+        {
+        	return view('index', [ 
+            'title' => 'MetaGer: Sicher suchen & finden, Privatsphäre schützen', 
+            'homeIcon']);
+        });
 
-Route::get('{locale?}/{subpage}', 
-	[ 'uses' => 'StartpageController@loadLocalPage']
-)->where('locale', '[a-z]{1,2}');
+        Route::get('datenschutz', function()
+        {
+        	return view('index', [ 
+            'title' => 'MetaGer: Sicher suchen & finden, Privatsphäre schützen', 
+            'homeIcon']);
+        });
+    });
 
-Route::get('{subpage}', 
-	[ 'uses' => 'StartpageController@loadPage']
-);
 
-# Unsere MetaGer Suche!!
-Route::get('/meta/meta.ger3', 
-	[ 'uses' => 'MetaGerSearch@forwardToServer' ]
-);

composer.json

@@ -6,7 +6,8 @@
     "type": "project",
     "require": {
         "php": ">=5.5.9",
-        "laravel/framework": "5.2.*"
+        "laravel/framework": "5.2.*",
+        "mcamara/laravel-localization": "^1.1"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",

composer.lock

@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "c284a9c122da36c99a8b6597bdce7aa6",
-    "content-hash": "8b1485987e7c5949da82435d403e52e8",
+    "hash": "ae0e551aa39df220a04748f0adc554b9",
+    "content-hash": "456deaed864467045ee5a98a26b13260",
     "packages": [
         {
             "name": "classpreloader/classpreloader",
@@ -518,6 +518,54 @@
             ],
             "time": "2016-04-28 06:53:12"
         },
+        {
+            "name": "mcamara/laravel-localization",
+            "version": "1.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mcamara/laravel-localization.git",
+                "reference": "e305d2d2b32dc07a24e0699dcb05cf4f2064cdf8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mcamara/laravel-localization/zipball/e305d2d2b32dc07a24e0699dcb05cf4f2064cdf8",
+                "reference": "e305d2d2b32dc07a24e0699dcb05cf4f2064cdf8",
+                "shasum": ""
+            },
+            "require": {
+                "laravel/framework": "~5.2",
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "orchestra/testbench": "3.2.*"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [],
+                "psr-0": {
+                    "Mcamara\\LaravelLocalization": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marc Cámara",
+                    "email": "mcamara88@gmail.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Easy localization for Laravel",
+            "homepage": "https://github.com/mcamara/laravel-localization",
+            "keywords": [
+                "laravel",
+                "localization",
+                "php"
+            ],
+            "time": "2016-01-08 07:14:49"
+        },
         {
             "name": "monolog/monolog",
             "version": "1.19.0",
@@ -2589,16 +2637,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "1.3.5",
+            "version": "1.3.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf"
+                "reference": "2292b116f43c272ff4328083096114f84ea46a56"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf",
-                "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/2292b116f43c272ff4328083096114f84ea46a56",
+                "reference": "2292b116f43c272ff4328083096114f84ea46a56",
                 "shasum": ""
             },
             "require": {
@@ -2635,7 +2683,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2016-02-26 18:40:46"
+            "time": "2016-05-04 07:59:13"
         },
         {
             "name": "sebastian/exporter",

config/app.php

@@ -155,6 +155,7 @@ return [
         App\Providers\AuthServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
+        Mcamara\LaravelLocalization\LaravelLocalizationServiceProvider::class,
 
     ],
 
@@ -201,6 +202,7 @@ return [
         'URL' => Illuminate\Support\Facades\URL::class,
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
+        'LaravelLocalization'   => Mcamara\LaravelLocalization\Facades\LaravelLocalization::class,
 
     ],