wip #4765 @0.25

diff --git a/app/Http/Controllers/Admin/ToolsController.php b/app/Http/Controllers/Admin/ToolsController.php
index 6863ee4d517312a7c50d28717816f314e9698cb7..0fee534d93d12884fa3b3f7be0a6d95592a3cd56 100644 (file)
--- a/app/Http/Controllers/Admin/ToolsController.php
+++ b/app/Http/Controllers/Admin/ToolsController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\Tools\FluidbookConvert;
 use App\Http\Controllers\Tools\FluidbookPreview;
+use Cubist\Socialite\User;
 
 class ToolsController extends Controller
 {
@@ -25,4 +26,9 @@ class ToolsController extends Controller
         }
         return $this->$tool($args);
     }
+
+    protected function test()
+    {
+        dd(User::fromProvider('google'));
+    }
 }

diff --git a/composer.lock b/composer.lock
index 81a63f38c0228e9a13d602ff6be924d753ffda58..54d4147ff778e624eb79217beda2386edab99bc4 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -1218,13 +1218,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "2d35890443562f432ed0f7045cf1508a0ee8e79c"
+                "reference": "dae8c7e158befd35faebcb6c5eebc07ea57b2fd2"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-126c49.tar",
-                "reference": "2d35890443562f432ed0f7045cf1508a0ee8e79c",
-                "shasum": "a2d7579514726b102db3d8b60fb07e7d6f6733ff"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-0be5d5.tar",
+                "reference": "dae8c7e158befd35faebcb6c5eebc07ea57b2fd2",
+                "shasum": "5da3d8274cec4ec246bc56f488a4b1f19cfcb380"
             },
             "require": {
                 "backpack/backupmanager": "^3.0",
@@ -1249,7 +1249,7 @@
                 "fideloper/proxy": "^4.4",
                 "genealabs/laravel-model-caching": "^0.11",
                 "graham-campbell/markdown": "^v13.1",
-                "laravel/framework": "^v8.62",
+                "laravel/framework": "^v8.63",
                 "lavary/laravel-menu": "^v1.8",
                 "league/commonmark": "^1.6",
                 "predis/predis": "^v1.1",
@@ -1301,7 +1301,7 @@
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2021-10-06T14:15:58+00:00"
+            "time": "2021-10-08T16:33:30+00:00"
         },
         {
             "name": "cubist/cms-front",
@@ -1556,21 +1556,22 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_socialite.git",
-                "reference": "24e28869aa4e291b9d6f7db6f1b1c6fe82e51d7a"
+                "reference": "a0d22bfc556a6b757b3d175b9b7618a1a1dd8d5b"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/socialite/cubist-socialite-dev-master-d8ac19.tar",
-                "reference": "24e28869aa4e291b9d6f7db6f1b1c6fe82e51d7a",
-                "shasum": "74756b5cbb25810f03ba23681a247823804a37cf"
+                "url": "https://composer.cubedesigners.com/dist/cubist/socialite/cubist-socialite-dev-master-4aa2b4.tar",
+                "reference": "a0d22bfc556a6b757b3d175b9b7618a1a1dd8d5b",
+                "shasum": "88e45975d24b9c9945d6fc42ad4c93e939a02140"
             },
             "require": {
-                "laravel/framework": "~5.8|^6.0|^7.0|^8.0",
+                "barryvdh/laravel-debugbar": "^3.6",
+                "laravel/framework": "^8.63",
                 "laravel/socialite": "^v5.2.5",
                 "mpyw/null-auth": "^2.0",
                 "php": ">=7.3.0",
                 "socialiteproviders/google": "^4.1.0",
-                "spatie/laravel-permission": "^4.0"
+                "spatie/laravel-permission": "^4.0|^5.1"
             },
             "default-branch": true,
             "type": "library",
@@ -1601,7 +1602,7 @@
                 "cubist",
                 "socialite"
             ],
-            "time": "2021-10-08T13:10:03+00:00"
+            "time": "2021-10-08T16:35:09+00:00"
         },
         {
             "name": "cubist/util",

diff --git a/routes/web.php b/routes/web.php
index 1725466e3a3fa689646f9d3b30de4474d7c25e25..3861b4c78d2a3697b3d051fdbe1dd3b902058bc2 100644 (file)
--- a/routes/web.php
+++ b/routes/web.php
@@ -7,5 +7,7 @@ Route::group([
     'middleware' => ['web', config('backpack.base.middleware_key', 'admin')],
     'namespace' => '\App\Http\Controllers\Admin',
 ], function () { // custom admin routes
+    Route::get('test','ToolsController@index');
     Route::any('tools/{tool}/{args?}', 'ToolsController@index')->where(['args' => '.*']);
 });
+