diff --git a/api/composer.lock b/api/composer.lock index f316029..8cf2ca4 100755 --- a/api/composer.lock +++ b/api/composer.lock @@ -202,11 +202,11 @@ }, { "name": "composer/ca-bundle", - "version": "1.3.6", + "version": "1.3.7", "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/90d087e988ff194065333d16bc5cf649872d9cdb", - "reference": "90d087e988ff194065333d16bc5cf649872d9cdb", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/76e46335014860eec1aa5a724799a00a2e47cc85", + "reference": "76e46335014860eec1aa5a724799a00a2e47cc85", "shasum": "" }, "require": { @@ -243,7 +243,7 @@ "ssl", "tls" ], - "time": "2023-06-06T12:02:59+00:00" + "time": "2023-08-30T09:31:38+00:00" }, { "name": "composer/composer", @@ -399,11 +399,11 @@ }, { "name": "composer/semver", - "version": "3.3.2", + "version": "3.4.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", + "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", "shasum": "" }, "require": { @@ -447,7 +447,7 @@ "validation", "versioning" ], - "time": "2022-04-01T19:23:25+00:00" + "time": "2023-08-31T09:50:34+00:00" }, { "name": "composer/spdx-licenses", @@ -984,11 +984,11 @@ }, { "name": "defuse/php-encryption", - "version": "v2.3.1", + "version": "v2.4.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/defuse/php-encryption/zipball/77880488b9954b7884c25555c2a0ea9e7053f9d2", - "reference": "77880488b9954b7884c25555c2a0ea9e7053f9d2", + "url": "https://api.github.com/repos/defuse/php-encryption/zipball/f53396c2d34225064647a05ca76c1da9d99e5828", + "reference": "f53396c2d34225064647a05ca76c1da9d99e5828", "shasum": "" }, "require": { @@ -1033,15 +1033,15 @@ "security", "symmetric key cryptography" ], - "time": "2021-04-09T23:57:26+00:00" + "time": "2023-06-19T06:10:36+00:00" }, { "name": "doctrine/collections", - "version": "2.1.2", + "version": "2.1.3", "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/db8cda536a034337f7dd63febecc713d4957f9ee", - "reference": "db8cda536a034337f7dd63febecc713d4957f9ee", + "url": "https://api.github.com/repos/doctrine/collections/zipball/3023e150f90a38843856147b58190aa8b46cc155", + "reference": "3023e150f90a38843856147b58190aa8b46cc155", "shasum": "" }, "require": { @@ -1087,7 +1087,7 @@ "iterators", "php" ], - "time": "2022-12-27T23:41:38+00:00" + "time": "2023-07-06T15:15:36+00:00" }, { "name": "doctrine/deprecations", @@ -1652,17 +1652,17 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.7.0", + "version": "7.8.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/fb7566caccf22d74d1ab270de3551f72a58399f5", - "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1110f66a6530a40fe7aea0378fe608ee2b2248f9", + "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5.3 || ^2.0", - "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", + "guzzlehttp/promises": "^1.5.3 || ^2.0.1", + "guzzlehttp/psr7": "^1.9.1 || ^2.5.1", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -1742,7 +1742,7 @@ "rest", "web service" ], - "time": "2023-05-21T14:04:53+00:00" + "time": "2023-08-27T10:20:53+00:00" }, { "name": "guzzlehttp/promises", @@ -1798,34 +1798,29 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.4.5", + "version": "1.9.1", "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/0454e12ef0cd597ccd2adb036f7bda4e7fface66", - "reference": "0454e12ef0cd597ccd2adb036f7bda4e7fface66", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/e4490cabc77465aaee90b20cfc9a770f8c04be6b", + "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b", "shasum": "" }, "require": { - "php": "^7.2.5 || ^8.0", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "ralouphie/getallheaders": "^3.0" + "php": ">=5.4.0", + "psr/http-message": "~1.0", + "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" }, "provide": { - "psr/http-factory-implementation": "1.0", "psr/http-message-implementation": "1.0" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", - "extra": { - "bamarni-bin": { - "bin-links": true, - "forward-command": false - } - }, "autoload": { + "files": [ + "src/functions_include.php" + ], "psr-4": { "GuzzleHttp\\Psr7\\": "src/" } @@ -1863,11 +1858,6 @@ "name": "Tobias Schultze", "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://sagikazarmark.hu" } ], "description": "PSR-7 message implementation that also provides common utility methods", @@ -1881,15 +1871,15 @@ "uri", "url" ], - "time": "2023-04-17T16:00:45+00:00" + "time": "2023-04-17T16:00:37+00:00" }, { "name": "illuminate/collections", - "version": "v9.52.9", + "version": "v9.52.15", "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/collections/zipball/0168d0e44ea0c4fe5451fe08cde7049b9e9f9741", - "reference": "0168d0e44ea0c4fe5451fe08cde7049b9e9f9741", + "url": "https://api.github.com/repos/illuminate/collections/zipball/d3710b0b244bfc62c288c1a87eaa62dd28352d1f", + "reference": "d3710b0b244bfc62c288c1a87eaa62dd28352d1f", "shasum": "" }, "require": { @@ -1926,11 +1916,11 @@ ], "description": "The Illuminate Collections package.", "homepage": "https://laravel.com", - "time": "2023-02-22T11:32:27+00:00" + "time": "2023-06-11T21:17:10+00:00" }, { "name": "illuminate/conditionable", - "version": "v9.52.9", + "version": "v9.52.15", "dist": { "type": "zip", "url": "https://api.github.com/repos/illuminate/conditionable/zipball/bea24daa0fa84b7e7b0d5b84f62c71b7e2dc3364", @@ -1966,7 +1956,7 @@ }, { "name": "illuminate/contracts", - "version": "v9.52.9", + "version": "v9.52.15", "dist": { "type": "zip", "url": "https://api.github.com/repos/illuminate/contracts/zipball/44f65d723b13823baa02ff69751a5948bde60c22", @@ -2004,7 +1994,7 @@ }, { "name": "illuminate/macroable", - "version": "v9.52.9", + "version": "v9.52.15", "dist": { "type": "zip", "url": "https://api.github.com/repos/illuminate/macroable/zipball/e3bfaf6401742a9c6abca61b9b10e998e5b6449a", @@ -2565,11 +2555,11 @@ }, { "name": "moneyphp/money", - "version": "v4.1.1", + "version": "v4.2.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/moneyphp/money/zipball/9682220995ffd396843be5b4ee1e5f2c2d6ecee2", - "reference": "9682220995ffd396843be5b4ee1e5f2c2d6ecee2", + "url": "https://api.github.com/repos/moneyphp/money/zipball/f660ab7f1d7a4c2ffdd30f50c55ed2c95c26fc3f", + "reference": "f660ab7f1d7a4c2ffdd30f50c55ed2c95c26fc3f", "shasum": "" }, "require": { @@ -2621,7 +2611,7 @@ "money", "vo" ], - "time": "2023-04-11T09:18:34+00:00" + "time": "2023-08-16T14:31:24+00:00" }, { "name": "monolog/monolog", @@ -2860,11 +2850,11 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.7.2", + "version": "1.7.3", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b2fe4d22a5426f38e014855322200b97b5362c0d", - "reference": "b2fe4d22a5426f38e014855322200b97b5362c0d", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", + "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", "shasum": "" }, "require": { @@ -2894,7 +2884,7 @@ } ], "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "time": "2023-05-30T18:13:47+00:00" + "time": "2023-08-12T11:01:26+00:00" }, { "name": "phpoption/phpoption", @@ -3056,11 +3046,11 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.22.0", + "version": "1.23.1", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/ec58baf7b3c7f1c81b3b00617c953249fb8cf30c", - "reference": "ec58baf7b3c7f1c81b3b00617c953249fb8cf30c", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/846ae76eef31c6d7790fac9bc399ecee45160b26", + "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26", "shasum": "" }, "require": { @@ -3078,7 +3068,7 @@ "MIT" ], "description": "PHPDoc parser with support for nullable, intersection and generic types", - "time": "2023-06-01T12:35:21+00:00" + "time": "2023-08-03T16:32:59+00:00" }, { "name": "pixelandtonic/imagine", @@ -3333,52 +3323,6 @@ ], "time": "2023-04-10T20:12:12+00:00" }, - { - "name": "psr/http-factory", - "version": "1.0.2", - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", - "reference": "e616d01114759c4c489f93b099585439f795fe35", - "shasum": "" - }, - "require": { - "php": ">=7.0.0", - "psr/http-message": "^1.0 || ^2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Http\\Message\\": "src/" - } - }, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common interfaces for PSR-7 HTTP message factories", - "keywords": [ - "factory", - "http", - "message", - "psr", - "psr-17", - "psr-7", - "request", - "response" - ], - "time": "2023-04-10T20:10:41+00:00" - }, { "name": "psr/http-message", "version": "1.0.1", @@ -3954,11 +3898,11 @@ }, { "name": "symfony/console", - "version": "v5.4.24", + "version": "v5.4.28", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8", - "reference": "560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8", + "url": "https://api.github.com/repos/symfony/console/zipball/f4f71842f24c2023b91237c72a365306f3c58827", + "reference": "f4f71842f24c2023b91237c72a365306f3c58827", "shasum": "" }, "require": { @@ -4017,7 +3961,7 @@ "console", "terminal" ], - "time": "2023-05-26T05:13:16+00:00" + "time": "2023-08-07T06:12:30+00:00" }, { "name": "symfony/deprecation-contracts", @@ -4065,11 +4009,11 @@ }, { "name": "symfony/event-dispatcher", - "version": "v6.3.0", + "version": "v6.3.2", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa", - "reference": "3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/adb01fe097a4ee930db9258a3cc906b5beb5cf2e", + "reference": "adb01fe097a4ee930db9258a3cc906b5beb5cf2e", "shasum": "" }, "require": { @@ -4108,7 +4052,7 @@ ], "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", - "time": "2023-04-21T14:41:17+00:00" + "time": "2023-07-06T06:56:43+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -4165,11 +4109,11 @@ }, { "name": "symfony/filesystem", - "version": "v6.3.0", + "version": "v6.3.1", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/97b698e1d77d356304def77a8d0cd73090b359ea", - "reference": "97b698e1d77d356304def77a8d0cd73090b359ea", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/edd36776956f2a6fcf577edb5b05eb0e3bdc52ae", + "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae", "shasum": "" }, "require": { @@ -4201,15 +4145,15 @@ ], "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", - "time": "2023-05-30T17:12:32+00:00" + "time": "2023-06-01T08:30:39+00:00" }, { "name": "symfony/finder", - "version": "v6.3.0", + "version": "v6.3.3", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/d9b01ba073c44cef617c7907ce2419f8d00d75e2", - "reference": "d9b01ba073c44cef617c7907ce2419f8d00d75e2", + "url": "https://api.github.com/repos/symfony/finder/zipball/9915db259f67d21eefee768c1abcf1cc61b1fc9e", + "reference": "9915db259f67d21eefee768c1abcf1cc61b1fc9e", "shasum": "" }, "require": { @@ -4239,15 +4183,15 @@ ], "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", - "time": "2023-04-02T01:25:41+00:00" + "time": "2023-07-31T08:31:44+00:00" }, { "name": "symfony/http-client", - "version": "v6.3.0", + "version": "v6.3.2", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/b2f892c91e4e02a939edddeb7ef452522d10a424", - "reference": "b2f892c91e4e02a939edddeb7ef452522d10a424", + "url": "https://api.github.com/repos/symfony/http-client/zipball/15f9f4bad62bfcbe48b5dedd866f04a08fc7ff00", + "reference": "15f9f4bad62bfcbe48b5dedd866f04a08fc7ff00", "shasum": "" }, "require": { @@ -4294,7 +4238,7 @@ "keywords": [ "http" ], - "time": "2023-05-12T08:49:48+00:00" + "time": "2023-07-05T08:41:27+00:00" }, { "name": "symfony/http-client-contracts", @@ -4404,15 +4348,16 @@ }, { "name": "symfony/mime", - "version": "v6.3.0", + "version": "v6.3.3", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/7b5d2121858cd6efbed778abce9cfdd7ab1f62ad", - "reference": "7b5d2121858cd6efbed778abce9cfdd7ab1f62ad", + "url": "https://api.github.com/repos/symfony/mime/zipball/9a0cbd52baa5ba5a5b1f0cacc59466f194730f98", + "reference": "9a0cbd52baa5ba5a5b1f0cacc59466f194730f98", "shasum": "" }, "require": { "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-intl-idn": "^1.10", "symfony/polyfill-mbstring": "^1.0" }, @@ -4421,7 +4366,7 @@ "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", "symfony/mailer": "<5.4", - "symfony/serializer": "<6.2" + "symfony/serializer": "<6.2.13|>=6.3,<6.3.2" }, "type": "library", "autoload": { @@ -4451,15 +4396,15 @@ "mime", "mime-type" ], - "time": "2023-04-28T15:57:00+00:00" + "time": "2023-07-31T07:08:24+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "version": "v1.28.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", "shasum": "" }, "require": { @@ -4474,7 +4419,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4510,15 +4455,15 @@ "polyfill", "portable" ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.27.0", + "version": "v1.28.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/927013f3aac555983a5059aada98e1907d842695", - "reference": "927013f3aac555983a5059aada98e1907d842695", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/6de50471469b8c9afc38164452ab2b6170ee71c1", + "reference": "6de50471469b8c9afc38164452ab2b6170ee71c1", "shasum": "" }, "require": { @@ -4533,7 +4478,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4570,15 +4515,15 @@ "portable", "shim" ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.27.0", + "version": "v1.28.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", + "reference": "875e90aeea2777b6f135677f618529449334a612", "shasum": "" }, "require": { @@ -4590,7 +4535,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4628,15 +4573,15 @@ "portable", "shim" ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.27.0", + "version": "v1.28.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d", + "reference": "ecaafce9f77234a6a449d29e49267ba10499116d", "shasum": "" }, "require": { @@ -4650,7 +4595,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4692,15 +4637,15 @@ "portable", "shim" ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:30:37+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", + "version": "v1.28.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", "shasum": "" }, "require": { @@ -4712,7 +4657,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4753,15 +4698,15 @@ "portable", "shim" ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.28.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", + "reference": "42292d99c55abe617799667f454222c54c60e229", "shasum": "" }, "require": { @@ -4776,7 +4721,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4813,15 +4758,15 @@ "portable", "shim" ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-07-28T09:04:16+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.27.0", + "version": "v1.28.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179", + "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179", "shasum": "" }, "require": { @@ -4830,7 +4775,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4866,15 +4811,15 @@ "portable", "shim" ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.27.0", + "version": "v1.28.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5", + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5", "shasum": "" }, "require": { @@ -4883,7 +4828,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4922,15 +4867,15 @@ "portable", "shim" ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.27.0", + "version": "v1.28.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", "shasum": "" }, "require": { @@ -4939,7 +4884,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4982,15 +4927,15 @@ "portable", "shim" ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/process", - "version": "v6.3.0", + "version": "v6.3.4", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/8741e3ed7fe2e91ec099e02446fb86667a0f1628", - "reference": "8741e3ed7fe2e91ec099e02446fb86667a0f1628", + "url": "https://api.github.com/repos/symfony/process/zipball/0b5c29118f2e980d455d2e34a5659f4579847c54", + "reference": "0b5c29118f2e980d455d2e34a5659f4579847c54", "shasum": "" }, "require": { @@ -5020,7 +4965,7 @@ ], "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", - "time": "2023-05-19T08:06:44+00:00" + "time": "2023-08-07T10:39:22+00:00" }, { "name": "symfony/service-contracts", @@ -5083,11 +5028,11 @@ }, { "name": "symfony/string", - "version": "v6.3.0", + "version": "v6.3.2", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/f2e190ee75ff0f5eced645ec0be5c66fac81f51f", - "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f", + "url": "https://api.github.com/repos/symfony/string/zipball/53d1a83225002635bca3482fcbf963001313fb68", + "reference": "53d1a83225002635bca3482fcbf963001313fb68", "shasum": "" }, "require": { @@ -5135,15 +5080,15 @@ "utf-8", "utf8" ], - "time": "2023-03-21T21:06:29+00:00" + "time": "2023-07-05T08:41:27+00:00" }, { "name": "symfony/var-dumper", - "version": "v5.4.24", + "version": "v5.4.28", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/8e12706bf9c68a2da633f23bfdc15b4dce5970b3", - "reference": "8e12706bf9c68a2da633f23bfdc15b4dce5970b3", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/684b36ff415e1381d4a943c3ca2502cd2debad73", + "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73", "shasum": "" }, "require": { @@ -5193,7 +5138,7 @@ "debug", "dump" ], - "time": "2023-05-25T13:05:00+00:00" + "time": "2023-08-24T13:38:36+00:00" }, { "name": "symfony/yaml", @@ -5455,11 +5400,11 @@ }, { "name": "voku/anti-xss", - "version": "4.1.41", + "version": "4.1.42", "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/anti-xss/zipball/55a403436494e44a2547a8d42de68e6cad4bca1d", - "reference": "55a403436494e44a2547a8d42de68e6cad4bca1d", + "url": "https://api.github.com/repos/voku/anti-xss/zipball/bca1f8607e55a3c5077483615cd93bd8f11bd675", + "reference": "bca1f8607e55a3c5077483615cd93bd8f11bd675", "shasum": "" }, "require": { @@ -5499,7 +5444,7 @@ "security", "xss" ], - "time": "2023-02-12T15:56:55+00:00" + "time": "2023-07-03T14:40:46+00:00" }, { "name": "voku/arrayy", @@ -5891,11 +5836,11 @@ }, { "name": "webonyx/graphql-php", - "version": "v14.11.9", + "version": "v14.11.10", "dist": { "type": "zip", - "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/ff91c9f3cf241db702e30b2c42bcc0920e70ac70", - "reference": "ff91c9f3cf241db702e30b2c42bcc0920e70ac70", + "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/d9c2fdebc6aa01d831bc2969da00e8588cffef19", + "reference": "d9c2fdebc6aa01d831bc2969da00e8588cffef19", "shasum": "" }, "require": { @@ -5922,7 +5867,7 @@ "api", "graphql" ], - "time": "2023-01-06T12:12:50+00:00" + "time": "2023-07-05T14:23:37+00:00" }, { "name": "yiisoft/yii2", @@ -6660,5 +6605,5 @@ "platform-overrides": { "php": "8.1.10" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } diff --git a/api/config/project/neoBlockTypeGroups/513634e9-3389-4e41-b769-9433ac34e35e.yaml b/api/config/project/neoBlockTypeGroups/513634e9-3389-4e41-b769-9433ac34e35e.yaml index 5efe49a..9ca1480 100644 --- a/api/config/project/neoBlockTypeGroups/513634e9-3389-4e41-b769-9433ac34e35e.yaml +++ b/api/config/project/neoBlockTypeGroups/513634e9-3389-4e41-b769-9433ac34e35e.yaml @@ -1,4 +1,4 @@ alwaysShowDropdown: null field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks name: Widgets -sortOrder: 5 +sortOrder: 8 diff --git a/api/config/project/neoBlockTypes/barGraphTool--a47f94c7-0a32-43be-863a-fa9d6636fff2.yaml b/api/config/project/neoBlockTypes/barGraphTool--a47f94c7-0a32-43be-863a-fa9d6636fff2.yaml index e31613e..f220a26 100644 --- a/api/config/project/neoBlockTypes/barGraphTool--a47f94c7-0a32-43be-863a-fa9d6636fff2.yaml +++ b/api/config/project/neoBlockTypes/barGraphTool--a47f94c7-0a32-43be-863a-fa9d6636fff2.yaml @@ -96,5 +96,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Bar Graph Tool' -sortOrder: 6 +sortOrder: 9 topLevel: true diff --git a/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml b/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml new file mode 100644 index 0000000..81cbca5 --- /dev/null +++ b/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml @@ -0,0 +1,21 @@ +childBlocks: + - colLeft + - colRight +conditions: null +description: '' +enabled: true +field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks +group: 7ebe493b-5e03-48c8-8375-c9f9582da77e # Containers +groupChildBlockTypes: true +handle: colLeft +icon: null +ignorePermissions: true +maxBlocks: 1 +maxChildBlocks: 0 +maxSiblingBlocks: 1 +minBlocks: 0 +minChildBlocks: 0 +minSiblingBlocks: 0 +name: 'Left Column' +sortOrder: 5 +topLevel: false diff --git a/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml b/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml new file mode 100644 index 0000000..53ecada --- /dev/null +++ b/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml @@ -0,0 +1,21 @@ +childBlocks: + - barGraphTool + - scatterplotTool +conditions: null +description: '' +enabled: true +field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks +group: 7ebe493b-5e03-48c8-8375-c9f9582da77e # Containers +groupChildBlockTypes: true +handle: colRight +icon: null +ignorePermissions: true +maxBlocks: 1 +maxChildBlocks: 0 +maxSiblingBlocks: 1 +minBlocks: 0 +minChildBlocks: 0 +minSiblingBlocks: 0 +name: 'Right Column' +sortOrder: 6 +topLevel: false diff --git a/api/config/project/neoBlockTypes/colorTool--2ec1a258-188f-43da-936b-78e95f910601.yaml b/api/config/project/neoBlockTypes/colorTool--2ec1a258-188f-43da-936b-78e95f910601.yaml index d19d656..9630756 100644 --- a/api/config/project/neoBlockTypes/colorTool--2ec1a258-188f-43da-936b-78e95f910601.yaml +++ b/api/config/project/neoBlockTypes/colorTool--2ec1a258-188f-43da-936b-78e95f910601.yaml @@ -95,5 +95,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Color Tool' -sortOrder: 7 +sortOrder: 10 topLevel: true diff --git a/api/config/project/neoBlockTypes/filterTool--3912a1a0-e71b-44b3-bcf4-976c0564975e.yaml b/api/config/project/neoBlockTypes/filterTool--3912a1a0-e71b-44b3-bcf4-976c0564975e.yaml index 6cb0448..2fc6ef4 100644 --- a/api/config/project/neoBlockTypes/filterTool--3912a1a0-e71b-44b3-bcf4-976c0564975e.yaml +++ b/api/config/project/neoBlockTypes/filterTool--3912a1a0-e71b-44b3-bcf4-976c0564975e.yaml @@ -48,5 +48,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Filter Tool' -sortOrder: 8 +sortOrder: 11 topLevel: true diff --git a/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml b/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml new file mode 100644 index 0000000..e50d213 --- /dev/null +++ b/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml @@ -0,0 +1,26 @@ +childBlocks: + - text + - twoColumnContainer + - widgetContainer + - barGraphTool + - colorTool + - filterTool + - scatterplotTool +conditions: null +description: '' +enabled: true +field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks +group: 7ebe493b-5e03-48c8-8375-c9f9582da77e # Containers +groupChildBlockTypes: true +handle: group +icon: null +ignorePermissions: true +maxBlocks: 0 +maxChildBlocks: 0 +maxSiblingBlocks: 0 +minBlocks: 0 +minChildBlocks: 0 +minSiblingBlocks: 0 +name: 'Interaction Group' +sortOrder: 3 +topLevel: true diff --git a/api/config/project/neoBlockTypes/scatterplotTool--5b8a79d6-e9d6-44d2-b986-36bf0bf74131.yaml b/api/config/project/neoBlockTypes/scatterplotTool--5b8a79d6-e9d6-44d2-b986-36bf0bf74131.yaml index 61ed3ad..8a626c7 100644 --- a/api/config/project/neoBlockTypes/scatterplotTool--5b8a79d6-e9d6-44d2-b986-36bf0bf74131.yaml +++ b/api/config/project/neoBlockTypes/scatterplotTool--5b8a79d6-e9d6-44d2-b986-36bf0bf74131.yaml @@ -96,5 +96,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Scatterplot Tool' -sortOrder: 9 +sortOrder: 12 topLevel: true diff --git a/api/config/project/neoBlockTypes/twoColumnContainer--1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml b/api/config/project/neoBlockTypes/twoColumnContainer--1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml index 4196c38..f6deaf2 100644 --- a/api/config/project/neoBlockTypes/twoColumnContainer--1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml +++ b/api/config/project/neoBlockTypes/twoColumnContainer--1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml @@ -1,16 +1,12 @@ childBlocks: - - text - - widgetContainer - - barGraphTool - - colorTool - - filterTool - - scatterplotTool + - colLeft + - colRight conditions: null description: '' enabled: true field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks group: 7ebe493b-5e03-48c8-8375-c9f9582da77e # Containers -groupChildBlockTypes: true +groupChildBlockTypes: false handle: twoColumnContainer icon: null ignorePermissions: true @@ -21,5 +17,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Two Column Container' -sortOrder: 3 +sortOrder: 4 topLevel: true diff --git a/api/config/project/neoBlockTypes/widgetContainer--5e096987-24f1-48a7-af6a-898905593ab5.yaml b/api/config/project/neoBlockTypes/widgetContainer--5e096987-24f1-48a7-af6a-898905593ab5.yaml index 1346169..0f0c68d 100644 --- a/api/config/project/neoBlockTypes/widgetContainer--5e096987-24f1-48a7-af6a-898905593ab5.yaml +++ b/api/config/project/neoBlockTypes/widgetContainer--5e096987-24f1-48a7-af6a-898905593ab5.yaml @@ -17,5 +17,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Widget Container' -sortOrder: 4 +sortOrder: 7 topLevel: true diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index 86ef86c..1474a71 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -1,4 +1,4 @@ -dateModified: 1691436696 +dateModified: 1694109746 email: fromEmail: $EMAIL_FROM_ADDRESS fromName: $EMAIL_SENDER_NAME @@ -67,6 +67,7 @@ meta: 075467b0-0dee-453c-9df0-0de6d2443cf8: Homepage # Homepage 513634e9-3389-4e41-b769-9433ac34e35e: Widgets # Widgets 547128fa-4529-4483-9968-66425996b69f: EN # EN + 947400f5-3c2d-403a-b94e-68715e48a9c0: 'Left Column' # Left Column 04341069-ff31-4470-970a-8c7e82ec37eb: 'Student Schema' # Student Schema 9679727f-de58-43ae-9674-13827bb1e0b3: 'Image Group' # Image Group 65934563-c9b7-45d5-99e6-cc013e22b668: 'Investigation Step (Child Entry)' # Investigation Step (Child Entry) @@ -76,6 +77,7 @@ meta: a72ca793-6ee2-4a6f-b47e-06a35cf61e06: 'Scatterplot Items' # Scatterplot Items aee57b4f-2623-44fc-af2b-c670f6e1babe: 'Site information' # Site information b0af5e39-02aa-4d2b-97c8-3ef5ac7982fa: X-value # X-value + ba6494d9-36e8-40ee-9284-c56783357043: 'Interaction Group' # Interaction Group be5b1aeb-8cbb-4460-a87d-d1ebe0a4fbf8: 'Group Name' # Group Name bfaa63c2-dd2c-42c8-b68e-79d0180d5146: 'Investigation (Parent Entry)' # Investigation (Parent Entry) c6d1924e-d9ec-4547-bb6d-bddb9b46b774: Description # Description @@ -89,6 +91,7 @@ meta: d9df041c-3556-450e-94e1-f37369daf5f3: 'X-axis Label' # X-axis Label e2951ac7-e91a-4d8a-964f-50c6b6e0b1ee: 'Educator Schema' # Educator Schema e5142c27-2288-47b7-bfad-14cd6b3a6653: 'Display Name' # Display Name + efbf1b30-4cb7-4361-9f45-016d119aec06: 'Right Column' # Right Column f8a590d0-db30-4e06-9d6d-6cfd7613147e: 'Hide Title' # Hide Title plugins: google-cloud: @@ -133,6 +136,9 @@ plugins: - schema-1 - __assoc__: + - + - availableFilters + - queryMutate - - contentBlocks - queryMutate @@ -142,25 +148,73 @@ plugins: - - siteDescription - queryMutate + - + - displayName + - queryMutate + - + - graphBars + - queryMutate - - hideTitle - queryMutate + - + - image + - queryMutate + - + - images + - queryMutate - - linkTo - queryMutate - - pageType - queryMutate + - + - preSelectedColor + - queryMutate + - + - readOnly + - queryMutate + - + - hasSavePoint + - queryMutate + - + - scatterplotItems + - queryMutate + - + - colorToolTemplate + - queryMutate - - text - queryMutate - - siteTitle - queryMutate + - + - xAxisLabel + - queryMutate + - + - xAxisMax + - queryMutate + - + - xAxisMin + - queryMutate + - + - yAxisLabel + - queryMutate + - + - yAxisMax + - queryMutate + - + - yAxisMin + - queryMutate - - 'schema-Educator Schema' - __assoc__: + - + - availableFilters + - queryMutate - - contentBlocks - queryMutate @@ -170,25 +224,73 @@ plugins: - - siteDescription - queryMutate + - + - displayName + - queryMutate + - + - graphBars + - queryMutate - - hideTitle - queryMutate + - + - image + - queryMutate + - + - images + - queryMutate - - linkTo - queryMutate - - pageType - queryMutate + - + - preSelectedColor + - queryMutate + - + - readOnly + - queryMutate + - + - hasSavePoint + - queryMutate + - + - scatterplotItems + - queryMutate + - + - colorToolTemplate + - queryMutate - - text - queryMutate - - siteTitle - queryMutate + - + - xAxisLabel + - queryMutate + - + - xAxisMax + - queryMutate + - + - xAxisMin + - queryMutate + - + - yAxisLabel + - queryMutate + - + - yAxisMax + - queryMutate + - + - yAxisMin + - queryMutate - - 'schema-Public Schema' - __assoc__: + - + - availableFilters + - queryMutate - - contentBlocks - queryMutate @@ -198,25 +300,73 @@ plugins: - - siteDescription - queryMutate + - + - displayName + - queryMutate + - + - graphBars + - queryMutate - - hideTitle - queryMutate + - + - image + - queryMutate + - + - images + - queryMutate - - linkTo - queryMutate - - pageType - queryMutate + - + - preSelectedColor + - queryMutate + - + - readOnly + - queryMutate + - + - hasSavePoint + - queryMutate + - + - scatterplotItems + - queryMutate + - + - colorToolTemplate + - queryMutate - - text - queryMutate - - siteTitle - queryMutate + - + - xAxisLabel + - queryMutate + - + - xAxisMax + - queryMutate + - + - xAxisMin + - queryMutate + - + - yAxisLabel + - queryMutate + - + - yAxisMax + - queryMutate + - + - yAxisMin + - queryMutate - - 'schema-Student Schema' - __assoc__: + - + - availableFilters + - queryMutate - - contentBlocks - queryMutate @@ -226,21 +376,66 @@ plugins: - - siteDescription - queryMutate + - + - displayName + - queryMutate + - + - graphBars + - queryMutate - - hideTitle - queryMutate + - + - image + - queryMutate + - + - images + - queryMutate - - linkTo - queryMutate - - pageType - queryMutate + - + - preSelectedColor + - queryMutate + - + - readOnly + - queryMutate + - + - hasSavePoint + - queryMutate + - + - scatterplotItems + - queryMutate + - + - colorToolTemplate + - queryMutate - - text - queryMutate - - siteTitle - queryMutate + - + - xAxisLabel + - queryMutate + - + - xAxisMax + - queryMutate + - + - xAxisMin + - queryMutate + - + - yAxisLabel + - queryMutate + - + - yAxisMax + - queryMutate + - + - yAxisMin + - queryMutate forbiddenField: 'User doesn''t have permission to access requested field(s)' forbiddenMutation: 'User doesn''t have permission to perform this mutation' googleClientId: $GOOGLE_APP_ID @@ -249,7 +444,7 @@ plugins: granularSchemas: __assoc__: - - - group-3 + - group-29 - __assoc__: - @@ -262,7 +457,7 @@ plugins: - siteId - '' - - - group-4 + - group-30 - __assoc__: - @@ -270,19 +465,12 @@ plugins: - 'Educator Schema' - - allowRegistration - - '1' + - '' - - siteId - '' - - - - entryQueries - - - __assoc__: - - - - pages - - '' - - - group-5 + - group-31 - __assoc__: - @@ -290,17 +478,10 @@ plugins: - 'Student Schema' - - allowRegistration - - '1' + - '' - - siteId - '' - - - - entryQueries - - - __assoc__: - - - - pages - - '' invalidEmailAddress: 'Invalid email address' invalidHeader: 'Invalid Authorization Header' invalidJwtSecretKey: 'Invalid JWT Secret Key' diff --git a/docker-compose-local-db.yml b/docker-compose-local-db.yml deleted file mode 100644 index 954ac54..0000000 --- a/docker-compose-local-db.yml +++ /dev/null @@ -1,59 +0,0 @@ -# docker-compose.yml -version: '2.2' - -services: - cache: - image: memcached - craft: - build: ./ - volumes: - - ./api:/var/www/html - environment: - CRAFT_ENVIRONMENT: dev - SECURITY_KEY: 6SkOBU85-5lFdRleCkckUCqquBq6mBIS - DB_DSN: pgsql:host=postgres;dbname=craft - DB_SERVER: postgres - DB_NAME: craft - DB_USER: craft - DB_PASSWORD: rootroot - DB_DATABASE: craft - DB_SCHEMA: public - DB_DRIVER: pgsql - DB_PORT: 5432 - PRIMARY_SITE_URL: http://localhost:8080 - WEB_BASE_URL: http://localhost:3000 - ALIAS_PREVIEW_URL_FORMAT: http://localhost:3000/api/preview?site={site}&entryUid={sourceUid} - ENABLE_MEMCACHED: "true" - MEMCACHED_IP: cache - MEMCACHED_PORT: 11211 - PORT: 8080 - NEXT_API_BASE_URL: gateway.docker.internal:3000/api - NEXT_REVALIDATE_SECRET_TOKEN: super-secret-token - VERIFY_EMAIL_PATH: http://localhost:3000/?activate=true - SET_PASSWORD_PATH: http://localhost:3000/?set_password=true - env_file: - - .env - ports: - - "8080:8080" - depends_on: - postgres: - condition: service_healthy - postgres: - build: ./db - environment: - POSTGRES_ROOT_PASSWORD: root - POSTGRES_USER: craft - POSTGRES_PASSWORD: rootroot - POSTGRES_DB: craft - volumes: - # Persistent data - - pgdata:/var/lib/postgresql/data - healthcheck: - test: [ "CMD-SHELL", "export PGPASSWORD=$${POSTGRES_PASSWORD}; pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"] - interval: 30s - timeout: 60s - retries: 5 - start_period: 80s - -volumes: - pgdata: