Compare commits

...
2 Commits
Author SHA1 Message Date
renovate Bot 52e755f05a chore(deps): pin fireflyiii/core docker tag
renovate/stability-days Updates have not met minimum release age requirement
2026-10-18 04:03:47 +00:00
hh 4a03ab8e1a feat(period): p and a letter picks a period from any page
p t current period, p m month to date, p 7 and p 3 the last seven and
thirty days, p y year to date, p l last year, p a everything, p c
custom dates, p p opens the period menu, which now shows each key. The
same presets are in the palette. Currencies make primary moves to P and
the subscriptions card/currency toggle to v to free p.
2026-10-17 16:13:29 +00:00
8 changed files with 70 additions and 15 deletions

No files matched your search

+11 -5
View File
@@ -4,13 +4,13 @@
import ChevronRight from "@lucide/svelte/icons/chevron-right"; import ChevronRight from "@lucide/svelte/icons/chevron-right";
import { Popover } from "bits-ui"; import { Popover } from "bits-ui";
import { period } from "#lib/period.svelte.js"; import { period } from "#lib/period.svelte.js";
import { ui } from "#lib/ui.svelte.js";
let open = $state(false);
let start = $state(period.start); let start = $state(period.start);
let end = $state(period.end); let end = $state(period.end);
$effect(() => { $effect(() => {
if (open) { if (ui.periodOpen) {
({ start, end } = period); ({ start, end } = period);
} }
}); });
@@ -19,7 +19,7 @@
event.preventDefault(); event.preventDefault();
if (start && end && start <= end) { if (start && end && start <= end) {
period.set({ end, start }); period.set({ end, start });
open = false; ui.periodOpen = false;
} }
} }
</script> </script>
@@ -34,7 +34,7 @@
> >
<ChevronLeft class="size-4" /> <ChevronLeft class="size-4" />
</button> </button>
<Popover.Root bind:open> <Popover.Root bind:open={ui.periodOpen}>
<Popover.Trigger <Popover.Trigger
class="flex h-8 items-center gap-2 px-2 font-medium text-[13px] hover:bg-black/10" class="flex h-8 items-center gap-2 px-2 font-medium text-[13px] hover:bg-black/10"
title="Choose period" title="Choose period"
@@ -59,11 +59,16 @@
: ""}" : ""}"
onclick={() => { onclick={() => {
period.set(preset.range); period.set(preset.range);
open = false; ui.periodOpen = false;
}} }}
type="button" type="button"
> >
{preset.label} {preset.label}
{#if preset.key || preset.hint}
<span class="kbd"
>{preset.key ? `p ${preset.key}` : preset.hint}</span
>
{/if}
</button> </button>
{/each} {/each}
</div> </div>
@@ -76,6 +81,7 @@
Start Start
<input <input
class="cladd-cut cladd-focusable-input h-8 rounded-cladd-sm px-2 text-[13px] text-cladd-fg" class="cladd-cut cladd-focusable-input h-8 rounded-cladd-sm px-2 text-[13px] text-cladd-fg"
id="period-start"
type="date" type="date"
bind:value={start} bind:value={start}
> >
+33
View File
@@ -36,6 +36,18 @@
} }
}); });
function setPreset(key: string | undefined) {
const preset = period.presets().find((item) => item.key === key);
if (preset) {
period.set(preset.range);
}
}
function openCustomPeriod() {
ui.periodOpen = true;
setTimeout(() => document.getElementById("period-start")?.focus(), 50);
}
function openOld(sticky = false) { function openOld(sticky = false) {
location.assign(oldUiUrl(page.url.href, sticky)); location.assign(oldUiUrl(page.url.href, sticky));
} }
@@ -148,6 +160,27 @@
label: "Current period", label: "Current period",
run: () => period.reset(), run: () => period.reset(),
}, },
{
group: "Period",
keys: "p p",
label: "Choose a period",
run: () => (ui.periodOpen = true),
},
{
group: "Period",
keys: "p c",
label: "Custom period: type the dates",
run: openCustomPeriod,
},
...period
.presets()
.filter((preset) => preset.key)
.map((preset) => ({
group: "Period",
keys: `p ${preset.key}`,
label: `Period: ${preset.label}`,
run: () => setPreset(preset.key),
})),
{ {
group: "Global", group: "Global",
hidden: true, hidden: true,
@@ -122,7 +122,7 @@
onclick={() => byCurrency || onmode()} onclick={() => byCurrency || onmode()}
type="button" type="button"
> >
By currency<span class="kbd max-sm:hidden">p</span> By currency<span class="kbd max-sm:hidden">v</span>
</button> </button>
</fieldset> </fieldset>
</header> </header>
+19 -4
View File
@@ -15,6 +15,8 @@ const STORAGE_KEY = "ffui.period";
const ISO_DATE = /^\d{4}-\d{2}-\d{2}$/; const ISO_DATE = /^\d{4}-\d{2}-\d{2}$/;
export interface Preset { export interface Preset {
hint?: string;
key?: string;
label: string; label: string;
range: Range; range: Range;
} }
@@ -113,31 +115,44 @@ class Period {
if (!isDynamic(view)) { if (!isDynamic(view)) {
const prev = shiftPeriod(this.range, view, -1); const prev = shiftPeriod(this.range, view, -1);
const next = shiftPeriod(this.range, view, 1); const next = shiftPeriod(this.range, view, 1);
presets.push({ label: periodLabel(prev, view), range: prev }); presets.push({ hint: "[", label: periodLabel(prev, view), range: prev });
presets.push({ label: periodLabel(next, view), range: next }); presets.push({ hint: "]", label: periodLabel(next, view), range: next });
} }
const current = periodOf(now, view); const current = periodOf(now, view);
presets.push({ presets.push({
key: "t",
label: `Today (${periodLabel(current, view)})`, label: `Today (${periodLabel(current, view)})`,
range: current, range: current,
}); });
presets.push({ presets.push({
key: "7",
label: "Last seven days", label: "Last seven days",
range: { end: now, start: addDays(now, -7) }, range: { end: now, start: addDays(now, -7) },
}); });
presets.push({ presets.push({
key: "3",
label: "Last thirty days", label: "Last thirty days",
range: { end: now, start: addDays(now, -30) }, range: { end: now, start: addDays(now, -30) },
}); });
presets.push({ label: "Month to date", range: periodOf(now, "MTD") }); presets.push({
presets.push({ label: "Year to date", range: periodOf(now, "YTD") }); key: "m",
label: "Month to date",
range: periodOf(now, "MTD"),
});
presets.push({
key: "y",
label: "Year to date",
range: periodOf(now, "YTD"),
});
const year = Number(now.slice(0, 4)) - 1; const year = Number(now.slice(0, 4)) - 1;
presets.push({ presets.push({
key: "l",
label: `Previous year (${year})`, label: `Previous year (${year})`,
range: { end: `${year}-12-31`, start: `${year}-01-01` }, range: { end: `${year}-12-31`, start: `${year}-01-01` },
}); });
if (this.first) { if (this.first) {
presets.push({ presets.push({
key: "a",
label: "Everything", label: "Everything",
range: { end: now, start: this.first }, range: { end: now, start: this.first },
}); });
+1
View File
@@ -11,6 +11,7 @@ class Ui {
palette = $state(false); palette = $state(false);
paletteQuery = $state(""); paletteQuery = $state("");
quickEntry = $state(false); quickEntry = $state(false);
periodOpen = $state(false);
mobileNav = $state(false); mobileNav = $state(false);
collapsed = $state(stored(SIDEBAR_KEY)); collapsed = $state(stored(SIDEBAR_KEY));
notes = $state(stored(NOTES_KEY)); notes = $state(stored(NOTES_KEY));
+2 -2
View File
@@ -78,7 +78,7 @@
}, },
{ {
group: "Currencies", group: "Currencies",
keys: "p", keys: "P",
label: "Make primary currency", label: "Make primary currency",
run: () => nav.current && makePrimary(nav.current), run: () => nav.current && makePrimary(nav.current),
}, },
@@ -203,7 +203,7 @@
</ContextMenuItem> </ContextMenuItem>
<ContextMenuItem onSelect={() => makePrimary(item)}> <ContextMenuItem onSelect={() => makePrimary(item)}>
Make primary Make primary
<span class="ml-auto kbd">p</span> <span class="ml-auto kbd">P</span>
</ContextMenuItem> </ContextMenuItem>
<MenuDelete {arm} id={item.id} run={() => remove(item)} /> <MenuDelete {arm} id={item.id} run={() => remove(item)} />
{/if} {/if}
+1 -1
View File
@@ -296,7 +296,7 @@
})), })),
{ {
group: "Runway", group: "Runway",
keys: "p", keys: "v",
label: perCurrency ? "Group by card" : "Group by currency", label: perCurrency ? "Group by card" : "Group by currency",
run: toggleMode, run: toggleMode,
}, },
+2 -2
View File
@@ -13,7 +13,7 @@ x-firefly-env: &firefly-env
services: services:
v1: v1:
image: fireflyiii/core:version-6.6.6 image: fireflyiii/core:version-6.6.6@sha256:ae69fdd95cdef9038cd7a460a5aec731f14813973e4f096511d5a4ea9ff0e972
environment: environment:
<<: *firefly-env <<: *firefly-env
APP_KEY: ffuistandv1ffuistandv1ffuistand1 APP_KEY: ffuistandv1ffuistandv1ffuistand1
@@ -26,7 +26,7 @@ services:
- "127.0.0.1:${FFUI_V1_PORT:-30072}:8080" - "127.0.0.1:${FFUI_V1_PORT:-30072}:8080"
v3: v3:
image: fireflyiii/core:latest image: fireflyiii/core:latest@sha256:a2b53539338d1cd04d341b229c3806cb178cf64c72459060e3ed34bec4167bd8
environment: environment:
<<: *firefly-env <<: *firefly-env
APP_KEY: ffuistandv3ffuistandv3ffuistand3 APP_KEY: ffuistandv3ffuistandv3ffuistand3