Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Not all views need the date dropdown.
James Cole30c57eb2d70f
diff --git a/resources/assets/v3/js/pages/generic-nodates.js b/resources/assets/v3/js/pages/generic-nodates.jsnew file mode 100644index 0000000000..d8a4971ef9--- /dev/null+++ b/resources/assets/v3/js/pages/generic-nodates.js@@ -0,0 +1,66 @@+/*+ * 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/>.+ */++import '../boot/bootstrap.js';+import sidebar from '../pages/shared/sidebar.js';+import dates from './shared/dates.js';++window.enableDates = false;++let index = function () {+ return {+ init() {+ (function() {+ let list = document.querySelectorAll('div.app-content form input[type="text"]:enabled');+ if (list.length > 0) {+ list[0].focus();+ }+ })();+ }+ }+};+++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/generic.js b/resources/assets/v3/js/pages/generic.jsindex 7a803f7fe8..92fe56adfe 100644--- a/resources/assets/v3/js/pages/generic.js+++ b/resources/assets/v3/js/pages/generic.js@@ -22,6 +22,8 @@ import '../boot/bootstrap.js';import sidebar from '../pages/shared/sidebar.js';import dates from './shared/dates.js';+window.enableDates = true;+let index = function () {return {init() {diff --git a/resources/assets/v3/js/pages/shared/dates.js b/resources/assets/v3/js/pages/shared/dates.jsindex 474727be44..1a28c8ad36 100644--- a/resources/assets/v3/js/pages/shared/dates.js+++ b/resources/assets/v3/js/pages/shared/dates.js@@ -43,7 +43,7 @@ export default () => ({start: null, end: null},submitForm() {- console.log('submitForm', format(window.store.get('start'), 'yyyy-MM-dd'), format(window.store.get('end'), 'yyyy-MM-dd'));+ // console.log('submitForm', format(window.store.get('start'), 'yyyy-MM-dd'), format(window.store.get('end'), 'yyyy-MM-dd'));// save form and submit for v1.document.getElementById('customStart').value = format(window.store.get('start'), 'yyyy-MM-dd');document.getElementById('customEnd').value = format(window.store.get('end'), 'yyyy-MM-dd');@@ -52,6 +52,11 @@ export default () => ({language: 'en_US',init() {+ if(false === window.enableDates) {+ console.log('Date selection is disabled on this page.');+ document.getElementById('date-dropdown').style.display = 'none';+ }+let end = new Date(window.store.get('end'));let start = new Date(window.store.get('start'));this.range = {diff --git a/resources/assets/v3/js/pages/shared/sidebar.js b/resources/assets/v3/js/pages/shared/sidebar.jsindex 18d7ab0ff5..1a9b3607f8 100644--- a/resources/assets/v3/js/pages/shared/sidebar.js+++ b/resources/assets/v3/js/pages/shared/sidebar.js@@ -21,11 +21,10 @@export default () => ({foo: 'bar',init() {- //console.log('init op sidebar')+ //console.log('init on sidebar')},logoutUser(e) {e.preventDefault();document.getElementById('logout-form').submit();- console.log('Logout user');}});diff --git a/resources/assets/v3/js/pages/transactions/bulk-edit.js b/resources/assets/v3/js/pages/transactions/bulk-edit.jsindex 7567c40580..8659820d62 100644--- a/resources/assets/v3/js/pages/transactions/bulk-edit.js+++ b/resources/assets/v3/js/pages/transactions/bulk-edit.js@@ -26,6 +26,8 @@ import Tags from "bootstrap5-tags";import i18next from 'i18next';import {addAutocomplete} from "./shared/add-autocomplete.js";+window.enableDates = false;+let edit = function () {return {detectCategoryChange(e) {diff --git a/resources/assets/v3/js/pages/transactions/create.js b/resources/assets/v3/js/pages/transactions/create.jsindex d6b43186fe..d999ac0e5c 100644--- a/resources/assets/v3/js/pages/transactions/create.js+++ b/resources/assets/v3/js/pages/transactions/create.js@@ -65,6 +65,8 @@ import {autoStep} from "./shared/auto-step.js";import {respondToTabSwitch} from "./shared/respond-to-tab-switch.js";import {loadTransactionLinks} from './shared/load-transaction-links.js';+window.enableDates = false;+let create = function () {return {// needed for translations.diff --git a/resources/assets/v3/js/pages/transactions/edit.js b/resources/assets/v3/js/pages/transactions/edit.jsindex 099bec79f9..5a6056b5ea 100644--- a/resources/assets/v3/js/pages/transactions/edit.js+++ b/resources/assets/v3/js/pages/transactions/edit.js@@ -69,6 +69,7 @@ import {autoStep} from "./shared/auto-step.js";import {respondToTabSwitch} from "./shared/respond-to-tab-switch.js";const urls = getUrls();+window.enableDates = false;let transactions = function () {return {diff --git a/resources/assets/v3/js/pages/transactions/mass-edit.js b/resources/assets/v3/js/pages/transactions/mass-edit.jsindex 90cf27c053..bd1857e00d 100644--- a/resources/assets/v3/js/pages/transactions/mass-edit.js+++ b/resources/assets/v3/js/pages/transactions/mass-edit.js@@ -23,6 +23,8 @@ import sidebar from '../../pages/shared/sidebar.js';import dates from '../shared/dates.js';import {addAutocomplete} from "./shared/add-autocomplete.js";+window.enableDates = false;+let edit = function () {return {init() {diff --git a/resources/assets/v3/js/pages/transactions/show.js b/resources/assets/v3/js/pages/transactions/show.jsindex c2c32cdc03..66700d4c7a 100644--- a/resources/assets/v3/js/pages/transactions/show.js+++ b/resources/assets/v3/js/pages/transactions/show.js@@ -25,6 +25,8 @@ import i18next from "i18next";import Get from '../../api/model/transaction/get.js';import {format} from "date-fns";+window.enableDates = false;+let show = function () {return {i18next: null,diff --git a/resources/assets/v3/js/pages/webhooks/create.js b/resources/assets/v3/js/pages/webhooks/create.jsindex 3a44318b89..91b51665d2 100644--- a/resources/assets/v3/js/pages/webhooks/create.js+++ b/resources/assets/v3/js/pages/webhooks/create.js@@ -26,6 +26,8 @@ import {loadDeliveries} from "./shared/load-deliveries.js";import {loadResponses} from "./shared/load-responses.js";import {loadTriggers} from "./shared/load-triggers.js";+window.enableDates = false;+let create = function () {return {error_message: '',diff --git a/resources/assets/v3/js/pages/webhooks/edit.js b/resources/assets/v3/js/pages/webhooks/edit.jsindex c0b4d6fc07..1ce7328fc1 100644--- a/resources/assets/v3/js/pages/webhooks/edit.js+++ b/resources/assets/v3/js/pages/webhooks/edit.js@@ -26,6 +26,7 @@ import {loadTriggers} from "./shared/load-triggers.js";import {loadResponses} from "./shared/load-responses.js";import {loadDeliveries} from "./shared/load-deliveries.js";+window.enableDates = false;let edit = function () {return {init() {diff --git a/resources/assets/v3/js/pages/webhooks/index.js b/resources/assets/v3/js/pages/webhooks/index.jsindex 9cec8a9119..fb1e7c5d83 100644--- a/resources/assets/v3/js/pages/webhooks/index.js+++ b/resources/assets/v3/js/pages/webhooks/index.js@@ -24,6 +24,7 @@ import sidebar from '../../pages/shared/sidebar.js';import dates from '../shared/dates.js';import i18next from "i18next";+window.enableDates = false;let index = function () {return {webhooks: [],diff --git a/resources/assets/v3/js/pages/webhooks/show.js b/resources/assets/v3/js/pages/webhooks/show.jsindex e4ce582410..2aa482910b 100644--- a/resources/assets/v3/js/pages/webhooks/show.js+++ b/resources/assets/v3/js/pages/webhooks/show.js@@ -24,6 +24,8 @@ import dates from '../shared/dates.js';import format from "date-fns/format";import i18next from "i18next";+window.enableDates = false;+let show = function () {return {i18next: null,diff --git a/resources/assets/v3/vite.config.js b/resources/assets/v3/vite.config.jsindex 56584580fc..a22b8ef924 100644--- a/resources/assets/v3/vite.config.js+++ b/resources/assets/v3/vite.config.js@@ -46,6 +46,7 @@ export default defineConfig(({command, mode, isSsrBuild, isPreview}) => {// generic'js/pages/generic.js',+ 'js/pages/generic-nodates.js','js/pages/blank.js', // small bootstrap'js/pages/flush.js',diff --git a/resources/views/budgets/create.blade.php b/resources/views/budgets/create.blade.phpindex d3338250d3..946eec0a15 100644--- a/resources/views/budgets/create.blade.php+++ b/resources/views/budgets/create.blade.php@@ -53,6 +53,6 @@@endsection@section('scripts')- @vite(['js/pages/generic.js'])+ @vite(['js/pages/generic-nodates.js'])<script type="text/javascript" src="v1/js/ff/budgets/create.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/budgets/delete.blade.php b/resources/views/budgets/delete.blade.phpindex 4ddcc1383f..310e61d413 100644--- a/resources/views/budgets/delete.blade.php+++ b/resources/views/budgets/delete.blade.php@@ -36,5 +36,5 @@</form>@endsection@section('scripts')- @vite(['js/pages/generic.js'])+ @vite(['js/pages/generic-nodates.js'])@endsectiondiff --git a/resources/views/budgets/edit.blade.php b/resources/views/budgets/edit.blade.phpindex df1cf96ff9..6a7dab8613 100644--- a/resources/views/budgets/edit.blade.php+++ b/resources/views/budgets/edit.blade.php@@ -55,6 +55,6 @@@endsection@section('scripts')- @vite(['js/pages/generic.js'])+ @vite(['js/pages/generic-nodates.js'])<script type="text/javascript" src="v1/js/ff/budgets/edit.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/budgets/index.blade.php b/resources/views/budgets/index.blade.phpindex 6910f3b0aa..87f7f9e233 100644--- a/resources/views/budgets/index.blade.php+++ b/resources/views/budgets/index.blade.php@@ -451,7 +451,7 @@@endsection@section('scripts')- @vite(['js/pages/generic.js'])+ @vite(['js/pages/generic-nodates.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/budgets/no-budget.blade.php b/resources/views/budgets/no-budget.blade.phpindex 9d318cd940..b2e41e0b61 100644--- a/resources/views/budgets/no-budget.blade.php+++ b/resources/views/budgets/no-budget.blade.php@@ -54,7 +54,7 @@@endsection@section('scripts')- @vite(['js/pages/generic.js'])+ @vite(['js/pages/generic-nodates.js']){{-- required for groups.twig --}}<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>@endsectiondiff --git a/resources/views/budgets/show.blade.php b/resources/views/budgets/show.blade.phpindex 1efb5c3fb0..485740fc4d 100644--- a/resources/views/budgets/show.blade.php+++ b/resources/views/budgets/show.blade.php@@ -214,7 +214,7 @@@endsection@section('scripts')- @vite(['js/pages/generic.js'])+ @vite(['js/pages/generic-nodates.js'])<script type="text/javascript" nonce="{{ $JS_NONCE }}">var budgetID = {{ $budget->id }};var budgetLimitID = 0;diff --git a/resources/views/components/layout/range.blade.php b/resources/views/components/layout/range.blade.phpindex ecd50b7a48..69a27492d3 100644--- a/resources/views/components/layout/range.blade.php+++ b/resources/views/components/layout/range.blade.php@@ -1,4 +1,4 @@-<li class="nav-item dropdown">+<li class="nav-item dropdown" id="date-dropdown"><ahref="#"class="nav-link"@@ -12,6 +12,7 @@<ulx-data="dates" x-bind="eventListeners"class="dropdown-menu"+aria-labelledby="date-range"style="--bs-dropdown-min-width: 8rem">diff --git a/resources/views/transactions/convert.blade.php b/resources/views/transactions/convert.blade.phpindex 384e0ddbb2..ab6bd092b8 100644--- a/resources/views/transactions/convert.blade.php+++ b/resources/views/transactions/convert.blade.php@@ -291,5 +291,5 @@@endsection@section('scripts')-@vite(['js/pages/generic.js'])+ @vite(['js/pages/generic-nodates.js'])@endsectiondiff --git a/resources/views/transactions/delete.blade.php b/resources/views/transactions/delete.blade.phpindex edd351908d..eb0b5c6e70 100644--- a/resources/views/transactions/delete.blade.php+++ b/resources/views/transactions/delete.blade.php@@ -28,4 +28,6 @@</form>@endsection-+@section('scripts')+ @vite(['js/pages/generic-nodates.js'])+@endsectiondiff --git a/resources/views/transactions/index.blade.php b/resources/views/transactions/index.blade.phpindex 3659fa5ba1..ba0975066e 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/generic.js'])+ @vite(['js/pages/generic-nodates.js']){{-- required for groups.twig --}}<script type="text/javascript" nonce="{{ $JS_NONCE }}">var showAll = @if(is_countable($periods) && count($periods) > 0) false @else true @endif;diff --git a/resources/views/transactions/links/delete.blade.php b/resources/views/transactions/links/delete.blade.phpindex d8770c893c..9deb92e211 100644--- a/resources/views/transactions/links/delete.blade.php+++ b/resources/views/transactions/links/delete.blade.php@@ -28,5 +28,5 @@</form>@endsection@section('scripts')- @vite(['js/pages/generic.js'])+ @vite(['js/pages/generic-nodates.js'])@endsectiondiff --git a/resources/views/transactions/mass/delete.blade.php b/resources/views/transactions/mass/delete.blade.phpindex 1616065962..05e4d7b189 100644--- a/resources/views/transactions/mass/delete.blade.php+++ b/resources/views/transactions/mass/delete.blade.php@@ -103,5 +103,5 @@</form>@endsection@section('scripts')- @vite(['js/pages/generic.js'])+ @vite(['js/pages/generic-nodates.js'])@endsectiondiff --git a/resources/views/transactions/single/delete.blade.php b/resources/views/transactions/single/delete.blade.phpindex 04d2f32063..941dcb0e3d 100644--- a/resources/views/transactions/single/delete.blade.php+++ b/resources/views/transactions/single/delete.blade.php@@ -37,5 +37,5 @@</form>@endsection@section('scripts')- @vite(['js/pages/generic.js'])+ @vite(['js/pages/generic-nodates.js'])@endsection