From: Vincent Vanwaelscappel Date: Sun, 30 Apr 2023 17:38:49 +0000 (+0200) Subject: wip #5851 @3 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=e40b31bda896080714f4aa02f05e3397becedd84;p=fluidbook-toolbox.git wip #5851 @3 --- diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml index 382c1d2a9..e6c267dcd 100644 --- a/.docker/dev/docker-compose.yml +++ b/.docker/dev/docker-compose.yml @@ -122,7 +122,7 @@ services: - "./database/plugin:/usr/lib/mysql/plugin/" - "./database/data:/var/lib/mysql" - "./database/dump.sql:/docker-entrypoint-initdb.d/dump.sql" - - "./database/config:/etc/mysql/conf.d:z" + - "/home/toolbox/dev/.docker/config/mariadb:/etc/mysql/conf.d:z" networks: - fluidbook-toolbox-dev redis: diff --git a/composer.lock b/composer.lock index 2e7678ac5..06c39c601 100644 --- a/composer.lock +++ b/composer.lock @@ -121,16 +121,16 @@ }, { "name": "backpack/crud", - "version": "5.5.6", + "version": "5.6.0", "source": { "type": "git", "url": "https://github.com/Laravel-Backpack/CRUD.git", - "reference": "d3d0f6d1af13eeea2f87a66e5ca9bc06d14115ca" + "reference": "5316015407af80934be4f66c65176447cce5ef85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Laravel-Backpack/CRUD/zipball/d3d0f6d1af13eeea2f87a66e5ca9bc06d14115ca", - "reference": "d3d0f6d1af13eeea2f87a66e5ca9bc06d14115ca", + "url": "https://api.github.com/repos/Laravel-Backpack/CRUD/zipball/5316015407af80934be4f66c65176447cce5ef85", + "reference": "5316015407af80934be4f66c65176447cce5ef85", "shasum": "" }, "require": { @@ -208,9 +208,9 @@ ], "support": { "issues": "https://github.com/Laravel-Backpack/CRUD/issues", - "source": "https://github.com/Laravel-Backpack/CRUD/tree/5.5.6" + "source": "https://github.com/Laravel-Backpack/CRUD/tree/5.6.0" }, - "time": "2023-04-06T05:28:00+00:00" + "time": "2023-04-27T13:43:06+00:00" }, { "name": "backpack/logmanager", @@ -1364,16 +1364,17 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubedesigners_userdatabase.git", - "reference": "a65622e3d1934c61150aa324698e6006ac3a0e8d" + "reference": "9ca5cfb2e0707d823c93ee19610e81cdeb340b26" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-backpack5-afd31d.tar", - "reference": "a65622e3d1934c61150aa324698e6006ac3a0e8d", - "shasum": "fa3d5a95776052d282eaac5f676387e4976b4355" + "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-backpack5-67f3ba.tar", + "reference": "9ca5cfb2e0707d823c93ee19610e81cdeb340b26", + "shasum": "cc84968c99fe3eb52f15c5acf8d608be185b075d" }, "require": { - "cubist/cms-back": "dev-backpack5" + "cubist/cms-back": "dev-backpack5", + "php": ">=8.2" }, "type": "library", "extra": { @@ -1401,7 +1402,7 @@ } ], "description": "Cubedesigners common users database", - "time": "2023-04-07T06:41:17+00:00" + "time": "2023-04-30T10:11:04+00:00" }, { "name": "cubist/azuretts", @@ -1451,13 +1452,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_cms-back.git", - "reference": "00f8958f3ebc7ad4ceb3efabb3533f298704461d" + "reference": "c6aef0a1af507beb865ead392f9a0780349a0917" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-backpack5-a1e13c.tar", - "reference": "00f8958f3ebc7ad4ceb3efabb3533f298704461d", - "shasum": "4d6f2d59936d64fcb4c7a174ee447770f181531f" + "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-backpack5-248a22.tar", + "reference": "c6aef0a1af507beb865ead392f9a0780349a0917", + "shasum": "e741f6ce7dc0495fd868ab1177264ee6635853e7" }, "require": { "backpack/backupmanager": "^v3.0.9", @@ -1536,7 +1537,7 @@ } ], "description": "Cubist Backpack extension", - "time": "2023-04-13T10:29:48+00:00" + "time": "2023-04-30T10:18:45+00:00" }, { "name": "cubist/cms-front", @@ -1832,13 +1833,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_net.git", - "reference": "4dad0f1bddd1e5c0655db0d7a975a1de52c23f22" + "reference": "f0203ae9addff45df5811cd5d68d64b77de829da" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/net/cubist-net-dev-master-f3e6ce.tar", - "reference": "4dad0f1bddd1e5c0655db0d7a975a1de52c23f22", - "shasum": "a6e68a4029c88dbded4d4c4eb1a660a1f310a289" + "url": "https://composer.cubedesigners.com/dist/cubist/net/cubist-net-dev-master-52aa4b.tar", + "reference": "f0203ae9addff45df5811cd5d68d64b77de829da", + "shasum": "1fc86d55ae26e48ea286a4fa0ac6e82cd1a09e0a" }, "require": { "cubist/util": "dev-master", @@ -1862,7 +1863,7 @@ } ], "description": "net cubist composer package", - "time": "2023-03-31T11:53:22+00:00" + "time": "2023-04-19T09:17:27+00:00" }, { "name": "cubist/pdf", @@ -1957,13 +1958,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_util.git", - "reference": "e2de2ff8641be0a716938bbab7d7f5d03e35e519" + "reference": "342e622a2b0cfcfe3a8a4b19d3477cc6464737fe" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-ecfd8c.tar", - "reference": "e2de2ff8641be0a716938bbab7d7f5d03e35e519", - "shasum": "9113ff5e3bab6fda3c8343f876852a264d2378b2" + "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-c43cb3.tar", + "reference": "342e622a2b0cfcfe3a8a4b19d3477cc6464737fe", + "shasum": "6e118dae36cdaf608c76ef4502e4d39bd7f64114" }, "require": { "cubist/net": "dev-master", @@ -1996,7 +1997,7 @@ } ], "description": "Utilities class", - "time": "2023-04-06T09:17:57+00:00" + "time": "2023-04-27T18:24:33+00:00" }, { "name": "cviebrock/eloquent-sluggable", @@ -2436,16 +2437,16 @@ }, { "name": "doctrine/dbal", - "version": "3.6.1", + "version": "3.6.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "57815c7bbcda3cd18871d253c1dd8cbe56f8526e" + "reference": "b4bd1cfbd2b916951696d82e57d054394d84864c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/57815c7bbcda3cd18871d253c1dd8cbe56f8526e", - "reference": "57815c7bbcda3cd18871d253c1dd8cbe56f8526e", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/b4bd1cfbd2b916951696d82e57d054394d84864c", + "reference": "b4bd1cfbd2b916951696d82e57d054394d84864c", "shasum": "" }, "require": { @@ -2461,9 +2462,9 @@ "doctrine/coding-standard": "11.1.0", "fig/log-test": "^1", "jetbrains/phpstorm-stubs": "2022.3", - "phpstan/phpstan": "1.10.3", + "phpstan/phpstan": "1.10.9", "phpstan/phpstan-strict-rules": "^1.5", - "phpunit/phpunit": "9.6.4", + "phpunit/phpunit": "9.6.6", "psalm/plugin-phpunit": "0.18.4", "squizlabs/php_codesniffer": "3.7.2", "symfony/cache": "^5.4|^6.0", @@ -2528,7 +2529,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.6.1" + "source": "https://github.com/doctrine/dbal/tree/3.6.2" }, "funding": [ { @@ -2544,7 +2545,7 @@ "type": "tidelift" } ], - "time": "2023-03-02T19:26:24+00:00" + "time": "2023-04-14T07:25:38+00:00" }, { "name": "doctrine/deprecations", @@ -2887,21 +2888,21 @@ }, { "name": "dragon-code/contracts", - "version": "v2.19.0", + "version": "v2.19.1", "source": { "type": "git", "url": "https://github.com/TheDragonCode/contracts.git", - "reference": "b50ceb575da285c68615bf759d2bb3288aaa4b25" + "reference": "644ac91d9df96ebec3a46c0d2cc8ff51a83cbfad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TheDragonCode/contracts/zipball/b50ceb575da285c68615bf759d2bb3288aaa4b25", - "reference": "b50ceb575da285c68615bf759d2bb3288aaa4b25", + "url": "https://api.github.com/repos/TheDragonCode/contracts/zipball/644ac91d9df96ebec3a46c0d2cc8ff51a83cbfad", + "reference": "644ac91d9df96ebec3a46c0d2cc8ff51a83cbfad", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", - "psr/http-message": "^1.0.1", + "psr/http-message": "^1.0.1 || ^2.0", "symfony/http-kernel": "^4.0 || ^5.0 || ^6.0", "symfony/polyfill-php80": "^1.23" }, @@ -2909,7 +2910,7 @@ "andrey-helldar/contracts": "*" }, "require-dev": { - "illuminate/database": "^8.0", + "illuminate/database": "^10.0", "phpdocumentor/reflection-docblock": "^5.0" }, "type": "library", @@ -2955,7 +2956,7 @@ "type": "yoomoney" } ], - "time": "2022-10-10T22:02:52+00:00" + "time": "2023-04-19T08:23:59+00:00" }, { "name": "dragon-code/pretty-array", @@ -3039,27 +3040,27 @@ }, { "name": "dragon-code/support", - "version": "v6.11.1", + "version": "v6.11.2", "source": { "type": "git", "url": "https://github.com/TheDragonCode/support.git", - "reference": "0560de8ae9b2641a1c8f27ebc1d602ea425153c3" + "reference": "81b4432f35ee5d1d7a310669ccc698d78b3e83a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TheDragonCode/support/zipball/0560de8ae9b2641a1c8f27ebc1d602ea425153c3", - "reference": "0560de8ae9b2641a1c8f27ebc1d602ea425153c3", + "url": "https://api.github.com/repos/TheDragonCode/support/zipball/81b4432f35ee5d1d7a310669ccc698d78b3e83a6", + "reference": "81b4432f35ee5d1d7a310669ccc698d78b3e83a6", "shasum": "" }, "require": { - "dragon-code/contracts": "^2.18", + "dragon-code/contracts": "^2.19.1", "ext-bcmath": "*", "ext-ctype": "*", "ext-dom": "*", "ext-json": "*", "ext-mbstring": "*", "php": "^8.0", - "psr/http-message": "^1.0.1", + "psr/http-message": "^1.0.1 || ^2.0", "symfony/polyfill-php81": "^1.25", "voku/portable-ascii": "^1.4.8 || ^2.0.1" }, @@ -3138,7 +3139,7 @@ "type": "yoomoney" } ], - "time": "2023-04-01T12:41:34+00:00" + "time": "2023-04-19T08:29:55+00:00" }, { "name": "dragonmantank/cron-expression", @@ -3270,16 +3271,16 @@ }, { "name": "elasticsearch/elasticsearch", - "version": "v7.17.1", + "version": "v7.17.2", "source": { "type": "git", "url": "git@github.com:elastic/elasticsearch-php.git", - "reference": "f1b8918f411b837ce5f6325e829a73518fd50367" + "reference": "2d302233f2bb0926812d82823bb820d405e130fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/f1b8918f411b837ce5f6325e829a73518fd50367", - "reference": "f1b8918f411b837ce5f6325e829a73518fd50367", + "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/2d302233f2bb0926812d82823bb820d405e130fc", + "reference": "2d302233f2bb0926812d82823bb820d405e130fc", "shasum": "" }, "require": { @@ -3292,7 +3293,7 @@ "ext-yaml": "*", "ext-zip": "*", "mockery/mockery": "^1.2", - "phpstan/phpstan": "^0.12", + "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^9.3", "squizlabs/php_codesniffer": "^3.4", "symfony/finder": "~4.0" @@ -3329,7 +3330,7 @@ "elasticsearch", "search" ], - "time": "2022-09-30T12:28:55+00:00" + "time": "2023-04-21T15:31:12+00:00" }, { "name": "evenement/evenement", @@ -3555,16 +3556,16 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/fluidbook_tools.git", - "reference": "b9821ca42ba7f4c19e1bf475f196937b52e734aa" + "reference": "5edecba650ee428f7d6be6afa9ba4cf83f40c371" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-9c36fd.tar", - "reference": "b9821ca42ba7f4c19e1bf475f196937b52e734aa", - "shasum": "6ac99a6dce0f28c05ff0d468181d690fa74c414f" + "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-9704e4.tar", + "reference": "5edecba650ee428f7d6be6afa9ba4cf83f40c371", + "shasum": "282d47a376acef4c7744cb13e82c263546e81dcc" }, "require": { - "barryvdh/laravel-debugbar": "^v3.8.1", + "barryvdh/laravel-debugbar": "*", "cubist/pdf": "dev-master", "cubist/util": "dev-master", "ext-dom": "*", @@ -3595,7 +3596,7 @@ } ], "description": "Fluidbook Tools", - "time": "2023-04-08T08:55:00+00:00" + "time": "2023-04-28T09:50:46+00:00" }, { "name": "fruitcake/php-cors", @@ -3812,22 +3813,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.5.0", + "version": "7.5.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba" + "reference": "b964ca597e86b752cd994f27293e9fa6b6a95ed9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba", - "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b964ca597e86b752cd994f27293e9fa6b6a95ed9", + "reference": "b964ca597e86b752cd994f27293e9fa6b6a95ed9", "shasum": "" }, "require": { "ext-json": "*", "guzzlehttp/promises": "^1.5", - "guzzlehttp/psr7": "^1.9 || ^2.4", + "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -3920,7 +3921,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.5.0" + "source": "https://github.com/guzzle/guzzle/tree/7.5.1" }, "funding": [ { @@ -3936,7 +3937,7 @@ "type": "tidelift" } ], - "time": "2022-08-28T15:39:27+00:00" + "time": "2023-04-17T16:30:08+00:00" }, { "name": "guzzlehttp/promises", @@ -4024,22 +4025,22 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.4.4", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf" + "reference": "b635f279edd83fc275f822a1188157ffea568ff6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf", - "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6", + "reference": "b635f279edd83fc275f822a1188157ffea568ff6", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.1 || ^2.0", "ralouphie/getallheaders": "^3.0" }, "provide": { @@ -4059,9 +4060,6 @@ "bamarni-bin": { "bin-links": true, "forward-command": false - }, - "branch-alias": { - "dev-master": "2.4-dev" } }, "autoload": { @@ -4123,7 +4121,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.4.4" + "source": "https://github.com/guzzle/psr7/tree/2.5.0" }, "funding": [ { @@ -4139,7 +4137,7 @@ "type": "tidelift" } ], - "time": "2023-03-09T13:19:02+00:00" + "time": "2023-04-17T16:11:26+00:00" }, { "name": "guzzlehttp/uri-template", @@ -4361,7 +4359,7 @@ }, { "name": "jane-php/json-schema-runtime", - "version": "v7.4.3", + "version": "v7.5.0", "source": { "type": "git", "url": "https://github.com/janephp/json-schema-runtime.git", @@ -4417,13 +4415,13 @@ ], "description": "Jane runtime Library", "support": { - "source": "https://github.com/janephp/json-schema-runtime/tree/v7.4.3" + "source": "https://github.com/janephp/json-schema-runtime/tree/v7.5.0" }, "time": "2023-01-24T07:25:29+00:00" }, { "name": "jane-php/open-api-runtime", - "version": "v7.4.3", + "version": "v7.5.0", "source": { "type": "git", "url": "https://github.com/janephp/open-api-runtime.git", @@ -4480,7 +4478,7 @@ ], "description": "Jane OpenAPI Runtime Library, dependencies and utility class for a library generated by jane/openapi", "support": { - "source": "https://github.com/janephp/open-api-runtime/tree/v7.4.3" + "source": "https://github.com/janephp/open-api-runtime/tree/v7.5.0" }, "time": "2021-12-16T13:26:58+00:00" }, @@ -4841,16 +4839,16 @@ }, { "name": "laravel/framework", - "version": "v10.7.1", + "version": "v10.9.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "ddbbb2b50388721fe63312bb4469cae13163fd36" + "reference": "35078125f61ef0b125edf524de934f108d4b47fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/ddbbb2b50388721fe63312bb4469cae13163fd36", - "reference": "ddbbb2b50388721fe63312bb4469cae13163fd36", + "url": "https://api.github.com/repos/laravel/framework/zipball/35078125f61ef0b125edf524de934f108d4b47fd", + "reference": "35078125f61ef0b125edf524de934f108d4b47fd", "shasum": "" }, "require": { @@ -5037,7 +5035,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-04-11T14:11:49+00:00" + "time": "2023-04-25T13:47:18+00:00" }, { "name": "laravel/serializable-closure", @@ -5519,23 +5517,23 @@ }, { "name": "league/glide", - "version": "2.2.3", + "version": "2.2.4", "source": { "type": "git", "url": "https://github.com/thephpleague/glide.git", - "reference": "446b1fc9f15101db52e8ddb7bec8cb16e814b244" + "reference": "d31132bf5651d5abeef345ff523cd9cf2575b971" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/glide/zipball/446b1fc9f15101db52e8ddb7bec8cb16e814b244", - "reference": "446b1fc9f15101db52e8ddb7bec8cb16e814b244", + "url": "https://api.github.com/repos/thephpleague/glide/zipball/d31132bf5651d5abeef345ff523cd9cf2575b971", + "reference": "d31132bf5651d5abeef345ff523cd9cf2575b971", "shasum": "" }, "require": { "intervention/image": "^2.7", "league/flysystem": "^2.0|^3.0", "php": "^7.2|^8.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0|^2.0" }, "require-dev": { "mockery/mockery": "^1.3.3", @@ -5578,9 +5576,9 @@ ], "support": { "issues": "https://github.com/thephpleague/glide/issues", - "source": "https://github.com/thephpleague/glide/tree/2.2.3" + "source": "https://github.com/thephpleague/glide/tree/2.2.4" }, - "time": "2023-02-14T06:15:26+00:00" + "time": "2023-04-18T18:42:22+00:00" }, { "name": "league/mime-type-detection", @@ -6849,23 +6847,23 @@ }, { "name": "nyholm/psr7", - "version": "1.6.0", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/Nyholm/psr7.git", - "reference": "bf4aebd170fadf5fd808c70b90535de327e81a50" + "reference": "ed7cf98f6562831dbc3c962406b5e49dc8179c8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Nyholm/psr7/zipball/bf4aebd170fadf5fd808c70b90535de327e81a50", - "reference": "bf4aebd170fadf5fd808c70b90535de327e81a50", + "url": "https://api.github.com/repos/Nyholm/psr7/zipball/ed7cf98f6562831dbc3c962406b5e49dc8179c8c", + "reference": "ed7cf98f6562831dbc3c962406b5e49dc8179c8c", "shasum": "" }, "require": { - "php": ">=7.1", + "php": ">=7.2", "php-http/message-factory": "^1.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.1 || ^2.0" }, "provide": { "php-http/message-factory-implementation": "1.0", @@ -6874,14 +6872,14 @@ }, "require-dev": { "http-interop/http-factory-tests": "^0.9", - "php-http/psr7-integration-tests": "^1.0", + "php-http/psr7-integration-tests": "^1.0@dev", "phpunit/phpunit": "^7.5 || 8.5 || 9.4", "symfony/error-handler": "^4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6-dev" + "dev-master": "1.7-dev" } }, "autoload": { @@ -6911,7 +6909,7 @@ ], "support": { "issues": "https://github.com/Nyholm/psr7/issues", - "source": "https://github.com/Nyholm/psr7/tree/1.6.0" + "source": "https://github.com/Nyholm/psr7/tree/1.7.0" }, "funding": [ { @@ -6923,7 +6921,7 @@ "type": "github" } ], - "time": "2023-04-09T08:34:27+00:00" + "time": "2023-04-20T08:38:48+00:00" }, { "name": "paragonie/constant_time_encoding", @@ -7083,16 +7081,16 @@ }, { "name": "php-http/client-common", - "version": "2.6.0", + "version": "2.6.1", "source": { "type": "git", "url": "https://github.com/php-http/client-common.git", - "reference": "45db684cd4e186dcdc2b9c06b22970fe123796c0" + "reference": "665bfc381bb910385f70391ed3eeefd0b7bbdd0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/client-common/zipball/45db684cd4e186dcdc2b9c06b22970fe123796c0", - "reference": "45db684cd4e186dcdc2b9c06b22970fe123796c0", + "url": "https://api.github.com/repos/php-http/client-common/zipball/665bfc381bb910385f70391ed3eeefd0b7bbdd0d", + "reference": "665bfc381bb910385f70391ed3eeefd0b7bbdd0d", "shasum": "" }, "require": { @@ -7102,7 +7100,7 @@ "php-http/message-factory": "^1.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.0 || ^2.0", "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", "symfony/polyfill-php80": "^1.17" }, @@ -7112,7 +7110,7 @@ "nyholm/psr7": "^1.2", "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", "phpspec/prophecy": "^1.10.2", - "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" + "phpunit/phpunit": "^7.5.20 || ^8.5.33 || ^9.6.7" }, "suggest": { "ext-json": "To detect JSON responses with the ContentTypePlugin", @@ -7122,11 +7120,6 @@ "php-http/stopwatch-plugin": "Symfony Stopwatch plugin" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3.x-dev" - } - }, "autoload": { "psr-4": { "Http\\Client\\Common\\": "src/" @@ -7152,22 +7145,22 @@ ], "support": { "issues": "https://github.com/php-http/client-common/issues", - "source": "https://github.com/php-http/client-common/tree/2.6.0" + "source": "https://github.com/php-http/client-common/tree/2.6.1" }, - "time": "2022-09-29T09:59:43+00:00" + "time": "2023-04-14T13:30:08+00:00" }, { "name": "php-http/discovery", - "version": "1.15.3", + "version": "1.17.0", "source": { "type": "git", "url": "https://github.com/php-http/discovery.git", - "reference": "3ccd28dd9fb34b52db946abea1b538568e34eae8" + "reference": "bd810d15957cf165230e65d9e1a130793265e3b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/discovery/zipball/3ccd28dd9fb34b52db946abea1b538568e34eae8", - "reference": "3ccd28dd9fb34b52db946abea1b538568e34eae8", + "url": "https://api.github.com/repos/php-http/discovery/zipball/bd810d15957cf165230e65d9e1a130793265e3b7", + "reference": "bd810d15957cf165230e65d9e1a130793265e3b7", "shasum": "" }, "require": { @@ -7175,7 +7168,8 @@ "php": "^7.1 || ^8.0" }, "conflict": { - "nyholm/psr7": "<1.0" + "nyholm/psr7": "<1.0", + "zendframework/zend-diactoros": "*" }, "provide": { "php-http/async-client-implementation": "*", @@ -7200,7 +7194,10 @@ "autoload": { "psr-4": { "Http\\Discovery\\": "src/" - } + }, + "exclude-from-classmap": [ + "src/Composer/Plugin.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -7226,40 +7223,35 @@ ], "support": { "issues": "https://github.com/php-http/discovery/issues", - "source": "https://github.com/php-http/discovery/tree/1.15.3" + "source": "https://github.com/php-http/discovery/tree/1.17.0" }, - "time": "2023-03-31T14:40:37+00:00" + "time": "2023-04-26T15:39:13+00:00" }, { "name": "php-http/httplug", - "version": "2.3.0", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/php-http/httplug.git", - "reference": "f640739f80dfa1152533976e3c112477f69274eb" + "reference": "625ad742c360c8ac580fcc647a1541d29e257f67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/httplug/zipball/f640739f80dfa1152533976e3c112477f69274eb", - "reference": "f640739f80dfa1152533976e3c112477f69274eb", + "url": "https://api.github.com/repos/php-http/httplug/zipball/625ad742c360c8ac580fcc647a1541d29e257f67", + "reference": "625ad742c360c8ac580fcc647a1541d29e257f67", "shasum": "" }, "require": { "php": "^7.1 || ^8.0", "php-http/promise": "^1.1", "psr/http-client": "^1.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "require-dev": { - "friends-of-phpspec/phpspec-code-coverage": "^4.1", - "phpspec/phpspec": "^5.1 || ^6.0" + "friends-of-phpspec/phpspec-code-coverage": "^4.1 || ^5.0 || ^6.0", + "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, "autoload": { "psr-4": { "Http\\Client\\": "src/" @@ -7288,29 +7280,29 @@ ], "support": { "issues": "https://github.com/php-http/httplug/issues", - "source": "https://github.com/php-http/httplug/tree/2.3.0" + "source": "https://github.com/php-http/httplug/tree/2.4.0" }, - "time": "2022-02-21T09:52:22+00:00" + "time": "2023-04-14T15:10:03+00:00" }, { "name": "php-http/message", - "version": "1.13.0", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/php-http/message.git", - "reference": "7886e647a30a966a1a8d1dad1845b71ca8678361" + "reference": "2ccee04a28c3d98eb3f2b85ce1e2fcff70c0e63b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/message/zipball/7886e647a30a966a1a8d1dad1845b71ca8678361", - "reference": "7886e647a30a966a1a8d1dad1845b71ca8678361", + "url": "https://api.github.com/repos/php-http/message/zipball/2ccee04a28c3d98eb3f2b85ce1e2fcff70c0e63b", + "reference": "2ccee04a28c3d98eb3f2b85ce1e2fcff70c0e63b", "shasum": "" }, "require": { "clue/stream-filter": "^1.5", "php": "^7.1 || ^8.0", "php-http/message-factory": "^1.0.2", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "provide": { "php-http/message-factory-implementation": "1.0" @@ -7330,11 +7322,6 @@ "slim/slim": "Used with Slim Framework PSR-7 implementation" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.10-dev" - } - }, "autoload": { "files": [ "src/filters.php" @@ -7362,32 +7349,32 @@ ], "support": { "issues": "https://github.com/php-http/message/issues", - "source": "https://github.com/php-http/message/tree/1.13.0" + "source": "https://github.com/php-http/message/tree/1.14.0" }, - "time": "2022-02-11T13:41:14+00:00" + "time": "2023-04-14T14:26:18+00:00" }, { "name": "php-http/message-factory", - "version": "v1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-http/message-factory.git", - "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1" + "reference": "4d8778e1c7d405cbb471574821c1ff5b68cc8f57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/message-factory/zipball/a478cb11f66a6ac48d8954216cfed9aa06a501a1", - "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1", + "url": "https://api.github.com/repos/php-http/message-factory/zipball/4d8778e1c7d405cbb471574821c1ff5b68cc8f57", + "reference": "4d8778e1c7d405cbb471574821c1ff5b68cc8f57", "shasum": "" }, "require": { "php": ">=5.4", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -7416,42 +7403,36 @@ ], "support": { "issues": "https://github.com/php-http/message-factory/issues", - "source": "https://github.com/php-http/message-factory/tree/master" + "source": "https://github.com/php-http/message-factory/tree/1.1.0" }, - "time": "2015-12-19T14:08:53+00:00" + "time": "2023-04-14T14:16:17+00:00" }, { "name": "php-http/multipart-stream-builder", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/php-http/multipart-stream-builder.git", - "reference": "11c1d31f72e01c738bbce9e27649a7cca829c30e" + "reference": "f5938fd135d9fa442cc297dc98481805acfe2b6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/multipart-stream-builder/zipball/11c1d31f72e01c738bbce9e27649a7cca829c30e", - "reference": "11c1d31f72e01c738bbce9e27649a7cca829c30e", + "url": "https://api.github.com/repos/php-http/multipart-stream-builder/zipball/f5938fd135d9fa442cc297dc98481805acfe2b6a", + "reference": "f5938fd135d9fa442cc297dc98481805acfe2b6a", "shasum": "" }, "require": { "php": "^7.1 || ^8.0", - "php-http/discovery": "^1.7", - "php-http/message-factory": "^1.0.2", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.0" + "php-http/discovery": "^1.15", + "psr/http-factory-implementation": "^1.0" }, "require-dev": { "nyholm/psr7": "^1.0", "php-http/message": "^1.5", + "php-http/message-factory": "^1.0.2", "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, "autoload": { "psr-4": { "Http\\Message\\MultipartStream\\": "src/" @@ -7478,9 +7459,9 @@ ], "support": { "issues": "https://github.com/php-http/multipart-stream-builder/issues", - "source": "https://github.com/php-http/multipart-stream-builder/tree/1.2.0" + "source": "https://github.com/php-http/multipart-stream-builder/tree/1.3.0" }, - "time": "2021-05-21T08:32:01+00:00" + "time": "2023-04-28T14:10:22+00:00" }, { "name": "php-http/promise", @@ -8392,16 +8373,16 @@ }, { "name": "ramsey/uuid", - "version": "4.x-dev", + "version": "4.7.4", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "8e955307d32dc9b6992440ff81321d3cb09db75a" + "reference": "60a4c63ab724854332900504274f6150ff26d286" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/8e955307d32dc9b6992440ff81321d3cb09db75a", - "reference": "8e955307d32dc9b6992440ff81321d3cb09db75a", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/60a4c63ab724854332900504274f6150ff26d286", + "reference": "60a4c63ab724854332900504274f6150ff26d286", "shasum": "" }, "require": { @@ -8442,7 +8423,6 @@ "paragonie/random-lib": "Provides RandomLib for use with the RandomLibAdapter", "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type." }, - "default-branch": true, "type": "library", "extra": { "captainhook": { @@ -8469,7 +8449,7 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.x" + "source": "https://github.com/ramsey/uuid/tree/4.7.4" }, "funding": [ { @@ -8481,7 +8461,7 @@ "type": "tidelift" } ], - "time": "2023-03-27T22:05:11+00:00" + "time": "2023-04-15T23:01:58+00:00" }, { "name": "react/promise", @@ -8869,16 +8849,16 @@ }, { "name": "spatie/laravel-backup", - "version": "8.1.8", + "version": "8.1.9", "source": { "type": "git", "url": "https://github.com/spatie/laravel-backup.git", - "reference": "75c12cf56a9eaed0c473130a1bdad1fe495d87cf" + "reference": "381f56fa109dd28f1b8366d2c24cb46267720c50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/75c12cf56a9eaed0c473130a1bdad1fe495d87cf", - "reference": "75c12cf56a9eaed0c473130a1bdad1fe495d87cf", + "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/381f56fa109dd28f1b8366d2c24cb46267720c50", + "reference": "381f56fa109dd28f1b8366d2c24cb46267720c50", "shasum": "" }, "require": { @@ -8952,7 +8932,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-backup/issues", - "source": "https://github.com/spatie/laravel-backup/tree/8.1.8" + "source": "https://github.com/spatie/laravel-backup/tree/8.1.9" }, "funding": [ { @@ -8964,7 +8944,7 @@ "type": "other" } ], - "time": "2023-04-12T08:23:50+00:00" + "time": "2023-04-25T07:19:55+00:00" }, { "name": "spatie/laravel-googletagmanager", @@ -9112,16 +9092,16 @@ }, { "name": "spatie/laravel-medialibrary", - "version": "10.7.16", + "version": "10.9.1", "source": { "type": "git", "url": "https://github.com/spatie/laravel-medialibrary.git", - "reference": "4fabfc58e08ee53586a613b18b8879049132e526" + "reference": "99b703e63a16fedeb00174b4657b65751b74e36e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/4fabfc58e08ee53586a613b18b8879049132e526", - "reference": "4fabfc58e08ee53586a613b18b8879049132e526", + "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/99b703e63a16fedeb00174b4657b65751b74e36e", + "reference": "99b703e63a16fedeb00174b4657b65751b74e36e", "shasum": "" }, "require": { @@ -9135,7 +9115,7 @@ "illuminate/pipeline": "^9.18|^10.0", "illuminate/support": "^9.18|^10.0", "intervention/image": "^2.7", - "maennchen/zipstream-php": "^2.0", + "maennchen/zipstream-php": "^2.0|^3.0", "php": "^8.0", "spatie/image": "^2.2.2", "spatie/temporary-directory": "^2.0", @@ -9205,7 +9185,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-medialibrary/issues", - "source": "https://github.com/spatie/laravel-medialibrary/tree/10.7.16" + "source": "https://github.com/spatie/laravel-medialibrary/tree/10.9.1" }, "funding": [ { @@ -9217,20 +9197,20 @@ "type": "github" } ], - "time": "2023-03-30T07:51:35+00:00" + "time": "2023-04-21T10:23:52+00:00" }, { "name": "spatie/laravel-package-tools", - "version": "1.14.2", + "version": "1.15.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-package-tools.git", - "reference": "bab62023a4745a61170ad5424184533685e73c2d" + "reference": "efab1844b8826443135201c4443690f032c3d533" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/bab62023a4745a61170ad5424184533685e73c2d", - "reference": "bab62023a4745a61170ad5424184533685e73c2d", + "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/efab1844b8826443135201c4443690f032c3d533", + "reference": "efab1844b8826443135201c4443690f032c3d533", "shasum": "" }, "require": { @@ -9269,7 +9249,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-package-tools/issues", - "source": "https://github.com/spatie/laravel-package-tools/tree/1.14.2" + "source": "https://github.com/spatie/laravel-package-tools/tree/1.15.0" }, "funding": [ { @@ -9277,7 +9257,7 @@ "type": "github" } ], - "time": "2023-03-14T16:41:21+00:00" + "time": "2023-04-27T08:09:01+00:00" }, { "name": "spatie/laravel-permission", @@ -9437,16 +9417,16 @@ }, { "name": "spatie/laravel-translatable", - "version": "6.4.0", + "version": "6.5.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-translatable.git", - "reference": "f472fbaec8a3d44096d3c6ed029484d0bf9116a7" + "reference": "732e46b8c664a6da6d5d14751185c1844e2b5bc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-translatable/zipball/f472fbaec8a3d44096d3c6ed029484d0bf9116a7", - "reference": "f472fbaec8a3d44096d3c6ed029484d0bf9116a7", + "url": "https://api.github.com/repos/spatie/laravel-translatable/zipball/732e46b8c664a6da6d5d14751185c1844e2b5bc1", + "reference": "732e46b8c664a6da6d5d14751185c1844e2b5bc1", "shasum": "" }, "require": { @@ -9506,7 +9486,8 @@ "translate" ], "support": { - "source": "https://github.com/spatie/laravel-translatable/tree/6.4.0" + "issues": "https://github.com/spatie/laravel-translatable/issues", + "source": "https://github.com/spatie/laravel-translatable/tree/6.5.0" }, "funding": [ { @@ -9514,7 +9495,7 @@ "type": "github" } ], - "time": "2023-03-19T17:50:34+00:00" + "time": "2023-04-20T08:54:14+00:00" }, { "name": "spatie/pdf-to-image", @@ -9578,16 +9559,16 @@ }, { "name": "spatie/temporary-directory", - "version": "2.1.1", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/spatie/temporary-directory.git", - "reference": "e2818d871783d520b319c2d38dc37c10ecdcde20" + "reference": "0c804873f6b4042aa8836839dca683c7d0f71831" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/temporary-directory/zipball/e2818d871783d520b319c2d38dc37c10ecdcde20", - "reference": "e2818d871783d520b319c2d38dc37c10ecdcde20", + "url": "https://api.github.com/repos/spatie/temporary-directory/zipball/0c804873f6b4042aa8836839dca683c7d0f71831", + "reference": "0c804873f6b4042aa8836839dca683c7d0f71831", "shasum": "" }, "require": { @@ -9623,7 +9604,7 @@ ], "support": { "issues": "https://github.com/spatie/temporary-directory/issues", - "source": "https://github.com/spatie/temporary-directory/tree/2.1.1" + "source": "https://github.com/spatie/temporary-directory/tree/2.1.2" }, "funding": [ { @@ -9635,7 +9616,7 @@ "type": "github" } ], - "time": "2022-08-23T07:15:15+00:00" + "time": "2023-04-28T07:47:42+00:00" }, { "name": "spomky-labs/base64url", @@ -9884,16 +9865,16 @@ }, { "name": "symfony/cache", - "version": "v6.2.8", + "version": "v6.2.10", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "76babfd82f6bfd8f6cbe851a153b95dd074ffc53" + "reference": "1ce7ed8e7ca6948892b6a3a52bb60cf2b04f7c94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/76babfd82f6bfd8f6cbe851a153b95dd074ffc53", - "reference": "76babfd82f6bfd8f6cbe851a153b95dd074ffc53", + "url": "https://api.github.com/repos/symfony/cache/zipball/1ce7ed8e7ca6948892b6a3a52bb60cf2b04f7c94", + "reference": "1ce7ed8e7ca6948892b6a3a52bb60cf2b04f7c94", "shasum": "" }, "require": { @@ -9902,7 +9883,7 @@ "psr/log": "^1.1|^2|^3", "symfony/cache-contracts": "^1.1.7|^2|^3", "symfony/service-contracts": "^1.1|^2|^3", - "symfony/var-exporter": "^6.2.7" + "symfony/var-exporter": "^6.2.10" }, "conflict": { "doctrine/dbal": "<2.13.1", @@ -9960,7 +9941,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.2.8" + "source": "https://github.com/symfony/cache/tree/v6.2.10" }, "funding": [ { @@ -9976,7 +9957,7 @@ "type": "tidelift" } ], - "time": "2023-03-30T07:37:32+00:00" + "time": "2023-04-21T15:42:15+00:00" }, { "name": "symfony/cache-contracts", @@ -10059,16 +10040,16 @@ }, { "name": "symfony/console", - "version": "v6.2.8", + "version": "v6.2.10", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "3582d68a64a86ec25240aaa521ec8bc2342b369b" + "reference": "12288d9f4500f84a4d02254d4aa968b15488476f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/3582d68a64a86ec25240aaa521ec8bc2342b369b", - "reference": "3582d68a64a86ec25240aaa521ec8bc2342b369b", + "url": "https://api.github.com/repos/symfony/console/zipball/12288d9f4500f84a4d02254d4aa968b15488476f", + "reference": "12288d9f4500f84a4d02254d4aa968b15488476f", "shasum": "" }, "require": { @@ -10135,7 +10116,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.2.8" + "source": "https://github.com/symfony/console/tree/v6.2.10" }, "funding": [ { @@ -10151,7 +10132,7 @@ "type": "tidelift" } ], - "time": "2023-03-29T21:42:15+00:00" + "time": "2023-04-28T13:37:43+00:00" }, { "name": "symfony/css-selector", @@ -10287,16 +10268,16 @@ }, { "name": "symfony/error-handler", - "version": "v6.2.7", + "version": "v6.2.10", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "61e90f94eb014054000bc902257d2763fac09166" + "reference": "8b7e9f124640cb0611624a9383176c3e5f7d8cfb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/61e90f94eb014054000bc902257d2763fac09166", - "reference": "61e90f94eb014054000bc902257d2763fac09166", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/8b7e9f124640cb0611624a9383176c3e5f7d8cfb", + "reference": "8b7e9f124640cb0611624a9383176c3e5f7d8cfb", "shasum": "" }, "require": { @@ -10338,7 +10319,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.2.7" + "source": "https://github.com/symfony/error-handler/tree/v6.2.10" }, "funding": [ { @@ -10354,7 +10335,7 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:44:56+00:00" + "time": "2023-04-18T13:46:08+00:00" }, { "name": "symfony/event-dispatcher", @@ -10584,16 +10565,16 @@ }, { "name": "symfony/http-client", - "version": "v6.2.8", + "version": "v6.2.10", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "66391ba3a8862c560e1d9134c96d9bd2a619b477" + "reference": "3f5545a91c8e79dedd1a06c4b04e1682c80c42f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/66391ba3a8862c560e1d9134c96d9bd2a619b477", - "reference": "66391ba3a8862c560e1d9134c96d9bd2a619b477", + "url": "https://api.github.com/repos/symfony/http-client/zipball/3f5545a91c8e79dedd1a06c4b04e1682c80c42f9", + "reference": "3f5545a91c8e79dedd1a06c4b04e1682c80c42f9", "shasum": "" }, "require": { @@ -10652,7 +10633,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.2.8" + "source": "https://github.com/symfony/http-client/tree/v6.2.10" }, "funding": [ { @@ -10668,7 +10649,7 @@ "type": "tidelift" } ], - "time": "2023-03-31T09:14:44+00:00" + "time": "2023-04-20T13:12:48+00:00" }, { "name": "symfony/http-client-contracts", @@ -10753,16 +10734,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.2.8", + "version": "v6.2.10", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "511a524affeefc191939348823ac75e9921c2112" + "reference": "49adbb92bcb4e3c2943719d2756271e8b9602acc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/511a524affeefc191939348823ac75e9921c2112", - "reference": "511a524affeefc191939348823ac75e9921c2112", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/49adbb92bcb4e3c2943719d2756271e8b9602acc", + "reference": "49adbb92bcb4e3c2943719d2756271e8b9602acc", "shasum": "" }, "require": { @@ -10811,7 +10792,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.2.8" + "source": "https://github.com/symfony/http-foundation/tree/v6.2.10" }, "funding": [ { @@ -10827,20 +10808,20 @@ "type": "tidelift" } ], - "time": "2023-03-29T21:42:15+00:00" + "time": "2023-04-18T13:46:08+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.2.8", + "version": "v6.2.10", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "9563229e56076070d92ca30c089e801e8a4629a3" + "reference": "81064a65a5496f17d2b6984f6519406f98864215" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9563229e56076070d92ca30c089e801e8a4629a3", - "reference": "9563229e56076070d92ca30c089e801e8a4629a3", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/81064a65a5496f17d2b6984f6519406f98864215", + "reference": "81064a65a5496f17d2b6984f6519406f98864215", "shasum": "" }, "require": { @@ -10922,7 +10903,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.2.8" + "source": "https://github.com/symfony/http-kernel/tree/v6.2.10" }, "funding": [ { @@ -10938,7 +10919,7 @@ "type": "tidelift" } ], - "time": "2023-03-31T12:00:10+00:00" + "time": "2023-04-28T13:50:28+00:00" }, { "name": "symfony/mailer", @@ -11021,16 +11002,16 @@ }, { "name": "symfony/mime", - "version": "v6.2.7", + "version": "v6.2.10", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "62e341f80699badb0ad70b31149c8df89a2d778e" + "reference": "b6c137fc53a9f7c4c951cd3f362b3734c7a97723" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/62e341f80699badb0ad70b31149c8df89a2d778e", - "reference": "62e341f80699badb0ad70b31149c8df89a2d778e", + "url": "https://api.github.com/repos/symfony/mime/zipball/b6c137fc53a9f7c4c951cd3f362b3734c7a97723", + "reference": "b6c137fc53a9f7c4c951cd3f362b3734c7a97723", "shasum": "" }, "require": { @@ -11084,7 +11065,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.2.7" + "source": "https://github.com/symfony/mime/tree/v6.2.10" }, "funding": [ { @@ -11100,7 +11081,7 @@ "type": "tidelift" } ], - "time": "2023-02-24T10:42:00+00:00" + "time": "2023-04-19T09:54:16+00:00" }, { "name": "symfony/options-resolver", @@ -11908,16 +11889,16 @@ }, { "name": "symfony/process", - "version": "v6.2.8", + "version": "v6.2.10", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "75ed64103df4f6615e15a7fe38b8111099f47416" + "reference": "b34cdbc9c5e75d45a3703e63a48ad07aafa8bf2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/75ed64103df4f6615e15a7fe38b8111099f47416", - "reference": "75ed64103df4f6615e15a7fe38b8111099f47416", + "url": "https://api.github.com/repos/symfony/process/zipball/b34cdbc9c5e75d45a3703e63a48ad07aafa8bf2e", + "reference": "b34cdbc9c5e75d45a3703e63a48ad07aafa8bf2e", "shasum": "" }, "require": { @@ -11949,7 +11930,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.2.8" + "source": "https://github.com/symfony/process/tree/v6.2.10" }, "funding": [ { @@ -11965,7 +11946,7 @@ "type": "tidelift" } ], - "time": "2023-03-09T16:20:02+00:00" + "time": "2023-04-18T13:56:57+00:00" }, { "name": "symfony/routing", @@ -12057,16 +12038,16 @@ }, { "name": "symfony/serializer", - "version": "v6.2.8", + "version": "v6.2.10", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "db9d36470bf0990990fda9320b8b001bb582f075" + "reference": "0732edf0ad28dd3faacde4f1200ab9d7a4d5f40d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/db9d36470bf0990990fda9320b8b001bb582f075", - "reference": "db9d36470bf0990990fda9320b8b001bb582f075", + "url": "https://api.github.com/repos/symfony/serializer/zipball/0732edf0ad28dd3faacde4f1200ab9d7a4d5f40d", + "reference": "0732edf0ad28dd3faacde4f1200ab9d7a4d5f40d", "shasum": "" }, "require": { @@ -12138,7 +12119,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v6.2.8" + "source": "https://github.com/symfony/serializer/tree/v6.2.10" }, "funding": [ { @@ -12154,7 +12135,7 @@ "type": "tidelift" } ], - "time": "2023-03-31T09:14:44+00:00" + "time": "2023-04-18T13:57:49+00:00" }, { "name": "symfony/service-contracts", @@ -12582,16 +12563,16 @@ }, { "name": "symfony/var-dumper", - "version": "v6.2.8", + "version": "v6.2.10", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "d37ab6787be2db993747b6218fcc96e8e3bb4bd0" + "reference": "41a750a23412ca76fdbbf5096943b4134272c1ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d37ab6787be2db993747b6218fcc96e8e3bb4bd0", - "reference": "d37ab6787be2db993747b6218fcc96e8e3bb4bd0", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/41a750a23412ca76fdbbf5096943b4134272c1ab", + "reference": "41a750a23412ca76fdbbf5096943b4134272c1ab", "shasum": "" }, "require": { @@ -12650,7 +12631,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.2.8" + "source": "https://github.com/symfony/var-dumper/tree/v6.2.10" }, "funding": [ { @@ -12666,20 +12647,20 @@ "type": "tidelift" } ], - "time": "2023-03-29T21:42:15+00:00" + "time": "2023-04-18T13:46:08+00:00" }, { "name": "symfony/var-exporter", - "version": "v6.2.8", + "version": "v6.2.10", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "8302bb670204500d492c6b8c595ee9a27da62cd6" + "reference": "9a07920c2058bafee921ce4d90aeef2193837d63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/8302bb670204500d492c6b8c595ee9a27da62cd6", - "reference": "8302bb670204500d492c6b8c595ee9a27da62cd6", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/9a07920c2058bafee921ce4d90aeef2193837d63", + "reference": "9a07920c2058bafee921ce4d90aeef2193837d63", "shasum": "" }, "require": { @@ -12724,7 +12705,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.2.8" + "source": "https://github.com/symfony/var-exporter/tree/v6.2.10" }, "funding": [ { @@ -12740,20 +12721,20 @@ "type": "tidelift" } ], - "time": "2023-03-14T15:48:45+00:00" + "time": "2023-04-21T08:33:05+00:00" }, { "name": "symfony/yaml", - "version": "v6.2.7", + "version": "v6.2.10", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "e8e6a1d59e050525f27a1f530aa9703423cb7f57" + "reference": "61916f3861b1e9705b18cfde723921a71dd1559d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/e8e6a1d59e050525f27a1f530aa9703423cb7f57", - "reference": "e8e6a1d59e050525f27a1f530aa9703423cb7f57", + "url": "https://api.github.com/repos/symfony/yaml/zipball/61916f3861b1e9705b18cfde723921a71dd1559d", + "reference": "61916f3861b1e9705b18cfde723921a71dd1559d", "shasum": "" }, "require": { @@ -12798,7 +12779,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.2.7" + "source": "https://github.com/symfony/yaml/tree/v6.2.10" }, "funding": [ { @@ -12814,7 +12795,7 @@ "type": "tidelift" } ], - "time": "2023-02-16T09:57:23+00:00" + "time": "2023-04-28T13:25:36+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -14659,16 +14640,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.18.1", + "version": "1.20.3", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "22dcdfd725ddf99583bfe398fc624ad6c5004a0f" + "reference": "6c04009f6cae6eda2f040745b6b846080ef069c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/22dcdfd725ddf99583bfe398fc624ad6c5004a0f", - "reference": "22dcdfd725ddf99583bfe398fc624ad6c5004a0f", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6c04009f6cae6eda2f040745b6b846080ef069c2", + "reference": "6c04009f6cae6eda2f040745b6b846080ef069c2", "shasum": "" }, "require": { @@ -14698,9 +14679,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.18.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.20.3" }, - "time": "2023-04-07T11:51:11+00:00" + "time": "2023-04-25T09:01:03+00:00" }, { "name": "phpunit/php-code-coverage", @@ -15022,16 +15003,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.6", + "version": "9.6.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115" + "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b65d59a059d3004a040c16a82e07bbdf6cfdd115", - "reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c993f0d3b0489ffc42ee2fe0bd645af1538a63b2", + "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2", "shasum": "" }, "require": { @@ -15105,7 +15086,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.6" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.7" }, "funding": [ { @@ -15121,20 +15102,20 @@ "type": "tidelift" } ], - "time": "2023-03-27T11:43:46+00:00" + "time": "2023-04-14T08:58:40+00:00" }, { "name": "psy/psysh", - "version": "v0.11.15", + "version": "v0.11.16", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "5350ce0ec8ecf2c5b5cf554cd2496f97b444af85" + "reference": "151b145906804eea8e5d71fea23bfb470c904bfb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/5350ce0ec8ecf2c5b5cf554cd2496f97b444af85", - "reference": "5350ce0ec8ecf2c5b5cf554cd2496f97b444af85", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/151b145906804eea8e5d71fea23bfb470c904bfb", + "reference": "151b145906804eea8e5d71fea23bfb470c904bfb", "shasum": "" }, "require": { @@ -15195,9 +15176,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.15" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.16" }, - "time": "2023-04-07T21:57:09+00:00" + "time": "2023-04-26T12:53:57+00:00" }, { "name": "sebastian/cli-parser", @@ -16296,16 +16277,16 @@ }, { "name": "spatie/ignition", - "version": "1.5.0", + "version": "1.6.0", "source": { "type": "git", "url": "https://github.com/spatie/ignition.git", - "reference": "4db9c9626e4d7745efbe0b512157326190b41b65" + "reference": "fbcfcabc44e506e40c4d72fd4ddf465e272a600e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/ignition/zipball/4db9c9626e4d7745efbe0b512157326190b41b65", - "reference": "4db9c9626e4d7745efbe0b512157326190b41b65", + "url": "https://api.github.com/repos/spatie/ignition/zipball/fbcfcabc44e506e40c4d72fd4ddf465e272a600e", + "reference": "fbcfcabc44e506e40c4d72fd4ddf465e272a600e", "shasum": "" }, "require": { @@ -16336,7 +16317,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.4.x-dev" + "dev-main": "1.5.x-dev" } }, "autoload": { @@ -16375,7 +16356,7 @@ "type": "github" } ], - "time": "2023-04-12T09:07:50+00:00" + "time": "2023-04-27T08:40:07+00:00" }, { "name": "spatie/laravel-ignition", @@ -16549,5 +16530,5 @@ "ext-zlib": "*" }, "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.3.0" } diff --git a/package-lock.json b/package-lock.json index 25fdf3ac2..097f0ab09 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,6 +6,7 @@ "": { "dependencies": { "ace-builds": "^1.17.0", + "cash-dom": "^8.1.5", "codemirror": "^6.0.1", "command-line-args": "^5.2.1", "crypto-js": "^4.1.1", @@ -3432,6 +3433,11 @@ "node": ">=6" } }, + "node_modules/cash-dom": { + "version": "8.1.5", + "resolved": "https://registry.npmjs.org/cash-dom/-/cash-dom-8.1.5.tgz", + "integrity": "sha512-/BS05CfzyHR5xT2ksKj1sDLPaOv5rSmIwoGxNgdKwUtnIuiJ5neMxVEmZxvfyJiSjGbOMD0Lwe+9v+fszDqHew==" + }, "node_modules/chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", diff --git a/package.json b/package.json index f83b30872..f31ff8704 100644 --- a/package.json +++ b/package.json @@ -1,27 +1,19 @@ { "private": true, "scripts": { - "all": "npm run elearningmedia-prod;npm run elearningpackage-prod;npm run quiz-prod;npm run linkeditor-prod", - "elearningmedia-dev": "npm run elearningmedia-development", - "elearningmedia-development": "cross-env process.env.section=elearningmedia mix", + "all": "npm run elearningmedia;npm run elearningpackage;npm run quiz;npm run linkeditor", + "elearningmedia-dev": "cross-env process.env.section=elearningmedia mix", "elearningmedia-watch": "cross-env process.env.section=elearningmedia mix watch", - "elearningmedia-prod": "npm run elearningmedia-production", - "elearningmedia-production": "cross-env process.env.section=elearningmedia mix --production", - "elearningpackage-dev": "npm run elearningpackage-development", - "elearningpackage-development": "cross-env process.env.section=elearningpackage mix", + "elearningmedia": "cross-env process.env.section=elearningmedia mix --production", + "elearningpackage-dev": "cross-env process.env.section=elearningpackage mix", "elearningpackage-watch": "cross-env process.env.section=elearningpackage mix watch", - "elearningpackage-prod": "npm run elearningpackage-production", - "elearningpackage-production": "cross-env process.env.section=elearningpackage mix --production", - "quiz-dev": "npm run quiz-development", - "quiz-development": "cross-env process.env.section=quiz mix", + "elearningpackage": "cross-env process.env.section=elearningpackage mix --production", + "quiz-dev": "cross-env process.env.section=quiz mix", "quiz-watch": "cross-env process.env.section=quiz mix watch", - "quiz-prod": "npm run quiz-production", - "quiz-production": "cross-env process.env.section=quiz mix --production", - "linkeditor-dev": "npm run linkeditor-development", - "linkeditor-development": "cross-env process.env.section=linkeditor mix", + "quiz": "cross-env process.env.section=quiz mix --production", + "linkeditor-dev": "cross-env process.env.section=linkeditor mix", "linkeditor-watch": "cross-env process.env.section=linkeditor mix watch", - "linkeditor-prod": "npm run linkeditor-production", - "linkeditor-production": "cross-env process.env.section=linkeditor mix --production" + "linkeditor": "cross-env process.env.section=linkeditor mix --production" }, "devDependencies": { "axios": "^1.3.5", @@ -36,6 +28,7 @@ }, "dependencies": { "ace-builds": "^1.17.0", + "cash-dom": "^8.1.5", "codemirror": "^6.0.1", "command-line-args": "^5.2.1", "crypto-js": "^4.1.1", diff --git a/public/packages/fluidbook/toolbox/css/style.less b/public/packages/fluidbook/toolbox/css/style.less index 01c396455..55dbcb19e 100644 --- a/public/packages/fluidbook/toolbox/css/style.less +++ b/public/packages/fluidbook/toolbox/css/style.less @@ -265,6 +265,7 @@ a, a.btn-link, a:not([href]):not([tabindex]) { } .pace .pace-progress { + display: none; background: @sidebar-active; } @@ -477,18 +478,4 @@ table.dataTable thead > tr > th.sorting_asc::before, table.dataTable thead > tr opacity: 1.0 !important; } -table.dataTable thead .sorting::before, table.dataTable thead .sorting::after, table.dataTable thead .sorting_asc::before, table.dataTable thead .sorting_asc::after, table.dataTable thead .sorting_desc::before, table.dataTable thead .sorting_desc::after, table.dataTable thead .sorting_asc_disabled::before, table.dataTable thead .sorting_asc_disabled::after, table.dataTable thead .sorting_desc_disabled::before, table.dataTable thead .sorting_desc_disabled::after { - opacity: 0.3 !important; -} - -.table-striped tbody tr:nth-of-type(2n) { - background-color: rgba(0, 0, 0, .02); -} - -table.dataTable.table-striped > tbody > tr:nth-of-type(2n+1):hover { - background-color: rgba(124, 124, 124, .1); -} - -@import "context-menu"; -@import "loader"; - +table.dataTable thead .sorting::before, table.dataTable thead .sorting::after, table.dataTable thead .sorting_asc::before, table.dataTable thead .sorting_asc::after, table.dataTable thead .sorting_desc::before, table.dataTable thead .sorting_desc::after, table.dataTabl diff --git a/resources/elearningmedia/js/app.js b/resources/elearningmedia/js/app.js index 69232aa94..6fd66aa87 100644 --- a/resources/elearningmedia/js/app.js +++ b/resources/elearningmedia/js/app.js @@ -1,10 +1,10 @@ -import jQuery from "jquery"; -import '../../scorm/scorm'; -import Plyr from 'plyr'; - -window.jQuery = window.$ = jQuery; -window.cubeSCORM = cubeSCORM; +import $ from "cash-dom"; +import Plyr from "plyr"; +import {CubeSCORM} from '../../scorm/scorm'; +import {Spectrum} from "./spectrum"; +window.cubeSCORM = new CubeSCORM(); +window.$ = window.jQuery = $; window.openTime = Date.now(); document.addEventListener("DOMContentLoaded", function () { @@ -80,131 +80,3 @@ function markComplete(interval) { cubeSCORM.scormMarkAsComplete(); clearInterval(interval); } - - -function Spectrum(element) { - this.started = false; - this.element = element; - this.init(); -} - -Spectrum.prototype = { - init: function () { - var $this = this; - - this.svg = document.getElementById('spectrum'); - this.svgNS = this.svg.namespaceURI; - this.g = document.createElementNS(this.svgNS, "g"); - - window.addEventListener('resize', function () { - $this.resize(); - }); - this.resize(); - - - this.fftSize = 512; - this.tilt = 0; - this.choke = 100; - this.c = 0; - - - this.svg.appendChild(this.g); - - this.setup(); - }, - - setup: function () { - var $this = this; - this.element.addEventListener('loadeddata', function (e) { - $this.start(); - }); - this.element.addEventListener('play', function (e) { - $this.start(); - }); - this.element.addEventListener('canplay', function (e) { - $this.start(); - }); - - }, - - resize: function () { - this.width = window.innerWidth; - this.height = window.innerHeight - 52; - this.maxHeight = Math.max(this.height * 0.3, 300); - this.svg.setAttribute("width", this.width + "px"); - this.svg.setAttribute("height", this.height + "px"); - this.svg.setAttribute("viewBox", "0 0 " + this.width + " " + this.height); - }, - - start: function () { - if (this.started) { - return; - } - this.resize(); - this.started = true; - - this.audioContext = new AudioContext(); - this.analyser = (this.analyser || this.audioContext.createAnalyser()); - this.analyser.minDecibels = -90; - this.analyser.maxDecibels = -10; - this.analyser.smoothingTimeConstant = 0.9; - this.analyser.fftSize = this.fftSize; - - this.sourceNode = this.audioContext.createMediaElementSource(document.getElementById("player")); - this.sourceNode.connect(this.analyser); - this.sourceNode.connect(this.audioContext.destination); - - this.update(); - }, - - update: function () { - var $this = this; - try { - this.g.remove(); - } catch (e) { - - } - this.g = document.createElementNS(this.svgNS, "g"); - var freqArray = new Uint8Array(this.analyser.frequencyBinCount); - this.analyser.getByteTimeDomainData(freqArray); - - for (var i = 0; i < freqArray.length; i++) { - var v = freqArray[i]; - this.shape(this.g, v, i + 1, freqArray.length, this.c); - } - this.svg.appendChild(this.g); - - this.c += 0.5; - requestAnimationFrame(function () { - $this.update(); - }); - }, - - shape: function (g, freqValue, freqSequence, freqCount, colorSequence) { - var freqRatio = freqSequence / freqCount, x = (this.width - (this.tilt * 2)) * freqRatio + this.tilt, - y = this.height / 2; - - var polyline = document.createElementNS(this.svgNS, "polyline"), // using power to increase highs and decrease lows - freqRatio = freqValue / 255, throttledRatio = (freqValue - this.choke) / (255 - this.choke), - strokeWidth = this.width / freqCount * 0.6 * throttledRatio, - throttledY = Math.max(throttledRatio, 0) * this.maxHeight, // color - color = "rgba(255,255,255,0.8)"; - - var loc_x = x - strokeWidth / 2, loc_y1 = y - throttledY / 2, loc_y2 = y + throttledY / 2, - x_offset = this.tilt * throttledRatio; - - if (throttledRatio > 0) { - var point_1 = (loc_x - x_offset) + "," + loc_y1, point_2 = (loc_x + x_offset) + "," + loc_y2; - var points = [point_1, point_2]; - } else { - var points = [loc_x + "," + (y - 1), loc_x + "," + (y + 1)] - } - - polyline.setAttribute("stroke-width", strokeWidth); - polyline.setAttribute("stroke", color); - polyline.setAttribute("points", points.join(" ")); - this.g.appendChild(polyline); - }, - - -} diff --git a/resources/elearningmedia/js/spectrum.js b/resources/elearningmedia/js/spectrum.js new file mode 100644 index 000000000..38dd654c6 --- /dev/null +++ b/resources/elearningmedia/js/spectrum.js @@ -0,0 +1,126 @@ +export function Spectrum(element) { + this.started = false; + this.element = element; + this.init(); +} + +Spectrum.prototype = { + init: function () { + var $this = this; + + this.svg = document.getElementById('spectrum'); + this.svgNS = this.svg.namespaceURI; + this.g = document.createElementNS(this.svgNS, "g"); + + window.addEventListener('resize', function () { + $this.resize(); + }); + this.resize(); + + + this.fftSize = 512; + this.tilt = 0; + this.choke = 100; + this.c = 0; + + + this.svg.appendChild(this.g); + + this.setup(); + }, + + setup: function () { + var $this = this; + this.element.addEventListener('loadeddata', function (e) { + $this.start(); + }); + this.element.addEventListener('play', function (e) { + $this.start(); + }); + this.element.addEventListener('canplay', function (e) { + $this.start(); + }); + + }, + + resize: function () { + this.width = window.innerWidth; + this.height = window.innerHeight - 52; + this.maxHeight = Math.max(this.height * 0.3, 300); + this.svg.setAttribute("width", this.width + "px"); + this.svg.setAttribute("height", this.height + "px"); + this.svg.setAttribute("viewBox", "0 0 " + this.width + " " + this.height); + }, + + start: function () { + if (this.started) { + return; + } + this.resize(); + this.started = true; + + this.audioContext = new AudioContext(); + this.analyser = (this.analyser || this.audioContext.createAnalyser()); + this.analyser.minDecibels = -90; + this.analyser.maxDecibels = -10; + this.analyser.smoothingTimeConstant = 0.9; + this.analyser.fftSize = this.fftSize; + + this.sourceNode = this.audioContext.createMediaElementSource(document.getElementById("player")); + this.sourceNode.connect(this.analyser); + this.sourceNode.connect(this.audioContext.destination); + + this.update(); + }, + + update: function () { + var $this = this; + try { + this.g.remove(); + } catch (e) { + + } + this.g = document.createElementNS(this.svgNS, "g"); + var freqArray = new Uint8Array(this.analyser.frequencyBinCount); + this.analyser.getByteTimeDomainData(freqArray); + + for (var i = 0; i < freqArray.length; i++) { + var v = freqArray[i]; + this.shape(this.g, v, i + 1, freqArray.length, this.c); + } + this.svg.appendChild(this.g); + + this.c += 0.5; + requestAnimationFrame(function () { + $this.update(); + }); + }, + + shape: function (g, freqValue, freqSequence, freqCount, colorSequence) { + var freqRatio = freqSequence / freqCount, x = (this.width - (this.tilt * 2)) * freqRatio + this.tilt, + y = this.height / 2; + + var polyline = document.createElementNS(this.svgNS, "polyline"), // using power to increase highs and decrease lows + freqRatio = freqValue / 255, throttledRatio = (freqValue - this.choke) / (255 - this.choke), + strokeWidth = this.width / freqCount * 0.6 * throttledRatio, + throttledY = Math.max(throttledRatio, 0) * this.maxHeight, // color + color = "rgba(255,255,255,0.8)"; + + var loc_x = x - strokeWidth / 2, loc_y1 = y - throttledY / 2, loc_y2 = y + throttledY / 2, + x_offset = this.tilt * throttledRatio; + + if (throttledRatio > 0) { + var point_1 = (loc_x - x_offset) + "," + loc_y1, point_2 = (loc_x + x_offset) + "," + loc_y2; + var points = [point_1, point_2]; + } else { + var points = [loc_x + "," + (y - 1), loc_x + "," + (y + 1)] + } + + polyline.setAttribute("stroke-width", strokeWidth); + polyline.setAttribute("stroke", color); + polyline.setAttribute("points", points.join(" ")); + this.g.appendChild(polyline); + }, + + +} diff --git a/resources/elearningpackage/js/app.js b/resources/elearningpackage/js/app.js index efd5f16f9..ef8eac37f 100644 --- a/resources/elearningpackage/js/app.js +++ b/resources/elearningpackage/js/app.js @@ -1,11 +1,13 @@ import axios from 'axios'; -import jQuery from "jquery"; -import "../../scorm/scorm.js"; +import $ from "cash-dom"; +import {CubeSCORM} from '../../scorm/scorm'; +import {SCORMFacade} from "./scorm_facade"; + +window.cubeSCORM = new CubeSCORM(); window.axios = axios; window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; -window.$ = window.jQuery = jQuery; -window.cubeSCORM=cubeSCORM; +window.$ = window.jQuery = $; window.savedState = {}; window.currentModule = null; @@ -37,7 +39,7 @@ function initPackage() { initState(); setContents(); initEvents(); - window.API = window.API_1484_11 = new SCORMFacade(); + window.API = window.API_1484_11 = new SCORMFacade(setModuleState, closeSubSCO); return res; } @@ -301,78 +303,3 @@ function getSpriteIcon(icon, attrs, dimensions) { return ''; } -function SCORMFacade() { -} - -SCORMFacade.prototype = { - LMSInitialize: function () { - return this.Initialize(); - }, Initialize: function () { - this._log('Init'); - return true; - }, LMSFinish: function () { - return this.Terminate(); - }, Terminate: function () { - this._log('Terminate'); - closeSubSCO(); - return true; - }, LMSGetValue: function (key) { - return this.GetValue(key); - }, GetValue: function (key) { - var d = savedState[currentModule.id]; - var res; - if (key === 'cmi.core.lesson_status' || key === 'cmi.completion_status') { - res = d.completion_status; - } else if (key === 'cmi.location' || key === 'cmi.core.lesson_location') { - if (typeof d.location === 'string' || typeof d.location === 'number') { - res = d.location; - } else { - res = JSON.stringify(d.location); - } - } else if (key === 'cmi.success_status') { - res = d.success_status; - } else { - res = d.cmi[key] === null ? '' : d.cmi[key]; - } - this._log('Get value ' + key + ' :: ' + res); - return res; - }, LMSSetValue: function (key, value) { - return this.SetValue(key, value); - }, SetValue: function (key, value) { - this._log('Set value ' + key + ' :: ' + value); - var data = {cmi: {}}; - if (key === 'cmi.core.lesson_status' || key === 'cmi.completion_status') { - key = 'completion_status'; - data[key] = value; - } else if (key === 'cmi.location' || key === 'cmi.core.lesson_location') { - key = 'location'; - data[key] = value; - } else if (key === 'cmi.success_status') { - key = 'success_status'; - data[key] = value; - } else { - data.cmi[key] = value; - } - - setModuleState(currentModule.id, data); - return true; - }, LMSCommit: function (d) { - return this.Commit(d); - }, Commit: function (d) { - return true; - }, LMSGetLastError: function () { - return this.GetLastError(); - }, GetLastError: function () { - return 0; - }, LMSGetErrorString: function (code) { - return this.GetErrorString(code); - }, GetErrorString: function (code) { - return ''; - }, LMSGetDiagnostic: function (code) { - return this.GetDiagnostic(code); - }, GetDiagnostic: function (code) { - return ''; - }, _log: function (log) { - console.log('SCORM facade (' + currentModule.id + ') : ' + log); - }, -}; diff --git a/resources/elearningpackage/js/scorm_facade.js b/resources/elearningpackage/js/scorm_facade.js new file mode 100644 index 000000000..ae047557b --- /dev/null +++ b/resources/elearningpackage/js/scorm_facade.js @@ -0,0 +1,93 @@ +export function SCORMFacade(changeStateFunc, closeSubSCO) { + this.changeStateFunc = changeStateFunc; + this.closeSubSCO = closeSubSCO; +} + +SCORMFacade.prototype = { + LMSInitialize: function () { + return this.Initialize(); + }, + Initialize: function () { + this._log('Init'); + return true; + }, + LMSFinish: function () { + return this.Terminate(); + }, + Terminate: function () { + this._log('Terminate'); + this.closeSubSCO(); + return true; + }, + LMSGetValue: function (key) { + return this.GetValue(key); + }, + GetValue: function (key) { + var d = savedState[currentModule.id]; + var res; + if (key === 'cmi.core.lesson_status' || key === 'cmi.completion_status') { + res = d.completion_status; + } else if (key === 'cmi.location' || key === 'cmi.core.lesson_location') { + if (typeof d.location === 'string' || typeof d.location === 'number') { + res = d.location; + } else { + res = JSON.stringify(d.location); + } + } else if (key === 'cmi.success_status') { + res = d.success_status; + } else { + res = d.cmi[key] === null ? '' : d.cmi[key]; + } + this._log('Get value ' + key + ' :: ' + res); + return res; + }, + LMSSetValue: function (key, value) { + return this.SetValue(key, value); + }, + SetValue: function (key, value) { + this._log('Set value ' + key + ' :: ' + value); + var data = {cmi: {}}; + if (key === 'cmi.core.lesson_status' || key === 'cmi.completion_status') { + key = 'completion_status'; + data[key] = value; + } else if (key === 'cmi.location' || key === 'cmi.core.lesson_location') { + key = 'location'; + data[key] = value; + } else if (key === 'cmi.success_status') { + key = 'success_status'; + data[key] = value; + } else { + data.cmi[key] = value; + } + + this.changeStateFunc(currentModule.id, data); + return true; + }, + LMSCommit: function (d) { + return this.Commit(d); + }, + Commit: function (d) { + return true; + }, + LMSGetLastError: function () { + return this.GetLastError(); + }, + GetLastError: function () { + return 0; + }, + LMSGetErrorString: function (code) { + return this.GetErrorString(code); + }, + GetErrorString: function (code) { + return ''; + }, + LMSGetDiagnostic: function (code) { + return this.GetDiagnostic(code); + }, + GetDiagnostic: function (code) { + return ''; + }, + _log: function (log) { + console.log('SCORM facade (' + currentModule.id + ') : ' + log); + }, +}; diff --git a/resources/elearningpackage/webpack.mix.js b/resources/elearningpackage/webpack.mix.js index 99dfcade7..973c6fa8e 100644 --- a/resources/elearningpackage/webpack.mix.js +++ b/resources/elearningpackage/webpack.mix.js @@ -1,4 +1,5 @@ const mix = require("laravel-mix"); mix.setPublicPath('resources/elearningpackage/dist').js('resources/elearningpackage/js/app.js', 'js') + .copyDirectory('resources/elearningpackage/fonts', 'resources/elearningpackage/dist/fonts') .sass('resources/elearningpackage/sass/app.sass', 'css').options({processCssUrls: false}).version(); diff --git a/resources/quiz/js/app.js b/resources/quiz/js/app.js index 0b54f0aa8..9ce6480ea 100644 --- a/resources/quiz/js/app.js +++ b/resources/quiz/js/app.js @@ -1,10 +1,9 @@ -import 'jquery'; -import {gsap} from "gsap"; -import '../../scorm/scorm'; - -window.cubeSCORM = cubeSCORM; -window.$ = window.jQuery = jQuery; +import $ from "jquery"; +import gsap from "gsap"; +import {CubeSCORM} from '../../scorm/scorm'; +window.cubeSCORM = new CubeSCORM(); +window.$ = window.jQuery = $; (function (global) { $(function () { diff --git a/resources/scorm/scorm.js b/resources/scorm/scorm.js index 5fc8a23ac..aa7c32d6c 100644 --- a/resources/scorm/scorm.js +++ b/resources/scorm/scorm.js @@ -1,22 +1,13 @@ import {SCORM} from "pipwerks-scorm-api-wrapper"; -import 'pako'; +import {inflate, deflate} from "pako"; -function CubeSCORM() { - this.pako = pako; - this.SCORM = SCORM; +export function CubeSCORM() { + this.SCORM = SCORM; this.SCORM_INITED = false; this.SCORM_START_TIME = null; - this.SCORM_INTERACTION_TIMESTAMPS = []; - this.SCORM_CORRECT_ANSWERS = []; - this.SCORM_ID_TO_N = {}; - this.SCORM_WEIGHTING = 0; - this.SCORM_QUESTIONS = []; - this.SCORM_SUCCESS_STATUS = 'unknown'; - this.SCORM_SUCCESS_SCORE = 0; this.SCORM_EVENTS_INITED = false; - this.SCORM_INTERACTIONS_INITED = false; this.SCORM_LOCATION_INITED = false; this.SCORM_OK = false; @@ -86,10 +77,10 @@ CubeSCORM.prototype = { var res = null; switch (this.scormVersion()) { case "1.2" : - res = _CMI12[key]; + res = this._CMI12[key]; break; case '2004': - res = _CMI2004[key]; + res = this._CMI2004[key]; break; } if (res == undefined || res == null) { @@ -116,8 +107,8 @@ CubeSCORM.prototype = { setSCORMLocation: function (location) { let json = JSON.stringify(location); - let deflate = this.pako.deflate(json); - let b64 = this.bytesArrToBase64(deflate); + let deflateStr = deflate(json); + let b64 = this.bytesArrToBase64(deflateStr); return this.setScormValue('suspend_data', b64); }, @@ -160,7 +151,7 @@ CubeSCORM.prototype = { if (currentLocation.indexOf('[') === -1 && currentLocation.indexOf('{') === -1) { // Maybe a zipped string try { - currentLocation = this.pako.inflate(this.base64ToBytesArr(currentLocation), {to: 'string'}) + currentLocation = inflate(this.base64ToBytesArr(currentLocation), {to: 'string'}) } catch (e) { console.warn('Unable to uncompress the data'); currentLocation = ''; @@ -337,4 +328,3 @@ CubeSCORM.prototype = { } -module.exports = CubeSCORM;