Skip to content

Firefly III: a personal finances manager

Update JS views

Sander Dorigo8a79bb7720ae
diff --git a/app/Helpers/Functions/helpers.php b/app/Helpers/Functions/helpers.php
index 5c31c21944..c4ea8d2952 100644
--- a/app/Helpers/Functions/helpers.php
+++ b/app/Helpers/Functions/helpers.php
@@ -26,6 +26,7 @@ use Carbon\Carbon;
use Carbon\CarbonInterface;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account;
+use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionJournalMeta;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\Facades\Amount;
@@ -205,6 +206,46 @@ if (!function_exists('string_is_equal')) {
}
}
+if(!function_exists('format_amount_by_code')) {
+ function format_amount_by_code(string $amount, string $code, ?bool $coloured = null): string {
+ $coloured ??= true;
+
+ try {
+ $currency = Amount::getTransactionCurrencyByCode($code);
+ } catch (FireflyException) {
+ Log::error(sprintf('Could not find currency with code "%s". Fallback to primary currency.', $code));
+ $currency = Amount::getPrimaryCurrency();
+ Log::error(sprintf('Fallback currency is "%s".', $currency->code));
+ }
+
+ return Amount::formatAnything($currency, $amount, $coloured);
+ }
+}
+
+if(!function_exists('format_amount_by_currency')) {
+ function format_amount_by_currency(TransactionCurrency $currency, string $amount, ?bool $coloured = null): string {
+ $coloured ??= true;
+
+ return Amount::formatAnything($currency, $amount, $coloured);
+ }
+}
+
+if(!function_exists('print_nice_filesize')) {
+ function print_nice_filesize (int $size): string {
+ // less than one GB, more than one MB
+ if ($size < (1024 * 1024 * 2014) && $size >= (1024 * 1024)) {
+ return round($size / (1024 * 1024), 2).' MB';
+ }
+
+ // less than one MB
+ if ($size < (1024 * 1024)) {
+ return round($size / 1024, 2).' KB';
+ }
+
+ return $size.' bytes';
+ }
+}
+
if(!function_exists('journal_has_meta')) {
function journal_has_meta(int $journalId, string $metaField): bool {
$count = DB::table('journal_meta')->where('name', $metaField)->where('transaction_journal_id', $journalId)->whereNull('deleted_at')->count();
diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php
index e7e2a83bea..025eafcb07 100644
--- a/app/Support/ExpandedForm.php
+++ b/app/Support/ExpandedForm.php
@@ -270,7 +270,7 @@ class ExpandedForm
}
try {
- $html = view('form.object_group', [
+ $html = view('form.object-group', [
'classes' => $classes,
'name' => $name,
'label' => $label,
diff --git a/resources/assets/v3/js/pages/accounts/index.js b/resources/assets/v3/js/pages/accounts/index.js
deleted file mode 100644
index 217ae6c5fb..0000000000
--- a/resources/assets/v3/js/pages/accounts/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dashboard.js
- * Copyright (c) 2026 [email protected]
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// CSS
-import '../../boot/bootstrap.js';
-import sidebar from '../../pages/shared/sidebar.js';
-import dates from '../shared/dates.js';
-
-let index = function () {
- return {
- foo2: 'bar2',
- init() {
- console.log('init op index xxx');
- }
- }
-};
-
-
-const comps = {
- index,
- sidebar,
- dates
-};
-
-function loadPage(comps) {
- console.log('loadPage');
- Object.keys(comps).forEach(comp => {
- let data = comps[comp]();
- Alpine.data(comp, () => data);
- console.log(comp);
- });
- Alpine.start();
-}
-
-// wait for load until bootstrapped event is received.
-document.addEventListener('firefly-iii-bootstrapped', () => {
- console.log('Loaded through event listener.');
- loadPage(comps);
-});
-// or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
- console.log('Loaded through window variable.');
- loadPage(comps);
-}
diff --git a/resources/assets/v3/js/pages/accounts/reconcile/index.js b/resources/assets/v3/js/pages/accounts/reconcile/index.js
deleted file mode 100644
index 12fac5c66f..0000000000
--- a/resources/assets/v3/js/pages/accounts/reconcile/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dashboard.js
- * Copyright (c) 2026 [email protected]
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// CSS
-import '../../../boot/bootstrap.js';
-import sidebar from '../../../pages/shared/sidebar.js';
-import dates from '../../shared/dates.js';
-
-let index = function () {
- return {
- foo2: 'bar2',
- init() {
- console.log('init op index');
- }
- }
-};
-
-
-const comps = {
- index,
- sidebar,
- dates
-};
-
-function loadPage(comps) {
- console.log('loadPage');
- Object.keys(comps).forEach(comp => {
- let data = comps[comp]();
- Alpine.data(comp, () => data);
- console.log(comp);
- });
- Alpine.start();
-}
-
-// wait for load until bootstrapped event is received.
-document.addEventListener('firefly-iii-bootstrapped', () => {
- console.log('Loaded through event listener.');
- loadPage(comps);
-});
-// or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
- console.log('Loaded through window variable.');
- loadPage(comps);
-}
diff --git a/resources/assets/v3/js/pages/accounts/show.js b/resources/assets/v3/js/pages/accounts/show.js
deleted file mode 100644
index afa0c9463d..0000000000
--- a/resources/assets/v3/js/pages/accounts/show.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dashboard.js
- * Copyright (c) 2026 [email protected]
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// CSS
-import '../../boot/bootstrap.js';
-import sidebar from '../../pages/shared/sidebar.js';
-import dates from '../shared/dates.js';
-
-let index = function () {
- return {
- foo2: 'bar2',
- init() {
- console.log('init op show');
- }
- }
-};
-
-
-const comps = {
- index,
- sidebar,
- dates
-};
-
-function loadPage(comps) {
- console.log('loadPage');
- Object.keys(comps).forEach(comp => {
- let data = comps[comp]();
- Alpine.data(comp, () => data);
- console.log(comp);
- });
- Alpine.start();
-}
-
-// wait for load until bootstrapped event is received.
-document.addEventListener('firefly-iii-bootstrapped', () => {
- console.log('Loaded through event listener.');
- loadPage(comps);
-});
-// or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
- console.log('Loaded through window variable.');
- loadPage(comps);
-}
diff --git a/resources/assets/v3/js/pages/auth/auth.js b/resources/assets/v3/js/pages/auth/auth.js
deleted file mode 100644
index b52fae3398..0000000000
--- a/resources/assets/v3/js/pages/auth/auth.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * auth.js
- * Copyright (c) 2026 [email protected]
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-import '../../boot/bootstrap.js';
diff --git a/resources/assets/v3/js/pages/budgets/index.js b/resources/assets/v3/js/pages/budgets/index.js
deleted file mode 100644
index 217ae6c5fb..0000000000
--- a/resources/assets/v3/js/pages/budgets/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dashboard.js
- * Copyright (c) 2026 [email protected]
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// CSS
-import '../../boot/bootstrap.js';
-import sidebar from '../../pages/shared/sidebar.js';
-import dates from '../shared/dates.js';
-
-let index = function () {
- return {
- foo2: 'bar2',
- init() {
- console.log('init op index xxx');
- }
- }
-};
-
-
-const comps = {
- index,
- sidebar,
- dates
-};
-
-function loadPage(comps) {
- console.log('loadPage');
- Object.keys(comps).forEach(comp => {
- let data = comps[comp]();
- Alpine.data(comp, () => data);
- console.log(comp);
- });
- Alpine.start();
-}
-
-// wait for load until bootstrapped event is received.
-document.addEventListener('firefly-iii-bootstrapped', () => {
- console.log('Loaded through event listener.');
- loadPage(comps);
-});
-// or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
- console.log('Loaded through window variable.');
- loadPage(comps);
-}
diff --git a/resources/assets/v3/js/pages/categories/index.js b/resources/assets/v3/js/pages/categories/index.js
deleted file mode 100644
index 217ae6c5fb..0000000000
--- a/resources/assets/v3/js/pages/categories/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dashboard.js
- * Copyright (c) 2026 [email protected]
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// CSS
-import '../../boot/bootstrap.js';
-import sidebar from '../../pages/shared/sidebar.js';
-import dates from '../shared/dates.js';
-
-let index = function () {
- return {
- foo2: 'bar2',
- init() {
- console.log('init op index xxx');
- }
- }
-};
-
-
-const comps = {
- index,
- sidebar,
- dates
-};
-
-function loadPage(comps) {
- console.log('loadPage');
- Object.keys(comps).forEach(comp => {
- let data = comps[comp]();
- Alpine.data(comp, () => data);
- console.log(comp);
- });
- Alpine.start();
-}
-
-// wait for load until bootstrapped event is received.
-document.addEventListener('firefly-iii-bootstrapped', () => {
- console.log('Loaded through event listener.');
- loadPage(comps);
-});
-// or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
- console.log('Loaded through window variable.');
- loadPage(comps);
-}
diff --git a/resources/assets/v3/js/pages/currencies/index.js b/resources/assets/v3/js/pages/currencies/index.js
deleted file mode 100644
index 217ae6c5fb..0000000000
--- a/resources/assets/v3/js/pages/currencies/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dashboard.js
- * Copyright (c) 2026 [email protected]
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// CSS
-import '../../boot/bootstrap.js';
-import sidebar from '../../pages/shared/sidebar.js';
-import dates from '../shared/dates.js';
-
-let index = function () {
- return {
- foo2: 'bar2',
- init() {
- console.log('init op index xxx');
- }
- }
-};
-
-
-const comps = {
- index,
- sidebar,
- dates
-};
-
-function loadPage(comps) {
- console.log('loadPage');
- Object.keys(comps).forEach(comp => {
- let data = comps[comp]();
- Alpine.data(comp, () => data);
- console.log(comp);
- });
- Alpine.start();
-}
-
-// wait for load until bootstrapped event is received.
-document.addEventListener('firefly-iii-bootstrapped', () => {
- console.log('Loaded through event listener.');
- loadPage(comps);
-});
-// or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
- console.log('Loaded through window variable.');
- loadPage(comps);
-}
diff --git a/resources/assets/v3/js/pages/dashboard/dashboard.js b/resources/assets/v3/js/pages/dashboard/dashboard.js
index ccc208e34e..4d2f8262ae 100644
--- a/resources/assets/v3/js/pages/dashboard/dashboard.js
+++ b/resources/assets/v3/js/pages/dashboard/dashboard.js
@@ -27,9 +27,8 @@ import boxes from './boxes.js';
let index = function () {
return {
- foo2: 'bar2',
init() {
- //console.log('init op index xxx');
+ console.log('Dashboard');
}
}
};
diff --git a/resources/assets/v3/js/pages/export/index.js b/resources/assets/v3/js/pages/export/index.js
deleted file mode 100644
index 6555101478..0000000000
--- a/resources/assets/v3/js/pages/export/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dashboard.js
- * Copyright (c) 2026 [email protected]
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// CSS
-import '../../boot/bootstrap.js';
-import sidebar from '../../pages/shared/sidebar.js';
-import dates from '../shared/dates.js';
-
-let index = function () {
- return {
- foo2: 'bar2',
- init() {
- // console.log('init op index xxx');
- }
- }
-};
-
-
-const comps = {
- index,
- sidebar,
- dates
-};
-
-function loadPage(comps) {
- console.log('loadPage');
- Object.keys(comps).forEach(comp => {
- let data = comps[comp]();
- Alpine.data(comp, () => data);
- console.log(comp);
- });
- Alpine.start();
-}
-
-// wait for load until bootstrapped event is received.
-document.addEventListener('firefly-iii-bootstrapped', () => {
- console.log('Loaded through event listener.');
- loadPage(comps);
-});
-// or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
- console.log('Loaded through window variable.');
- loadPage(comps);
-}
diff --git a/resources/assets/v3/js/pages/subscriptions/create.js b/resources/assets/v3/js/pages/generic.js
similarity index 88%
rename from resources/assets/v3/js/pages/subscriptions/create.js
rename to resources/assets/v3/js/pages/generic.js
index dc39b3511b..cad2a829fc 100644
--- a/resources/assets/v3/js/pages/subscriptions/create.js
+++ b/resources/assets/v3/js/pages/generic.js
@@ -19,15 +19,14 @@
*/
// CSS
-import '../../boot/bootstrap.js';
-import sidebar from '../../pages/shared/sidebar.js';
-import dates from '../shared/dates.js';
+import '../boot/bootstrap.js';
+import sidebar from '../pages/shared/sidebar.js';
+import dates from './shared/dates.js';
let index = function () {
return {
- foo2: 'bar2',
init() {
- console.log('init op edit');
+ console.log('Generic JS for page with few features.');
}
}
};
diff --git a/resources/assets/v3/js/pages/object-groups/index.js b/resources/assets/v3/js/pages/object-groups/index.js
deleted file mode 100644
index 217ae6c5fb..0000000000
--- a/resources/assets/v3/js/pages/object-groups/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dashboard.js
- * Copyright (c) 2026 [email protected]
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// CSS
-import '../../boot/bootstrap.js';
-import sidebar from '../../pages/shared/sidebar.js';
-import dates from '../shared/dates.js';
-
-let index = function () {
- return {
- foo2: 'bar2',
- init() {
- console.log('init op index xxx');
- }
- }
-};
-
-
-const comps = {
- index,
- sidebar,
- dates
-};
-
-function loadPage(comps) {
- console.log('loadPage');
- Object.keys(comps).forEach(comp => {
- let data = comps[comp]();
- Alpine.data(comp, () => data);
- console.log(comp);
- });
- Alpine.start();
-}
-
-// wait for load until bootstrapped event is received.
-document.addEventListener('firefly-iii-bootstrapped', () => {
- console.log('Loaded through event listener.');
- loadPage(comps);
-});
-// or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
- console.log('Loaded through window variable.');
- loadPage(comps);
-}
diff --git a/resources/assets/v3/js/pages/piggy-banks/index.js b/resources/assets/v3/js/pages/piggy-banks/index.js
deleted file mode 100644
index 217ae6c5fb..0000000000
--- a/resources/assets/v3/js/pages/piggy-banks/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dashboard.js
- * Copyright (c) 2026 [email protected]
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// CSS
-import '../../boot/bootstrap.js';
-import sidebar from '../../pages/shared/sidebar.js';
-import dates from '../shared/dates.js';
-
-let index = function () {
- return {
- foo2: 'bar2',
- init() {
- console.log('init op index xxx');
- }
- }
-};
-
-
-const comps = {
- index,
- sidebar,
- dates
-};
-
-function loadPage(comps) {
- console.log('loadPage');
- Object.keys(comps).forEach(comp => {
- let data = comps[comp]();
- Alpine.data(comp, () => data);
- console.log(comp);
- });
- Alpine.start();
-}
-
-// wait for load until bootstrapped event is received.
-document.addEventListener('firefly-iii-bootstrapped', () => {
- console.log('Loaded through event listener.');
- loadPage(comps);
-});
-// or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
- console.log('Loaded through window variable.');
- loadPage(comps);
-}
diff --git a/resources/assets/v3/js/pages/recurring/index.js b/resources/assets/v3/js/pages/recurring/index.js
deleted file mode 100644
index 217ae6c5fb..0000000000
--- a/resources/assets/v3/js/pages/recurring/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dashboard.js
- * Copyright (c) 2026 [email protected]
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// CSS
-import '../../boot/bootstrap.js';
-import sidebar from '../../pages/shared/sidebar.js';
-import dates from '../shared/dates.js';
-
-let index = function () {
- return {
- foo2: 'bar2',
- init() {
- console.log('init op index xxx');
- }
- }
-};
-
-
-const comps = {
- index,
- sidebar,
- dates
-};
-
-function loadPage(comps) {
- console.log('loadPage');
- Object.keys(comps).forEach(comp => {
- let data = comps[comp]();
- Alpine.data(comp, () => data);
- console.log(comp);
- });
- Alpine.start();
-}
-
-// wait for load until bootstrapped event is received.
-document.addEventListener('firefly-iii-bootstrapped', () => {
- console.log('Loaded through event listener.');
- loadPage(comps);
-});
-// or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
- console.log('Loaded through window variable.');
- loadPage(comps);
-}
diff --git a/resources/assets/v3/js/pages/rules/index.js b/resources/assets/v3/js/pages/rules/index.js
deleted file mode 100644
index 217ae6c5fb..0000000000
--- a/resources/assets/v3/js/pages/rules/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dashboard.js
- * Copyright (c) 2026 [email protected]
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// CSS
-import '../../boot/bootstrap.js';
-import sidebar from '../../pages/shared/sidebar.js';
-import dates from '../shared/dates.js';
-
-let index = function () {
- return {
- foo2: 'bar2',
- init() {
- console.log('init op index xxx');
- }
- }
-};
-
-
-const comps = {
- index,
- sidebar,
- dates
-};
-
-function loadPage(comps) {
- console.log('loadPage');
- Object.keys(comps).forEach(comp => {
- let data = comps[comp]();
- Alpine.data(comp, () => data);
- console.log(comp);
- });
- Alpine.start();
-}
-
-// wait for load until bootstrapped event is received.
-document.addEventListener('firefly-iii-bootstrapped', () => {
- console.log('Loaded through event listener.');
- loadPage(comps);
-});
-// or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
- console.log('Loaded through window variable.');
- loadPage(comps);
-}
diff --git a/resources/assets/v3/js/pages/subscriptions/delete.js b/resources/assets/v3/js/pages/subscriptions/delete.js
deleted file mode 100644
index dc39b3511b..0000000000
--- a/resources/assets/v3/js/pages/subscriptions/delete.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dashboard.js
- * Copyright (c) 2026 [email protected]
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// CSS
-import '../../boot/bootstrap.js';
-import sidebar from '../../pages/shared/sidebar.js';
-import dates from '../shared/dates.js';
-
-let index = function () {
- return {
- foo2: 'bar2',
- init() {
- console.log('init op edit');
- }
- }
-};
-
-
-const comps = {
- index,
- sidebar,
- dates
-};
-
-function loadPage(comps) {
- console.log('loadPage');
- Object.keys(comps).forEach(comp => {
- let data = comps[comp]();
- Alpine.data(comp, () => data);
- console.log(comp);
- });
- Alpine.start();
-}
-
-// wait for load until bootstrapped event is received.
-document.addEventListener('firefly-iii-bootstrapped', () => {
- console.log('Loaded through event listener.');
- loadPage(comps);
-});
-// or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
- console.log('Loaded through window variable.');
- loadPage(comps);
-}
diff --git a/resources/assets/v3/js/pages/subscriptions/edit.js b/resources/assets/v3/js/pages/subscriptions/edit.js
deleted file mode 100644
index dc39b3511b..0000000000
--- a/resources/assets/v3/js/pages/subscriptions/edit.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dashboard.js
- * Copyright (c) 2026 [email protected]
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// CSS
-import '../../boot/bootstrap.js';
-import sidebar from '../../pages/shared/sidebar.js';
-import dates from '../shared/dates.js';
-
-let index = function () {
- return {
- foo2: 'bar2',
- init() {
- console.log('init op edit');
- }
- }
-};
-
-
-const comps = {
- index,
- sidebar,
- dates
-};
-
-function loadPage(comps) {
- console.log('loadPage');
- Object.keys(comps).forEach(comp => {
- let data = comps[comp]();
- Alpine.data(comp, () => data);
- console.log(comp);
- });
- Alpine.start();
-}
-
-// wait for load until bootstrapped event is received.
-document.addEventListener('firefly-iii-bootstrapped', () => {
- console.log('Loaded through event listener.');
- loadPage(comps);
-});
-// or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
- console.log('Loaded through window variable.');
- loadPage(comps);
-}
diff --git a/resources/assets/v3/js/pages/subscriptions/index.js b/resources/assets/v3/js/pages/subscriptions/index.js
deleted file mode 100644
index 217ae6c5fb..0000000000
--- a/resources/assets/v3/js/pages/subscriptions/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dashboard.js
- * Copyright (c) 2026 [email protected]
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// CSS
-import '../../boot/bootstrap.js';
-import sidebar from '../../pages/shared/sidebar.js';
-import dates from '../shared/dates.js';
-
-let index = function () {
- return {
- foo2: 'bar2',
- init() {
- console.log('init op index xxx');
- }
- }
-};
-
-
-const comps = {
- index,
- sidebar,
- dates
-};
-
-function loadPage(comps) {
- console.log('loadPage');
- Object.keys(comps).forEach(comp => {
- let data = comps[comp]();
- Alpine.data(comp, () => data);
- console.log(comp);
- });
- Alpine.start();
-}
-
-// wait for load until bootstrapped event is received.
-document.addEventListener('firefly-iii-bootstrapped', () => {
- console.log('Loaded through event listener.');
- loadPage(comps);
-});
-// or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
- console.log('Loaded through window variable.');
- loadPage(comps);
-}
diff --git a/resources/assets/v3/js/pages/subscriptions/show.js b/resources/assets/v3/js/pages/subscriptions/show.js
deleted file mode 100644
index dc39b3511b..0000000000
--- a/resources/assets/v3/js/pages/subscriptions/show.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dashboard.js
- * Copyright (c) 2026 [email protected]
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// CSS
-import '../../boot/bootstrap.js';
-import sidebar from '../../pages/shared/sidebar.js';
-import dates from '../shared/dates.js';
-
-let index = function () {
- return {
- foo2: 'bar2',
- init() {
- console.log('init op edit');
- }
- }
-};
-
-
-const comps = {
- index,
- sidebar,
- dates
-};
-
-function loadPage(comps) {
- console.log('loadPage');
- Object.keys(comps).forEach(comp => {
- let data = comps[comp]();
- Alpine.data(comp, () => data);
- console.log(comp);
- });
- Alpine.start();
-}
-
-// wait for load until bootstrapped event is received.
-document.addEventListener('firefly-iii-bootstrapped', () => {
- console.log('Loaded through event listener.');
- loadPage(comps);
-});
-// or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
- console.log('Loaded through window variable.');
- loadPage(comps);
-}
diff --git a/resources/assets/v3/js/pages/tags/index.js b/resources/assets/v3/js/pages/tags/index.js
deleted file mode 100644
index 217ae6c5fb..0000000000
--- a/resources/assets/v3/js/pages/tags/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dashboard.js
- * Copyright (c) 2026 [email protected]
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// CSS
-import '../../boot/bootstrap.js';
-import sidebar from '../../pages/shared/sidebar.js';
-import dates from '../shared/dates.js';
-
-let index = function () {
- return {
- foo2: 'bar2',
- init() {
- console.log('init op index xxx');
- }
- }
-};
-
-
-const comps = {
- index,
- sidebar,
- dates
-};
-
-function loadPage(comps) {
- console.log('loadPage');
- Object.keys(comps).forEach(comp => {
- let data = comps[comp]();
- Alpine.data(comp, () => data);
- console.log(comp);
- });
- Alpine.start();
-}
-
-// wait for load until bootstrapped event is received.
-document.addEventListener('firefly-iii-bootstrapped', () => {
- console.log('Loaded through event listener.');
- loadPage(comps);
-});
-// or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
- console.log('Loaded through window variable.');
- loadPage(comps);
-}
diff --git a/resources/assets/v3/js/pages/transactions/index.js b/resources/assets/v3/js/pages/transactions/index.js
deleted file mode 100644
index 217ae6c5fb..0000000000
--- a/resources/assets/v3/js/pages/transactions/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dashboard.js
- * Copyright (c) 2026 [email protected]
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// CSS
-import '../../boot/bootstrap.js';
-import sidebar from '../../pages/shared/sidebar.js';
-import dates from '../shared/dates.js';
-
-let index = function () {
- return {
- foo2: 'bar2',
- init() {
- console.log('init op index xxx');
- }
- }
-};
-
-
-const comps = {
- index,
- sidebar,
- dates
-};
-
-function loadPage(comps) {
- console.log('loadPage');
- Object.keys(comps).forEach(comp => {
- let data = comps[comp]();
- Alpine.data(comp, () => data);
- console.log(comp);
- });
- Alpine.start();
-}
-
-// wait for load until bootstrapped event is received.
-document.addEventListener('firefly-iii-bootstrapped', () => {
- console.log('Loaded through event listener.');
- loadPage(comps);
-});
-// or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
- console.log('Loaded through window variable.');
- loadPage(comps);
-}
diff --git a/resources/assets/v3/js/pages/transactions/show.js b/resources/assets/v3/js/pages/transactions/show.js
deleted file mode 100644
index afa0c9463d..0000000000
--- a/resources/assets/v3/js/pages/transactions/show.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * dashboard.js
- * Copyright (c) 2026 [email protected]
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// CSS
-import '../../boot/bootstrap.js';
-import sidebar from '../../pages/shared/sidebar.js';
-import dates from '../shared/dates.js';
-
-let index = function () {
- return {
- foo2: 'bar2',
- init() {
- console.log('init op show');
- }
- }
-};
-
-
-const comps = {
- index,
- sidebar,
- dates
-};
-
-function loadPage(comps) {
- console.log('loadPage');
- Object.keys(comps).forEach(comp => {
- let data = comps[comp]();
- Alpine.data(comp, () => data);
- console.log(comp);
- });
- Alpine.start();
-}
-
-// wait for load until bootstrapped event is received.
-document.addEventListener('firefly-iii-bootstrapped', () => {
- console.log('Loaded through event listener.');
- loadPage(comps);
-});
-// or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
- console.log('Loaded through window variable.');
- loadPage(comps);
-}
diff --git a/resources/assets/v3/vite.config.js b/resources/assets/v3/vite.config.js
index 1d24eea20f..328c4bf991 100644
--- a/resources/assets/v3/vite.config.js
+++ b/resources/assets/v3/vite.config.js
@@ -40,67 +40,48 @@ export default defineConfig(({command, mode, isSsrBuild, isPreview}) => {
// CSS for entire app
'sass/app.scss',
- // auth pages (login etc)
- 'js/pages/auth/auth.js',
-
// dashboard
'js/pages/dashboard/boxes.js',
'js/pages/dashboard/dashboard.js',
+ // generic
+ 'js/pages/generic.js',
+
// accounts
- 'js/pages/accounts/index.js',
- 'js/pages/accounts/show.js',
- 'js/pages/accounts/reconcile/index.js',
// administrations
'js/pages/administrations/index.js',
'js/pages/administrations/edit.js',
// categories
- 'js/pages/categories/index.js',
// budgets
- 'js/pages/budgets/index.js',
// exchange rates
'js/pages/exchange-rates/index.js',
// export
- 'js/pages/export/index.js',
// object groups
- 'js/pages/object-groups/index.js',
// rules
- 'js/pages/rules/index.js',
// recurring transactions
- 'js/pages/recurring/index.js',
// subscriptions
- 'js/pages/subscriptions/index.js',
- 'js/pages/subscriptions/create.js',
- 'js/pages/subscriptions/edit.js',
- 'js/pages/subscriptions/show.js',
- 'js/pages/subscriptions/delete.js',
// transaction currencies
- 'js/pages/currencies/index.js',
// transactions
- 'js/pages/transactions/index.js',
'js/pages/transactions/create.js',
'js/pages/transactions/edit.js',
- 'js/pages/transactions/show.js',
// tags
- 'js/pages/tags/index.js',
// webhooks
'js/pages/webhooks/index.js',
// piggy banks
- 'js/pages/piggy-banks/index.js',
],
buildDirectory: '../../../../public/build',
// publicDirectory: '../../../public',
diff --git a/resources/views/accounts/index.blade.php b/resources/views/accounts/index.blade.php
index e36a84ed0d..263033d68b 100644
--- a/resources/views/accounts/index.blade.php
+++ b/resources/views/accounts/index.blade.php
@@ -54,7 +54,7 @@
@endsection
@section('scripts')
- @vite(['js/pages/accounts/index.js'])
+ @vite(['js/pages/generic.js'])
<script type="text/javascript" nonce="{{ $JS_NONCE }}">
var objectType = '{{ e($objectType) }}';
</script>
diff --git a/resources/views/accounts/reconcile/index.blade.php b/resources/views/accounts/reconcile/index.blade.php
index faa6efde42..ae3584549d 100644
--- a/resources/views/accounts/reconcile/index.blade.php
+++ b/resources/views/accounts/reconcile/index.blade.php
@@ -117,7 +117,7 @@
@endsection
@section('scripts')
- @vite(['js/pages/accounts/reconcile/index.js'])
+ @vite(['js/pages/generic.js'])
<script type="text/javascript" nonce="{{ $JS_NONCE }}">
currencySymbol = "{{ $currency->symbol }}";
diff --git a/resources/views/accounts/show.blade.php b/resources/views/accounts/show.blade.php
index b82715f82e..64ed58e0e0 100644
--- a/resources/views/accounts/show.blade.php
+++ b/resources/views/accounts/show.blade.php
@@ -199,7 +199,7 @@
@endsection
@section('scripts')
- @vite(['js/pages/accounts/show.js'])
+ @vite(['js/pages/generic.js'])
<script type="text/javascript" nonce="{{ $JS_NONCE }}">
// location stuff
@if($location)
diff --git a/resources/views/bills/create.blade.php b/resources/views/bills/create.blade.php
index beeee1c8ba..99035abf84 100644
--- a/resources/views/bills/create.blade.php
+++ b/resources/views/bills/create.blade.php
@@ -68,7 +68,7 @@
<link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ $FF_BUILD_TIME }}" type="text/css" rel="stylesheet" media="all" nonce="{{ $JS_NONCE }}">
@endsection
@section('scripts')
- @vite(['js/pages/subscriptions/create.js'])
+ @vite(['js/pages/generic.js'])
<script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
diff --git a/resources/views/bills/delete.blade.php b/resources/views/bills/delete.blade.php
index 91e4360c47..d7b102d0da 100644
--- a/resources/views/bills/delete.blade.php
+++ b/resources/views/bills/delete.blade.php
@@ -35,5 +35,5 @@
</form>
@endsection
@section('scripts')
- @vite(['js/pages/subscriptions/delete.js'])
+ @vite(['js/pages/generic.js'])
@endsection
diff --git a/resources/views/bills/edit.blade.php b/resources/views/bills/edit.blade.php
index c25e73ab62..884a6a274d 100644
--- a/resources/views/bills/edit.blade.php
+++ b/resources/views/bills/edit.blade.php
@@ -76,7 +76,7 @@
media="all" nonce="{{ $JS_NONCE }}">
@endsection
@section('scripts')
- @vite(['js/pages/subscriptions/edit.js'])
+ @vite(['js/pages/generic.js'])
<script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ $FF_BUILD_TIME }}"
nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ $FF_BUILD_TIME }}"
diff --git a/resources/views/bills/index.blade.php b/resources/views/bills/index.blade.php
index 216a6e2283..29475dcef1 100644
--- a/resources/views/bills/index.blade.php
+++ b/resources/views/bills/index.blade.php
@@ -21,7 +21,7 @@
@endif
@endsection
@section('scripts')
- @vite(['js/pages/subscriptions/index.js'])
+ @vite(['js/pages/generic.js'])
<script src="v1/js/lib/jquery-ui.min.js?v={{ $FF_BUILD_TIME }}" type="text/javascript" nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/ff/bills/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
@endsection
diff --git a/resources/views/bills/show.blade.php b/resources/views/bills/show.blade.php
index cf0403a79a..b89801133c 100644
--- a/resources/views/bills/show.blade.php
+++ b/resources/views/bills/show.blade.php
@@ -181,7 +181,7 @@
@endsection
@section('scripts')
- @vite(['js/pages/subscriptions/show.js'])
+ @vite(['js/pages/generic.js'])
<script type="text/javascript" nonce="{{ $JS_NONCE }}">
var billCurrencySymbol = "{{ $convertToPrimary ? $primaryCurrency->symbol : $object['data']['currency']['symbol'] }}";
var billUrl = '{{ route('chart.bill.single', [$object['data']['id']]) }}';
diff --git a/resources/views/budgets/index.blade.php b/resources/views/budgets/index.blade.php
index 5b60433896..b3c8e4b677 100644
--- a/resources/views/budgets/index.blade.php
+++ b/resources/views/budgets/index.blade.php
@@ -436,7 +436,7 @@
@endsection
@section('scripts')
- @vite(['js/pages/budgets/index.js'])
+ @vite(['js/pages/generic.js'])
<script src="v1/js/lib/jquery-ui.min.js?v={{ $FF_BUILD_TIME }}" type="text/javascript" nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" nonce="{{ $JS_NONCE }}">
diff --git a/resources/views/categories/index.blade.php b/resources/views/categories/index.blade.php
index 31bfb1581f..1269f68ab8 100644
--- a/resources/views/categories/index.blade.php
+++ b/resources/views/categories/index.blade.php
@@ -28,7 +28,7 @@
@endsection
@section('scripts')
- @vite(['js/pages/categories/index.js'])
+ @vite(['js/pages/generic.js'])
<script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/ff/categories/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
@endsection
diff --git a/resources/views/currencies/index.blade.php b/resources/views/currencies/index.blade.php
index bf51488c64..e937365dea 100644
--- a/resources/views/currencies/index.blade.php
+++ b/resources/views/currencies/index.blade.php
@@ -76,7 +76,7 @@
</div>
@endsection
@section('scripts')
- @vite(['js/pages/currencies/index.js'])
+ @vite(['js/pages/generic.js'])
<script type="text/javascript" nonce="{{ $JS_NONCE }}">
var redirectUrl = "{{ route('currencies.index') }}";
var updateCurrencyUrl = "{{ route('api.v1.currencies.update', ['']) }}";
diff --git a/resources/views/export/index.blade.php b/resources/views/export/index.blade.php
index 324013c5fd..2acc153a1c 100644
--- a/resources/views/export/index.blade.php
+++ b/resources/views/export/index.blade.php
@@ -30,5 +30,5 @@
@endsection
@section('scripts')
- @vite(['js/pages/export/index.js'])
+ @vite(['js/pages/generic.js'])
@endsection
diff --git a/resources/views/layout/v3/auth.blade.php b/resources/views/layout/v3/auth.blade.php
index d982973635..0772ba36e0 100644
--- a/resources/views/layout/v3/auth.blade.php
+++ b/resources/views/layout/v3/auth.blade.php
@@ -35,7 +35,7 @@
</div>
@yield('content')
</div>
-@vite(['js/pages/auth/auth.js'])
+@vite(['js/pages/generic.js'])
@yield('scripts')
</body>
diff --git a/resources/views/layout/v3/blank.blade.php b/resources/views/layout/v3/blank.blade.php
index 2af6446d13..e64eedb156 100644
--- a/resources/views/layout/v3/blank.blade.php
+++ b/resources/views/layout/v3/blank.blade.php
@@ -42,7 +42,7 @@
</div>
</div>
</main>
-@vite(['js/pages/auth/auth.js'])
+@vite(['js/pages/generic.js'])
</body>
</html>
diff --git a/resources/views/object-groups/index.blade.php b/resources/views/object-groups/index.blade.php
index 0d0699cd06..c4e5a3ad46 100644
--- a/resources/views/object-groups/index.blade.php
+++ b/resources/views/object-groups/index.blade.php
@@ -56,7 +56,7 @@
@endif
@endsection
@section('scripts')
- @vite(['js/pages/object-groups/index.js'])
+ @vite(['js/pages/generic.js'])
<script src="v1/js/lib/jquery-ui.min.js?v={{ $FF_BUILD_TIME }}" type="text/javascript" nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/ff/object-groups/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
@endsection
diff --git a/resources/views/piggy-banks/index.blade.php b/resources/views/piggy-banks/index.blade.php
index 269a74b8c8..5b9fff7ee4 100644
--- a/resources/views/piggy-banks/index.blade.php
+++ b/resources/views/piggy-banks/index.blade.php
@@ -64,7 +64,7 @@
@endif
@endsection
@section('scripts')
- @vite(['js/pages/piggy-banks/index.js'])
+ @vite(['js/pages/generic.js'])
<script src="v1/js/lib/jquery-ui.min.js?v={{ $FF_BUILD_TIME }}" type="text/javascript" nonce="{{ $JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/ff/piggy-banks/index.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
@endsection
diff --git a/resources/views/recurring/index.blade.php b/resources/views/recurring/index.blade.php
index 6bc3284d95..8ee93bbc46 100644
--- a/resources/views/recurring/index.blade.php
+++ b/resources/views/recurring/index.blade.php
@@ -138,6 +138,6 @@
@endsection
@section('scripts')
- @vite(['js/pages/recurring/index.js'])
+ @vite(['js/pages/generic.js'])
<script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
@endsection
diff --git a/resources/views/reports/index.blade.php b/resources/views/reports/index.blade.php
index a82c7461c3..064cebab7a 100644
--- a/resources/views/reports/index.blade.php
+++ b/resources/views/reports/index.blade.php
@@ -178,7 +178,7 @@
@endsection
@section('scripts')
- @vite(['js/pages/object-groups/index.js'])
+ @vite(['js/pages/generic.js'])
<script type="text/javascript" nonce="{{ $JS_NONCE }}">
var minDate = "{{ $start->format('Y-m-d') }}";
var picker;
diff --git a/resources/views/rules/index.blade.php b/resources/views/rules/index.blade.php
index de7ea23d12..447ea79c09 100644
--- a/resources/views/rules/index.blade.php
+++ b/resources/views/rules/index.blade.php
@@ -178,7 +178,7 @@ $shownDemo = true
@endsection
@section('scripts')
- @vite(['js/pages/rules/index.js'])
+ @vite(['js/pages/generic.js'])
<script type="text/javascript" nonce="{{ $JS_NONCE }}">
var moveRuleGroupUrl = '{{ route('rule-groups.move') }}';
var duplicateRuleUrl = '{{ route('rules.duplicate') }}';
diff --git a/resources/views/tags/index.blade.php b/resources/views/tags/index.blade.php
index 5951145fee..ec642f4802 100644
--- a/resources/views/tags/index.blade.php
+++ b/resources/views/tags/index.blade.php
@@ -46,7 +46,7 @@
@endsection
@section('scripts')
- @vite(['js/pages/tags/index.js'])
+ @vite(['js/pages/generic.js'])
<script nonce="{{ $JS_NONCE }}">
var confirmText = '{{ e(__('firefly.are_you_sure')) }}';
</script>
diff --git a/resources/views/transactions/index.blade.php b/resources/views/transactions/index.blade.php
index 25ae04f237..e5e7b36671 100644
--- a/resources/views/transactions/index.blade.php
+++ b/resources/views/transactions/index.blade.php
@@ -105,7 +105,7 @@
@endsection
@section('scripts')
- @vite(['js/pages/transactions/index.js'])
+ @vite(['js/pages/generic.js'])
{{-- required for groups.twig --}}
<script type="text/javascript" nonce="{{ $JS_NONCE }}">
var showAll = @if(count($periods) > 0) false @else true @endif;