dave/bill-manager
1
0
Fork 0
generated from dave/wails-template
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Compare commits

base: dave:8c10540309fe77fb622392ebb5ee13dd38468b63
Branches Tags
dave:master
dave:1.1.0 dave:1.0.1 dave:1.0.0
...
compare: dave:1.0.0
Branches Tags
dave:master
dave:1.1.0 dave:1.0.1 dave:1.0.0

8 Commits
8c10540309 ... 1.0.0

Author SHA1 Message Date
PhatPhuckDave
236b113c10 Rename application 2024-08-19 14:03:44 +02:00
PhatPhuckDave
4ee622e65e Enable marking as paid 2024-08-19 14:00:35 +02:00
PhatPhuckDave
2ac082f230 Add force redraw on navigate 2024-08-19 13:55:10 +02:00
PhatPhuckDave
45030f8634 More better displaying 2024-08-19 13:51:00 +02:00
PhatPhuckDave
79b89a01e5 Refresh payment stores on time frame change 2024-08-19 13:09:14 +02:00
PhatPhuckDave
37a0c52464 Fix scrolling in frame 2024-08-19 13:09:06 +02:00
PhatPhuckDave
f018459818 Rework "nowStore" to scrollingTimeFrameStore that contains both from and to dates 2024-08-19 12:45:37 +02:00
PhatPhuckDave
c5613ee0cc Make formatting a bit more better 
Display dates for months in view
 2024-08-19 12:33:26 +02:00
12 changed files with 145 additions and 55 deletions
Expand all files Collapse all files

15
frontend/index.html
View File

@@ -1,12 +1,15 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"/> <meta charset="UTF-8" />
<meta content="width=device-width, initial-scale=1.0" name="viewport"/> <meta content="width=device-width, initial-scale=1.0" name="viewport" />
<title>wails-template</title> <title>bill-manager</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
<script src="./src/main.ts" type="module"></script> <script src="./src/main.ts" type="module"></script>
</body> </body>
</html>
</html>

10
frontend/src/App.svelte
View File

@@ -1,8 +1,8 @@
<script lang="ts"> <script lang="ts">
import { Toaster } from "svelte-sonner"; import { Toaster } from "svelte-sonner";
import Header from "$lib/components/Header.svelte";
import Router from "$lib/router/Router.svelte"; import Router from "$lib/router/Router.svelte";
import { Close } from "$wails/main/App"; import { Close } from "$wails/main/App";
import { scrollingTimeFrameStore } from "$lib/store/scrollingTimeFrameStore";
function keyDown(event: KeyboardEvent) { function keyDown(event: KeyboardEvent) {
if (event.ctrlKey && event.key == "r") { if (event.ctrlKey && event.key == "r") {
@@ -11,13 +11,19 @@
if (event.ctrlKey && event.key == "w") { if (event.ctrlKey && event.key == "w") {
Close(); Close();
} }
if (event.key == "ArrowLeft") {
scrollingTimeFrameStore.prev();
}
if (event.key == "ArrowRight") {
scrollingTimeFrameStore.next();
}
} }
</script> </script>
<svelte:window on:keydown={keyDown} /> <svelte:window on:keydown={keyDown} />
<Toaster theme="dark" expand visibleToasts={9} /> <Toaster theme="dark" expand visibleToasts={9} />
<template> <template>
<Header /> <!-- <Header /> -->
<main class="flex-1"> <main class="flex-1">
<Router /> <Router />
</main> </main>

34
frontend/src/lib/components/PaymentBillComp.svelte
View File

@@ -1,17 +1,45 @@
<script lang="ts"> <script lang="ts">
import { type PaymentBill } from "$lib/types"; import { type PaymentBill } from "$lib/types";
import { SetPaid } from "$wails/main/App";
import { toast } from "svelte-sonner";
export let paymentBill: PaymentBill = { export let paymentBill: PaymentBill = {
id: -1, id: -1,
name: "none", name: "none",
payment: null, payment: null,
}; };
export let monthFor: Date = new Date();
console.log(paymentBill); let paymentDate: string = "";
$: {
if (!!paymentBill.payment?.paymentDate) {
// @ts-ignore Yes split exists... The type is time.Time but it's actually a string
// Because typescript is a worthless waste of bytes
// And I don't know how to properly convert time.Time to Date or String
// So I'm doing this bullshit
paymentDate = paymentBill.payment!.paymentDate.split("T")[0];
}
}
async function doPaid(event: MouseEvent) {
const res = await SetPaid(paymentBill.id, monthFor);
if (!res.success) {
toast.error(`failed setting paid for ${paymentBill.id} and month ${monthFor} with error ${res.error}`);
return;
}
paymentBill.payment = res.data;
}
</script> </script>
<template> <template>
<div> <div class="grid grid-cols-2 w-full text-start px-3 text-xl">
<p>{paymentBill.name}</p> <p class={paymentBill.payment == null ? "text-red-700" : ""}>{paymentBill.name}</p>
<!-- svelte-ignore a11y-click-events-have-key-events -->
<p
class="h-[1.6em] cursor-pointer border-2 border-transparent hover:border-solid hover:border-sky-500"
on:click={doPaid}
>
{paymentDate}
</p>
</div> </div>
</template> </template>

19
frontend/src/lib/components/Payments.svelte
View File

@@ -6,6 +6,12 @@
import PaymentBillComp from "./PaymentBillComp.svelte"; import PaymentBillComp from "./PaymentBillComp.svelte";
export let payments: main.Payment[] = []; export let payments: main.Payment[] = [];
export let date: Date = new Date();
let dateString: string = date.toISOString()
$: {
dateString = date.toISOString().split("T")[0]
dateString = dateString.split("-").slice(0, 2).join("-");
}
const paymentsModel: { [key: number]: PaymentBill } = {}; const paymentsModel: { [key: number]: PaymentBill } = {};
for (const bill of $billsStore) { for (const bill of $billsStore) {
@@ -30,9 +36,14 @@
</script> </script>
<template> <template>
<div> <div class="border-double border-2 border-gray-500 m-1">
{#each Object.values(paymentsModel) as payment} <div class="text-4xl font-bold">
<PaymentBillComp paymentBill={payment} /> {dateString}
{/each} </div>
<div class="">
{#each Object.values(paymentsModel) as payment}
<PaymentBillComp paymentBill={payment} monthFor={date} />
{/each}
</div>
</div> </div>
</template> </template>

22
frontend/src/lib/router/routes/Home.svelte
View File

@@ -1,12 +1,26 @@
<script lang="ts"> <script lang="ts">
import Payments from "$lib/components/Payments.svelte"; import Payments from "$lib/components/Payments.svelte";
import { scrollingTimeFrameStore } from "$lib/store/scrollingTimeFrameStore";
import { lastMonthPaymentsStore } from "$lib/store/lastMonthPaymentsStore"; import { lastMonthPaymentsStore } from "$lib/store/lastMonthPaymentsStore";
import { thisMonthPaymentsStore } from "$lib/store/thisMonthPaymentsStore"; import { thisMonthPaymentsStore } from "$lib/store/thisMonthPaymentsStore";
let forceupdate = false;
thisMonthPaymentsStore.subscribe(() => {
forceupdate = !forceupdate;
});
lastMonthPaymentsStore.subscribe(() => {
forceupdate = !forceupdate;
});
</script> </script>
<template> <template>
<Payments payments={$thisMonthPaymentsStore} /> <div class="grid grid-cols-2">
<Payments payments={$lastMonthPaymentsStore} /> {#if forceupdate}
</template> <Payments date={$scrollingTimeFrameStore.from} payments={$lastMonthPaymentsStore} />
<Payments date={$scrollingTimeFrameStore.to} payments={$thisMonthPaymentsStore} />
{:else}
<Payments date={$scrollingTimeFrameStore.from} payments={$lastMonthPaymentsStore} />
<Payments date={$scrollingTimeFrameStore.to} payments={$thisMonthPaymentsStore} />
{/if}
</div>
</template>

18
frontend/src/lib/store/lastMonthPaymentsStore.ts
View File

@@ -2,13 +2,11 @@ import { get, type Writable, writable } from "svelte/store";
import { GetPaymentsForMonth } from "$wails/main/App"; import { GetPaymentsForMonth } from "$wails/main/App";
import { main } from "$wails/models"; import { main } from "$wails/models";
import { toast } from "svelte-sonner"; import { toast } from "svelte-sonner";
import { nowStore } from "$lib/store/nowStore"; import { scrollingTimeFrameStore } from "$lib/store/scrollingTimeFrameStore";
async function createStore(): Promise<Writable<main.Payment[]>> { async function createStore(): Promise<Writable<main.Payment[]>> {
const payments: main.Payment[] = []; const payments: main.Payment[] = [];
const now = new Date(); const res = await GetPaymentsForMonth(get(scrollingTimeFrameStore).from);
now.setMonth(get(nowStore).getMonth() - 1)
const res = await GetPaymentsForMonth(now);
if (!res.success) { if (!res.success) {
toast.error("Error getting payments " + res.error); toast.error("Error getting payments " + res.error);
} else { } else {
@@ -23,4 +21,14 @@ async function createStore(): Promise<Writable<main.Payment[]>> {
}; };
} }
export const lastMonthPaymentsStore = await createStore(); const lastMonthPaymentsStore = await createStore();
scrollingTimeFrameStore.subscribe(async (timeframe) => {
const res = await GetPaymentsForMonth(timeframe.from);
if (!res.success) {
toast.error("Error getting payments " + res.error);
return;
}
lastMonthPaymentsStore.set(res.data);
});
export { lastMonthPaymentsStore };

24
frontend/src/lib/store/nowStore.ts
View File

@@ -1,24 +0,0 @@
import { type Writable, writable } from "svelte/store";
async function createStore(): Promise<Writable<Date> & { next: Function; prev: Function }> {
const { subscribe, update, set } = writable(new Date());
return {
subscribe,
update,
set,
next: () => {
update((now: Date) => {
now.setMonth(now.getMonth() + 1);
return now;
});
},
prev: () => {
update((now: Date) => {
now.setMonth(now.getMonth() - 1);
return now;
});
},
};
}
export const nowStore = await createStore();

31
frontend/src/lib/store/scrollingTimeFrameStore.ts Normal file
View File

@@ -0,0 +1,31 @@
import { type ScrollingTimeframe } from "$lib/types";
import { type Writable, writable } from "svelte/store";
async function createStore(): Promise<Writable<ScrollingTimeframe> & { next: Function; prev: Function }> {
const thism = new Date();
const lastm = new Date();
lastm.setMonth(thism.getMonth() - 1);
const { subscribe, update, set } = writable({ from: lastm, to: thism });
return {
subscribe,
update,
set,
next: () => {
update((frame: ScrollingTimeframe) => {
frame.from.setMonth(frame.from.getMonth() + 1);
frame.to.setMonth(frame.to.getMonth() + 1);
return frame;
});
},
prev: () => {
update((frame: ScrollingTimeframe) => {
frame.from.setMonth(frame.from.getMonth() - 1);
frame.to.setMonth(frame.to.getMonth() - 1);
return frame;
});
},
};
}
export const scrollingTimeFrameStore = await createStore();

17
frontend/src/lib/store/thisMonthPaymentsStore.ts
View File

@@ -2,12 +2,11 @@ import { get, type Writable, writable } from "svelte/store";
import { GetPaymentsForMonth } from "$wails/main/App"; import { GetPaymentsForMonth } from "$wails/main/App";
import { main } from "$wails/models"; import { main } from "$wails/models";
import { toast } from "svelte-sonner"; import { toast } from "svelte-sonner";
import { nowStore } from "$lib/store/nowStore"; import { scrollingTimeFrameStore } from "$lib/store/scrollingTimeFrameStore";
async function createStore(): Promise<Writable<main.Payment[]>> { async function createStore(): Promise<Writable<main.Payment[]>> {
const payments: main.Payment[] = []; const payments: main.Payment[] = [];
const now = get(nowStore) const res = await GetPaymentsForMonth(get(scrollingTimeFrameStore).to);
const res = await GetPaymentsForMonth(now);
if (!res.success) { if (!res.success) {
toast.error("Error getting payments " + res.error); toast.error("Error getting payments " + res.error);
} else { } else {
@@ -22,4 +21,14 @@ async function createStore(): Promise<Writable<main.Payment[]>> {
}; };
} }
export const thisMonthPaymentsStore = await createStore(); const thisMonthPaymentsStore = await createStore();
scrollingTimeFrameStore.subscribe(async (timeframe) => {
const res = await GetPaymentsForMonth(timeframe.to);
if (!res.success) {
toast.error("Error getting payments " + res.error);
return;
}
thisMonthPaymentsStore.set(res.data);
});
export { thisMonthPaymentsStore };

4
frontend/src/lib/types.ts
View File

@@ -5,3 +5,7 @@ export type PaymentBill = {
name: string; name: string;
payment: main.Payment|null; payment: main.Payment|null;
}; };
export type ScrollingTimeframe = {
from: Date;
to: Date;
}

2
go.mod
View File

@@ -1,4 +1,4 @@
module wails-template module bill-manager
go 1.21 go 1.21

4
wails.json
View File

@@ -1,7 +1,7 @@
{ {
"$schema": "https://wails.io/schemas/config.v2.json", "$schema": "https://wails.io/schemas/config.v2.json",
"name": "wails-template", "name": "bill-manager",
"outputfilename": "wails-template", "outputfilename": "bill-manager",
"frontend:install": "pnpm install", "frontend:install": "pnpm install",
"frontend:build": "pnpm build", "frontend:build": "pnpm build",
"frontend:dev:watcher": "pnpm dev", "frontend:dev:watcher": "pnpm dev",