diff --git a/.env.example b/.env.example index a5c086a46b..2f59eda08f 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,3 @@ -RR_VERSION=2024.1.0 -PHP_IMAGE_VERSION=8.1-cli-alpine +RR_VERSION=2024.1.1 +PHP_IMAGE_VERSION=8.3-cli-alpine diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index f742269039..0000000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: ci - -on: - pull_request: - branches: - - homolog - - workflow_dispatch: - -jobs: - BUILD: - runs-on: ubuntu-latest - steps: - - - uses: actions/checkout@v4.1.1 - - - name: Docker Login - uses: docker/login-action@v3.0.0 - with: - username: ${{ secrets.DOCKERHUB_USER }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} - - - name: Checkout submodules - run: git submodule update --init --recursive - - - name: Ajusta branch do MultipleLocalAuth - run: cd src/plugins/MultipleLocalAuth && git checkout v3.0.0 - - - name: Criação da Imagem docker - uses: docker/build-push-action@v5.0.0 - with: - context: ./ - file: ./Dockerfile - push: true - tags: | - secultceara/mapascultural:7.3.7 - secultceara/mapascultural:latest - - DEPLOY: - needs: BUILD - runs-on: mapahomolog - steps: - - name: Pull das imagens docker - run: cd /opt/docker/mapa7 && sudo docker-compose pull - - name: Restart do docker-compose para atualizar o container com a nova imagem - run: cd /opt/docker/mapa7 && sudo docker-compose down && sudo docker-compose up -d \ No newline at end of file diff --git a/.github/workflows/cicd-dev.yml b/.github/workflows/cicd-dev.yml deleted file mode 100644 index d41a29e6df..0000000000 --- a/.github/workflows/cicd-dev.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: ci/cd-dev - -on: - pull_request: - branches: - - develop - - workflow_dispatch: - -jobs: - BUILD: - runs-on: ubuntu-latest - steps: - - - uses: actions/checkout@v4.1.1 - - - name: Docker Login - uses: docker/login-action@v3.0.0 - with: - username: ${{ secrets.DOCKERHUB_USER }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} - - - name: Checkout submodules - run: git submodule update --init --recursive - - - name: Ajusta branch do MultipleLocalAuth - run: cd src/plugins/MultipleLocalAuth && git checkout v3.0.0 - - - name: Criação da Imagem docker - uses: docker/build-push-action@v5.0.0 - with: - context: ./ - file: ./Dockerfile - push: true - tags: | - secultceara/mapascultural:7.3.7-dev - - DEPLOY: - needs: BUILD - runs-on: mapahomolog - steps: - - name: Pull das imagens docker - run: cd /opt/docker/developv7 && sudo docker-compose pull - - name: Restart do docker-compose para atualizar o container com a nova imagem - run: cd /opt/docker/developv7 && sudo docker-compose down && sudo docker-compose up -d \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 00d9d84fe6..5f5687a497 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,89 +1,34 @@ -name: Testing +name: Test on: - push: - branches: - - "master" - - "develop" pull_request: branches: - - "develop" + - main jobs: - php: - strategy: - matrix: - operating-system: [ubuntu-latest] - php-versions: ['8.2'] - runs-on: ${{ matrix.operating-system }} + build-test: + runs-on: ubuntu-latest + steps: - - - name: Checkout - uses: actions/checkout@v3 - - - name: Composer Install - run: docker run --rm -v $PWD:/app composer:latest install - - - name: Docker Compose - uses: KengoTODA/actions-setup-docker-compose@v1 + - name: Checkout Code + uses: actions/checkout@v2 + + - name: Install composer and dependencies + uses: php-actions/composer@v6 + + - name: PHPUnit Tests + uses: php-actions/phpunit@v3 + env: + XDEBUG_MODE: coverage with: - version: '2.14.2' # the full version of `docker-compose` command - - run: docker compose up -d - - - name: Database Migrations - run: sleep 5 && docker compose run --rm migrations - - - name: Phpunit Coverage - run: docker compose exec backend ./vendor/bin/phpunit --coverage-text - # - - # name: deploy to cluster - # uses: steebchen/kubectl@v2.0.0 - # with: # defaults to latest kubectl binary version - # config: ${{ secrets.KUBE_CONFIG_DATA }} - # command: set image --record deployment/mapasculturais -nredelivre-mapas-dev container=${{ github.repository }}:${{ github.sha }} + bootstrap: vendor/autoload.php + configuration: phpunit.xml + php_extensions: xdebug + args: tests --coverage-clover ./coverage.xml - # Docs: https://github.com/shivammathur/setup-php - # - - # name: Setup PHP - # uses: shivammathur/setup-php@v2 - # with: - # php-version: ${{ matrix.php-versions }} - # extensions: mbstring, dom, pdo_pgsql, gd, intl, zip, opcache, xml, curl, iconv, xmlwriter, simplexml - # coverage: none # xdebug - # tools: composer - # - - # name: Get composer cache directory - # id: composer-cache - # run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - # - - # name: Cache composer dependencies - # uses: actions/cache@v3 - # with: - # path: ${{ steps.composer-cache.outputs.dir }} - # # Use composer.json for key, if composer.lock is not committed. - # # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} - # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - # restore-keys: ${{ runner.os }}-composer- - # - - # name: Install dependencies - # run: composer install --no-progress --prefer-dist --optimize-autoloader - # - - # name: Add hosts to /etc/hosts - # run: | - # sudo echo "127.0.0.1 db redis" | sudo tee -a /etc/hosts - # - - # name: Docker compose up - # uses: isbang/compose-action@v1.5.1 - # with: - # compose-file: "./docker-compose.yml" - # down-flags: "--volumes" - # services: | - # db - # redis - # migrations - # - - # name: Test with phpunit - # run: docker compose exec backend ls ./vendor/ - # - - # name: Test with phpunit - # run: docker compose exec backend ./vendor/bin/phpunit --coverage-text + - name: Upload to Codecov + uses: codecov/codecov-action@v2 + with: + token: ${{ secrets.CODE_COV_TOKEN }} + files: ./coverage.xml + verbose: true diff --git a/.gitpod.yml b/.gitpod.yml index 998613f550..6e50177317 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -5,4 +5,4 @@ # Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart tasks: - - init: docker compose -f dev/docker-compose.yml up -d + - init: docker compose -f dev/docker-compose.yml up -d && cd src && pnpm i && pnpm run build diff --git a/src/ErrorHandlingMiddleware.php b/app/src/ErrorHandlingMiddleware.php similarity index 95% rename from src/ErrorHandlingMiddleware.php rename to app/src/ErrorHandlingMiddleware.php index f7c897479a..8c650f7e20 100644 --- a/src/ErrorHandlingMiddleware.php +++ b/app/src/ErrorHandlingMiddleware.php @@ -21,7 +21,8 @@ public function __construct(ResponseFactoryInterface $responseFactory) $this->responseFactory = $responseFactory; } - public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface { + public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface + { try { return $handler->handle($request); } catch (HttpNotFoundException $e) { @@ -34,4 +35,4 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface return $response; } } -} \ No newline at end of file +} diff --git a/app/src/Kernel.php b/app/src/Kernel.php index eac2115e02..c445973898 100644 --- a/app/src/Kernel.php +++ b/app/src/Kernel.php @@ -2,8 +2,14 @@ declare(strict_types=1); + namespace App; +// use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait; +use Symfony\Component\HttpKernel\Kernel as BaseKernel; + +// use MicroKernelTrait; + use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Exception\MethodNotAllowedException; @@ -12,7 +18,7 @@ use Symfony\Component\Routing\RequestContext; use Symfony\Component\Routing\RouteCollection; -class Kernel +class Kernel extends BaseKernel { private string $url; private RouteCollection $routes; @@ -20,7 +26,7 @@ class Kernel public function __construct() { $this->url = $this->getPathRequest(); - $this->routes = require_once dirname(__DIR__).'/routes/routes.php'; + $this->routes = require_once dirname(__DIR__) . '/routes/routes.php'; } public function execute(): void @@ -35,7 +41,7 @@ public function execute(): void $this->dispatchAction($matcher); } catch (MethodNotAllowedException $exception) { (new JsonResponse([ - 'error' => 'Method not allowed: '.$_SERVER['REQUEST_METHOD'], + 'error' => 'Method not allowed: ' . $_SERVER['REQUEST_METHOD'], ], status: Response::HTTP_METHOD_NOT_ALLOWED))->send(); exit; diff --git a/composer.json b/composer.json index 86c87b46bb..0174400ffa 100644 --- a/composer.json +++ b/composer.json @@ -1,63 +1,66 @@ { - "require": { - "acelaya/doctrine-enum-type": "^2.3", - "akrabat/ip-address-middleware": "^2.1", - "doctrine/annotations": "^2.0", - "doctrine/dbal": "^3.6", - "doctrine/orm": "2.16.*", - "firebase/php-jwt": "^6.4", - "michelf/php-markdown": "1.*", - "monolog/monolog": "^3.4", - "mustache/mustache": "^2.11", - "opauth/openid": "*", - "opauth/logincidadao" : "*", - "opauth/authentik" : "*", - "pomo/pomo": "^1.5", - "psy/psysh": "^0.11.12", - "respect/validation": "^2.2", - "sinergi/browser-detector": "^6.1", - "slim/psr7": "^1.6", - "slim/slim": "4.*", - "smottt/wideimage": "*", - "symfony/amazon-mailer": "^6.3", - "symfony/cache": "^6.2", - "symfony/mailchimp-mailer": "^6.3", - "symfony/mailer": "^6.3", - "symfony/mailgun-mailer": "^6.3", - "symfony/mime": "^6.3", - "symfony/sendgrid-mailer": "^6.3", - "league/csv": "^9.6.2", - "symfony/http-foundation": "^7.0", - "symfony/routing": "^7.0", - "symfony/console": "^6.4.6" + "require": { + "php": "^7.3 || ^8.0", + "acelaya/doctrine-enum-type": "^2.3", + "akrabat/ip-address-middleware": "^2.1", + "doctrine/annotations": "^2.0", + "doctrine/dbal": "^3.6", + "doctrine/orm": "2.16.*", + "firebase/php-jwt": "^6.4", + "league/csv": "^9.6.2", + "michelf/php-markdown": "1.*", + "monolog/monolog": "^3.4", + "mustache/mustache": "^2.11", + "nyholm/psr7": "^1.4", + "opauth/authentik": "*", + "opauth/logincidadao": "*", + "opauth/openid": "*", + "php-curl-class/php-curl-class": "^9.18", + "php-di/php-di": "^6.0", + "php-di/slim-bridge": "^3.2", + "pomo/pomo": "^1.5", + "respect/validation": "^2.2", + "sinergi/browser-detector": "^6.1", + "slim/psr7": "^1.6", + "slim/slim": "^4.0", + "smottt/wideimage": "*", + "spiral/roadrunner": "2024.1.0", + "spiral/roadrunner-http": "^3", + "spiral/roadrunner-worker": "^3", + "symfony/amazon-mailer": "^6.3", + "symfony/cache": "^6.2", + "symfony/mailchimp-mailer": "^6.3", + "symfony/mailer": "^6.3", + "symfony/mailgun-mailer": "^6.3", + "symfony/mime": "^6.3", + "symfony/sendgrid-mailer": "^6.3" + }, + "autoload": { + "psr-4": { + "App\\": "app/src", + "App\\Tests\\": "app/tests", + "MapasCulturais\\": "src/core", + "MapasCulturais\\Modules\\": "src/modules", + "MapasCulturais\\Themes\\": "src/themes" + } + }, + "repositories": [ + { + "type": "git", + "url": "https://github.com/hacklabr/opauth-logincidadao.git" }, - "autoload": { - "psr-4": { - "App\\": "app/src", - "App\\Tests\\": "app/tests", - "MapasCulturais\\": "src/core", - "MapasCulturais\\Modules\\": "src/modules", - "MapasCulturais\\Themes\\": "src/themes" - } + { + "type": "git", + "url": "https://github.com/mapasculturais/opauth-authentik.git" }, - "repositories": [ - { - "type": "git", - "url": "https://github.com/hacklabr/opauth-logincidadao.git" - }, - { - "type": "git", - "url": "https://github.com/mapasculturais/opauth-authentik.git" - }, - { - "type": "git", - "url": "https://github.com/mapasculturais/opauth.git" - } - ], - "require-dev": { - "friendsofphp/php-cs-fixer": "^3.51", - "phpunit/phpunit": "^10", - "symfony/http-client": "^7", - "doctrine/data-fixtures": "^1.7" + { + "type": "git", + "url": "https://github.com/mapasculturais/opauth.git" } + ], + "require-dev": { + "phpunit/phpunit": "^10.5", + "psy/psysh": "^0.11.12", + "zircote/swagger-php": "^4.8" + } } diff --git a/composer.lock b/composer.lock index 2d1b55ac80..794fce5a29 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c34f100b2b05e14e25d227d14ebd32fb", + "content-hash": "7b5aa298df5f8bfc7135c339f27e0e65", "packages": [ { "name": "acelaya/doctrine-enum-type", @@ -199,16 +199,16 @@ }, { "name": "async-aws/ses", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/async-aws/ses.git", - "reference": "3aed25813b21aeab96a60a658edf1e23531d2011" + "reference": "9bf4873210cfc8b86e4abb18d1d707f9ae247ace" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/async-aws/ses/zipball/3aed25813b21aeab96a60a658edf1e23531d2011", - "reference": "3aed25813b21aeab96a60a658edf1e23531d2011", + "url": "https://api.github.com/repos/async-aws/ses/zipball/9bf4873210cfc8b86e4abb18d1d707f9ae247ace", + "reference": "9bf4873210cfc8b86e4abb18d1d707f9ae247ace", "shasum": "" }, "require": { @@ -219,7 +219,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -240,7 +240,7 @@ "ses" ], "support": { - "source": "https://github.com/async-aws/ses/tree/1.7.0" + "source": "https://github.com/async-aws/ses/tree/1.8.0" }, "funding": [ { @@ -252,7 +252,7 @@ "type": "github" } ], - "time": "2023-12-13T20:52:19+00:00" + "time": "2024-05-14T07:34:42+00:00" }, { "name": "doctrine/annotations", @@ -602,16 +602,16 @@ }, { "name": "doctrine/dbal", - "version": "3.8.3", + "version": "3.8.4", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "db922ba9436b7b18a23d1653a0b41ff2369ca41c" + "reference": "b05e48a745f722801f55408d0dbd8003b403dbbd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/db922ba9436b7b18a23d1653a0b41ff2369ca41c", - "reference": "db922ba9436b7b18a23d1653a0b41ff2369ca41c", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/b05e48a745f722801f55408d0dbd8003b403dbbd", + "reference": "b05e48a745f722801f55408d0dbd8003b403dbbd", "shasum": "" }, "require": { @@ -695,7 +695,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.8.3" + "source": "https://github.com/doctrine/dbal/tree/3.8.4" }, "funding": [ { @@ -711,7 +711,7 @@ "type": "tidelift" } ], - "time": "2024-03-03T15:55:06+00:00" + "time": "2024-04-25T07:04:44+00:00" }, { "name": "doctrine/deprecations", @@ -1475,6 +1475,110 @@ }, "time": "2023-12-01T16:26:39+00:00" }, + { + "name": "google/protobuf", + "version": "v3.25.3", + "source": { + "type": "git", + "url": "https://github.com/protocolbuffers/protobuf-php.git", + "reference": "983a87f4f8798a90ca3a25b0f300b8fda38df643" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/983a87f4f8798a90ca3a25b0f300b8fda38df643", + "reference": "983a87f4f8798a90ca3a25b0f300b8fda38df643", + "shasum": "" + }, + "require": { + "php": ">=7.0.0" + }, + "require-dev": { + "phpunit/phpunit": ">=5.0.0" + }, + "suggest": { + "ext-bcmath": "Need to support JSON deserialization" + }, + "type": "library", + "autoload": { + "psr-4": { + "Google\\Protobuf\\": "src/Google/Protobuf", + "GPBMetadata\\Google\\Protobuf\\": "src/GPBMetadata/Google/Protobuf" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "proto library for PHP", + "homepage": "https://developers.google.com/protocol-buffers/", + "keywords": [ + "proto" + ], + "support": { + "source": "https://github.com/protocolbuffers/protobuf-php/tree/v3.25.3" + }, + "time": "2024-02-15T21:11:49+00:00" + }, + { + "name": "laravel/serializable-closure", + "version": "v1.3.3", + "source": { + "type": "git", + "url": "https://github.com/laravel/serializable-closure.git", + "reference": "3dbf8a8e914634c48d389c1234552666b3d43754" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754", + "reference": "3dbf8a8e914634c48d389c1234552666b3d43754", + "shasum": "" + }, + "require": { + "php": "^7.3|^8.0" + }, + "require-dev": { + "nesbot/carbon": "^2.61", + "pestphp/pest": "^1.21.3", + "phpstan/phpstan": "^1.8.2", + "symfony/var-dumper": "^5.4.11" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Laravel\\SerializableClosure\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + }, + { + "name": "Nuno Maduro", + "email": "nuno@laravel.com" + } + ], + "description": "Laravel Serializable Closure provides an easy and secure way to serialize closures in PHP.", + "keywords": [ + "closure", + "laravel", + "serializable" + ], + "support": { + "issues": "https://github.com/laravel/serializable-closure/issues", + "source": "https://github.com/laravel/serializable-closure" + }, + "time": "2023-11-08T14:08:06+00:00" + }, { "name": "league/csv", "version": "9.15.0", @@ -1882,60 +1986,82 @@ "time": "2018-02-13T20:26:39+00:00" }, { - "name": "nikic/php-parser", - "version": "v4.19.1", + "name": "nyholm/psr7", + "version": "1.8.1", "source": { "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b" + "url": "https://github.com/Nyholm/psr7.git", + "reference": "aa5fc277a4f5508013d571341ade0c3886d4d00e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b", - "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b", + "url": "https://api.github.com/repos/Nyholm/psr7/zipball/aa5fc277a4f5508013d571341ade0c3886d4d00e", + "reference": "aa5fc277a4f5508013d571341ade0c3886d4d00e", "shasum": "" }, "require": { - "ext-tokenizer": "*", - "php": ">=7.1" + "php": ">=7.2", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.1 || ^2.0" + }, + "provide": { + "php-http/message-factory-implementation": "1.0", + "psr/http-factory-implementation": "1.0", + "psr/http-message-implementation": "1.0" }, "require-dev": { - "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + "http-interop/http-factory-tests": "^0.9", + "php-http/message-factory": "^1.0", + "php-http/psr7-integration-tests": "^1.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4", + "symfony/error-handler": "^4.4" }, - "bin": [ - "bin/php-parse" - ], "type": "library", "extra": { "branch-alias": { - "dev-master": "4.9-dev" + "dev-master": "1.8-dev" } }, "autoload": { "psr-4": { - "PhpParser\\": "lib/PhpParser" + "Nyholm\\Psr7\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Nikita Popov" + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com" + }, + { + "name": "Martijn van der Ven", + "email": "martijn@vanderven.se" } ], - "description": "A PHP parser written in PHP", + "description": "A fast PHP7 implementation of PSR-7", + "homepage": "https://tnyholm.se", "keywords": [ - "parser", - "php" + "psr-17", + "psr-7" ], "support": { - "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1" + "issues": "https://github.com/Nyholm/psr7/issues", + "source": "https://github.com/Nyholm/psr7/tree/1.8.1" }, - "time": "2024-03-17T08:10:35+00:00" + "funding": [ + { + "url": "https://github.com/Zegnat", + "type": "github" + }, + { + "url": "https://github.com/nyholm", + "type": "github" + } + ], + "time": "2023-11-13T09:31:12+00:00" }, { "name": "opauth/authentik", @@ -2108,244 +2234,533 @@ "time": "2012-06-08T07:00:03+00:00" }, { - "name": "pomo/pomo", - "version": "v1.5.0", + "name": "php-curl-class/php-curl-class", + "version": "9.19.2", "source": { "type": "git", - "url": "https://github.com/LeoColomb/pomo.git", - "reference": "b1e53a997850496369634d574fa6b508091fc353" + "url": "https://github.com/php-curl-class/php-curl-class.git", + "reference": "c41efeb4ea2dc3cf8f90f8f967b0fcf45a41e294" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LeoColomb/pomo/zipball/b1e53a997850496369634d574fa6b508091fc353", - "reference": "b1e53a997850496369634d574fa6b508091fc353", + "url": "https://api.github.com/repos/php-curl-class/php-curl-class/zipball/c41efeb4ea2dc3cf8f90f8f967b0fcf45a41e294", + "reference": "c41efeb4ea2dc3cf8f90f8f967b0fcf45a41e294", "shasum": "" }, "require": { - "php": ">=5.3.0" + "ext-curl": "*", + "php": ">=7.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^7.0", - "squizlabs/php_codesniffer": "^3.0" + "dealerdirect/phpcodesniffer-composer-installer": "*", + "ext-gd": "*", + "friendsofphp/php-cs-fixer": "*", + "phpcompatibility/php-compatibility": "dev-develop", + "phpcsstandards/phpcsutils": "@alpha", + "phpunit/phpunit": "*", + "squizlabs/php_codesniffer": "*", + "vimeo/psalm": ">=0.3.63" + }, + "suggest": { + "ext-mbstring": "*" }, "type": "library", "autoload": { "psr-4": { - "POMO\\": "src" + "Curl\\": "src/Curl/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0+" + "Unlicense" ], "authors": [ { - "name": "WordPress", - "homepage": "https://wordpress.org", - "role": "Author" + "name": "Zach Borboa" }, { - "name": "Léo Colombaro", - "homepage": "https://colombaro.fr", - "role": "Maintainer" + "name": "Contributors", + "homepage": "https://github.com/php-curl-class/php-curl-class/graphs/contributors" } ], - "description": "Gettext library to translate with i18n", - "homepage": "https://github.com/LeoColomb/pomo", + "description": "PHP Curl Class makes it easy to send HTTP requests and integrate with web APIs.", + "homepage": "https://github.com/php-curl-class/php-curl-class", "keywords": [ - "gettext", - "i18n", - "internationalization", - "localization", - "translation" + "API-Client", + "api", + "class", + "client", + "curl", + "framework", + "http", + "http-client", + "http-proxy", + "json", + "php", + "php-curl", + "php-curl-library", + "proxy", + "requests", + "restful", + "web-scraper", + "web-scraping ", + "web-service", + "xml" ], "support": { - "issues": "https://github.com/LeoColomb/pomo/issues", - "source": "https://github.com/LeoColomb/pomo/tree/v1.5.0" + "issues": "https://github.com/php-curl-class/php-curl-class/issues", + "source": "https://github.com/php-curl-class/php-curl-class/tree/9.19.2" }, - "funding": [ - { - "url": "https://github.com/LeoColomb", - "type": "github" - }, - { - "url": "https://www.patreon.com/LeoColomb", - "type": "patreon" - } - ], - "time": "2023-01-06T01:05:43+00:00" + "time": "2024-04-09T18:03:13+00:00" }, { - "name": "psr/cache", - "version": "3.0.0", + "name": "php-di/invoker", + "version": "2.3.4", "source": { "type": "git", - "url": "https://github.com/php-fig/cache.git", - "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf" + "url": "https://github.com/PHP-DI/Invoker.git", + "reference": "33234b32dafa8eb69202f950a1fc92055ed76a86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", - "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/33234b32dafa8eb69202f950a1fc92055ed76a86", + "reference": "33234b32dafa8eb69202f950a1fc92055ed76a86", "shasum": "" }, "require": { - "php": ">=8.0.0" + "php": ">=7.3", + "psr/container": "^1.0|^2.0" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } + "require-dev": { + "athletic/athletic": "~0.1.8", + "mnapoli/hard-mode": "~0.3.0", + "phpunit/phpunit": "^9.0" }, + "type": "library", "autoload": { "psr-4": { - "Psr\\Cache\\": "src/" + "Invoker\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common interface for caching libraries", + "description": "Generic and extensible callable invoker", + "homepage": "https://github.com/PHP-DI/Invoker", "keywords": [ - "cache", - "psr", - "psr-6" + "callable", + "dependency", + "dependency-injection", + "injection", + "invoke", + "invoker" ], "support": { - "source": "https://github.com/php-fig/cache/tree/3.0.0" + "issues": "https://github.com/PHP-DI/Invoker/issues", + "source": "https://github.com/PHP-DI/Invoker/tree/2.3.4" }, - "time": "2021-02-03T23:26:27+00:00" + "funding": [ + { + "url": "https://github.com/mnapoli", + "type": "github" + } + ], + "time": "2023-09-08T09:24:21+00:00" }, { - "name": "psr/container", - "version": "2.0.2", + "name": "php-di/php-di", + "version": "6.4.0", "source": { "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" + "url": "https://github.com/PHP-DI/PHP-DI.git", + "reference": "ae0f1b3b03d8b29dff81747063cbfd6276246cc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", - "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/ae0f1b3b03d8b29dff81747063cbfd6276246cc4", + "reference": "ae0f1b3b03d8b29dff81747063cbfd6276246cc4", "shasum": "" }, "require": { - "php": ">=7.4.0" + "laravel/serializable-closure": "^1.0", + "php": ">=7.4.0", + "php-di/invoker": "^2.0", + "php-di/phpdoc-reader": "^2.0.1", + "psr/container": "^1.0" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } + "provide": { + "psr/container-implementation": "^1.0" + }, + "require-dev": { + "doctrine/annotations": "~1.10", + "friendsofphp/php-cs-fixer": "^2.4", + "mnapoli/phpunit-easymock": "^1.2", + "ocramius/proxy-manager": "^2.11.2", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^9.5" + }, + "suggest": { + "doctrine/annotations": "Install it if you want to use annotations (version ~1.2)", + "ocramius/proxy-manager": "Install it if you want to use lazy injection (version ~2.0)" }, + "type": "library", "autoload": { + "files": [ + "src/functions.php" + ], "psr-4": { - "Psr\\Container\\": "src/" + "DI\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", + "description": "The dependency injection container for humans", + "homepage": "https://php-di.org/", "keywords": [ "PSR-11", "container", - "container-interface", "container-interop", - "psr" + "dependency injection", + "di", + "ioc", + "psr11" ], "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/2.0.2" + "issues": "https://github.com/PHP-DI/PHP-DI/issues", + "source": "https://github.com/PHP-DI/PHP-DI/tree/6.4.0" }, - "time": "2021-11-05T16:47:00+00:00" + "funding": [ + { + "url": "https://github.com/mnapoli", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/php-di/php-di", + "type": "tidelift" + } + ], + "time": "2022-04-09T16:46:38+00:00" }, { - "name": "psr/event-dispatcher", - "version": "1.0.0", + "name": "php-di/phpdoc-reader", + "version": "2.2.1", "source": { "type": "git", - "url": "https://github.com/php-fig/event-dispatcher.git", - "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" + "url": "https://github.com/PHP-DI/PhpDocReader.git", + "reference": "66daff34cbd2627740ffec9469ffbac9f8c8185c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", - "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", + "url": "https://api.github.com/repos/PHP-DI/PhpDocReader/zipball/66daff34cbd2627740ffec9469ffbac9f8c8185c", + "reference": "66daff34cbd2627740ffec9469ffbac9f8c8185c", "shasum": "" }, "require": { "php": ">=7.2.0" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } + "require-dev": { + "mnapoli/hard-mode": "~0.3.0", + "phpunit/phpunit": "^8.5|^9.0" }, + "type": "library", "autoload": { "psr-4": { - "Psr\\EventDispatcher\\": "src/" + "PhpDocReader\\": "src/PhpDocReader" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Standard interfaces for event handling.", + "description": "PhpDocReader parses @var and @param values in PHP docblocks (supports namespaced class names with the same resolution rules as PHP)", "keywords": [ - "events", - "psr", - "psr-14" + "phpdoc", + "reflection" ], "support": { - "issues": "https://github.com/php-fig/event-dispatcher/issues", - "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + "issues": "https://github.com/PHP-DI/PhpDocReader/issues", + "source": "https://github.com/PHP-DI/PhpDocReader/tree/2.2.1" }, - "time": "2019-01-08T18:20:26+00:00" + "time": "2020-10-12T12:39:22+00:00" }, { - "name": "psr/http-factory", - "version": "1.0.2", + "name": "php-di/slim-bridge", + "version": "3.4.0", "source": { "type": "git", - "url": "https://github.com/php-fig/http-factory.git", - "reference": "e616d01114759c4c489f93b099585439f795fe35" + "url": "https://github.com/PHP-DI/Slim-Bridge.git", + "reference": "d14c95b34b3c5ba2e8c40020dd93fdcc8f3ba875" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", - "reference": "e616d01114759c4c489f93b099585439f795fe35", + "url": "https://api.github.com/repos/PHP-DI/Slim-Bridge/zipball/d14c95b34b3c5ba2e8c40020dd93fdcc8f3ba875", + "reference": "d14c95b34b3c5ba2e8c40020dd93fdcc8f3ba875", "shasum": "" }, "require": { - "php": ">=7.0.0", - "psr/http-message": "^1.0 || ^2.0" + "php": "^7.1 || ^8.0", + "php-di/invoker": "^2.0.0", + "php-di/php-di": "^6.0|^7.0", + "slim/slim": "^4.2.0" }, - "type": "library", + "require-dev": { + "laminas/laminas-diactoros": "^2.1", + "phpunit/phpunit": ">= 7.0 < 10" + }, + "type": "library", + "autoload": { + "psr-4": { + "DI\\Bridge\\Slim\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHP-DI integration in Slim", + "support": { + "issues": "https://github.com/PHP-DI/Slim-Bridge/issues", + "source": "https://github.com/PHP-DI/Slim-Bridge/tree/3.4.0" + }, + "time": "2023-06-29T14:08:47+00:00" + }, + { + "name": "pomo/pomo", + "version": "v1.5.0", + "source": { + "type": "git", + "url": "https://github.com/LeoColomb/pomo.git", + "reference": "b1e53a997850496369634d574fa6b508091fc353" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/LeoColomb/pomo/zipball/b1e53a997850496369634d574fa6b508091fc353", + "reference": "b1e53a997850496369634d574fa6b508091fc353", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0 || ^7.0", + "squizlabs/php_codesniffer": "^3.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "POMO\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "WordPress", + "homepage": "https://wordpress.org", + "role": "Author" + }, + { + "name": "Léo Colombaro", + "homepage": "https://colombaro.fr", + "role": "Maintainer" + } + ], + "description": "Gettext library to translate with i18n", + "homepage": "https://github.com/LeoColomb/pomo", + "keywords": [ + "gettext", + "i18n", + "internationalization", + "localization", + "translation" + ], + "support": { + "issues": "https://github.com/LeoColomb/pomo/issues", + "source": "https://github.com/LeoColomb/pomo/tree/v1.5.0" + }, + "funding": [ + { + "url": "https://github.com/LeoColomb", + "type": "github" + }, + { + "url": "https://www.patreon.com/LeoColomb", + "type": "patreon" + } + ], + "time": "2023-01-06T01:05:43+00:00" + }, + { + "name": "psr/cache", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/cache.git", + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "shasum": "" + }, + "require": { + "php": ">=8.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Cache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for caching libraries", + "keywords": [ + "cache", + "psr", + "psr-6" + ], + "support": { + "source": "https://github.com/php-fig/cache/tree/3.0.0" + }, + "time": "2021-02-03T23:26:27+00:00" + }, + { + "name": "psr/container", + "version": "1.1.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/1.1.2" + }, + "time": "2021-11-05T16:50:12+00:00" + }, + { + "name": "psr/event-dispatcher", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\EventDispatcher\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Standard interfaces for event handling.", + "keywords": [ + "events", + "psr", + "psr-14" + ], + "support": { + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + }, + "time": "2019-01-08T18:20:26+00:00" + }, + { + "name": "psr/http-factory", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-factory.git", + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a", + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a", + "shasum": "" + }, + "require": { + "php": ">=7.1", + "psr/http-message": "^1.0 || ^2.0" + }, + "type": "library", "extra": { "branch-alias": { "dev-master": "1.0.x-dev" @@ -2366,7 +2781,7 @@ "homepage": "https://www.php-fig.org/" } ], - "description": "Common interfaces for PSR-7 HTTP message factories", + "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories", "keywords": [ "factory", "http", @@ -2378,9 +2793,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-factory/tree/1.0.2" + "source": "https://github.com/php-fig/http-factory" }, - "time": "2023-04-10T20:10:41+00:00" + "time": "2024-04-15T12:06:14+00:00" }, { "name": "psr/http-message", @@ -2599,97 +3014,17 @@ "time": "2021-07-14T16:46:02+00:00" }, { - "name": "psy/psysh", - "version": "v0.11.22", + "name": "ralouphie/getallheaders", + "version": "3.0.3", "source": { "type": "git", - "url": "https://github.com/bobthecow/psysh.git", - "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b" + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "120b605dfeb996808c31b6477290a714d356e822" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/128fa1b608be651999ed9789c95e6e2a31b5802b", - "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-tokenizer": "*", - "nikic/php-parser": "^4.0 || ^3.1", - "php": "^8.0 || ^7.0.8", - "symfony/console": "^6.0 || ^5.0 || ^4.0 || ^3.4", - "symfony/var-dumper": "^6.0 || ^5.0 || ^4.0 || ^3.4" - }, - "conflict": { - "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4" - }, - "require-dev": { - "bamarni/composer-bin-plugin": "^1.2" - }, - "suggest": { - "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", - "ext-pdo-sqlite": "The doc command requires SQLite to work.", - "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.", - "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history." - }, - "bin": [ - "bin/psysh" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-0.11": "0.11.x-dev" - }, - "bamarni-bin": { - "bin-links": false, - "forward-command": false - } - }, - "autoload": { - "files": [ - "src/functions.php" - ], - "psr-4": { - "Psy\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Justin Hileman", - "email": "justin@justinhileman.info", - "homepage": "http://justinhileman.com" - } - ], - "description": "An interactive shell for modern PHP.", - "homepage": "http://psysh.org", - "keywords": [ - "REPL", - "console", - "interactive", - "shell" - ], - "support": { - "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.22" - }, - "time": "2023-10-14T21:56:36+00:00" - }, - { - "name": "ralouphie/getallheaders", - "version": "3.0.3", - "source": { - "type": "git", - "url": "https://github.com/ralouphie/getallheaders.git", - "reference": "120b605dfeb996808c31b6477290a714d356e822" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", - "reference": "120b605dfeb996808c31b6477290a714d356e822", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", + "reference": "120b605dfeb996808c31b6477290a714d356e822", "shasum": "" }, "require": { @@ -2844,6 +3179,73 @@ }, "time": "2024-04-13T09:45:55+00:00" }, + { + "name": "roadrunner-php/roadrunner-api-dto", + "version": "v1.7.0", + "source": { + "type": "git", + "url": "https://github.com/roadrunner-php/roadrunner-api-dto.git", + "reference": "d46b24f8b51ca0bca36aa74df60822f024d8c6dd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/roadrunner-php/roadrunner-api-dto/zipball/d46b24f8b51ca0bca36aa74df60822f024d8c6dd", + "reference": "d46b24f8b51ca0bca36aa74df60822f024d8c6dd", + "shasum": "" + }, + "require": { + "google/protobuf": "^v3.22", + "php": "^8.1" + }, + "conflict": { + "temporal/sdk": "<2.9.0" + }, + "suggest": { + "google/common-protos": "Required for Temporal API" + }, + "type": "library", + "autoload": { + "psr-4": { + "Temporal\\": "generated/Temporal", + "RoadRunner\\": "generated/RoadRunner", + "GPBMetadata\\": "generated/GPBMetadata" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Pavel Butchnev (butschster)", + "email": "pavel.buchnev@spiralscout.com" + }, + { + "name": "Aleksei Gagarin (roxblnfk)", + "email": "alexey.gagarin@spiralscout.com" + }, + { + "name": "RoadRunner Community", + "homepage": "https://github.com/roadrunner-server/roadrunner/graphs/contributors" + } + ], + "description": "RoadRunner PHP API", + "homepage": "https://roadrunner.dev", + "support": { + "chat": "https://discord.gg/V6EK4he", + "docs": "https://docs.roadrunner.dev", + "forum": "https://forum.roadrunner.dev", + "issues": "https://github.com/roadrunner-server/roadrunner/issues", + "source": "https://github.com/roadrunner-php/roadrunner-api-dto/tree/v1.7.0" + }, + "funding": [ + { + "url": "https://github.com/sponsors/roadrunner-server", + "type": "github" + } + ], + "time": "2024-04-11T14:08:46+00:00" + }, { "name": "sinergi/browser-detector", "version": "6.1.4", @@ -3135,35 +3537,44 @@ "time": "2021-01-09T15:26:41+00:00" }, { - "name": "symfony/amazon-mailer", - "version": "v6.4.3", + "name": "spiral/goridge", + "version": "v4.2.0", "source": { "type": "git", - "url": "https://github.com/symfony/amazon-mailer.git", - "reference": "0c9294b1cf610a6dd77b6ce6475bd76e1529b788" + "url": "https://github.com/roadrunner-php/goridge.git", + "reference": "c6696bd1834f5e88d1252a953a1336c041795411" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/amazon-mailer/zipball/0c9294b1cf610a6dd77b6ce6475bd76e1529b788", - "reference": "0c9294b1cf610a6dd77b6ce6475bd76e1529b788", + "url": "https://api.github.com/repos/roadrunner-php/goridge/zipball/c6696bd1834f5e88d1252a953a1336c041795411", + "reference": "c6696bd1834f5e88d1252a953a1336c041795411", "shasum": "" }, "require": { - "async-aws/ses": "^1.0", + "ext-json": "*", + "ext-sockets": "*", "php": ">=8.1", - "symfony/mailer": "^5.4.21|^6.2.7|^7.0" + "spiral/roadrunner": "^2023 || ^2024.1" }, "require-dev": { - "symfony/http-client": "^5.4|^6.0|^7.0" + "google/protobuf": "^3.22", + "infection/infection": "^0.26.1", + "jetbrains/phpstorm-attributes": "^1.0", + "phpunit/phpunit": "^10.0", + "rybakit/msgpack": "^0.7", + "vimeo/psalm": "^5.9" }, - "type": "symfony-mailer-bridge", + "suggest": { + "ext-msgpack": "MessagePack codec support", + "ext-protobuf": "Protobuf codec support", + "google/protobuf": "(^3.0) Protobuf codec support", + "rybakit/msgpack": "(^0.7) MessagePack codec support" + }, + "type": "goridge", "autoload": { "psr-4": { - "Symfony\\Component\\Mailer\\Bridge\\Amazon\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "Spiral\\Goridge\\": "src" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3171,162 +3582,136 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Anton Titov (wolfy-j)", + "email": "wolfy-j@spiralscout.com" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Valery Piashchynski", + "homepage": "https://github.com/rustatian" + }, + { + "name": "Aleksei Gagarin (roxblnfk)", + "homepage": "https://github.com/roxblnfk" + }, + { + "name": "Pavel Buchnev (butschster)", + "email": "pavel.buchnev@spiralscout.com" + }, + { + "name": "Maksim Smakouz (msmakouz)", + "email": "maksim.smakouz@spiralscout.com" + }, + { + "name": "RoadRunner Community", + "homepage": "https://github.com/roadrunner-server/roadrunner/graphs/contributors" } ], - "description": "Symfony Amazon Mailer Bridge", - "homepage": "https://symfony.com", + "description": "High-performance PHP-to-Golang RPC bridge", + "homepage": "https://spiral.dev/", "support": { - "source": "https://github.com/symfony/amazon-mailer/tree/v6.4.3" + "chat": "https://discord.gg/V6EK4he", + "docs": "https://docs.roadrunner.dev", + "forum": "https://forum.roadrunner.dev/", + "issues": "https://github.com/roadrunner-server/roadrunner/issues", + "source": "https://github.com/roadrunner-php/goridge/tree/v4.2.0" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sponsors/roadrunner-server", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-04-11T17:26:14+00:00" }, { - "name": "symfony/cache", - "version": "v6.4.6", + "name": "spiral/roadrunner", + "version": "v2024.1.0", "source": { "type": "git", - "url": "https://github.com/symfony/cache.git", - "reference": "b59bbf9c093b592d77110f9ee70c74dff89294cb" + "url": "https://github.com/roadrunner-server/roadrunner.git", + "reference": "c0d3df2b33bc2a9e9726dbbd73d7fe125ab9d045" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/b59bbf9c093b592d77110f9ee70c74dff89294cb", - "reference": "b59bbf9c093b592d77110f9ee70c74dff89294cb", + "url": "https://api.github.com/repos/roadrunner-server/roadrunner/zipball/c0d3df2b33bc2a9e9726dbbd73d7fe125ab9d045", + "reference": "c0d3df2b33bc2a9e9726dbbd73d7fe125ab9d045", "shasum": "" }, - "require": { - "php": ">=8.1", - "psr/cache": "^2.0|^3.0", - "psr/log": "^1.1|^2|^3", - "symfony/cache-contracts": "^2.5|^3", - "symfony/service-contracts": "^2.5|^3", - "symfony/var-exporter": "^6.3.6|^7.0" - }, - "conflict": { - "doctrine/dbal": "<2.13.1", - "symfony/dependency-injection": "<5.4", - "symfony/http-kernel": "<5.4", - "symfony/var-dumper": "<5.4" - }, - "provide": { - "psr/cache-implementation": "2.0|3.0", - "psr/simple-cache-implementation": "1.0|2.0|3.0", - "symfony/cache-implementation": "1.1|2.0|3.0" - }, - "require-dev": { - "cache/integration-tests": "dev-master", - "doctrine/dbal": "^2.13.1|^3|^4", - "predis/predis": "^1.1|^2.0", - "psr/simple-cache": "^1.0|^2.0|^3.0", - "symfony/config": "^5.4|^6.0|^7.0", - "symfony/dependency-injection": "^5.4|^6.0|^7.0", - "symfony/filesystem": "^5.4|^6.0|^7.0", - "symfony/http-kernel": "^5.4|^6.0|^7.0", - "symfony/messenger": "^5.4|^6.0|^7.0", - "symfony/var-dumper": "^5.4|^6.0|^7.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Cache\\": "" - }, - "classmap": [ - "Traits/ValueWrapper.php" - ], - "exclude-from-classmap": [ - "/Tests/" - ] - }, + "type": "metapackage", "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Anton Titov / Wolfy-J", + "email": "wolfy.jd@gmail.com" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Valery Piashchynski", + "homepage": "https://github.com/rustatian" + }, + { + "name": "RoadRunner Community", + "homepage": "https://github.com/roadrunner-server/roadrunner/graphs/contributors" } ], - "description": "Provides extended PSR-6, PSR-16 (and tags) implementations", - "homepage": "https://symfony.com", - "keywords": [ - "caching", - "psr6" - ], + "description": "RoadRunner: High-performance PHP application server and process manager written in Go and powered with plugins", + "homepage": "https://roadrunner.dev/", "support": { - "source": "https://github.com/symfony/cache/tree/v6.4.6" + "chat": "https://discord.gg/V6EK4he", + "docs": "https://roadrunner.dev/docs", + "forum": "https://forum.roadrunner.dev/", + "issues": "https://github.com/roadrunner-server/roadrunner/issues", + "source": "https://github.com/roadrunner-server/roadrunner/tree/v2024.1.0" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sponsors/roadrunner-server", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2024-03-27T13:27:42+00:00" + "time": "2024-04-11T16:32:14+00:00" }, { - "name": "symfony/cache-contracts", - "version": "v3.4.2", + "name": "spiral/roadrunner-http", + "version": "v3.5.1", "source": { "type": "git", - "url": "https://github.com/symfony/cache-contracts.git", - "reference": "2c9db6509a1b21dad229606897639d3284f54b2a" + "url": "https://github.com/roadrunner-php/http.git", + "reference": "213cd0d5c0fba1548f22a5f5ff333afa88fe24ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/2c9db6509a1b21dad229606897639d3284f54b2a", - "reference": "2c9db6509a1b21dad229606897639d3284f54b2a", + "url": "https://api.github.com/repos/roadrunner-php/http/zipball/213cd0d5c0fba1548f22a5f5ff333afa88fe24ae", + "reference": "213cd0d5c0fba1548f22a5f5ff333afa88fe24ae", "shasum": "" }, "require": { + "ext-json": "*", "php": ">=8.1", - "psr/cache": "^3.0" + "psr/http-factory": "^1.0.1", + "psr/http-message": "^1.0.1 || ^2.0", + "roadrunner-php/roadrunner-api-dto": "^1.6", + "spiral/roadrunner": "^2023.3 || ^2024.1", + "spiral/roadrunner-worker": "^3.5", + "symfony/polyfill-php83": "^1.29" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.4-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } + "require-dev": { + "jetbrains/phpstorm-attributes": "^1.0", + "nyholm/psr7": "^1.3", + "phpunit/phpunit": "^10.0", + "symfony/process": "^6.2 || ^7.0", + "vimeo/psalm": "^5.9" }, + "suggest": { + "ext-protobuf": "Provides Protocol Buffers support. Without it, performance will be lower.", + "spiral/roadrunner-cli": "Provides RoadRunner installation and management CLI tools" + }, + "type": "library", "autoload": { "psr-4": { - "Symfony\\Contracts\\Cache\\": "" + "Spiral\\RoadRunner\\Http\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -3335,18 +3720,345 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Anton Titov (wolfy-j)", + "email": "wolfy-j@spiralscout.com" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Valery Piashchynski", + "homepage": "https://github.com/rustatian" + }, + { + "name": "Aleksei Gagarin (roxblnfk)", + "homepage": "https://github.com/roxblnfk" + }, + { + "name": "Pavel Buchnev (butschster)", + "email": "pavel.buchnev@spiralscout.com" + }, + { + "name": "Maksim Smakouz (msmakouz)", + "email": "maksim.smakouz@spiralscout.com" + }, + { + "name": "RoadRunner Community", + "homepage": "https://github.com/roadrunner-server/roadrunner/graphs/contributors" } ], - "description": "Generic abstractions related to caching", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", + "description": "RoadRunner: HTTP and PSR-7 worker", + "homepage": "https://spiral.dev/", + "support": { + "chat": "https://discord.gg/V6EK4he", + "docs": "https://docs.roadrunner.dev", + "forum": "https://forum.roadrunner.dev/", + "issues": "https://github.com/roadrunner-server/roadrunner/issues", + "source": "https://github.com/roadrunner-php/http/tree/v3.5.1" + }, + "funding": [ + { + "url": "https://github.com/sponsors/roadrunner-server", + "type": "github" + } + ], + "time": "2024-04-26T11:16:10+00:00" + }, + { + "name": "spiral/roadrunner-worker", + "version": "v3.5.0", + "source": { + "type": "git", + "url": "https://github.com/roadrunner-php/worker.git", + "reference": "7c7411a301b9dade863634ab17ef01929adada6b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/roadrunner-php/worker/zipball/7c7411a301b9dade863634ab17ef01929adada6b", + "reference": "7c7411a301b9dade863634ab17ef01929adada6b", + "shasum": "" + }, + "require": { + "composer-runtime-api": "^2.0", + "ext-json": "*", + "ext-sockets": "*", + "php": ">=8.1", + "psr/log": "^2.0 || ^3.0", + "spiral/goridge": "^4.1.0", + "spiral/roadrunner": "^2023.1 || ^2024.1" + }, + "require-dev": { + "jetbrains/phpstorm-attributes": "^1.0", + "phpunit/phpunit": "^10.0", + "symfony/var-dumper": "^6.3 || ^7.0", + "vimeo/psalm": "^5.9" + }, + "suggest": { + "spiral/roadrunner-cli": "Provides RoadRunner installation and management CLI tools" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spiral\\RoadRunner\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Anton Titov (wolfy-j)", + "email": "wolfy-j@spiralscout.com" + }, + { + "name": "Valery Piashchynski", + "homepage": "https://github.com/rustatian" + }, + { + "name": "Aleksei Gagarin (roxblnfk)", + "homepage": "https://github.com/roxblnfk" + }, + { + "name": "Pavel Buchnev (butschster)", + "email": "pavel.buchnev@spiralscout.com" + }, + { + "name": "Maksim Smakouz (msmakouz)", + "email": "maksim.smakouz@spiralscout.com" + }, + { + "name": "RoadRunner Community", + "homepage": "https://github.com/roadrunner-server/roadrunner/graphs/contributors" + } + ], + "description": "RoadRunner: PHP worker", + "homepage": "https://spiral.dev/", + "support": { + "chat": "https://discord.gg/V6EK4he", + "docs": "https://docs.roadrunner.dev", + "forum": "https://forum.roadrunner.dev/", + "issues": "https://github.com/roadrunner-server/roadrunner/issues", + "source": "https://github.com/roadrunner-php/worker/tree/v3.5.0" + }, + "funding": [ + { + "url": "https://github.com/sponsors/roadrunner-server", + "type": "github" + } + ], + "time": "2024-03-29T08:06:36+00:00" + }, + { + "name": "symfony/amazon-mailer", + "version": "v6.4.7", + "source": { + "type": "git", + "url": "https://github.com/symfony/amazon-mailer.git", + "reference": "e750b42f6c08e5b9e9264ad6d65225a59bb0c6c7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/amazon-mailer/zipball/e750b42f6c08e5b9e9264ad6d65225a59bb0c6c7", + "reference": "e750b42f6c08e5b9e9264ad6d65225a59bb0c6c7", + "shasum": "" + }, + "require": { + "async-aws/ses": "^1.0", + "php": ">=8.1", + "symfony/mailer": "^5.4.21|^6.2.7|^7.0" + }, + "require-dev": { + "symfony/http-client": "^5.4|^6.0|^7.0" + }, + "type": "symfony-mailer-bridge", + "autoload": { + "psr-4": { + "Symfony\\Component\\Mailer\\Bridge\\Amazon\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Amazon Mailer Bridge", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/amazon-mailer/tree/v6.4.7" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-18T09:22:46+00:00" + }, + { + "name": "symfony/cache", + "version": "v6.4.7", + "source": { + "type": "git", + "url": "https://github.com/symfony/cache.git", + "reference": "b9e9b93c9817ec6c789c7943f5e54b57a041c16a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/cache/zipball/b9e9b93c9817ec6c789c7943f5e54b57a041c16a", + "reference": "b9e9b93c9817ec6c789c7943f5e54b57a041c16a", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/cache": "^2.0|^3.0", + "psr/log": "^1.1|^2|^3", + "symfony/cache-contracts": "^2.5|^3", + "symfony/service-contracts": "^2.5|^3", + "symfony/var-exporter": "^6.3.6|^7.0" + }, + "conflict": { + "doctrine/dbal": "<2.13.1", + "symfony/dependency-injection": "<5.4", + "symfony/http-kernel": "<5.4", + "symfony/var-dumper": "<5.4" + }, + "provide": { + "psr/cache-implementation": "2.0|3.0", + "psr/simple-cache-implementation": "1.0|2.0|3.0", + "symfony/cache-implementation": "1.1|2.0|3.0" + }, + "require-dev": { + "cache/integration-tests": "dev-master", + "doctrine/dbal": "^2.13.1|^3|^4", + "predis/predis": "^1.1|^2.0", + "psr/simple-cache": "^1.0|^2.0|^3.0", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/filesystem": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Cache\\": "" + }, + "classmap": [ + "Traits/ValueWrapper.php" + ], + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides extended PSR-6, PSR-16 (and tags) implementations", + "homepage": "https://symfony.com", + "keywords": [ + "caching", + "psr6" + ], + "support": { + "source": "https://github.com/symfony/cache/tree/v6.4.7" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-18T09:22:46+00:00" + }, + { + "name": "symfony/cache-contracts", + "version": "v3.5.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/cache-contracts.git", + "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/df6a1a44c890faded49a5fca33c2d5c5fd3c2197", + "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/cache": "^3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Cache\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to caching", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", "contracts", "decoupling", "interfaces", @@ -3354,7 +4066,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v3.4.2" + "source": "https://github.com/symfony/cache-contracts/tree/v3.5.0" }, "funding": [ { @@ -3370,20 +4082,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/console", - "version": "v6.4.6", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f" + "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a2708a5da5c87d1d0d52937bdeac625df659e11f", - "reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f", + "url": "https://api.github.com/repos/symfony/console/zipball/a170e64ae10d00ba89e2acbb590dc2e54da8ad8f", + "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f", "shasum": "" }, "require": { @@ -3448,7 +4160,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.6" + "source": "https://github.com/symfony/console/tree/v6.4.7" }, "funding": [ { @@ -3464,20 +4176,20 @@ "type": "tidelift" } ], - "time": "2024-03-29T19:07:53+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", "shasum": "" }, "require": { @@ -3486,7 +4198,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -3515,7 +4227,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" }, "funding": [ { @@ -3531,20 +4243,20 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v7.0.3", + "version": "v7.0.7", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "834c28d533dd0636f910909d01b9ff45cc094b5e" + "reference": "db2a7fab994d67d92356bb39c367db115d9d30f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/834c28d533dd0636f910909d01b9ff45cc094b5e", - "reference": "834c28d533dd0636f910909d01b9ff45cc094b5e", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/db2a7fab994d67d92356bb39c367db115d9d30f9", + "reference": "db2a7fab994d67d92356bb39c367db115d9d30f9", "shasum": "" }, "require": { @@ -3595,7 +4307,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", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v7.0.3" + "source": "https://github.com/symfony/event-dispatcher/tree/v7.0.7" }, "funding": [ { @@ -3611,20 +4323,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T15:02:46+00:00" + "time": "2024-04-18T09:29:19+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.4.2", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "4e64b49bf370ade88e567de29465762e316e4224" + "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/4e64b49bf370ade88e567de29465762e316e4224", - "reference": "4e64b49bf370ade88e567de29465762e316e4224", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50", + "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50", "shasum": "" }, "require": { @@ -3634,7 +4346,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -3671,7 +4383,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.2" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0" }, "funding": [ { @@ -3687,20 +4399,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/http-client", - "version": "v7.0.6", + "version": "v7.0.7", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "6e70473909f46fe5dd3b994a0f1b20ecb6b2f858" + "reference": "6ce3c4c899051b3d7326ea1a1dda3729e29ae6d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/6e70473909f46fe5dd3b994a0f1b20ecb6b2f858", - "reference": "6e70473909f46fe5dd3b994a0f1b20ecb6b2f858", + "url": "https://api.github.com/repos/symfony/http-client/zipball/6ce3c4c899051b3d7326ea1a1dda3729e29ae6d7", + "reference": "6ce3c4c899051b3d7326ea1a1dda3729e29ae6d7", "shasum": "" }, "require": { @@ -3763,7 +4475,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v7.0.6" + "source": "https://github.com/symfony/http-client/tree/v7.0.7" }, "funding": [ { @@ -3779,20 +4491,20 @@ "type": "tidelift" } ], - "time": "2024-04-01T20:49:44+00:00" + "time": "2024-04-18T09:29:19+00:00" }, { "name": "symfony/http-client-contracts", - "version": "v3.4.2", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "b6b5c876b3a4ed74460e2c5ac53bbce2f12e2a7e" + "reference": "20414d96f391677bf80078aa55baece78b82647d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/b6b5c876b3a4ed74460e2c5ac53bbce2f12e2a7e", - "reference": "b6b5c876b3a4ed74460e2c5ac53bbce2f12e2a7e", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/20414d96f391677bf80078aa55baece78b82647d", + "reference": "20414d96f391677bf80078aa55baece78b82647d", "shasum": "" }, "require": { @@ -3801,7 +4513,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -3841,7 +4553,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/v3.4.2" + "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.0" }, "funding": [ { @@ -3857,97 +4569,20 @@ "type": "tidelift" } ], - "time": "2024-04-01T18:51:09+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { - "name": "symfony/http-foundation", - "version": "v7.0.6", + "name": "symfony/mailchimp-mailer", + "version": "v6.4.7", "source": { "type": "git", - "url": "https://github.com/symfony/http-foundation.git", - "reference": "8789625dcf36e5fbf753014678a1e090f1bc759c" + "url": "https://github.com/symfony/mailchimp-mailer.git", + "reference": "e59de564673708ee9b029d714ec37f93fefb125e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8789625dcf36e5fbf753014678a1e090f1bc759c", - "reference": "8789625dcf36e5fbf753014678a1e090f1bc759c", - "shasum": "" - }, - "require": { - "php": ">=8.2", - "symfony/polyfill-mbstring": "~1.1", - "symfony/polyfill-php83": "^1.27" - }, - "conflict": { - "doctrine/dbal": "<3.6", - "symfony/cache": "<6.4" - }, - "require-dev": { - "doctrine/dbal": "^3.6|^4", - "predis/predis": "^1.1|^2.0", - "symfony/cache": "^6.4|^7.0", - "symfony/dependency-injection": "^6.4|^7.0", - "symfony/expression-language": "^6.4|^7.0", - "symfony/http-kernel": "^6.4|^7.0", - "symfony/mime": "^6.4|^7.0", - "symfony/rate-limiter": "^6.4|^7.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\HttpFoundation\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Defines an object-oriented layer for the HTTP specification", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/http-foundation/tree/v7.0.6" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-03-19T11:46:48+00:00" - }, - { - "name": "symfony/mailchimp-mailer", - "version": "v6.4.3", - "source": { - "type": "git", - "url": "https://github.com/symfony/mailchimp-mailer.git", - "reference": "8fcbf792a553cdb6d246111a0826ba9ef75fafdf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/mailchimp-mailer/zipball/8fcbf792a553cdb6d246111a0826ba9ef75fafdf", - "reference": "8fcbf792a553cdb6d246111a0826ba9ef75fafdf", + "url": "https://api.github.com/repos/symfony/mailchimp-mailer/zipball/e59de564673708ee9b029d714ec37f93fefb125e", + "reference": "e59de564673708ee9b029d714ec37f93fefb125e", "shasum": "" }, "require": { @@ -3983,7 +4618,7 @@ "description": "Symfony Mailchimp Mailer Bridge", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailchimp-mailer/tree/v6.4.3" + "source": "https://github.com/symfony/mailchimp-mailer/tree/v6.4.7" }, "funding": [ { @@ -3999,20 +4634,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/mailer", - "version": "v6.4.6", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "677f34a6f4b4559e08acf73ae0aec460479e5859" + "reference": "2c446d4e446995bed983c0b5bb9ff837e8de7dbd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/677f34a6f4b4559e08acf73ae0aec460479e5859", - "reference": "677f34a6f4b4559e08acf73ae0aec460479e5859", + "url": "https://api.github.com/repos/symfony/mailer/zipball/2c446d4e446995bed983c0b5bb9ff837e8de7dbd", + "reference": "2c446d4e446995bed983c0b5bb9ff837e8de7dbd", "shasum": "" }, "require": { @@ -4063,7 +4698,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v6.4.6" + "source": "https://github.com/symfony/mailer/tree/v6.4.7" }, "funding": [ { @@ -4079,20 +4714,20 @@ "type": "tidelift" } ], - "time": "2024-03-27T21:14:17+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/mailgun-mailer", - "version": "v6.4.4", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/mailgun-mailer.git", - "reference": "8c018872b40ce050590b6d18cf741db0c8313435" + "reference": "044eede71c3eb5fbe7192042b8c0d04987b5653d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/8c018872b40ce050590b6d18cf741db0c8313435", - "reference": "8c018872b40ce050590b6d18cf741db0c8313435", + "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/044eede71c3eb5fbe7192042b8c0d04987b5653d", + "reference": "044eede71c3eb5fbe7192042b8c0d04987b5653d", "shasum": "" }, "require": { @@ -4132,7 +4767,7 @@ "description": "Symfony Mailgun Mailer Bridge", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailgun-mailer/tree/v6.4.4" + "source": "https://github.com/symfony/mailgun-mailer/tree/v6.4.7" }, "funding": [ { @@ -4148,20 +4783,20 @@ "type": "tidelift" } ], - "time": "2024-02-14T06:31:46+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/mime", - "version": "v6.4.6", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "14762b86918823cb42e3558cdcca62e58b5227fe" + "reference": "decadcf3865918ecfcbfa90968553994ce935a5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/14762b86918823cb42e3558cdcca62e58b5227fe", - "reference": "14762b86918823cb42e3558cdcca62e58b5227fe", + "url": "https://api.github.com/repos/symfony/mime/zipball/decadcf3865918ecfcbfa90968553994ce935a5e", + "reference": "decadcf3865918ecfcbfa90968553994ce935a5e", "shasum": "" }, "require": { @@ -4217,7 +4852,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.4.6" + "source": "https://github.com/symfony/mime/tree/v6.4.7" }, "funding": [ { @@ -4233,7 +4868,7 @@ "type": "tidelift" } ], - "time": "2024-03-21T19:36:20+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4867,99 +5502,18 @@ ], "time": "2024-01-29T20:11:03+00:00" }, - { - "name": "symfony/routing", - "version": "v7.0.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/routing.git", - "reference": "cded64e5bbf9f31786f1055fcc76718fdd77519c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/cded64e5bbf9f31786f1055fcc76718fdd77519c", - "reference": "cded64e5bbf9f31786f1055fcc76718fdd77519c", - "shasum": "" - }, - "require": { - "php": ">=8.2", - "symfony/deprecation-contracts": "^2.5|^3" - }, - "conflict": { - "symfony/config": "<6.4", - "symfony/dependency-injection": "<6.4", - "symfony/yaml": "<6.4" - }, - "require-dev": { - "psr/log": "^1|^2|^3", - "symfony/config": "^6.4|^7.0", - "symfony/dependency-injection": "^6.4|^7.0", - "symfony/expression-language": "^6.4|^7.0", - "symfony/http-foundation": "^6.4|^7.0", - "symfony/yaml": "^6.4|^7.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Routing\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Maps an HTTP request to a set of configuration variables", - "homepage": "https://symfony.com", - "keywords": [ - "router", - "routing", - "uri", - "url" - ], - "support": { - "source": "https://github.com/symfony/routing/tree/v7.0.6" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-03-28T21:02:11+00:00" - }, { "name": "symfony/sendgrid-mailer", - "version": "v6.4.3", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/sendgrid-mailer.git", - "reference": "910a1c8f8a44111b69de1e2539a2243a91eaf9be" + "reference": "deea5b186e31719d212ccc265d05459d4eb8d374" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/sendgrid-mailer/zipball/910a1c8f8a44111b69de1e2539a2243a91eaf9be", - "reference": "910a1c8f8a44111b69de1e2539a2243a91eaf9be", + "url": "https://api.github.com/repos/symfony/sendgrid-mailer/zipball/deea5b186e31719d212ccc265d05459d4eb8d374", + "reference": "deea5b186e31719d212ccc265d05459d4eb8d374", "shasum": "" }, "require": { @@ -5000,7 +5554,7 @@ "description": "Symfony Sendgrid Mailer Bridge", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/sendgrid-mailer/tree/v6.4.3" + "source": "https://github.com/symfony/sendgrid-mailer/tree/v6.4.7" }, "funding": [ { @@ -5016,520 +5570,47 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.4.2", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "11bbf19a0fb7b36345861e85c5768844c552906e" + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/11bbf19a0fb7b36345861e85c5768844c552906e", - "reference": "11bbf19a0fb7b36345861e85c5768844c552906e", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", "shasum": "" }, "require": { "php": ">=8.1", - "psr/container": "^1.1|^2.0" - }, - "conflict": { - "ext-psr": "<1.1|>=2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.4-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Contracts\\Service\\": "" - }, - "exclude-from-classmap": [ - "/Test/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Generic abstractions related to writing services", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], - "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.4.2" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-12-19T21:51:00+00:00" - }, - { - "name": "symfony/string", - "version": "v7.0.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/string.git", - "reference": "f5832521b998b0bec40bee688ad5de98d4cf111b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/f5832521b998b0bec40bee688ad5de98d4cf111b", - "reference": "f5832521b998b0bec40bee688ad5de98d4cf111b", - "shasum": "" - }, - "require": { - "php": ">=8.2", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-intl-grapheme": "~1.0", - "symfony/polyfill-intl-normalizer": "~1.0", - "symfony/polyfill-mbstring": "~1.0" - }, - "conflict": { - "symfony/translation-contracts": "<2.5" - }, - "require-dev": { - "symfony/error-handler": "^6.4|^7.0", - "symfony/http-client": "^6.4|^7.0", - "symfony/intl": "^6.4|^7.0", - "symfony/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^6.4|^7.0" - }, - "type": "library", - "autoload": { - "files": [ - "Resources/functions.php" - ], - "psr-4": { - "Symfony\\Component\\String\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", - "homepage": "https://symfony.com", - "keywords": [ - "grapheme", - "i18n", - "string", - "unicode", - "utf-8", - "utf8" - ], - "support": { - "source": "https://github.com/symfony/string/tree/v7.0.4" + "psr/container": "^1.1|^2.0", + "symfony/deprecation-contracts": "^2.5|^3" }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-02-01T13:17:36+00:00" - }, - { - "name": "symfony/var-dumper", - "version": "v6.4.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/var-dumper.git", - "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/95bd2706a97fb875185b51ecaa6112ec184233d4", - "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4", - "shasum": "" - }, - "require": { - "php": ">=8.1", - "symfony/deprecation-contracts": "^2.5|^3", - "symfony/polyfill-mbstring": "~1.0" - }, - "conflict": { - "symfony/console": "<5.4" - }, - "require-dev": { - "ext-iconv": "*", - "symfony/console": "^5.4|^6.0|^7.0", - "symfony/error-handler": "^6.3|^7.0", - "symfony/http-kernel": "^5.4|^6.0|^7.0", - "symfony/process": "^5.4|^6.0|^7.0", - "symfony/uid": "^5.4|^6.0|^7.0", - "twig/twig": "^2.13|^3.0.4" - }, - "bin": [ - "Resources/bin/var-dump-server" - ], - "type": "library", - "autoload": { - "files": [ - "Resources/functions/dump.php" - ], - "psr-4": { - "Symfony\\Component\\VarDumper\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides mechanisms for walking through any arbitrary PHP variable", - "homepage": "https://symfony.com", - "keywords": [ - "debug", - "dump" - ], - "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.6" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-03-19T11:56:30+00:00" - }, - { - "name": "symfony/var-exporter", - "version": "v7.0.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/var-exporter.git", - "reference": "c74c568d2a15a1d407cf40d61ea82bc2d521e27b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/c74c568d2a15a1d407cf40d61ea82bc2d521e27b", - "reference": "c74c568d2a15a1d407cf40d61ea82bc2d521e27b", - "shasum": "" - }, - "require": { - "php": ">=8.2" - }, - "require-dev": { - "symfony/property-access": "^6.4|^7.0", - "symfony/serializer": "^6.4|^7.0", - "symfony/var-dumper": "^6.4|^7.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\VarExporter\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Allows exporting any serializable PHP data structure to plain PHP code", - "homepage": "https://symfony.com", - "keywords": [ - "clone", - "construct", - "export", - "hydrate", - "instantiate", - "lazy-loading", - "proxy", - "serialize" - ], - "support": { - "source": "https://github.com/symfony/var-exporter/tree/v7.0.6" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-03-20T21:25:22+00:00" - } - ], - "packages-dev": [ - { - "name": "composer/pcre", - "version": "3.1.3", - "source": { - "type": "git", - "url": "https://github.com/composer/pcre.git", - "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", - "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", - "shasum": "" - }, - "require": { - "php": "^7.4 || ^8.0" - }, - "require-dev": { - "phpstan/phpstan": "^1.3", - "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Composer\\Pcre\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - } - ], - "description": "PCRE wrapping library that offers type-safe preg_* replacements.", - "keywords": [ - "PCRE", - "preg", - "regex", - "regular expression" - ], - "support": { - "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.3" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2024-03-19T10:26:25+00:00" - }, - { - "name": "composer/semver", - "version": "3.4.0", - "source": { - "type": "git", - "url": "https://github.com/composer/semver.git", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", - "shasum": "" - }, - "require": { - "php": "^5.3.2 || ^7.0 || ^8.0" - }, - "require-dev": { - "phpstan/phpstan": "^1.4", - "symfony/phpunit-bridge": "^4.2 || ^5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Composer\\Semver\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nils Adermann", - "email": "naderman@naderman.de", - "homepage": "http://www.naderman.de" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - }, - { - "name": "Rob Bast", - "email": "rob.bast@gmail.com", - "homepage": "http://robbast.nl" - } - ], - "description": "Semver library that offers utilities, version constraint parsing and validation.", - "keywords": [ - "semantic", - "semver", - "validation", - "versioning" - ], - "support": { - "irc": "ircs://irc.libera.chat:6697/composer", - "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.4.0" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2023-08-31T09:50:34+00:00" - }, - { - "name": "composer/xdebug-handler", - "version": "3.0.4", - "source": { - "type": "git", - "url": "https://github.com/composer/xdebug-handler.git", - "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/4f988f8fdf580d53bdb2d1278fe93d1ed5462255", - "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255", - "shasum": "" - }, - "require": { - "composer/pcre": "^1 || ^2 || ^3", - "php": "^7.2.5 || ^8.0", - "psr/log": "^1 || ^2 || ^3" - }, - "require-dev": { - "phpstan/phpstan": "^1.0", - "phpstan/phpstan-strict-rules": "^1.1", - "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5" + "conflict": { + "ext-psr": "<1.1|>=2" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, "autoload": { "psr-4": { - "Composer\\XdebugHandler\\": "src" - } + "Symfony\\Contracts\\Service\\": "" + }, + "exclude-from-classmap": [ + "/Test/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5537,84 +5618,85 @@ ], "authors": [ { - "name": "John Stevenson", - "email": "john-stevenson@blueyonder.co.uk" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Restarts a process without Xdebug.", + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", "keywords": [ - "Xdebug", - "performance" + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" ], "support": { - "irc": "ircs://irc.libera.chat:6697/composer", - "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/3.0.4" + "source": "https://github.com/symfony/service-contracts/tree/v3.5.0" }, "funding": [ { - "url": "https://packagist.com", + "url": "https://symfony.com/sponsor", "type": "custom" }, { - "url": "https://github.com/composer", + "url": "https://github.com/fabpot", "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-03-26T18:29:49+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { - "name": "doctrine/data-fixtures", - "version": "1.7.0", + "name": "symfony/string", + "version": "v7.0.7", "source": { "type": "git", - "url": "https://github.com/doctrine/data-fixtures.git", - "reference": "bbcb74f2ac6dbe81a14b3c3687d7623490a0448f" + "url": "https://github.com/symfony/string.git", + "reference": "e405b5424dc2528e02e31ba26b83a79fd4eb8f63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/bbcb74f2ac6dbe81a14b3c3687d7623490a0448f", - "reference": "bbcb74f2ac6dbe81a14b3c3687d7623490a0448f", + "url": "https://api.github.com/repos/symfony/string/zipball/e405b5424dc2528e02e31ba26b83a79fd4eb8f63", + "reference": "e405b5424dc2528e02e31ba26b83a79fd4eb8f63", "shasum": "" }, "require": { - "doctrine/deprecations": "^0.5.3 || ^1.0", - "doctrine/persistence": "^2.0|^3.0", - "php": "^7.4 || ^8.0" + "php": ">=8.2", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-normalizer": "~1.0", + "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "doctrine/dbal": "<3.5 || >=5", - "doctrine/orm": "<2.14 || >=4", - "doctrine/phpcr-odm": "<1.3.0" + "symfony/translation-contracts": "<2.5" }, "require-dev": { - "doctrine/annotations": "^1.12 || ^2", - "doctrine/coding-standard": "^12", - "doctrine/dbal": "^3.5 || ^4", - "doctrine/mongodb-odm": "^1.3.0 || ^2.0.0", - "doctrine/orm": "^2.14 || ^3", - "ext-sqlite3": "*", - "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^9.6.13 || ^10.4.2", - "symfony/cache": "^5.4 || ^6.3 || ^7", - "symfony/var-exporter": "^5.4 || ^6.3 || ^7", - "vimeo/psalm": "^5.9" - }, - "suggest": { - "alcaeus/mongo-php-adapter": "For using MongoDB ODM 1.3 with PHP 7 (deprecated)", - "doctrine/mongodb-odm": "For loading MongoDB ODM fixtures", - "doctrine/orm": "For loading ORM fixtures", - "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures" + "symfony/error-handler": "^6.4|^7.0", + "symfony/http-client": "^6.4|^7.0", + "symfony/intl": "^6.4|^7.0", + "symfony/translation-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^6.4|^7.0" }, "type": "library", "autoload": { + "files": [ + "Resources/functions.php" + ], "psr-4": { - "Doctrine\\Common\\DataFixtures\\": "src" - } + "Symfony\\Component\\String\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5622,94 +5704,73 @@ ], "authors": [ { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Data Fixtures for all Doctrine Object Managers", - "homepage": "https://www.doctrine-project.org", + "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", + "homepage": "https://symfony.com", "keywords": [ - "database" + "grapheme", + "i18n", + "string", + "unicode", + "utf-8", + "utf8" ], "support": { - "issues": "https://github.com/doctrine/data-fixtures/issues", - "source": "https://github.com/doctrine/data-fixtures/tree/1.7.0" + "source": "https://github.com/symfony/string/tree/v7.0.7" }, "funding": [ { - "url": "https://www.doctrine-project.org/sponsorship.html", + "url": "https://symfony.com/sponsor", "type": "custom" }, { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" + "url": "https://github.com/fabpot", + "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdata-fixtures", + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2023-11-24T11:18:31+00:00" + "time": "2024-04-18T09:29:19+00:00" }, { - "name": "friendsofphp/php-cs-fixer", - "version": "v3.54.0", + "name": "symfony/var-exporter", + "version": "v7.0.7", "source": { "type": "git", - "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "2aecbc8640d7906c38777b3dcab6f4ca79004d08" + "url": "https://github.com/symfony/var-exporter.git", + "reference": "cdecc0022e40e90340ba1a59a3d5ccf069777078" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/2aecbc8640d7906c38777b3dcab6f4ca79004d08", - "reference": "2aecbc8640d7906c38777b3dcab6f4ca79004d08", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/cdecc0022e40e90340ba1a59a3d5ccf069777078", + "reference": "cdecc0022e40e90340ba1a59a3d5ccf069777078", "shasum": "" }, "require": { - "composer/semver": "^3.4", - "composer/xdebug-handler": "^3.0.3", - "ext-filter": "*", - "ext-json": "*", - "ext-tokenizer": "*", - "php": "^7.4 || ^8.0", - "sebastian/diff": "^4.0 || ^5.0 || ^6.0", - "symfony/console": "^5.4 || ^6.0 || ^7.0", - "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0", - "symfony/filesystem": "^5.4 || ^6.0 || ^7.0", - "symfony/finder": "^5.4 || ^6.0 || ^7.0", - "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0", - "symfony/polyfill-mbstring": "^1.28", - "symfony/polyfill-php80": "^1.28", - "symfony/polyfill-php81": "^1.28", - "symfony/process": "^5.4 || ^6.0 || ^7.0", - "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0" + "php": ">=8.2" }, "require-dev": { - "facile-it/paraunit": "^1.3 || ^2.0", - "infection/infection": "^0.27.11", - "justinrainbow/json-schema": "^5.2", - "keradus/cli-executor": "^2.1", - "mikey179/vfsstream": "^1.6.11", - "php-coveralls/php-coveralls": "^2.7", - "php-cs-fixer/accessible-object": "^1.1", - "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4", - "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4", - "phpunit/phpunit": "^9.6 || ^10.5.5 || ^11.0.2", - "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0", - "symfony/yaml": "^5.4 || ^6.0 || ^7.0" - }, - "suggest": { - "ext-dom": "For handling output formats in XML", - "ext-mbstring": "For handling non-UTF8 characters." + "symfony/property-access": "^6.4|^7.0", + "symfony/serializer": "^6.4|^7.0", + "symfony/var-dumper": "^6.4|^7.0" }, - "bin": [ - "php-cs-fixer" - ], - "type": "application", + "type": "library", "autoload": { "psr-4": { - "PhpCsFixer\\": "src/" - } + "Symfony\\Component\\VarExporter\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5717,33 +5778,47 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "name": "Dariusz Rumiński", - "email": "dariusz.ruminski@gmail.com" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "A tool to automatically fix PHP code style", + "description": "Allows exporting any serializable PHP data structure to plain PHP code", + "homepage": "https://symfony.com", "keywords": [ - "Static code analysis", - "fixer", - "standards", - "static analysis" + "clone", + "construct", + "export", + "hydrate", + "instantiate", + "lazy-loading", + "proxy", + "serialize" ], "support": { - "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.54.0" + "source": "https://github.com/symfony/var-exporter/tree/v7.0.7" }, "funding": [ { - "url": "https://github.com/keradus", + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" } ], - "time": "2024-04-17T08:12:13+00:00" - }, + "time": "2024-04-18T09:29:19+00:00" + } + ], + "packages-dev": [ { "name": "myclabs/deep-copy", "version": "1.11.1", @@ -5803,6 +5878,62 @@ ], "time": "2023-03-08T13:26:56+00:00" }, + { + "name": "nikic/php-parser", + "version": "v4.19.1", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b", + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=7.1" + }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.9-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1" + }, + "time": "2024-03-17T08:10:35+00:00" + }, { "name": "phar-io/manifest", "version": "2.0.4", @@ -6244,16 +6375,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.19", + "version": "10.5.20", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c726f0de022368f6ed103e452a765d3304a996a4" + "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c726f0de022368f6ed103e452a765d3304a996a4", - "reference": "c726f0de022368f6ed103e452a765d3304a996a4", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3", + "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3", "shasum": "" }, "require": { @@ -6325,7 +6456,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.19" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.20" }, "funding": [ { @@ -6341,7 +6472,87 @@ "type": "tidelift" } ], - "time": "2024-04-17T14:06:18+00:00" + "time": "2024-04-24T06:32:35+00:00" + }, + { + "name": "psy/psysh", + "version": "v0.11.22", + "source": { + "type": "git", + "url": "https://github.com/bobthecow/psysh.git", + "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/128fa1b608be651999ed9789c95e6e2a31b5802b", + "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-tokenizer": "*", + "nikic/php-parser": "^4.0 || ^3.1", + "php": "^8.0 || ^7.0.8", + "symfony/console": "^6.0 || ^5.0 || ^4.0 || ^3.4", + "symfony/var-dumper": "^6.0 || ^5.0 || ^4.0 || ^3.4" + }, + "conflict": { + "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.2" + }, + "suggest": { + "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", + "ext-pdo-sqlite": "The doc command requires SQLite to work.", + "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.", + "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history." + }, + "bin": [ + "bin/psysh" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-0.11": "0.11.x-dev" + }, + "bamarni-bin": { + "bin-links": false, + "forward-command": false + } + }, + "autoload": { + "files": [ + "src/functions.php" + ], + "psr-4": { + "Psy\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Justin Hileman", + "email": "justin@justinhileman.info", + "homepage": "http://justinhileman.com" + } + ], + "description": "An interactive shell for modern PHP.", + "homepage": "http://psysh.org", + "keywords": [ + "REPL", + "console", + "interactive", + "shell" + ], + "support": { + "issues": "https://github.com/bobthecow/psysh/issues", + "source": "https://github.com/bobthecow/psysh/tree/v0.11.22" + }, + "time": "2023-10-14T21:56:36+00:00" }, { "name": "sebastian/cli-parser", @@ -7259,81 +7470,18 @@ ], "time": "2023-02-07T11:34:05+00:00" }, - { - "name": "symfony/filesystem", - "version": "v7.0.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/filesystem.git", - "reference": "408105dff4c104454100730bdfd1a9cdd993f04d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/408105dff4c104454100730bdfd1a9cdd993f04d", - "reference": "408105dff4c104454100730bdfd1a9cdd993f04d", - "shasum": "" - }, - "require": { - "php": ">=8.2", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.8" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Filesystem\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides basic utilities for the filesystem", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/filesystem/tree/v7.0.6" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-03-21T19:37:36+00:00" - }, { "name": "symfony/finder", - "version": "v7.0.0", + "version": "v7.0.7", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "6e5688d69f7cfc4ed4a511e96007e06c2d34ce56" + "reference": "4d58f0f4fe95a30d7b538d71197135483560b97c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/6e5688d69f7cfc4ed4a511e96007e06c2d34ce56", - "reference": "6e5688d69f7cfc4ed4a511e96007e06c2d34ce56", + "url": "https://api.github.com/repos/symfony/finder/zipball/4d58f0f4fe95a30d7b538d71197135483560b97c", + "reference": "4d58f0f4fe95a30d7b538d71197135483560b97c", "shasum": "" }, "require": { @@ -7368,7 +7516,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.0.0" + "source": "https://github.com/symfony/finder/tree/v7.0.7" }, "funding": [ { @@ -7384,108 +7532,52 @@ "type": "tidelift" } ], - "time": "2023-10-31T17:59:56+00:00" + "time": "2024-04-28T11:44:19+00:00" }, { - "name": "symfony/options-resolver", - "version": "v7.0.0", + "name": "symfony/var-dumper", + "version": "v6.4.7", "source": { "type": "git", - "url": "https://github.com/symfony/options-resolver.git", - "reference": "700ff4096e346f54cb628ea650767c8130f1001f" + "url": "https://github.com/symfony/var-dumper.git", + "reference": "7a9cd977cd1c5fed3694bee52990866432af07d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/700ff4096e346f54cb628ea650767c8130f1001f", - "reference": "700ff4096e346f54cb628ea650767c8130f1001f", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7a9cd977cd1c5fed3694bee52990866432af07d7", + "reference": "7a9cd977cd1c5fed3694bee52990866432af07d7", "shasum": "" }, "require": { - "php": ">=8.2", - "symfony/deprecation-contracts": "^2.5|^3" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.0" }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\OptionsResolver\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "conflict": { + "symfony/console": "<5.4" }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides an improved replacement for the array_replace PHP function", - "homepage": "https://symfony.com", - "keywords": [ - "config", - "configuration", - "options" - ], - "support": { - "source": "https://github.com/symfony/options-resolver/tree/v7.0.0" + "require-dev": { + "ext-iconv": "*", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^6.3|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/uid": "^5.4|^6.0|^7.0", + "twig/twig": "^2.13|^3.0.4" }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } + "bin": [ + "Resources/bin/var-dump-server" ], - "time": "2023-08-08T10:20:21+00:00" - }, - { - "name": "symfony/polyfill-php81", - "version": "v1.29.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d", - "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, "autoload": { "files": [ - "bootstrap.php" + "Resources/functions/dump.php" ], "psr-4": { - "Symfony\\Polyfill\\Php81\\": "" + "Symfony\\Component\\VarDumper\\": "" }, - "classmap": [ - "Resources/stubs" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -7502,16 +7594,14 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "description": "Provides mechanisms for walking through any arbitrary PHP variable", "homepage": "https://symfony.com", "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" + "debug", + "dump" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.7" }, "funding": [ { @@ -7527,91 +7617,39 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { - "name": "symfony/process", - "version": "v7.0.4", + "name": "symfony/yaml", + "version": "v7.0.7", "source": { "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "0e7727191c3b71ebec6d529fa0e50a01ca5679e9" + "url": "https://github.com/symfony/yaml.git", + "reference": "0d3916ae69ea28b59d94b60c4f2b50f4e25adb5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/0e7727191c3b71ebec6d529fa0e50a01ca5679e9", - "reference": "0e7727191c3b71ebec6d529fa0e50a01ca5679e9", + "url": "https://api.github.com/repos/symfony/yaml/zipball/0d3916ae69ea28b59d94b60c4f2b50f4e25adb5c", + "reference": "0d3916ae69ea28b59d94b60c4f2b50f4e25adb5c", "shasum": "" }, "require": { - "php": ">=8.2" + "php": ">=8.2", + "symfony/polyfill-ctype": "^1.8" }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Process\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "conflict": { + "symfony/console": "<6.4" }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Executes commands in sub-processes", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/process/tree/v7.0.4" + "require-dev": { + "symfony/console": "^6.4|^7.0" }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } + "bin": [ + "Resources/bin/yaml-lint" ], - "time": "2024-02-22T20:27:20+00:00" - }, - { - "name": "symfony/stopwatch", - "version": "v7.0.3", - "source": { - "type": "git", - "url": "https://github.com/symfony/stopwatch.git", - "reference": "983900d6fddf2b0cbaacacbbad07610854bd8112" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/983900d6fddf2b0cbaacacbbad07610854bd8112", - "reference": "983900d6fddf2b0cbaacacbbad07610854bd8112", - "shasum": "" - }, - "require": { - "php": ">=8.2", - "symfony/service-contracts": "^2.5|^3" - }, "type": "library", "autoload": { "psr-4": { - "Symfony\\Component\\Stopwatch\\": "" + "Symfony\\Component\\Yaml\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -7631,10 +7669,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Provides a way to profile code", + "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v7.0.3" + "source": "https://github.com/symfony/yaml/tree/v7.0.7" }, "funding": [ { @@ -7650,7 +7688,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T15:02:46+00:00" + "time": "2024-04-28T11:44:19+00:00" }, { "name": "theseer/tokenizer", @@ -7701,6 +7739,87 @@ } ], "time": "2024-03-03T12:36:25+00:00" + }, + { + "name": "zircote/swagger-php", + "version": "4.9.2", + "source": { + "type": "git", + "url": "https://github.com/zircote/swagger-php.git", + "reference": "256d42cb07ba1c2206d66bc7516ee3d3e3e9f0b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zircote/swagger-php/zipball/256d42cb07ba1c2206d66bc7516ee3d3e3e9f0b2", + "reference": "256d42cb07ba1c2206d66bc7516ee3d3e3e9f0b2", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": ">=7.2", + "psr/log": "^1.1 || ^2.0 || ^3.0", + "symfony/deprecation-contracts": "^2 || ^3", + "symfony/finder": ">=2.2", + "symfony/yaml": ">=3.3" + }, + "require-dev": { + "composer/package-versions-deprecated": "^1.11", + "doctrine/annotations": "^1.7 || ^2.0", + "friendsofphp/php-cs-fixer": "^2.17 || ^3.47.1", + "phpstan/phpstan": "^1.6", + "phpunit/phpunit": ">=8", + "vimeo/psalm": "^4.23" + }, + "suggest": { + "doctrine/annotations": "^1.7 || ^2.0" + }, + "bin": [ + "bin/openapi" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, + "autoload": { + "psr-4": { + "OpenApi\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Robert Allen", + "email": "zircote@gmail.com" + }, + { + "name": "Bob Fanger", + "email": "bfanger@gmail.com", + "homepage": "https://bfanger.nl" + }, + { + "name": "Martin Rademacher", + "email": "mano@radebatz.net", + "homepage": "https://radebatz.net" + } + ], + "description": "swagger-php - Generate interactive documentation for your RESTful API using phpdoc annotations", + "homepage": "https://github.com/zircote/swagger-php/", + "keywords": [ + "api", + "json", + "rest", + "service discovery" + ], + "support": { + "issues": "https://github.com/zircote/swagger-php/issues", + "source": "https://github.com/zircote/swagger-php/tree/4.9.2" + }, + "time": "2024-05-02T21:36:00+00:00" } ], "aliases": [], @@ -7708,7 +7827,9 @@ "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, - "platform": [], + "platform": { + "php": "^7.3 || ^8.0" + }, "platform-dev": [], "plugin-api-version": "2.6.0" } diff --git a/config/0.main.php b/config/0.main.php index 950fa9a9c0..36f3df93fc 100644 --- a/config/0.main.php +++ b/config/0.main.php @@ -1,6 +1,5 @@ 0 THEN - current_week := CEIL(extract(day from next_date) / 7); - ELSE - current_week := -CEIL((1 + days_in_month(next_date) - extract(day from next_date)) / 7); - END IF; - next_date := next_date + (repeat_week - current_week) * '7 days'::interval; - END IF; - EXIT WHEN next_date > range_end; - - IF next_date >= range_start AND next_date >= original_start_date THEN - RETURN NEXT next_date; - END IF; - - if original_end_date IS NOT NULL AND range_start >= original_start_date + (duration*intervals) AND range_start <= original_end_date + (duration*intervals) THEN - RETURN NEXT next_date; - END IF; - intervals := intervals + 1; - END LOOP; -END; + AS $$ +DECLARE + start_date DATE := original_start_date; + next_date DATE; + intervals INT := FLOOR(intervals_between(original_start_date, range_start, duration)); + current_month INT; + current_week INT; +BEGIN + IF repeat_month IS NOT NULL THEN + start_date := start_date + (((12 + repeat_month - cast(extract(month from start_date) as int)) % 12) || ' months')::interval; + END IF; + IF repeat_week IS NULL AND repeat_day IS NOT NULL THEN + IF duration = '7 days'::interval THEN + start_date := start_date + (((7 + repeat_day - cast(extract(dow from start_date) as int)) % 7) || ' days')::interval; + ELSE + start_date := start_date + (repeat_day - extract(day from start_date) || ' days')::interval; + END IF; + END IF; + LOOP + next_date := start_date + duration * intervals; + IF repeat_week IS NOT NULL AND repeat_day IS NOT NULL THEN + current_month := extract(month from next_date); + next_date := next_date + (((7 + repeat_day - cast(extract(dow from next_date) as int)) % 7) || ' days')::interval; + IF extract(month from next_date) != current_month THEN + next_date := next_date - '7 days'::interval; + END IF; + IF repeat_week > 0 THEN + current_week := CEIL(extract(day from next_date) / 7); + ELSE + current_week := -CEIL((1 + days_in_month(next_date) - extract(day from next_date)) / 7); + END IF; + next_date := next_date + (repeat_week - current_week) * '7 days'::interval; + END IF; + EXIT WHEN next_date > range_end; + + IF next_date >= range_start AND next_date >= original_start_date THEN + RETURN NEXT next_date; + END IF; + + if original_end_date IS NOT NULL AND range_start >= original_start_date + (duration*intervals) AND range_start <= original_end_date + (duration*intervals) THEN + RETURN NEXT next_date; + END IF; + intervals := intervals + 1; + END LOOP; +END; $$; @@ -278,20 +358,20 @@ ALTER FUNCTION public.generate_recurrences(duration interval, original_start_dat CREATE FUNCTION public.interval_for(recurs public.frequency) RETURNS interval LANGUAGE plpgsql IMMUTABLE - AS $$ -BEGIN - IF recurs = 'daily' THEN - RETURN '1 day'::interval; - ELSIF recurs = 'weekly' THEN - RETURN '7 days'::interval; - ELSIF recurs = 'monthly' THEN - RETURN '1 month'::interval; - ELSIF recurs = 'yearly' THEN - RETURN '1 year'::interval; - ELSE - RAISE EXCEPTION 'Recurrence % not supported by generate_recurrences()', recurs; - END IF; -END; + AS $$ +BEGIN + IF recurs = 'daily' THEN + RETURN '1 day'::interval; + ELSIF recurs = 'weekly' THEN + RETURN '7 days'::interval; + ELSIF recurs = 'monthly' THEN + RETURN '1 month'::interval; + ELSIF recurs = 'yearly' THEN + RETURN '1 year'::interval; + ELSE + RAISE EXCEPTION 'Recurrence % not supported by generate_recurrences()', recurs; + END IF; +END; $$; @@ -303,24 +383,24 @@ ALTER FUNCTION public.interval_for(recurs public.frequency) OWNER TO mapas; CREATE FUNCTION public.intervals_between(start_date date, end_date date, duration interval) RETURNS double precision LANGUAGE plpgsql IMMUTABLE - AS $$ -DECLARE - count FLOAT := 0; - multiplier INT := 512; -BEGIN - IF start_date > end_date THEN - RETURN 0; - END IF; - LOOP - WHILE start_date + (count + multiplier) * duration < end_date LOOP - count := count + multiplier; - END LOOP; - EXIT WHEN multiplier = 1; - multiplier := multiplier / 2; - END LOOP; - count := count + (extract(epoch from end_date) - extract(epoch from (start_date + count * duration))) / (extract(epoch from end_date + duration) - extract(epoch from end_date))::int; - RETURN count; -END + AS $$ +DECLARE + count FLOAT := 0; + multiplier INT := 512; +BEGIN + IF start_date > end_date THEN + RETURN 0; + END IF; + LOOP + WHILE start_date + (count + multiplier) * duration < end_date LOOP + count := count + multiplier; + END LOOP; + EXIT WHEN multiplier = 1; + multiplier := multiplier / 2; + END LOOP; + count := count + (extract(epoch from end_date) - extract(epoch from (start_date + count * duration))) / (extract(epoch from end_date + duration) - extract(epoch from end_date))::int; + RETURN count; +END $$; @@ -332,27 +412,27 @@ ALTER FUNCTION public.intervals_between(start_date date, end_date date, duration CREATE FUNCTION public.pseudo_random_id_generator() RETURNS integer LANGUAGE plpgsql IMMUTABLE STRICT - AS $$ - DECLARE - l1 int; - l2 int; - r1 int; - r2 int; - VALUE int; - i int:=0; - BEGIN - VALUE:= nextval('pseudo_random_id_seq'); - l1:= (VALUE >> 16) & 65535; - r1:= VALUE & 65535; - WHILE i < 3 LOOP - l2 := r1; - r2 := l1 # ((((1366 * r1 + 150889) % 714025) / 714025.0) * 32767)::int; - l1 := l2; - r1 := r2; - i := i + 1; - END LOOP; - RETURN ((r1 << 16) + l1); - END; + AS $$ + DECLARE + l1 int; + l2 int; + r1 int; + r2 int; + VALUE int; + i int:=0; + BEGIN + VALUE:= nextval('pseudo_random_id_seq'); + l1:= (VALUE >> 16) & 65535; + r1:= VALUE & 65535; + WHILE i < 3 LOOP + l2 := r1; + r2 := l1 # ((((1366 * r1 + 150889) % 714025) / 714025.0) * 32767)::int; + l1 := l2; + r1 := r2; + i := i + 1; + END LOOP; + RETURN ((r1 << 16) + l1); + END; $$; @@ -364,26 +444,26 @@ ALTER FUNCTION public.pseudo_random_id_generator() OWNER TO mapas; CREATE FUNCTION public.random_id_generator(table_name character varying, initial_range bigint) RETURNS bigint LANGUAGE plpgsql - AS $$DECLARE - rand_int INTEGER; - count INTEGER := 1; - statement TEXT; - BEGIN - WHILE count > 0 LOOP - initial_range := initial_range * 10; - - rand_int := (RANDOM() * initial_range)::BIGINT + initial_range / 10; - - statement := CONCAT('SELECT count(id) FROM ', table_name, ' WHERE id = ', rand_int); - - EXECUTE statement; - IF NOT FOUND THEN - count := 0; - END IF; - - END LOOP; - RETURN rand_int; - END; + AS $$DECLARE + rand_int INTEGER; + count INTEGER := 1; + statement TEXT; + BEGIN + WHILE count > 0 LOOP + initial_range := initial_range * 10; + + rand_int := (RANDOM() * initial_range)::BIGINT + initial_range / 10; + + statement := CONCAT('SELECT count(id) FROM ', table_name, ' WHERE id = ', rand_int); + + EXECUTE statement; + IF NOT FOUND THEN + count := 0; + END IF; + + END LOOP; + RETURN rand_int; + END; $$; @@ -391,7 +471,7 @@ ALTER FUNCTION public.random_id_generator(table_name character varying, initial_ SET default_tablespace = ''; -SET default_with_oids = false; +SET default_table_access_method = heap; -- -- Name: event_occurrence; Type: TABLE; Schema: public; Owner: mapas @@ -412,6 +492,9 @@ CREATE TABLE public.event_occurrence ( until date, timezone_name text DEFAULT 'Etc/UTC'::text NOT NULL, status integer DEFAULT 1 NOT NULL, + description text, + price text, + priceinfo text, CONSTRAINT positive_separation CHECK ((separation > 0)) ); @@ -424,45 +507,45 @@ ALTER TABLE public.event_occurrence OWNER TO mapas; CREATE FUNCTION public.recurrences_for(event public.event_occurrence, range_start timestamp without time zone, range_end timestamp without time zone) RETURNS SETOF date LANGUAGE plpgsql STABLE - AS $$ -DECLARE - recurrence event_occurrence_recurrence; - recurrences_start DATE := COALESCE(event.starts_at::date, event.starts_on); - recurrences_end DATE := range_end; - duration INTERVAL := interval_for(event.frequency) * event.separation; - next_date DATE; -BEGIN - IF event.until IS NOT NULL AND event.until < recurrences_end THEN - recurrences_end := event.until; - END IF; - IF event.count IS NOT NULL AND recurrences_start + (event.count - 1) * duration < recurrences_end THEN - recurrences_end := recurrences_start + (event.count - 1) * duration; - END IF; - - FOR recurrence IN - SELECT event_occurrence_recurrence.* - FROM (SELECT NULL) AS foo - LEFT JOIN event_occurrence_recurrence - ON event_occurrence_id = event.id - LOOP - FOR next_date IN - SELECT * - FROM generate_recurrences( - duration, - recurrences_start, - COALESCE(event.ends_at::date, event.ends_on), - range_start::date, - recurrences_end, - recurrence.month, - recurrence.week, - recurrence.day - ) - LOOP - RETURN NEXT next_date; - END LOOP; - END LOOP; - RETURN; -END; + AS $$ +DECLARE + recurrence event_occurrence_recurrence; + recurrences_start DATE := COALESCE(event.starts_at::date, event.starts_on); + recurrences_end DATE := range_end; + duration INTERVAL := interval_for(event.frequency) * event.separation; + next_date DATE; +BEGIN + IF event.until IS NOT NULL AND event.until < recurrences_end THEN + recurrences_end := event.until; + END IF; + IF event.count IS NOT NULL AND recurrences_start + (event.count - 1) * duration < recurrences_end THEN + recurrences_end := recurrences_start + (event.count - 1) * duration; + END IF; + + FOR recurrence IN + SELECT event_occurrence_recurrence.* + FROM (SELECT NULL) AS foo + LEFT JOIN event_occurrence_recurrence + ON event_occurrence_id = event.id + LOOP + FOR next_date IN + SELECT * + FROM generate_recurrences( + duration, + recurrences_start, + COALESCE(event.ends_at::date, event.ends_on), + range_start::date, + recurrences_end, + recurrence.month, + recurrence.week, + recurrence.day + ) + LOOP + RETURN NEXT next_date; + END LOOP; + END LOOP; + RETURN; +END; $$; @@ -474,124 +557,124 @@ ALTER FUNCTION public.recurrences_for(event public.event_occurrence, range_start CREATE FUNCTION public.recurring_event_occurrence_for(range_start timestamp without time zone, range_end timestamp without time zone, time_zone character varying, event_occurrence_limit integer) RETURNS SETOF public.event_occurrence LANGUAGE plpgsql STABLE - AS $$ - DECLARE - event event_occurrence; - original_date DATE; - original_date_in_zone DATE; - start_time TIME; - start_time_in_zone TIME; - next_date DATE; - next_time_in_zone TIME; - duration INTERVAL; - time_offset INTERVAL; - r_start DATE := (timezone('UTC', range_start) AT TIME ZONE time_zone)::DATE; - r_end DATE := (timezone('UTC', range_end) AT TIME ZONE time_zone)::DATE; - - recurrences_start DATE := CASE WHEN r_start < range_start THEN r_start ELSE range_start END; - recurrences_end DATE := CASE WHEN r_end > range_end THEN r_end ELSE range_end END; - - inc_interval INTERVAL := '2 hours'::INTERVAL; - - ext_start TIMESTAMP := range_start::TIMESTAMP - inc_interval; - ext_end TIMESTAMP := range_end::TIMESTAMP + inc_interval; - BEGIN - FOR event IN - SELECT * - FROM event_occurrence - WHERE - status > 0 - AND - ( - (frequency = 'once' AND - ((starts_on IS NOT NULL AND ends_on IS NOT NULL AND starts_on <= r_end AND ends_on >= r_start) OR - (starts_on IS NOT NULL AND starts_on <= r_end AND starts_on >= r_start) OR - (starts_at <= range_end AND ends_at >= range_start))) - - OR - - ( - frequency <> 'once' AND - ( - ( starts_on IS NOT NULL AND starts_on <= ext_end ) OR - ( starts_at IS NOT NULL AND starts_at <= ext_end ) - ) AND ( - (until IS NULL AND ends_at IS NULL AND ends_on IS NULL) OR - (until IS NOT NULL AND until >= ext_start) OR - (ends_on IS NOT NULL AND ends_on >= ext_start) OR - (ends_at IS NOT NULL AND ends_at >= ext_start) - ) - ) - ) - - LOOP - IF event.frequency = 'once' THEN - RETURN NEXT event; - CONTINUE; - END IF; - - -- All-day event - IF event.starts_on IS NOT NULL AND event.ends_on IS NULL THEN - original_date := event.starts_on; - duration := '1 day'::interval; - -- Multi-day event - ELSIF event.starts_on IS NOT NULL AND event.ends_on IS NOT NULL THEN - original_date := event.starts_on; - duration := timezone(time_zone, event.ends_on) - timezone(time_zone, event.starts_on); - -- Timespan event - ELSE - original_date := event.starts_at::date; - original_date_in_zone := (timezone('UTC', event.starts_at) AT TIME ZONE event.timezone_name)::date; - start_time := event.starts_at::time; - start_time_in_zone := (timezone('UTC', event.starts_at) AT time ZONE event.timezone_name)::time; - duration := event.ends_at - event.starts_at; - END IF; - - IF event.count IS NOT NULL THEN - recurrences_start := original_date; - END IF; - - FOR next_date IN - SELECT occurrence - FROM ( - SELECT * FROM recurrences_for(event, recurrences_start, recurrences_end) AS occurrence - UNION SELECT original_date - LIMIT event.count - ) AS occurrences - WHERE - occurrence::date <= recurrences_end AND - (occurrence + duration)::date >= recurrences_start AND - occurrence NOT IN (SELECT date FROM event_occurrence_cancellation WHERE event_occurrence_id = event.id) - LIMIT event_occurrence_limit - LOOP - -- All-day event - IF event.starts_on IS NOT NULL AND event.ends_on IS NULL THEN - CONTINUE WHEN next_date < r_start OR next_date > r_end; - event.starts_on := next_date; - - -- Multi-day event - ELSIF event.starts_on IS NOT NULL AND event.ends_on IS NOT NULL THEN - event.starts_on := next_date; - CONTINUE WHEN event.starts_on > r_end; - event.ends_on := next_date + duration; - CONTINUE WHEN event.ends_on < r_start; - - -- Timespan event - ELSE - next_time_in_zone := (timezone('UTC', (next_date + start_time)) at time zone event.timezone_name)::time; - time_offset := (original_date_in_zone + next_time_in_zone) - (original_date_in_zone + start_time_in_zone); - event.starts_at := next_date + start_time - time_offset; - - CONTINUE WHEN event.starts_at > range_end; - event.ends_at := event.starts_at + duration; - CONTINUE WHEN event.ends_at < range_start; - END IF; - - RETURN NEXT event; - END LOOP; - END LOOP; - RETURN; - END; + AS $$ + DECLARE + event event_occurrence; + original_date DATE; + original_date_in_zone DATE; + start_time TIME; + start_time_in_zone TIME; + next_date DATE; + next_time_in_zone TIME; + duration INTERVAL; + time_offset INTERVAL; + r_start DATE := (timezone('UTC', range_start) AT TIME ZONE time_zone)::DATE; + r_end DATE := (timezone('UTC', range_end) AT TIME ZONE time_zone)::DATE; + + recurrences_start DATE := CASE WHEN r_start < range_start THEN r_start ELSE range_start END; + recurrences_end DATE := CASE WHEN r_end > range_end THEN r_end ELSE range_end END; + + inc_interval INTERVAL := '2 hours'::INTERVAL; + + ext_start TIMESTAMP := range_start::TIMESTAMP - inc_interval; + ext_end TIMESTAMP := range_end::TIMESTAMP + inc_interval; + BEGIN + FOR event IN + SELECT * + FROM event_occurrence + WHERE + status > 0 + AND + ( + (frequency = 'once' AND + ((starts_on IS NOT NULL AND ends_on IS NOT NULL AND starts_on <= r_end AND ends_on >= r_start) OR + (starts_on IS NOT NULL AND starts_on <= r_end AND starts_on >= r_start) OR + (starts_at <= range_end AND ends_at >= range_start))) + + OR + + ( + frequency <> 'once' AND + ( + ( starts_on IS NOT NULL AND starts_on <= ext_end ) OR + ( starts_at IS NOT NULL AND starts_at <= ext_end ) + ) AND ( + (until IS NULL AND ends_at IS NULL AND ends_on IS NULL) OR + (until IS NOT NULL AND until >= ext_start) OR + (ends_on IS NOT NULL AND ends_on >= ext_start) OR + (ends_at IS NOT NULL AND ends_at >= ext_start) + ) + ) + ) + + LOOP + IF event.frequency = 'once' THEN + RETURN NEXT event; + CONTINUE; + END IF; + + -- All-day event + IF event.starts_on IS NOT NULL AND event.ends_on IS NULL THEN + original_date := event.starts_on; + duration := '1 day'::interval; + -- Multi-day event + ELSIF event.starts_on IS NOT NULL AND event.ends_on IS NOT NULL THEN + original_date := event.starts_on; + duration := timezone(time_zone, event.ends_on) - timezone(time_zone, event.starts_on); + -- Timespan event + ELSE + original_date := event.starts_at::date; + original_date_in_zone := (timezone('UTC', event.starts_at) AT TIME ZONE event.timezone_name)::date; + start_time := event.starts_at::time; + start_time_in_zone := (timezone('UTC', event.starts_at) AT time ZONE event.timezone_name)::time; + duration := event.ends_at - event.starts_at; + END IF; + + IF event.count IS NOT NULL THEN + recurrences_start := original_date; + END IF; + + FOR next_date IN + SELECT occurrence + FROM ( + SELECT * FROM recurrences_for(event, recurrences_start, recurrences_end) AS occurrence + UNION SELECT original_date + LIMIT event.count + ) AS occurrences + WHERE + occurrence::date <= recurrences_end AND + (occurrence + duration)::date >= recurrences_start AND + occurrence NOT IN (SELECT date FROM event_occurrence_cancellation WHERE event_occurrence_id = event.id) + LIMIT event_occurrence_limit + LOOP + -- All-day event + IF event.starts_on IS NOT NULL AND event.ends_on IS NULL THEN + CONTINUE WHEN next_date < r_start OR next_date > r_end; + event.starts_on := next_date; + + -- Multi-day event + ELSIF event.starts_on IS NOT NULL AND event.ends_on IS NOT NULL THEN + event.starts_on := next_date; + CONTINUE WHEN event.starts_on > r_end; + event.ends_on := next_date + duration; + CONTINUE WHEN event.ends_on < r_start; + + -- Timespan event + ELSE + next_time_in_zone := (timezone('UTC', (next_date + start_time)) at time zone event.timezone_name)::time; + time_offset := (original_date_in_zone + next_time_in_zone) - (original_date_in_zone + start_time_in_zone); + event.starts_at := next_date + start_time - time_offset; + + CONTINUE WHEN event.starts_at > range_end; + event.ends_at := event.starts_at + duration; + CONTINUE WHEN event.ends_at < range_start; + END IF; + + RETURN NEXT event; + END LOOP; + END LOOP; + RETURN; + END; $$; @@ -798,7 +881,8 @@ CREATE TABLE public.agent_relation ( type character varying(64), has_control boolean DEFAULT false NOT NULL, create_timestamp timestamp without time zone, - status smallint + status smallint, + metadata json ); @@ -825,6 +909,76 @@ ALTER TABLE public.agent_relation_id_seq OWNER TO mapas; ALTER SEQUENCE public.agent_relation_id_seq OWNED BY public.agent_relation.id; +-- +-- Name: chat_message; Type: TABLE; Schema: public; Owner: mapas +-- + +CREATE TABLE public.chat_message ( + id integer NOT NULL, + chat_thread_id integer NOT NULL, + parent_id integer, + user_id integer NOT NULL, + payload text NOT NULL, + create_timestamp timestamp(0) without time zone NOT NULL +); + + +ALTER TABLE public.chat_message OWNER TO mapas; + +-- +-- Name: chat_message_id_seq; Type: SEQUENCE; Schema: public; Owner: mapas +-- + +CREATE SEQUENCE public.chat_message_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER TABLE public.chat_message_id_seq OWNER TO mapas; + +-- +-- Name: chat_thread; Type: TABLE; Schema: public; Owner: mapas +-- + +CREATE TABLE public.chat_thread ( + id integer NOT NULL, + object_id integer NOT NULL, + object_type character varying(255) NOT NULL, + type character varying(255) NOT NULL, + identifier character varying(255) NOT NULL, + description text, + create_timestamp timestamp(0) without time zone NOT NULL, + last_message_timestamp timestamp(0) without time zone DEFAULT NULL::timestamp without time zone, + status integer NOT NULL +); + + +ALTER TABLE public.chat_thread OWNER TO mapas; + +-- +-- Name: COLUMN chat_thread.object_type; Type: COMMENT; Schema: public; Owner: mapas +-- + +COMMENT ON COLUMN public.chat_thread.object_type IS '(DC2Type:object_type)'; + + +-- +-- Name: chat_thread_id_seq; Type: SEQUENCE; Schema: public; Owner: mapas +-- + +CREATE SEQUENCE public.chat_thread_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER TABLE public.chat_thread_id_seq OWNER TO mapas; + -- -- Name: db_update; Type: TABLE; Schema: public; Owner: mapas -- @@ -901,7 +1055,10 @@ ALTER TABLE public.entity_revision_revision_data OWNER TO mapas; CREATE TABLE public.evaluation_method_configuration ( id integer NOT NULL, opportunity_id integer NOT NULL, - type character varying(255) NOT NULL + type character varying(255) NOT NULL, + evaluation_from timestamp without time zone, + evaluation_to timestamp without time zone, + name character varying(255) DEFAULT NULL::character varying ); @@ -1003,7 +1160,11 @@ CREATE TABLE public.registration ( consolidated_result character varying(255) DEFAULT NULL::character varying, number character varying(24), valuers_exceptions_list text DEFAULT '{"include": [], "exclude": []}'::text NOT NULL, - space_data text + space_data text, + proponent_type character varying(255), + range character varying(255), + score double precision, + eligible boolean ); @@ -1019,7 +1180,9 @@ CREATE TABLE public.registration_evaluation ( user_id integer NOT NULL, result character varying(255) DEFAULT NULL::character varying, evaluation_data text NOT NULL, - status smallint + status smallint, + create_timestamp timestamp without time zone DEFAULT now() NOT NULL, + update_timestamp timestamp without time zone ); @@ -1070,6 +1233,7 @@ COMMENT ON COLUMN public.usr.auth_provider IS '1=openid'; CREATE VIEW public.evaluations AS SELECT evaluations_view.registration_id, + evaluations_view.registration_sent_timestamp, evaluations_view.registration_number, evaluations_view.registration_category, evaluations_view.registration_agent_id, @@ -1080,6 +1244,7 @@ CREATE VIEW public.evaluations AS max((evaluations_view.evaluation_result)::text) AS evaluation_result, max(evaluations_view.evaluation_status) AS evaluation_status FROM ( SELECT r.id AS registration_id, + r.sent_timestamp AS registration_sent_timestamp, r.number AS registration_number, r.category AS registration_category, r.agent_id AS registration_agent_id, @@ -1095,6 +1260,7 @@ CREATE VIEW public.evaluations AS WHERE (r.status > 0) UNION SELECT r2.id AS registration_id, + r2.sent_timestamp AS registration_sent_timestamp, r2.number AS registration_number, r2.category AS registration_category, r2.agent_id AS registration_agent_id, @@ -1104,15 +1270,12 @@ CREATE VIEW public.evaluations AS NULL::integer AS evaluation_id, NULL::character varying AS evaluation_result, NULL::smallint AS evaluation_status - FROM ((public.registration r2 - JOIN public.pcache p2 ON ((r2.id = p2.object_id))) + FROM (((public.registration r2 + JOIN public.pcache p2 ON (((p2.object_id = r2.id) AND (p2.object_type = 'MapasCulturais\Entities\Registration'::public.object_type) AND (p2.action = 'evaluateOnTime'::public.permission_action)))) JOIN public.usr u2 ON ((u2.id = p2.user_id))) - WHERE ((p2.object_type = 'MapasCulturais\Entities\Registration'::public.object_type) AND (p2.action = 'evaluate'::public.permission_action) AND (r2.status > 0) AND (p2.user_id IN ( SELECT agent.user_id - FROM public.agent - WHERE (agent.id IN ( SELECT agent_relation.agent_id - FROM public.agent_relation - WHERE ((agent_relation.object_type = 'MapasCulturais\Entities\EvaluationMethodConfiguration'::public.object_type) AND (agent_relation.object_id = r2.opportunity_id)))))))) evaluations_view - GROUP BY evaluations_view.registration_id, evaluations_view.registration_number, evaluations_view.registration_category, evaluations_view.registration_agent_id, evaluations_view.valuer_user_id, evaluations_view.valuer_agent_id, evaluations_view.opportunity_id; + JOIN public.evaluation_method_configuration emc ON ((emc.opportunity_id = r2.opportunity_id))) + WHERE (r2.status > 0)) evaluations_view + GROUP BY evaluations_view.registration_id, evaluations_view.registration_sent_timestamp, evaluations_view.registration_number, evaluations_view.registration_category, evaluations_view.registration_agent_id, evaluations_view.valuer_user_id, evaluations_view.valuer_agent_id, evaluations_view.opportunity_id; ALTER TABLE public.evaluations OWNER TO mapas; @@ -1348,7 +1511,7 @@ CREATE TABLE public.file ( object_id integer NOT NULL, create_timestamp timestamp without time zone DEFAULT now() NOT NULL, grp character varying(32) NOT NULL, - description character varying(255), + description text, parent_id integer, path character varying(1024) DEFAULT NULL::character varying, private boolean DEFAULT false NOT NULL @@ -1390,6 +1553,33 @@ CREATE TABLE public.geo_division ( ALTER TABLE public.geo_division OWNER TO mapas; +-- +-- Name: job; Type: TABLE; Schema: public; Owner: mapas +-- + +CREATE TABLE public.job ( + id character varying(255) NOT NULL, + name character varying(32) NOT NULL, + iterations integer NOT NULL, + iterations_count integer NOT NULL, + interval_string character varying(255) NOT NULL, + create_timestamp timestamp(0) without time zone NOT NULL, + next_execution_timestamp timestamp(0) without time zone NOT NULL, + last_execution_timestamp timestamp(0) without time zone DEFAULT NULL::timestamp without time zone, + metadata json NOT NULL, + status smallint NOT NULL +); + + +ALTER TABLE public.job OWNER TO mapas; + +-- +-- Name: COLUMN job.metadata; Type: COMMENT; Schema: public; Owner: mapas +-- + +COMMENT ON COLUMN public.job.metadata IS '(DC2Type:json)'; + + -- -- Name: metadata; Type: TABLE; Schema: public; Owner: mapas -- @@ -1429,7 +1619,7 @@ CREATE TABLE public.metalist ( grp character varying(32) NOT NULL, title character varying(255) NOT NULL, description text, - value character varying(2048) NOT NULL, + value text NOT NULL, create_timestamp timestamp without time zone DEFAULT now() NOT NULL, "order" smallint ); @@ -1546,7 +1736,12 @@ CREATE TABLE public.opportunity ( status smallint NOT NULL, subsite_id integer, object_type character varying(255) NOT NULL, - object_id integer NOT NULL + object_id integer NOT NULL, + avaliable_evaluation_fields json, + publish_timestamp timestamp without time zone, + auto_publish boolean DEFAULT false NOT NULL, + registration_proponent_types json, + registration_ranges json ); @@ -1588,7 +1783,8 @@ CREATE TABLE public.permission_cache_pending ( id integer NOT NULL, object_id integer NOT NULL, object_type character varying(255) NOT NULL, - status smallint DEFAULT 0 + status smallint DEFAULT 0, + usr_id integer ); @@ -1639,8 +1835,8 @@ CREATE TABLE public.project ( is_verified boolean DEFAULT false NOT NULL, type smallint NOT NULL, parent_id integer, - registration_from timestamp without time zone, - registration_to timestamp without time zone, + starts_on timestamp without time zone, + ends_on timestamp without time zone, update_timestamp timestamp(0) without time zone, subsite_id integer ); @@ -1783,7 +1979,12 @@ CREATE TABLE public.registration_field_configuration ( field_options text NOT NULL, max_size text, display_order smallint DEFAULT 255, - config text + config text, + conditional boolean, + conditional_field character varying(255), + conditional_value character varying(255), + registration_ranges json, + proponent_types json ); @@ -1821,7 +2022,12 @@ CREATE TABLE public.registration_file_configuration ( description text, required boolean NOT NULL, categories text, - display_order smallint DEFAULT 255 + display_order smallint DEFAULT 255, + conditional boolean, + conditional_field character varying(255), + conditional_value character varying(255), + registration_ranges json, + proponent_types json ); @@ -2004,7 +2210,8 @@ CREATE TABLE public.seal ( status smallint NOT NULL, certificate_text text, update_timestamp timestamp(0) without time zone, - subsite_id integer + subsite_id integer, + locked_fields json DEFAULT '[]'::json ); @@ -2265,6 +2472,45 @@ CREATE SEQUENCE public.subsite_meta_id_seq ALTER TABLE public.subsite_meta_id_seq OWNER TO mapas; +-- +-- Name: system_role; Type: TABLE; Schema: public; Owner: mapas +-- + +CREATE TABLE public.system_role ( + id integer NOT NULL, + slug character varying(64) NOT NULL, + name character varying(255) NOT NULL, + subsite_context boolean NOT NULL, + permissions json, + create_timestamp timestamp(0) without time zone NOT NULL, + update_timestamp timestamp(0) without time zone DEFAULT NULL::timestamp without time zone, + status smallint NOT NULL +); + + +ALTER TABLE public.system_role OWNER TO mapas; + +-- +-- Name: COLUMN system_role.permissions; Type: COMMENT; Schema: public; Owner: mapas +-- + +COMMENT ON COLUMN public.system_role.permissions IS '(DC2Type:json)'; + + +-- +-- Name: system_role_id_seq; Type: SEQUENCE; Schema: public; Owner: mapas +-- + +CREATE SEQUENCE public.system_role_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER TABLE public.system_role_id_seq OWNER TO mapas; + -- -- Name: term; Type: TABLE; Schema: public; Owner: mapas -- @@ -2515,6 +2761,9 @@ COPY public._municipios (gid, id, cd_geocodm, nm_municip, geom) FROM stdin; COPY public.agent (id, parent_id, user_id, type, name, location, _geo_location, short_description, long_description, create_timestamp, status, is_verified, public_location, update_timestamp, subsite_id) FROM stdin; 1 \N 1 1 Admin@local \N \N \N \N 2019-03-07 00:00:00 1 f \N 2019-03-07 00:00:00 \N +2 \N 2 1 lucas (0,0) \N \N \N 2024-04-10 13:22:34 1 f f 2024-04-10 13:22:34 \N +3 \N 3 1 lucas (0,0) \N \N \N 2024-04-10 13:22:37 1 f f 2024-04-10 13:22:37 \N +4 \N 4 1 lucas (0,0) \N \N \N 2024-04-10 14:43:59 1 f f 2024-04-10 14:43:59 \N \. @@ -2530,7 +2779,23 @@ COPY public.agent_meta (object_id, key, value, id) FROM stdin; -- Data for Name: agent_relation; Type: TABLE DATA; Schema: public; Owner: mapas -- -COPY public.agent_relation (id, agent_id, object_type, object_id, type, has_control, create_timestamp, status) FROM stdin; +COPY public.agent_relation (id, agent_id, object_type, object_id, type, has_control, create_timestamp, status, metadata) FROM stdin; +\. + + +-- +-- Data for Name: chat_message; Type: TABLE DATA; Schema: public; Owner: mapas +-- + +COPY public.chat_message (id, chat_thread_id, parent_id, user_id, payload, create_timestamp) FROM stdin; +\. + + +-- +-- Data for Name: chat_thread; Type: TABLE DATA; Schema: public; Owner: mapas +-- + +COPY public.chat_thread (id, object_id, object_type, type, identifier, description, create_timestamp, last_message_timestamp, status) FROM stdin; \. @@ -2620,6 +2885,59 @@ alter tables to use enum types 2021-02-04 13:50:37.698794 alter table permission_cache_pending add column status 2021-02-04 13:50:37.698794 CREATE VIEW evaluation 2021-02-04 13:50:37.698794 valuer disabling refactor 2021-02-04 13:50:37.698794 +remove orphan events again 2024-04-10 02:34:31.099147 +fix subsite verifiedSeals array 2024-04-10 02:34:31.099147 +RECREATE VIEW evaluations AGAIN!!!!! 2024-04-10 02:34:31.099147 +adiciona oportunidades na fila de reprocessamento de cache 2024-04-10 02:34:31.099147 +adiciona novos indices a tabela agent_relation 2024-04-10 02:34:31.099147 +ALTER TABLE metalist ALTER value TYPE TEXT 2024-04-10 02:34:31.099147 +Add metadata to Agent Relation 2024-04-10 02:34:31.099147 +add timestamp columns to registration_evaluation 2024-04-10 02:34:31.099147 +create chat tables 2024-04-10 02:34:31.099147 +create table job 2024-04-10 02:34:31.099147 +alter job.metadata comment 2024-04-10 02:34:31.099147 +clean existing orphans 2024-04-10 02:34:31.099147 +add triggers for orphan cleanup 2024-04-10 02:34:31.099147 +Remove lixo angular registration_meta 2024-04-10 02:34:31.099147 +Adiciona coluna avaliableEvaluationFields na tabela opportunity 2024-04-10 02:34:31.099147 +Adiciona coluna publish_timestamp na tabela opportunity 2024-04-10 02:34:31.099147 +Adiciona coluna auto_publish na tabela opportunity 2024-04-10 02:34:31.099147 +Adiciona coluna evaluation_from e evaluation_to na tabela evaluation_method_configuration 2024-04-10 02:34:31.099147 +adiciona coluna name na tabela evaluation_method_configuration 2024-04-10 02:34:31.099147 +popula as colunas name, evaluation_from e evaluation_to da tabela evaluation_method_configuration 2024-04-10 02:34:31.099147 +cria funções para o cast automático de ponto para varchar 2024-04-10 02:34:31.099147 +Renomeia colunas registrationFrom e registrationTo da tabela de projetod 2024-04-10 02:34:31.099147 +Adiciona novas coluna na tabela registration_field_configuration 2024-04-10 02:34:31.099147 +Adiciona novas coluna na tabela registration_file_configuration 2024-04-10 02:34:31.099147 +alter seal add column locked_fields 2024-04-10 02:34:31.099147 +Consede permissão em todos os campo para todos os avaliadores da oportunidade 2024-04-10 02:34:31.099147 +corrige metadados criados por erro em inscricoes de fases 2024-04-10 02:34:31.099147 +Adiciona a coluna description para a descrição da ocorrência 2024-04-10 02:34:31.099147 +Adiciona a coluna price para a o valor de entrada da ocorrência 2024-04-10 02:34:31.099147 +Adiciona a coluna priceInfo para a informações sobre o valor de entrada da ocorrência 2024-04-10 02:34:31.099147 +Apaga registro do db-update de "Definição dos cammpos cpf e cnpj com base no documento" para que rode novamente 2024-04-10 02:34:31.099147 +Corrige config dos campos na entidade registration_fields_configurarion 2024-04-10 02:34:31.099147 +seta como vazio campo escolaridade do agent caso esteja com valor não informado 2024-04-10 02:34:31.099147 +altera tipo da coluna description na tabela file 2024-04-10 02:34:31.099147 +faz com que o updateTimestamp seja igual ao createTimestamp na criacão da entidade 2024-04-10 02:34:31.099147 +migra valores das colunas do tipo array para do tipo json 2024-04-10 02:34:31.099147 +corrige permissão de avaliadores que tem avaliação mas não possui permissão de avaliar pela regra configurada 2024-04-10 02:34:31.099147 +adiciona coluna user_id à tabela pending_permission_cache 2024-04-10 02:34:31.099147 +limpeza da tabela de pcache 2024-04-10 02:34:31.099147 +Cria colunas proponent_type e registration na tabela registration 2024-04-10 02:34:31.099147 +Cria colunas registration_proponent_types e registration_ranges na tabela opportunity 2024-04-10 02:34:31.099147 +Cria colunas registration_ranges e proponent_types na tabela registration_field_configuration 2024-04-10 02:34:31.099147 +Cria colunas registration_ranges e proponent_types na tabela registration_file_configuration 2024-04-10 02:34:31.099147 +trigger to update children and parent opportunities 2024-04-10 02:34:31.099147 +renomeia metadados da funcionalidade AffirmativePollices 2024-04-10 02:34:31.099147 +Cria colunas score e eligible na entidade Registration 2024-04-10 02:34:31.099147 +corrige os valores da distribuição de avaliação por categorias 2024-04-10 02:34:31.099147 +adiciona índices nas tabelas de revisões de entidades 2024-04-10 02:34:31.099147 +adiciona índice para a coluna action da tabela pcache 2024-04-10 02:34:31.099147 +update taxonomy slug funcao 2024-04-10 02:34:31.099147 +define metadado isDataCollection = 0 nas fases sem campos configurados 2024-04-10 02:34:31.099147 +create table system_role 2024-04-10 02:34:31.099147 +alter system_role.permissions comment 2024-04-10 02:34:31.099147 \. @@ -2629,6 +2947,12 @@ valuer disabling refactor 2021-02-04 13:50:37.698794 COPY public.entity_revision (id, user_id, object_id, object_type, create_timestamp, action, message) FROM stdin; 1 1 1 MapasCulturais\\Entities\\Agent 2019-03-07 00:00:00 created Registro criado. +2 2 2 MapasCulturais\\Entities\\Agent 2024-04-10 13:22:34 created Registro criado. +3 2 2 MapasCulturais\\Entities\\Agent 2024-04-10 13:22:35 modified Registro atualizado. +4 3 3 MapasCulturais\\Entities\\Agent 2024-04-10 13:22:37 created Registro criado. +5 3 3 MapasCulturais\\Entities\\Agent 2024-04-10 13:22:37 modified Registro atualizado. +6 4 4 MapasCulturais\\Entities\\Agent 2024-04-10 14:43:59 created Registro criado. +7 4 4 MapasCulturais\\Entities\\Agent 2024-04-10 14:44:00 modified Registro atualizado. \. @@ -2647,6 +2971,45 @@ COPY public.entity_revision_data (id, "timestamp", key, value) FROM stdin; 8 2019-03-07 23:54:19 status 1 9 2019-03-07 23:54:19 updateTimestamp {"date":"2019-03-07 00:00:00.000000","timezone_type":3,"timezone":"UTC"} 10 2019-03-07 23:54:19 _subsiteId null +11 2024-04-10 13:22:35 _type 1 +12 2024-04-10 13:22:35 name "lucas" +13 2024-04-10 13:22:35 publicLocation false +14 2024-04-10 13:22:35 location {"latitude":0,"longitude":0} +15 2024-04-10 13:22:35 shortDescription null +16 2024-04-10 13:22:35 longDescription null +17 2024-04-10 13:22:35 createTimestamp {"date":"2024-04-10 13:22:34.918621","timezone_type":3,"timezone":"UTC"} +18 2024-04-10 13:22:35 status 1 +19 2024-04-10 13:22:35 updateTimestamp {"date":"2024-04-10 13:22:34.918627","timezone_type":3,"timezone":"UTC"} +20 2024-04-10 13:22:35 _subsiteId null +21 2024-04-10 13:22:35 location {"latitude":"0","longitude":"0"} +22 2024-04-10 13:22:35 createTimestamp {"date":"2024-04-10 13:22:34.000000","timezone_type":3,"timezone":"UTC"} +23 2024-04-10 13:22:35 updateTimestamp {"date":"2024-04-10 13:22:34.000000","timezone_type":3,"timezone":"UTC"} +24 2024-04-10 13:22:37 _type 1 +25 2024-04-10 13:22:37 name "lucas" +26 2024-04-10 13:22:37 publicLocation false +27 2024-04-10 13:22:37 location {"latitude":0,"longitude":0} +28 2024-04-10 13:22:37 shortDescription null +29 2024-04-10 13:22:37 longDescription null +30 2024-04-10 13:22:37 createTimestamp {"date":"2024-04-10 13:22:37.295616","timezone_type":3,"timezone":"UTC"} +31 2024-04-10 13:22:37 status 1 +32 2024-04-10 13:22:37 updateTimestamp {"date":"2024-04-10 13:22:37.295620","timezone_type":3,"timezone":"UTC"} +33 2024-04-10 13:22:37 _subsiteId null +34 2024-04-10 13:22:37 location {"latitude":"0","longitude":"0"} +35 2024-04-10 13:22:37 createTimestamp {"date":"2024-04-10 13:22:37.000000","timezone_type":3,"timezone":"UTC"} +36 2024-04-10 13:22:37 updateTimestamp {"date":"2024-04-10 13:22:37.000000","timezone_type":3,"timezone":"UTC"} +37 2024-04-10 14:43:59 _type 1 +38 2024-04-10 14:43:59 name "lucas" +39 2024-04-10 14:43:59 publicLocation false +40 2024-04-10 14:43:59 location {"latitude":0,"longitude":0} +41 2024-04-10 14:43:59 shortDescription null +42 2024-04-10 14:43:59 longDescription null +43 2024-04-10 14:43:59 createTimestamp {"date":"2024-04-10 14:43:59.645130","timezone_type":3,"timezone":"UTC"} +44 2024-04-10 14:43:59 status 1 +45 2024-04-10 14:43:59 updateTimestamp {"date":"2024-04-10 14:43:59.645136","timezone_type":3,"timezone":"UTC"} +46 2024-04-10 14:43:59 _subsiteId null +47 2024-04-10 14:44:00 location {"latitude":"0","longitude":"0"} +48 2024-04-10 14:44:00 createTimestamp {"date":"2024-04-10 14:43:59.000000","timezone_type":3,"timezone":"UTC"} +49 2024-04-10 14:44:00 updateTimestamp {"date":"2024-04-10 14:43:59.000000","timezone_type":3,"timezone":"UTC"} \. @@ -2665,6 +3028,66 @@ COPY public.entity_revision_revision_data (revision_id, revision_data_id) FROM s 1 8 1 9 1 10 +2 11 +2 12 +2 13 +2 14 +2 15 +2 16 +2 17 +2 18 +2 19 +2 20 +3 11 +3 12 +3 13 +3 21 +3 15 +3 16 +3 22 +3 18 +3 23 +3 20 +4 24 +4 25 +4 26 +4 27 +4 28 +4 29 +4 30 +4 31 +4 32 +4 33 +5 24 +5 25 +5 26 +5 34 +5 28 +5 29 +5 35 +5 31 +5 36 +5 33 +6 37 +6 38 +6 39 +6 40 +6 41 +6 42 +6 43 +6 44 +6 45 +6 46 +7 37 +7 38 +7 39 +7 47 +7 41 +7 42 +7 48 +7 44 +7 49 +7 46 \. @@ -2672,7 +3095,7 @@ COPY public.entity_revision_revision_data (revision_id, revision_data_id) FROM s -- Data for Name: evaluation_method_configuration; Type: TABLE DATA; Schema: public; Owner: mapas -- -COPY public.evaluation_method_configuration (id, opportunity_id, type) FROM stdin; +COPY public.evaluation_method_configuration (id, opportunity_id, type, evaluation_from, evaluation_to, name) FROM stdin; \. @@ -2712,7 +3135,7 @@ COPY public.event_meta (key, object_id, value, id) FROM stdin; -- Data for Name: event_occurrence; Type: TABLE DATA; Schema: public; Owner: mapas -- -COPY public.event_occurrence (id, space_id, event_id, rule, starts_on, ends_on, starts_at, ends_at, frequency, separation, count, until, timezone_name, status) FROM stdin; +COPY public.event_occurrence (id, space_id, event_id, rule, starts_on, ends_on, starts_at, ends_at, frequency, separation, count, until, timezone_name, status, description, price, priceinfo) FROM stdin; \. @@ -2748,6 +3171,14 @@ COPY public.geo_division (id, parent_id, type, cod, name, geom) FROM stdin; \. +-- +-- Data for Name: job; Type: TABLE DATA; Schema: public; Owner: mapas +-- + +COPY public.job (id, name, iterations, iterations_count, interval_string, create_timestamp, next_execution_timestamp, last_execution_timestamp, metadata, status) FROM stdin; +\. + + -- -- Data for Name: metadata; Type: TABLE DATA; Schema: public; Owner: mapas -- @@ -2784,7 +3215,7 @@ COPY public.notification_meta (id, object_id, key, value) FROM stdin; -- Data for Name: opportunity; Type: TABLE DATA; Schema: public; Owner: mapas -- -COPY public.opportunity (id, parent_id, agent_id, type, name, short_description, long_description, registration_from, registration_to, published_registrations, registration_categories, create_timestamp, update_timestamp, status, subsite_id, object_type, object_id) FROM stdin; +COPY public.opportunity (id, parent_id, agent_id, type, name, short_description, long_description, registration_from, registration_to, published_registrations, registration_categories, create_timestamp, update_timestamp, status, subsite_id, object_type, object_id, avaliable_evaluation_fields, publish_timestamp, auto_publish, registration_proponent_types, registration_ranges) FROM stdin; \. @@ -2801,6 +3232,110 @@ COPY public.opportunity_meta (id, object_id, key, value) FROM stdin; -- COPY public.pcache (id, user_id, action, create_timestamp, object_type, object_id) FROM stdin; +1 2 @control 2024-04-10 13:22:35 MapasCulturais\\Entities\\User 2 +2 2 create 2024-04-10 13:22:35 MapasCulturais\\Entities\\User 2 +3 2 deleteAccount 2024-04-10 13:22:35 MapasCulturais\\Entities\\User 2 +4 2 view 2024-04-10 13:22:35 MapasCulturais\\Entities\\User 2 +5 2 modify 2024-04-10 13:22:35 MapasCulturais\\Entities\\User 2 +6 2 remove 2024-04-10 13:22:35 MapasCulturais\\Entities\\User 2 +7 2 viewPrivateFiles 2024-04-10 13:22:35 MapasCulturais\\Entities\\User 2 +8 2 viewPrivateData 2024-04-10 13:22:35 MapasCulturais\\Entities\\User 2 +9 2 destroy 2024-04-10 13:22:35 MapasCulturais\\Entities\\User 2 +10 2 @control 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +11 2 create 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +12 2 changeUserProfile 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +13 2 changeType 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +14 2 remove 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +15 2 destroy 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +16 2 changeOwner 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +17 2 archive 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +18 2 view 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +19 2 modify 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +20 2 viewPrivateFiles 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +21 2 viewPrivateData 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +22 2 createAgentRelation 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +23 2 createAgentRelationWithControl 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +24 2 removeAgentRelation 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +25 2 removeAgentRelationWithControl 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +26 2 createSealRelation 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +27 2 removeSealRelation 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +28 2 publish 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +29 2 unarchive 2024-04-10 13:22:36 MapasCulturais\\Entities\\Agent 2 +30 3 @control 2024-04-10 13:22:37 MapasCulturais\\Entities\\User 3 +31 3 create 2024-04-10 13:22:37 MapasCulturais\\Entities\\User 3 +32 3 deleteAccount 2024-04-10 13:22:37 MapasCulturais\\Entities\\User 3 +33 3 view 2024-04-10 13:22:37 MapasCulturais\\Entities\\User 3 +34 3 modify 2024-04-10 13:22:37 MapasCulturais\\Entities\\User 3 +35 3 remove 2024-04-10 13:22:37 MapasCulturais\\Entities\\User 3 +36 3 viewPrivateFiles 2024-04-10 13:22:37 MapasCulturais\\Entities\\User 3 +37 3 viewPrivateData 2024-04-10 13:22:37 MapasCulturais\\Entities\\User 3 +38 3 destroy 2024-04-10 13:22:37 MapasCulturais\\Entities\\User 3 +39 3 @control 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +40 3 create 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +41 3 changeUserProfile 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +42 3 changeType 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +43 3 remove 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +44 3 destroy 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +45 3 changeOwner 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +46 3 archive 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +47 3 view 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +48 3 modify 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +49 3 viewPrivateFiles 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +50 3 viewPrivateData 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +51 3 createAgentRelation 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +52 3 createAgentRelationWithControl 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +53 3 removeAgentRelation 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +54 3 removeAgentRelationWithControl 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +55 3 createSealRelation 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +56 3 removeSealRelation 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +57 3 publish 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +58 3 unarchive 2024-04-10 13:22:37 MapasCulturais\\Entities\\Agent 3 +59 4 @control 2024-04-10 14:44:00 MapasCulturais\\Entities\\User 4 +60 4 create 2024-04-10 14:44:00 MapasCulturais\\Entities\\User 4 +61 4 deleteAccount 2024-04-10 14:44:00 MapasCulturais\\Entities\\User 4 +62 4 view 2024-04-10 14:44:00 MapasCulturais\\Entities\\User 4 +63 4 modify 2024-04-10 14:44:00 MapasCulturais\\Entities\\User 4 +64 4 remove 2024-04-10 14:44:00 MapasCulturais\\Entities\\User 4 +65 4 viewPrivateFiles 2024-04-10 14:44:00 MapasCulturais\\Entities\\User 4 +66 4 viewPrivateData 2024-04-10 14:44:00 MapasCulturais\\Entities\\User 4 +67 4 destroy 2024-04-10 14:44:00 MapasCulturais\\Entities\\User 4 +68 4 @control 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +69 4 create 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +70 4 changeUserProfile 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +71 4 changeType 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +72 4 remove 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +73 4 destroy 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +74 4 changeOwner 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +75 4 archive 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +76 4 view 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +77 4 modify 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +78 4 viewPrivateFiles 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +79 4 viewPrivateData 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +80 4 createAgentRelation 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +81 4 createAgentRelationWithControl 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +82 4 removeAgentRelation 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +83 4 removeAgentRelationWithControl 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +84 4 createSealRelation 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +85 4 removeSealRelation 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +86 4 publish 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +87 4 unarchive 2024-04-10 14:44:00 MapasCulturais\\Entities\\Agent 4 +88 4 @control 2024-04-10 14:45:00 MapasCulturais\\Entities\\Project 1 +89 4 createEvents 2024-04-10 14:45:00 MapasCulturais\\Entities\\Project 1 +90 4 requestEventRelation 2024-04-10 14:45:00 MapasCulturais\\Entities\\Project 1 +91 4 view 2024-04-10 14:45:00 MapasCulturais\\Entities\\Project 1 +92 4 create 2024-04-10 14:45:00 MapasCulturais\\Entities\\Project 1 +93 4 modify 2024-04-10 14:45:00 MapasCulturais\\Entities\\Project 1 +94 4 remove 2024-04-10 14:45:00 MapasCulturais\\Entities\\Project 1 +95 4 viewPrivateFiles 2024-04-10 14:45:00 MapasCulturais\\Entities\\Project 1 +96 4 changeOwner 2024-04-10 14:45:00 MapasCulturais\\Entities\\Project 1 +97 4 viewPrivateData 2024-04-10 14:45:00 MapasCulturais\\Entities\\Project 1 +98 4 createAgentRelation 2024-04-10 14:45:00 MapasCulturais\\Entities\\Project 1 +99 4 createAgentRelationWithControl 2024-04-10 14:45:00 MapasCulturais\\Entities\\Project 1 +100 4 removeAgentRelation 2024-04-10 14:45:00 MapasCulturais\\Entities\\Project 1 +101 4 removeAgentRelationWithControl 2024-04-10 14:45:00 MapasCulturais\\Entities\\Project 1 +102 4 destroy 2024-04-10 14:45:00 MapasCulturais\\Entities\\Project 1 +103 4 archive 2024-04-10 14:45:00 MapasCulturais\\Entities\\Project 1 +104 4 unarchive 2024-04-10 14:45:00 MapasCulturais\\Entities\\Project 1 \. @@ -2808,7 +3343,14 @@ COPY public.pcache (id, user_id, action, create_timestamp, object_type, object_i -- Data for Name: permission_cache_pending; Type: TABLE DATA; Schema: public; Owner: mapas -- -COPY public.permission_cache_pending (id, object_id, object_type, status) FROM stdin; +COPY public.permission_cache_pending (id, object_id, object_type, status, usr_id) FROM stdin; +1 2 MapasCulturais\\Entities\\User 0 \N +2 2 MapasCulturais\\Entities\\Agent 0 \N +3 3 MapasCulturais\\Entities\\User 0 \N +4 3 MapasCulturais\\Entities\\Agent 0 \N +5 4 MapasCulturais\\Entities\\User 0 \N +6 4 MapasCulturais\\Entities\\Agent 0 \N +7 1 MapasCulturais\\Entities\\Project 0 \N \. @@ -2824,7 +3366,8 @@ COPY public.procuration (token, usr_id, attorney_user_id, action, create_timesta -- Data for Name: project; Type: TABLE DATA; Schema: public; Owner: mapas -- -COPY public.project (id, name, short_description, long_description, create_timestamp, status, agent_id, is_verified, type, parent_id, registration_from, registration_to, update_timestamp, subsite_id) FROM stdin; +COPY public.project (id, name, short_description, long_description, create_timestamp, status, agent_id, is_verified, type, parent_id, starts_on, ends_on, update_timestamp, subsite_id) FROM stdin; +1 teste teste \N 2024-04-10 14:45:00 1 4 f 9 \N \N \N 2024-04-10 14:45:00 \N \. @@ -2848,7 +3391,7 @@ COPY public.project_meta (object_id, key, value, id) FROM stdin; -- Data for Name: registration; Type: TABLE DATA; Schema: public; Owner: mapas -- -COPY public.registration (id, opportunity_id, category, agent_id, create_timestamp, sent_timestamp, status, agents_data, subsite_id, consolidated_result, number, valuers_exceptions_list, space_data) FROM stdin; +COPY public.registration (id, opportunity_id, category, agent_id, create_timestamp, sent_timestamp, status, agents_data, subsite_id, consolidated_result, number, valuers_exceptions_list, space_data, proponent_type, range, score, eligible) FROM stdin; \. @@ -2856,7 +3399,7 @@ COPY public.registration (id, opportunity_id, category, agent_id, create_timesta -- Data for Name: registration_evaluation; Type: TABLE DATA; Schema: public; Owner: mapas -- -COPY public.registration_evaluation (id, registration_id, user_id, result, evaluation_data, status) FROM stdin; +COPY public.registration_evaluation (id, registration_id, user_id, result, evaluation_data, status, create_timestamp, update_timestamp) FROM stdin; \. @@ -2864,7 +3407,7 @@ COPY public.registration_evaluation (id, registration_id, user_id, result, evalu -- Data for Name: registration_field_configuration; Type: TABLE DATA; Schema: public; Owner: mapas -- -COPY public.registration_field_configuration (id, opportunity_id, title, description, categories, required, field_type, field_options, max_size, display_order, config) FROM stdin; +COPY public.registration_field_configuration (id, opportunity_id, title, description, categories, required, field_type, field_options, max_size, display_order, config, conditional, conditional_field, conditional_value, registration_ranges, proponent_types) FROM stdin; \. @@ -2872,7 +3415,7 @@ COPY public.registration_field_configuration (id, opportunity_id, title, descrip -- Data for Name: registration_file_configuration; Type: TABLE DATA; Schema: public; Owner: mapas -- -COPY public.registration_file_configuration (id, opportunity_id, title, description, required, categories, display_order) FROM stdin; +COPY public.registration_file_configuration (id, opportunity_id, title, description, required, categories, display_order, conditional, conditional_field, conditional_value, registration_ranges, proponent_types) FROM stdin; \. @@ -2905,8 +3448,8 @@ COPY public.role (id, usr_id, name, subsite_id) FROM stdin; -- Data for Name: seal; Type: TABLE DATA; Schema: public; Owner: mapas -- -COPY public.seal (id, agent_id, name, short_description, long_description, valid_period, create_timestamp, status, certificate_text, update_timestamp, subsite_id) FROM stdin; -1 1 Selo Mapas Descrição curta Selo Mapas Descrição longa Selo Mapas 0 2019-03-07 23:54:04 1 \N 2019-03-07 00:00:00 \N +COPY public.seal (id, agent_id, name, short_description, long_description, valid_period, create_timestamp, status, certificate_text, update_timestamp, subsite_id, locked_fields) FROM stdin; +1 1 Selo Mapas Descrição curta Selo Mapas Descrição longa Selo Mapas 0 2019-03-07 23:54:04 1 \N 2019-03-07 00:00:00 \N [] \. @@ -2974,6 +3517,14 @@ COPY public.subsite_meta (object_id, key, value, id) FROM stdin; \. +-- +-- Data for Name: system_role; Type: TABLE DATA; Schema: public; Owner: mapas +-- + +COPY public.system_role (id, slug, name, subsite_context, permissions, create_timestamp, update_timestamp, status) FROM stdin; +\. + + -- -- Data for Name: term; Type: TABLE DATA; Schema: public; Owner: mapas -- @@ -3005,6 +3556,7 @@ COPY public.user_app (public_key, private_key, user_id, name, status, create_tim COPY public.user_meta (object_id, key, value, id) FROM stdin; 1 deleteAccountToken 54cd760dfca39f8e8c8332d7499bdb44f921dc16 1 1 localAuthenticationPassword $2y$10$iIXeqhX.4fEAAVZPsbtRde7CFw1ChduCi8NsnXGnJc6TlelY6gf3e 2 +4 deleteAccountToken 95905b0b82bb505fcf71cd91c73c3cc9aa65253f 3 \. @@ -3014,6 +3566,9 @@ COPY public.user_meta (object_id, key, value, id) FROM stdin; COPY public.usr (id, auth_provider, auth_uid, email, last_login_timestamp, create_timestamp, status, profile_id) FROM stdin; 1 1 1 Admin@local 2019-03-08 19:03:34 2019-03-07 00:00:00 1 1 +2 0 fake-6616929ab6c9e lucaspirola@gmail.com 2024-04-10 13:22:34 2024-04-10 13:22:34 1 2 +3 0 fake-6616929d41b0e lucaspirola@gmail.com 2024-04-10 13:22:37 2024-04-10 13:22:37 1 3 +4 0 fake-6616a5af6dfc5 lucas@pirola.com 2024-04-10 14:44:02 2024-04-10 14:43:59 1 4 \. @@ -3090,7 +3645,7 @@ SELECT pg_catalog.setval('public._municipios_gid_seq', 1, false); -- Name: agent_id_seq; Type: SEQUENCE SET; Schema: public; Owner: mapas -- -SELECT pg_catalog.setval('public.agent_id_seq', 1, true); +SELECT pg_catalog.setval('public.agent_id_seq', 4, true); -- @@ -3107,11 +3662,25 @@ SELECT pg_catalog.setval('public.agent_meta_id_seq', 1, false); SELECT pg_catalog.setval('public.agent_relation_id_seq', 1, false); +-- +-- Name: chat_message_id_seq; Type: SEQUENCE SET; Schema: public; Owner: mapas +-- + +SELECT pg_catalog.setval('public.chat_message_id_seq', 1, false); + + +-- +-- Name: chat_thread_id_seq; Type: SEQUENCE SET; Schema: public; Owner: mapas +-- + +SELECT pg_catalog.setval('public.chat_thread_id_seq', 1, false); + + -- -- Name: entity_revision_id_seq; Type: SEQUENCE SET; Schema: public; Owner: mapas -- -SELECT pg_catalog.setval('public.entity_revision_id_seq', 1, true); +SELECT pg_catalog.setval('public.entity_revision_id_seq', 7, true); -- @@ -3230,14 +3799,14 @@ SELECT pg_catalog.setval('public.opportunity_meta_id_seq', 1, false); -- Name: pcache_id_seq; Type: SEQUENCE SET; Schema: public; Owner: mapas -- -SELECT pg_catalog.setval('public.pcache_id_seq', 1, false); +SELECT pg_catalog.setval('public.pcache_id_seq', 104, true); -- -- Name: permission_cache_pending_seq; Type: SEQUENCE SET; Schema: public; Owner: mapas -- -SELECT pg_catalog.setval('public.permission_cache_pending_seq', 1, false); +SELECT pg_catalog.setval('public.permission_cache_pending_seq', 7, true); -- @@ -3251,7 +3820,7 @@ SELECT pg_catalog.setval('public.project_event_id_seq', 1, false); -- Name: project_id_seq; Type: SEQUENCE SET; Schema: public; Owner: mapas -- -SELECT pg_catalog.setval('public.project_id_seq', 1, false); +SELECT pg_catalog.setval('public.project_id_seq', 1, true); -- @@ -3314,7 +3883,7 @@ SELECT pg_catalog.setval('public.request_id_seq', 1, false); -- Name: revision_data_id_seq; Type: SEQUENCE SET; Schema: public; Owner: mapas -- -SELECT pg_catalog.setval('public.revision_data_id_seq', 10, true); +SELECT pg_catalog.setval('public.revision_data_id_seq', 49, true); -- @@ -3380,6 +3949,13 @@ SELECT pg_catalog.setval('public.subsite_id_seq', 1, false); SELECT pg_catalog.setval('public.subsite_meta_id_seq', 1, false); +-- +-- Name: system_role_id_seq; Type: SEQUENCE SET; Schema: public; Owner: mapas +-- + +SELECT pg_catalog.setval('public.system_role_id_seq', 1, false); + + -- -- Name: term_id_seq; Type: SEQUENCE SET; Schema: public; Owner: mapas -- @@ -3398,14 +3974,21 @@ SELECT pg_catalog.setval('public.term_relation_id_seq', 1, false); -- Name: user_meta_id_seq; Type: SEQUENCE SET; Schema: public; Owner: mapas -- -SELECT pg_catalog.setval('public.user_meta_id_seq', 2, true); +SELECT pg_catalog.setval('public.user_meta_id_seq', 3, true); -- -- Name: usr_id_seq; Type: SEQUENCE SET; Schema: public; Owner: mapas -- -SELECT pg_catalog.setval('public.usr_id_seq', 1, true); +SELECT pg_catalog.setval('public.usr_id_seq', 4, true); + + +-- +-- Name: topology_id_seq; Type: SEQUENCE SET; Schema: topology; Owner: mapas +-- + +SELECT pg_catalog.setval('topology.topology_id_seq', 1, false); -- @@ -3456,6 +4039,22 @@ ALTER TABLE ONLY public.agent_relation ADD CONSTRAINT agent_relation_pkey PRIMARY KEY (id); +-- +-- Name: chat_message chat_message_pkey; Type: CONSTRAINT; Schema: public; Owner: mapas +-- + +ALTER TABLE ONLY public.chat_message + ADD CONSTRAINT chat_message_pkey PRIMARY KEY (id); + + +-- +-- Name: chat_thread chat_thread_pkey; Type: CONSTRAINT; Schema: public; Owner: mapas +-- + +ALTER TABLE ONLY public.chat_thread + ADD CONSTRAINT chat_thread_pkey PRIMARY KEY (id); + + -- -- Name: db_update db_update_pk; Type: CONSTRAINT; Schema: public; Owner: mapas -- @@ -3568,6 +4167,14 @@ ALTER TABLE ONLY public.geo_division ADD CONSTRAINT geo_divisions_pkey PRIMARY KEY (id); +-- +-- Name: job job_pkey; Type: CONSTRAINT; Schema: public; Owner: mapas +-- + +ALTER TABLE ONLY public.job + ADD CONSTRAINT job_pkey PRIMARY KEY (id); + + -- -- Name: metadata metadata_pk; Type: CONSTRAINT; Schema: public; Owner: mapas -- @@ -3784,6 +4391,14 @@ ALTER TABLE ONLY public.subsite_meta ADD CONSTRAINT subsite_meta_pkey PRIMARY KEY (id); +-- +-- Name: system_role system_role_pkey; Type: CONSTRAINT; Schema: public; Owner: mapas +-- + +ALTER TABLE ONLY public.system_role + ADD CONSTRAINT system_role_pkey PRIMARY KEY (id); + + -- -- Name: term term_pk; Type: CONSTRAINT; Schema: public; Owner: mapas -- @@ -3846,10 +4461,45 @@ CREATE INDEX agent_meta_owner_key_idx ON public.agent_meta USING btree (object_i -- --- Name: agent_relation_all; Type: INDEX; Schema: public; Owner: mapas +-- Name: agent_relation_has_control; Type: INDEX; Schema: public; Owner: mapas +-- + +CREATE INDEX agent_relation_has_control ON public.agent_relation USING btree (has_control); + + +-- +-- Name: agent_relation_owner; Type: INDEX; Schema: public; Owner: mapas +-- + +CREATE INDEX agent_relation_owner ON public.agent_relation USING btree (object_type, object_id); + + +-- +-- Name: agent_relation_owner_agent; Type: INDEX; Schema: public; Owner: mapas +-- + +CREATE INDEX agent_relation_owner_agent ON public.agent_relation USING btree (object_type, object_id, agent_id); + + +-- +-- Name: agent_relation_owner_id; Type: INDEX; Schema: public; Owner: mapas +-- + +CREATE INDEX agent_relation_owner_id ON public.agent_relation USING btree (object_id); + + +-- +-- Name: agent_relation_owner_type; Type: INDEX; Schema: public; Owner: mapas -- -CREATE INDEX agent_relation_all ON public.agent_relation USING btree (agent_id, object_type, object_id); +CREATE INDEX agent_relation_owner_type ON public.agent_relation USING btree (object_type); + + +-- +-- Name: agent_relation_status; Type: INDEX; Schema: public; Owner: mapas +-- + +CREATE INDEX agent_relation_status ON public.agent_relation USING btree (status); -- @@ -3859,6 +4509,55 @@ CREATE INDEX agent_relation_all ON public.agent_relation USING btree (agent_id, CREATE INDEX alias_url_index ON public.subsite USING btree (alias_url); +-- +-- Name: entity_revision_data_id; Type: INDEX; Schema: public; Owner: mapas +-- + +CREATE INDEX entity_revision_data_id ON public.entity_revision_data USING btree (id); + + +-- +-- Name: entity_revision_data_key; Type: INDEX; Schema: public; Owner: mapas +-- + +CREATE INDEX entity_revision_data_key ON public.entity_revision_data USING btree (key); + + +-- +-- Name: entity_revision_object; Type: INDEX; Schema: public; Owner: mapas +-- + +CREATE INDEX entity_revision_object ON public.entity_revision USING btree (object_type, object_id); + + +-- +-- Name: entity_revision_object_id; Type: INDEX; Schema: public; Owner: mapas +-- + +CREATE INDEX entity_revision_object_id ON public.entity_revision USING btree (object_id); + + +-- +-- Name: entity_revision_object_type; Type: INDEX; Schema: public; Owner: mapas +-- + +CREATE INDEX entity_revision_object_type ON public.entity_revision USING btree (object_type); + + +-- +-- Name: entity_revision_revision_data_data_id; Type: INDEX; Schema: public; Owner: mapas +-- + +CREATE INDEX entity_revision_revision_data_data_id ON public.entity_revision_revision_data USING btree (revision_data_id); + + +-- +-- Name: entity_revision_revision_data_revision_id; Type: INDEX; Schema: public; Owner: mapas +-- + +CREATE INDEX entity_revision_revision_data_revision_id ON public.entity_revision_revision_data USING btree (revision_id); + + -- -- Name: evaluationmethodconfiguration_meta_owner_idx; Type: INDEX; Schema: public; Owner: mapas -- @@ -4097,6 +4796,41 @@ CREATE INDEX idx_62a8a7a79a34590f ON public.registration USING btree (opportunit CREATE INDEX idx_62a8a7a7c79c849a ON public.registration USING btree (subsite_id); +-- +-- Name: idx_fab3fc16727aca70; Type: INDEX; Schema: public; Owner: mapas +-- + +CREATE INDEX idx_fab3fc16727aca70 ON public.chat_message USING btree (parent_id); + + +-- +-- Name: idx_fab3fc16a76ed395; Type: INDEX; Schema: public; Owner: mapas +-- + +CREATE INDEX idx_fab3fc16a76ed395 ON public.chat_message USING btree (user_id); + + +-- +-- Name: idx_fab3fc16c47d5262; Type: INDEX; Schema: public; Owner: mapas +-- + +CREATE INDEX idx_fab3fc16c47d5262 ON public.chat_message USING btree (chat_thread_id); + + +-- +-- Name: job_next_execution_timestamp_idx; Type: INDEX; Schema: public; Owner: mapas +-- + +CREATE INDEX job_next_execution_timestamp_idx ON public.job USING btree (next_execution_timestamp); + + +-- +-- Name: job_search_idx; Type: INDEX; Schema: public; Owner: mapas +-- + +CREATE INDEX job_search_idx ON public.job USING btree (next_execution_timestamp, iterations_count, status); + + -- -- Name: notification_meta_key_idx; Type: INDEX; Schema: public; Owner: mapas -- @@ -4160,6 +4894,13 @@ CREATE INDEX opportunity_parent_idx ON public.opportunity USING btree (parent_id CREATE INDEX owner_index ON public.term_relation USING btree (object_type, object_id); +-- +-- Name: pcache_action_idx; Type: INDEX; Schema: public; Owner: mapas +-- + +CREATE INDEX pcache_action_idx ON public.pcache USING btree (action); + + -- -- Name: pcache_owner_idx; Type: INDEX; Schema: public; Owner: mapas -- @@ -4363,6 +5104,97 @@ CREATE INDEX user_meta_owner_idx ON public.user_meta USING btree (object_id); CREATE INDEX user_meta_owner_key_idx ON public.user_meta USING btree (object_id, key); +-- +-- Name: agent trigger_clean_orphans_agent; Type: TRIGGER; Schema: public; Owner: mapas +-- + +CREATE TRIGGER trigger_clean_orphans_agent AFTER DELETE ON public.agent FOR EACH ROW EXECUTE FUNCTION public.fn_clean_orphans('MapasCulturais\Entities\Agent'); + + +-- +-- Name: chat_message trigger_clean_orphans_chat_message; Type: TRIGGER; Schema: public; Owner: mapas +-- + +CREATE TRIGGER trigger_clean_orphans_chat_message AFTER DELETE ON public.chat_message FOR EACH ROW EXECUTE FUNCTION public.fn_clean_orphans('MapasCulturais\Entities\ChatMessage'); + + +-- +-- Name: chat_thread trigger_clean_orphans_chat_thread; Type: TRIGGER; Schema: public; Owner: mapas +-- + +CREATE TRIGGER trigger_clean_orphans_chat_thread AFTER DELETE ON public.chat_thread FOR EACH ROW EXECUTE FUNCTION public.fn_clean_orphans('MapasCulturais\Entities\ChatThread'); + + +-- +-- Name: evaluation_method_configuration trigger_clean_orphans_evaluation_method_configuration; Type: TRIGGER; Schema: public; Owner: mapas +-- + +CREATE TRIGGER trigger_clean_orphans_evaluation_method_configuration AFTER DELETE ON public.evaluation_method_configuration FOR EACH ROW EXECUTE FUNCTION public.fn_clean_orphans('MapasCulturais\Entities\EvaluationMethodConfiguration'); + + +-- +-- Name: event trigger_clean_orphans_event; Type: TRIGGER; Schema: public; Owner: mapas +-- + +CREATE TRIGGER trigger_clean_orphans_event AFTER DELETE ON public.event FOR EACH ROW EXECUTE FUNCTION public.fn_clean_orphans('MapasCulturais\Entities\Event'); + + +-- +-- Name: notification trigger_clean_orphans_notification; Type: TRIGGER; Schema: public; Owner: mapas +-- + +CREATE TRIGGER trigger_clean_orphans_notification AFTER DELETE ON public.notification FOR EACH ROW EXECUTE FUNCTION public.fn_clean_orphans('MapasCulturais\Entities\Notification'); + + +-- +-- Name: opportunity trigger_clean_orphans_opportunity; Type: TRIGGER; Schema: public; Owner: mapas +-- + +CREATE TRIGGER trigger_clean_orphans_opportunity AFTER DELETE ON public.opportunity FOR EACH ROW EXECUTE FUNCTION public.fn_clean_orphans('MapasCulturais\Entities\Opportunity'); + + +-- +-- Name: project trigger_clean_orphans_project; Type: TRIGGER; Schema: public; Owner: mapas +-- + +CREATE TRIGGER trigger_clean_orphans_project AFTER DELETE ON public.project FOR EACH ROW EXECUTE FUNCTION public.fn_clean_orphans('MapasCulturais\Entities\Project'); + + +-- +-- Name: registration trigger_clean_orphans_registration; Type: TRIGGER; Schema: public; Owner: mapas +-- + +CREATE TRIGGER trigger_clean_orphans_registration AFTER DELETE ON public.registration FOR EACH ROW EXECUTE FUNCTION public.fn_clean_orphans('MapasCulturais\Entities\Registration'); + + +-- +-- Name: registration_file_configuration trigger_clean_orphans_registration_file_configuration; Type: TRIGGER; Schema: public; Owner: mapas +-- + +CREATE TRIGGER trigger_clean_orphans_registration_file_configuration AFTER DELETE ON public.registration_file_configuration FOR EACH ROW EXECUTE FUNCTION public.fn_clean_orphans('MapasCulturais\Entities\RegistrationFileConfiguration'); + + +-- +-- Name: space trigger_clean_orphans_space; Type: TRIGGER; Schema: public; Owner: mapas +-- + +CREATE TRIGGER trigger_clean_orphans_space AFTER DELETE ON public.space FOR EACH ROW EXECUTE FUNCTION public.fn_clean_orphans('MapasCulturais\Entities\Space'); + + +-- +-- Name: subsite trigger_clean_orphans_subsite; Type: TRIGGER; Schema: public; Owner: mapas +-- + +CREATE TRIGGER trigger_clean_orphans_subsite AFTER DELETE ON public.subsite FOR EACH ROW EXECUTE FUNCTION public.fn_clean_orphans('MapasCulturais\Entities\Subsite'); + + +-- +-- Name: opportunity trigger_propagate_opportunity_update; Type: TRIGGER; Schema: public; Owner: mapas +-- + +CREATE TRIGGER trigger_propagate_opportunity_update AFTER UPDATE ON public.opportunity FOR EACH ROW EXECUTE FUNCTION public.fn_propagate_opportunity_update(); + + -- -- Name: usr fk_1762498cccfa12b8; Type: FK CONSTRAINT; Schema: public; Owner: mapas -- @@ -4891,6 +5723,30 @@ ALTER TABLE ONLY public.project_meta ADD CONSTRAINT fk_ee63dc2d232d562b FOREIGN KEY (object_id) REFERENCES public.project(id) ON DELETE CASCADE; +-- +-- Name: chat_message fk_fab3fc16727aca70; Type: FK CONSTRAINT; Schema: public; Owner: mapas +-- + +ALTER TABLE ONLY public.chat_message + ADD CONSTRAINT fk_fab3fc16727aca70 FOREIGN KEY (parent_id) REFERENCES public.chat_message(id) ON DELETE CASCADE; + + +-- +-- Name: chat_message fk_fab3fc16a76ed395; Type: FK CONSTRAINT; Schema: public; Owner: mapas +-- + +ALTER TABLE ONLY public.chat_message + ADD CONSTRAINT fk_fab3fc16a76ed395 FOREIGN KEY (user_id) REFERENCES public.usr(id) ON DELETE CASCADE; + + +-- +-- Name: chat_message fk_fab3fc16c47d5262; Type: FK CONSTRAINT; Schema: public; Owner: mapas +-- + +ALTER TABLE ONLY public.chat_message + ADD CONSTRAINT fk_fab3fc16c47d5262 FOREIGN KEY (chat_thread_id) REFERENCES public.chat_thread(id) ON DELETE CASCADE; + + -- -- PostgreSQL database dump complete -- diff --git a/docker-compose.yml b/docker-compose.yml index 71645bfcb0..06d8f0100a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,6 +14,7 @@ services: environment: RR_VERSION: ${RR_VERSION} APP_MODE: development + BASE_URL: http://localhost:8080/ working_dir: /app volumes: - ./:/app diff --git a/public/bootstrap.php b/public/bootstrap.php index 3f573f9ce0..09e2e0aa53 100644 --- a/public/bootstrap.php +++ b/public/bootstrap.php @@ -1,4 +1,5 @@ persistPCachePendingQueue(); $this->applyHookBoundTo($this, 'mapasculturais.run:after'); $this->applyHookBoundTo($this, 'slim.after'); + return $this->response; } /** @@ -732,6 +733,7 @@ protected function _initDoctrine() { * @return void */ protected function _initSubsite() { + return ; $domain = $_SERVER['HTTP_HOST'] ?? 'localhost'; if(($pos = strpos($domain, ':')) !== false){ diff --git a/src/core/Controllers/Agent.php b/src/core/Controllers/Agent.php index cc6dcea55a..e0325d342e 100644 --- a/src/core/Controllers/Agent.php +++ b/src/core/Controllers/Agent.php @@ -117,7 +117,6 @@ class Agent extends EntityController { * @apiGroup AGENT * @apiName setAsUserProfile * @apiPermission user - * @apiVersion 4.0.0 */ function ALL_setAsUserProfile(){ $this->requireAuthentication(); @@ -224,7 +223,6 @@ function GET_single() { * @apiParam {String} nome do "role" a ser removida de usuário. * @apiParam {Number} [subsiteId] identificador do subsite. * @apiPermission user - * @apiVersion 4.0.0 * * @deprecated 6.0.0 */ diff --git a/src/core/Controllers/Opportunity.php b/src/core/Controllers/Opportunity.php index 2af28c12b7..0a697545aa 100644 --- a/src/core/Controllers/Opportunity.php +++ b/src/core/Controllers/Opportunity.php @@ -282,6 +282,12 @@ protected function reportOutput($view, $view_params, $filename){ } + /** + * @api {GET} /api/opportunity/findByUserApprovedRegistration Recuperar descrição da entidade Espaço + * @apiUse APIdescribe + * @apiGroup SPACE + * @apiName GETdescribe + */ function API_findByUserApprovedRegistration(){ ini_set('max_execution_time', 0); diff --git a/src/core/Controllers/Site.php b/src/core/Controllers/Site.php index c563b24a2f..4b99d47426 100644 --- a/src/core/Controllers/Site.php +++ b/src/core/Controllers/Site.php @@ -6,6 +6,9 @@ use MapasCulturais\Traits; /** + * + * @OA\Info(title="Mapas Culturais", version="0.1") + * * Site Controller * * By default this is the default controller and is registered with the id 'site' @@ -133,6 +136,12 @@ function GET_page() { } /** + * + * @OA\Get( + * path="/api/site/version", + * @OA\Response(response="200", description="An example version") + * ) + * * @api {GET} /api/site/version Versão Mapas Culturais * @apiDescription Obtem a versão do Mapas Culturais * @apiGroup SITE @@ -174,6 +183,12 @@ function API_version() { $this->json($data); } + /** + * @OA\Get( + * path="/api/site/info", + * @OA\Response(response="200", description="An example info") + * ) + */ function API_info(){ $app = App::i(); diff --git a/src/core/Entities/Agent.php b/src/core/Entities/Agent.php index 467c9578dd..c9750c8357 100644 --- a/src/core/Entities/Agent.php +++ b/src/core/Entities/Agent.php @@ -8,6 +8,9 @@ /** + * + + * * Agent * * @property-read int $id diff --git a/src/core/Entities/AgentOpportunity.php b/src/core/Entities/AgentOpportunity.php index 1e0cbc1df7..00fb0a640d 100644 --- a/src/core/Entities/AgentOpportunity.php +++ b/src/core/Entities/AgentOpportunity.php @@ -32,6 +32,6 @@ class AgentOpportunity extends Opportunity{ protected $parent; public function getSpecializedClassName() { - return AgentOpportunity::class; + return static::class; } } \ No newline at end of file diff --git a/src/core/Entities/Event.php b/src/core/Entities/Event.php index 892f1af170..ac2ff3aca5 100644 --- a/src/core/Entities/Event.php +++ b/src/core/Entities/Event.php @@ -8,6 +8,9 @@ /** + * + + * * Event * * @property-read int $id diff --git a/src/core/Entities/Opportunity.php b/src/core/Entities/Opportunity.php index 13a9fb7c40..5bad1a3b29 100644 --- a/src/core/Entities/Opportunity.php +++ b/src/core/Entities/Opportunity.php @@ -9,6 +9,9 @@ use MapasCulturais\App; use MapasCulturais\Definitions\Metadata as MetadataDefinition; /** + * + + * * Opportunity * * @property-read int $id @@ -475,7 +478,7 @@ static function getValidations() { } static function getClassName() { - return Opportunity::class; + return static::class; } function getExtraPermissionCacheUsers(){ @@ -1295,4 +1298,4 @@ public function postRemove($args = null){ parent::postRemove($args); } public function preUpdate($args = null){ parent::preUpdate($args); } /** @ORM\PostUpdate */ public function postUpdate($args = null){ parent::postUpdate($args); } -} +} \ No newline at end of file diff --git a/src/core/Entities/ProjectOpportunity.php b/src/core/Entities/ProjectOpportunity.php index 1f2d36b55e..7782661a63 100644 --- a/src/core/Entities/ProjectOpportunity.php +++ b/src/core/Entities/ProjectOpportunity.php @@ -32,6 +32,6 @@ class ProjectOpportunity extends Opportunity{ protected $parent; public function getSpecializedClassName() { - return ProjectOpportunity::class; + return static::class; } } \ No newline at end of file diff --git a/src/core/Repositories/Agent.php b/src/core/Repositories/Agent.php index 603ed65808..21ef883f45 100644 --- a/src/core/Repositories/Agent.php +++ b/src/core/Repositories/Agent.php @@ -1,9 +1,11 @@ [ diff --git a/src/modules/Components/assets/js/media-query.js.LICENSE.txt b/src/modules/Components/assets/js/media-query.js.LICENSE.txt new file mode 100644 index 0000000000..ba4cb560f1 --- /dev/null +++ b/src/modules/Components/assets/js/media-query.js.LICENSE.txt @@ -0,0 +1,7 @@ +/*! #__NO_SIDE_EFFECTS__ */ + +/** +* @vue/shared v3.4.26 +* (c) 2018-present Yuxi (Evan) You and Vue contributors +* @license MIT +**/ diff --git a/src/node_scripts/webpack.mix.js b/src/node_scripts/webpack.mix.js index 3785e7da3d..252078308f 100644 --- a/src/node_scripts/webpack.mix.js +++ b/src/node_scripts/webpack.mix.js @@ -6,7 +6,7 @@ const mix = require('laravel-mix') const CWD = process.cwd() const pkg = require(`${CWD}/package.json`) -function resolveDestination (source, type) { +function resolveDestination(source, type) { const sourceId = source.split('/').pop().split('.').shift() const exportName = pkg.mapas?.assets?.[type]?.[sourceId] if (exportName) { @@ -41,3 +41,7 @@ glob(['assets-src/sass/*.scss'], GLOB_OPTIONS).map((source) => { const destination = resolveDestination(source, 'css') mix.sass(source, destination) }) +glob(['assets/css/sass/*.scss'], GLOB_OPTIONS).map((source) => { + const destination = resolveDestination(source, 'css') + mix.sass(source, destination) +}) diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml index b60f95c91e..3293979225 100644 --- a/src/pnpm-lock.yaml +++ b/src/pnpm-lock.yaml @@ -96,6 +96,12 @@ importers: node_scripts: {} + themes/BaseV1: + devDependencies: + '@mapas/scripts': + specifier: workspace:* + version: link:../../node_scripts + themes/BaseV2: devDependencies: '@mapas/scripts': diff --git a/src/themes/BaseV1/assets/css/sass/fonts/Aleo-Regular.eot b/src/themes/BaseV1/assets/css/sass/fonts/Aleo-Regular.eot new file mode 100644 index 0000000000..9e8eb4797f Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/Aleo-Regular.eot differ diff --git a/src/themes/BaseV1/assets/css/sass/fonts/Aleo-Regular.svg b/src/themes/BaseV1/assets/css/sass/fonts/Aleo-Regular.svg new file mode 100644 index 0000000000..c0e41703cf --- /dev/null +++ b/src/themes/BaseV1/assets/css/sass/fonts/Aleo-Regular.svg @@ -0,0 +1,4139 @@ + + + + +Created by FontForge 20201107 at Fri Jun 2 16:12:24 2023 + By +Copyright 2013 The Aleo Project Authors (https://github.com/AlessioLaiso/aleo) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/themes/BaseV1/assets/css/sass/fonts/Aleo-Regular.ttf b/src/themes/BaseV1/assets/css/sass/fonts/Aleo-Regular.ttf new file mode 100644 index 0000000000..f33cc8f590 Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/Aleo-Regular.ttf differ diff --git a/src/themes/BaseV1/assets/css/sass/fonts/Aleo-Regular.woff b/src/themes/BaseV1/assets/css/sass/fonts/Aleo-Regular.woff new file mode 100644 index 0000000000..1b435507ef Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/Aleo-Regular.woff differ diff --git a/src/themes/BaseV1/assets/css/sass/fonts/Aleo-Regular.woff2 b/src/themes/BaseV1/assets/css/sass/fonts/Aleo-Regular.woff2 new file mode 100644 index 0000000000..d5d703d85f Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/Aleo-Regular.woff2 differ diff --git a/src/themes/BaseV1/assets/fonts/ElegantIcons.eot b/src/themes/BaseV1/assets/css/sass/fonts/ElegantIcons.eot old mode 100644 new mode 100755 similarity index 100% rename from src/themes/BaseV1/assets/fonts/ElegantIcons.eot rename to src/themes/BaseV1/assets/css/sass/fonts/ElegantIcons.eot diff --git a/src/themes/BaseV1/assets/css/sass/fonts/ElegantIcons.svg b/src/themes/BaseV1/assets/css/sass/fonts/ElegantIcons.svg new file mode 100755 index 0000000000..93538d7e27 --- /dev/null +++ b/src/themes/BaseV1/assets/css/sass/fonts/ElegantIcons.svg @@ -0,0 +1,1832 @@ + + + + +This is a custom SVG font generated by IcoMoon. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/themes/BaseV1/assets/fonts/ElegantIcons.ttf b/src/themes/BaseV1/assets/css/sass/fonts/ElegantIcons.ttf old mode 100644 new mode 100755 similarity index 100% rename from src/themes/BaseV1/assets/fonts/ElegantIcons.ttf rename to src/themes/BaseV1/assets/css/sass/fonts/ElegantIcons.ttf diff --git a/src/themes/BaseV1/assets/fonts/ElegantIcons.woff b/src/themes/BaseV1/assets/css/sass/fonts/ElegantIcons.woff old mode 100644 new mode 100755 similarity index 100% rename from src/themes/BaseV1/assets/fonts/ElegantIcons.woff rename to src/themes/BaseV1/assets/css/sass/fonts/ElegantIcons.woff diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Bold.eot b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Bold.eot new file mode 100644 index 0000000000..618d545d37 Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Bold.eot differ diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Bold.svg b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Bold.svg new file mode 100644 index 0000000000..35a1e4a162 --- /dev/null +++ b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Bold.svg @@ -0,0 +1,21062 @@ + + + + +Created by FontForge 20201107 at Thu May 5 16:37:53 2011 + By +Digitized data copyright (c) 2010-2011, Google Corporation. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Bold.ttf b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Bold.ttf new file mode 100644 index 0000000000..edd85974a5 Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Bold.ttf differ diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Bold.woff b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Bold.woff new file mode 100644 index 0000000000..99b62070cc Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Bold.woff differ diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Bold.woff2 b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Bold.woff2 new file mode 100644 index 0000000000..ac02498e00 Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Bold.woff2 differ diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-BoldItalic.eot b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-BoldItalic.eot new file mode 100644 index 0000000000..4397499fd2 Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-BoldItalic.eot differ diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-BoldItalic.svg b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-BoldItalic.svg new file mode 100644 index 0000000000..bfc1a4c01f --- /dev/null +++ b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-BoldItalic.svg @@ -0,0 +1,21121 @@ + + + + +Created by FontForge 20201107 at Thu May 5 16:38:40 2011 + By +Digitized data copyright (c) 2010-2011, Google Corporation. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-BoldItalic.ttf b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-BoldItalic.ttf new file mode 100644 index 0000000000..ed99fc3f6b Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-BoldItalic.ttf differ diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-BoldItalic.woff b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-BoldItalic.woff new file mode 100644 index 0000000000..d6b799ee22 Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-BoldItalic.woff differ diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-BoldItalic.woff2 b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-BoldItalic.woff2 new file mode 100644 index 0000000000..5b4d10b230 Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-BoldItalic.woff2 differ diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Italic.eot b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Italic.eot new file mode 100644 index 0000000000..7eff980ae5 Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Italic.eot differ diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Italic.svg b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Italic.svg new file mode 100644 index 0000000000..b31ded9152 --- /dev/null +++ b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Italic.svg @@ -0,0 +1,21164 @@ + + + + +Created by FontForge 20201107 at Thu May 5 16:42:54 2011 + By +Digitized data copyright (c) 2010-2011, Google Corporation. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Italic.ttf b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Italic.ttf new file mode 100644 index 0000000000..c405e5a618 Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Italic.ttf differ diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Italic.woff b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Italic.woff new file mode 100644 index 0000000000..9a799e518e Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Italic.woff differ diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Italic.woff2 b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Italic.woff2 new file mode 100644 index 0000000000..79d0f457b9 Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans-Italic.woff2 differ diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans.eot b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans.eot new file mode 100644 index 0000000000..3025b27e66 Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans.eot differ diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans.svg b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans.svg new file mode 100644 index 0000000000..39b66cef3e --- /dev/null +++ b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans.svg @@ -0,0 +1,21064 @@ + + + + +Created by FontForge 20201107 at Thu May 5 16:45:00 2011 + By +Digitized data copyright (c) 2010-2011, Google Corporation. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans.ttf b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans.ttf new file mode 100644 index 0000000000..4ff708be26 Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans.ttf differ diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans.woff b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans.woff new file mode 100644 index 0000000000..d0c631f3f3 Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans.woff differ diff --git a/src/themes/BaseV1/assets/css/sass/fonts/OpenSans.woff2 b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans.woff2 new file mode 100644 index 0000000000..5faa5d6fba Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/fonts/OpenSans.woff2 differ diff --git a/src/themes/BaseV1/assets/css/sass/fonts/demo.html b/src/themes/BaseV1/assets/css/sass/fonts/demo.html new file mode 100644 index 0000000000..23b422f946 --- /dev/null +++ b/src/themes/BaseV1/assets/css/sass/fonts/demo.html @@ -0,0 +1,221 @@ + + + + + + + + + Transfonter demo + + + + +
+
+

Aleo Regular

+ 
.your-style {
+    font-family: 'Aleo';
+    font-weight: normal;
+    font-style: normal;
+}
+ 
+<link rel="preload" href="Aleo-Regular.woff2" as="font" type="font/woff2" crossorigin>
+
+

+ abcdefghijklmnopqrstuvwxyz
+ABCDEFGHIJKLMNOPQRSTUVWXYZ
+ 0123456789.:,;()*!?'@#<>$%&^+-=~ +

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+
+
+ +
+

Open Sans

+ 
.your-style {
+    font-family: 'Open Sans';
+    font-weight: normal;
+    font-style: normal;
+}
+ 
+<link rel="preload" href="OpenSans.woff2" as="font" type="font/woff2" crossorigin>
+
+

+ abcdefghijklmnopqrstuvwxyz
+ABCDEFGHIJKLMNOPQRSTUVWXYZ
+ 0123456789.:,;()*!?'@#<>$%&^+-=~ +

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+

The quick brown fox jumps over the lazy dog.

+
+
+ +
+ + diff --git a/src/themes/BaseV1/assets/css/sass/fonts/stylesheet.css b/src/themes/BaseV1/assets/css/sass/fonts/stylesheet.css new file mode 100644 index 0000000000..c62e7d701b --- /dev/null +++ b/src/themes/BaseV1/assets/css/sass/fonts/stylesheet.css @@ -0,0 +1,26 @@ +@font-face { + font-family: 'Aleo'; + src: url('Aleo-Regular.eot'); + src: url('Aleo-Regular.eot?#iefix') format('embedded-opentype'), + url('Aleo-Regular.woff2') format('woff2'), + url('Aleo-Regular.woff') format('woff'), + url('Aleo-Regular.ttf') format('truetype'), + url('Aleo-Regular.svg#Aleo-Regular') format('svg'); + font-weight: normal; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'Open Sans'; + src: url('OpenSans.eot'); + src: url('OpenSans.eot?#iefix') format('embedded-opentype'), + url('OpenSans.woff2') format('woff2'), + url('OpenSans.woff') format('woff'), + url('OpenSans.ttf') format('truetype'), + url('OpenSans.svg#OpenSans') format('svg'); + font-weight: normal; + font-style: normal; + font-display: swap; +} + diff --git a/src/themes/BaseV1/assets/css/sass/globals/_variables.scss b/src/themes/BaseV1/assets/css/sass/globals/_variables.scss index becc130068..9141b956b0 100644 --- a/src/themes/BaseV1/assets/css/sass/globals/_variables.scss +++ b/src/themes/BaseV1/assets/css/sass/globals/_variables.scss @@ -58,13 +58,13 @@ $font-path: '../fonts/' !default; //** Font family name $font-family-base: 'Open Sans' !default; //** Font file names and svg ids -$font-regular-name: 'OpenSans-Regular-webfont' !default; +$font-regular-name: 'OpenSans' !default; $font-regular-svg-id: 'open_sansregular' !default; -$font-italic-name: 'OpenSans-Italic-webfont' !default; +$font-italic-name: 'OpenSans-Italic' !default; $font-italic-svg-id: 'open_sansitalic' !default; -$font-bold-name: 'OpenSans-Bold-webfont' !default; +$font-bold-name: 'OpenSans-Bold' !default; $font-bold-svg-id: 'open_sansbold' !default; -$font-bolditalic-name: 'OpenSans-BoldItalic-webfont' !default; +$font-bolditalic-name: 'OpenSans-BoldItalic' !default; $font-bolditalic-svg-id: 'open_sansbold_italic' !default; @@ -97,7 +97,7 @@ $line-height-h6: $line-height-base !default; // 20px //** Headings font family name $headings-font-family: 'aleo' !default; //** Headings font file name -$headings-font-name: 'aleo-regular-webfont' !default; +$headings-font-name: 'Aleo-Regular' !default; $headings-font-svg-id: 'aleoregular' !default; //** Default headings font stack $headings-font-stack: $headings-font-family, serif !default; diff --git a/src/themes/BaseV1/assets/img/agrupador-agent.png b/src/themes/BaseV1/assets/css/sass/img/agrupador-agent.png similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-agent.png rename to src/themes/BaseV1/assets/css/sass/img/agrupador-agent.png diff --git a/src/themes/BaseV1/assets/img/agrupador-agente.png b/src/themes/BaseV1/assets/css/sass/img/agrupador-agente.png similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-agente.png rename to src/themes/BaseV1/assets/css/sass/img/agrupador-agente.png diff --git a/src/themes/BaseV1/assets/img/agrupador-combinado-agent-event.png b/src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-agent-event.png similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-combinado-agent-event.png rename to src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-agent-event.png diff --git a/src/themes/BaseV1/assets/img/agrupador-combinado-agent-event.svg b/src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-agent-event.svg similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-combinado-agent-event.svg rename to src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-agent-event.svg diff --git a/src/themes/BaseV1/assets/img/agrupador-combinado-agent-space-event.svg b/src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-agent-space-event.svg similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-combinado-agent-space-event.svg rename to src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-agent-space-event.svg diff --git a/src/themes/BaseV1/assets/img/agrupador-combinado-agente-espaco-evento.svg b/src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-agente-espaco-evento.svg similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-combinado-agente-espaco-evento.svg rename to src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-agente-espaco-evento.svg diff --git a/src/themes/BaseV1/assets/img/agrupador-combinado-agente-evento.png b/src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-agente-evento.png similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-combinado-agente-evento.png rename to src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-agente-evento.png diff --git a/src/themes/BaseV1/assets/img/agrupador-combinado-agente-evento.svg b/src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-agente-evento.svg similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-combinado-agente-evento.svg rename to src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-agente-evento.svg diff --git a/src/themes/BaseV1/assets/img/agrupador-combinado-espaco-agente.png b/src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-espaco-agente.png similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-combinado-espaco-agente.png rename to src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-espaco-agente.png diff --git a/src/themes/BaseV1/assets/img/agrupador-combinado-espaco-agente.svg b/src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-espaco-agente.svg similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-combinado-espaco-agente.svg rename to src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-espaco-agente.svg diff --git a/src/themes/BaseV1/assets/img/agrupador-combinado-espaco-evento.png b/src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-espaco-evento.png similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-combinado-espaco-evento.png rename to src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-espaco-evento.png diff --git a/src/themes/BaseV1/assets/img/agrupador-combinado-espaco-evento.svg b/src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-espaco-evento.svg similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-combinado-espaco-evento.svg rename to src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-espaco-evento.svg diff --git a/src/themes/BaseV1/assets/img/agrupador-combinado-space-agent.png b/src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-space-agent.png similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-combinado-space-agent.png rename to src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-space-agent.png diff --git a/src/themes/BaseV1/assets/img/agrupador-combinado-space-agent.svg b/src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-space-agent.svg similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-combinado-space-agent.svg rename to src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-space-agent.svg diff --git a/src/themes/BaseV1/assets/img/agrupador-combinado-space-event.png b/src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-space-event.png similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-combinado-space-event.png rename to src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-space-event.png diff --git a/src/themes/BaseV1/assets/img/agrupador-combinado-space-event.svg b/src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-space-event.svg similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-combinado-space-event.svg rename to src/themes/BaseV1/assets/css/sass/img/agrupador-combinado-space-event.svg diff --git a/src/themes/BaseV1/assets/img/agrupador-combinado.png b/src/themes/BaseV1/assets/css/sass/img/agrupador-combinado.png similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-combinado.png rename to src/themes/BaseV1/assets/css/sass/img/agrupador-combinado.png diff --git a/src/themes/BaseV1/assets/img/agrupador-espaco.png b/src/themes/BaseV1/assets/css/sass/img/agrupador-espaco.png similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-espaco.png rename to src/themes/BaseV1/assets/css/sass/img/agrupador-espaco.png diff --git a/src/themes/BaseV1/assets/img/agrupador-event.png b/src/themes/BaseV1/assets/css/sass/img/agrupador-event.png similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-event.png rename to src/themes/BaseV1/assets/css/sass/img/agrupador-event.png diff --git a/src/themes/BaseV1/assets/img/agrupador-evento.png b/src/themes/BaseV1/assets/css/sass/img/agrupador-evento.png similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-evento.png rename to src/themes/BaseV1/assets/css/sass/img/agrupador-evento.png diff --git a/src/themes/BaseV1/assets/img/agrupador-space.png b/src/themes/BaseV1/assets/css/sass/img/agrupador-space.png similarity index 100% rename from src/themes/BaseV1/assets/img/agrupador-space.png rename to src/themes/BaseV1/assets/css/sass/img/agrupador-space.png diff --git a/src/themes/BaseV1/assets/img/avatar--agent.png b/src/themes/BaseV1/assets/css/sass/img/avatar--agent.png similarity index 100% rename from src/themes/BaseV1/assets/img/avatar--agent.png rename to src/themes/BaseV1/assets/css/sass/img/avatar--agent.png diff --git a/src/themes/BaseV1/assets/img/avatar--event.png b/src/themes/BaseV1/assets/css/sass/img/avatar--event.png similarity index 100% rename from src/themes/BaseV1/assets/img/avatar--event.png rename to src/themes/BaseV1/assets/css/sass/img/avatar--event.png diff --git a/src/themes/BaseV1/assets/img/avatar--opportunity.png b/src/themes/BaseV1/assets/css/sass/img/avatar--opportunity.png similarity index 100% rename from src/themes/BaseV1/assets/img/avatar--opportunity.png rename to src/themes/BaseV1/assets/css/sass/img/avatar--opportunity.png diff --git a/src/themes/BaseV1/assets/img/avatar--project.png b/src/themes/BaseV1/assets/css/sass/img/avatar--project.png similarity index 100% rename from src/themes/BaseV1/assets/img/avatar--project.png rename to src/themes/BaseV1/assets/css/sass/img/avatar--project.png diff --git a/src/themes/BaseV1/assets/img/avatar--seal.png b/src/themes/BaseV1/assets/css/sass/img/avatar--seal.png similarity index 100% rename from src/themes/BaseV1/assets/img/avatar--seal.png rename to src/themes/BaseV1/assets/css/sass/img/avatar--seal.png diff --git a/src/themes/BaseV1/assets/img/avatar--space.png b/src/themes/BaseV1/assets/css/sass/img/avatar--space.png similarity index 100% rename from src/themes/BaseV1/assets/img/avatar--space.png rename to src/themes/BaseV1/assets/css/sass/img/avatar--space.png diff --git a/src/themes/BaseV1/assets/img/favicon-32.ico b/src/themes/BaseV1/assets/css/sass/img/favicon-32.ico similarity index 100% rename from src/themes/BaseV1/assets/img/favicon-32.ico rename to src/themes/BaseV1/assets/css/sass/img/favicon-32.ico diff --git a/src/themes/BaseV1/assets/img/favicon.ico b/src/themes/BaseV1/assets/css/sass/img/favicon.ico similarity index 100% rename from src/themes/BaseV1/assets/img/favicon.ico rename to src/themes/BaseV1/assets/css/sass/img/favicon.ico diff --git a/src/themes/BaseV1/assets/img/fundo.png b/src/themes/BaseV1/assets/css/sass/img/fundo.png similarity index 100% rename from src/themes/BaseV1/assets/img/fundo.png rename to src/themes/BaseV1/assets/css/sass/img/fundo.png diff --git a/src/themes/BaseV1/assets/img/icon-agent.png b/src/themes/BaseV1/assets/css/sass/img/icon-agent.png similarity index 100% rename from src/themes/BaseV1/assets/img/icon-agent.png rename to src/themes/BaseV1/assets/css/sass/img/icon-agent.png diff --git a/src/themes/BaseV1/assets/img/icon-agente.png b/src/themes/BaseV1/assets/css/sass/img/icon-agente.png similarity index 100% rename from src/themes/BaseV1/assets/img/icon-agente.png rename to src/themes/BaseV1/assets/css/sass/img/icon-agente.png diff --git a/src/themes/BaseV1/assets/img/icon-circulo.png b/src/themes/BaseV1/assets/css/sass/img/icon-circulo.png similarity index 100% rename from src/themes/BaseV1/assets/img/icon-circulo.png rename to src/themes/BaseV1/assets/css/sass/img/icon-circulo.png diff --git a/src/themes/BaseV1/assets/img/icon-espaco.png b/src/themes/BaseV1/assets/css/sass/img/icon-espaco.png similarity index 100% rename from src/themes/BaseV1/assets/img/icon-espaco.png rename to src/themes/BaseV1/assets/css/sass/img/icon-espaco.png diff --git a/src/themes/BaseV1/assets/img/icon-event.png b/src/themes/BaseV1/assets/css/sass/img/icon-event.png similarity index 100% rename from src/themes/BaseV1/assets/img/icon-event.png rename to src/themes/BaseV1/assets/css/sass/img/icon-event.png diff --git a/src/themes/BaseV1/assets/img/icon-evento.png b/src/themes/BaseV1/assets/css/sass/img/icon-evento.png similarity index 100% rename from src/themes/BaseV1/assets/img/icon-evento.png rename to src/themes/BaseV1/assets/css/sass/img/icon-evento.png diff --git a/src/themes/BaseV1/assets/img/icon-fullscreen.png b/src/themes/BaseV1/assets/css/sass/img/icon-fullscreen.png similarity index 100% rename from src/themes/BaseV1/assets/img/icon-fullscreen.png rename to src/themes/BaseV1/assets/css/sass/img/icon-fullscreen.png diff --git a/src/themes/BaseV1/assets/img/icon-localizacao.png b/src/themes/BaseV1/assets/css/sass/img/icon-localizacao.png similarity index 100% rename from src/themes/BaseV1/assets/img/icon-localizacao.png rename to src/themes/BaseV1/assets/css/sass/img/icon-localizacao.png diff --git a/src/themes/BaseV1/assets/img/icon-project.png b/src/themes/BaseV1/assets/css/sass/img/icon-project.png similarity index 100% rename from src/themes/BaseV1/assets/img/icon-project.png rename to src/themes/BaseV1/assets/css/sass/img/icon-project.png diff --git a/src/themes/BaseV1/assets/img/icon-projeto.png b/src/themes/BaseV1/assets/css/sass/img/icon-projeto.png similarity index 100% rename from src/themes/BaseV1/assets/img/icon-projeto.png rename to src/themes/BaseV1/assets/css/sass/img/icon-projeto.png diff --git a/src/themes/BaseV1/assets/img/icon-seal.png b/src/themes/BaseV1/assets/css/sass/img/icon-seal.png similarity index 100% rename from src/themes/BaseV1/assets/img/icon-seal.png rename to src/themes/BaseV1/assets/css/sass/img/icon-seal.png diff --git a/src/themes/BaseV1/assets/img/icon-selo.png b/src/themes/BaseV1/assets/css/sass/img/icon-selo.png similarity index 100% rename from src/themes/BaseV1/assets/img/icon-selo.png rename to src/themes/BaseV1/assets/css/sass/img/icon-selo.png diff --git a/src/themes/BaseV1/assets/img/icon-space.png b/src/themes/BaseV1/assets/css/sass/img/icon-space.png similarity index 100% rename from src/themes/BaseV1/assets/img/icon-space.png rename to src/themes/BaseV1/assets/css/sass/img/icon-space.png diff --git a/src/themes/BaseV1/assets/img/icon-zoom-in.png b/src/themes/BaseV1/assets/css/sass/img/icon-zoom-in.png similarity index 100% rename from src/themes/BaseV1/assets/img/icon-zoom-in.png rename to src/themes/BaseV1/assets/css/sass/img/icon-zoom-in.png diff --git a/src/themes/BaseV1/assets/img/icon-zoom-out.png b/src/themes/BaseV1/assets/css/sass/img/icon-zoom-out.png similarity index 100% rename from src/themes/BaseV1/assets/img/icon-zoom-out.png rename to src/themes/BaseV1/assets/css/sass/img/icon-zoom-out.png diff --git a/src/themes/BaseV1/assets/img/instituto-tim-white.png b/src/themes/BaseV1/assets/css/sass/img/instituto-tim-white.png similarity index 100% rename from src/themes/BaseV1/assets/img/instituto-tim-white.png rename to src/themes/BaseV1/assets/css/sass/img/instituto-tim-white.png diff --git a/src/themes/BaseV1/assets/img/layers.png b/src/themes/BaseV1/assets/css/sass/img/layers.png similarity index 100% rename from src/themes/BaseV1/assets/img/layers.png rename to src/themes/BaseV1/assets/css/sass/img/layers.png diff --git a/src/themes/BaseV1/assets/img/marca-da-org.png b/src/themes/BaseV1/assets/css/sass/img/marca-da-org.png similarity index 100% rename from src/themes/BaseV1/assets/img/marca-da-org.png rename to src/themes/BaseV1/assets/css/sass/img/marca-da-org.png diff --git a/src/themes/BaseV1/assets/img/marker-icon.png b/src/themes/BaseV1/assets/css/sass/img/marker-icon.png similarity index 100% rename from src/themes/BaseV1/assets/img/marker-icon.png rename to src/themes/BaseV1/assets/css/sass/img/marker-icon.png diff --git a/src/themes/BaseV1/assets/img/pin-agent.png b/src/themes/BaseV1/assets/css/sass/img/pin-agent.png similarity index 100% rename from src/themes/BaseV1/assets/img/pin-agent.png rename to src/themes/BaseV1/assets/css/sass/img/pin-agent.png diff --git a/src/themes/BaseV1/assets/img/pin-agent.svg b/src/themes/BaseV1/assets/css/sass/img/pin-agent.svg similarity index 100% rename from src/themes/BaseV1/assets/img/pin-agent.svg rename to src/themes/BaseV1/assets/css/sass/img/pin-agent.svg diff --git a/src/themes/BaseV1/assets/img/pin-agente.png b/src/themes/BaseV1/assets/css/sass/img/pin-agente.png similarity index 100% rename from src/themes/BaseV1/assets/img/pin-agente.png rename to src/themes/BaseV1/assets/css/sass/img/pin-agente.png diff --git a/src/themes/BaseV1/assets/img/pin-agente.svg b/src/themes/BaseV1/assets/css/sass/img/pin-agente.svg similarity index 100% rename from src/themes/BaseV1/assets/img/pin-agente.svg rename to src/themes/BaseV1/assets/css/sass/img/pin-agente.svg diff --git a/src/themes/BaseV1/assets/img/pin-espaco.png b/src/themes/BaseV1/assets/css/sass/img/pin-espaco.png similarity index 100% rename from src/themes/BaseV1/assets/img/pin-espaco.png rename to src/themes/BaseV1/assets/css/sass/img/pin-espaco.png diff --git a/src/themes/BaseV1/assets/img/pin-espaco.svg b/src/themes/BaseV1/assets/css/sass/img/pin-espaco.svg similarity index 100% rename from src/themes/BaseV1/assets/img/pin-espaco.svg rename to src/themes/BaseV1/assets/css/sass/img/pin-espaco.svg diff --git a/src/themes/BaseV1/assets/img/pin-event.png b/src/themes/BaseV1/assets/css/sass/img/pin-event.png similarity index 100% rename from src/themes/BaseV1/assets/img/pin-event.png rename to src/themes/BaseV1/assets/css/sass/img/pin-event.png diff --git a/src/themes/BaseV1/assets/img/pin-event.svg b/src/themes/BaseV1/assets/css/sass/img/pin-event.svg similarity index 100% rename from src/themes/BaseV1/assets/img/pin-event.svg rename to src/themes/BaseV1/assets/css/sass/img/pin-event.svg diff --git a/src/themes/BaseV1/assets/img/pin-evento.png b/src/themes/BaseV1/assets/css/sass/img/pin-evento.png similarity index 100% rename from src/themes/BaseV1/assets/img/pin-evento.png rename to src/themes/BaseV1/assets/css/sass/img/pin-evento.png diff --git a/src/themes/BaseV1/assets/img/pin-evento.svg b/src/themes/BaseV1/assets/css/sass/img/pin-evento.svg similarity index 100% rename from src/themes/BaseV1/assets/img/pin-evento.svg rename to src/themes/BaseV1/assets/css/sass/img/pin-evento.svg diff --git a/src/themes/BaseV1/assets/img/pin-seal.png b/src/themes/BaseV1/assets/css/sass/img/pin-seal.png similarity index 100% rename from src/themes/BaseV1/assets/img/pin-seal.png rename to src/themes/BaseV1/assets/css/sass/img/pin-seal.png diff --git a/src/themes/BaseV1/assets/img/pin-selo.png b/src/themes/BaseV1/assets/css/sass/img/pin-selo.png similarity index 100% rename from src/themes/BaseV1/assets/img/pin-selo.png rename to src/themes/BaseV1/assets/css/sass/img/pin-selo.png diff --git a/src/themes/BaseV1/assets/img/pin-single-example.svg b/src/themes/BaseV1/assets/css/sass/img/pin-single-example.svg similarity index 100% rename from src/themes/BaseV1/assets/img/pin-single-example.svg rename to src/themes/BaseV1/assets/css/sass/img/pin-single-example.svg diff --git a/src/themes/BaseV1/assets/img/pin-sombra.png b/src/themes/BaseV1/assets/css/sass/img/pin-sombra.png similarity index 100% rename from src/themes/BaseV1/assets/img/pin-sombra.png rename to src/themes/BaseV1/assets/css/sass/img/pin-sombra.png diff --git a/src/themes/BaseV1/assets/img/pin-space.png b/src/themes/BaseV1/assets/css/sass/img/pin-space.png similarity index 100% rename from src/themes/BaseV1/assets/img/pin-space.png rename to src/themes/BaseV1/assets/css/sass/img/pin-space.png diff --git a/src/themes/BaseV1/assets/img/pin-space.svg b/src/themes/BaseV1/assets/css/sass/img/pin-space.svg similarity index 100% rename from src/themes/BaseV1/assets/img/pin-space.svg rename to src/themes/BaseV1/assets/css/sass/img/pin-space.svg diff --git a/src/themes/BaseV1/assets/img/setinhas-editable.png b/src/themes/BaseV1/assets/css/sass/img/setinhas-editable.png similarity index 100% rename from src/themes/BaseV1/assets/img/setinhas-editable.png rename to src/themes/BaseV1/assets/css/sass/img/setinhas-editable.png diff --git a/src/themes/BaseV1/assets/img/share.png b/src/themes/BaseV1/assets/css/sass/img/share.png similarity index 100% rename from src/themes/BaseV1/assets/img/share.png rename to src/themes/BaseV1/assets/css/sass/img/share.png diff --git a/src/themes/BaseV1/assets/img/spinner-black.gif b/src/themes/BaseV1/assets/css/sass/img/spinner-black.gif similarity index 100% rename from src/themes/BaseV1/assets/img/spinner-black.gif rename to src/themes/BaseV1/assets/css/sass/img/spinner-black.gif diff --git a/src/themes/BaseV1/assets/img/spinner.gif b/src/themes/BaseV1/assets/css/sass/img/spinner.gif similarity index 100% rename from src/themes/BaseV1/assets/img/spinner.gif rename to src/themes/BaseV1/assets/css/sass/img/spinner.gif diff --git a/src/themes/BaseV1/assets/img/spinner_192.gif b/src/themes/BaseV1/assets/css/sass/img/spinner_192.gif similarity index 100% rename from src/themes/BaseV1/assets/img/spinner_192.gif rename to src/themes/BaseV1/assets/css/sass/img/spinner_192.gif diff --git a/src/themes/BaseV1/assets/img/tim.png b/src/themes/BaseV1/assets/css/sass/img/tim.png similarity index 100% rename from src/themes/BaseV1/assets/img/tim.png rename to src/themes/BaseV1/assets/css/sass/img/tim.png diff --git a/src/themes/BaseV1/assets/img/tour/tour01.png b/src/themes/BaseV1/assets/css/sass/img/tour/tour01.png similarity index 100% rename from src/themes/BaseV1/assets/img/tour/tour01.png rename to src/themes/BaseV1/assets/css/sass/img/tour/tour01.png diff --git a/src/themes/BaseV1/assets/img/tour/tour02.png b/src/themes/BaseV1/assets/css/sass/img/tour/tour02.png similarity index 100% rename from src/themes/BaseV1/assets/img/tour/tour02.png rename to src/themes/BaseV1/assets/css/sass/img/tour/tour02.png diff --git a/src/themes/BaseV1/assets/img/tour/tour03.png b/src/themes/BaseV1/assets/css/sass/img/tour/tour03.png similarity index 100% rename from src/themes/BaseV1/assets/img/tour/tour03.png rename to src/themes/BaseV1/assets/css/sass/img/tour/tour03.png diff --git a/src/themes/BaseV1/assets/img/tour/tour04.png b/src/themes/BaseV1/assets/css/sass/img/tour/tour04.png similarity index 100% rename from src/themes/BaseV1/assets/img/tour/tour04.png rename to src/themes/BaseV1/assets/css/sass/img/tour/tour04.png diff --git a/src/themes/BaseV1/assets/img/tour/tour05.png b/src/themes/BaseV1/assets/css/sass/img/tour/tour05.png similarity index 100% rename from src/themes/BaseV1/assets/img/tour/tour05.png rename to src/themes/BaseV1/assets/css/sass/img/tour/tour05.png diff --git a/src/themes/BaseV1/assets/img/unverified-seal.png b/src/themes/BaseV1/assets/css/sass/img/unverified-seal-small.png similarity index 100% rename from src/themes/BaseV1/assets/img/unverified-seal.png rename to src/themes/BaseV1/assets/css/sass/img/unverified-seal-small.png diff --git a/src/themes/BaseV1/assets/css/sass/img/unverified-seal.png b/src/themes/BaseV1/assets/css/sass/img/unverified-seal.png new file mode 100644 index 0000000000..05b8dd1ae1 Binary files /dev/null and b/src/themes/BaseV1/assets/css/sass/img/unverified-seal.png differ diff --git a/src/themes/BaseV1/assets/img/verified-icon.png b/src/themes/BaseV1/assets/css/sass/img/verified-icon.png similarity index 100% rename from src/themes/BaseV1/assets/img/verified-icon.png rename to src/themes/BaseV1/assets/css/sass/img/verified-icon.png diff --git a/src/themes/BaseV1/assets/img/verified-seal-small.png b/src/themes/BaseV1/assets/css/sass/img/verified-seal-small.png similarity index 100% rename from src/themes/BaseV1/assets/img/verified-seal-small.png rename to src/themes/BaseV1/assets/css/sass/img/verified-seal-small.png diff --git a/src/themes/BaseV1/assets/img/verified-seal.png b/src/themes/BaseV1/assets/css/sass/img/verified-seal.png similarity index 100% rename from src/themes/BaseV1/assets/img/verified-seal.png rename to src/themes/BaseV1/assets/css/sass/img/verified-seal.png diff --git a/src/themes/BaseV1/assets/fonts/OpenSans-Bold-webfont.eot b/src/themes/BaseV1/assets/fonts/OpenSans-Bold-webfont.eot deleted file mode 100644 index 0ceae53ccc..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/OpenSans-Bold-webfont.eot and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/OpenSans-Bold-webfont.ttf b/src/themes/BaseV1/assets/fonts/OpenSans-Bold-webfont.ttf deleted file mode 100644 index 9797435bd4..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/OpenSans-Bold-webfont.ttf and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/OpenSans-Bold-webfont.woff b/src/themes/BaseV1/assets/fonts/OpenSans-Bold-webfont.woff deleted file mode 100644 index 39c3d9a1b6..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/OpenSans-Bold-webfont.woff and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/OpenSans-BoldItalic-webfont.eot b/src/themes/BaseV1/assets/fonts/OpenSans-BoldItalic-webfont.eot deleted file mode 100644 index c22a557e80..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/OpenSans-BoldItalic-webfont.eot and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/OpenSans-BoldItalic-webfont.ttf b/src/themes/BaseV1/assets/fonts/OpenSans-BoldItalic-webfont.ttf deleted file mode 100644 index 7e34c0b0c6..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/OpenSans-BoldItalic-webfont.ttf and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/OpenSans-BoldItalic-webfont.woff b/src/themes/BaseV1/assets/fonts/OpenSans-BoldItalic-webfont.woff deleted file mode 100644 index ee8630b00d..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/OpenSans-BoldItalic-webfont.woff and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/OpenSans-Italic-webfont.eot b/src/themes/BaseV1/assets/fonts/OpenSans-Italic-webfont.eot deleted file mode 100644 index afaef26c87..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/OpenSans-Italic-webfont.eot and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/OpenSans-Italic-webfont.ttf b/src/themes/BaseV1/assets/fonts/OpenSans-Italic-webfont.ttf deleted file mode 100644 index 034c2644fa..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/OpenSans-Italic-webfont.ttf and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/OpenSans-Italic-webfont.woff b/src/themes/BaseV1/assets/fonts/OpenSans-Italic-webfont.woff deleted file mode 100644 index 67c7430e37..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/OpenSans-Italic-webfont.woff and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/OpenSans-Regular-webfont.eot b/src/themes/BaseV1/assets/fonts/OpenSans-Regular-webfont.eot deleted file mode 100644 index 1d3c8bea38..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/OpenSans-Regular-webfont.eot and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/OpenSans-Regular-webfont.ttf b/src/themes/BaseV1/assets/fonts/OpenSans-Regular-webfont.ttf deleted file mode 100644 index b7bbdc2228..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/OpenSans-Regular-webfont.ttf and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/OpenSans-Regular-webfont.woff b/src/themes/BaseV1/assets/fonts/OpenSans-Regular-webfont.woff deleted file mode 100644 index 5f1b132c6d..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/OpenSans-Regular-webfont.woff and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/aleo-bold-webfont.eot b/src/themes/BaseV1/assets/fonts/aleo-bold-webfont.eot deleted file mode 100644 index c3748d3065..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/aleo-bold-webfont.eot and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/aleo-bold-webfont.ttf b/src/themes/BaseV1/assets/fonts/aleo-bold-webfont.ttf deleted file mode 100644 index a0abd1b902..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/aleo-bold-webfont.ttf and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/aleo-bold-webfont.woff b/src/themes/BaseV1/assets/fonts/aleo-bold-webfont.woff deleted file mode 100644 index f8f2d76f4d..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/aleo-bold-webfont.woff and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/aleo-bolditalic-webfont.eot b/src/themes/BaseV1/assets/fonts/aleo-bolditalic-webfont.eot deleted file mode 100644 index 412ec90bf5..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/aleo-bolditalic-webfont.eot and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/aleo-bolditalic-webfont.ttf b/src/themes/BaseV1/assets/fonts/aleo-bolditalic-webfont.ttf deleted file mode 100644 index 80d4b1ee40..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/aleo-bolditalic-webfont.ttf and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/aleo-bolditalic-webfont.woff b/src/themes/BaseV1/assets/fonts/aleo-bolditalic-webfont.woff deleted file mode 100644 index 6523ea4c1a..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/aleo-bolditalic-webfont.woff and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/aleo-light-webfont.eot b/src/themes/BaseV1/assets/fonts/aleo-light-webfont.eot deleted file mode 100644 index 4c20748c30..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/aleo-light-webfont.eot and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/aleo-light-webfont.svg b/src/themes/BaseV1/assets/fonts/aleo-light-webfont.svg deleted file mode 100644 index dd9748e570..0000000000 --- a/src/themes/BaseV1/assets/fonts/aleo-light-webfont.svg +++ /dev/null @@ -1,4299 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/themes/BaseV1/assets/fonts/aleo-light-webfont.ttf b/src/themes/BaseV1/assets/fonts/aleo-light-webfont.ttf deleted file mode 100644 index f99197701f..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/aleo-light-webfont.ttf and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/aleo-light-webfont.woff b/src/themes/BaseV1/assets/fonts/aleo-light-webfont.woff deleted file mode 100644 index e548605d4c..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/aleo-light-webfont.woff and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/aleo-regular-webfont.eot b/src/themes/BaseV1/assets/fonts/aleo-regular-webfont.eot deleted file mode 100644 index e3f2bfc9e1..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/aleo-regular-webfont.eot and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/aleo-regular-webfont.svg b/src/themes/BaseV1/assets/fonts/aleo-regular-webfont.svg deleted file mode 100644 index e52345360c..0000000000 --- a/src/themes/BaseV1/assets/fonts/aleo-regular-webfont.svg +++ /dev/null @@ -1,4372 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/themes/BaseV1/assets/fonts/aleo-regular-webfont.ttf b/src/themes/BaseV1/assets/fonts/aleo-regular-webfont.ttf deleted file mode 100644 index 5b79b16de3..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/aleo-regular-webfont.ttf and /dev/null differ diff --git a/src/themes/BaseV1/assets/fonts/aleo-regular-webfont.woff b/src/themes/BaseV1/assets/fonts/aleo-regular-webfont.woff deleted file mode 100644 index 3b7e6cf11b..0000000000 Binary files a/src/themes/BaseV1/assets/fonts/aleo-regular-webfont.woff and /dev/null differ diff --git a/src/themes/BaseV1/package.json b/src/themes/BaseV1/package.json new file mode 100644 index 0000000000..785186ee0d --- /dev/null +++ b/src/themes/BaseV1/package.json @@ -0,0 +1,17 @@ +{ + "scripts": { + "dev": "mix --mix-config=node_modules/@mapas/scripts/webpack.mix.js", + "build": "mix --mix-config=node_modules/@mapas/scripts/webpack.mix.js --production", + "watch": "mix watch --mix-config=node_modules/@mapas/scripts/webpack.mix.js" + }, + "devDependencies": { + "@mapas/scripts": "workspace:*" + }, + "mapas": { + "assets": { + "css": { + "main": "main" + } + } + } +}