diff --git a/src/lib/united.js b/src/lib/united.js index 94daf26..bd106ac 100644 --- a/src/lib/united.js +++ b/src/lib/united.js @@ -210,7 +210,7 @@ export async function pullData(amount = 100) { for (const transaction of transactions) { const amount = Number(transaction.amount); const date = new Date(transaction.postedDate); - const id = transaction.transactionId; + const id = transaction.hostTranNumber; const payee = transaction.description || ''; const statementDescription = transaction.statementDescription; const card = cardRegEx.test(statementDescription) diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index aa5f914..1bb2d63 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,14 +1,25 @@
-
+
+ +
+ {#each toast as t} +
+ {t.message} +
+ {/each} +
diff --git a/src/routes/account/[slug]/+page.svelte b/src/routes/account/[slug]/+page.svelte index 955bc4d..055bc70 100644 --- a/src/routes/account/[slug]/+page.svelte +++ b/src/routes/account/[slug]/+page.svelte @@ -2,7 +2,11 @@ import { EditSymbol } from '$lib/editSymbol.svelte'; import { settingsSymbol } from '$lib/settingsSymbol.svelte'; import { invalidate, invalidateAll } from '$app/navigation'; + import { loadingModal } from '$lib/loadingModal.svelte'; + import { getContext } from 'svelte'; + let { data } = $props(); + const addToast = getContext('addToast'); let trans = $derived(data.transactions); let budgets = $derived(data.budgets); let budgetTransactions = $derived(data.budgetTransactions); @@ -12,6 +16,7 @@ let hide = $derived(account?.hide || false); let inTotal = $derived(account?.in_total || false); let expanded = $state([]); + let loading = $state(false); function editNotes(transaction) { my_modal_3.showModal(); @@ -19,6 +24,8 @@ notes = transaction.notes; } async function saveNotes() { + my_modal_3.close(); + loading = true; let res = fetch(`/transcation/${currentTransaction.id}`, { method: 'POST', headers: { @@ -26,18 +33,22 @@ }, body: JSON.stringify({ notes: $state.snapshot(notes) }) }); - my_modal_3.close(); + loading = false; let result = await res; if (result.ok) { // Update the transaction in the data currentTransaction.notes = notes; // Optionally, you can also update the UI or show a success message + addToast('Notes saved successfully', 'success'); } else { // Handle error case console.error('Failed to save notes'); + addToast('Failed to save notes', 'error'); } } async function saveSettings() { + loading = true; + settings_modal.close(); let res = await fetch(`/api/account/${account.id}`, { method: 'POST', headers: { @@ -48,8 +59,9 @@ in_total: $state.snapshot(inTotal) }) }); + loading = false; + invalidateAll(); if (res.ok) { - settings_modal.close(); // Optionally, you can refresh the account data or show a success message } else { console.error('Failed to save settings'); @@ -59,9 +71,9 @@
-

{account?.name}

+

{account?.name}

-
{account?.balance}
+
{account?.balance}

Transcations

- - - - - - - - - - - - - - {#each trans as transaction} - {@const applicableBudgets = budgetTransactions.filter( - (bt) => bt.transaction_id === transaction.id - )} - {@const budgetTotal = applicableBudgets.reduce( - (accumulator, currentValue) => accumulator + Number(currentValue.amount), - 0 - )} - - - - - - - - - - {/each} - -
DatePayeeDescriptionAmountNotesBudgets
{transaction.date.toDateString()}{transaction.payee ?? ''}{transaction.description}
    -
  • Amount: {transaction.amount}
    • -
  • Budget: {budgetTotal.toFixed(2)}
    • -
  • Remains: {(transaction.amount - budgetTotal).toFixed(2)}
    • -
{transaction.notes} -
    - {#each applicableBudgets as budgetTransaction} -
  • -
    -
    - {budgets.find((b) => b.id === budgetTransaction.budget_id)?.name} -
    -
    ${budgetTransaction.amount}
    -
    {budgetTransaction.notes}
    -
    -
    • - {/each} -
+
    + {#each trans as transaction} + {@const applicableBudgets = budgetTransactions.filter( + (bt) => bt.transaction_id === transaction.id + )} + {@const budgetTotal = applicableBudgets.reduce( + (accumulator, currentValue) => accumulator + Number(currentValue.amount), + 0 + )} + {@const remaining = transaction.amount - budgetTotal} +
  • +
    +
    {transaction.description}
    +
    + {transaction.date.toDateString()} +
    +
    + +
    +
    +
    + In Budget: {budgetTotal.toFixed(2)} +
    +
    + Remaining {remaining.toFixed(2)} +
    +
    +
    {transaction.amount}
    + +
    • + {/each} +
@@ -165,6 +158,8 @@ class="btn btn-primary" onclick={() => { if (currentTransaction.budget_id) { + loading = true; + my_modal_3.close(); fetch(`/api/budget/${currentTransaction.budget_id}/transaction`, { method: 'POST', headers: { @@ -176,10 +171,14 @@ notes: currentTransaction.notes }) }).then((res) => { + loading = false; + invalidateAll(); if (res.ok) { // Optionally, you can refresh the UI or show a success message + addToast('Transaction added to budget', 'success'); console.log('Transaction added to budget successfully'); } else { + addToast('Failed to add transaction to budget', 'error'); console.error('Failed to add transaction to budget'); } }); @@ -218,3 +217,7 @@
+ +{#if loading} + {@render loadingModal()} +{/if} diff --git a/src/routes/api/budget/+server.js b/src/routes/api/budget/+server.js new file mode 100644 index 0000000..dd3e02c --- /dev/null +++ b/src/routes/api/budget/+server.js @@ -0,0 +1,18 @@ +import { json } from '@sveltejs/kit'; +import { addBudget, deleteBudget } from '$lib/db'; + +// In-memory store for demonstration (replace with a database in production) +let budgets = []; + +/** @type {import('./$types').RequestHandler} */ +export async function POST({ request }) { + const data = await request.json(); + + // Basic validation + if (!data.name || typeof data.amount !== 'number') { + return json({ error: 'Invalid input' }, { status: 400 }); + } + let res = await addBudget(data.name, data.amount, data.notes); + + return json(res, { status: 201 }); +} diff --git a/src/routes/budget/+server.js b/src/routes/budget/+server.js deleted file mode 100644 index 9b33ad8..0000000 --- a/src/routes/budget/+server.js +++ /dev/null @@ -1,18 +0,0 @@ -import { json } from '@sveltejs/kit'; -import { addBudget, deleteBudget } from '$lib/db'; - -// In-memory store for demonstration (replace with a database in production) -let budgets = []; - -/** @type {import('./$types').RequestHandler} */ -export async function POST({ request }) { - const data = await request.json(); - - // Basic validation - if (!data.name || typeof data.amount !== 'number') { - return json({ error: 'Invalid input' }, { status: 400 }); - } - let res = await addBudget(data.name, data.amount, data.notes); - - return json(res, { status: 201 }); -} diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte index 5a322a9..d73ca76 100644 --- a/src/routes/settings/+page.svelte +++ b/src/routes/settings/+page.svelte @@ -15,7 +15,7 @@ async function saveBudget() { loading = true; - let res = await fetch('/budget', { + let res = await fetch('/api/budget', { method: 'POST', headers: { 'Content-Type': 'application/json' @@ -36,14 +36,6 @@ loading = false; } - async function update() { - loading = true; - let res = await fetch('/api/simplefin/update', { - method: 'POST' - }); - loading = false; - } - async function deleteBudget(name) { loading = true; if (name === toDeleteBudget.name) { @@ -69,8 +61,6 @@ {@render loadingModal()} {/if} - -

Settings