From 5b8e01fbfbdd7ba21520c6168cf865caf2216f08 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 29 Dec 2022 19:43:43 +0100 Subject: [PATCH] Various PSR12 code cleanup --- bootstrap/app.php | 11 +- config/auth.php | 2 +- config/cache.php | 2 +- config/database.php | 2 +- config/filesystems.php | 2 +- config/firefly.php | 1 - config/ide-helper.php | 2 +- config/logging.php | 2 +- config/mail.php | 16 +- config/passport.php | 1 + config/twigbridge.php | 34 +- ...016_06_16_000000_create_support_tables.php | 1 + .../2016_06_16_000001_create_users_table.php | 1 + .../2016_06_16_000002_create_main_tables.php | 1 + .../2016_08_25_091522_changes_for_3101.php | 1 + .../2016_09_12_121359_fix_nullables.php | 1 + ...10_09_150037_expand_transactions_table.php | 1 + .../2016_10_22_075804_changes_for_v410.php | 1 + .../2016_11_24_210552_changes_for_v420.php | 1 + .../2016_12_22_150431_changes_for_v430.php | 1 + .../2016_12_28_203205_changes_for_v431.php | 1 + .../2017_04_13_163623_changes_for_v440.php | 1 + .../2017_06_02_105232_changes_for_v450.php | 1 + .../2017_08_20_062014_changes_for_v470.php | 1 + .../2017_11_04_170844_changes_for_v470a.php | 1 + ...1_000001_create_oauth_auth_codes_table.php | 17 +- ...00002_create_oauth_access_tokens_table.php | 21 +- ...0003_create_oauth_refresh_tokens_table.php | 13 +- ...1_01_000004_create_oauth_clients_table.php | 23 +- ...te_oauth_personal_access_clients_table.php | 11 +- .../2018_04_07_210913_changes_for_v473.php | 1 - .../2018_04_29_174524_changes_for_v474.php | 1 - .../2018_06_08_200526_changes_for_v475.php | 133 +++--- .../2018_09_05_195147_changes_for_v477.php | 14 +- .../2018_11_06_172532_changes_for_v479.php | 7 +- .../2019_01_28_193833_changes_for_v4710.php | 17 +- .../2019_02_05_055516_changes_for_v4711.php | 14 +- .../2019_02_11_170529_changes_for_v4712.php | 7 +- ...19_03_11_223700_fix_ldap_configuration.php | 14 +- .../2019_03_22_183214_changes_for_v480.php | 28 +- ...2019_12_28_191351_make_locations_table.php | 21 +- .../2020_06_07_063612_changes_for_v530.php | 30 +- .../2020_06_30_202620_changes_for_v530a.php | 14 +- .../2020_07_24_162820_changes_for_v540.php | 53 ++- .../2020_11_12_070604_changes_for_v550.php | 58 +-- .../2021_03_12_061213_changes_for_v550b2.php | 24 +- ...064644_add_ldap_columns_to_users_table.php | 14 +- ...2021_05_13_053836_extend_currency_info.php | 9 +- .../2021_08_28_073733_user_groups.php | 98 +++-- .../2022_08_21_104626_add_user_groups.php | 26 +- ...9_18_123911_create_notifications_table.php | 3 +- .../2022_10_01_074908_invited_users.php | 3 +- .../2022_10_01_210238_audit_log_entries.php | 3 +- database/seeders/AccountTypeSeeder.php | 1 + database/seeders/ConfigSeeder.php | 2 +- database/seeders/DatabaseSeeder.php | 1 + database/seeders/ExchangeRateSeeder.php | 20 +- database/seeders/LinkTypeSeeder.php | 1 + database/seeders/PermissionSeeder.php | 1 + .../seeders/TransactionCurrencySeeder.php | 1 + database/seeders/TransactionTypeSeeder.php | 1 + frontend/src/App.vue | 2 +- frontend/src/api/accounts/get.js | 2 +- frontend/src/api/accounts/list.js | 2 +- frontend/src/api/authenticate/index.js | 2 +- frontend/src/api/categories/get.js | 4 +- frontend/src/api/currencies/get.js | 3 +- frontend/src/api/currencies/index.js | 5 +- frontend/src/api/currencies/post.js | 1 + frontend/src/api/piggy-banks/get.js | 3 +- frontend/src/api/preferences/index.js | 1 + frontend/src/api/recurring/get.js | 2 +- frontend/src/api/rule-groups/get.js | 3 +- frontend/src/api/rules/get.js | 2 +- frontend/src/api/subscriptions/get.js | 1 + frontend/src/api/system/about.js | 6 +- frontend/src/api/system/configuration.js | 5 +- frontend/src/api/tags/get.js | 1 + frontend/src/api/v2/accounts/get.js | 5 +- frontend/src/api/v2/preferences/index.js | 1 + frontend/src/api/v2/root/api.js | 1 + frontend/src/boot/axios.js | 6 +- frontend/src/boot/i18n.js | 6 +- frontend/src/components/Alert.vue | 8 +- .../src/components/CompositionComponent.vue | 22 +- frontend/src/components/DateRange.vue | 9 +- frontend/src/components/EssentialLink.vue | 6 +- .../src/components/dashboard/AccountChart.vue | 10 +- .../components/dashboard/BillInsightBox.vue | 10 +- .../src/components/dashboard/BudgetBox.vue | 6 +- .../dashboard/NetWorthInsightBox.vue | 13 +- frontend/src/components/dashboard/NewUser.vue | 72 +-- .../components/dashboard/SpendInsightBox.vue | 18 +- .../components/dashboard/TransactionList.vue | 15 +- .../components/dashboard/TransactionLists.vue | 12 +- .../components/transactions/LargeTable.vue | 24 +- frontend/src/css/quasar.variables.scss | 12 +- frontend/src/i18n/bg_BG/index.js | 410 +++++++++--------- frontend/src/i18n/cs_CZ/index.js | 410 +++++++++--------- frontend/src/i18n/da_DK/index.js | 410 +++++++++--------- frontend/src/i18n/de_DE/index.js | 410 +++++++++--------- frontend/src/i18n/el_GR/index.js | 410 +++++++++--------- frontend/src/i18n/en_GB/index.js | 410 +++++++++--------- frontend/src/i18n/en_US/index.js | 410 +++++++++--------- frontend/src/i18n/es_ES/index.js | 410 +++++++++--------- frontend/src/i18n/fi_FI/index.js | 410 +++++++++--------- frontend/src/i18n/fr_FR/index.js | 410 +++++++++--------- frontend/src/i18n/hu_HU/index.js | 410 +++++++++--------- frontend/src/i18n/id_ID/index.js | 410 +++++++++--------- frontend/src/i18n/it_IT/index.js | 410 +++++++++--------- frontend/src/i18n/ja_JP/index.js | 410 +++++++++--------- frontend/src/i18n/nb_NO/index.js | 410 +++++++++--------- frontend/src/i18n/nl_NL/index.js | 410 +++++++++--------- frontend/src/i18n/pl_PL/index.js | 410 +++++++++--------- frontend/src/i18n/pt_BR/index.js | 410 +++++++++--------- frontend/src/i18n/pt_PT/index.js | 410 +++++++++--------- frontend/src/i18n/ro_RO/index.js | 410 +++++++++--------- frontend/src/i18n/ru_RU/index.js | 410 +++++++++--------- frontend/src/i18n/sk_SK/index.js | 410 +++++++++--------- frontend/src/i18n/sl_SI/index.js | 410 +++++++++--------- frontend/src/i18n/sv_SE/index.js | 410 +++++++++--------- frontend/src/i18n/tr_TR/index.js | 410 +++++++++--------- frontend/src/i18n/uk_UA/index.js | 410 +++++++++--------- frontend/src/i18n/vi_VN/index.js | 410 +++++++++--------- frontend/src/i18n/zh_CN/index.js | 410 +++++++++--------- frontend/src/i18n/zh_TW/index.js | 410 +++++++++--------- frontend/src/index.template.html | 65 +-- frontend/src/layouts/MainLayout.vue | 122 +++--- frontend/src/pages/Error404.vue | 8 +- frontend/src/pages/accounts/Create.vue | 28 +- frontend/src/pages/accounts/Edit.vue | 26 +- frontend/src/pages/accounts/Index.vue | 55 +-- frontend/src/pages/accounts/Reconcile.vue | 14 +- frontend/src/pages/accounts/Show.vue | 8 +- frontend/src/pages/admin/Index.vue | 26 +- frontend/src/pages/budgets/Create.vue | 18 +- frontend/src/pages/budgets/Edit.vue | 18 +- frontend/src/pages/budgets/Index.vue | 28 +- frontend/src/pages/budgets/Show.vue | 8 +- frontend/src/pages/categories/Create.vue | 18 +- frontend/src/pages/categories/Edit.vue | 18 +- frontend/src/pages/categories/Index.vue | 27 +- frontend/src/pages/categories/Show.vue | 8 +- frontend/src/pages/currencies/Create.vue | 35 +- frontend/src/pages/currencies/Edit.vue | 35 +- frontend/src/pages/currencies/Index.vue | 29 +- frontend/src/pages/currencies/Show.vue | 8 +- frontend/src/pages/dashboard/Boxes.vue | 5 +- frontend/src/pages/dashboard/Dashboard.vue | 30 +- frontend/src/pages/dashboard/HomeChart.vue | 5 +- frontend/src/pages/development/Index.vue | 29 +- frontend/src/pages/groups/Edit.vue | 18 +- frontend/src/pages/groups/Index.vue | 14 +- frontend/src/pages/piggy-banks/Create.vue | 44 +- frontend/src/pages/piggy-banks/Edit.vue | 18 +- frontend/src/pages/piggy-banks/Index.vue | 27 +- frontend/src/pages/piggy-banks/Show.vue | 4 +- frontend/src/pages/preferences/Index.vue | 72 +-- frontend/src/pages/profile/Index.vue | 35 +- frontend/src/pages/recurring/Create.vue | 158 +++---- frontend/src/pages/recurring/Edit.vue | 144 +++--- frontend/src/pages/recurring/Index.vue | 27 +- frontend/src/pages/reports/Default.vue | 6 +- frontend/src/pages/reports/Index.vue | 57 +-- frontend/src/pages/rule-groups/Create.vue | 22 +- frontend/src/pages/rule-groups/Edit.vue | 18 +- frontend/src/pages/rules/Create.vue | 108 ++--- frontend/src/pages/rules/Edit.vue | 18 +- frontend/src/pages/rules/Index.vue | 112 ++--- frontend/src/pages/subscriptions/Create.vue | 50 ++- frontend/src/pages/subscriptions/Edit.vue | 59 +-- frontend/src/pages/subscriptions/Index.vue | 47 +- frontend/src/pages/subscriptions/Show.vue | 8 +- frontend/src/pages/tags/Index.vue | 14 +- frontend/src/pages/tags/Show.vue | 8 +- frontend/src/pages/transactions/Create.vue | 59 +-- frontend/src/pages/transactions/Edit.vue | 67 +-- frontend/src/pages/transactions/Index.vue | 31 +- frontend/src/pages/transactions/Show.vue | 10 +- frontend/src/pages/webhooks/Create.vue | 70 +-- frontend/src/pages/webhooks/Edit.vue | 64 +-- frontend/src/pages/webhooks/Index.vue | 28 +- frontend/src/pages/webhooks/Show.vue | 4 +- frontend/src/router/index.js | 6 +- frontend/src/shims-vue.d.ts | 2 +- frontend/src/store/fireflyiii/actions.js | 2 - frontend/src/store/fireflyiii/getters.js | 2 + frontend/src/store/index.js | 4 +- frontend/src/store/module-example/actions.ts | 8 +- frontend/src/store/module-example/getters.ts | 8 +- frontend/src/store/module-example/index.ts | 6 +- .../src/store/module-example/mutations.ts | 6 +- frontend/src/store/module-example/state.ts | 2 +- frontend/src/stores/index.js | 4 +- frontend/src/stores/teststore.js | 6 +- routes/api.php | 40 +- routes/breadcrumbs.php | 1 - routes/web.php | 18 +- .../Autocomplete/AccountControllerTest.php | 2 +- .../Models/Account/StoreControllerTest.php | 40 +- .../Models/Account/UpdateControllerTest.php | 49 ++- .../Models/Attachment/StoreControllerTest.php | 11 +- .../Attachment/UpdateControllerTest.php | 14 +- .../AvailableBudget/StoreControllerTest.php | 15 +- .../AvailableBudget/UpdateControllerTest.php | 22 +- tests/Api/Models/Bill/StoreControllerTest.php | 40 +- .../Api/Models/Bill/UpdateControllerTest.php | 40 +- .../Api/Models/Budget/StoreControllerTest.php | 18 +- .../Models/Budget/UpdateControllerTest.php | 25 +- .../BudgetLimit/StoreControllerTest.php | 22 +- .../BudgetLimit/UpdateControllerTest.php | 21 +- .../Models/Category/StoreControllerTest.php | 10 +- .../Models/Category/UpdateControllerTest.php | 11 +- .../ObjectGroup/UpdateControllerTest.php | 11 +- .../Models/PiggyBank/StoreControllerTest.php | 26 +- .../Models/PiggyBank/UpdateControllerTest.php | 30 +- .../Models/Recurrence/StoreControllerTest.php | 29 +- .../Recurrence/UpdateControllerTest.php | 37 +- tests/Api/Models/Rule/StoreControllerTest.php | 22 +- .../Api/Models/Rule/UpdateControllerTest.php | 36 +- .../Models/RuleGroup/StoreControllerTest.php | 15 +- .../Models/RuleGroup/UpdateControllerTest.php | 14 +- tests/Api/Models/Tag/StoreControllerTest.php | 15 +- tests/Api/Models/Tag/UpdateControllerTest.php | 14 +- .../Transaction/StoreControllerTest.php | 18 +- .../Transaction/UpdateControllerTest.php | 26 +- .../StoreControllerTest.php | 15 +- .../UpdateControllerTest.php | 18 +- .../TransactionLink/StoreControllerTest.php | 11 +- .../TransactionLink/UpdateControllerTest.php | 17 +- .../StoreControllerTest.php | 9 +- .../UpdateControllerTest.php | 13 +- tests/Api/Webhook/StoreControllerTest.php | 10 +- tests/Api/Webhook/UpdateControllerTest.php | 18 +- tests/Objects/Field.php | 4 +- tests/Objects/FieldSet.php | 2 +- tests/Objects/TestConfiguration.php | 4 +- tests/TestCase.php | 4 +- tests/Traits/CollectsValues.php | 1 + tests/Traits/TestHelpers.php | 3 +- 240 files changed, 8059 insertions(+), 7895 deletions(-) diff --git a/bootstrap/app.php b/bootstrap/app.php index 0fd478deb3..6f71022e3b 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -21,7 +21,6 @@ declare(strict_types=1); -use Illuminate\Contracts\View\Factory as ViewFactory; /* |-------------------------------------------------------------------------- | Create The Application @@ -37,8 +36,8 @@ bcscale(24); if (!function_exists('envNonEmpty')) { /** - * @param string $key - * @param null $default + * @param string $key + * @param null $default * * @return mixed|null */ @@ -55,8 +54,8 @@ if (!function_exists('envNonEmpty')) { if (!function_exists('str_is_equal')) { /** - * @param string $left - * @param string $right + * @param string $left + * @param string $right * * @return bool */ @@ -67,7 +66,7 @@ if (!function_exists('str_is_equal')) { } $app = new Illuminate\Foundation\Application( - realpath(__DIR__ . '/../') + realpath(__DIR__.'/../') ); /* diff --git a/config/auth.php b/config/auth.php index 92fad546f9..c645307e39 100644 --- a/config/auth.php +++ b/config/auth.php @@ -21,7 +21,7 @@ declare(strict_types=1); -if ('ldap' === strtolower((string) env('AUTHENTICATION_GUARD'))) { +if ('ldap' === strtolower((string)env('AUTHENTICATION_GUARD'))) { die('LDAP is no longer supported by Firefly III v5.7+. Sorry about that. You will have to switch to "remote_user_guard", and use tools like Authelia or Keycloak to use LDAP together with Firefly III.'); } diff --git a/config/cache.php b/config/cache.php index 69ed690ca4..d28d9d6882 100644 --- a/config/cache.php +++ b/config/cache.php @@ -83,7 +83,7 @@ return [ 'servers' => [ [ 'host' => env('MEMCACHED_HOST', '127.0.0.1'), - 'port' => (int) env('MEMCACHED_PORT', 11211), + 'port' => (int)env('MEMCACHED_PORT', 11211), 'weight' => 100, ], ], diff --git a/config/database.php b/config/database.php index da13fb0564..0ea963ea83 100644 --- a/config/database.php +++ b/config/database.php @@ -142,7 +142,7 @@ return [ 'client' => env('REDIS_CLIENT', 'predis'), 'options' => [ 'cluster' => env('REDIS_CLUSTER', 'predis'), - 'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_database_'), + 'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'), ], 'default' => [ 'scheme' => envNonEmpty('REDIS_SCHEME', 'tcp'), diff --git a/config/filesystems.php b/config/filesystems.php index 8deff7ba8f..1af22469ae 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -88,7 +88,7 @@ return [ 'public' => [ 'driver' => 'local', 'root' => storage_path('app/public'), - 'url' => env('APP_URL') . '/storage', + 'url' => env('APP_URL').'/storage', 'visibility' => 'public', ], diff --git a/config/firefly.php b/config/firefly.php index da277143da..5ea6f8bd44 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -87,7 +87,6 @@ use FireflyIII\TransactionRules\Actions\SetSourceAccount; use FireflyIII\TransactionRules\Actions\UpdatePiggybank; use FireflyIII\User; - /* * DO NOT EDIT THIS FILE. IT IS AUTO GENERATED. * diff --git a/config/ide-helper.php b/config/ide-helper.php index 95598ccdcf..f39619f398 100644 --- a/config/ide-helper.php +++ b/config/ide-helper.php @@ -86,7 +86,7 @@ return [ 'include_helpers' => false, 'helper_files' => [ - base_path() . '/vendor/laravel/framework/src/Illuminate/Support/helpers.php', + base_path().'/vendor/laravel/framework/src/Illuminate/Support/helpers.php', ], /* diff --git a/config/logging.php b/config/logging.php index 228f6c1de1..ada1fbc874 100644 --- a/config/logging.php +++ b/config/logging.php @@ -93,7 +93,7 @@ return [ // daily, used in stack 'stack' by default: 'daily' => [ 'driver' => 'daily', - 'path' => storage_path('logs/ff3-' . PHP_SAPI . '.log'), + 'path' => storage_path('logs/ff3-'.PHP_SAPI.'.log'), 'level' => envNonEmpty('APP_LOG_LEVEL', 'info'), 'days' => 7, ], diff --git a/config/mail.php b/config/mail.php index f1de983819..37861ebd56 100644 --- a/config/mail.php +++ b/config/mail.php @@ -37,14 +37,14 @@ return [ 'mailers' => [ 'smtp' => [ - 'transport' => 'smtp', - 'host' => env('MAIL_HOST', 'smtp.mailtrap.io'), - 'port' => (int) env('MAIL_PORT', 2525), - 'encryption' => env('MAIL_ENCRYPTION', 'tls'), - 'username' => env('MAIL_USERNAME'), - 'password' => env('MAIL_PASSWORD'), - 'timeout' => null, - 'verify_peer' => null !== env('MAIL_ENCRYPTION') + 'transport' => 'smtp', + 'host' => env('MAIL_HOST', 'smtp.mailtrap.io'), + 'port' => (int)env('MAIL_PORT', 2525), + 'encryption' => env('MAIL_ENCRYPTION', 'tls'), + 'username' => env('MAIL_USERNAME'), + 'password' => env('MAIL_PASSWORD'), + 'timeout' => null, + 'verify_peer' => null !== env('MAIL_ENCRYPTION'), ], 'ses' => [ diff --git a/config/passport.php b/config/passport.php index f025442040..55e2030517 100644 --- a/config/passport.php +++ b/config/passport.php @@ -1,4 +1,5 @@ ['is_safe' => ['input', 'select', 'checkbox', 'model', 'open', 'radio', 'textarea', 'file']], 'ExpandedForm' => [ 'is_safe' => [ - 'date', 'text', 'select', 'balance', 'optionsList', 'checkbox', 'amount', 'tags', 'integer', 'textarea', 'location', 'file', 'staticText', - 'password', 'nonSelectableAmount', 'number', 'amountNoCurrency', 'percentage', 'objectGroup', + 'date', + 'text', + 'select', + 'balance', + 'optionsList', + 'checkbox', + 'amount', + 'tags', + 'integer', + 'textarea', + 'location', + 'file', + 'staticText', + 'password', + 'nonSelectableAmount', + 'number', + 'amountNoCurrency', + 'percentage', + 'objectGroup', ], ], 'AccountForm' => [ 'is_safe' => [ - 'activeWithdrawalDestinations', 'activeDepositDestinations', 'assetAccountCheckList', 'assetAccountList', 'longAccountList', + 'activeWithdrawalDestinations', + 'activeDepositDestinations', + 'assetAccountCheckList', + 'assetAccountList', + 'longAccountList', ], ], 'CurrencyForm' => [ 'is_safe' => [ - 'currencyList', 'currencyListEmpty', 'balanceAll', + 'currencyList', + 'currencyListEmpty', + 'balanceAll', ], ], 'PiggyBankForm' => [ @@ -196,7 +219,8 @@ return [ ], 'RuleForm' => [ 'is_safe' => [ - 'ruleGroupList', 'ruleGroupListWithEmpty', + 'ruleGroupList', + 'ruleGroupListWithEmpty', ], ], ], diff --git a/database/migrations/2016_06_16_000000_create_support_tables.php b/database/migrations/2016_06_16_000000_create_support_tables.php index fc2c2e8779..65925899dc 100644 --- a/database/migrations/2016_06_16_000000_create_support_tables.php +++ b/database/migrations/2016_06_16_000000_create_support_tables.php @@ -1,4 +1,5 @@ string('id', 100)->primary(); - $table->integer('user_id'); - $table->integer('client_id'); - $table->text('scopes')->nullable(); - $table->boolean('revoked'); - $table->dateTime('expires_at')->nullable(); - } + 'oauth_auth_codes', + static function (Blueprint $table) { + $table->string('id', 100)->primary(); + $table->integer('user_id'); + $table->integer('client_id'); + $table->text('scopes')->nullable(); + $table->boolean('revoked'); + $table->dateTime('expires_at')->nullable(); + } ); } } diff --git a/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php b/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php index e8e95975f2..883955a3e7 100644 --- a/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php +++ b/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php @@ -48,16 +48,17 @@ class CreateOauthAccessTokensTable extends Migration public function up(): void { Schema::create( - 'oauth_access_tokens', static function (Blueprint $table) { - $table->string('id', 100)->primary(); - $table->integer('user_id')->index()->nullable(); - $table->integer('client_id'); - $table->string('name')->nullable(); - $table->text('scopes')->nullable(); - $table->boolean('revoked'); - $table->timestamps(); - $table->dateTime('expires_at')->nullable(); - } + 'oauth_access_tokens', + static function (Blueprint $table) { + $table->string('id', 100)->primary(); + $table->integer('user_id')->index()->nullable(); + $table->integer('client_id'); + $table->string('name')->nullable(); + $table->text('scopes')->nullable(); + $table->boolean('revoked'); + $table->timestamps(); + $table->dateTime('expires_at')->nullable(); + } ); } } diff --git a/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php b/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php index 513e34b852..44a7aecdcb 100644 --- a/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php +++ b/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php @@ -48,12 +48,13 @@ class CreateOauthRefreshTokensTable extends Migration public function up(): void { Schema::create( - 'oauth_refresh_tokens', static function (Blueprint $table) { - $table->string('id', 100)->primary(); - $table->string('access_token_id', 100)->index(); - $table->boolean('revoked'); - $table->dateTime('expires_at')->nullable(); - } + 'oauth_refresh_tokens', + static function (Blueprint $table) { + $table->string('id', 100)->primary(); + $table->string('access_token_id', 100)->index(); + $table->boolean('revoked'); + $table->dateTime('expires_at')->nullable(); + } ); } } diff --git a/database/migrations/2018_01_01_000004_create_oauth_clients_table.php b/database/migrations/2018_01_01_000004_create_oauth_clients_table.php index c06869e26d..2fc046a840 100644 --- a/database/migrations/2018_01_01_000004_create_oauth_clients_table.php +++ b/database/migrations/2018_01_01_000004_create_oauth_clients_table.php @@ -48,17 +48,18 @@ class CreateOauthClientsTable extends Migration public function up(): void { Schema::create( - 'oauth_clients', static function (Blueprint $table) { - $table->increments('id'); - $table->integer('user_id')->index()->nullable(); - $table->string('name'); - $table->string('secret', 100); - $table->text('redirect'); - $table->boolean('personal_access_client'); - $table->boolean('password_client'); - $table->boolean('revoked'); - $table->timestamps(); - } + 'oauth_clients', + static function (Blueprint $table) { + $table->increments('id'); + $table->integer('user_id')->index()->nullable(); + $table->string('name'); + $table->string('secret', 100); + $table->text('redirect'); + $table->boolean('personal_access_client'); + $table->boolean('password_client'); + $table->boolean('revoked'); + $table->timestamps(); + } ); } } diff --git a/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php b/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php index 228fcf05fd..35236cff40 100644 --- a/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php +++ b/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php @@ -48,11 +48,12 @@ class CreateOauthPersonalAccessClientsTable extends Migration public function up(): void { Schema::create( - 'oauth_personal_access_clients', static function (Blueprint $table) { - $table->increments('id'); - $table->integer('client_id')->index(); - $table->timestamps(); - } + 'oauth_personal_access_clients', + static function (Blueprint $table) { + $table->increments('id'); + $table->integer('client_id')->index(); + $table->timestamps(); + } ); } } diff --git a/database/migrations/2018_04_07_210913_changes_for_v473.php b/database/migrations/2018_04_07_210913_changes_for_v473.php index d659877176..33e93911f8 100644 --- a/database/migrations/2018_04_07_210913_changes_for_v473.php +++ b/database/migrations/2018_04_07_210913_changes_for_v473.php @@ -43,7 +43,6 @@ class ChangesForV473 extends Migration Schema::table( 'bills', static function (Blueprint $table) { - // cannot drop foreign keys in SQLite: if ('sqlite' !== config('database.default')) { $table->dropForeign('bills_transaction_currency_id_foreign'); diff --git a/database/migrations/2018_04_29_174524_changes_for_v474.php b/database/migrations/2018_04_29_174524_changes_for_v474.php index b1e9088b78..132b86dc47 100644 --- a/database/migrations/2018_04_29_174524_changes_for_v474.php +++ b/database/migrations/2018_04_29_174524_changes_for_v474.php @@ -44,7 +44,6 @@ class ChangesForV474 extends Migration Schema::table( 'import_jobs', static function (Blueprint $table) { - // cannot drop foreign keys in SQLite: if ('sqlite' !== config('database.default')) { $table->dropForeign('import_jobs_tag_id_foreign'); diff --git a/database/migrations/2018_06_08_200526_changes_for_v475.php b/database/migrations/2018_06_08_200526_changes_for_v475.php index bab7ef6846..6e7053056e 100644 --- a/database/migrations/2018_06_08_200526_changes_for_v475.php +++ b/database/migrations/2018_06_08_200526_changes_for_v475.php @@ -56,93 +56,98 @@ class ChangesForV475 extends Migration public function up(): void { Schema::create( - 'recurrences', static function (Blueprint $table) { - $table->increments('id'); - $table->timestamps(); - $table->softDeletes(); - $table->integer('user_id', false, true); - $table->integer('transaction_type_id', false, true); + 'recurrences', + static function (Blueprint $table) { + $table->increments('id'); + $table->timestamps(); + $table->softDeletes(); + $table->integer('user_id', false, true); + $table->integer('transaction_type_id', false, true); - $table->string('title', 1024); - $table->text('description'); + $table->string('title', 1024); + $table->text('description'); - $table->date('first_date'); - $table->date('repeat_until')->nullable(); - $table->date('latest_date')->nullable(); - $table->smallInteger('repetitions', false, true); + $table->date('first_date'); + $table->date('repeat_until')->nullable(); + $table->date('latest_date')->nullable(); + $table->smallInteger('repetitions', false, true); - $table->boolean('apply_rules')->default(true); - $table->boolean('active')->default(true); + $table->boolean('apply_rules')->default(true); + $table->boolean('active')->default(true); - $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); - $table->foreign('transaction_type_id')->references('id')->on('transaction_types')->onDelete('cascade'); - } + $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); + $table->foreign('transaction_type_id')->references('id')->on('transaction_types')->onDelete('cascade'); + } ); Schema::create( - 'recurrences_transactions', static function (Blueprint $table) { - $table->increments('id'); - $table->timestamps(); - $table->softDeletes(); - $table->integer('recurrence_id', false, true); - $table->integer('transaction_currency_id', false, true); - $table->integer('foreign_currency_id', false, true)->nullable(); - $table->integer('source_id', false, true); - $table->integer('destination_id', false, true); + 'recurrences_transactions', + static function (Blueprint $table) { + $table->increments('id'); + $table->timestamps(); + $table->softDeletes(); + $table->integer('recurrence_id', false, true); + $table->integer('transaction_currency_id', false, true); + $table->integer('foreign_currency_id', false, true)->nullable(); + $table->integer('source_id', false, true); + $table->integer('destination_id', false, true); - $table->decimal('amount', 36, 24); - $table->decimal('foreign_amount', 36, 24)->nullable(); - $table->string('description', 1024); + $table->decimal('amount', 36, 24); + $table->decimal('foreign_amount', 36, 24)->nullable(); + $table->string('description', 1024); - $table->foreign('recurrence_id')->references('id')->on('recurrences')->onDelete('cascade'); - $table->foreign('transaction_currency_id')->references('id')->on('transaction_currencies')->onDelete('cascade'); - $table->foreign('foreign_currency_id')->references('id')->on('transaction_currencies')->onDelete('set null'); - $table->foreign('source_id')->references('id')->on('accounts')->onDelete('cascade'); - $table->foreign('destination_id')->references('id')->on('accounts')->onDelete('cascade'); - } + $table->foreign('recurrence_id')->references('id')->on('recurrences')->onDelete('cascade'); + $table->foreign('transaction_currency_id')->references('id')->on('transaction_currencies')->onDelete('cascade'); + $table->foreign('foreign_currency_id')->references('id')->on('transaction_currencies')->onDelete('set null'); + $table->foreign('source_id')->references('id')->on('accounts')->onDelete('cascade'); + $table->foreign('destination_id')->references('id')->on('accounts')->onDelete('cascade'); + } ); Schema::create( - 'recurrences_repetitions', static function (Blueprint $table) { - $table->increments('id'); - $table->timestamps(); - $table->softDeletes(); - $table->integer('recurrence_id', false, true); - $table->string('repetition_type', 50); - $table->string('repetition_moment', 50); - $table->smallInteger('repetition_skip', false, true); - $table->smallInteger('weekend', false, true); + 'recurrences_repetitions', + static function (Blueprint $table) { + $table->increments('id'); + $table->timestamps(); + $table->softDeletes(); + $table->integer('recurrence_id', false, true); + $table->string('repetition_type', 50); + $table->string('repetition_moment', 50); + $table->smallInteger('repetition_skip', false, true); + $table->smallInteger('weekend', false, true); - $table->foreign('recurrence_id')->references('id')->on('recurrences')->onDelete('cascade'); - } + $table->foreign('recurrence_id')->references('id')->on('recurrences')->onDelete('cascade'); + } ); Schema::create( - 'recurrences_meta', static function (Blueprint $table) { - $table->increments('id'); - $table->timestamps(); - $table->softDeletes(); - $table->integer('recurrence_id', false, true); + 'recurrences_meta', + static function (Blueprint $table) { + $table->increments('id'); + $table->timestamps(); + $table->softDeletes(); + $table->integer('recurrence_id', false, true); - $table->string('name', 50); - $table->text('value'); + $table->string('name', 50); + $table->text('value'); - $table->foreign('recurrence_id')->references('id')->on('recurrences')->onDelete('cascade'); - } + $table->foreign('recurrence_id')->references('id')->on('recurrences')->onDelete('cascade'); + } ); Schema::create( - 'rt_meta', static function (Blueprint $table) { - $table->increments('id'); - $table->timestamps(); - $table->softDeletes(); - $table->integer('rt_id', false, true); + 'rt_meta', + static function (Blueprint $table) { + $table->increments('id'); + $table->timestamps(); + $table->softDeletes(); + $table->integer('rt_id', false, true); - $table->string('name', 50); - $table->text('value'); + $table->string('name', 50); + $table->text('value'); - $table->foreign('rt_id')->references('id')->on('recurrences_transactions')->onDelete('cascade'); - } + $table->foreign('rt_id')->references('id')->on('recurrences_transactions')->onDelete('cascade'); + } ); } } diff --git a/database/migrations/2018_09_05_195147_changes_for_v477.php b/database/migrations/2018_09_05_195147_changes_for_v477.php index d9f9678942..3db1986b8f 100644 --- a/database/migrations/2018_09_05_195147_changes_for_v477.php +++ b/database/migrations/2018_09_05_195147_changes_for_v477.php @@ -40,15 +40,15 @@ class ChangesForV477 extends Migration public function down(): void { Schema::table( - 'budget_limits', static function (Blueprint $table) { + 'budget_limits', + static function (Blueprint $table) { + // cannot drop foreign keys in SQLite: + if ('sqlite' !== config('database.default')) { + $table->dropForeign('budget_limits_transaction_currency_id_foreign'); + } - // cannot drop foreign keys in SQLite: - if ('sqlite' !== config('database.default')) { - $table->dropForeign('budget_limits_transaction_currency_id_foreign'); + $table->dropColumn(['transaction_currency_id']); } - - $table->dropColumn(['transaction_currency_id']); - } ); } diff --git a/database/migrations/2018_11_06_172532_changes_for_v479.php b/database/migrations/2018_11_06_172532_changes_for_v479.php index 3001eea2d3..9cc0093cbf 100644 --- a/database/migrations/2018_11_06_172532_changes_for_v479.php +++ b/database/migrations/2018_11_06_172532_changes_for_v479.php @@ -40,9 +40,10 @@ class ChangesForV479 extends Migration public function down() { Schema::table( - 'transaction_currencies', static function (Blueprint $table) { - $table->dropColumn(['enabled']); - } + 'transaction_currencies', + static function (Blueprint $table) { + $table->dropColumn(['enabled']); + } ); } diff --git a/database/migrations/2019_01_28_193833_changes_for_v4710.php b/database/migrations/2019_01_28_193833_changes_for_v4710.php index dfda36398d..0e07b4286f 100644 --- a/database/migrations/2019_01_28_193833_changes_for_v4710.php +++ b/database/migrations/2019_01_28_193833_changes_for_v4710.php @@ -54,15 +54,16 @@ class ChangesForV4710 extends Migration { if (!Schema::hasTable('transaction_groups')) { Schema::create( - 'transaction_groups', static function (Blueprint $table) { - $table->increments('id'); - $table->timestamps(); - $table->softDeletes(); - $table->integer('user_id', false, true); - $table->string('title', 1024)->nullable(); + 'transaction_groups', + static function (Blueprint $table) { + $table->increments('id'); + $table->timestamps(); + $table->softDeletes(); + $table->integer('user_id', false, true); + $table->string('title', 1024)->nullable(); - $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); - } + $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); + } ); } diff --git a/database/migrations/2019_02_05_055516_changes_for_v4711.php b/database/migrations/2019_02_05_055516_changes_for_v4711.php index 1829ede413..430f23f0e9 100644 --- a/database/migrations/2019_02_05_055516_changes_for_v4711.php +++ b/database/migrations/2019_02_05_055516_changes_for_v4711.php @@ -60,15 +60,17 @@ class ChangesForV4711 extends Migration * nice. */ Schema::table( - 'transaction_journals', static function (Blueprint $table) { - $table->dateTime('date')->change(); - } + 'transaction_journals', + static function (Blueprint $table) { + $table->dateTime('date')->change(); + } ); Schema::table( - 'preferences', static function (Blueprint $table) { - $table->text('data')->nullable()->change(); - } + 'preferences', + static function (Blueprint $table) { + $table->text('data')->nullable()->change(); + } ); } } diff --git a/database/migrations/2019_02_11_170529_changes_for_v4712.php b/database/migrations/2019_02_11_170529_changes_for_v4712.php index 8d235a6b4e..09c3bb4910 100644 --- a/database/migrations/2019_02_11_170529_changes_for_v4712.php +++ b/database/migrations/2019_02_11_170529_changes_for_v4712.php @@ -59,9 +59,10 @@ class ChangesForV4712 extends Migration * nice. */ Schema::table( - 'transaction_journals', static function (Blueprint $table) { - $table->dateTime('date')->change(); - } + 'transaction_journals', + static function (Blueprint $table) { + $table->dateTime('date')->change(); + } ); } } diff --git a/database/migrations/2019_03_11_223700_fix_ldap_configuration.php b/database/migrations/2019_03_11_223700_fix_ldap_configuration.php index 9f16faaa27..bbf7a89207 100644 --- a/database/migrations/2019_03_11_223700_fix_ldap_configuration.php +++ b/database/migrations/2019_03_11_223700_fix_ldap_configuration.php @@ -40,9 +40,10 @@ class FixLdapConfiguration extends Migration public function down(): void { Schema::table( - 'users', static function (Blueprint $table) { - $table->dropColumn(['objectguid']); - } + 'users', + static function (Blueprint $table) { + $table->dropColumn(['objectguid']); + } ); } @@ -59,9 +60,10 @@ class FixLdapConfiguration extends Migration * now. To support this, we add the column. */ Schema::table( - 'users', static function (Blueprint $table) { - $table->uuid('objectguid')->nullable()->after('id'); - } + 'users', + static function (Blueprint $table) { + $table->uuid('objectguid')->nullable()->after('id'); + } ); } } diff --git a/database/migrations/2019_03_22_183214_changes_for_v480.php b/database/migrations/2019_03_22_183214_changes_for_v480.php index d68a2fbffe..825cfbecb6 100644 --- a/database/migrations/2019_03_22_183214_changes_for_v480.php +++ b/database/migrations/2019_03_22_183214_changes_for_v480.php @@ -50,15 +50,17 @@ class ChangesForV480 extends Migration } ); Schema::table( - 'rule_groups', static function (Blueprint $table) { - $table->dropColumn('stop_processing'); - } + 'rule_groups', + static function (Blueprint $table) { + $table->dropColumn('stop_processing'); + } ); Schema::table( - 'users', static function (Blueprint $table) { - $table->dropColumn('mfa_secret'); - } + 'users', + static function (Blueprint $table) { + $table->dropColumn('mfa_secret'); + } ); } @@ -84,14 +86,16 @@ class ChangesForV480 extends Migration } ); Schema::table( - 'rule_groups', static function (Blueprint $table) { - $table->boolean('stop_processing')->default(false); - } + 'rule_groups', + static function (Blueprint $table) { + $table->boolean('stop_processing')->default(false); + } ); Schema::table( - 'users', static function (Blueprint $table) { - $table->string('mfa_secret', 50)->nullable(); - } + 'users', + static function (Blueprint $table) { + $table->string('mfa_secret', 50)->nullable(); + } ); } } diff --git a/database/migrations/2019_12_28_191351_make_locations_table.php b/database/migrations/2019_12_28_191351_make_locations_table.php index b2435c8430..65c6dc91b0 100644 --- a/database/migrations/2019_12_28_191351_make_locations_table.php +++ b/database/migrations/2019_12_28_191351_make_locations_table.php @@ -51,18 +51,19 @@ class MakeLocationsTable extends Migration public function up() { Schema::create( - 'locations', static function (Blueprint $table) { - $table->bigIncrements('id'); - $table->timestamps(); - $table->softDeletes(); + 'locations', + static function (Blueprint $table) { + $table->bigIncrements('id'); + $table->timestamps(); + $table->softDeletes(); - $table->integer('locatable_id', false, true); - $table->string('locatable_type', 255); + $table->integer('locatable_id', false, true); + $table->string('locatable_type', 255); - $table->decimal('latitude', 36, 24)->nullable(); - $table->decimal('longitude', 36, 24)->nullable(); - $table->smallInteger('zoom_level', false, true)->nullable(); - } + $table->decimal('latitude', 36, 24)->nullable(); + $table->decimal('longitude', 36, 24)->nullable(); + $table->smallInteger('zoom_level', false, true)->nullable(); + } ); } } diff --git a/database/migrations/2020_06_07_063612_changes_for_v530.php b/database/migrations/2020_06_07_063612_changes_for_v530.php index 6f5eb8204a..0441731aa6 100644 --- a/database/migrations/2020_06_07_063612_changes_for_v530.php +++ b/database/migrations/2020_06_07_063612_changes_for_v530.php @@ -52,24 +52,26 @@ class ChangesForV530 extends Migration { if (!Schema::hasTable('object_groups')) { Schema::create( - 'object_groups', static function (Blueprint $table) { - $table->increments('id'); - $table->integer('user_id', false, true); - $table->timestamps(); - $table->softDeletes(); - $table->string('title', 255); - $table->mediumInteger('order', false, true)->default(0); - $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); - } + 'object_groups', + static function (Blueprint $table) { + $table->increments('id'); + $table->integer('user_id', false, true); + $table->timestamps(); + $table->softDeletes(); + $table->string('title', 255); + $table->mediumInteger('order', false, true)->default(0); + $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); + } ); } if (!Schema::hasTable('object_groupables')) { Schema::create( - 'object_groupables', static function (Blueprint $table) { - $table->integer('object_group_id'); - $table->integer('object_groupable_id', false, true); - $table->string('object_groupable_type', 255); - } + 'object_groupables', + static function (Blueprint $table) { + $table->integer('object_group_id'); + $table->integer('object_groupable_id', false, true); + $table->string('object_groupable_type', 255); + } ); } } diff --git a/database/migrations/2020_06_30_202620_changes_for_v530a.php b/database/migrations/2020_06_30_202620_changes_for_v530a.php index b5412de5d4..b54a7144cc 100644 --- a/database/migrations/2020_06_30_202620_changes_for_v530a.php +++ b/database/migrations/2020_06_30_202620_changes_for_v530a.php @@ -41,9 +41,10 @@ class ChangesForV530a extends Migration public function down(): void { Schema::table( - 'bills', static function (Blueprint $table) { - $table->dropColumn('order'); - } + 'bills', + static function (Blueprint $table) { + $table->dropColumn('order'); + } ); } @@ -55,9 +56,10 @@ class ChangesForV530a extends Migration public function up(): void { Schema::table( - 'bills', static function (Blueprint $table) { - $table->integer('order', false, true)->default(0); - } + 'bills', + static function (Blueprint $table) { + $table->integer('order', false, true)->default(0); + } ); } } diff --git a/database/migrations/2020_07_24_162820_changes_for_v540.php b/database/migrations/2020_07_24_162820_changes_for_v540.php index 3e1f951768..38401fba0a 100644 --- a/database/migrations/2020_07_24_162820_changes_for_v540.php +++ b/database/migrations/2020_07_24_162820_changes_for_v540.php @@ -41,22 +41,25 @@ class ChangesForV540 extends Migration public function down(): void { Schema::table( - 'oauth_clients', static function (Blueprint $table) { - $table->dropColumn('provider'); - } + 'oauth_clients', + static function (Blueprint $table) { + $table->dropColumn('provider'); + } ); Schema::table( - 'accounts', static function (Blueprint $table) { - $table->dropColumn('order'); - } + 'accounts', + static function (Blueprint $table) { + $table->dropColumn('order'); + } ); Schema::table( - 'bills', static function (Blueprint $table) { - $table->dropColumn('end_date'); - $table->dropColumn('extension_date'); - } + 'bills', + static function (Blueprint $table) { + $table->dropColumn('end_date'); + $table->dropColumn('extension_date'); + } ); } @@ -68,26 +71,30 @@ class ChangesForV540 extends Migration public function up(): void { Schema::table( - 'accounts', static function (Blueprint $table) { - $table->integer('order', false, true)->default(0); - } + 'accounts', + static function (Blueprint $table) { + $table->integer('order', false, true)->default(0); + } ); Schema::table( - 'oauth_clients', static function (Blueprint $table) { - $table->string('provider')->nullable(); - } + 'oauth_clients', + static function (Blueprint $table) { + $table->string('provider')->nullable(); + } ); Schema::table( - 'bills', static function (Blueprint $table) { - $table->date('end_date')->nullable()->after('date'); - $table->date('extension_date')->nullable()->after('end_date'); - } + 'bills', + static function (Blueprint $table) { + $table->date('end_date')->nullable()->after('date'); + $table->date('extension_date')->nullable()->after('end_date'); + } ); // make column nullable: Schema::table( - 'oauth_clients', function (Blueprint $table) { - $table->string('secret', 100)->nullable()->change(); - } + 'oauth_clients', + function (Blueprint $table) { + $table->string('secret', 100)->nullable()->change(); + } ); } } diff --git a/database/migrations/2020_11_12_070604_changes_for_v550.php b/database/migrations/2020_11_12_070604_changes_for_v550.php index 9cec0a1dcf..9c73f036a5 100644 --- a/database/migrations/2020_11_12_070604_changes_for_v550.php +++ b/database/migrations/2020_11_12_070604_changes_for_v550.php @@ -58,10 +58,11 @@ class ChangesForV550 extends Migration // expand budget / transaction journal table. Schema::table( - 'budget_transaction_journal', function (Blueprint $table) { - $table->dropForeign('budget_id_foreign'); - $table->dropColumn('budget_limit_id'); - } + 'budget_transaction_journal', + function (Blueprint $table) { + $table->dropForeign('budget_id_foreign'); + $table->dropColumn('budget_limit_id'); + } ); // drop failed jobs table. @@ -91,40 +92,43 @@ class ChangesForV550 extends Migration Schema::dropIfExists('jobs'); // this is the NEW table Schema::create( - 'jobs', function (Blueprint $table) { - $table->bigIncrements('id'); - $table->string('queue')->index(); - $table->longText('payload'); - $table->unsignedTinyInteger('attempts'); - $table->unsignedInteger('reserved_at')->nullable(); - $table->unsignedInteger('available_at'); - $table->unsignedInteger('created_at'); - } + 'jobs', + function (Blueprint $table) { + $table->bigIncrements('id'); + $table->string('queue')->index(); + $table->longText('payload'); + $table->unsignedTinyInteger('attempts'); + $table->unsignedInteger('reserved_at')->nullable(); + $table->unsignedInteger('available_at'); + $table->unsignedInteger('created_at'); + } ); // drop failed jobs table. Schema::dropIfExists('failed_jobs'); // create new failed_jobs table. Schema::create( - 'failed_jobs', function (Blueprint $table) { - $table->bigIncrements('id'); - $table->string('uuid')->unique(); - $table->text('connection'); - $table->text('queue'); - $table->longText('payload'); - $table->longText('exception'); - $table->timestamp('failed_at')->useCurrent(); - } + 'failed_jobs', + function (Blueprint $table) { + $table->bigIncrements('id'); + $table->string('uuid')->unique(); + $table->text('connection'); + $table->text('queue'); + $table->longText('payload'); + $table->longText('exception'); + $table->timestamp('failed_at')->useCurrent(); + } ); // update budget / transaction journal table. Schema::table( - 'budget_transaction_journal', function (Blueprint $table) { - if (!Schema::hasColumn('budget_transaction_journal', 'budget_limit_id')) { - $table->integer('budget_limit_id', false, true)->nullable()->default(null)->after('budget_id'); - $table->foreign('budget_limit_id', 'budget_id_foreign')->references('id')->on('budget_limits')->onDelete('set null'); + 'budget_transaction_journal', + function (Blueprint $table) { + if (!Schema::hasColumn('budget_transaction_journal', 'budget_limit_id')) { + $table->integer('budget_limit_id', false, true)->nullable()->default(null)->after('budget_id'); + $table->foreign('budget_limit_id', 'budget_id_foreign')->references('id')->on('budget_limits')->onDelete('set null'); + } } - } ); // append budget limits table. diff --git a/database/migrations/2021_03_12_061213_changes_for_v550b2.php b/database/migrations/2021_03_12_061213_changes_for_v550b2.php index a894a00324..4b3a97a1b2 100644 --- a/database/migrations/2021_03_12_061213_changes_for_v550b2.php +++ b/database/migrations/2021_03_12_061213_changes_for_v550b2.php @@ -39,14 +39,13 @@ class ChangesForV550b2 extends Migration public function down(): void { Schema::table( - 'recurrences_transactions', function (Blueprint $table) { - - $table->dropForeign('type_foreign'); - if (Schema::hasColumn('recurrences_transactions', 'transaction_type_id')) { - $table->dropColumn('transaction_type_id'); + 'recurrences_transactions', + function (Blueprint $table) { + $table->dropForeign('type_foreign'); + if (Schema::hasColumn('recurrences_transactions', 'transaction_type_id')) { + $table->dropColumn('transaction_type_id'); + } } - - } ); } @@ -59,12 +58,13 @@ class ChangesForV550b2 extends Migration { // expand recurrence transaction table Schema::table( - 'recurrences_transactions', function (Blueprint $table) { - if (!Schema::hasColumn('recurrences_transactions', 'transaction_type_id')) { - $table->integer('transaction_type_id', false, true)->nullable()->after('transaction_currency_id'); - $table->foreign('transaction_type_id', 'type_foreign')->references('id')->on('transaction_types')->onDelete('set null'); + 'recurrences_transactions', + function (Blueprint $table) { + if (!Schema::hasColumn('recurrences_transactions', 'transaction_type_id')) { + $table->integer('transaction_type_id', false, true)->nullable()->after('transaction_currency_id'); + $table->foreign('transaction_type_id', 'type_foreign')->references('id')->on('transaction_types')->onDelete('set null'); + } } - } ); } } diff --git a/database/migrations/2021_05_09_064644_add_ldap_columns_to_users_table.php b/database/migrations/2021_05_09_064644_add_ldap_columns_to_users_table.php index 17d54fa8bd..5a0ad59217 100644 --- a/database/migrations/2021_05_09_064644_add_ldap_columns_to_users_table.php +++ b/database/migrations/2021_05_09_064644_add_ldap_columns_to_users_table.php @@ -34,9 +34,10 @@ class AddLdapColumnsToUsersTable extends Migration public function down() { Schema::table( - 'users', function (Blueprint $table) { - $table->dropColumn(['domain']); - } + 'users', + function (Blueprint $table) { + $table->dropColumn(['domain']); + } ); } @@ -46,9 +47,10 @@ class AddLdapColumnsToUsersTable extends Migration public function up() { Schema::table( - 'users', function (Blueprint $table) { - $table->string('domain')->nullable(); - } + 'users', + function (Blueprint $table) { + $table->string('domain')->nullable(); + } ); } } diff --git a/database/migrations/2021_05_13_053836_extend_currency_info.php b/database/migrations/2021_05_13_053836_extend_currency_info.php index 1eeea51fa5..cc572ac058 100644 --- a/database/migrations/2021_05_13_053836_extend_currency_info.php +++ b/database/migrations/2021_05_13_053836_extend_currency_info.php @@ -49,10 +49,11 @@ class ExtendCurrencyInfo extends Migration public function up() { Schema::table( - 'transaction_currencies', function (Blueprint $table) { - $table->string('code', 51)->change(); - $table->string('symbol', 51)->change(); - } + 'transaction_currencies', + function (Blueprint $table) { + $table->string('code', 51)->change(); + $table->string('symbol', 51)->change(); + } ); } } diff --git a/database/migrations/2021_08_28_073733_user_groups.php b/database/migrations/2021_08_28_073733_user_groups.php index 70afc7d990..fcc2f8242f 100644 --- a/database/migrations/2021_08_28_073733_user_groups.php +++ b/database/migrations/2021_08_28_073733_user_groups.php @@ -32,8 +32,21 @@ use Illuminate\Support\Facades\Schema; class UserGroups extends Migration { private array $tables - = ['accounts', 'attachments', 'available_budgets', 'bills', 'budgets', 'categories', 'recurrences', 'rule_groups', 'rules', 'tags', - 'transaction_groups', 'transaction_journals', 'webhooks']; + = [ + 'accounts', + 'attachments', + 'available_budgets', + 'bills', + 'budgets', + 'categories', + 'recurrences', + 'rule_groups', + 'rules', + 'tags', + 'transaction_groups', + 'transaction_journals', + 'webhooks', + ]; /** * Reverse the migrations. @@ -46,25 +59,24 @@ class UserGroups extends Migration /** @var string $tableName */ foreach ($this->tables as $tableName) { Schema::table( - $tableName, function (Blueprint $table) use ($tableName) { - - $table->dropForeign(sprintf('%s_to_ugi', $tableName)); - if (Schema::hasColumn($tableName, 'user_group_id')) { - $table->dropColumn('user_group_id'); + $tableName, + function (Blueprint $table) use ($tableName) { + $table->dropForeign(sprintf('%s_to_ugi', $tableName)); + if (Schema::hasColumn($tableName, 'user_group_id')) { + $table->dropColumn('user_group_id'); + } } - } ); } Schema::table( - 'users', function (Blueprint $table) { - - $table->dropForeign('type_user_group_id'); - if (Schema::hasColumn('users', 'user_group_id')) { - $table->dropColumn('user_group_id'); + 'users', + function (Blueprint $table) { + $table->dropForeign('type_user_group_id'); + if (Schema::hasColumn('users', 'user_group_id')) { + $table->dropColumn('user_group_id'); + } } - - } ); Schema::dropIfExists('group_memberships'); @@ -84,25 +96,27 @@ class UserGroups extends Migration * may have multiple roles in a group */ Schema::create( - 'user_groups', static function (Blueprint $table) { - $table->bigIncrements('id'); - $table->timestamps(); - $table->softDeletes(); + 'user_groups', + static function (Blueprint $table) { + $table->bigIncrements('id'); + $table->timestamps(); + $table->softDeletes(); - $table->string('title', 255); - $table->unique('title'); - } + $table->string('title', 255); + $table->unique('title'); + } ); Schema::create( - 'user_roles', static function (Blueprint $table) { - $table->bigIncrements('id'); - $table->timestamps(); - $table->softDeletes(); + 'user_roles', + static function (Blueprint $table) { + $table->bigIncrements('id'); + $table->timestamps(); + $table->softDeletes(); - $table->string('title', 255); - $table->unique('title'); - } + $table->string('title', 255); + $table->unique('title'); + } ); Schema::create( @@ -122,27 +136,29 @@ class UserGroups extends Migration } ); Schema::table( - 'users', function (Blueprint $table) { - if (!Schema::hasColumn('users', 'user_group_id')) { - $table->bigInteger('user_group_id', false, true)->nullable(); - $table->foreign('user_group_id', 'type_user_group_id')->references('id')->on('user_groups')->onDelete('set null')->onUpdate('cascade'); + 'users', + function (Blueprint $table) { + if (!Schema::hasColumn('users', 'user_group_id')) { + $table->bigInteger('user_group_id', false, true)->nullable(); + $table->foreign('user_group_id', 'type_user_group_id')->references('id')->on('user_groups')->onDelete('set null')->onUpdate('cascade'); + } } - } ); // ADD columns from tables /** @var string $tableName */ foreach ($this->tables as $tableName) { Schema::table( - $tableName, function (Blueprint $table) use ($tableName) { - - if (!Schema::hasColumn($tableName, 'user_group_id')) { - $table->bigInteger('user_group_id', false, true)->nullable()->after('user_id'); - $table->foreign('user_group_id', sprintf('%s_to_ugi', $tableName))->references('id')->on('user_groups')->onDelete('set null')->onUpdate('cascade'); + $tableName, + function (Blueprint $table) use ($tableName) { + if (!Schema::hasColumn($tableName, 'user_group_id')) { + $table->bigInteger('user_group_id', false, true)->nullable()->after('user_id'); + $table->foreign('user_group_id', sprintf('%s_to_ugi', $tableName))->references('id')->on('user_groups')->onDelete('set null')->onUpdate( + 'cascade' + ); + } } - } ); } - } } diff --git a/database/migrations/2022_08_21_104626_add_user_groups.php b/database/migrations/2022_08_21_104626_add_user_groups.php index 2c8bd55731..4a8ea74758 100644 --- a/database/migrations/2022_08_21_104626_add_user_groups.php +++ b/database/migrations/2022_08_21_104626_add_user_groups.php @@ -29,7 +29,7 @@ use Illuminate\Support\Facades\Schema; /** * */ -return new class extends Migration { +return new class () extends Migration { /** * Run the migrations. * @@ -38,13 +38,13 @@ return new class extends Migration { public function up(): void { Schema::table( - 'currency_exchange_rates', function (Blueprint $table) { - - if (!Schema::hasColumn('currency_exchange_rates', 'user_group_id')) { - $table->bigInteger('user_group_id', false, true)->nullable()->after('user_id'); - $table->foreign('user_group_id', 'cer_to_ugi')->references('id')->on('user_groups')->onDelete('set null')->onUpdate('cascade'); + 'currency_exchange_rates', + function (Blueprint $table) { + if (!Schema::hasColumn('currency_exchange_rates', 'user_group_id')) { + $table->bigInteger('user_group_id', false, true)->nullable()->after('user_id'); + $table->foreign('user_group_id', 'cer_to_ugi')->references('id')->on('user_groups')->onDelete('set null')->onUpdate('cascade'); + } } - } ); } @@ -56,13 +56,13 @@ return new class extends Migration { public function down(): void { Schema::table( - 'currency_exchange_rates', function (Blueprint $table) { - - $table->dropForeign('cer_to_ugi'); - if (Schema::hasColumn('currency_exchange_rates', 'user_group_id')) { - $table->dropColumn('user_group_id'); + 'currency_exchange_rates', + function (Blueprint $table) { + $table->dropForeign('cer_to_ugi'); + if (Schema::hasColumn('currency_exchange_rates', 'user_group_id')) { + $table->dropColumn('user_group_id'); + } } - } ); } }; diff --git a/database/migrations/2022_09_18_123911_create_notifications_table.php b/database/migrations/2022_09_18_123911_create_notifications_table.php index e86b8f7023..cafb647bf0 100644 --- a/database/migrations/2022_09_18_123911_create_notifications_table.php +++ b/database/migrations/2022_09_18_123911_create_notifications_table.php @@ -26,8 +26,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class extends Migration -{ +return new class () extends Migration { /** * Run the migrations. * diff --git a/database/migrations/2022_10_01_074908_invited_users.php b/database/migrations/2022_10_01_074908_invited_users.php index 921e261ef0..d91ccb6508 100644 --- a/database/migrations/2022_10_01_074908_invited_users.php +++ b/database/migrations/2022_10_01_074908_invited_users.php @@ -26,8 +26,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class extends Migration -{ +return new class () extends Migration { /** * Run the migrations. * diff --git a/database/migrations/2022_10_01_210238_audit_log_entries.php b/database/migrations/2022_10_01_210238_audit_log_entries.php index fb0c5e0e6b..5b6d2d1ae9 100644 --- a/database/migrations/2022_10_01_210238_audit_log_entries.php +++ b/database/migrations/2022_10_01_210238_audit_log_entries.php @@ -26,8 +26,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class extends Migration -{ +return new class () extends Migration { /** * Run the migrations. * diff --git a/database/seeders/AccountTypeSeeder.php b/database/seeders/AccountTypeSeeder.php index e917f3ba94..5d0eac7ee7 100644 --- a/database/seeders/AccountTypeSeeder.php +++ b/database/seeders/AccountTypeSeeder.php @@ -1,4 +1,5 @@ data = $version; $entry->save(); diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 57b47b7a59..8c18621566 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -1,4 +1,5 @@ { - const locale = data.data.data.attributes.data.replace('_','-'); + const locale = data.data.data.attributes.data.replace('_', '-'); ffStore.setLocale(locale); }).catch((err) => { diff --git a/frontend/src/api/accounts/get.js b/frontend/src/api/accounts/get.js index e6cf5163fd..8270b4ecdb 100644 --- a/frontend/src/api/accounts/get.js +++ b/frontend/src/api/accounts/get.js @@ -33,7 +33,7 @@ export default class Get extends Api { */ get(identifier, date) { let params = {date: date}; - if(!date) { + if (!date) { return this.apiGet(identifier); } return this.apiGet(identifier, params); diff --git a/frontend/src/api/accounts/list.js b/frontend/src/api/accounts/list.js index 72b5f4e20b..28b7d5b41a 100644 --- a/frontend/src/api/accounts/list.js +++ b/frontend/src/api/accounts/list.js @@ -21,7 +21,7 @@ import {api} from "boot/axios"; import Api from "src/api/root/api"; -export default class List extends Api{ +export default class List extends Api { constructor() { super('accounts'); } diff --git a/frontend/src/api/authenticate/index.js b/frontend/src/api/authenticate/index.js index 43d5fb32ea..2335516928 100644 --- a/frontend/src/api/authenticate/index.js +++ b/frontend/src/api/authenticate/index.js @@ -20,7 +20,7 @@ import {api} from "boot/axios"; - export default class Authenticate { +export default class Authenticate { async authenticate() { return await api.get('/sanctum/csrf-cookie'); } diff --git a/frontend/src/api/categories/get.js b/frontend/src/api/categories/get.js index 765aec746f..a3fc6f2891 100644 --- a/frontend/src/api/categories/get.js +++ b/frontend/src/api/categories/get.js @@ -23,12 +23,14 @@ import {api} from "boot/axios"; export default class Get { get(identifier) { let url = '/api/v1/categories/' + identifier; - return api.get(url); + return api.get(url); } + transactions(identifier, page, cacheKey) { let url = '/api/v1/categories/' + identifier + '/transactions'; return api.get(url, {params: {page: page, cache: cacheKey}}); } + transactionsWithoutCategory(page, cacheKey) { let url = '/api/v1/categories/transactions-without-category'; return api.get(url, {params: {page: page, cache: cacheKey}}); diff --git a/frontend/src/api/currencies/get.js b/frontend/src/api/currencies/get.js index 107144b51d..ebce1424c6 100644 --- a/frontend/src/api/currencies/get.js +++ b/frontend/src/api/currencies/get.js @@ -23,8 +23,9 @@ import {api} from "boot/axios"; export default class Get { get(identifier) { let url = '/api/v1/currencies/' + identifier; - return api.get(url); + return api.get(url); } + transactions(identifier, page, cacheKey) { let url = '/api/v1/currencies/' + identifier + '/transactions'; return api.get(url, {params: {page: page, cache: cacheKey}}); diff --git a/frontend/src/api/currencies/index.js b/frontend/src/api/currencies/index.js index bcc528de2b..86c8c916e9 100644 --- a/frontend/src/api/currencies/index.js +++ b/frontend/src/api/currencies/index.js @@ -20,9 +20,12 @@ import {api} from "boot/axios"; import Authenticate from '../authenticate/index'; + export default class Currencies { default() { let auth = new Authenticate(); - return auth.authenticate().then(() => {return api.get('/api/v1/currencies/default')}); + return auth.authenticate().then(() => { + return api.get('/api/v1/currencies/default') + }); } } diff --git a/frontend/src/api/currencies/post.js b/frontend/src/api/currencies/post.js index 689d72c571..063e99c502 100644 --- a/frontend/src/api/currencies/post.js +++ b/frontend/src/api/currencies/post.js @@ -25,6 +25,7 @@ export default class Post { let url = '/api/v1/currencies'; return api.post(url, submission); } + makeDefault(currency) { let url = '/api/v1/currencies/' + currency + '/default'; return api.post(url); diff --git a/frontend/src/api/piggy-banks/get.js b/frontend/src/api/piggy-banks/get.js index d12c88609f..fa3271f5d6 100644 --- a/frontend/src/api/piggy-banks/get.js +++ b/frontend/src/api/piggy-banks/get.js @@ -23,8 +23,9 @@ import {api} from "boot/axios"; export default class Get { get(identifier) { let url = '/api/v1/piggy_banks/' + identifier; - return api.get(url); + return api.get(url); } + transactions(identifier, page, cacheKey) { let url = '/api/v1/piggy_banks/' + identifier + '/transactions'; return api.get(url, {params: {page: page, cache: cacheKey}}); diff --git a/frontend/src/api/preferences/index.js b/frontend/src/api/preferences/index.js index 4121d77636..fac50967d5 100644 --- a/frontend/src/api/preferences/index.js +++ b/frontend/src/api/preferences/index.js @@ -24,6 +24,7 @@ export default class Preferences { getByName(name) { return api.get('/api/v1/preferences/' + name); } + postByName(name, value) { return api.post('/api/v1/preferences', {name: name, data: value}); } diff --git a/frontend/src/api/recurring/get.js b/frontend/src/api/recurring/get.js index f1a05daf97..d08f98d99b 100644 --- a/frontend/src/api/recurring/get.js +++ b/frontend/src/api/recurring/get.js @@ -23,6 +23,6 @@ import {api} from "boot/axios"; export default class Get { get(identifier) { let url = '/api/v1/recurrences/' + identifier; - return api.get(url); + return api.get(url); } } diff --git a/frontend/src/api/rule-groups/get.js b/frontend/src/api/rule-groups/get.js index 7fe8793f9e..b63ba19027 100644 --- a/frontend/src/api/rule-groups/get.js +++ b/frontend/src/api/rule-groups/get.js @@ -23,11 +23,12 @@ import {api} from "boot/axios"; export default class Get { get(identifier, date) { let url = '/api/v1/rule_groups/' + identifier; - if(!date) { + if (!date) { return api.get(url); } return api.get(url, {params: {date: date}}); } + rules(identifier, page, cacheKey) { let url = '/api/v1/rule_groups/' + identifier + '/rules'; return api.get(url, {params: {page: page, cache: cacheKey}}); diff --git a/frontend/src/api/rules/get.js b/frontend/src/api/rules/get.js index 29e80b2474..98f6bc77b6 100644 --- a/frontend/src/api/rules/get.js +++ b/frontend/src/api/rules/get.js @@ -23,7 +23,7 @@ import {api} from "boot/axios"; export default class Get { get(identifier, date) { let url = '/api/v1/rules/' + identifier; - if(!date) { + if (!date) { return api.get(url); } return api.get(url, {params: {date: date}}); diff --git a/frontend/src/api/subscriptions/get.js b/frontend/src/api/subscriptions/get.js index 2d0ef000cf..66759dd199 100644 --- a/frontend/src/api/subscriptions/get.js +++ b/frontend/src/api/subscriptions/get.js @@ -25,6 +25,7 @@ export default class Get { let url = '/api/v1/bills/' + identifier; return api.get(url); } + transactions(identifier, page, cacheKey) { let url = '/api/v1/bills/' + identifier + '/transactions'; return api.get(url, {params: {page: page, cache: cacheKey}}); diff --git a/frontend/src/api/system/about.js b/frontend/src/api/system/about.js index e895bf64bf..3f8d10ce74 100644 --- a/frontend/src/api/system/about.js +++ b/frontend/src/api/system/about.js @@ -22,7 +22,7 @@ import {api} from "boot/axios"; //import createAuthRefreshInterceptor from 'axios-auth-refresh'; export default class About { - list() { - return api.get('/api/v1/about'); - } + list() { + return api.get('/api/v1/about'); + } } diff --git a/frontend/src/api/system/configuration.js b/frontend/src/api/system/configuration.js index e57913ea55..4161f0294c 100644 --- a/frontend/src/api/system/configuration.js +++ b/frontend/src/api/system/configuration.js @@ -1,4 +1,3 @@ - /* * configuration.js * Copyright (c) 2022 james@firefly-iii.org @@ -22,11 +21,11 @@ import {api} from "boot/axios"; export default class Configuration { - get (identifier) { + get(identifier) { return api.get('/api/v1/configuration/' + identifier); } - put (identifier, value) { + put(identifier, value) { return api.put('/api/v1/configuration/' + identifier, value); } } diff --git a/frontend/src/api/tags/get.js b/frontend/src/api/tags/get.js index 1825f1aec3..90939638e2 100644 --- a/frontend/src/api/tags/get.js +++ b/frontend/src/api/tags/get.js @@ -25,6 +25,7 @@ export default class Get { let url = '/api/v1/tags/' + identifier; return api.get(url); } + transactions(identifier, page, cacheKey) { let url = '/api/v1/tags/' + identifier + '/transactions'; return api.get(url, {params: {page: page, cache: cacheKey}}); diff --git a/frontend/src/api/v2/accounts/get.js b/frontend/src/api/v2/accounts/get.js index fe0600d9c6..16d4cecfed 100644 --- a/frontend/src/api/v2/accounts/get.js +++ b/frontend/src/api/v2/accounts/get.js @@ -33,13 +33,14 @@ export default class Get extends Api { */ get(identifier, date) { let params = {date: date}; - if(!date) { + if (!date) { return this.apiGet(identifier); } return this.apiGet(identifier, params); } + transactions(identifier, params) { - if(!params) { + if (!params) { return this.apiGetTransactions(identifier); } return this.apiGetTransactions(identifier, params); diff --git a/frontend/src/api/v2/preferences/index.js b/frontend/src/api/v2/preferences/index.js index 165b10d6bb..4e5e9e5951 100644 --- a/frontend/src/api/v2/preferences/index.js +++ b/frontend/src/api/v2/preferences/index.js @@ -24,6 +24,7 @@ export default class Preferences { get(name) { return api.get('/api/v2/preferences/' + name); } + // postByName(name, value) { // return api.post('/api/v1/preferences', {name: name, data: value}); // } diff --git a/frontend/src/api/v2/root/api.js b/frontend/src/api/v2/root/api.js index 19587122d0..1ab35799e3 100644 --- a/frontend/src/api/v2/root/api.js +++ b/frontend/src/api/v2/root/api.js @@ -52,6 +52,7 @@ export default class Api { } return api.get(url); } + /** * * @param object diff --git a/frontend/src/boot/axios.js b/frontend/src/boot/axios.js index 37e2ffc6be..6cc571832e 100644 --- a/frontend/src/boot/axios.js +++ b/frontend/src/boot/axios.js @@ -23,9 +23,9 @@ import axios from 'axios' import {setupCache} from 'axios-cache-adapter' const cache = setupCache({ - maxAge: 15 * 60 * 1000, - exclude: { query: false } - }) + maxAge: 15 * 60 * 1000, + exclude: {query: false} +}) // Be careful when using SSR for cross-request state pollution // due to creating a Singleton instance here; diff --git a/frontend/src/boot/i18n.js b/frontend/src/boot/i18n.js index 9d105e14bd..d28f99d44b 100644 --- a/frontend/src/boot/i18n.js +++ b/frontend/src/boot/i18n.js @@ -18,11 +18,11 @@ * along with this program. If not, see . */ -import { boot } from 'quasar/wrappers' -import { createI18n } from 'vue-i18n' +import {boot} from 'quasar/wrappers' +import {createI18n} from 'vue-i18n' import messages from 'src/i18n' -export default boot(({ app }) => { +export default boot(({app}) => { const i18n = createI18n({ locale: 'en-US', messages diff --git a/frontend/src/components/Alert.vue b/frontend/src/components/Alert.vue index 970e43794b..8523990715 100644 --- a/frontend/src/components/Alert.vue +++ b/frontend/src/components/Alert.vue @@ -19,14 +19,14 @@ --> diff --git a/frontend/src/components/DateRange.vue b/frontend/src/components/DateRange.vue index 2f0817db19..86fd499585 100644 --- a/frontend/src/components/DateRange.vue +++ b/frontend/src/components/DateRange.vue @@ -22,14 +22,15 @@
- +
- - + + - + {{ $t('firefly.pref_' + choice.value) }} diff --git a/frontend/src/components/EssentialLink.vue b/frontend/src/components/EssentialLink.vue index 37f4fbef43..bfae5fff32 100644 --- a/frontend/src/components/EssentialLink.vue +++ b/frontend/src/components/EssentialLink.vue @@ -20,16 +20,16 @@