From f71efbfcbf31cab3ae067932eacabd09ecebbbba Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 22 Jul 2021 17:56:05 +0200 Subject: [PATCH] wip #4210 @1 --- .../API/FluidbookThemeAPIController.php | 11 +++ composer.lock | 67 ++++++++++--------- routes/api.php | 4 +- 3 files changed, 48 insertions(+), 34 deletions(-) diff --git a/app/Http/Controllers/API/FluidbookThemeAPIController.php b/app/Http/Controllers/API/FluidbookThemeAPIController.php index 035e255ff..47eeeae2f 100644 --- a/app/Http/Controllers/API/FluidbookThemeAPIController.php +++ b/app/Http/Controllers/API/FluidbookThemeAPIController.php @@ -9,6 +9,7 @@ use App\Models\FluidbookTheme; use Cubist\Backpack\Magic\Fields\Color; use Cubist\Backpack\Magic\Fields\Files; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; use Spatie\MediaLibrary\MediaCollections\Models\Media; class FluidbookThemeAPIController extends Controller @@ -129,7 +130,17 @@ class FluidbookThemeAPIController extends Controller { $theme = FluidbookTheme::find($id); $newtheme = $theme->replicate(); + $newtheme->name .= ' (copy)'; + $newtheme->owner = Auth::id(); $newtheme->push(); + return $newtheme->id; + } + + public function renamefromws2(Request $request, $id) + { + $theme = FluidbookTheme::find($id); + $theme->name = $request->get('newname'); + $theme->save(); } public function deletefromws2(Request $request, $id) diff --git a/composer.lock b/composer.lock index 03bb62d97..8db256415 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "bce7c4d3ff964c66331ac4cee4c57347", + "content-hash": "c46912c94285cd3dc940007e79357f21", "packages": [ { "name": "ahmadshah/lucy", @@ -1318,13 +1318,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_cms-back.git", - "reference": "af677aa6a382ae1782fb1e0d382b5ab87f3b8a0d" + "reference": "46fa9123056af8d528172189371ebdb69c75fb03" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-070acc.tar", - "reference": "af677aa6a382ae1782fb1e0d382b5ab87f3b8a0d", - "shasum": "aeb240df1f5053f5a9603735150f5002555c6944" + "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-4c7b46.tar", + "reference": "46fa9123056af8d528172189371ebdb69c75fb03", + "shasum": "50f0e194a12665175e35ff18347c31f672dddc63" }, "require": { "backpack/backupmanager": "^2.0", @@ -1399,7 +1399,7 @@ } ], "description": "Cubist Backpack extension", - "time": "2021-07-20T10:10:01+00:00" + "time": "2021-07-22T14:35:06+00:00" }, { "name": "cubist/cms-front", @@ -3369,16 +3369,16 @@ }, { "name": "intervention/image", - "version": "2.6.0", + "version": "2.6.1", "source": { "type": "git", "url": "https://github.com/Intervention/image.git", - "reference": "a2d7238069bb01322f9c2a661449955434fec9c6" + "reference": "0925f10b259679b5d8ca58f3a2add9255ffcda45" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/a2d7238069bb01322f9c2a661449955434fec9c6", - "reference": "a2d7238069bb01322f9c2a661449955434fec9c6", + "url": "https://api.github.com/repos/Intervention/image/zipball/0925f10b259679b5d8ca58f3a2add9255ffcda45", + "reference": "0925f10b259679b5d8ca58f3a2add9255ffcda45", "shasum": "" }, "require": { @@ -3437,7 +3437,7 @@ ], "support": { "issues": "https://github.com/Intervention/image/issues", - "source": "https://github.com/Intervention/image/tree/2.6.0" + "source": "https://github.com/Intervention/image/tree/2.6.1" }, "funding": [ { @@ -3449,7 +3449,7 @@ "type": "github" } ], - "time": "2021-07-06T13:35:54+00:00" + "time": "2021-07-22T14:31:53+00:00" }, { "name": "jaybizzle/crawler-detect", @@ -9887,16 +9887,16 @@ }, { "name": "composer/composer", - "version": "2.1.3", + "version": "2.1.4", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "fc5c4573aafce3a018eb7f1f8f91cea423970f2e" + "reference": "5701b38ec6c66dd143658e6aa18e1808d2d5dc4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/fc5c4573aafce3a018eb7f1f8f91cea423970f2e", - "reference": "fc5c4573aafce3a018eb7f1f8f91cea423970f2e", + "url": "https://api.github.com/repos/composer/composer/zipball/5701b38ec6c66dd143658e6aa18e1808d2d5dc4b", + "reference": "5701b38ec6c66dd143658e6aa18e1808d2d5dc4b", "shasum": "" }, "require": { @@ -9905,7 +9905,7 @@ "composer/semver": "^3.0", "composer/spdx-licenses": "^1.2", "composer/xdebug-handler": "^2.0", - "justinrainbow/json-schema": "^5.2.10", + "justinrainbow/json-schema": "^5.2.11", "php": "^5.3.2 || ^7.0 || ^8.0", "psr/log": "^1.0", "react/promise": "^1.2 || ^2.7", @@ -9965,7 +9965,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.1.3" + "source": "https://github.com/composer/composer/tree/2.1.4" }, "funding": [ { @@ -9981,7 +9981,7 @@ "type": "tidelift" } ], - "time": "2021-06-09T14:31:20+00:00" + "time": "2021-07-22T11:55:24+00:00" }, { "name": "composer/metadata-minifier", @@ -10718,16 +10718,16 @@ }, { "name": "justinrainbow/json-schema", - "version": "5.2.10", + "version": "5.2.11", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b" + "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b", - "reference": "2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ab6744b7296ded80f8cc4f9509abbff393399aa", + "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa", "shasum": "" }, "require": { @@ -10782,9 +10782,9 @@ ], "support": { "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/5.2.10" + "source": "https://github.com/justinrainbow/json-schema/tree/5.2.11" }, - "time": "2020-05-27T16:41:55+00:00" + "time": "2021-07-22T09:24:00+00:00" }, { "name": "laravel/tinker", @@ -10986,16 +10986,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.11.0", + "version": "v4.12.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "fe14cf3672a149364fb66dfe11bf6549af899f94" + "reference": "6608f01670c3cc5079e18c1dab1104e002579143" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/fe14cf3672a149364fb66dfe11bf6549af899f94", - "reference": "fe14cf3672a149364fb66dfe11bf6549af899f94", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6608f01670c3cc5079e18c1dab1104e002579143", + "reference": "6608f01670c3cc5079e18c1dab1104e002579143", "shasum": "" }, "require": { @@ -11036,9 +11036,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.11.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.12.0" }, - "time": "2021-07-03T13:36:55+00:00" + "time": "2021-07-21T10:44:31+00:00" }, { "name": "nunomaduro/collision", @@ -12557,6 +12557,7 @@ "type": "github" } ], + "abandoned": true, "time": "2020-11-30T07:30:19+00:00" }, { @@ -12885,9 +12886,9 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { + "ahmadshah/lucy": 20, "cubedesigners/userdatabase": 20, - "cubist/cms-back": 20, - "ahmadshah/lucy": 20 + "cubist/cms-back": 20 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/routes/api.php b/routes/api.php index 4f318d536..47bda1e65 100644 --- a/routes/api.php +++ b/routes/api.php @@ -15,10 +15,12 @@ use Illuminate\Support\Facades\Route; Route::group([ 'middleware' => ['auth:api'], - 'excluded_middleware' => ['verifycsrftoken'] + 'excluded_middleware' => ['verifycsrftoken'] ], function () { + Route::post('fluidbook-theme/{id}/clone', [\App\Http\Controllers\API\FluidbookThemeAPIController::class, 'clonefromws2']); Route::post('fluidbook-theme', [\App\Http\Controllers\API\FluidbookThemeAPIController::class, 'createfromws2']); Route::put('fluidbook-theme/{id}', [\App\Http\Controllers\API\FluidbookThemeAPIController::class, 'updatefromws2']); + Route::put('fluidbook-theme/{id}/rename', [\App\Http\Controllers\API\FluidbookThemeAPIController::class, 'renamefromws2']); Route::put('fluidbook-theme/{id}/uploadfile/{fieldname}', [\App\Http\Controllers\API\FluidbookThemeAPIController::class, 'uploadfile']); Route::delete('fluidbook-theme/{id}', [\App\Http\Controllers\API\FluidbookThemeAPIController::class, 'deletefromws2']); }); -- 2.39.5