From c7756eee6c97f36e8c51bc017073333a04b7cbe6 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 28 Feb 2020 18:57:03 +0100
Subject: [PATCH] wip #3439

---
 app/Http/Controllers/PageController.php | 10 +++++++++
 bootstrap/app.php                       |  2 +-
 composer.lock                           | 27 ++++++++++++-------------
 routes/web.php                          | 16 ++-------------
 4 files changed, 26 insertions(+), 29 deletions(-)
 create mode 100644 app/Http/Controllers/PageController.php

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
new file mode 100644
index 0000000..56f17dd
--- /dev/null
+++ b/app/Http/Controllers/PageController.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Cubist\Backpack\app\Http\Controllers\CubistRedirectToAdminController;
+
+class PageController extends CubistRedirectToAdminController
+{
+
+}
diff --git a/bootstrap/app.php b/bootstrap/app.php
index 8d4e15e..521fba4 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -11,7 +11,7 @@
 |
 */
 
-$app = new Cubist\Backpack\Application(
+$app = new Cubist\Backpack\app\Application(
     $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
 );
 
diff --git a/composer.lock b/composer.lock
index 29bed1f..59db7bb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -920,13 +920,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "3ae0567cbf9a6341ad5d782591f74c7fd492fe4a"
+                "reference": "b8907df2bc291abe0d1c150c991b740fdcdca250"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-2933a2.tar",
-                "reference": "3ae0567cbf9a6341ad5d782591f74c7fd492fe4a",
-                "shasum": "acfae26a7c5eb36962343f1e4c48885f3bd186fa"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-1fce04.tar",
+                "reference": "b8907df2bc291abe0d1c150c991b740fdcdca250",
+                "shasum": "f93144c1a91f48a76cd3de0ee8ebeef5891c4f96"
             },
             "require": {
                 "backpack/backupmanager": "^2.0",
@@ -997,7 +997,7 @@
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2020-02-27T17:59:22+00:00"
+            "time": "2020-02-28T17:49:14+00:00"
         },
         {
             "name": "cubist/cms-front",
@@ -8678,26 +8678,25 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.0.1",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9"
+                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
-                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95",
+                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1",
+                "php": "^7.2",
                 "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "ext-tokenizer": "^7.1",
-                "mockery/mockery": "~1",
-                "phpunit/phpunit": "^7.0"
+                "ext-tokenizer": "^7.2",
+                "mockery/mockery": "~1"
             },
             "type": "library",
             "extra": {
@@ -8721,7 +8720,7 @@
                 }
             ],
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "time": "2019-08-22T18:11:29+00:00"
+            "time": "2020-02-18T18:59:58+00:00"
         },
         {
             "name": "phpspec/prophecy",
diff --git a/routes/web.php b/routes/web.php
index 810aa34..b24ceec 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,16 +1,4 @@
 <?php
 
-/*
-|--------------------------------------------------------------------------
-| Web Routes
-|--------------------------------------------------------------------------
-|
-| Here is where you can register web routes for your application. These
-| routes are loaded by the RouteServiceProvider within a group which
-| contains the "web" middleware group. Now create something great!
-|
-*/
-
-Route::get('/', function () {
-    return view('welcome');
-});
+Route::any('{page}/{subs?}',  'PageController@catchall')
+    ->where(['page' => '^(((?=(?!admin))(?=(?!\/)).))*$', 'subs' => '.*']);
-- 
2.39.5