From 11ef73b2df95c08893e2b39a87463edb93f80642 Mon Sep 17 00:00:00 2001 From: Jesus Guerrero Date: Sun, 17 Dec 2023 12:55:13 -0400 Subject: [PATCH 1/3] chore: customize build command --- .do/deploy.template.yml | 4 +- README.md | 2 + composer.json | 3 +- composer.lock | 170 +++++++++++++++++++++------------------- 4 files changed, 97 insertions(+), 82 deletions(-) diff --git a/.do/deploy.template.yml b/.do/deploy.template.yml index 5a6c754b..cc5c87eb 100644 --- a/.do/deploy.template.yml +++ b/.do/deploy.template.yml @@ -5,8 +5,8 @@ spec: git: branch: master repo_clone_url: https://github.com/jesusantguerrero/atmosphere.git - build_command: npm run build:digitalocean - run_command: php artisan migrate:fresh --force --seed ; php artisan storage:link; heroku-php-apache2 public/ && composer install --ignore-platform-reqs + build_command: npm run build:digitalocean; composer install --ignore-platform-reqs + run_command: php artisan migrate:fresh --force --seed ; php artisan storage:link; heroku-php-nginx public/ envs: - key: APP_NAME scope: RUN_TIME diff --git a/README.md b/README.md index 9e2fd14d..09ec1adf 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,8 @@ ![example workflow](https://github.com/jesusantguerrero/atmosphere/actions/workflows/laravel.yml/badge.svg) +![example workflow](https://github.com/jesusantguerrero/atmosphere/actions/workflows/laravel.yml/badge.svg?event-push) + ![image](https://user-images.githubusercontent.com/17421742/212417292-19f319c5-1cf4-48a8-ba40-1e9b040e820f.png) diff --git a/composer.json b/composer.json index 6a0f951d..815867e7 100644 --- a/composer.json +++ b/composer.json @@ -5,8 +5,9 @@ "keywords": ["framework", "laravel"], "license": "MIT", "require": { - "php": "^8.1.0", + "php": "^8.1", "ext-mailparse": "*", + "ext-redis": "*", "brick/money": "^0.6.0", "doctrine/dbal": "^3.3", "dompdf/dompdf": "^2.0.3", diff --git a/composer.lock b/composer.lock index cb861443..f7b338d7 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": "18355d353064e154b65dc29c2322490f", + "content-hash": "c0075c94e330fc7f49b53c5e14cdbcc9", "packages": [ { "name": "bacon/bacon-qr-code", @@ -302,16 +302,16 @@ }, { "name": "carbonphp/carbon-doctrine-types", - "version": "2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git", - "reference": "67a77972b9f398ae7068dabacc39c08aeee170d5" + "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/67a77972b9f398ae7068dabacc39c08aeee170d5", - "reference": "67a77972b9f398ae7068dabacc39c08aeee170d5", + "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/99f76ffa36cce3b70a4a6abce41dba15ca2e84cb", + "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb", "shasum": "" }, "require": { @@ -351,7 +351,7 @@ ], "support": { "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues", - "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/2.0.0" + "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/2.1.0" }, "funding": [ { @@ -367,7 +367,7 @@ "type": "tidelift" } ], - "time": "2023-10-01T14:29:01+00:00" + "time": "2023-12-11T17:09:12+00:00" }, { "name": "composer/semver", @@ -1227,16 +1227,16 @@ }, { "name": "dompdf/dompdf", - "version": "v2.0.3", + "version": "v2.0.4", "source": { "type": "git", "url": "https://github.com/dompdf/dompdf.git", - "reference": "e8d2d5e37e8b0b30f0732a011295ab80680d7e85" + "reference": "093f2d9739cec57428e39ddadedfd4f3ae862c0f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dompdf/dompdf/zipball/e8d2d5e37e8b0b30f0732a011295ab80680d7e85", - "reference": "e8d2d5e37e8b0b30f0732a011295ab80680d7e85", + "url": "https://api.github.com/repos/dompdf/dompdf/zipball/093f2d9739cec57428e39ddadedfd4f3ae862c0f", + "reference": "093f2d9739cec57428e39ddadedfd4f3ae862c0f", "shasum": "" }, "require": { @@ -1283,9 +1283,9 @@ "homepage": "https://github.com/dompdf/dompdf", "support": { "issues": "https://github.com/dompdf/dompdf/issues", - "source": "https://github.com/dompdf/dompdf/tree/v2.0.3" + "source": "https://github.com/dompdf/dompdf/tree/v2.0.4" }, - "time": "2023-02-07T12:51:48+00:00" + "time": "2023-12-12T20:19:39+00:00" }, { "name": "dragonmantank/cron-expression", @@ -3286,16 +3286,16 @@ }, { "name": "laravel/fortify", - "version": "v1.19.0", + "version": "v1.19.1", "source": { "type": "git", "url": "https://github.com/laravel/fortify.git", - "reference": "2da721fead1f3bc18af983e4903c4e1df67177e7" + "reference": "1dde858a520f679b4a2f453fa68f8a0e98751875" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/fortify/zipball/2da721fead1f3bc18af983e4903c4e1df67177e7", - "reference": "2da721fead1f3bc18af983e4903c4e1df67177e7", + "url": "https://api.github.com/repos/laravel/fortify/zipball/1dde858a520f679b4a2f453fa68f8a0e98751875", + "reference": "1dde858a520f679b4a2f453fa68f8a0e98751875", "shasum": "" }, "require": { @@ -3346,20 +3346,20 @@ "issues": "https://github.com/laravel/fortify/issues", "source": "https://github.com/laravel/fortify" }, - "time": "2023-11-27T22:01:18+00:00" + "time": "2023-12-11T16:16:45+00:00" }, { "name": "laravel/framework", - "version": "v10.35.0", + "version": "v10.37.3", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "91ec2d92d2f6007e9084fe06438b99c91845da69" + "reference": "996375dd61f8c6e4ac262b57ed485655d71fcbdc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/91ec2d92d2f6007e9084fe06438b99c91845da69", - "reference": "91ec2d92d2f6007e9084fe06438b99c91845da69", + "url": "https://api.github.com/repos/laravel/framework/zipball/996375dd61f8c6e4ac262b57ed485655d71fcbdc", + "reference": "996375dd61f8c6e4ac262b57ed485655d71fcbdc", "shasum": "" }, "require": { @@ -3548,7 +3548,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-12-05T14:50:33+00:00" + "time": "2023-12-13T20:10:58+00:00" }, { "name": "laravel/jetstream", @@ -3679,16 +3679,16 @@ }, { "name": "laravel/pulse", - "version": "v1.0.0-beta5", + "version": "v1.0.0-beta7", "source": { "type": "git", "url": "https://github.com/laravel/pulse.git", - "reference": "27055078f4cf3ad771e4fa23ec6da50a170c5d1d" + "reference": "1f2d6667b4a68ea4780a149677757193ed692702" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pulse/zipball/27055078f4cf3ad771e4fa23ec6da50a170c5d1d", - "reference": "27055078f4cf3ad771e4fa23ec6da50a170c5d1d", + "url": "https://api.github.com/repos/laravel/pulse/zipball/1f2d6667b4a68ea4780a149677757193ed692702", + "reference": "1f2d6667b4a68ea4780a149677757193ed692702", "shasum": "" }, "require": { @@ -3707,7 +3707,7 @@ "illuminate/routing": "^10.21", "illuminate/support": "^10.21", "illuminate/view": "^10.21", - "livewire/livewire": "^3.02", + "livewire/livewire": "^3.2", "nesbot/carbon": "^2.67", "php": "^8.1" }, @@ -3717,7 +3717,7 @@ "require-dev": { "guzzlehttp/guzzle": "^7.7", "mockery/mockery": "^1.0", - "orchestra/testbench": "^8.0", + "orchestra/testbench": "^8.16", "pestphp/pest": "^2.0", "pestphp/pest-plugin-laravel": "^2.2", "phpstan/phpstan": "^1.11", @@ -3752,6 +3752,7 @@ "email": "taylor@laravel.com" } ], + "description": "Laravel Pulse is a real-time application performance monitoring tool and dashboard for your Laravel application.", "homepage": "https://github.com/laravel/pulse", "keywords": [ "laravel" @@ -3760,7 +3761,7 @@ "issues": "https://github.com/laravel/pulse/issues", "source": "https://github.com/laravel/pulse" }, - "time": "2023-12-05T22:49:00+00:00" + "time": "2023-12-13T00:05:37+00:00" }, { "name": "laravel/sanctum", @@ -4490,16 +4491,16 @@ }, { "name": "livewire/livewire", - "version": "v3.2.6", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/livewire/livewire.git", - "reference": "ecded08cdc4b36bbb4b26bcc7f7a171ea2e4368c" + "reference": "7c1f609515e74ef1197c08e56a5606571b3ec1d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/livewire/livewire/zipball/ecded08cdc4b36bbb4b26bcc7f7a171ea2e4368c", - "reference": "ecded08cdc4b36bbb4b26bcc7f7a171ea2e4368c", + "url": "https://api.github.com/repos/livewire/livewire/zipball/7c1f609515e74ef1197c08e56a5606571b3ec1d9", + "reference": "7c1f609515e74ef1197c08e56a5606571b3ec1d9", "shasum": "" }, "require": { @@ -4552,7 +4553,7 @@ "description": "A front-end framework for Laravel.", "support": { "issues": "https://github.com/livewire/livewire/issues", - "source": "https://github.com/livewire/livewire/tree/v3.2.6" + "source": "https://github.com/livewire/livewire/tree/v3.3.0" }, "funding": [ { @@ -4560,20 +4561,20 @@ "type": "github" } ], - "time": "2023-12-04T21:20:19+00:00" + "time": "2023-12-11T18:04:00+00:00" }, { "name": "maatwebsite/excel", - "version": "3.1.50", + "version": "3.1.51", "source": { "type": "git", "url": "https://github.com/SpartnerNL/Laravel-Excel.git", - "reference": "d79e66391aa306983bb7e234503f5605c3e33348" + "reference": "6d3c78ce6645abada32e03b40dc7f3c561878bc3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/d79e66391aa306983bb7e234503f5605c3e33348", - "reference": "d79e66391aa306983bb7e234503f5605c3e33348", + "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/6d3c78ce6645abada32e03b40dc7f3c561878bc3", + "reference": "6d3c78ce6645abada32e03b40dc7f3c561878bc3", "shasum": "" }, "require": { @@ -4628,7 +4629,7 @@ ], "support": { "issues": "https://github.com/SpartnerNL/Laravel-Excel/issues", - "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.50" + "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.51" }, "funding": [ { @@ -4640,7 +4641,7 @@ "type": "github" } ], - "time": "2023-11-06T11:29:48+00:00" + "time": "2023-12-08T12:44:49+00:00" }, { "name": "maennchen/zipstream-php", @@ -5855,16 +5856,16 @@ }, { "name": "phenx/php-svg-lib", - "version": "0.5.0", + "version": "0.5.1", "source": { "type": "git", "url": "https://github.com/dompdf/php-svg-lib.git", - "reference": "76876c6cf3080bcb6f249d7d59705108166a6685" + "reference": "8a8a1ebcf6aea861ef30197999f096f7bd4b4456" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/76876c6cf3080bcb6f249d7d59705108166a6685", - "reference": "76876c6cf3080bcb6f249d7d59705108166a6685", + "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/8a8a1ebcf6aea861ef30197999f096f7bd4b4456", + "reference": "8a8a1ebcf6aea861ef30197999f096f7bd4b4456", "shasum": "" }, "require": { @@ -5895,9 +5896,9 @@ "homepage": "https://github.com/PhenX/php-svg-lib", "support": { "issues": "https://github.com/dompdf/php-svg-lib/issues", - "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.0" + "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.1" }, - "time": "2022-09-06T12:16:56+00:00" + "time": "2023-12-11T20:56:08+00:00" }, { "name": "php-mime-mail-parser/php-mime-mail-parser", @@ -6393,16 +6394,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.4", + "version": "1.24.5", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "6bd0c26f3786cd9b7c359675cb789e35a8e07496" + "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6bd0c26f3786cd9b7c359675cb789e35a8e07496", - "reference": "6bd0c26f3786cd9b7c359675cb789e35a8e07496", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fedf211ff14ec8381c9bf5714e33a7a552dd1acc", + "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc", "shasum": "" }, "require": { @@ -6434,9 +6435,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.4" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.5" }, - "time": "2023-11-26T18:29:22+00:00" + "time": "2023-12-16T09:33:33+00:00" }, { "name": "pragmarx/google2fa", @@ -7944,16 +7945,16 @@ }, { "name": "staudenmeir/belongs-to-through", - "version": "v2.14", + "version": "v2.15", "source": { "type": "git", "url": "https://github.com/staudenmeir/belongs-to-through.git", - "reference": "b85c0e41e5a7175c7b3f3eab396e31ae7e74d23c" + "reference": "18b5d55ee0db5cc14bbba75702bf312dd28051f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/staudenmeir/belongs-to-through/zipball/b85c0e41e5a7175c7b3f3eab396e31ae7e74d23c", - "reference": "b85c0e41e5a7175c7b3f3eab396e31ae7e74d23c", + "url": "https://api.github.com/repos/staudenmeir/belongs-to-through/zipball/18b5d55ee0db5cc14bbba75702bf312dd28051f3", + "reference": "18b5d55ee0db5cc14bbba75702bf312dd28051f3", "shasum": "" }, "require": { @@ -7961,13 +7962,23 @@ "php": "^8.1" }, "require-dev": { + "barryvdh/laravel-ide-helper": "^2.13", + "orchestra/testbench": "^8.17", "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^10.1" }, "type": "library", + "extra": { + "laravel": { + "providers": [ + "Staudenmeir\\BelongsToThrough\\IdeHelperServiceProvider" + ] + } + }, "autoload": { "psr-4": { - "Znck\\Eloquent\\": "src/" + "Znck\\Eloquent\\": "src/", + "Staudenmeir\\BelongsToThrough\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -7987,7 +7998,7 @@ "description": "Laravel Eloquent BelongsToThrough relationships", "support": { "issues": "https://github.com/staudenmeir/belongs-to-through/issues", - "source": "https://github.com/staudenmeir/belongs-to-through/tree/v2.14" + "source": "https://github.com/staudenmeir/belongs-to-through/tree/v2.15" }, "funding": [ { @@ -7995,7 +8006,7 @@ "type": "custom" } ], - "time": "2023-11-27T21:12:07+00:00" + "time": "2023-12-16T22:07:22+00:00" }, { "name": "symfony/cache", @@ -11872,16 +11883,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "10.1.9", + "version": "10.1.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "a56a9ab2f680246adcf3db43f38ddf1765774735" + "reference": "599109c8ca6bae97b23482d557d2874c25a65e59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/a56a9ab2f680246adcf3db43f38ddf1765774735", - "reference": "a56a9ab2f680246adcf3db43f38ddf1765774735", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/599109c8ca6bae97b23482d557d2874c25a65e59", + "reference": "599109c8ca6bae97b23482d557d2874c25a65e59", "shasum": "" }, "require": { @@ -11938,7 +11949,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.9" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.10" }, "funding": [ { @@ -11946,7 +11957,7 @@ "type": "github" } ], - "time": "2023-11-23T12:23:20+00:00" + "time": "2023-12-11T06:28:43+00:00" }, { "name": "phpunit/php-file-iterator", @@ -12193,16 +12204,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.2", + "version": "10.5.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "5aedff46afba98dddecaa12349ec044d9103d4fe" + "reference": "6fce887c71076a73f32fd3e0774a6833fc5c7f19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5aedff46afba98dddecaa12349ec044d9103d4fe", - "reference": "5aedff46afba98dddecaa12349ec044d9103d4fe", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6fce887c71076a73f32fd3e0774a6833fc5c7f19", + "reference": "6fce887c71076a73f32fd3e0774a6833fc5c7f19", "shasum": "" }, "require": { @@ -12274,7 +12285,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.2" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.3" }, "funding": [ { @@ -12290,7 +12301,7 @@ "type": "tidelift" } ], - "time": "2023-12-05T14:54:33+00:00" + "time": "2023-12-13T07:25:23+00:00" }, { "name": "sebastian/cli-parser", @@ -13424,16 +13435,16 @@ }, { "name": "spatie/laravel-ignition", - "version": "2.3.1", + "version": "2.3.2", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ignition.git", - "reference": "bf21cd15aa47fa4ec5d73bbc932005c70261efc8" + "reference": "4800661a195e15783477d99f7f8f669a49793996" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/bf21cd15aa47fa4ec5d73bbc932005c70261efc8", - "reference": "bf21cd15aa47fa4ec5d73bbc932005c70261efc8", + "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/4800661a195e15783477d99f7f8f669a49793996", + "reference": "4800661a195e15783477d99f7f8f669a49793996", "shasum": "" }, "require": { @@ -13512,7 +13523,7 @@ "type": "github" } ], - "time": "2023-10-09T12:55:26+00:00" + "time": "2023-12-15T13:44:49+00:00" }, { "name": "theseer/tokenizer", @@ -13578,7 +13589,8 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^8.1.0" + "php": "^8.1", + "ext-mailparse": "*" }, "platform-dev": [], "plugin-api-version": "2.3.0" From 0a7595137aeec27dca4bc6bb87efefcf5474be4b Mon Sep 17 00:00:00 2001 From: Jesus Guerrero Date: Sun, 17 Dec 2023 17:51:08 -0400 Subject: [PATCH 2/3] chore: update dependencies --- Dockerfile | 5 ++++ composer.json | 12 +++++++-- composer.lock | 62 ++++++++++++++++++++++------------------------ docker-compose.yml | 3 --- 4 files changed, 45 insertions(+), 37 deletions(-) diff --git a/Dockerfile b/Dockerfile index e4071ba0..876bcf02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,10 @@ FROM php:8.1.2-fpm ARG user ARG uid ARG TZ + +ENV user $user +ENV uid $uid +ENV TZ $TZ # Install system dependencies RUN apt-get update && apt-get install -y \ git \ @@ -36,3 +40,4 @@ RUN mkdir -p /home/$user/.composer && \ WORKDIR /var/www USER $user +CMD ["php artisan serve"] diff --git a/composer.json b/composer.json index 815867e7..f722653e 100644 --- a/composer.json +++ b/composer.json @@ -4,10 +4,18 @@ "description": "The Laravel Framework.", "keywords": ["framework", "laravel"], "license": "MIT", + "repositories": [ + { + "url": "../packages/journal", + "type": "path", + "options": { + "symlink": true + } + } + ], "require": { "php": "^8.1", "ext-mailparse": "*", - "ext-redis": "*", "brick/money": "^0.6.0", "doctrine/dbal": "^3.3", "dompdf/dompdf": "^2.0.3", @@ -29,7 +37,7 @@ "laravel/tinker": "^2.8", "maatwebsite/excel": "^3.1", "nwidart/laravel-modules": "^9.0", - "php-mime-mail-parser/php-mime-mail-parser": "^7.1", + "php-mime-mail-parser/php-mime-mail-parser": "^8.0", "phpoffice/phpspreadsheet": "^1.27", "rlanvin/php-rrule": "^2.4", "simshaun/recurr": "^5.0", diff --git a/composer.lock b/composer.lock index f7b338d7..ad0437ce 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": "c0075c94e330fc7f49b53c5e14cdbcc9", + "content-hash": "9ea65b2532aada17a850815c50136ee4", "packages": [ { "name": "bacon/bacon-qr-code", @@ -2636,16 +2636,10 @@ { "name": "insane/journal", "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/insane-code/journal.git", - "reference": "424233e9ffa538efc51700b0bdd6700069717124" - }, "dist": { - "type": "zip", - "url": "https://api.github.com/repos/insane-code/journal/zipball/424233e9ffa538efc51700b0bdd6700069717124", - "reference": "424233e9ffa538efc51700b0bdd6700069717124", - "shasum": "" + "type": "path", + "url": "../packages/journal", + "reference": "424233e9ffa538efc51700b0bdd6700069717124" }, "require": { "staudenmeir/belongs-to-through": "^2.5" @@ -2659,7 +2653,6 @@ "phpunit/phpunit": "^7.4@dev", "symfony/thanks": "^1.0" }, - "default-branch": true, "type": "library", "extra": { "laravel": { @@ -2676,7 +2669,19 @@ "Insane\\Journal\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "autoload-dev": { + "psr-4": { + "Insane\\Journal\\Tests\\": "tests/" + } + }, + "scripts": { + "test": [ + "vendor/bin/phpunit" + ], + "test-coverage": [ + "vendor/bin/phpunit --coverage-html coverage" + ] + }, "license": [ "MIT" ], @@ -2688,14 +2693,13 @@ ], "description": "Accounting module for atmosphere and laravel", "keywords": [ - "Accounting", + "accounting", "invoicing" ], - "support": { - "issues": "https://github.com/insane-code/journal/issues", - "source": "https://github.com/insane-code/journal/tree/v1.0.5" - }, - "time": "2023-12-09T15:00:26+00:00" + "transport-options": { + "symlink": true, + "relative": true + } }, { "name": "insane/plan-module", @@ -5902,21 +5906,21 @@ }, { "name": "php-mime-mail-parser/php-mime-mail-parser", - "version": "7.1.2", + "version": "8.0.2", "source": { "type": "git", "url": "https://github.com/php-mime-mail-parser/php-mime-mail-parser.git", - "reference": "81d84bbc6a73b913110e155e98059526825c7ee3" + "reference": "f922907123625d940adbba7be403a2e620d0a8e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-mime-mail-parser/php-mime-mail-parser/zipball/81d84bbc6a73b913110e155e98059526825c7ee3", - "reference": "81d84bbc6a73b913110e155e98059526825c7ee3", + "url": "https://api.github.com/repos/php-mime-mail-parser/php-mime-mail-parser/zipball/f922907123625d940adbba7be403a2e620d0a8e5", + "reference": "f922907123625d940adbba7be403a2e620d0a8e5", "shasum": "" }, "require": { "ext-mailparse": "*", - "php": "^7.2|^8.0" + "php": "^8.0" }, "replace": { "exorus/php-mime-mail-parser": "*", @@ -5969,7 +5973,7 @@ "role": "Developer" } ], - "description": "A fully tested email parser for PHP 7.2+ (mailparse extension wrapper).", + "description": "A fully tested email parser for PHP 8.0+ (mailparse extension wrapper).", "homepage": "https://github.com/php-mime-mail-parser/php-mime-mail-parser", "keywords": [ "MimeMailParser", @@ -5981,15 +5985,9 @@ ], "support": { "issues": "https://github.com/php-mime-mail-parser/php-mime-mail-parser/issues", - "source": "https://github.com/php-mime-mail-parser/php-mime-mail-parser/tree/7.1.2" + "source": "https://github.com/php-mime-mail-parser/php-mime-mail-parser/tree/8.0.2" }, - "funding": [ - { - "url": "https://github.com/eXorus", - "type": "github" - } - ], - "time": "2022-04-16T07:56:53+00:00" + "time": "2023-08-23T13:29:02+00:00" }, { "name": "phpdocumentor/reflection-common", diff --git a/docker-compose.yml b/docker-compose.yml index 85913e92..9ec49433 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -123,8 +123,6 @@ services: phpmyadmin: depends_on: - db - #links: - #- db:mysql image: phpmyadmin/phpmyadmin container_name: phpmyadmin restart: always @@ -134,7 +132,6 @@ services: environment: - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - VIRTUAL_HOST=phpmyadmin.${HOST_DOMAIN} - #- VIRTUAL_PORT=8002 - LETSENCRYPT_HOST=phpmyadmin.${HOST_DOMAIN} - LETSENCRYPT_EMAIL=jesusant.guerrero@gmail.com networks: From c3ab683a79a8272be9b2b6e8429b61ecbe332f35 Mon Sep 17 00:00:00 2001 From: Jesus Guerrero Date: Sun, 17 Dec 2023 20:08:06 -0400 Subject: [PATCH 3/3] fix: rollover --- app/Domains/Budget/Services/BudgetRolloverService.php | 4 ++++ app/Domains/Transaction/Services/TransactionService.php | 2 +- resources/js/Pages/Finance/Budget.vue | 2 +- resources/js/Pages/Journal/Statements/Category.vue | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Domains/Budget/Services/BudgetRolloverService.php b/app/Domains/Budget/Services/BudgetRolloverService.php index f9583389..d77d282c 100644 --- a/app/Domains/Budget/Services/BudgetRolloverService.php +++ b/app/Domains/Budget/Services/BudgetRolloverService.php @@ -52,6 +52,10 @@ private function setMonthBudget($category, $month) { 'name' => $month, ])->first(); + if (!$budgetMonth) { + return; + } + if ($budgetMonth->category->account_id) { $available = (- $budgetMonth->payments); $available = Money::of($budgetMonth->funded_spending, $category->account->currency_code) diff --git a/app/Domains/Transaction/Services/TransactionService.php b/app/Domains/Transaction/Services/TransactionService.php index 8f5b4bf6..7e88fa84 100644 --- a/app/Domains/Transaction/Services/TransactionService.php +++ b/app/Domains/Transaction/Services/TransactionService.php @@ -456,10 +456,10 @@ public function getCreditCardSpentTransactions(int $teamId) { ->orderByRaw('g.index,categories.index, accounts.index,accounts.number') ->where(fn ($q) => $q->where([ 'transactions.status' => Transaction::STATUS_VERIFIED, - 'accounts.team_id' => $teamId ])->orWhereNull('transactions.status') ) ->where([ + 'accounts.team_id' => $teamId, 'g.display_id' => 'liabilities', ]) ->get(); diff --git a/resources/js/Pages/Finance/Budget.vue b/resources/js/Pages/Finance/Budget.vue index e6c04d18..2ec9c537 100644 --- a/resources/js/Pages/Finance/Budget.vue +++ b/resources/js/Pages/Finance/Budget.vue @@ -121,7 +121,7 @@ const goToday = () => { const budgetAccountsTotal = computed(() => { return props.accounts.reduce((total, account) => { - console.log(account); + console.log(account.balance_type, account.name); return account.balance_type == 'CREDIT' ? total : exactMath.add(total, account?.balance) diff --git a/resources/js/Pages/Journal/Statements/Category.vue b/resources/js/Pages/Journal/Statements/Category.vue index c3a505e5..e7766d74 100644 --- a/resources/js/Pages/Journal/Statements/Category.vue +++ b/resources/js/Pages/Journal/Statements/Category.vue @@ -146,7 +146,7 @@ const { customPrint } = usePrint("report");
- {{ categories.alias ?? categories.name }} + {{ categories.alias || (categories.label ?? categories.name) }}
@@ -163,7 +163,7 @@ const { customPrint } = usePrint("report");
- {{ account.alias ?? account.name }} + {{ account.alias || (account.name ?? account) }}