mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-12-11 17:39:41 +00:00
Various code cleanup and fixed alignments.
This commit is contained in:
@@ -145,12 +145,12 @@ return [
|
||||
'Google2FA' => PragmaRX\Google2FALaravel\Facade::class,
|
||||
'Twig' => TwigBridge\Facade\Twig::class,
|
||||
|
||||
'Arr' => Illuminate\Support\Arr::class,
|
||||
'Http' => Illuminate\Support\Facades\Http::class,
|
||||
'Str' => Illuminate\Support\Str::class,
|
||||
'Arr' => Illuminate\Support\Arr::class,
|
||||
'Http' => Illuminate\Support\Facades\Http::class,
|
||||
'Str' => Illuminate\Support\Str::class,
|
||||
],
|
||||
|
||||
'asset_url' => env('ASSET_URL', null),
|
||||
'asset_url' => env('ASSET_URL', null),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@@ -163,5 +163,5 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'faker_locale' => 'en_US',
|
||||
'faker_locale' => 'en_US',
|
||||
];
|
||||
|
||||
@@ -37,12 +37,12 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'defaults' => [
|
||||
'defaults' => [
|
||||
'guard' => envNonEmpty('AUTHENTICATION_GUARD', 'web'),
|
||||
'passwords' => 'users',
|
||||
],
|
||||
'guard_header' => envNonEmpty('AUTHENTICATION_GUARD_HEADER', 'REMOTE_USER'),
|
||||
'guard_email' => envNonEmpty('AUTHENTICATION_GUARD_EMAIL', null),
|
||||
'guard_header' => envNonEmpty('AUTHENTICATION_GUARD_HEADER', 'REMOTE_USER'),
|
||||
'guard_email' => envNonEmpty('AUTHENTICATION_GUARD_EMAIL', null),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@@ -61,7 +61,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'guards' => [
|
||||
'guards' => [
|
||||
'web' => [
|
||||
'driver' => 'session',
|
||||
'provider' => 'users',
|
||||
@@ -93,7 +93,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'providers' => [
|
||||
'providers' => [
|
||||
'users' => [
|
||||
'driver' => 'eloquent',
|
||||
'model' => FireflyIII\User::class,
|
||||
@@ -119,7 +119,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'passwords' => [
|
||||
'passwords' => [
|
||||
'users' => [
|
||||
'provider' => 'users',
|
||||
'table' => 'password_resets',
|
||||
|
||||
@@ -46,7 +46,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'view' => 'partials/layout/breadcrumbs',
|
||||
'view' => 'partials/layout/breadcrumbs',
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
||||
@@ -35,7 +35,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'default' => env('BROADCAST_DRIVER', 'null'),
|
||||
'default' => env('BROADCAST_DRIVER', 'null'),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@@ -67,21 +67,21 @@ return [
|
||||
],
|
||||
],
|
||||
|
||||
'ably' => [
|
||||
'ably' => [
|
||||
'driver' => 'ably',
|
||||
'key' => env('ABLY_KEY'),
|
||||
],
|
||||
|
||||
'redis' => [
|
||||
'redis' => [
|
||||
'driver' => 'redis',
|
||||
'connection' => 'default',
|
||||
],
|
||||
|
||||
'log' => [
|
||||
'log' => [
|
||||
'driver' => 'log',
|
||||
],
|
||||
|
||||
'null' => [
|
||||
'null' => [
|
||||
'driver' => 'null',
|
||||
],
|
||||
],
|
||||
|
||||
@@ -48,23 +48,23 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'stores' => [
|
||||
'apc' => [
|
||||
'stores' => [
|
||||
'apc' => [
|
||||
'driver' => 'apc',
|
||||
],
|
||||
|
||||
'array' => [
|
||||
'array' => [
|
||||
'driver' => 'array',
|
||||
'serialize' => false,
|
||||
],
|
||||
|
||||
'database' => [
|
||||
'database' => [
|
||||
'driver' => 'database',
|
||||
'table' => 'cache',
|
||||
'connection' => null,
|
||||
],
|
||||
|
||||
'file' => [
|
||||
'file' => [
|
||||
'driver' => 'file',
|
||||
'path' => storage_path('framework/cache/data'),
|
||||
],
|
||||
@@ -88,11 +88,11 @@ return [
|
||||
],
|
||||
],
|
||||
|
||||
'redis' => [
|
||||
'redis' => [
|
||||
'driver' => 'redis',
|
||||
'connection' => 'default',
|
||||
],
|
||||
'dynamodb' => [
|
||||
'dynamodb' => [
|
||||
'driver' => 'dynamodb',
|
||||
'key' => env('AWS_ACCESS_KEY_ID'),
|
||||
'secret' => env('AWS_SECRET_ACCESS_KEY'),
|
||||
@@ -113,5 +113,5 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'prefix' => env('CACHE_PREFIX', 'firefly'),
|
||||
'prefix' => env('CACHE_PREFIX', 'firefly'),
|
||||
];
|
||||
|
||||
@@ -36,19 +36,19 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'paths' => ['api/*', 'sanctum/csrf-cookie'],
|
||||
'paths' => ['api/*', 'sanctum/csrf-cookie'],
|
||||
|
||||
'allowed_methods' => ['*'],
|
||||
'allowed_methods' => ['*'],
|
||||
|
||||
'allowed_origins' => ['*'],
|
||||
'allowed_origins' => ['*'],
|
||||
|
||||
'allowed_origins_patterns' => ['*'],
|
||||
|
||||
'allowed_headers' => ['*'],
|
||||
'allowed_headers' => ['*'],
|
||||
|
||||
'exposed_headers' => [],
|
||||
'exposed_headers' => [],
|
||||
|
||||
'max_age' => 0,
|
||||
'max_age' => 0,
|
||||
|
||||
'supports_credentials' => false,
|
||||
'supports_credentials' => false,
|
||||
];
|
||||
|
||||
@@ -23,12 +23,12 @@ declare(strict_types=1);
|
||||
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
$databaseUrl = getenv('DATABASE_URL');
|
||||
$host = '';
|
||||
$username = '';
|
||||
$password = '';
|
||||
$database = '';
|
||||
$port = '';
|
||||
$databaseUrl = getenv('DATABASE_URL');
|
||||
$host = '';
|
||||
$username = '';
|
||||
$password = '';
|
||||
$database = '';
|
||||
$port = '';
|
||||
|
||||
if (false !== $databaseUrl) {
|
||||
$options = parse_url($databaseUrl);
|
||||
@@ -47,8 +47,8 @@ $mysql_ssl_key = envNonEmpty('MYSQL_SSL_KEY', null);
|
||||
$mysql_ssl_ciphers = envNonEmpty('MYSQL_SSL_CIPHER', null);
|
||||
$mysql_ssl_verify = envNonEmpty('MYSQL_SSL_VERIFY_SERVER_CERT', null);
|
||||
|
||||
$mySqlSSLOptions = [];
|
||||
$useSSL = envNonEmpty('MYSQL_USE_SSL', false);
|
||||
$mySqlSSLOptions = [];
|
||||
$useSSL = envNonEmpty('MYSQL_USE_SSL', false);
|
||||
if (false !== $useSSL && null !== $useSSL && '' !== $useSSL) {
|
||||
if (null !== $mysql_ssl_ca_dir) {
|
||||
$mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CAPATH] = $mysql_ssl_ca_dir;
|
||||
|
||||
@@ -34,8 +34,8 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'enabled' => env('DEBUGBAR_ENABLED', null),
|
||||
'except' => [
|
||||
'enabled' => env('DEBUGBAR_ENABLED', null),
|
||||
'except' => [
|
||||
'telescope*',
|
||||
],
|
||||
|
||||
@@ -51,7 +51,7 @@ return [
|
||||
| can also be used. For PDO, run the package migrations first.
|
||||
|
|
||||
*/
|
||||
'storage' => [
|
||||
'storage' => [
|
||||
'enabled' => true,
|
||||
'driver' => 'file', // redis, file, pdo, custom
|
||||
'path' => storage_path('debugbar'), // For file driver
|
||||
@@ -120,7 +120,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'collectors' => [
|
||||
'collectors' => [
|
||||
'phpinfo' => true, // Php version
|
||||
'messages' => true, // Messages
|
||||
'time' => true, // Time Datalogger
|
||||
@@ -154,7 +154,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'options' => [
|
||||
'options' => [
|
||||
'auth' => [
|
||||
'show_name' => true, // Also show the users name/email in the debugbar
|
||||
],
|
||||
@@ -197,7 +197,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'inject' => true,
|
||||
'inject' => true,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@@ -209,7 +209,7 @@ return [
|
||||
| from trying to overcome bugs like this: http://trac.nginx.org/nginx/ticket/97
|
||||
|
|
||||
*/
|
||||
'route_prefix' => '_debugbar',
|
||||
'route_prefix' => '_debugbar',
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@@ -219,5 +219,5 @@ return [
|
||||
| By default DebugBar route served from the same domain that request served.
|
||||
| To override default domain, specify it as a non-empty value.
|
||||
*/
|
||||
'route_domain' => null,
|
||||
'route_domain' => null,
|
||||
];
|
||||
|
||||
@@ -51,7 +51,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'disks' => [
|
||||
'disks' => [
|
||||
'local' => [
|
||||
'driver' => 'local',
|
||||
'root' => storage_path('app'),
|
||||
@@ -85,7 +85,7 @@ return [
|
||||
'root' => base_path('resources'),
|
||||
],
|
||||
|
||||
'public' => [
|
||||
'public' => [
|
||||
'driver' => 'local',
|
||||
'root' => storage_path('app/public'),
|
||||
'url' => env('APP_URL').'/storage',
|
||||
|
||||
@@ -431,7 +431,7 @@ return [
|
||||
'transfers' => 'fa-exchange',
|
||||
],
|
||||
|
||||
'bindables' => [
|
||||
'bindables' => [
|
||||
// models
|
||||
'account' => Account::class,
|
||||
'attachment' => Attachment::class,
|
||||
@@ -488,7 +488,7 @@ return [
|
||||
'userGroupBill' => UserGroupBill::class,
|
||||
'userGroup' => UserGroup::class,
|
||||
],
|
||||
'rule-actions' => [
|
||||
'rule-actions' => [
|
||||
'set_category' => SetCategory::class,
|
||||
'clear_category' => ClearCategory::class,
|
||||
'set_budget' => SetBudget::class,
|
||||
@@ -519,7 +519,7 @@ return [
|
||||
'set_source_to_cash' => SetSourceToCashAccount::class,
|
||||
'set_destination_to_cash' => SetDestinationToCashAccount::class,
|
||||
],
|
||||
'context-rule-actions' => [
|
||||
'context-rule-actions' => [
|
||||
'set_category',
|
||||
'set_budget',
|
||||
'add_tag',
|
||||
@@ -538,13 +538,13 @@ return [
|
||||
'convert_transfer',
|
||||
],
|
||||
|
||||
'test-triggers' => [
|
||||
'test-triggers' => [
|
||||
'limit' => 10,
|
||||
'range' => 200,
|
||||
],
|
||||
|
||||
// expected source types for each transaction type, in order of preference.
|
||||
'expected_source_types' => [
|
||||
'expected_source_types' => [
|
||||
'source' => [
|
||||
TransactionTypeModel::WITHDRAWAL => [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE],
|
||||
TransactionTypeEnum::DEPOSIT->value => [AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE, AccountType::REVENUE, AccountType::CASH],
|
||||
@@ -589,7 +589,7 @@ return [
|
||||
TransactionTypeModel::LIABILITY_CREDIT => [AccountType::LIABILITY_CREDIT, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE],
|
||||
],
|
||||
],
|
||||
'allowed_opposing_types' => [
|
||||
'allowed_opposing_types' => [
|
||||
'source' => [
|
||||
AccountType::ASSET => [
|
||||
AccountType::ASSET,
|
||||
@@ -679,7 +679,7 @@ return [
|
||||
],
|
||||
],
|
||||
// depending on the account type, return the allowed transaction types:
|
||||
'allowed_transaction_types' => [
|
||||
'allowed_transaction_types' => [
|
||||
'source' => [
|
||||
AccountType::ASSET => [
|
||||
TransactionTypeModel::WITHDRAWAL,
|
||||
@@ -748,7 +748,7 @@ return [
|
||||
],
|
||||
|
||||
// having the source + dest will tell you the transaction type.
|
||||
'account_to_transaction' => [
|
||||
'account_to_transaction' => [
|
||||
AccountType::ASSET => [
|
||||
AccountType::ASSET => TransactionTypeModel::TRANSFER,
|
||||
AccountType::CASH => TransactionTypeModel::WITHDRAWAL,
|
||||
@@ -813,7 +813,7 @@ return [
|
||||
],
|
||||
|
||||
// allowed source -> destination accounts.
|
||||
'source_dests' => [
|
||||
'source_dests' => [
|
||||
TransactionTypeModel::WITHDRAWAL => [
|
||||
AccountType::ASSET => [AccountType::EXPENSE, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE, AccountType::CASH],
|
||||
AccountType::LOAN => [AccountType::EXPENSE, AccountType::CASH],
|
||||
@@ -852,7 +852,7 @@ return [
|
||||
],
|
||||
],
|
||||
// if you add fields to this array, don't forget to update the export routine (ExportDataGenerator).
|
||||
'journal_meta_fields' => [
|
||||
'journal_meta_fields' => [
|
||||
// sepa
|
||||
'sepa_cc',
|
||||
'sepa_ct_op',
|
||||
@@ -886,28 +886,28 @@ return [
|
||||
'recurrence_count',
|
||||
'recurrence_date',
|
||||
],
|
||||
'webhooks' => [
|
||||
'webhooks' => [
|
||||
'max_attempts' => env('WEBHOOK_MAX_ATTEMPTS', 3),
|
||||
],
|
||||
'can_have_virtual_amounts' => [AccountType::ASSET],
|
||||
'can_have_opening_balance' => [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE],
|
||||
'dynamic_creation_allowed' => [
|
||||
'can_have_virtual_amounts' => [AccountType::ASSET],
|
||||
'can_have_opening_balance' => [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE],
|
||||
'dynamic_creation_allowed' => [
|
||||
AccountType::EXPENSE,
|
||||
AccountType::REVENUE,
|
||||
AccountType::INITIAL_BALANCE,
|
||||
AccountType::RECONCILIATION,
|
||||
AccountType::LIABILITY_CREDIT,
|
||||
],
|
||||
'valid_asset_fields' => ['account_role', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],
|
||||
'valid_cc_fields' => ['account_role', 'cc_monthly_payment_date', 'cc_type', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],
|
||||
'valid_account_fields' => ['account_number', 'currency_id', 'BIC', 'interest', 'interest_period', 'include_net_worth', 'liability_direction'],
|
||||
'valid_asset_fields' => ['account_role', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],
|
||||
'valid_cc_fields' => ['account_role', 'cc_monthly_payment_date', 'cc_type', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],
|
||||
'valid_account_fields' => ['account_number', 'currency_id', 'BIC', 'interest', 'interest_period', 'include_net_worth', 'liability_direction'],
|
||||
|
||||
// dynamic date ranges are as follows:
|
||||
'dynamic_date_ranges' => ['last7', 'last30', 'last90', 'last365', 'MTD', 'QTD', 'YTD'],
|
||||
'dynamic_date_ranges' => ['last7', 'last30', 'last90', 'last365', 'MTD', 'QTD', 'YTD'],
|
||||
|
||||
// only used in v1
|
||||
'allowed_sort_parameters' => ['order', 'name', 'iban'],
|
||||
'allowed_sort_parameters' => ['order', 'name', 'iban'],
|
||||
|
||||
// preselected account lists possibilities:
|
||||
'preselected_accounts' => ['all', 'assets', 'liabilities'],
|
||||
'preselected_accounts' => ['all', 'assets', 'liabilities'],
|
||||
];
|
||||
|
||||
@@ -26,22 +26,22 @@ use PragmaRX\Google2FALaravel\Support\Constants;
|
||||
return [
|
||||
// Auth container binding
|
||||
|
||||
'enabled' => true,
|
||||
'enabled' => true,
|
||||
|
||||
/*
|
||||
* Lifetime in minutes.
|
||||
* In case you need your users to be asked for a new one time passwords from time to time.
|
||||
*/
|
||||
|
||||
'lifetime' => 0, // 0 = eternal
|
||||
'lifetime' => 0, // 0 = eternal
|
||||
|
||||
// Renew lifetime at every new request.
|
||||
|
||||
'keep_alive' => true,
|
||||
'keep_alive' => true,
|
||||
|
||||
// Auth container binding
|
||||
|
||||
'auth' => 'auth',
|
||||
'auth' => 'auth',
|
||||
|
||||
// 2FA verified session var
|
||||
|
||||
@@ -70,7 +70,7 @@ return [
|
||||
// Throw exceptions or just fire events?
|
||||
'throw_exceptions' => true,
|
||||
|
||||
'store_in_cookie' => true,
|
||||
'store_in_cookie' => true,
|
||||
|
||||
'qrcode_image_backend' => Constants::QRCODE_IMAGE_BACKEND_SVG,
|
||||
];
|
||||
|
||||
@@ -64,7 +64,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'argon' => [
|
||||
'argon' => [
|
||||
'memory' => 65536,
|
||||
'threads' => 1,
|
||||
'time' => 4,
|
||||
|
||||
@@ -31,10 +31,10 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'filename' => '_ide_helper',
|
||||
'format' => 'php',
|
||||
'filename' => '_ide_helper',
|
||||
'format' => 'php',
|
||||
|
||||
'meta_filename' => '.phpstorm.meta.php',
|
||||
'meta_filename' => '.phpstorm.meta.php',
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@@ -45,7 +45,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'include_fluent' => true,
|
||||
'include_fluent' => true,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@@ -56,7 +56,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'write_model_magic_where' => true,
|
||||
'write_model_magic_where' => true,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@@ -83,9 +83,9 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'include_helpers' => false,
|
||||
'include_helpers' => false,
|
||||
|
||||
'helper_files' => [
|
||||
'helper_files' => [
|
||||
base_path().'/vendor/laravel/framework/src/Illuminate/Support/helpers.php',
|
||||
],
|
||||
|
||||
@@ -99,7 +99,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'model_locations' => [
|
||||
'model_locations' => [
|
||||
'app',
|
||||
],
|
||||
|
||||
@@ -112,12 +112,12 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'extra' => [
|
||||
'extra' => [
|
||||
'Eloquent' => ['Illuminate\Database\Eloquent\Builder', 'Illuminate\Database\Query\Builder'],
|
||||
'Session' => ['Illuminate\Session\Store'],
|
||||
],
|
||||
|
||||
'magic' => [
|
||||
'magic' => [
|
||||
'Log' => [
|
||||
'debug' => 'Monolog\Logger::addDebug',
|
||||
'info' => 'Monolog\Logger::addInfo',
|
||||
|
||||
@@ -25,7 +25,7 @@ declare(strict_types=1);
|
||||
|
||||
return [
|
||||
// index
|
||||
'index' => [
|
||||
'index' => [
|
||||
'intro' => [],
|
||||
'accounts-chart' => ['element' => '#accounts-chart'],
|
||||
'box_out_holder' => ['element' => '#box_out_holder'],
|
||||
@@ -35,11 +35,11 @@ return [
|
||||
'outro' => [],
|
||||
],
|
||||
// accounts: create
|
||||
'accounts_create' => [
|
||||
'accounts_create' => [
|
||||
'iban' => ['element' => '#ffInput_iban'],
|
||||
],
|
||||
// transactions: create
|
||||
'transactions_create' => [
|
||||
'transactions_create' => [
|
||||
'basic_info' => ['element' => '#transaction-info', 'position' => 'right'],
|
||||
'amount_info' => ['element' => '#amount-info', 'position' => 'bottom'],
|
||||
'optional_info' => ['element' => '#optional-info', 'position' => 'left'],
|
||||
@@ -49,21 +49,21 @@ return [
|
||||
'transactions_create_withdrawal' => [
|
||||
],
|
||||
|
||||
'transactions_create_deposit' => [
|
||||
'transactions_create_deposit' => [
|
||||
],
|
||||
|
||||
'transactions_create_transfer' => [
|
||||
'transactions_create_transfer' => [
|
||||
],
|
||||
|
||||
// extra text for asset account creation.
|
||||
'accounts_create_asset' => [
|
||||
'accounts_create_asset' => [
|
||||
'opening_balance' => ['element' => '#ffInput_opening_balance'],
|
||||
'currency' => ['element' => '#ffInput_currency_id'],
|
||||
'virtual' => ['element' => '#ffInput_virtual_balance'],
|
||||
],
|
||||
|
||||
// budgets: index
|
||||
'budgets_index' => [
|
||||
'budgets_index' => [
|
||||
'intro' => [],
|
||||
'set_budget' => ['element' => '#availableBar'],
|
||||
'see_expenses_bar' => ['element' => '#spentBar'],
|
||||
@@ -73,59 +73,59 @@ return [
|
||||
'outro' => [],
|
||||
],
|
||||
// reports: index, default report, audit, budget, cat, tag
|
||||
'reports_index' => [
|
||||
'reports_index' => [
|
||||
'intro' => [],
|
||||
'inputReportType' => ['element' => '#inputReportType'],
|
||||
'inputAccountsSelect' => ['element' => '#inputAccountsSelect'],
|
||||
'inputDateRange' => ['element' => '#inputDateRange'],
|
||||
'extra-options-box' => ['element' => '#extra-options-box', 'position' => 'top'],
|
||||
],
|
||||
'reports_report_default' => [
|
||||
'reports_report_default' => [
|
||||
'intro' => [],
|
||||
],
|
||||
'reports_report_audit' => [
|
||||
'reports_report_audit' => [
|
||||
'intro' => [],
|
||||
'optionsBox' => ['element' => '#optionsBox'],
|
||||
],
|
||||
'reports_report_category' => [
|
||||
'reports_report_category' => [
|
||||
'intro' => [],
|
||||
'pieCharts' => ['element' => '#pieCharts'],
|
||||
'incomeAndExpensesChart' => ['element' => '#incomeAndExpensesChart', 'position' => 'top'],
|
||||
],
|
||||
'reports_report_tag' => [
|
||||
'reports_report_tag' => [
|
||||
'intro' => [],
|
||||
'pieCharts' => ['element' => '#pieCharts'],
|
||||
'incomeAndExpensesChart' => ['element' => '#incomeAndExpensesChart', 'position' => 'top'],
|
||||
],
|
||||
'reports_report_budget' => [
|
||||
'reports_report_budget' => [
|
||||
'intro' => [],
|
||||
'pieCharts' => ['element' => '#pieCharts'],
|
||||
'incomeAndExpensesChart' => ['element' => '#incomeAndExpensesChart', 'position' => 'top'],
|
||||
],
|
||||
|
||||
// piggies: index, create, show
|
||||
'piggy-banks_index' => [
|
||||
'piggy-banks_index' => [
|
||||
'saved' => ['element' => '.piggySaved'],
|
||||
'button' => ['element' => '.piggyBar'],
|
||||
'accountStatus' => ['element' => '#accountStatus', 'position' => 'top'],
|
||||
],
|
||||
'piggy-banks_create' => [
|
||||
'piggy-banks_create' => [
|
||||
'name' => ['element' => '#ffInput_name'],
|
||||
'date' => ['element' => '#ffInput_targetdate'],
|
||||
],
|
||||
'piggy-banks_show' => [
|
||||
'piggy-banks_show' => [
|
||||
'piggyChart' => ['element' => '#piggyChart'],
|
||||
'piggyDetails' => ['element' => '#piggyDetails'],
|
||||
'piggyEvents' => ['element' => '#piggyEvents'],
|
||||
],
|
||||
|
||||
// bills: index, create, show
|
||||
'bills_index' => [
|
||||
'bills_index' => [
|
||||
'rules' => ['element' => '.rules'],
|
||||
'paid_in_period' => ['element' => '.paid_in_period'],
|
||||
'expected_in_period' => ['element' => '.expected_in_period'],
|
||||
],
|
||||
'bills_create' => [
|
||||
'bills_create' => [
|
||||
'intro' => [],
|
||||
'name' => ['element' => '#name_holder'],
|
||||
// 'match' => ['element' => '#match_holder'],
|
||||
@@ -133,13 +133,13 @@ return [
|
||||
'repeat_freq_holder' => ['element' => '#repeat_freq_holder'],
|
||||
'skip_holder' => ['element' => '#skip_holder'],
|
||||
],
|
||||
'bills_show' => [
|
||||
'bills_show' => [
|
||||
'billInfo' => ['element' => '#billInfo'],
|
||||
'billButtons' => ['element' => '#billButtons'],
|
||||
'billChart' => ['element' => '#billChart', 'position' => 'top'],
|
||||
],
|
||||
// rules: index, create-rule, edit-rule
|
||||
'rules_index' => [
|
||||
'rules_index' => [
|
||||
'intro' => [],
|
||||
'new_rule_group' => ['element' => '#new_rule_group'],
|
||||
'new_rule' => ['element' => '.new_rule'],
|
||||
@@ -148,23 +148,23 @@ return [
|
||||
'rule-triggers' => ['element' => '.rule-triggers'],
|
||||
'outro' => [],
|
||||
],
|
||||
'rules_create' => [
|
||||
'rules_create' => [
|
||||
'mandatory' => ['element' => '#mandatory'],
|
||||
'ruletriggerholder' => ['element' => '.rule-trigger-box'],
|
||||
'test_rule_triggers' => ['element' => '.test_rule_triggers'],
|
||||
'actions' => ['element' => '.rule-action-box', 'position' => 'top'],
|
||||
],
|
||||
// preferences: index
|
||||
'preferences_index' => [
|
||||
'preferences_index' => [
|
||||
'tabs' => ['element' => '.nav-tabs'],
|
||||
],
|
||||
// currencies: index, create
|
||||
'currencies_index' => [
|
||||
'currencies_index' => [
|
||||
'intro' => [],
|
||||
'default' => ['element' => '#default-currency'],
|
||||
'buttons' => ['element' => '.buttons'],
|
||||
],
|
||||
'currencies_create' => [
|
||||
'currencies_create' => [
|
||||
'code' => ['element' => '#ffInput_code'],
|
||||
],
|
||||
];
|
||||
|
||||
@@ -25,16 +25,16 @@ use FireflyIII\Support\Logging\AuditLogger;
|
||||
use Monolog\Handler\SyslogUdpHandler;
|
||||
|
||||
// standard config for both log things:
|
||||
$defaultChannels = ['daily', 'stdout'];
|
||||
$auditChannels = ['audit_daily', 'audit_stdout'];
|
||||
$defaultChannels = ['daily', 'stdout'];
|
||||
$auditChannels = ['audit_daily', 'audit_stdout'];
|
||||
|
||||
// validChannels is missing 'stack' because we already check for that one.
|
||||
$validChannels = ['single', 'papertrail', 'stdout', 'daily', 'syslog', 'errorlog'];
|
||||
$validAuditChannels = ['audit_papertrail', 'audit_stdout', 'audit_stdout', 'audit_daily', 'audit_syslog', 'audit_errorlog'];
|
||||
|
||||
// which settings did the user set, if any?
|
||||
$defaultLogChannel = (string)envNonEmpty('LOG_CHANNEL', 'stack');
|
||||
$auditLogChannel = (string)envNonEmpty('AUDIT_LOG_CHANNEL', '');
|
||||
$defaultLogChannel = (string)envNonEmpty('LOG_CHANNEL', 'stack');
|
||||
$auditLogChannel = (string)envNonEmpty('AUDIT_LOG_CHANNEL', '');
|
||||
|
||||
if ('stack' === $defaultLogChannel) {
|
||||
$defaultChannels = ['daily', 'stdout'];
|
||||
@@ -59,8 +59,8 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'default' => envNonEmpty('LOG_CHANNEL', 'stack'),
|
||||
'level' => envNonEmpty('APP_LOG_LEVEL', 'info'),
|
||||
'default' => envNonEmpty('LOG_CHANNEL', 'stack'),
|
||||
'level' => envNonEmpty('APP_LOG_LEVEL', 'info'),
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Log Channels
|
||||
|
||||
@@ -32,10 +32,10 @@ return [
|
||||
| and used as needed; however, this mailer will be used by default.
|
||||
|
|
||||
*/
|
||||
'default' => envNonEmpty('MAIL_MAILER', 'log'),
|
||||
'default' => envNonEmpty('MAIL_MAILER', 'log'),
|
||||
|
||||
'mailers' => [
|
||||
'smtp' => [
|
||||
'mailers' => [
|
||||
'smtp' => [
|
||||
'transport' => 'smtp',
|
||||
'host' => envNonEmpty('MAIL_HOST', 'smtp.mailtrap.io'),
|
||||
'port' => (int)env('MAIL_PORT', 2525),
|
||||
@@ -46,11 +46,11 @@ return [
|
||||
'verify_peer' => null !== env('MAIL_ENCRYPTION'),
|
||||
],
|
||||
|
||||
'ses' => [
|
||||
'ses' => [
|
||||
'transport' => 'ses',
|
||||
],
|
||||
|
||||
'mailgun' => [
|
||||
'mailgun' => [
|
||||
'transport' => 'mailgun',
|
||||
],
|
||||
|
||||
@@ -77,7 +77,7 @@ return [
|
||||
'level' => 'notice',
|
||||
],
|
||||
|
||||
'array' => [
|
||||
'array' => [
|
||||
'transport' => 'array',
|
||||
],
|
||||
],
|
||||
|
||||
@@ -34,7 +34,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'guard' => envNonEmpty('AUTHENTICATION_GUARD', 'web'),
|
||||
'guard' => envNonEmpty('AUTHENTICATION_GUARD', 'web'),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@@ -47,9 +47,9 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'private_key' => env('PASSPORT_PRIVATE_KEY'),
|
||||
'private_key' => env('PASSPORT_PRIVATE_KEY'),
|
||||
|
||||
'public_key' => env('PASSPORT_PUBLIC_KEY'),
|
||||
'public_key' => env('PASSPORT_PUBLIC_KEY'),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@@ -62,7 +62,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'client_uuids' => false,
|
||||
'client_uuids' => false,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
||||
@@ -34,7 +34,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'default' => env('QUEUE_CONNECTION', 'sync'),
|
||||
'default' => env('QUEUE_CONNECTION', 'sync'),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@@ -50,11 +50,11 @@ return [
|
||||
*/
|
||||
|
||||
'connections' => [
|
||||
'sync' => [
|
||||
'sync' => [
|
||||
'driver' => 'sync',
|
||||
],
|
||||
|
||||
'database' => [
|
||||
'database' => [
|
||||
'driver' => 'database',
|
||||
'table' => 'jobs',
|
||||
'queue' => 'default',
|
||||
@@ -69,7 +69,7 @@ return [
|
||||
'block_for' => 0,
|
||||
],
|
||||
|
||||
'sqs' => [
|
||||
'sqs' => [
|
||||
'driver' => 'sqs',
|
||||
'key' => env('AWS_ACCESS_KEY_ID'),
|
||||
'secret' => env('AWS_SECRET_ACCESS_KEY'),
|
||||
@@ -79,7 +79,7 @@ return [
|
||||
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
|
||||
],
|
||||
|
||||
'redis' => [
|
||||
'redis' => [
|
||||
'driver' => 'redis',
|
||||
'connection' => 'default',
|
||||
'queue' => env('REDIS_QUEUE', 'default'),
|
||||
@@ -99,7 +99,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'failed' => [
|
||||
'failed' => [
|
||||
'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'),
|
||||
'database' => env('DB_CONNECTION', 'mysql'),
|
||||
'table' => 'failed_jobs',
|
||||
|
||||
@@ -37,7 +37,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'stateful' => explode(',', env('SANCTUM_STATEFUL_DOMAINS', '')),
|
||||
'stateful' => explode(',', env('SANCTUM_STATEFUL_DOMAINS', '')),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@@ -51,7 +51,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'guard' => [env('AUTHENTICATION_GUARD', 'web')],
|
||||
'guard' => [env('AUTHENTICATION_GUARD', 'web')],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
||||
@@ -34,13 +34,13 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'mailgun' => [
|
||||
'mailgun' => [
|
||||
'domain' => env('MAILGUN_DOMAIN'),
|
||||
'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
|
||||
'secret' => env('MAILGUN_SECRET'),
|
||||
],
|
||||
|
||||
'ses' => [
|
||||
'ses' => [
|
||||
'key' => env('SES_KEY'),
|
||||
'secret' => env('SES_SECRET'),
|
||||
'region' => 'us-east-1',
|
||||
@@ -50,12 +50,12 @@ return [
|
||||
'secret' => env('SPARKPOST_SECRET'),
|
||||
],
|
||||
|
||||
'stripe' => [
|
||||
'stripe' => [
|
||||
'model' => FireflyIII\User::class,
|
||||
'key' => env('STRIPE_KEY'),
|
||||
'secret' => env('STRIPE_SECRET'),
|
||||
],
|
||||
'mandrill' => [
|
||||
'mandrill' => [
|
||||
'secret' => env('MANDRILL_SECRET'),
|
||||
],
|
||||
];
|
||||
|
||||
@@ -54,7 +54,7 @@ use TwigBridge\Extension\Loader\Globals;
|
||||
|
||||
// Configuration options for Twig.
|
||||
return [
|
||||
'twig' => [
|
||||
'twig' => [
|
||||
'extension' => 'twig',
|
||||
'environment' => [
|
||||
'debug' => env('APP_DEBUG', false),
|
||||
|
||||
@@ -40,7 +40,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'paths' => $paths,
|
||||
'paths' => $paths,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user