From c55fce7f792bac3d4f39dc7940e7bdfab859acb4 Mon Sep 17 00:00:00 2001 From: Jesus Guerrero Date: Wed, 27 Dec 2023 10:00:55 -0400 Subject: [PATCH] fix: remove event from finance index --- Caddyfile | 4 +- .../Controllers/Finance/FinanceController.php | 2 +- components.d.ts | 7 + composer.json | 1 + composer.lock | 264 +++++++++++++++++- .../organisms/LogerApiSimpleSelect.vue | 227 +++++++-------- .../js/Components/templates/AppGlobals.vue | 1 - 7 files changed, 388 insertions(+), 118 deletions(-) diff --git a/Caddyfile b/Caddyfile index 62aeb86b..0dde8b49 100644 --- a/Caddyfile +++ b/Caddyfile @@ -17,9 +17,9 @@ dev-loger.neatlancer.com { # Transport to use (default to Bolt) transport_url {$MERCURE_TRANSPORT_URL:bolt://mercure.db} # Publisher JWT key - publisher_jwt {env.MERCURE_PUBLISHER_JWT_KEY} {env.MERCURE_PUBLISHER_JWT_ALG} + publisher_jwt {env.MERCURE_PUBLISHER_JWT_KEY} # Subscriber JWT key - subscriber_jwt {env.MERCURE_SUBSCRIBER_JWT_KEY} {env.MERCURE_SUBSCRIBER_JWT_ALG} + subscriber_jwt {env.MERCURE_SUBSCRIBER_JWT_KEY} # Permissive configuration for the development environment cors_origins * publish_origins * diff --git a/app/Http/Controllers/Finance/FinanceController.php b/app/Http/Controllers/Finance/FinanceController.php index 8ece196c..135cc4fe 100644 --- a/app/Http/Controllers/Finance/FinanceController.php +++ b/app/Http/Controllers/Finance/FinanceController.php @@ -52,7 +52,7 @@ public function index(Request $request) $savings = BudgetMonthService::getSavingsBalance($teamId, $endDate); $savingsInMonth = BudgetMonthService::getSavingsBalance($teamId, $endDate, $startDate); - BudgetCalculated::dispatch(); + // BudgetCalculated::dispatch(); return Jetstream::inertia()->render($request, 'Finance/Index', [ 'sectionTitle' => 'Finance', diff --git a/components.d.ts b/components.d.ts index 22e10afb..ba6f29af 100644 --- a/components.d.ts +++ b/components.d.ts @@ -8,18 +8,25 @@ export {} declare module 'vue' { export interface GlobalComponents { IFluentFoodApple20Filled: typeof import('~icons/fluent/food-apple20-filled')['default'] + IIonEllipsisVertical: typeof import('~icons/ion/ellipsis-vertical')['default'] IMaterialSymbolsBrightnessAlertOutlineRounded: typeof import('~icons/material-symbols/brightness-alert-outline-rounded')['default'] IMdiBankTransfer: typeof import('~icons/mdi/bank-transfer')['default'] IMdiBankTransferIn: typeof import('~icons/mdi/bank-transfer-in')['default'] IMdiBankTransferOut: typeof import('~icons/mdi/bank-transfer-out')['default'] IMdiCallSplit: typeof import('~icons/mdi/call-split')['default'] + IMdiCheck: typeof import('~icons/mdi/check')['default'] + IMdiClose: typeof import('~icons/mdi/close')['default'] IMdiEdit: typeof import('~icons/mdi/edit')['default'] IMdiEllipsisVertical: typeof import('~icons/mdi/ellipsis-vertical')['default'] IMdiFile: typeof import('~icons/mdi/file')['default'] + IMdiFilter: typeof import('~icons/mdi/filter')['default'] + IMdiHistory: typeof import('~icons/mdi/history')['default'] IMdiLink: typeof import('~icons/mdi/link')['default'] IMdiLock: typeof import('~icons/mdi/lock')['default'] IMdiMinus: typeof import('~icons/mdi/minus')['default'] IMdiPlus: typeof import('~icons/mdi/plus')['default'] + IMdiSearch: typeof import('~icons/mdi/search')['default'] + IMdiSort: typeof import('~icons/mdi/sort')['default'] IMdiStar: typeof import('~icons/mdi/star')['default'] IMdiStarOutline: typeof import('~icons/mdi/star-outline')['default'] IMdiSync: typeof import('~icons/mdi/sync')['default'] diff --git a/composer.json b/composer.json index 59b08f4c..1329fee1 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,7 @@ "laravel/cashier-paddle": "^1.8", "laravel/framework": "^10.0", "laravel/jetstream": "^2.3", + "laravel/octane": "^2.2", "laravel/pulse": "^1.0@beta", "laravel/sanctum": "^3.2", "laravel/tinker": "^2.8", diff --git a/composer.lock b/composer.lock index e1751f67..5f21b818 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": "e172466ff26c1953dbae455f7fcc23bc", + "content-hash": "7c01117d95b0db236cdb61d54786b42a", "packages": [ { "name": "amphp/amp", @@ -3753,6 +3753,91 @@ ], "time": "2023-12-01T04:27:02+00:00" }, + { + "name": "laminas/laminas-diactoros", + "version": "3.3.0", + "source": { + "type": "git", + "url": "https://github.com/laminas/laminas-diactoros.git", + "reference": "4db52734837c60259c9b2d7caf08eef8f7f9b9ac" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/4db52734837c60259c9b2d7caf08eef8f7f9b9ac", + "reference": "4db52734837c60259c9b2d7caf08eef8f7f9b9ac", + "shasum": "" + }, + "require": { + "php": "~8.1.0 || ~8.2.0 || ~8.3.0", + "psr/http-factory": "^1.0.2", + "psr/http-message": "^1.1 || ^2.0" + }, + "provide": { + "psr/http-factory-implementation": "^1.1 || ^2.0", + "psr/http-message-implementation": "^1.1 || ^2.0" + }, + "require-dev": { + "ext-curl": "*", + "ext-dom": "*", + "ext-gd": "*", + "ext-libxml": "*", + "http-interop/http-factory-tests": "^0.9.0", + "laminas/laminas-coding-standard": "~2.5.0", + "php-http/psr7-integration-tests": "^1.3", + "phpunit/phpunit": "^9.5.28", + "psalm/plugin-phpunit": "^0.18.4", + "vimeo/psalm": "^5.15.0" + }, + "type": "library", + "extra": { + "laminas": { + "config-provider": "Laminas\\Diactoros\\ConfigProvider", + "module": "Laminas\\Diactoros" + } + }, + "autoload": { + "files": [ + "src/functions/create_uploaded_file.php", + "src/functions/marshal_headers_from_sapi.php", + "src/functions/marshal_method_from_sapi.php", + "src/functions/marshal_protocol_version_from_sapi.php", + "src/functions/normalize_server.php", + "src/functions/normalize_uploaded_files.php", + "src/functions/parse_cookie_header.php" + ], + "psr-4": { + "Laminas\\Diactoros\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "PSR HTTP Message implementations", + "homepage": "https://laminas.dev", + "keywords": [ + "http", + "laminas", + "psr", + "psr-17", + "psr-7" + ], + "support": { + "chat": "https://laminas.dev/chat", + "docs": "https://docs.laminas.dev/laminas-diactoros/", + "forum": "https://discourse.laminas.dev", + "issues": "https://github.com/laminas/laminas-diactoros/issues", + "rss": "https://github.com/laminas/laminas-diactoros/releases.atom", + "source": "https://github.com/laminas/laminas-diactoros" + }, + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], + "time": "2023-10-26T11:01:07+00:00" + }, { "name": "laravel/cashier-paddle", "version": "v1.9.2", @@ -4174,6 +4259,94 @@ }, "time": "2023-02-14T19:28:38+00:00" }, + { + "name": "laravel/octane", + "version": "v2.2.5", + "source": { + "type": "git", + "url": "https://github.com/laravel/octane.git", + "reference": "6a625a848bdedb2b22eced8cdb06d38aaaf1b38a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/octane/zipball/6a625a848bdedb2b22eced8cdb06d38aaaf1b38a", + "reference": "6a625a848bdedb2b22eced8cdb06d38aaaf1b38a", + "shasum": "" + }, + "require": { + "laminas/laminas-diactoros": "^3.0", + "laravel/framework": "^10.10.1", + "laravel/serializable-closure": "^1.3.0", + "nesbot/carbon": "^2.66.0", + "php": "^8.1.0", + "symfony/psr-http-message-bridge": "^2.2.0" + }, + "conflict": { + "spiral/roadrunner": "<2023.1.0", + "spiral/roadrunner-cli": "<2.5.0", + "spiral/roadrunner-http": "<3.0.1" + }, + "require-dev": { + "guzzlehttp/guzzle": "^7.6.1", + "inertiajs/inertia-laravel": "^0.6.9", + "laravel/scout": "^10.2.1", + "laravel/socialite": "^5.6.1", + "livewire/livewire": "^2.12.3", + "mockery/mockery": "^1.5.1", + "nunomaduro/collision": "^6.4.0|^7.5.2", + "orchestra/testbench": "^8.5.2", + "phpstan/phpstan": "^1.10.15", + "phpunit/phpunit": "^10.1.3", + "spiral/roadrunner-cli": "^2.5.0", + "spiral/roadrunner-http": "^3.0.1" + }, + "bin": [ + "bin/roadrunner-worker", + "bin/swoole-server" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + }, + "laravel": { + "providers": [ + "Laravel\\Octane\\OctaneServiceProvider" + ], + "aliases": { + "Octane": "Laravel\\Octane\\Facades\\Octane" + } + } + }, + "autoload": { + "psr-4": { + "Laravel\\Octane\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "Supercharge your Laravel application's performance.", + "keywords": [ + "frankenphp", + "laravel", + "octane", + "roadrunner", + "swoole" + ], + "support": { + "issues": "https://github.com/laravel/octane/issues", + "source": "https://github.com/laravel/octane" + }, + "time": "2023-12-21T19:20:57+00:00" + }, { "name": "laravel/prompts", "version": "v0.1.13", @@ -11020,6 +11193,95 @@ ], "time": "2023-11-17T21:06:49+00:00" }, + { + "name": "symfony/psr-http-message-bridge", + "version": "v2.3.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/psr-http-message-bridge.git", + "reference": "581ca6067eb62640de5ff08ee1ba6850a0ee472e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/581ca6067eb62640de5ff08ee1ba6850a0ee472e", + "reference": "581ca6067eb62640de5ff08ee1ba6850a0ee472e", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "psr/http-message": "^1.0 || ^2.0", + "symfony/deprecation-contracts": "^2.5 || ^3.0", + "symfony/http-foundation": "^5.4 || ^6.0" + }, + "require-dev": { + "nyholm/psr7": "^1.1", + "psr/log": "^1.1 || ^2 || ^3", + "symfony/browser-kit": "^5.4 || ^6.0", + "symfony/config": "^5.4 || ^6.0", + "symfony/event-dispatcher": "^5.4 || ^6.0", + "symfony/framework-bundle": "^5.4 || ^6.0", + "symfony/http-kernel": "^5.4 || ^6.0", + "symfony/phpunit-bridge": "^6.2" + }, + "suggest": { + "nyholm/psr7": "For a super lightweight PSR-7/17 implementation" + }, + "type": "symfony-bridge", + "extra": { + "branch-alias": { + "dev-main": "2.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Bridge\\PsrHttpMessage\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "PSR HTTP message bridge", + "homepage": "http://symfony.com", + "keywords": [ + "http", + "http-message", + "psr-17", + "psr-7" + ], + "support": { + "issues": "https://github.com/symfony/psr-http-message-bridge/issues", + "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.3.1" + }, + "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-07-26T11:53:26+00:00" + }, { "name": "symfony/routing", "version": "v6.4.1", diff --git a/resources/js/Components/organisms/LogerApiSimpleSelect.vue b/resources/js/Components/organisms/LogerApiSimpleSelect.vue index 274d948d..2b0a26db 100644 --- a/resources/js/Components/organisms/LogerApiSimpleSelect.vue +++ b/resources/js/Components/organisms/LogerApiSimpleSelect.vue @@ -1,6 +1,5 @@ - diff --git a/resources/js/Components/templates/AppGlobals.vue b/resources/js/Components/templates/AppGlobals.vue index ddc361c2..e20f0878 100644 --- a/resources/js/Components/templates/AppGlobals.vue +++ b/resources/js/Components/templates/AppGlobals.vue @@ -11,7 +11,6 @@ import { config } from "@/config/index"; const { isOpen, closeTransactionModal } = useTransactionModal(); const onTransactionSaved = () => { - debugger; router.reload(); closeTransactionModal(); };