Compare commits
No commits in common. "cddb216526f907b167ec46faf5142c193646c223" and "5566d1f78f129281dc06464e9b191b4f632356fa" have entirely different histories.
cddb216526
...
5566d1f78f
|
@ -35,20 +35,11 @@ export interface Expense {
|
||||||
date: string;
|
date: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface Transfer {
|
|
||||||
id: number;
|
|
||||||
from_card_id: number;
|
|
||||||
to_card_id: number;
|
|
||||||
value: number;
|
|
||||||
date: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export const EntityTypes = {
|
export const EntityTypes = {
|
||||||
card: "Card",
|
card: "Card",
|
||||||
type: "Type",
|
type: "Type",
|
||||||
category: "Category",
|
category: "Category",
|
||||||
expense: "Expense",
|
expense: "Expense",
|
||||||
transfer: "Transfer",
|
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
export type EntityName = keyof typeof EntityTypes;
|
export type EntityName = keyof typeof EntityTypes;
|
||||||
|
@ -57,7 +48,6 @@ export type EntityType<T extends EntityName> =
|
||||||
T extends "type" ? Type :
|
T extends "type" ? Type :
|
||||||
T extends "category" ? Category :
|
T extends "category" ? Category :
|
||||||
T extends "expense" ? Expense :
|
T extends "expense" ? Expense :
|
||||||
T extends "transfer" ? Transfer :
|
|
||||||
never;
|
never;
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -183,8 +173,7 @@ export async function remove(groupName: string, id: number, session?: string): P
|
||||||
try {
|
try {
|
||||||
const response = await fetch(url, config);
|
const response = await fetch(url, config);
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
const body = await response.json()
|
throw new Error(`Failed to delete ${groupName}: ${response.statusText}`);
|
||||||
throw new Error(`Failed to delete ${groupName}: ${body.message}`);
|
|
||||||
}
|
}
|
||||||
return await response.json() as Message;
|
return await response.json() as Message;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|
|
@ -34,10 +34,6 @@
|
||||||
{
|
{
|
||||||
Path: "/expense",
|
Path: "/expense",
|
||||||
Name: "Expense",
|
Name: "Expense",
|
||||||
},
|
|
||||||
{
|
|
||||||
Path: "/transfer",
|
|
||||||
Name: "Transfer",
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -141,7 +141,7 @@
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<div class="container mx-auto my-8 p-6 bg-gray-100 rounded-lg shadow-lg">
|
<div class="container mx-auto my-8 p-6 bg-gray-100 rounded-lg shadow-lg">
|
||||||
<h1 class="text-2xl font-bold mb-4 text-center">Manage Expenses</h1>
|
<h1 class="text-2xl font-bold mb-4 text-center">Manage Categories</h1>
|
||||||
|
|
||||||
<div class="mb-8 p-6 bg-white rounded-lg shadow-md">
|
<div class="mb-8 p-6 bg-white rounded-lg shadow-md">
|
||||||
<h2 class="text-xl font-semibold mb-4">
|
<h2 class="text-xl font-semibold mb-4">
|
||||||
|
@ -223,7 +223,7 @@
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold mb-4 text-center">Expenses List</h2>
|
<h2 class="text-xl font-semibold mb-4 text-center">Categories List</h2>
|
||||||
<ul class="space-y-4">
|
<ul class="space-y-4">
|
||||||
{#each expenses as expense}
|
{#each expenses as expense}
|
||||||
<li
|
<li
|
||||||
|
|
|
@ -1,238 +0,0 @@
|
||||||
<script lang="ts">
|
|
||||||
import { onMount } from "svelte";
|
|
||||||
import { type Card, type Transfer } from "$lib/entities";
|
|
||||||
import { selectedDate } from "$lib/stores/dateStore";
|
|
||||||
|
|
||||||
let mutateDate = $state($selectedDate);
|
|
||||||
let selectedTime = $state("00:00:00");
|
|
||||||
let transfers: Transfer[] = $state([]);
|
|
||||||
let cards: Card[] = $state([]);
|
|
||||||
let error: string | null = $state(null);
|
|
||||||
let editingTransfer: Transfer | null = $state(null);
|
|
||||||
let newTransfer: Partial<Transfer> = $state({
|
|
||||||
card_id: 0,
|
|
||||||
value: 0,
|
|
||||||
comment: "",
|
|
||||||
date: "2006-01-02T15:04:05Z",
|
|
||||||
});
|
|
||||||
|
|
||||||
onMount(async () => {
|
|
||||||
await fetchCategories();
|
|
||||||
await fetchCards();
|
|
||||||
});
|
|
||||||
|
|
||||||
async function fetchCards() {
|
|
||||||
const result = await fetch("/api/card/all");
|
|
||||||
if (!result.ok) {
|
|
||||||
const obj = await result.json();
|
|
||||||
error = obj.message;
|
|
||||||
} else {
|
|
||||||
cards = await result.json();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
async function fetchCategories() {
|
|
||||||
const result = await fetch("/api/transfer/all");
|
|
||||||
if (!result.ok) {
|
|
||||||
const obj = await result.json();
|
|
||||||
error = obj.message;
|
|
||||||
} else {
|
|
||||||
transfers = await result.json();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function saveTransfer() {
|
|
||||||
const endpoint = editingTransfer
|
|
||||||
? `/api/transfer/update`
|
|
||||||
: "/api/transfer/create";
|
|
||||||
const method = editingTransfer ? "PUT" : "POST";
|
|
||||||
|
|
||||||
const data = {
|
|
||||||
...currentTransfer,
|
|
||||||
from_card_id: Number(currentTransfer.from_card_id),
|
|
||||||
to_card_id: Number(currentTransfer.to_card_id),
|
|
||||||
value: Number(currentTransfer.value),
|
|
||||||
date: constructedTime,
|
|
||||||
};
|
|
||||||
const response = await fetch(endpoint, {
|
|
||||||
method,
|
|
||||||
headers: { "Content-Type": "application/json" },
|
|
||||||
body: JSON.stringify(data),
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
const { message } = await response.json();
|
|
||||||
error = message;
|
|
||||||
} else {
|
|
||||||
await fetchCategories();
|
|
||||||
if (editingTransfer) {
|
|
||||||
editingTransfer = null;
|
|
||||||
} else {
|
|
||||||
newTransfer = {
|
|
||||||
from_card_id: 0,
|
|
||||||
to_card_id: 0,
|
|
||||||
value: 0,
|
|
||||||
date: "",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function editTransfer(transfer: Transfer) {
|
|
||||||
editingTransfer = { ...transfer };
|
|
||||||
const parts = transfer.date.split("T");
|
|
||||||
mutateDate = parts[0];
|
|
||||||
selectedTime = parts[1].split("Z")[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
async function deleteTransfer(id: number) {
|
|
||||||
const response = await fetch(`/api/transfer/delete`, {
|
|
||||||
method: "DELETE",
|
|
||||||
headers: { "Content-Type": "application/json" },
|
|
||||||
body: JSON.stringify({ id }),
|
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
const { message } = await response.json();
|
|
||||||
error = message;
|
|
||||||
} else {
|
|
||||||
await fetchCategories();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Helper function to get the name of the parent category
|
|
||||||
function getCardName(cardId: number) {
|
|
||||||
if (cardId === 0) return "None";
|
|
||||||
const card = cards.find((card) => card.id === cardId);
|
|
||||||
return card ? card.name : "Unknown";
|
|
||||||
}
|
|
||||||
|
|
||||||
const constructedTime = $derived(`${mutateDate}T${selectedTime}Z`);
|
|
||||||
const currentTransfer = $derived(editingTransfer ?? newTransfer);
|
|
||||||
$inspect(currentTransfer);
|
|
||||||
$inspect("constructedTime = ", constructedTime);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
{#if error}
|
|
||||||
<p class="bg-red-100 text-red-700 p-4 rounded">{error}</p>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
<div class="container mx-auto my-8 p-6 bg-gray-100 rounded-lg shadow-lg">
|
|
||||||
<h1 class="text-2xl font-bold mb-4 text-center">Manage Transfers</h1>
|
|
||||||
|
|
||||||
<div class="mb-8 p-6 bg-white rounded-lg shadow-md">
|
|
||||||
<h2 class="text-xl font-semibold mb-4">
|
|
||||||
{editingTransfer ? "Edit Transfer" : "Add New Transfer"}
|
|
||||||
</h2>
|
|
||||||
<form onsubmit={saveTransfer} class="space-y-4">
|
|
||||||
<label class="block">
|
|
||||||
<span class="text-gray-700">Value:</span>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
bind:value={currentTransfer.value}
|
|
||||||
required
|
|
||||||
class="mt-1 block w-full px-4 py-2 border border-gray-300 rounded-md focus:ring focus:ring-indigo-200 focus:border-indigo-500"
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<label class="block">
|
|
||||||
<span class="text-gray-700">From:</span>
|
|
||||||
<select
|
|
||||||
bind:value={currentTransfer.from_card_id}
|
|
||||||
class="mt-1 block w-full px-4 py-2 border border-gray-300 rounded-md focus:ring focus:ring-indigo-200 focus:border-indigo-500"
|
|
||||||
>
|
|
||||||
{#each cards as card}
|
|
||||||
{#if card.id != currentTransfer.to_card_id}
|
|
||||||
<option value={card.id}>{card.name}</option>
|
|
||||||
{/if}
|
|
||||||
{/each}
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<label class="block">
|
|
||||||
<span class="text-gray-700">To:</span>
|
|
||||||
<select
|
|
||||||
bind:value={currentTransfer.to_card_id}
|
|
||||||
class="mt-1 block w-full px-4 py-2 border border-gray-300 rounded-md focus:ring focus:ring-indigo-200 focus:border-indigo-500"
|
|
||||||
>
|
|
||||||
{#each cards as card}
|
|
||||||
{#if card.id != currentTransfer.from_card_id}
|
|
||||||
<option value={card.id}>{card.name}</option>
|
|
||||||
{/if}
|
|
||||||
{/each}
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<div class="flex items-center space-x-4">
|
|
||||||
<label>
|
|
||||||
Date:
|
|
||||||
<input
|
|
||||||
type="date"
|
|
||||||
bind:value={mutateDate}
|
|
||||||
class="bg-gray-800 text-white p-2 rounded-md border border-gray-700"
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<label>
|
|
||||||
Time:
|
|
||||||
<input
|
|
||||||
type="time"
|
|
||||||
bind:value={selectedTime}
|
|
||||||
class="bg-gray-800 text-white p-2 rounded-md border border-gray-700"
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex space-x-2">
|
|
||||||
<button
|
|
||||||
type="submit"
|
|
||||||
class="px-4 py-2 bg-indigo-500 text-white rounded-md hover:bg-indigo-600"
|
|
||||||
>
|
|
||||||
{editingTransfer ? "Update Transfer" : "Add Transfer"}
|
|
||||||
</button>
|
|
||||||
{#if editingTransfer}
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onclick={() => (editingTransfer = null)}
|
|
||||||
class="px-4 py-2 bg-gray-300 text-gray-700 rounded-md hover:bg-gray-400"
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</button>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h2 class="text-xl font-semibold mb-4 text-center">Transfers List</h2>
|
|
||||||
<ul class="space-y-4">
|
|
||||||
{#each transfers as transfer}
|
|
||||||
<li
|
|
||||||
class="bg-white p-4 rounded-lg shadow-md flex justify-between items-center"
|
|
||||||
>
|
|
||||||
<div>
|
|
||||||
<strong class="block text-lg">{transfer.value}</strong>
|
|
||||||
<div class="text-sm text-gray-600">
|
|
||||||
<span class="font-bold">From:</span>
|
|
||||||
{getCardName(transfer.from_card_id)}
|
|
||||||
<span class="font-bold">To:</span>
|
|
||||||
{getCardName(transfer.to_card_id)}
|
|
||||||
<span class="font-bold">Date:</span>
|
|
||||||
{transfer.date}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="flex space-x-2">
|
|
||||||
<button
|
|
||||||
onclick={() => editTransfer(transfer)}
|
|
||||||
class="px-4 py-2 bg-blue-500 text-white rounded-md hover:bg-blue-600"
|
|
||||||
>
|
|
||||||
Edit
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
onclick={() => deleteTransfer(transfer.id)}
|
|
||||||
class="px-4 py-2 bg-red-500 text-white rounded-md hover:bg-red-600"
|
|
||||||
>
|
|
||||||
Delete
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
{/each}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
Loading…
Reference in New Issue
Block a user