mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2026-03-12 07:17:53 +00:00
Compare commits
14 Commits
develop-20
...
develop-20
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
481b01e4f7 | ||
|
|
629f70d27d | ||
|
|
57f5ebc0f9 | ||
|
|
b4f51e7b47 | ||
|
|
d78d254e86 | ||
|
|
eb0c113699 | ||
|
|
a620b07c00 | ||
|
|
cb724145f2 | ||
|
|
8ef17f6686 | ||
|
|
debfd9160c | ||
|
|
f2482e4ace | ||
|
|
d98d757f8b | ||
|
|
0c9a41a929 | ||
|
|
e26f78bf50 |
40
.ci/php-cs-fixer/composer.lock
generated
40
.ci/php-cs-fixer/composer.lock
generated
@@ -72,26 +72,26 @@
|
||||
},
|
||||
{
|
||||
"name": "composer/pcre",
|
||||
"version": "3.2.0",
|
||||
"version": "3.3.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/composer/pcre.git",
|
||||
"reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90"
|
||||
"reference": "1637e067347a0c40bbb1e3cd786b20dcab556a81"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/composer/pcre/zipball/ea4ab6f9580a4fd221e0418f2c357cdd39102a90",
|
||||
"reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90",
|
||||
"url": "https://api.github.com/repos/composer/pcre/zipball/1637e067347a0c40bbb1e3cd786b20dcab556a81",
|
||||
"reference": "1637e067347a0c40bbb1e3cd786b20dcab556a81",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^7.4 || ^8.0"
|
||||
},
|
||||
"conflict": {
|
||||
"phpstan/phpstan": "<1.11.8"
|
||||
"phpstan/phpstan": "<1.11.10"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpstan/phpstan": "^1.11.8",
|
||||
"phpstan/phpstan": "^1.11.10",
|
||||
"phpstan/phpstan-strict-rules": "^1.1",
|
||||
"phpunit/phpunit": "^8 || ^9"
|
||||
},
|
||||
@@ -131,7 +131,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/composer/pcre/issues",
|
||||
"source": "https://github.com/composer/pcre/tree/3.2.0"
|
||||
"source": "https://github.com/composer/pcre/tree/3.3.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -147,7 +147,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-07-25T09:36:02+00:00"
|
||||
"time": "2024-08-19T19:43:53+00:00"
|
||||
},
|
||||
{
|
||||
"name": "composer/semver",
|
||||
@@ -406,16 +406,16 @@
|
||||
},
|
||||
{
|
||||
"name": "friendsofphp/php-cs-fixer",
|
||||
"version": "v3.61.1",
|
||||
"version": "v3.62.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
|
||||
"reference": "94a87189f55814e6cabca2d9a33b06de384a2ab8"
|
||||
"reference": "627692f794d35c43483f34b01d94740df2a73507"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/94a87189f55814e6cabca2d9a33b06de384a2ab8",
|
||||
"reference": "94a87189f55814e6cabca2d9a33b06de384a2ab8",
|
||||
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/627692f794d35c43483f34b01d94740df2a73507",
|
||||
"reference": "627692f794d35c43483f34b01d94740df2a73507",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -497,7 +497,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
|
||||
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.61.1"
|
||||
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.62.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -505,7 +505,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2024-07-31T14:33:15+00:00"
|
||||
"time": "2024-08-07T17:03:09+00:00"
|
||||
},
|
||||
{
|
||||
"name": "psr/container",
|
||||
@@ -612,16 +612,16 @@
|
||||
},
|
||||
{
|
||||
"name": "psr/log",
|
||||
"version": "3.0.0",
|
||||
"version": "3.0.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/php-fig/log.git",
|
||||
"reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
|
||||
"reference": "79dff0b268932c640297f5208d6298f71855c03e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
|
||||
"reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
|
||||
"url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e",
|
||||
"reference": "79dff0b268932c640297f5208d6298f71855c03e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -656,9 +656,9 @@
|
||||
"psr-3"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/php-fig/log/tree/3.0.0"
|
||||
"source": "https://github.com/php-fig/log/tree/3.0.1"
|
||||
},
|
||||
"time": "2021-07-14T16:46:02+00:00"
|
||||
"time": "2024-08-21T13:31:24+00:00"
|
||||
},
|
||||
{
|
||||
"name": "react/cache",
|
||||
|
||||
@@ -37,6 +37,7 @@ use Illuminate\Support\Arr;
|
||||
use Illuminate\Validation\ValidationException as LaravelValidationException;
|
||||
use Laravel\Passport\Exceptions\OAuthServerException as LaravelOAuthException;
|
||||
use LaravelJsonApi\Core\Exceptions\JsonApiException;
|
||||
use LaravelJsonApi\Exceptions\ExceptionParser;
|
||||
use League\OAuth2\Server\Exception\OAuthServerException;
|
||||
use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
@@ -67,6 +68,16 @@ class Handler extends ExceptionHandler
|
||||
JsonApiException::class,
|
||||
];
|
||||
|
||||
/**
|
||||
* Register the exception handling callbacks for the application.
|
||||
*/
|
||||
public function register(): void
|
||||
{
|
||||
$this->renderable(
|
||||
ExceptionParser::make()->renderable()
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Render an exception into an HTTP response. It's complex but lucky for us, we never use it because
|
||||
* Firefly III never crashes.
|
||||
@@ -81,15 +92,23 @@ class Handler extends ExceptionHandler
|
||||
public function render($request, \Throwable $e): Response
|
||||
{
|
||||
$expectsJson = $request->expectsJson();
|
||||
// if the user requests anything /api/, assume the user wants to see JSON.
|
||||
if (str_starts_with($request->getRequestUri(), '/api/')) {
|
||||
app('log')->debug('API endpoint, always assume user wants JSON.');
|
||||
$expectsJson = true;
|
||||
}
|
||||
|
||||
app('log')->debug('Now in Handler::render()');
|
||||
|
||||
if ($e instanceof JsonApiException) {
|
||||
// ignore it: controller will handle it.
|
||||
|
||||
app('log')->debug(sprintf(
|
||||
'Return to parent to handle JsonApiException(%d)',
|
||||
$e->getCode()
|
||||
));
|
||||
|
||||
return parent::render($request, $e);
|
||||
}
|
||||
|
||||
if ($e instanceof LaravelValidationException && $expectsJson) {
|
||||
// ignore it: controller will handle it.
|
||||
|
||||
app('log')->debug(sprintf('Return to parent to handle LaravelValidationException(%d)', $e->status));
|
||||
|
||||
return parent::render($request, $e);
|
||||
|
||||
@@ -805,7 +805,7 @@ class GroupCollector implements GroupCollectorInterface
|
||||
return 'zzz';
|
||||
}
|
||||
|
||||
exit('here we are');
|
||||
exit('here we are 2');
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -99,6 +99,10 @@ class AccountRepository extends AbstractRepository implements QueriesAll, Create
|
||||
return Capabilities\CrudAccount::make();
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO piggy banks
|
||||
* TODO transactions
|
||||
*/
|
||||
protected function relations(): CrudRelations
|
||||
{
|
||||
Log::debug(__METHOD__);
|
||||
|
||||
@@ -4,30 +4,55 @@ declare(strict_types=1);
|
||||
|
||||
namespace FireflyIII\JsonApi\V2\Accounts;
|
||||
|
||||
use FireflyIII\Rules\BelongsUser;
|
||||
use FireflyIII\Rules\Account\IsUniqueAccount;
|
||||
use FireflyIII\Rules\IsBoolean;
|
||||
use FireflyIII\Rules\IsValidPositiveAmount;
|
||||
use FireflyIII\Rules\UniqueAccountNumber;
|
||||
use FireflyIII\Rules\UniqueIban;
|
||||
use FireflyIII\Support\Request\ConvertsDataTypes;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use LaravelJsonApi\Laravel\Http\Requests\ResourceRequest;
|
||||
|
||||
class AccountRequest extends ResourceRequest
|
||||
{
|
||||
use ConvertsDataTypes;
|
||||
|
||||
/**
|
||||
* Get the validation rules for the resource.
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
Log::debug(__METHOD__);
|
||||
|
||||
exit('am i used');
|
||||
$accountRoles = implode(',', config('firefly.accountRoles'));
|
||||
$ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
|
||||
$types = implode(',', array_keys(config('firefly.subTitlesByIdentifier')));
|
||||
$type = $this->convertString('type');
|
||||
// var_dump($types);exit;
|
||||
|
||||
return [
|
||||
'type' => [
|
||||
new BelongsUser(),
|
||||
],
|
||||
'name' => [
|
||||
'nullable',
|
||||
'string',
|
||||
'max:255',
|
||||
],
|
||||
'name' => ['required', 'max:1024', 'min:1'], // , new IsUniqueAccount()
|
||||
'account_type' => ['required', 'max:1024', 'min:1', sprintf('in:%s', $types)],
|
||||
// 'iban' => ['iban', 'nullable', new UniqueIban(null, $type)],
|
||||
// 'bic' => 'bic|nullable',
|
||||
// 'account_number' => ['min:1', 'max:255', 'nullable', new UniqueAccountNumber(null, $type)],
|
||||
// 'opening_balance' => 'numeric|required_with:opening_balance_date|nullable',
|
||||
// 'opening_balance_date' => 'date|required_with:opening_balance|nullable',
|
||||
// 'virtual_balance' => 'numeric|nullable',
|
||||
// 'order' => 'numeric|nullable',
|
||||
// 'currency_id' => 'numeric|exists:transaction_currencies,id',
|
||||
// 'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
|
||||
// 'active' => [new IsBoolean()],
|
||||
// 'include_net_worth' => [new IsBoolean()],
|
||||
// 'account_role' => sprintf('nullable|in:%s|required_if:type,asset', $accountRoles),
|
||||
// 'credit_card_type' => sprintf('nullable|in:%s|required_if:account_role,ccAsset', $ccPaymentTypes),
|
||||
// 'monthly_payment_date' => 'nullable|date|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull',
|
||||
// 'liability_type' => 'nullable|required_if:type,liability|required_if:type,liabilities|in:loan,debt,mortgage',
|
||||
// 'liability_amount' => ['required_with:liability_start_date', new IsValidPositiveAmount()],
|
||||
// 'liability_start_date' => 'required_with:liability_amount|date',
|
||||
// 'liability_direction' => 'nullable|required_if:type,liability|required_if:type,liabilities|in:credit,debit',
|
||||
// 'interest' => 'min:0|max:100|numeric',
|
||||
// 'interest_period' => sprintf('nullable|in:%s', implode(',', config('firefly.interest_periods'))),
|
||||
// 'notes' => 'min:0|max:32768',
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,6 @@ namespace FireflyIII\JsonApi\V2\Accounts;
|
||||
|
||||
use FireflyIII\Models\Account;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use LaravelJsonApi\Core\Resources\JsonApiResource;
|
||||
|
||||
/**
|
||||
@@ -38,7 +37,7 @@ class AccountResource extends JsonApiResource
|
||||
'active' => $this->resource->active,
|
||||
'order' => $this->resource->order,
|
||||
'iban' => $this->resource->iban,
|
||||
'type' => $this->resource->account_type_string,
|
||||
'account_type' => $this->resource->account_type_string,
|
||||
'account_role' => $this->resource->account_role,
|
||||
'account_number' => '' === $this->resource->account_number ? null : $this->resource->account_number,
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ class AccountSchema extends Schema
|
||||
Attribute::make('active')->sortable(),
|
||||
Attribute::make('order')->sortable(),
|
||||
Attribute::make('iban')->sortable(),
|
||||
Attribute::make('type'),
|
||||
Attribute::make('account_type'),
|
||||
Attribute::make('account_role'),
|
||||
Attribute::make('account_number')->sortable(),
|
||||
|
||||
@@ -60,7 +60,9 @@ class AccountSchema extends Schema
|
||||
Attribute::make('liability_direction'),
|
||||
Attribute::make('interest'),
|
||||
Attribute::make('interest_period'),
|
||||
Attribute::make('current_debt')->sortable(),
|
||||
// Attribute::make('current_debt')->sortable(),
|
||||
|
||||
// TODO credit card fields.
|
||||
|
||||
// dynamic data
|
||||
Attribute::make('last_activity')->sortable(),
|
||||
|
||||
@@ -53,6 +53,8 @@ class CrudAccount extends CrudResource
|
||||
|
||||
public function create(array $validatedData): Account
|
||||
{
|
||||
exit('here we are');
|
||||
var_dump($validatedData);
|
||||
|
||||
exit;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,6 +37,11 @@ class AccountPolicy
|
||||
return auth()->check() && $user->id === $account->user_id;
|
||||
}
|
||||
|
||||
public function create(): bool
|
||||
{
|
||||
return auth()->check();
|
||||
}
|
||||
|
||||
/**
|
||||
* Everybody can do this, but selection should limit to user.
|
||||
*
|
||||
|
||||
201
app/Rules/Account/IsUniqueAccount.php
Normal file
201
app/Rules/Account/IsUniqueAccount.php
Normal file
@@ -0,0 +1,201 @@
|
||||
<?php
|
||||
/*
|
||||
* IsUniqueAccount.php
|
||||
* Copyright (c) 2024 james@firefly-iii.org.
|
||||
*
|
||||
* This file is part of Firefly III (https://github.com/firefly-iii).
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see https://www.gnu.org/licenses/.
|
||||
*/
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace FireflyIII\Rules\Account;
|
||||
|
||||
use FireflyIII\Models\Account;
|
||||
use FireflyIII\Models\AccountType;
|
||||
use FireflyIII\User;
|
||||
use Illuminate\Contracts\Validation\DataAwareRule;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
|
||||
/**
|
||||
* @method fail(string $string)
|
||||
*/
|
||||
class IsUniqueAccount implements ValidationRule, DataAwareRule
|
||||
{
|
||||
protected \Closure $fail;
|
||||
protected array $data = [];
|
||||
|
||||
#[\Override]
|
||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||
{
|
||||
return;
|
||||
$this->fail = $fail;
|
||||
// because a user does not have to be logged in (tests and what-not).
|
||||
if (!auth()->check()) {
|
||||
app('log')->debug('validateUniqueAccountForUser::anon');
|
||||
$fail('validation.nog_logged_in')->translate();
|
||||
|
||||
return;
|
||||
}
|
||||
if (array_key_exists('type', $this->data)) {
|
||||
app('log')->debug('validateUniqueAccountForUser::typeString');
|
||||
|
||||
$this->validateByAccountTypeString($value, $parameters, (string) $this->data['type']);
|
||||
}
|
||||
if (array_key_exists('account_type_id', $this->data)) {
|
||||
app('log')->debug('validateUniqueAccountForUser::typeId');
|
||||
|
||||
$this->validateByAccountTypeId($value, $parameters);
|
||||
}
|
||||
$parameterId = $parameters[0] ?? null;
|
||||
if (null !== $parameterId) {
|
||||
app('log')->debug('validateUniqueAccountForUser::paramId');
|
||||
|
||||
$this->validateByParameterId((int) $parameterId, $value);
|
||||
}
|
||||
if (array_key_exists('id', $this->data)) {
|
||||
app('log')->debug('validateUniqueAccountForUser::accountId');
|
||||
|
||||
$this->validateByAccountId($value);
|
||||
}
|
||||
|
||||
// without type, just try to validate the name.
|
||||
app('log')->debug('validateUniqueAccountForUser::accountName');
|
||||
|
||||
$this->validateByAccountName($value);
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO duplicate from old validation class.
|
||||
*/
|
||||
private function validateByAccountTypeString(string $value, array $parameters, string $type): bool
|
||||
{
|
||||
/** @var null|array $search */
|
||||
$search = config('firefly.accountTypeByIdentifier.%s', $type);
|
||||
|
||||
if (null === $search) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$accountTypes = AccountType::whereIn('type', $search)->get();
|
||||
$ignore = (int) ($parameters[0] ?? 0.0);
|
||||
$accountTypeIds = $accountTypes->pluck('id')->toArray();
|
||||
|
||||
/** @var null|Account $result */
|
||||
$result = auth()->user()->accounts()->whereIn('account_type_id', $accountTypeIds)->where('id', '!=', $ignore)
|
||||
->where('name', $value)
|
||||
->first()
|
||||
;
|
||||
|
||||
return null === $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO duplicate from old validation class.
|
||||
*/
|
||||
private function validateAccountAnonymously(): void
|
||||
{
|
||||
if (!array_key_exists('user_id', $this->data)) {
|
||||
$this->fail('No user ID provided.');
|
||||
}
|
||||
|
||||
/** @var User $user */
|
||||
$user = User::find($this->data['user_id']);
|
||||
$type = AccountType::find($this->data['account_type_id'])->first();
|
||||
$value = $this->data['name'];
|
||||
|
||||
/** @var null|Account $result */
|
||||
$result = $user->accounts()->where('account_type_id', $type->id)->where('name', $value)->first();
|
||||
|
||||
return null === $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO Duplicate from old validation class.
|
||||
*
|
||||
* @param mixed $value
|
||||
* @param mixed $parameters
|
||||
*/
|
||||
private function validateByAccountTypeId($value, $parameters): bool
|
||||
{
|
||||
$type = AccountType::find($this->data['account_type_id'])->first();
|
||||
$ignore = (int) ($parameters[0] ?? 0.0);
|
||||
|
||||
/** @var null|Account $result */
|
||||
$result = auth()->user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)
|
||||
->where('name', $value)
|
||||
->first()
|
||||
;
|
||||
|
||||
return null === $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO Duplicate from old validation class.
|
||||
*
|
||||
* @param mixed $value
|
||||
*/
|
||||
private function validateByParameterId(int $accountId, $value): bool
|
||||
{
|
||||
/** @var Account $existingAccount */
|
||||
$existingAccount = Account::find($accountId);
|
||||
|
||||
$type = $existingAccount->accountType;
|
||||
$ignore = $existingAccount->id;
|
||||
|
||||
$entry = auth()->user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)
|
||||
->where('name', $value)
|
||||
->first()
|
||||
;
|
||||
|
||||
return null === $entry;
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO Duplicate from old validation class.
|
||||
*
|
||||
* @param mixed $value
|
||||
*/
|
||||
private function validateByAccountId($value): bool
|
||||
{
|
||||
/** @var Account $existingAccount */
|
||||
$existingAccount = Account::find($this->data['id']);
|
||||
|
||||
$type = $existingAccount->accountType;
|
||||
$ignore = $existingAccount->id;
|
||||
|
||||
$entry = auth()->user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)
|
||||
->where('name', $value)
|
||||
->first()
|
||||
;
|
||||
|
||||
return null === $entry;
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO is duplicate
|
||||
* TODO does not take group into account. Must be made group aware.
|
||||
*/
|
||||
private function validateByAccountName(string $value): bool
|
||||
{
|
||||
return 0 === auth()->user()->accounts()->where('name', $value)->count();
|
||||
}
|
||||
|
||||
#[\Override]
|
||||
public function setData(array $data): void
|
||||
{
|
||||
$this->data = $data;
|
||||
}
|
||||
}
|
||||
@@ -41,9 +41,8 @@ trait DateCalculation
|
||||
{
|
||||
$difference = (int)($start->diffInDays($end, true) + 1);
|
||||
$today = today(config('app.timezone'))->startOfDay();
|
||||
|
||||
if ($start->lte($today) && $end->gte($today)) {
|
||||
$difference = $today->diffInDays($end);
|
||||
$difference = $today->diffInDays($end) + 1;
|
||||
}
|
||||
|
||||
return (int)(0 === $difference ? 1 : $difference);
|
||||
|
||||
@@ -130,6 +130,7 @@ trait GetConfigurationData
|
||||
|
||||
/** @var Carbon $todayEnd */
|
||||
$todayEnd = app('navigation')->endOfPeriod($todayStart, $viewRange);
|
||||
|
||||
if ($todayStart->ne($start) || $todayEnd->ne($end)) {
|
||||
$ranges[ucfirst((string)trans('firefly.today'))] = [$todayStart, $todayEnd];
|
||||
}
|
||||
|
||||
@@ -306,7 +306,7 @@ class AccountBalanceCalculator
|
||||
|
||||
private function getStartAmounts(Account $account, TransactionJournal $journal): array
|
||||
{
|
||||
exit('here we are');
|
||||
exit('here we are 1');
|
||||
|
||||
return [];
|
||||
}
|
||||
|
||||
@@ -177,6 +177,7 @@ class Navigation
|
||||
'year' => 'startOfYear',
|
||||
'yearly' => 'startOfYear',
|
||||
'1Y' => 'startOfYear',
|
||||
'MTD' => 'startOfMonth',
|
||||
];
|
||||
|
||||
$parameterMap = [
|
||||
@@ -274,13 +275,21 @@ class Navigation
|
||||
|
||||
/** @var Carbon $tEnd */
|
||||
$tEnd = session('end', today(config('app.timezone'))->endOfMonth());
|
||||
$diffInDays = (int)$tStart->diffInDays($tEnd, true);
|
||||
$diffInDays = (int) $tStart->diffInDays($tEnd, true);
|
||||
}
|
||||
Log::debug(sprintf('Diff in days is %d', $diffInDays));
|
||||
$currentEnd->addDays($diffInDays);
|
||||
|
||||
return $currentEnd;
|
||||
}
|
||||
if ('MTD' === $repeatFreq) {
|
||||
$today = today();
|
||||
if ($today->isSameMonth($end)) {
|
||||
return $today->endOfDay();
|
||||
}
|
||||
|
||||
return $end->endOfMonth();
|
||||
}
|
||||
|
||||
$result = match ($repeatFreq) {
|
||||
'last7' => $currentEnd->addDays(7)->startOfDay(),
|
||||
@@ -327,7 +336,7 @@ class Navigation
|
||||
{
|
||||
$endOfMonth = $date->copy()->endOfMonth();
|
||||
|
||||
return (int)$date->diffInDays($endOfMonth, true);
|
||||
return (int) $date->diffInDays($endOfMonth, true);
|
||||
}
|
||||
|
||||
public function diffInPeriods(string $period, int $skip, Carbon $beginning, Carbon $end): int
|
||||
@@ -382,7 +391,7 @@ class Navigation
|
||||
));
|
||||
}
|
||||
|
||||
return (int)$diff;
|
||||
return (int) $diff;
|
||||
}
|
||||
|
||||
public function endOfX(Carbon $theCurrentEnd, string $repeatFreq, ?Carbon $maxDate): Carbon
|
||||
@@ -428,7 +437,7 @@ class Navigation
|
||||
if (is_array($range)) {
|
||||
$range = '1M';
|
||||
}
|
||||
$range = (string)$range;
|
||||
$range = (string) $range;
|
||||
if (!$correct) {
|
||||
return $range;
|
||||
}
|
||||
@@ -463,18 +472,18 @@ class Navigation
|
||||
// define period to increment
|
||||
$increment = 'addDay';
|
||||
$format = $this->preferredCarbonFormat($start, $end);
|
||||
$displayFormat = (string)trans('config.month_and_day_js', [], $locale);
|
||||
$displayFormat = (string) trans('config.month_and_day_js', [], $locale);
|
||||
$diff = $start->diffInMonths($end, true);
|
||||
// increment by month (for year)
|
||||
if ($diff >= 1.0001) {
|
||||
$increment = 'addMonth';
|
||||
$displayFormat = (string)trans('config.month_js');
|
||||
$displayFormat = (string) trans('config.month_js');
|
||||
}
|
||||
|
||||
// increment by year (for multi-year)
|
||||
if ($diff >= 12.0001) {
|
||||
$increment = 'addYear';
|
||||
$displayFormat = (string)trans('config.year_js');
|
||||
$displayFormat = (string) trans('config.year_js');
|
||||
}
|
||||
$begin = clone $start;
|
||||
$entries = [];
|
||||
@@ -514,19 +523,19 @@ class Navigation
|
||||
{
|
||||
$date = clone $theDate;
|
||||
$formatMap = [
|
||||
'1D' => (string)trans('config.specific_day_js'),
|
||||
'daily' => (string)trans('config.specific_day_js'),
|
||||
'custom' => (string)trans('config.specific_day_js'),
|
||||
'1W' => (string)trans('config.week_in_year_js'),
|
||||
'week' => (string)trans('config.week_in_year_js'),
|
||||
'weekly' => (string)trans('config.week_in_year_js'),
|
||||
'1M' => (string)trans('config.month_js'),
|
||||
'month' => (string)trans('config.month_js'),
|
||||
'monthly' => (string)trans('config.month_js'),
|
||||
'1Y' => (string)trans('config.year_js'),
|
||||
'year' => (string)trans('config.year_js'),
|
||||
'yearly' => (string)trans('config.year_js'),
|
||||
'6M' => (string)trans('config.half_year_js'),
|
||||
'1D' => (string) trans('config.specific_day_js'),
|
||||
'daily' => (string) trans('config.specific_day_js'),
|
||||
'custom' => (string) trans('config.specific_day_js'),
|
||||
'1W' => (string) trans('config.week_in_year_js'),
|
||||
'week' => (string) trans('config.week_in_year_js'),
|
||||
'weekly' => (string) trans('config.week_in_year_js'),
|
||||
'1M' => (string) trans('config.month_js'),
|
||||
'month' => (string) trans('config.month_js'),
|
||||
'monthly' => (string) trans('config.month_js'),
|
||||
'1Y' => (string) trans('config.year_js'),
|
||||
'year' => (string) trans('config.year_js'),
|
||||
'yearly' => (string) trans('config.year_js'),
|
||||
'6M' => (string) trans('config.half_year_js'),
|
||||
];
|
||||
|
||||
if (array_key_exists($repeatFrequency, $formatMap)) {
|
||||
@@ -567,13 +576,13 @@ class Navigation
|
||||
public function preferredCarbonLocalizedFormat(Carbon $start, Carbon $end): string
|
||||
{
|
||||
$locale = app('steam')->getLocale();
|
||||
$format = (string)trans('config.month_and_day_js', [], $locale);
|
||||
$format = (string) trans('config.month_and_day_js', [], $locale);
|
||||
if ($start->diffInMonths($end, true) > 1) {
|
||||
$format = (string)trans('config.month_js', [], $locale);
|
||||
$format = (string) trans('config.month_js', [], $locale);
|
||||
}
|
||||
|
||||
if ($start->diffInMonths($end, true) > 12) {
|
||||
$format = (string)trans('config.year_js', [], $locale);
|
||||
$format = (string) trans('config.year_js', [], $locale);
|
||||
}
|
||||
|
||||
return $format;
|
||||
@@ -586,11 +595,11 @@ class Navigation
|
||||
public function preferredEndOfPeriod(Carbon $start, Carbon $end): string
|
||||
{
|
||||
$format = 'endOfDay';
|
||||
if ((int)$start->diffInMonths($end, true) > 1) {
|
||||
if ((int) $start->diffInMonths($end, true) > 1) {
|
||||
$format = 'endOfMonth';
|
||||
}
|
||||
|
||||
if ((int)$start->diffInMonths($end, true) > 12) {
|
||||
if ((int) $start->diffInMonths($end, true) > 12) {
|
||||
$format = 'endOfYear';
|
||||
}
|
||||
|
||||
@@ -604,11 +613,11 @@ class Navigation
|
||||
public function preferredRangeFormat(Carbon $start, Carbon $end): string
|
||||
{
|
||||
$format = '1D';
|
||||
if ((int)$start->diffInMonths($end, true) > 1) {
|
||||
if ((int) $start->diffInMonths($end, true) > 1) {
|
||||
$format = '1M';
|
||||
}
|
||||
|
||||
if ((int)$start->diffInMonths($end, true) > 12) {
|
||||
if ((int) $start->diffInMonths($end, true) > 12) {
|
||||
$format = '1Y';
|
||||
}
|
||||
|
||||
@@ -622,11 +631,11 @@ class Navigation
|
||||
public function preferredSqlFormat(Carbon $start, Carbon $end): string
|
||||
{
|
||||
$format = '%Y-%m-%d';
|
||||
if ((int)$start->diffInMonths($end, true) > 1) {
|
||||
if ((int) $start->diffInMonths($end, true) > 1) {
|
||||
$format = '%Y-%m';
|
||||
}
|
||||
|
||||
if ((int)$start->diffInMonths($end, true) > 12) {
|
||||
if ((int) $start->diffInMonths($end, true) > 12) {
|
||||
$format = '%Y';
|
||||
}
|
||||
|
||||
@@ -682,7 +691,7 @@ class Navigation
|
||||
|
||||
/** @var Carbon $tEnd */
|
||||
$tEnd = session('end', today(config('app.timezone'))->endOfMonth());
|
||||
$diffInDays = (int)$tStart->diffInDays($tEnd, true);
|
||||
$diffInDays = (int) $tStart->diffInDays($tEnd, true);
|
||||
$date->subDays($diffInDays * $subtract);
|
||||
|
||||
return $date;
|
||||
|
||||
@@ -44,8 +44,7 @@ class Steam
|
||||
*/
|
||||
public function balanceIgnoreVirtual(Account $account, Carbon $date): string
|
||||
{
|
||||
Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
|
||||
|
||||
// Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
|
||||
/** @var AccountRepositoryInterface $repository */
|
||||
$repository = app(AccountRepositoryInterface::class);
|
||||
$repository->setUser($account->user);
|
||||
@@ -96,7 +95,7 @@ class Steam
|
||||
*/
|
||||
public function balanceInRange(Account $account, Carbon $start, Carbon $end, ?TransactionCurrency $currency = null): array
|
||||
{
|
||||
Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
|
||||
// Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
|
||||
$cache = new CacheProperties();
|
||||
$cache->addProperty($account->id);
|
||||
$cache->addProperty('balance-in-range');
|
||||
@@ -221,7 +220,7 @@ class Steam
|
||||
*/
|
||||
public function balance(Account $account, Carbon $date, ?TransactionCurrency $currency = null): string
|
||||
{
|
||||
Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
|
||||
// Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
|
||||
// abuse chart properties:
|
||||
$cache = new CacheProperties();
|
||||
$cache->addProperty($account->id);
|
||||
@@ -270,7 +269,7 @@ class Steam
|
||||
*/
|
||||
public function balanceInRangeConverted(Account $account, Carbon $start, Carbon $end, TransactionCurrency $native): array
|
||||
{
|
||||
Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
|
||||
// Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
|
||||
$cache = new CacheProperties();
|
||||
$cache->addProperty($account->id);
|
||||
$cache->addProperty('balance-in-range-converted');
|
||||
@@ -396,7 +395,7 @@ class Steam
|
||||
*/
|
||||
public function balanceConverted(Account $account, Carbon $date, TransactionCurrency $native): string
|
||||
{
|
||||
Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
|
||||
// Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
|
||||
Log::debug(sprintf('Now in balanceConverted (%s) for account #%d, converting to %s', $date->format('Y-m-d'), $account->id, $native->code));
|
||||
$cache = new CacheProperties();
|
||||
$cache->addProperty($account->id);
|
||||
@@ -542,7 +541,7 @@ class Steam
|
||||
*/
|
||||
public function balancesByAccounts(Collection $accounts, Carbon $date): array
|
||||
{
|
||||
Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
|
||||
// Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
|
||||
$ids = $accounts->pluck('id')->toArray();
|
||||
// cache this property.
|
||||
$cache = new CacheProperties();
|
||||
@@ -573,7 +572,7 @@ class Steam
|
||||
*/
|
||||
public function balancesByAccountsConverted(Collection $accounts, Carbon $date): array
|
||||
{
|
||||
Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
|
||||
// Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
|
||||
$ids = $accounts->pluck('id')->toArray();
|
||||
// cache this property.
|
||||
$cache = new CacheProperties();
|
||||
@@ -607,7 +606,7 @@ class Steam
|
||||
*/
|
||||
public function balancesPerCurrencyByAccounts(Collection $accounts, Carbon $date): array
|
||||
{
|
||||
Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
|
||||
// Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
|
||||
$ids = $accounts->pluck('id')->toArray();
|
||||
// cache this property.
|
||||
$cache = new CacheProperties();
|
||||
@@ -633,7 +632,7 @@ class Steam
|
||||
|
||||
public function balancePerCurrency(Account $account, Carbon $date): array
|
||||
{
|
||||
Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
|
||||
// Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
|
||||
// abuse chart properties:
|
||||
$cache = new CacheProperties();
|
||||
$cache->addProperty($account->id);
|
||||
|
||||
337
composer.lock
generated
337
composer.lock
generated
@@ -191,23 +191,23 @@
|
||||
},
|
||||
{
|
||||
"name": "dasprid/enum",
|
||||
"version": "1.0.5",
|
||||
"version": "1.0.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/DASPRiD/Enum.git",
|
||||
"reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016"
|
||||
"reference": "8dfd07c6d2cf31c8da90c53b83c026c7696dda90"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/DASPRiD/Enum/zipball/6faf451159fb8ba4126b925ed2d78acfce0dc016",
|
||||
"reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016",
|
||||
"url": "https://api.github.com/repos/DASPRiD/Enum/zipball/8dfd07c6d2cf31c8da90c53b83c026c7696dda90",
|
||||
"reference": "8dfd07c6d2cf31c8da90c53b83c026c7696dda90",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=7.1 <9.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^7 | ^8 | ^9",
|
||||
"phpunit/phpunit": "^7 || ^8 || ^9 || ^10 || ^11",
|
||||
"squizlabs/php_codesniffer": "*"
|
||||
},
|
||||
"type": "library",
|
||||
@@ -235,9 +235,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/DASPRiD/Enum/issues",
|
||||
"source": "https://github.com/DASPRiD/Enum/tree/1.0.5"
|
||||
"source": "https://github.com/DASPRiD/Enum/tree/1.0.6"
|
||||
},
|
||||
"time": "2023-08-25T16:18:39+00:00"
|
||||
"time": "2024-08-09T14:30:48+00:00"
|
||||
},
|
||||
{
|
||||
"name": "defuse/php-encryption",
|
||||
@@ -1799,16 +1799,16 @@
|
||||
},
|
||||
{
|
||||
"name": "laravel-json-api/core",
|
||||
"version": "v4.1.0",
|
||||
"version": "v4.2.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel-json-api/core.git",
|
||||
"reference": "5b3d39caedb90b40c9aa30bb70a3700fd4c08dfa"
|
||||
"reference": "5a3d1771a63e222d902ccd7d57c9323c8aac8d32"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel-json-api/core/zipball/5b3d39caedb90b40c9aa30bb70a3700fd4c08dfa",
|
||||
"reference": "5b3d39caedb90b40c9aa30bb70a3700fd4c08dfa",
|
||||
"url": "https://api.github.com/repos/laravel-json-api/core/zipball/5a3d1771a63e222d902ccd7d57c9323c8aac8d32",
|
||||
"reference": "5a3d1771a63e222d902ccd7d57c9323c8aac8d32",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -1857,9 +1857,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/laravel-json-api/core/issues",
|
||||
"source": "https://github.com/laravel-json-api/core/tree/v4.1.0"
|
||||
"source": "https://github.com/laravel-json-api/core/tree/v4.2.0"
|
||||
},
|
||||
"time": "2024-06-26T19:32:04+00:00"
|
||||
"time": "2024-08-21T19:29:20+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel-json-api/eloquent",
|
||||
@@ -2410,16 +2410,16 @@
|
||||
},
|
||||
{
|
||||
"name": "laravel/framework",
|
||||
"version": "v11.19.0",
|
||||
"version": "v11.21.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/framework.git",
|
||||
"reference": "5e103d499e9ee5bcfc184412d034c4e516b87085"
|
||||
"reference": "9d9d36708d56665b12185493f684abce38ad2d30"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/5e103d499e9ee5bcfc184412d034c4e516b87085",
|
||||
"reference": "5e103d499e9ee5bcfc184412d034c4e516b87085",
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/9d9d36708d56665b12185493f684abce38ad2d30",
|
||||
"reference": "9d9d36708d56665b12185493f684abce38ad2d30",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2612,20 +2612,20 @@
|
||||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2024-07-30T15:22:41+00:00"
|
||||
"time": "2024-08-20T15:00:52+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/passport",
|
||||
"version": "v12.2.1",
|
||||
"version": "v12.3.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/passport.git",
|
||||
"reference": "795bbb406c8f10167df6062032de803bd7d686f2"
|
||||
"reference": "ca63a86697a4fa091c7dcabe88ebba91d97c785d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/passport/zipball/795bbb406c8f10167df6062032de803bd7d686f2",
|
||||
"reference": "795bbb406c8f10167df6062032de803bd7d686f2",
|
||||
"url": "https://api.github.com/repos/laravel/passport/zipball/ca63a86697a4fa091c7dcabe88ebba91d97c785d",
|
||||
"reference": "ca63a86697a4fa091c7dcabe88ebba91d97c785d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2688,20 +2688,20 @@
|
||||
"issues": "https://github.com/laravel/passport/issues",
|
||||
"source": "https://github.com/laravel/passport"
|
||||
},
|
||||
"time": "2024-07-10T19:25:36+00:00"
|
||||
"time": "2024-08-05T13:44:51+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/prompts",
|
||||
"version": "v0.1.24",
|
||||
"version": "v0.1.25",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/prompts.git",
|
||||
"reference": "409b0b4305273472f3754826e68f4edbd0150149"
|
||||
"reference": "7b4029a84c37cb2725fc7f011586e2997040bc95"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/prompts/zipball/409b0b4305273472f3754826e68f4edbd0150149",
|
||||
"reference": "409b0b4305273472f3754826e68f4edbd0150149",
|
||||
"url": "https://api.github.com/repos/laravel/prompts/zipball/7b4029a84c37cb2725fc7f011586e2997040bc95",
|
||||
"reference": "7b4029a84c37cb2725fc7f011586e2997040bc95",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2744,9 +2744,9 @@
|
||||
"description": "Add beautiful and user-friendly forms to your command-line applications.",
|
||||
"support": {
|
||||
"issues": "https://github.com/laravel/prompts/issues",
|
||||
"source": "https://github.com/laravel/prompts/tree/v0.1.24"
|
||||
"source": "https://github.com/laravel/prompts/tree/v0.1.25"
|
||||
},
|
||||
"time": "2024-06-17T13:58:22+00:00"
|
||||
"time": "2024-08-12T22:06:33+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/sanctum",
|
||||
@@ -2814,26 +2814,27 @@
|
||||
},
|
||||
{
|
||||
"name": "laravel/serializable-closure",
|
||||
"version": "v1.3.3",
|
||||
"version": "v1.3.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/serializable-closure.git",
|
||||
"reference": "3dbf8a8e914634c48d389c1234552666b3d43754"
|
||||
"reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754",
|
||||
"reference": "3dbf8a8e914634c48d389c1234552666b3d43754",
|
||||
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/61b87392d986dc49ad5ef64e75b1ff5fee24ef81",
|
||||
"reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^7.3|^8.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"nesbot/carbon": "^2.61",
|
||||
"illuminate/support": "^8.0|^9.0|^10.0|^11.0",
|
||||
"nesbot/carbon": "^2.61|^3.0",
|
||||
"pestphp/pest": "^1.21.3",
|
||||
"phpstan/phpstan": "^1.8.2",
|
||||
"symfony/var-dumper": "^5.4.11"
|
||||
"symfony/var-dumper": "^5.4.11|^6.2.0|^7.0.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
@@ -2870,20 +2871,20 @@
|
||||
"issues": "https://github.com/laravel/serializable-closure/issues",
|
||||
"source": "https://github.com/laravel/serializable-closure"
|
||||
},
|
||||
"time": "2023-11-08T14:08:06+00:00"
|
||||
"time": "2024-08-02T07:48:17+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/slack-notification-channel",
|
||||
"version": "v3.3.0",
|
||||
"version": "v3.3.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/slack-notification-channel.git",
|
||||
"reference": "8cd988fad1a08ed88dfd852f140477376c60217f"
|
||||
"reference": "fc8f931b9ae868945cf0c39aeda71f1cbe180484"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/8cd988fad1a08ed88dfd852f140477376c60217f",
|
||||
"reference": "8cd988fad1a08ed88dfd852f140477376c60217f",
|
||||
"url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/fc8f931b9ae868945cf0c39aeda71f1cbe180484",
|
||||
"reference": "fc8f931b9ae868945cf0c39aeda71f1cbe180484",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2933,9 +2934,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/laravel/slack-notification-channel/issues",
|
||||
"source": "https://github.com/laravel/slack-notification-channel/tree/v3.3.0"
|
||||
"source": "https://github.com/laravel/slack-notification-channel/tree/v3.3.1"
|
||||
},
|
||||
"time": "2024-07-10T19:39:44+00:00"
|
||||
"time": "2024-08-17T20:57:03+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/ui",
|
||||
@@ -3139,16 +3140,16 @@
|
||||
},
|
||||
{
|
||||
"name": "league/commonmark",
|
||||
"version": "2.5.1",
|
||||
"version": "2.5.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/thephpleague/commonmark.git",
|
||||
"reference": "ac815920de0eff6de947eac0a6a94e5ed0fb147c"
|
||||
"reference": "b650144166dfa7703e62a22e493b853b58d874b0"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/ac815920de0eff6de947eac0a6a94e5ed0fb147c",
|
||||
"reference": "ac815920de0eff6de947eac0a6a94e5ed0fb147c",
|
||||
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0",
|
||||
"reference": "b650144166dfa7703e62a22e493b853b58d874b0",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -3161,8 +3162,8 @@
|
||||
},
|
||||
"require-dev": {
|
||||
"cebe/markdown": "^1.0",
|
||||
"commonmark/cmark": "0.31.0",
|
||||
"commonmark/commonmark.js": "0.31.0",
|
||||
"commonmark/cmark": "0.31.1",
|
||||
"commonmark/commonmark.js": "0.31.1",
|
||||
"composer/package-versions-deprecated": "^1.8",
|
||||
"embed/embed": "^4.4",
|
||||
"erusev/parsedown": "^1.0",
|
||||
@@ -3241,7 +3242,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-07-24T12:52:09+00:00"
|
||||
"time": "2024-08-16T11:46:16+00:00"
|
||||
},
|
||||
{
|
||||
"name": "league/config",
|
||||
@@ -4090,16 +4091,16 @@
|
||||
},
|
||||
{
|
||||
"name": "nesbot/carbon",
|
||||
"version": "3.7.0",
|
||||
"version": "3.8.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/briannesbitt/Carbon.git",
|
||||
"reference": "cb4374784c87d0a0294e8513a52eb63c0aff3139"
|
||||
"reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/cb4374784c87d0a0294e8513a52eb63c0aff3139",
|
||||
"reference": "cb4374784c87d0a0294e8513a52eb63c0aff3139",
|
||||
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bbd3eef89af8ba66a3aa7952b5439168fbcc529f",
|
||||
"reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -4192,7 +4193,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-07-16T22:29:20+00:00"
|
||||
"time": "2024-08-19T06:22:39+00:00"
|
||||
},
|
||||
{
|
||||
"name": "nette/schema",
|
||||
@@ -4258,20 +4259,20 @@
|
||||
},
|
||||
{
|
||||
"name": "nette/utils",
|
||||
"version": "v4.0.4",
|
||||
"version": "v4.0.5",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/nette/utils.git",
|
||||
"reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218"
|
||||
"reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
|
||||
"reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
|
||||
"url": "https://api.github.com/repos/nette/utils/zipball/736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
|
||||
"reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=8.0 <8.4"
|
||||
"php": "8.0 - 8.4"
|
||||
},
|
||||
"conflict": {
|
||||
"nette/finder": "<3",
|
||||
@@ -4338,9 +4339,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/nette/utils/issues",
|
||||
"source": "https://github.com/nette/utils/tree/v4.0.4"
|
||||
"source": "https://github.com/nette/utils/tree/v4.0.5"
|
||||
},
|
||||
"time": "2024-01-17T16:50:36+00:00"
|
||||
"time": "2024-08-07T15:39:19+00:00"
|
||||
},
|
||||
{
|
||||
"name": "nunomaduro/collision",
|
||||
@@ -4799,16 +4800,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpseclib/phpseclib",
|
||||
"version": "3.0.39",
|
||||
"version": "3.0.41",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/phpseclib/phpseclib.git",
|
||||
"reference": "211ebc399c6e73c225a018435fe5ae209d1d1485"
|
||||
"reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/211ebc399c6e73c225a018435fe5ae209d1d1485",
|
||||
"reference": "211ebc399c6e73c225a018435fe5ae209d1d1485",
|
||||
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/621c73f7dcb310b61de34d1da4c4204e8ace6ceb",
|
||||
"reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -4889,7 +4890,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/phpseclib/phpseclib/issues",
|
||||
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.39"
|
||||
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.41"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -4905,7 +4906,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-06-24T06:27:33+00:00"
|
||||
"time": "2024-08-12T00:13:54+00:00"
|
||||
},
|
||||
{
|
||||
"name": "pragmarx/google2fa",
|
||||
@@ -5511,16 +5512,16 @@
|
||||
},
|
||||
{
|
||||
"name": "psr/log",
|
||||
"version": "3.0.0",
|
||||
"version": "3.0.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/php-fig/log.git",
|
||||
"reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
|
||||
"reference": "79dff0b268932c640297f5208d6298f71855c03e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
|
||||
"reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
|
||||
"url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e",
|
||||
"reference": "79dff0b268932c640297f5208d6298f71855c03e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -5555,9 +5556,9 @@
|
||||
"psr-3"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/php-fig/log/tree/3.0.0"
|
||||
"source": "https://github.com/php-fig/log/tree/3.0.1"
|
||||
},
|
||||
"time": "2021-07-14T16:46:02+00:00"
|
||||
"time": "2024-08-21T13:31:24+00:00"
|
||||
},
|
||||
{
|
||||
"name": "psr/simple-cache",
|
||||
@@ -8401,6 +8402,82 @@
|
||||
],
|
||||
"time": "2024-05-31T15:07:36+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-php81",
|
||||
"version": "v1.30.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-php81.git",
|
||||
"reference": "3fb075789fb91f9ad9af537c4012d523085bd5af"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/3fb075789fb91f9ad9af537c4012d523085bd5af",
|
||||
"reference": "3fb075789fb91f9ad9af537c4012d523085bd5af",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=7.1"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"thanks": {
|
||||
"name": "symfony/polyfill",
|
||||
"url": "https://github.com/symfony/polyfill"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"files": [
|
||||
"bootstrap.php"
|
||||
],
|
||||
"psr-4": {
|
||||
"Symfony\\Polyfill\\Php81\\": ""
|
||||
},
|
||||
"classmap": [
|
||||
"Resources/stubs"
|
||||
]
|
||||
},
|
||||
"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": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
|
||||
"homepage": "https://symfony.com",
|
||||
"keywords": [
|
||||
"compatibility",
|
||||
"polyfill",
|
||||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/polyfill-php81/tree/v1.30.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"
|
||||
}
|
||||
],
|
||||
"time": "2024-06-19T12:30:46+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-php83",
|
||||
"version": "v1.30.0",
|
||||
@@ -9411,16 +9488,16 @@
|
||||
},
|
||||
{
|
||||
"name": "twig/twig",
|
||||
"version": "v3.10.3",
|
||||
"version": "v3.11.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/twigphp/Twig.git",
|
||||
"reference": "67f29781ffafa520b0bbfbd8384674b42db04572"
|
||||
"reference": "e80fb8ebba85c7341a97a9ebf825d7fd4b77708d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/twigphp/Twig/zipball/67f29781ffafa520b0bbfbd8384674b42db04572",
|
||||
"reference": "67f29781ffafa520b0bbfbd8384674b42db04572",
|
||||
"url": "https://api.github.com/repos/twigphp/Twig/zipball/e80fb8ebba85c7341a97a9ebf825d7fd4b77708d",
|
||||
"reference": "e80fb8ebba85c7341a97a9ebf825d7fd4b77708d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -9428,7 +9505,8 @@
|
||||
"symfony/deprecation-contracts": "^2.5|^3",
|
||||
"symfony/polyfill-ctype": "^1.8",
|
||||
"symfony/polyfill-mbstring": "^1.3",
|
||||
"symfony/polyfill-php80": "^1.22"
|
||||
"symfony/polyfill-php80": "^1.22",
|
||||
"symfony/polyfill-php81": "^1.29"
|
||||
},
|
||||
"require-dev": {
|
||||
"psr/container": "^1.0|^2.0",
|
||||
@@ -9474,7 +9552,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/twigphp/Twig/issues",
|
||||
"source": "https://github.com/twigphp/Twig/tree/v3.10.3"
|
||||
"source": "https://github.com/twigphp/Twig/tree/v3.11.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -9486,7 +9564,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-05-16T10:04:27+00:00"
|
||||
"time": "2024-08-08T16:15:16+00:00"
|
||||
},
|
||||
{
|
||||
"name": "vlucas/phpdotenv",
|
||||
@@ -10069,26 +10147,26 @@
|
||||
},
|
||||
{
|
||||
"name": "composer/pcre",
|
||||
"version": "3.2.0",
|
||||
"version": "3.3.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/composer/pcre.git",
|
||||
"reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90"
|
||||
"reference": "1637e067347a0c40bbb1e3cd786b20dcab556a81"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/composer/pcre/zipball/ea4ab6f9580a4fd221e0418f2c357cdd39102a90",
|
||||
"reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90",
|
||||
"url": "https://api.github.com/repos/composer/pcre/zipball/1637e067347a0c40bbb1e3cd786b20dcab556a81",
|
||||
"reference": "1637e067347a0c40bbb1e3cd786b20dcab556a81",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": "^7.4 || ^8.0"
|
||||
},
|
||||
"conflict": {
|
||||
"phpstan/phpstan": "<1.11.8"
|
||||
"phpstan/phpstan": "<1.11.10"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpstan/phpstan": "^1.11.8",
|
||||
"phpstan/phpstan": "^1.11.10",
|
||||
"phpstan/phpstan-strict-rules": "^1.1",
|
||||
"phpunit/phpunit": "^8 || ^9"
|
||||
},
|
||||
@@ -10128,7 +10206,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/composer/pcre/issues",
|
||||
"source": "https://github.com/composer/pcre/tree/3.2.0"
|
||||
"source": "https://github.com/composer/pcre/tree/3.3.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -10144,7 +10222,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-07-25T09:36:02+00:00"
|
||||
"time": "2024-08-19T19:43:53+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/deprecations",
|
||||
@@ -11046,16 +11124,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpmyadmin/sql-parser",
|
||||
"version": "5.9.0",
|
||||
"version": "5.9.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/phpmyadmin/sql-parser.git",
|
||||
"reference": "011fa18a4e55591fac6545a821921dd1d61c6984"
|
||||
"reference": "169a9f11f1957ea36607c9b29eac1b48679f1ecc"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/011fa18a4e55591fac6545a821921dd1d61c6984",
|
||||
"reference": "011fa18a4e55591fac6545a821921dd1d61c6984",
|
||||
"url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/169a9f11f1957ea36607c9b29eac1b48679f1ecc",
|
||||
"reference": "169a9f11f1957ea36607c9b29eac1b48679f1ecc",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -11073,8 +11151,7 @@
|
||||
"phpstan/extension-installer": "^1.1",
|
||||
"phpstan/phpstan": "^1.9.12",
|
||||
"phpstan/phpstan-phpunit": "^1.3.3",
|
||||
"phpunit/php-code-coverage": "*",
|
||||
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
|
||||
"phpunit/phpunit": "^8.5 || ^9.6",
|
||||
"psalm/plugin-phpunit": "^0.16.1",
|
||||
"vimeo/psalm": "^4.11",
|
||||
"zumba/json-serializer": "~3.0.2"
|
||||
@@ -11130,7 +11207,7 @@
|
||||
"type": "other"
|
||||
}
|
||||
],
|
||||
"time": "2024-01-20T20:34:02+00:00"
|
||||
"time": "2024-08-13T19:01:01+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpstan/extension-installer",
|
||||
@@ -11225,16 +11302,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpstan/phpstan",
|
||||
"version": "1.11.9",
|
||||
"version": "1.11.11",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/phpstan/phpstan.git",
|
||||
"reference": "e370bcddadaede0c1716338b262346f40d296f82"
|
||||
"reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/e370bcddadaede0c1716338b262346f40d296f82",
|
||||
"reference": "e370bcddadaede0c1716338b262346f40d296f82",
|
||||
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/707c2aed5d8d0075666e673a5e71440c1d01a5a3",
|
||||
"reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -11279,7 +11356,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2024-08-01T16:25:18+00:00"
|
||||
"time": "2024-08-19T14:37:29+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpstan/phpstan-deprecation-rules",
|
||||
@@ -11379,32 +11456,32 @@
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-code-coverage",
|
||||
"version": "10.1.15",
|
||||
"version": "10.1.16",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
|
||||
"reference": "5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae"
|
||||
"reference": "7e308268858ed6baedc8704a304727d20bc07c77"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae",
|
||||
"reference": "5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7e308268858ed6baedc8704a304727d20bc07c77",
|
||||
"reference": "7e308268858ed6baedc8704a304727d20bc07c77",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-dom": "*",
|
||||
"ext-libxml": "*",
|
||||
"ext-xmlwriter": "*",
|
||||
"nikic/php-parser": "^4.18 || ^5.0",
|
||||
"nikic/php-parser": "^4.19.1 || ^5.1.0",
|
||||
"php": ">=8.1",
|
||||
"phpunit/php-file-iterator": "^4.0",
|
||||
"phpunit/php-text-template": "^3.0",
|
||||
"sebastian/code-unit-reverse-lookup": "^3.0",
|
||||
"sebastian/complexity": "^3.0",
|
||||
"sebastian/environment": "^6.0",
|
||||
"sebastian/lines-of-code": "^2.0",
|
||||
"sebastian/version": "^4.0",
|
||||
"theseer/tokenizer": "^1.2.0"
|
||||
"phpunit/php-file-iterator": "^4.1.0",
|
||||
"phpunit/php-text-template": "^3.0.1",
|
||||
"sebastian/code-unit-reverse-lookup": "^3.0.0",
|
||||
"sebastian/complexity": "^3.2.0",
|
||||
"sebastian/environment": "^6.1.0",
|
||||
"sebastian/lines-of-code": "^2.0.2",
|
||||
"sebastian/version": "^4.0.1",
|
||||
"theseer/tokenizer": "^1.2.3"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^10.1"
|
||||
@@ -11416,7 +11493,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-main": "10.1-dev"
|
||||
"dev-main": "10.1.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@@ -11445,7 +11522,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.15"
|
||||
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.16"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -11453,7 +11530,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2024-06-29T08:25:15+00:00"
|
||||
"time": "2024-08-22T04:31:57+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-file-iterator",
|
||||
@@ -11700,16 +11777,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpunit/phpunit",
|
||||
"version": "10.5.29",
|
||||
"version": "10.5.30",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||
"reference": "8e9e80872b4e8064401788ee8a32d40b4455318f"
|
||||
"reference": "b15524febac0153876b4ba9aab3326c2ee94c897"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8e9e80872b4e8064401788ee8a32d40b4455318f",
|
||||
"reference": "8e9e80872b4e8064401788ee8a32d40b4455318f",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b15524febac0153876b4ba9aab3326c2ee94c897",
|
||||
"reference": "b15524febac0153876b4ba9aab3326c2ee94c897",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -11730,7 +11807,7 @@
|
||||
"phpunit/php-timer": "^6.0.0",
|
||||
"sebastian/cli-parser": "^2.0.1",
|
||||
"sebastian/code-unit": "^2.0.0",
|
||||
"sebastian/comparator": "^5.0.1",
|
||||
"sebastian/comparator": "^5.0.2",
|
||||
"sebastian/diff": "^5.1.1",
|
||||
"sebastian/environment": "^6.1.0",
|
||||
"sebastian/exporter": "^5.1.2",
|
||||
@@ -11781,7 +11858,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.29"
|
||||
"source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.30"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -11797,7 +11874,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-07-30T11:08:00+00:00"
|
||||
"time": "2024-08-13T06:09:37+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sebastian/cli-parser",
|
||||
@@ -11969,16 +12046,16 @@
|
||||
},
|
||||
{
|
||||
"name": "sebastian/comparator",
|
||||
"version": "5.0.1",
|
||||
"version": "5.0.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/comparator.git",
|
||||
"reference": "2db5010a484d53ebf536087a70b4a5423c102372"
|
||||
"reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372",
|
||||
"reference": "2db5010a484d53ebf536087a70b4a5423c102372",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53",
|
||||
"reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -11989,7 +12066,7 @@
|
||||
"sebastian/exporter": "^5.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^10.3"
|
||||
"phpunit/phpunit": "^10.4"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
@@ -12034,7 +12111,7 @@
|
||||
"support": {
|
||||
"issues": "https://github.com/sebastianbergmann/comparator/issues",
|
||||
"security": "https://github.com/sebastianbergmann/comparator/security/policy",
|
||||
"source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1"
|
||||
"source": "https://github.com/sebastianbergmann/comparator/tree/5.0.2"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -12042,7 +12119,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2023-08-14T13:18:12+00:00"
|
||||
"time": "2024-08-12T06:03:08+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sebastian/complexity",
|
||||
|
||||
@@ -117,7 +117,7 @@ return [
|
||||
'expression_engine' => true,
|
||||
// see cer.php for exchange rates feature flag.
|
||||
],
|
||||
'version' => 'develop/2024-08-05',
|
||||
'version' => 'develop/2024-08-26',
|
||||
'api_version' => '2.1.0',
|
||||
'db_version' => 24,
|
||||
|
||||
|
||||
535
package-lock.json
generated
535
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,12 +0,0 @@
|
||||
diff --git a/node_modules/admin-lte/src/scss/_app-sidebar.scss b/node_modules/admin-lte/src/scss/_app-sidebar.scss
|
||||
index 437946b..040bf5d 100644
|
||||
--- a/node_modules/admin-lte/src/scss/_app-sidebar.scss
|
||||
+++ b/node_modules/admin-lte/src/scss/_app-sidebar.scss
|
||||
@@ -582,7 +582,6 @@ body:not(.app-loaded) {
|
||||
|
||||
@if $enable-dark-mode {
|
||||
@include color-mode(dark) {
|
||||
- &.app-sidebar,
|
||||
.app-sidebar {
|
||||
--#{$lte-prefix}sidebar-hover-bg: #{$lte-sidebar-hover-bg-dark};
|
||||
--#{$lte-prefix}sidebar-color: #{$lte-sidebar-color-dark};
|
||||
689
patches/admin-lte+4.0.0-beta1.patch
Normal file
689
patches/admin-lte+4.0.0-beta1.patch
Normal file
@@ -0,0 +1,689 @@
|
||||
diff --git a/node_modules/admin-lte/.browserslistrc b/node_modules/admin-lte/.browserslistrc
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/.bundlewatch.config.json b/node_modules/admin-lte/.bundlewatch.config.json
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/.cache/.eslintcache b/node_modules/admin-lte/.cache/.eslintcache
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/.cache/.stylelintcache b/node_modules/admin-lte/.cache/.stylelintcache
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/.editorconfig b/node_modules/admin-lte/.editorconfig
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/.eslintignore b/node_modules/admin-lte/.eslintignore
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/.eslintrc.json b/node_modules/admin-lte/.eslintrc.json
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/.gitattributes b/node_modules/admin-lte/.gitattributes
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/.gitpod.yml b/node_modules/admin-lte/.gitpod.yml
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/.stylelintignore b/node_modules/admin-lte/.stylelintignore
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/.stylelintrc.json b/node_modules/admin-lte/.stylelintrc.json
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/CODE_OF_CONDUCT.md b/node_modules/admin-lte/CODE_OF_CONDUCT.md
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/LICENSE b/node_modules/admin-lte/LICENSE
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/README.md b/node_modules/admin-lte/README.md
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/composer.json b/node_modules/admin-lte/composer.json
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/AdminLTEFullLogo.png b/node_modules/admin-lte/dist/assets/img/AdminLTEFullLogo.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/AdminLTELogo.png b/node_modules/admin-lte/dist/assets/img/AdminLTELogo.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/avatar.png b/node_modules/admin-lte/dist/assets/img/avatar.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/avatar2.png b/node_modules/admin-lte/dist/assets/img/avatar2.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/avatar3.png b/node_modules/admin-lte/dist/assets/img/avatar3.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/avatar4.png b/node_modules/admin-lte/dist/assets/img/avatar4.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/avatar5.png b/node_modules/admin-lte/dist/assets/img/avatar5.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/boxed-bg.jpg b/node_modules/admin-lte/dist/assets/img/boxed-bg.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/boxed-bg.png b/node_modules/admin-lte/dist/assets/img/boxed-bg.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/credit/american-express.png b/node_modules/admin-lte/dist/assets/img/credit/american-express.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/credit/cirrus.png b/node_modules/admin-lte/dist/assets/img/credit/cirrus.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/credit/mastercard.png b/node_modules/admin-lte/dist/assets/img/credit/mastercard.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/credit/paypal.png b/node_modules/admin-lte/dist/assets/img/credit/paypal.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/credit/paypal2.png b/node_modules/admin-lte/dist/assets/img/credit/paypal2.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/credit/visa.png b/node_modules/admin-lte/dist/assets/img/credit/visa.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/default-150x150.png b/node_modules/admin-lte/dist/assets/img/default-150x150.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/icons.png b/node_modules/admin-lte/dist/assets/img/icons.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/photo1.png b/node_modules/admin-lte/dist/assets/img/photo1.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/photo2.png b/node_modules/admin-lte/dist/assets/img/photo2.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/photo3.jpg b/node_modules/admin-lte/dist/assets/img/photo3.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/photo4.jpg b/node_modules/admin-lte/dist/assets/img/photo4.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/prod-1.jpg b/node_modules/admin-lte/dist/assets/img/prod-1.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/prod-2.jpg b/node_modules/admin-lte/dist/assets/img/prod-2.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/prod-3.jpg b/node_modules/admin-lte/dist/assets/img/prod-3.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/prod-4.jpg b/node_modules/admin-lte/dist/assets/img/prod-4.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/prod-5.jpg b/node_modules/admin-lte/dist/assets/img/prod-5.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/user1-128x128.jpg b/node_modules/admin-lte/dist/assets/img/user1-128x128.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/user2-160x160.jpg b/node_modules/admin-lte/dist/assets/img/user2-160x160.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/user3-128x128.jpg b/node_modules/admin-lte/dist/assets/img/user3-128x128.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/user4-128x128.jpg b/node_modules/admin-lte/dist/assets/img/user4-128x128.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/user5-128x128.jpg b/node_modules/admin-lte/dist/assets/img/user5-128x128.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/user6-128x128.jpg b/node_modules/admin-lte/dist/assets/img/user6-128x128.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/user7-128x128.jpg b/node_modules/admin-lte/dist/assets/img/user7-128x128.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/assets/img/user8-128x128.jpg b/node_modules/admin-lte/dist/assets/img/user8-128x128.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/css/adminlte.css b/node_modules/admin-lte/dist/css/adminlte.css
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/css/adminlte.css.map b/node_modules/admin-lte/dist/css/adminlte.css.map
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/css/adminlte.min.css b/node_modules/admin-lte/dist/css/adminlte.min.css
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/css/adminlte.min.css.map b/node_modules/admin-lte/dist/css/adminlte.min.css.map
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/css/adminlte.rtl.css b/node_modules/admin-lte/dist/css/adminlte.rtl.css
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/css/adminlte.rtl.css.map b/node_modules/admin-lte/dist/css/adminlte.rtl.css.map
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/css/adminlte.rtl.min.css b/node_modules/admin-lte/dist/css/adminlte.rtl.min.css
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/css/adminlte.rtl.min.css.map b/node_modules/admin-lte/dist/css/adminlte.rtl.min.css.map
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/js/adminlte.js b/node_modules/admin-lte/dist/js/adminlte.js
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/js/adminlte.js.map b/node_modules/admin-lte/dist/js/adminlte.js.map
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/js/adminlte.min.js b/node_modules/admin-lte/dist/js/adminlte.min.js
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/js/adminlte.min.js.map b/node_modules/admin-lte/dist/js/adminlte.min.js.map
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/UI/general.html b/node_modules/admin-lte/dist/pages/UI/general.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/UI/timeline.html b/node_modules/admin-lte/dist/pages/UI/timeline.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/docs/browser-support.html b/node_modules/admin-lte/dist/pages/docs/browser-support.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/docs/color-mode.html b/node_modules/admin-lte/dist/pages/docs/color-mode.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/docs/components/main-header.html b/node_modules/admin-lte/dist/pages/docs/components/main-header.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/docs/components/main-sidebar.html b/node_modules/admin-lte/dist/pages/docs/components/main-sidebar.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/docs/faq.html b/node_modules/admin-lte/dist/pages/docs/faq.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/docs/how-to-contribute.html b/node_modules/admin-lte/dist/pages/docs/how-to-contribute.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/docs/introduction.html b/node_modules/admin-lte/dist/pages/docs/introduction.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/docs/javascript/treeview.html b/node_modules/admin-lte/dist/pages/docs/javascript/treeview.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/docs/layout.html b/node_modules/admin-lte/dist/pages/docs/layout.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/docs/license.html b/node_modules/admin-lte/dist/pages/docs/license.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/examples/lockscreen.html b/node_modules/admin-lte/dist/pages/examples/lockscreen.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/examples/login-v2.html b/node_modules/admin-lte/dist/pages/examples/login-v2.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/examples/login.html b/node_modules/admin-lte/dist/pages/examples/login.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/examples/register-v2.html b/node_modules/admin-lte/dist/pages/examples/register-v2.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/examples/register.html b/node_modules/admin-lte/dist/pages/examples/register.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/forms/general.html b/node_modules/admin-lte/dist/pages/forms/general.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/index.html b/node_modules/admin-lte/dist/pages/index.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/index2.html b/node_modules/admin-lte/dist/pages/index2.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/index3.html b/node_modules/admin-lte/dist/pages/index3.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/layout/collapsed-sidebar.html b/node_modules/admin-lte/dist/pages/layout/collapsed-sidebar.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/layout/fixed-complete.html b/node_modules/admin-lte/dist/pages/layout/fixed-complete.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/layout/fixed-sidebar.html b/node_modules/admin-lte/dist/pages/layout/fixed-sidebar.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/layout/layout-rtl.html b/node_modules/admin-lte/dist/pages/layout/layout-rtl.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/layout/logo-switch.html b/node_modules/admin-lte/dist/pages/layout/logo-switch.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/layout/sidebar-mini.html b/node_modules/admin-lte/dist/pages/layout/sidebar-mini.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/layout/unfixed-sidebar.html b/node_modules/admin-lte/dist/pages/layout/unfixed-sidebar.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/tables/simple.html b/node_modules/admin-lte/dist/pages/tables/simple.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/widgets/cards.html b/node_modules/admin-lte/dist/pages/widgets/cards.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/widgets/info-box.html b/node_modules/admin-lte/dist/pages/widgets/info-box.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/dist/pages/widgets/small-box.html b/node_modules/admin-lte/dist/pages/widgets/small-box.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/index.html b/node_modules/admin-lte/index.html
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/AdminLTEFullLogo.png b/node_modules/admin-lte/src/assets/img/AdminLTEFullLogo.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/AdminLTELogo.png b/node_modules/admin-lte/src/assets/img/AdminLTELogo.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/avatar.png b/node_modules/admin-lte/src/assets/img/avatar.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/avatar2.png b/node_modules/admin-lte/src/assets/img/avatar2.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/avatar3.png b/node_modules/admin-lte/src/assets/img/avatar3.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/avatar4.png b/node_modules/admin-lte/src/assets/img/avatar4.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/avatar5.png b/node_modules/admin-lte/src/assets/img/avatar5.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/boxed-bg.jpg b/node_modules/admin-lte/src/assets/img/boxed-bg.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/boxed-bg.png b/node_modules/admin-lte/src/assets/img/boxed-bg.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/credit/american-express.png b/node_modules/admin-lte/src/assets/img/credit/american-express.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/credit/cirrus.png b/node_modules/admin-lte/src/assets/img/credit/cirrus.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/credit/mastercard.png b/node_modules/admin-lte/src/assets/img/credit/mastercard.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/credit/paypal.png b/node_modules/admin-lte/src/assets/img/credit/paypal.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/credit/paypal2.png b/node_modules/admin-lte/src/assets/img/credit/paypal2.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/credit/visa.png b/node_modules/admin-lte/src/assets/img/credit/visa.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/default-150x150.png b/node_modules/admin-lte/src/assets/img/default-150x150.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/icons.png b/node_modules/admin-lte/src/assets/img/icons.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/photo1.png b/node_modules/admin-lte/src/assets/img/photo1.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/photo2.png b/node_modules/admin-lte/src/assets/img/photo2.png
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/photo3.jpg b/node_modules/admin-lte/src/assets/img/photo3.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/photo4.jpg b/node_modules/admin-lte/src/assets/img/photo4.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/prod-1.jpg b/node_modules/admin-lte/src/assets/img/prod-1.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/prod-2.jpg b/node_modules/admin-lte/src/assets/img/prod-2.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/prod-3.jpg b/node_modules/admin-lte/src/assets/img/prod-3.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/prod-4.jpg b/node_modules/admin-lte/src/assets/img/prod-4.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/prod-5.jpg b/node_modules/admin-lte/src/assets/img/prod-5.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/user1-128x128.jpg b/node_modules/admin-lte/src/assets/img/user1-128x128.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/user2-160x160.jpg b/node_modules/admin-lte/src/assets/img/user2-160x160.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/user3-128x128.jpg b/node_modules/admin-lte/src/assets/img/user3-128x128.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/user4-128x128.jpg b/node_modules/admin-lte/src/assets/img/user4-128x128.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/user5-128x128.jpg b/node_modules/admin-lte/src/assets/img/user5-128x128.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/user6-128x128.jpg b/node_modules/admin-lte/src/assets/img/user6-128x128.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/user7-128x128.jpg b/node_modules/admin-lte/src/assets/img/user7-128x128.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/assets/img/user8-128x128.jpg b/node_modules/admin-lte/src/assets/img/user8-128x128.jpg
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/config/assets.config.mjs b/node_modules/admin-lte/src/config/assets.config.mjs
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/config/astro.config.mjs b/node_modules/admin-lte/src/config/astro.config.mjs
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/config/postcss.config.mjs b/node_modules/admin-lte/src/config/postcss.config.mjs
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/config/rollup.config.js b/node_modules/admin-lte/src/config/rollup.config.js
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/.eslintrc.json b/node_modules/admin-lte/src/html/.eslintrc.json
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/.prettierrc.js b/node_modules/admin-lte/src/html/.prettierrc.js
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/.tsconfig.json b/node_modules/admin-lte/src/html/.tsconfig.json
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/components/_head.astro b/node_modules/admin-lte/src/html/components/_head.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/components/_scripts.astro b/node_modules/admin-lte/src/html/components/_scripts.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/components/dashboard/_footer.astro b/node_modules/admin-lte/src/html/components/dashboard/_footer.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/components/dashboard/_sidenav.astro b/node_modules/admin-lte/src/html/components/dashboard/_sidenav.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/components/dashboard/_topbar.astro b/node_modules/admin-lte/src/html/components/dashboard/_topbar.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/components/docs/browser-support.mdx b/node_modules/admin-lte/src/html/components/docs/browser-support.mdx
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/components/docs/color-mode.mdx b/node_modules/admin-lte/src/html/components/docs/color-mode.mdx
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/components/docs/components/main-header.mdx b/node_modules/admin-lte/src/html/components/docs/components/main-header.mdx
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/components/docs/components/main-sidebar.mdx b/node_modules/admin-lte/src/html/components/docs/components/main-sidebar.mdx
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/components/docs/faq.mdx b/node_modules/admin-lte/src/html/components/docs/faq.mdx
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/components/docs/how-to-contribute.mdx b/node_modules/admin-lte/src/html/components/docs/how-to-contribute.mdx
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/components/docs/introduction.mdx b/node_modules/admin-lte/src/html/components/docs/introduction.mdx
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/components/docs/license.mdx b/node_modules/admin-lte/src/html/components/docs/license.mdx
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/components/javascript/treeview.mdx b/node_modules/admin-lte/src/html/components/javascript/treeview.mdx
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/env.d.ts b/node_modules/admin-lte/src/html/env.d.ts
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/UI/general.astro b/node_modules/admin-lte/src/html/pages/UI/general.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/UI/timeline.astro b/node_modules/admin-lte/src/html/pages/UI/timeline.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/docs/browser-support.astro b/node_modules/admin-lte/src/html/pages/docs/browser-support.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/docs/color-mode.astro b/node_modules/admin-lte/src/html/pages/docs/color-mode.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/docs/components/main-header.astro b/node_modules/admin-lte/src/html/pages/docs/components/main-header.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/docs/components/main-sidebar.astro b/node_modules/admin-lte/src/html/pages/docs/components/main-sidebar.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/docs/faq.astro b/node_modules/admin-lte/src/html/pages/docs/faq.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/docs/how-to-contribute.astro b/node_modules/admin-lte/src/html/pages/docs/how-to-contribute.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/docs/introduction.astro b/node_modules/admin-lte/src/html/pages/docs/introduction.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/docs/javascript/treeview.astro b/node_modules/admin-lte/src/html/pages/docs/javascript/treeview.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/docs/layout.astro b/node_modules/admin-lte/src/html/pages/docs/layout.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/docs/license.astro b/node_modules/admin-lte/src/html/pages/docs/license.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/examples/lockscreen.astro b/node_modules/admin-lte/src/html/pages/examples/lockscreen.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/examples/login-v2.astro b/node_modules/admin-lte/src/html/pages/examples/login-v2.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/examples/login.astro b/node_modules/admin-lte/src/html/pages/examples/login.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/examples/register-v2.astro b/node_modules/admin-lte/src/html/pages/examples/register-v2.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/examples/register.astro b/node_modules/admin-lte/src/html/pages/examples/register.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/forms/general.astro b/node_modules/admin-lte/src/html/pages/forms/general.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/index.astro b/node_modules/admin-lte/src/html/pages/index.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/index2.astro b/node_modules/admin-lte/src/html/pages/index2.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/index3.astro b/node_modules/admin-lte/src/html/pages/index3.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/layout/collapsed-sidebar.astro b/node_modules/admin-lte/src/html/pages/layout/collapsed-sidebar.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/layout/fixed-complete.astro b/node_modules/admin-lte/src/html/pages/layout/fixed-complete.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/layout/fixed-sidebar.astro b/node_modules/admin-lte/src/html/pages/layout/fixed-sidebar.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/layout/layout-rtl.astro b/node_modules/admin-lte/src/html/pages/layout/layout-rtl.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/layout/logo-switch.astro b/node_modules/admin-lte/src/html/pages/layout/logo-switch.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/layout/sidebar-mini.astro b/node_modules/admin-lte/src/html/pages/layout/sidebar-mini.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/layout/unfixed-sidebar.astro b/node_modules/admin-lte/src/html/pages/layout/unfixed-sidebar.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/tables/simple.astro b/node_modules/admin-lte/src/html/pages/tables/simple.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/widgets/cards.astro b/node_modules/admin-lte/src/html/pages/widgets/cards.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/widgets/info-box.astro b/node_modules/admin-lte/src/html/pages/widgets/info-box.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/html/pages/widgets/small-box.astro b/node_modules/admin-lte/src/html/pages/widgets/small-box.astro
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_app-content.scss b/node_modules/admin-lte/src/scss/_app-content.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_app-footer.scss b/node_modules/admin-lte/src/scss/_app-footer.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_app-header.scss b/node_modules/admin-lte/src/scss/_app-header.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_app-main.scss b/node_modules/admin-lte/src/scss/_app-main.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_app-sidebar.scss b/node_modules/admin-lte/src/scss/_app-sidebar.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
index 9bf7e2b..e736da0
|
||||
--- a/node_modules/admin-lte/src/scss/_app-sidebar.scss
|
||||
+++ b/node_modules/admin-lte/src/scss/_app-sidebar.scss
|
||||
@@ -582,7 +582,6 @@ body:not(.app-loaded) {
|
||||
|
||||
@if $enable-dark-mode {
|
||||
@include color-mode(dark) {
|
||||
- &.app-sidebar,
|
||||
.app-sidebar {
|
||||
--#{$lte-prefix}sidebar-hover-bg: #{$lte-sidebar-hover-bg-dark};
|
||||
--#{$lte-prefix}sidebar-color: #{$lte-sidebar-color-dark};
|
||||
diff --git a/node_modules/admin-lte/src/scss/_app-wrapper.scss b/node_modules/admin-lte/src/scss/_app-wrapper.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_bootstrap-variables.scss b/node_modules/admin-lte/src/scss/_bootstrap-variables.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_callouts.scss b/node_modules/admin-lte/src/scss/_callouts.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_cards.scss b/node_modules/admin-lte/src/scss/_cards.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_compact-mode.scss b/node_modules/admin-lte/src/scss/_compact-mode.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_direct-chat.scss b/node_modules/admin-lte/src/scss/_direct-chat.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_docs.scss b/node_modules/admin-lte/src/scss/_docs.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_dropdown.scss b/node_modules/admin-lte/src/scss/_dropdown.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_info-box.scss b/node_modules/admin-lte/src/scss/_info-box.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_miscellaneous.scss b/node_modules/admin-lte/src/scss/_miscellaneous.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_mixins.scss b/node_modules/admin-lte/src/scss/_mixins.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_progress-bars.scss b/node_modules/admin-lte/src/scss/_progress-bars.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_root.scss b/node_modules/admin-lte/src/scss/_root.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_small-box.scss b/node_modules/admin-lte/src/scss/_small-box.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_table.scss b/node_modules/admin-lte/src/scss/_table.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_timeline.scss b/node_modules/admin-lte/src/scss/_timeline.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_toasts.scss b/node_modules/admin-lte/src/scss/_toasts.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_variables-dark.scss b/node_modules/admin-lte/src/scss/_variables-dark.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/_variables.scss b/node_modules/admin-lte/src/scss/_variables.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/adminlte.scss b/node_modules/admin-lte/src/scss/adminlte.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/mixins/_animations.scss b/node_modules/admin-lte/src/scss/mixins/_animations.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/mixins/_scrollbar.scss b/node_modules/admin-lte/src/scss/mixins/_scrollbar.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/pages/_lockscreen.scss b/node_modules/admin-lte/src/scss/pages/_lockscreen.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/pages/_login_and_register.scss b/node_modules/admin-lte/src/scss/pages/_login_and_register.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/parts/_components.scss b/node_modules/admin-lte/src/scss/parts/_components.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/parts/_core.scss b/node_modules/admin-lte/src/scss/parts/_core.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/parts/_extra-components.scss b/node_modules/admin-lte/src/scss/parts/_extra-components.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/parts/_miscellaneous.scss b/node_modules/admin-lte/src/scss/parts/_miscellaneous.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/scss/parts/_pages.scss b/node_modules/admin-lte/src/scss/parts/_pages.scss
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/ts/adminlte.ts b/node_modules/admin-lte/src/ts/adminlte.ts
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/ts/card-widget.ts b/node_modules/admin-lte/src/ts/card-widget.ts
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/ts/direct-chat.ts b/node_modules/admin-lte/src/ts/direct-chat.ts
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/ts/fullscreen.ts b/node_modules/admin-lte/src/ts/fullscreen.ts
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/ts/layout.ts b/node_modules/admin-lte/src/ts/layout.ts
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/ts/push-menu.ts b/node_modules/admin-lte/src/ts/push-menu.ts
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/ts/treeview.ts b/node_modules/admin-lte/src/ts/treeview.ts
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/ts/util/index.ts b/node_modules/admin-lte/src/ts/util/index.ts
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/src/utils/index.js b/node_modules/admin-lte/src/utils/index.js
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
diff --git a/node_modules/admin-lte/tsconfig.json b/node_modules/admin-lte/tsconfig.json
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
@@ -15,14 +15,14 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@johmun/vue-tags-input": "^2",
|
||||
"@vue/compiler-sfc": "^3.4.34",
|
||||
"axios": "^1.3",
|
||||
"@vue/compiler-sfc": "^3.3.4",
|
||||
"axios": "^1.7",
|
||||
"bootstrap-sass": "^3",
|
||||
"cross-env": "^7.0",
|
||||
"font-awesome": "^4.7.0",
|
||||
"jquery": "^3",
|
||||
"laravel-mix": "^6.0",
|
||||
"postcss": "^8.4",
|
||||
"postcss": ">=8.4.31",
|
||||
"uiv": "^1.4",
|
||||
"vue": "^2.7",
|
||||
"vue-i18n": "^8",
|
||||
|
||||
@@ -540,6 +540,7 @@ export default {
|
||||
// }
|
||||
},
|
||||
convertData: function () {
|
||||
console.log('start of convertData');
|
||||
let data = {
|
||||
'apply_rules': this.applyRules,
|
||||
'fire_webhooks': this.fireWebhooks,
|
||||
@@ -585,7 +586,7 @@ export default {
|
||||
}
|
||||
}
|
||||
//console.log(data);
|
||||
|
||||
console.log('end of convertData');
|
||||
return data;
|
||||
},
|
||||
convertDataRow(row, index, transactionType, currencyId) {
|
||||
@@ -741,8 +742,8 @@ export default {
|
||||
return currentArray;
|
||||
},
|
||||
submit: function (e) {
|
||||
|
||||
let button = $('#submitButton');
|
||||
console.log('Submit!');
|
||||
let button = $(e.currentTarget);
|
||||
button.prop("disabled", true);
|
||||
|
||||
const page = window.location.href.split('/');
|
||||
@@ -750,23 +751,26 @@ export default {
|
||||
let uri = './api/v1/transactions/' + groupId + '?_token=' + document.head.querySelector('meta[name="csrf-token"]').content;
|
||||
let method = 'PUT';
|
||||
if (this.storeAsNew) {
|
||||
console.log('storeAsNew');
|
||||
// other links.
|
||||
uri = './api/v1/transactions?_token=' + document.head.querySelector('meta[name="csrf-token"]').content;
|
||||
method = 'POST';
|
||||
}
|
||||
const data = this.convertData();
|
||||
|
||||
//axios.put(uri, data)
|
||||
console.log('POST!');
|
||||
axios({
|
||||
method: method,
|
||||
url: uri,
|
||||
data: data,
|
||||
}).then(response => {
|
||||
console.log('Response!');
|
||||
if (0 === this.collectAttachmentData(response)) {
|
||||
const title = response.data.data.attributes.group_title ?? response.data.data.attributes.transactions[0].description;
|
||||
this.redirectUser(response.data.data.id, title);
|
||||
}
|
||||
button.removeAttr('disabled');
|
||||
}).catch(error => {
|
||||
console.log('Error :(');
|
||||
// give user errors things back.
|
||||
// something something render errors.
|
||||
this.parseErrors(error.response.data);
|
||||
@@ -775,10 +779,11 @@ export default {
|
||||
if (e) {
|
||||
e.preventDefault();
|
||||
}
|
||||
button.removeAttr('disabled');
|
||||
console.log('DONE with method.');
|
||||
},
|
||||
|
||||
redirectUser(groupId, title) {
|
||||
console.log('Now in redirectUser');
|
||||
if (this.returnAfter) {
|
||||
this.setDefaultErrors();
|
||||
// do message if update or new:
|
||||
@@ -796,10 +801,11 @@ export default {
|
||||
window.location.href = window.previousUrl + '?transaction_group_id=' + groupId + '&message=updated';
|
||||
}
|
||||
}
|
||||
console.log('End of redirectUser');
|
||||
},
|
||||
|
||||
collectAttachmentData(response) {
|
||||
// console.log('Now incollectAttachmentData()');
|
||||
console.log('Now incollectAttachmentData()');
|
||||
let groupId = response.data.data.id;
|
||||
|
||||
// array of all files to be uploaded:
|
||||
@@ -831,7 +837,7 @@ export default {
|
||||
}
|
||||
}
|
||||
let count = toBeUploaded.length;
|
||||
// console.log('Found ' + toBeUploaded.length + ' attachments.');
|
||||
console.log('Found ' + toBeUploaded.length + ' attachments.');
|
||||
|
||||
// loop all uploads.
|
||||
for (const key in toBeUploaded) {
|
||||
@@ -857,6 +863,7 @@ export default {
|
||||
})(toBeUploaded[key], key, this);
|
||||
}
|
||||
}
|
||||
console.log('Done with collectAttachmentData()');
|
||||
return count;
|
||||
},
|
||||
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
"flash_warning": "\uacbd\uace0!",
|
||||
"flash_success": "\uc131\uacf5!",
|
||||
"close": "\ub2eb\uae30",
|
||||
"select_dest_account": "Please select or type a valid destination account name",
|
||||
"select_source_account": "Please select or type a valid source account name",
|
||||
"select_dest_account": "\uc720\ud6a8\ud55c \ub300\uc0c1 \uacc4\uc815 \ub0b4\uc5ed\uc744 \uc120\ud0dd \ub610\ub294 \ud0c0\uc785\uc744 \uc120\ud0dd\ud558\uc2ed\uc2dc\uc624.",
|
||||
"select_source_account": "\uc720\ud6a8\ud55c \uc18c\uc2a4 \uacc4\uc815 \ub0b4\uc5ed\uc744 \uc120\ud0dd \ub610\ub294 \ud0c0\uc785\uc744 \uc120\ud0dd\ud558\uc2ed\uc2dc\uc624.",
|
||||
"split_transaction_title": "\ubd84\ud560 \uac70\ub798\uc5d0 \ub300\ud55c \uc124\uba85",
|
||||
"errors_submission": "There was something wrong with your submission. Please check out the errors below.",
|
||||
"errors_submission": "\uc81c\ucd9c\ud55c \ub0b4\uc6a9\uc5d0 \ubb38\uc81c\uac00 \uc788\uc2b5\ub2c8\ub2e4. \uc544\ub798 \uc624\ub958\ub97c \ud655\uc778\ud574 \uc8fc\uc138\uc694.",
|
||||
"split": "\ub098\ub204\uae30",
|
||||
"single_split": "\ub098\ub204\uae30",
|
||||
"transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\uac70\ub798 #{ID} (\"{title}\")<\/a>\uac00 \uc800\uc7a5\ub418\uc5c8\uc2b5\ub2c8\ub2e4.",
|
||||
@@ -33,7 +33,7 @@
|
||||
"submit": "\uc81c\ucd9c",
|
||||
"amount": "\uae08\uc561",
|
||||
"date": "\ub0a0\uc9dc",
|
||||
"is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
|
||||
"is_reconciled_fields_dropped": "\uc774 \uac70\ub798\uac00 \uc218\uc815\ub418\uc5c8\uae30 \ub54c\ubb38\uc5d0, \uacc4\uc88c\ub098 \uae08\uc561\uc744 \uc5c5\ub370\uc774\ud2b8 \ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.",
|
||||
"tags": "\ud0dc\uadf8",
|
||||
"no_budget": "(\uc608\uc0b0 \uc5c6\uc74c)",
|
||||
"no_bill": "(\uccad\uad6c\uc11c \uc5c6\uc74c)",
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
"flash_warning": "Aviso!",
|
||||
"flash_success": "Sucesso!",
|
||||
"close": "Fechar",
|
||||
"select_dest_account": "Please select or type a valid destination account name",
|
||||
"select_source_account": "Please select or type a valid source account name",
|
||||
"select_dest_account": "Por favor, selecione ou digite um nome de conta destinat\u00e1ria v\u00e1lida",
|
||||
"select_source_account": "Por favor, selecione ou digite um nome de conta v\u00e1lido",
|
||||
"split_transaction_title": "Descri\u00e7\u00e3o da transa\u00e7\u00e3o dividida",
|
||||
"errors_submission": "Algo correu mal com o envio dos dados. Por favor verifique e corrija os erros abaixo.",
|
||||
"split": "Dividir",
|
||||
|
||||
@@ -5,60 +5,60 @@
|
||||
"flash_warning": "\u0423\u0432\u0430\u0433\u0430!",
|
||||
"flash_success": "\u0423\u0441\u043f\u0456\u0448\u043d\u043e!",
|
||||
"close": "\u0417\u0430\u043a\u0440\u0438\u0442\u0438",
|
||||
"select_dest_account": "Please select or type a valid destination account name",
|
||||
"select_source_account": "Please select or type a valid source account name",
|
||||
"split_transaction_title": "Description of the split transaction",
|
||||
"errors_submission": "There was something wrong with your submission. Please check out the errors below.",
|
||||
"select_dest_account": "\u0411\u0443\u0434\u044c \u043b\u0430\u0441\u043a\u0430, \u0432\u0438\u0431\u0435\u0440\u0456\u0442\u044c \u0430\u0431\u043e \u0432\u0432\u0435\u0434\u0456\u0442\u044c \u0434\u0456\u0439\u0441\u043d\u0435 \u0456\u043c'\u044f \u043e\u0431\u043b\u0456\u043a\u043e\u0432\u043e\u0433\u043e \u0437\u0430\u043f\u0438\u0441\u0443 \u043f\u0440\u0438\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u044f",
|
||||
"select_source_account": "\u0411\u0443\u0434\u044c \u043b\u0430\u0441\u043a\u0430, \u0432\u0438\u0431\u0435\u0440\u0456\u0442\u044c \u0430\u0431\u043e \u0432\u0432\u0435\u0434\u0456\u0442\u044c \u0434\u0456\u0439\u0441\u043d\u0435 \u0456\u043c'\u044f \u0432\u0438\u0445\u0456\u0434\u043d\u043e\u0433\u043e \u043e\u0431\u043b\u0456\u043a\u043e\u0432\u043e\u0433\u043e \u0437\u0430\u043f\u0438\u0441\u0443",
|
||||
"split_transaction_title": "\u041e\u043f\u0438\u0441 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u0457 \u0440\u043e\u0437\u0434\u0456\u043b\u0435\u043d\u043d\u044f",
|
||||
"errors_submission": "\u0429\u043e\u0441\u044c \u043d\u0435 \u0442\u0430\u043a \u0437 \u0432\u0430\u0448\u043e\u044e \u043f\u0440\u043e\u043f\u043e\u0437\u0438\u0446\u0456\u0454\u044e. \u0411\u0443\u0434\u044c \u043b\u0430\u0441\u043a\u0430, \u043f\u0435\u0440\u0435\u0432\u0456\u0440\u0442\u0435 \u043f\u043e\u043c\u0438\u043b\u043a\u0438 \u043d\u0438\u0436\u0447\u0435.",
|
||||
"split": "\u0420\u043e\u0437\u0434\u0456\u043b\u0438\u0442\u0438",
|
||||
"single_split": "\u0420\u043e\u0437\u0434\u0456\u043b\u0438\u0442\u0438",
|
||||
"transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
|
||||
"transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\u0422\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u044f #{ID} (\"{title}\")<\/a> \u0431\u0443\u043b\u0430 \u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043d\u0430.",
|
||||
"webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">\u0412\u0435\u0431\u0445\u0443\u043a #{ID} (\"{title}\")<\/a> \u0431\u0443\u0432 \u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043d\u0438\u0439.",
|
||||
"webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">\u0412\u0435\u0431\u0445\u0443\u043a #{ID}<\/a> (\"{title}\") \u0431\u0443\u0432 \u043e\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0439.",
|
||||
"transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> (\"{title}\") has been updated.",
|
||||
"transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> has been stored.",
|
||||
"transaction_journal_information": "Transaction information",
|
||||
"submission_options": "Submission options",
|
||||
"transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">\u0422\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u044f #{ID}<\/a> (\"{title}\") \u0431\u0443\u043b\u0430 \u043e\u043d\u043e\u0432\u043b\u0435\u043d\u0430.",
|
||||
"transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">\u0422\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u044f #{ID}<\/a> \u0431\u0443\u043b\u0430 \u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043d\u0430.",
|
||||
"transaction_journal_information": "\u0406\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0456\u044f \u043f\u0440\u043e \u043f\u043b\u0430\u0442\u0456\u0436",
|
||||
"submission_options": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438 \u0441\u0430\u0431\u043c\u0456\u0442\u0443",
|
||||
"apply_rules_checkbox": "\u0417\u0430\u0441\u0442\u043e\u0441\u0443\u0432\u0430\u0442\u0438 \u043f\u0440\u0430\u0432\u0438\u043b\u0430",
|
||||
"fire_webhooks_checkbox": "Fire webhooks",
|
||||
"fire_webhooks_checkbox": "\u041f\u043e\u0436\u0435\u0436\u043d\u0456 \u0432\u0435\u0431\u0433\u0430\u043a\u0438",
|
||||
"no_budget_pointer": "\u0417\u0434\u0430\u0454\u0442\u044c\u0441\u044f, \u043d\u0435 \u0441\u0442\u0432\u043e\u0440\u0438\u043b\u0438 \u0436\u043e\u0434\u043d\u043e\u0433\u043e \u0431\u044e\u0434\u0436\u0435\u0442\u0443. \u0421\u0442\u0432\u043e\u0440\u0456\u0442\u044c \u043e\u0434\u0438\u043d \u043d\u0430 \u0441\u0442\u043e\u0440\u0456\u043d\u0446\u0456 <a href=\"budgets\">\u0431\u044e\u0434\u0436\u0435\u0442\u0456\u0432<\/a>. \u0411\u044e\u0434\u0436\u0435\u0442\u0438 \u043c\u043e\u0436\u0443\u0442\u044c \u0434\u043e\u043f\u043e\u043c\u043e\u0433\u0442\u0438 \u0432\u0430\u043c \u0441\u0442\u0435\u0436\u0438\u0442\u0438 \u0437\u0430 \u0432\u0438\u0442\u0440\u0430\u0442\u0430\u043c\u0438.",
|
||||
"no_bill_pointer": "\u0423 \u0432\u0430\u0441, \u0437\u0434\u0430\u0454\u0442\u044c\u0441\u044f, \u0449\u0435 \u043d\u0435\u043c\u0430\u0454 \u0440\u0430\u0445\u0443\u043d\u043a\u0456\u0432 \u0434\u043e \u0441\u043f\u043b\u0430\u0442\u0438. \u0421\u0442\u0432\u043e\u0440\u0456\u0442\u044c \u043a\u0456\u043b\u044c\u043a\u0430 \u043d\u0430 \u0441\u0442\u043e\u0440\u0456\u043d\u0446\u0456 <a href=\"bills\">\u0440\u0430\u0445\u0443\u043d\u043a\u0456\u0432<\/a>. \u0420\u0430\u0445\u0443\u043d\u043a\u0438 \u043c\u043e\u0436\u0443\u0442\u044c \u0434\u043e\u043f\u043e\u043c\u043e\u0433\u0442\u0438 \u0432\u0430\u043c \u0441\u0442\u0435\u0436\u0438\u0442\u0438 \u0437\u0430 \u0432\u0438\u0442\u0440\u0430\u0442\u0430\u043c\u0438.",
|
||||
"source_account": "\u0412\u0438\u0445\u0456\u0434\u043d\u0438\u0439 \u0440\u0430\u0445\u0443\u043d\u043e\u043a",
|
||||
"hidden_fields_preferences": "You can enable more transaction options in your <a href=\"preferences\">preferences<\/a>.",
|
||||
"hidden_fields_preferences": "\u0412\u0438 \u043c\u043e\u0436\u0435\u0442\u0435 \u0443\u0432\u0456\u043c\u043a\u043d\u0443\u0442\u0438 \u0431\u0456\u043b\u044c\u0448\u0435 \u043e\u043f\u0446\u0456\u0439 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u0457 \u0443 \u0432\u0430\u0448\u043e\u043c\u0443 <a href=\"preferences\">\u043d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f<\/a>.",
|
||||
"destination_account": "\u0420\u0430\u0445\u0443\u043d\u043e\u043a \u043f\u0440\u0438\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u044f",
|
||||
"add_another_split": "Add another split",
|
||||
"submission": "Submission",
|
||||
"stored_journal": "Successfully created new transaction \":description\"",
|
||||
"create_another": "After storing, return here to create another one.",
|
||||
"reset_after": "Reset form after submission",
|
||||
"add_another_split": "\u0414\u043e\u0434\u0430\u0442\u0438 \u0449\u0435 \u0447\u0430\u0441\u0442\u0438\u043d\u0443",
|
||||
"submission": "\u041f\u043e\u0434\u0430\u043d\u043d\u044f",
|
||||
"stored_journal": "\u0423\u0441\u043f\u0456\u0448\u043d\u043e \u0441\u0442\u0432\u043e\u0440\u0435\u043d\u043e \u043d\u043e\u0432\u0443 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u044e \":description\"",
|
||||
"create_another": "\u041f\u0456\u0441\u043b\u044f \u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043d\u043d\u044f, \u043f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438\u0441\u044f \u0441\u044e\u0434\u0438.",
|
||||
"reset_after": "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u0438 \u0444\u043e\u0440\u043c\u0443 \u043f\u0456\u0441\u043b\u044f \u0443\u0445\u0432\u0430\u043b\u0435\u043d\u043d\u044f",
|
||||
"submit": "\u041f\u0456\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0438",
|
||||
"amount": "\u0421\u0443\u043c\u0430",
|
||||
"date": "\u0414\u0430\u0442\u0430",
|
||||
"is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
|
||||
"is_reconciled_fields_dropped": "\u0427\u0435\u0440\u0435\u0437 \u0442\u0435, \u0449\u043e \u0446\u044f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u044f \u0431\u0443\u043b\u0430 \u0432\u0438\u043a\u043e\u043d\u0430\u043d\u0430, \u0432\u0438 \u043d\u0435 \u0437\u043c\u043e\u0436\u0435\u0442\u0435 \u043e\u043d\u043e\u0432\u0438\u0442\u0438 \u043e\u0431\u043b\u0456\u043a\u043e\u0432\u0456 \u0437\u0430\u043f\u0438\u0441\u0438, \u0430 \u0442\u0430\u043a\u043e\u0436 \u0441\u0443\u043c\u0438(\u0457).",
|
||||
"tags": "\u0422\u0435\u0433\u0438",
|
||||
"no_budget": "(\u043f\u043e\u0437\u0430 \u0431\u044e\u0434\u0436\u0435\u0442\u043e\u043c)",
|
||||
"no_bill": "(no bill)",
|
||||
"category": "Category",
|
||||
"no_bill": "(\u043d\u0435\u043c\u0430\u0454 \u0440\u0430\u0445\u0443\u043d\u043a\u0443)",
|
||||
"category": "\u041a\u0430\u0442\u0435\u0433\u043e\u0440\u0456\u044f",
|
||||
"attachments": "\u0412\u043a\u043b\u0430\u0434\u0435\u043d\u043d\u044f",
|
||||
"notes": "Notes",
|
||||
"notes": "\u041f\u0440\u0438\u043c\u0456\u0442\u043a\u0438",
|
||||
"external_url": "\u0417\u043e\u0432\u043d\u0456\u0448\u043d\u0456\u0439 URL",
|
||||
"update_transaction": "Update transaction",
|
||||
"after_update_create_another": "After updating, return here to continue editing.",
|
||||
"store_as_new": "Store as a new transaction instead of updating.",
|
||||
"split_title_help": "If you create a split transaction, there must be a global description for all splits of the transaction.",
|
||||
"update_transaction": "\u041e\u043d\u043e\u0432\u0438\u0442\u0438 \u043e\u043f\u0435\u0440\u0430\u0446\u0456\u044e",
|
||||
"after_update_create_another": "\u041f\u0456\u0441\u043b\u044f \u043e\u043d\u043e\u0432\u043b\u0435\u043d\u043d\u044f \u043f\u043e\u0432\u0435\u0440\u043d\u0456\u0442\u044c\u0441\u044f \u0441\u044e\u0434\u0438 \u0434\u043b\u044f \u043f\u0440\u043e\u0434\u043e\u0432\u0436\u0435\u043d\u043d\u044f \u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043d\u043d\u044f.",
|
||||
"store_as_new": "\u0417\u0431\u0435\u0440\u0456\u0433\u0430\u0442\u0438 \u0432 \u044f\u043a\u043e\u0441\u0442\u0456 \u043d\u043e\u0432\u043e\u0457 \u043e\u043f\u0435\u0440\u0430\u0446\u0456\u0457, \u0430 \u043d\u0435 \u043e\u043d\u043e\u0432\u043b\u044e\u0432\u0430\u0442\u0438.",
|
||||
"split_title_help": "\u042f\u043a\u0449\u043e \u0432\u0438 \u0441\u0442\u0432\u043e\u0440\u0438\u0442\u0435 \u0440\u043e\u0437\u043f\u043e\u0434\u0456\u043b\u0435\u043d\u0443 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u044e, \u0442\u043e \u043f\u043e\u0432\u0438\u043d\u043d\u0456 \u0431\u0443\u0442\u0438 \u0433\u043b\u043e\u0431\u0430\u043b\u044c\u043d\u0456 \u043e\u043f\u0438\u0441\u0438 \u0434\u043b\u044f \u0432\u0441\u0456\u0445 \u0440\u043e\u0437\u0434\u0456\u043b\u0435\u043d\u0438\u0445 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u0439.",
|
||||
"none_in_select_list": "(\u043d\u0435\u043c\u0430\u0454)",
|
||||
"no_piggy_bank": "(\u043d\u0435\u043c\u0430\u0454 \u0441\u043a\u0430\u0440\u0431\u043d\u0438\u0447\u043a\u0438)",
|
||||
"description": "\u041e\u043f\u0438\u0441",
|
||||
"split_transaction_title_help": "If you create a split transaction, there must be a global description for all splits of the transaction.",
|
||||
"split_transaction_title_help": "\u042f\u043a\u0449\u043e \u0432\u0438 \u0441\u0442\u0432\u043e\u0440\u0438\u0442\u0435 \u0440\u043e\u0437\u043f\u043e\u0434\u0456\u043b\u0435\u043d\u0443 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u044e, \u0442\u043e \u043f\u043e\u0432\u0438\u043d\u043d\u0456 \u0431\u0443\u0442\u0438 \u0433\u043b\u043e\u0431\u0430\u043b\u044c\u043d\u0456 \u043e\u043f\u0438\u0441\u0438 \u0434\u043b\u044f \u0432\u0441\u0456\u0445 \u0440\u043e\u0437\u0434\u0456\u043b\u0435\u043d\u0438\u0445 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u0439.",
|
||||
"destination_account_reconciliation": "\u0412\u0438 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442\u0435 \u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u043e\u043f\u0435\u0440\u0430\u0446\u0456\u0457 \u043f\u043e\u0433\u043e\u0434\u0436\u0435\u043d\u043d\u044f, \u0440\u0430\u0445\u0443\u043d\u043a\u0443 \u043f\u0440\u0438\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u044f.",
|
||||
"source_account_reconciliation": "\u0412\u0438 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442\u0435 \u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u043e\u043f\u0435\u0440\u0430\u0446\u0456\u0457 \u0437\u0432\u0456\u0440\u043a\u0438, \u0440\u0430\u0445\u0443\u043d\u043a\u0430 \u0434\u0436\u0435\u0440\u0435\u043b\u0430.",
|
||||
"budget": "Budget",
|
||||
"budget": "\u0411\u044e\u0434\u0436\u0435\u0442",
|
||||
"bill": "\u0420\u0430\u0445\u0443\u043d\u043e\u043a",
|
||||
"you_create_withdrawal": "You're creating a withdrawal.",
|
||||
"you_create_transfer": "You're creating a transfer.",
|
||||
"you_create_deposit": "You're creating a deposit.",
|
||||
"you_create_withdrawal": "\u0412\u0438 \u0441\u0442\u0432\u043e\u0440\u044e\u0454\u0442\u0435 \u0432\u0456\u0434\u043a\u043b\u0438\u043a\u0430\u043d\u043d\u044f.",
|
||||
"you_create_transfer": "\u0412\u0438 \u0441\u0442\u0432\u043e\u0440\u044e\u0454\u0442\u0435 \u043f\u0435\u0440\u0435\u043a\u0430\u0437.",
|
||||
"you_create_deposit": "\u0412\u0438 \u0441\u0442\u0432\u043e\u0440\u044e\u0454\u0442\u0435 \u0434\u0435\u043f\u043e\u0437\u0438\u0442.",
|
||||
"edit": "\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438",
|
||||
"delete": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438",
|
||||
"name": "Name",
|
||||
"name": "\u041d\u0430\u0437\u0432\u0430",
|
||||
"profile_whoops": "\u041b\u0438\u0448\u0435\u043d\u044c\u043a\u043e!",
|
||||
"profile_something_wrong": "\u0429\u043e\u0441\u044c \u043f\u0456\u0448\u043b\u043e \u043d\u0435 \u0442\u0430\u043a!",
|
||||
"profile_try_again": "\u0429\u043e\u0441\u044c \u043f\u0456\u0448\u043b\u043e \u043d\u0435 \u0442\u0430\u043a. \u0411\u0443\u0434\u044c \u043b\u0430\u0441\u043a\u0430, \u0441\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0449\u0435 \u0440\u0430\u0437.",
|
||||
@@ -107,7 +107,7 @@
|
||||
"actions": "\u0414\u0456\u0457",
|
||||
"meta_data": "\u041c\u0435\u0442\u0430-\u0434\u0430\u043d\u0456",
|
||||
"webhook_messages": "\u041f\u043e\u0432\u0456\u0434\u043e\u043c\u043b\u0435\u043d\u043d\u044f \u0432\u0435\u0431-\u0445\u0443\u043a\u0430",
|
||||
"inactive": "Inactive",
|
||||
"inactive": "\u041d\u0435\u0430\u043a\u0442\u0438\u0432\u043d\u0438\u0439",
|
||||
"no_webhook_messages": "\u041f\u043e\u0432\u0456\u0434\u043e\u043c\u043b\u0435\u043d\u043d\u044f \u0432\u0456\u0434\u0441\u0443\u0442\u043d\u0456",
|
||||
"inspect": "\u0414\u043e\u0441\u043b\u0456\u0434\u0438\u0442\u0438",
|
||||
"create_new_webhook": "\u0421\u0442\u0432\u043e\u0440\u0438\u0442\u0438 \u043d\u043e\u0432\u0438\u0439 \u0432\u0435\u0431-\u0445\u0443\u043a",
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
"postinstall": "patch-package --error-on-fail"
|
||||
},
|
||||
"devDependencies": {
|
||||
"axios": "^1.6.8",
|
||||
"axios": "^1.7.4",
|
||||
"laravel-vite-plugin": "^1.0.5",
|
||||
"patch-package": "^8.0.0",
|
||||
"sass": "^1.77.8",
|
||||
|
||||
@@ -28,6 +28,7 @@ return [
|
||||
'filter_must_be_in' => 'Filter ":filter" must be one of: :values',
|
||||
'filter_not_string' => 'Filter ":filter" is expected to be a string of text',
|
||||
'bad_api_filter' => 'This API endpoint does not support ":filter" as a filter.',
|
||||
'nog_logged_in' => 'You are not logged in.',
|
||||
'bad_type_source' => 'Firefly III can\'t determine the transaction type based on this source account.',
|
||||
'bad_type_destination' => 'Firefly III can\'t determine the transaction type based on this destination account.',
|
||||
'missing_where' => 'Array is missing "where"-clause',
|
||||
|
||||
@@ -243,10 +243,11 @@ Route::group(
|
||||
JsonApiRoute::server('v2')->prefix('v2')
|
||||
->resources(function (ResourceRegistrar $server): void {
|
||||
// ACCOUNTS
|
||||
$server->resource('accounts', AccountController::class)->relationships(function (Relationships $relations): void {
|
||||
$relations->hasOne('user')->readOnly();
|
||||
});
|
||||
// $server->resource('accounts', AccountController::class)->readOnly();
|
||||
$server->resource('accounts', AccountController::class)
|
||||
->relationships(function (Relationships $relations): void {
|
||||
$relations->hasOne('user')->readOnly();
|
||||
})
|
||||
;
|
||||
|
||||
// USERS
|
||||
$server->resource('users', JsonApiController::class)->readOnly()->relationships(function (Relationships $relations): void {
|
||||
|
||||
Reference in New Issue
Block a user