From b00b68eab97d86b8a083f593ae4f96ceda404dd7 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 1 Dec 2023 12:57:44 +0100 Subject: [PATCH] wip #6542 @0.25 --- .docker/docker-compose.yml | 1 + .npmrc | 3 + app/Console/Commands/CopyMediaFromDev.php | 6 +- package-lock.json | 82 +++++++++++++++++++++-- package.json | 5 +- 5 files changed, 88 insertions(+), 9 deletions(-) create mode 100644 .npmrc diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 9f9f445ba..4b5626753 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -63,6 +63,7 @@ services: - '/home/toolbox/www/.docker/config/php/fpm.conf:/etc/php/8.2/fpm/pool.d/z-overrides.conf' # PROD - '/home/toolbox/dev/:/application/dev/' + - '/data/toolbox/dev/storage/:/application/dev/storage/' # ENV - '/home/toolbox/www/.env.prod:/application/.env' ports: diff --git a/.npmrc b/.npmrc new file mode 100644 index 000000000..58c0713e8 --- /dev/null +++ b/.npmrc @@ -0,0 +1,3 @@ +always-auth=true +//npm.greensock.com/:_authToken=b0069e3e-cf2a-4e32-a57d-268fbfa745c9 +@gsap:registry=https://npm.greensock.com diff --git a/app/Console/Commands/CopyMediaFromDev.php b/app/Console/Commands/CopyMediaFromDev.php index 0bce18e1d..c75319367 100644 --- a/app/Console/Commands/CopyMediaFromDev.php +++ b/app/Console/Commands/CopyMediaFromDev.php @@ -5,13 +5,15 @@ namespace App\Console\Commands; use App\Console\Commands\Base\ToolboxCommand; use App\Models\QuizTheme; use Cubist\Backpack\Media\Util; +use Cubist\Util\Files\Files; class CopyMediaFromDev extends ToolboxCommand { protected $signature = 'toolbox:copymediafromdev'; protected $description = 'Compile a fluidbook'; - public function handle(){ - Util::copyMedia(QuizTheme::withoutGlobalScopes()->get(),); + public function handle() + { + Util::copyMedia(QuizTheme::withoutGlobalScopes()->get(), 'dev','/application/dev/storage/app/public','/application/storage/app/public'); } } diff --git a/package-lock.json b/package-lock.json index 78023dd39..c9d0e666e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,14 +28,17 @@ "select2": "^4.1.0-rc.0", "select2-bootstrap-theme": "^0.1.0-beta.10", "semver": "^7.5.4", + "simplebar": "^6.2.5", "spectrum-colorpicker": "^1.8.1", + "split-type": "^0.3.4", + "swiper": "^11.0.5", "tippy": "^0.0.0", "tippy.js": "^6.3.7" }, "devDependencies": { "axios": "^1.3.5", "cross-env": "^7.0.3", - "gsap": "^3.11.5", + "gsap": "npm:@gsap/business@^3.12.3", "jquery": "^3.6.4", "laravel-mix": "^6.0.49", "resolve-url-loader": "^5.0.0", @@ -2442,6 +2445,19 @@ "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", "dev": true }, + "node_modules/@types/lodash": { + "version": "4.14.202", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz", + "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==" + }, + "node_modules/@types/lodash-es": { + "version": "4.17.12", + "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz", + "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==", + "dependencies": { + "@types/lodash": "*" + } + }, "node_modules/@types/mime": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", @@ -3675,6 +3691,11 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/can-use-dom": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/can-use-dom/-/can-use-dom-0.1.0.tgz", + "integrity": "sha512-ceOhN1DL7Y4O6M0j9ICgmTYziV89WMd96SvSl0REd8PMgrY0B/WBOPoed5S1KUmJqXgUXh8gzSe6E3ae27upsQ==" + }, "node_modules/caniuse-api": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", @@ -5775,10 +5796,12 @@ "dev": true }, "node_modules/gsap": { + "name": "@gsap/business", "version": "3.12.3", - "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.12.3.tgz", - "integrity": "sha512-TySXTE+ABiAVa61W+h5wv2p5GkJT1Uj//4nWpK8EjmhcDqwH++35IvtbQlVVFj+rdcJdFCdCt0SKgb+SwdPq/A==", - "dev": true + "resolved": "https://npm.greensock.com/@gsap%2fbusiness/-/business-3.12.3.tgz", + "integrity": "sha512-q4/V+uAg8FgRhZNlzNopL0EOHKh1sN9qER7kwQ/FNSoZ/R6aU45LX0zgiNAYI0lWvq+dDAbF6zqGhZKgc9JT9w==", + "dev": true, + "license": "This package should only be used by individuals/companies with an active Business Green Club GSAP membership. See https://gsap.com/pricing/. Licensing: https://gsap.com/licensing/" }, "node_modules/handle-thing": { "version": "2.0.1", @@ -6872,8 +6895,12 @@ "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "node_modules/lodash-es": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" }, "node_modules/lodash.camelcase": { "version": "4.3.0", @@ -9697,6 +9724,26 @@ "simple-concat": "^1.0.0" } }, + "node_modules/simplebar": { + "version": "6.2.5", + "resolved": "https://registry.npmjs.org/simplebar/-/simplebar-6.2.5.tgz", + "integrity": "sha512-vfxKR6KNBsPx7+sZnqO7T8VuCvi4px6OlycrrkNgyjvoHhRW7LIyVkHhUfXxbz33Gw99Wb9UMMsnEZv35wtLSw==", + "dependencies": { + "can-use-dom": "^0.1.0", + "simplebar-core": "^1.2.4" + } + }, + "node_modules/simplebar-core": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/simplebar-core/-/simplebar-core-1.2.4.tgz", + "integrity": "sha512-P+Sqshef4fq3++gQ82TgNYcgl3qZFSCP5jS2/8NMmw18oagXOijMzs1G+vm6RUY3oMvpwH3wGoqh9u6SyDjHfQ==", + "dependencies": { + "@types/lodash-es": "^4.17.6", + "can-use-dom": "^0.1.0", + "lodash": "^4.17.21", + "lodash-es": "^4.17.21" + } + }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -9832,6 +9879,11 @@ "resolved": "https://registry.npmjs.org/spectrum-colorpicker/-/spectrum-colorpicker-1.8.1.tgz", "integrity": "sha512-x1picQ5giVso71ESII7jZ3+ZFdit8WthNkzwJqLNdPDPzrltKUQGpTohWyPfSAID+bK1zGdO6bDbSh1S6GoLYA==" }, + "node_modules/split-type": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/split-type/-/split-type-0.3.4.tgz", + "integrity": "sha512-otEk9vnD8qwfLsk3Lx0gz+qRkNIJCx0mlyL47ImP/DjMuV39d75Lpfwjn9fHteDRz0aoOblSzQjSNT9+Sswxcg==" + }, "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -10110,6 +10162,24 @@ "url": "https://github.com/fontello/svg2ttf?sponsor=1" } }, + "node_modules/swiper": { + "version": "11.0.5", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-11.0.5.tgz", + "integrity": "sha512-rhCwupqSyRnWrtNzWzemnBLMoyYuoDgGgspAm/8iBD3jCvAWycPLH4Z3TB0O5520DHLzMx94yUMH/B9Efpa48w==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", diff --git a/package.json b/package.json index d5d6f68f0..610ba494d 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "devDependencies": { "axios": "^1.3.5", "cross-env": "^7.0.3", - "gsap": "^3.11.5", + "gsap": "npm:@gsap/business@^3.12.3", "jquery": "^3.6.4", "laravel-mix": "^6.0.49", "resolve-url-loader": "^5.0.0", @@ -47,7 +47,10 @@ "select2": "^4.1.0-rc.0", "select2-bootstrap-theme": "^0.1.0-beta.10", "semver": "^7.5.4", + "simplebar": "^6.2.5", "spectrum-colorpicker": "^1.8.1", + "split-type": "^0.3.4", + "swiper": "^11.0.5", "tippy": "^0.0.0", "tippy.js": "^6.3.7" } -- 2.39.5