generated from dave/wails-template
Compare commits
20 Commits
f4d29aabbd
...
1.1.0
Author | SHA1 | Date | |
---|---|---|---|
e83fb7abb8 | |||
3ca12139cd | |||
236b113c10 | |||
4ee622e65e | |||
2ac082f230 | |||
45030f8634 | |||
79b89a01e5 | |||
37a0c52464 | |||
f018459818 | |||
c5613ee0cc | |||
8c10540309 | |||
f96c0ba8b5 | |||
46b50b6bd3 | |||
e33dea3e4b | |||
5b00b68a88 | |||
69eee93cff | |||
9cbaf7880b | |||
c17e25c358 | |||
de7c2cc82c | |||
5e94f44e27 |
4
.gitignore
vendored
4
.gitignore
vendored
@@ -1,3 +1,7 @@
|
||||
node_modules
|
||||
frontend/dist
|
||||
build
|
||||
bills.db
|
||||
main.log
|
||||
bills.db-shm
|
||||
bills.db-wal
|
||||
|
51
app.go
51
app.go
@@ -2,6 +2,9 @@ package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"github.com/wailsapp/wails/v2/pkg/runtime"
|
||||
)
|
||||
|
||||
// App struct
|
||||
@@ -19,3 +22,51 @@ func NewApp() *App {
|
||||
func (a *App) startup(ctx context.Context) {
|
||||
a.ctx = ctx
|
||||
}
|
||||
func (a *App) Close() {
|
||||
runtime.Quit(a.ctx)
|
||||
}
|
||||
|
||||
func (a *App) GetBills() WailsBills {
|
||||
res := WailsBills{}
|
||||
bills, err := service.GetAllBills()
|
||||
if err != nil {
|
||||
res.Success = false
|
||||
res.Error = err.Error()
|
||||
return res
|
||||
}
|
||||
res.Success = true
|
||||
res.Data = bills
|
||||
return res
|
||||
}
|
||||
func (a *App) GetPaymentsForMonth(month time.Time) WailsPayments {
|
||||
res := WailsPayments{}
|
||||
payments, err := service.GetPaymentsForDate(month)
|
||||
if err != nil {
|
||||
res.Success = false
|
||||
res.Error = err.Error()
|
||||
return res
|
||||
}
|
||||
res.Success = true
|
||||
res.Data = payments
|
||||
return res
|
||||
}
|
||||
func (a *App) SetPaid(billid int64, month time.Time) WailsPayment {
|
||||
res := WailsPayment{}
|
||||
payment, err := service.MarkPaid(billid, month, time.Now())
|
||||
if err!= nil {
|
||||
res.Success = false
|
||||
res.Error = err.Error()
|
||||
return res
|
||||
}
|
||||
res.Success = true
|
||||
res.Data = payment
|
||||
return res
|
||||
}
|
||||
|
||||
// These exist only so that wails generates models for Bill and Payment
|
||||
func (a *App) EmptyBill() Bill {
|
||||
return Bill{}
|
||||
}
|
||||
func (a *App) EmptyPayment() Payment {
|
||||
return Payment{}
|
||||
}
|
134
db.go
Normal file
134
db.go
Normal file
@@ -0,0 +1,134 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
_ "github.com/mattn/go-sqlite3"
|
||||
)
|
||||
|
||||
type DB struct {
|
||||
Ready bool
|
||||
path string
|
||||
readConn *sql.DB
|
||||
writeConn *sql.DB
|
||||
}
|
||||
|
||||
func (db *DB) Open() error {
|
||||
if db.path == "" {
|
||||
return fmt.Errorf("database path not set")
|
||||
}
|
||||
|
||||
file, err := os.Open(db.path)
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
log.Printf("Database file does not exist at %s, creating", db.path)
|
||||
file, err := os.Create(db.path)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create database file: %v", err)
|
||||
}
|
||||
log.Printf("Database created at %s", db.path)
|
||||
file.Close()
|
||||
} else {
|
||||
return fmt.Errorf("failed to open database file: %v", err)
|
||||
}
|
||||
}
|
||||
file.Close()
|
||||
|
||||
writeConn, err := sql.Open("sqlite3", db.path+"?_journal=WAL&_synchronous=NORMAL")
|
||||
if err != nil {
|
||||
Error.Printf("%++v", err)
|
||||
return err
|
||||
}
|
||||
writeConn.SetMaxOpenConns(1)
|
||||
writeConn.SetConnMaxIdleTime(30 * time.Second)
|
||||
writeConn.SetConnMaxLifetime(30 * time.Second)
|
||||
db.writeConn = writeConn
|
||||
|
||||
readConn, err := sql.Open("sqlite3", db.path+"?mode=ro&_journal=WAL&_synchronous=NORMAL&_mode=ro")
|
||||
if err != nil {
|
||||
Error.Printf("%++v", err)
|
||||
return err
|
||||
}
|
||||
readConn.SetMaxOpenConns(4)
|
||||
readConn.SetConnMaxIdleTime(30 * time.Second)
|
||||
readConn.SetConnMaxLifetime(30 * time.Second)
|
||||
db.readConn = readConn
|
||||
|
||||
db.Ready = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func (db *DB) Init(ddl string) error {
|
||||
if !db.Ready {
|
||||
return fmt.Errorf("database not ready")
|
||||
}
|
||||
|
||||
var rows map[string]struct{} = make(map[string]struct{})
|
||||
// TODO: Maybe make this better one day...
|
||||
var expected = map[string]struct{}{
|
||||
"Bill": {},
|
||||
"Payment": {},
|
||||
}
|
||||
|
||||
res, err := db.readConn.Query("SELECT name FROM sqlite_master WHERE type='table';")
|
||||
if err != nil {
|
||||
Error.Printf("%++v", err)
|
||||
return err
|
||||
}
|
||||
defer res.Close()
|
||||
for res.Next() {
|
||||
var name string
|
||||
err := res.Scan(&name)
|
||||
if err != nil {
|
||||
Error.Printf("%++v", err)
|
||||
return err
|
||||
}
|
||||
rows[name] = struct{}{}
|
||||
}
|
||||
|
||||
var needsInit bool
|
||||
for table := range expected {
|
||||
if _, ok := rows[table]; !ok {
|
||||
log.Printf("Table %s not found, initializing", table)
|
||||
needsInit = true
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if !needsInit {
|
||||
log.Printf("Database already initialized")
|
||||
return nil
|
||||
}
|
||||
|
||||
_, err = db.writeConn.Exec(ddl)
|
||||
if err != nil {
|
||||
Error.Printf("%++v", err)
|
||||
log.Printf("%#v", "Rolling back")
|
||||
_, err2 := db.writeConn.Exec("ROLLBACK;")
|
||||
if err2 != nil {
|
||||
Error.Printf("Error rolling back! %++v", err)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
log.Printf("Database init OK")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (db *DB) Close() error {
|
||||
err := db.writeConn.Close()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = db.readConn.Close()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
19
ddl.sql
Normal file
19
ddl.sql
Normal file
@@ -0,0 +1,19 @@
|
||||
begin transaction;
|
||||
|
||||
create table Bill (
|
||||
id integer PRIMARY KEY AUTOINCREMENT,
|
||||
name TEXT not null
|
||||
);
|
||||
create index Bill_name on Bill (name);
|
||||
|
||||
create table Payment (
|
||||
id integer PRIMARY KEY AUTOINCREMENT,
|
||||
billid integer,
|
||||
monthFor date not null,
|
||||
paymentDate date
|
||||
);
|
||||
create unique index Payment_billid_monthFor_unique on Payment (billid, monthFor);
|
||||
create index Payment_billid on Payment (billid);
|
||||
create index Payment_monthFor on Payment (monthFor);
|
||||
|
||||
commit;
|
@@ -1,12 +1,15 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8"/>
|
||||
<meta content="width=device-width, initial-scale=1.0" name="viewport"/>
|
||||
<title>wails-template</title>
|
||||
<meta charset="UTF-8" />
|
||||
<meta content="width=device-width, initial-scale=1.0" name="viewport" />
|
||||
<title>bill-manager</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
<script src="./src/main.ts" type="module"></script>
|
||||
<div id="app"></div>
|
||||
<script src="./src/main.ts" type="module"></script>
|
||||
</body>
|
||||
|
||||
</html>
|
@@ -1,10 +1,36 @@
|
||||
<script lang="ts">
|
||||
import Header from "$lib/components/Header.svelte";
|
||||
import { Toaster } from "svelte-sonner";
|
||||
import Router from "$lib/router/Router.svelte";
|
||||
import { Close } from "$wails/main/App";
|
||||
import { scrollingTimeFrameStore } from "$lib/store/scrollingTimeFrameStore";
|
||||
|
||||
function keyDown(event: KeyboardEvent) {
|
||||
if (event.ctrlKey && event.key == "r") {
|
||||
window.location.reload();
|
||||
}
|
||||
if (event.ctrlKey && event.key == "w") {
|
||||
Close();
|
||||
}
|
||||
if (event.key == "ArrowLeft") {
|
||||
scrollingTimeFrameStore.prev();
|
||||
}
|
||||
if (event.key == "ArrowRight") {
|
||||
scrollingTimeFrameStore.next();
|
||||
}
|
||||
}
|
||||
function scroll(event: WheelEvent) {
|
||||
if (event.deltaY < 0) {
|
||||
scrollingTimeFrameStore.next();
|
||||
} else {
|
||||
scrollingTimeFrameStore.prev();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<svelte:window on:keydown={keyDown} on:wheel={scroll} />
|
||||
<Toaster theme="dark" expand visibleToasts={9} />
|
||||
<template>
|
||||
<Header />
|
||||
<!-- <Header /> -->
|
||||
<main class="flex-1">
|
||||
<Router />
|
||||
</main>
|
||||
|
45
frontend/src/lib/components/PaymentBillComp.svelte
Normal file
45
frontend/src/lib/components/PaymentBillComp.svelte
Normal file
@@ -0,0 +1,45 @@
|
||||
<script lang="ts">
|
||||
import { type PaymentBill } from "$lib/types";
|
||||
import { SetPaid } from "$wails/main/App";
|
||||
import { toast } from "svelte-sonner";
|
||||
|
||||
export let paymentBill: PaymentBill = {
|
||||
id: -1,
|
||||
name: "none",
|
||||
payment: null,
|
||||
};
|
||||
export let monthFor: Date = new Date();
|
||||
|
||||
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>
|
||||
|
||||
<template>
|
||||
<div class="grid grid-cols-2 w-full text-start px-3 text-xl">
|
||||
<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>
|
||||
</template>
|
49
frontend/src/lib/components/Payments.svelte
Normal file
49
frontend/src/lib/components/Payments.svelte
Normal file
@@ -0,0 +1,49 @@
|
||||
<script lang="ts">
|
||||
import { billsStore } from "$lib/store/billsStore";
|
||||
import { type PaymentBill } from "$lib/types";
|
||||
import { main } from "$wails/models";
|
||||
import { toast } from "svelte-sonner";
|
||||
import PaymentBillComp from "./PaymentBillComp.svelte";
|
||||
|
||||
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 } = {};
|
||||
for (const bill of $billsStore) {
|
||||
paymentsModel[bill[1].id] = {
|
||||
id: bill[1].id,
|
||||
name: bill[1].name,
|
||||
payment: null,
|
||||
};
|
||||
}
|
||||
for (const payment of payments) {
|
||||
const bill = $billsStore.get(payment.billId);
|
||||
if (!!!bill) {
|
||||
toast.error(`Bill not found for id ${payment.billId}`);
|
||||
continue;
|
||||
}
|
||||
paymentsModel[bill.id] = {
|
||||
id: bill.id,
|
||||
name: bill.name,
|
||||
payment: payment,
|
||||
};
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="border-double border-2 border-gray-500 m-1">
|
||||
<div class="text-4xl font-bold">
|
||||
{dateString}
|
||||
</div>
|
||||
<div class="">
|
||||
{#each Object.values(paymentsModel) as payment}
|
||||
<PaymentBillComp paymentBill={payment} monthFor={date} />
|
||||
{/each}
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
@@ -1,7 +1,26 @@
|
||||
<script lang="ts">
|
||||
import Payments from "$lib/components/Payments.svelte";
|
||||
import { scrollingTimeFrameStore } from "$lib/store/scrollingTimeFrameStore";
|
||||
import { lastMonthPaymentsStore } from "$lib/store/lastMonthPaymentsStore";
|
||||
import { thisMonthPaymentsStore } from "$lib/store/thisMonthPaymentsStore";
|
||||
|
||||
let forceupdate = false;
|
||||
thisMonthPaymentsStore.subscribe(() => {
|
||||
forceupdate = !forceupdate;
|
||||
});
|
||||
lastMonthPaymentsStore.subscribe(() => {
|
||||
forceupdate = !forceupdate;
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
Hello, world
|
||||
<div class="grid grid-cols-2">
|
||||
{#if forceupdate}
|
||||
<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>
|
37
frontend/src/lib/store/billsStore.ts
Normal file
37
frontend/src/lib/store/billsStore.ts
Normal file
@@ -0,0 +1,37 @@
|
||||
import { type Writable, writable } from "svelte/store";
|
||||
import { GetBills } from "$wails/main/App";
|
||||
import { main } from "$wails/models";
|
||||
import { toast } from "svelte-sonner";
|
||||
|
||||
async function createStore(): Promise<Writable<Map<number, main.Bill>> & { refresh: Function }> {
|
||||
const bills: Map<number, main.Bill> = new Map<number, main.Bill>();
|
||||
const res = await GetBills();
|
||||
if (!res.success) {
|
||||
toast.error("Error getting bills " + res.error);
|
||||
} else {
|
||||
for (let i = 0; i < res.data.length; i++) {
|
||||
const bill = res.data[i];
|
||||
bills.set(bill.id, bill);
|
||||
}
|
||||
}
|
||||
|
||||
const { subscribe, update, set } = writable(bills);
|
||||
return {
|
||||
subscribe,
|
||||
update,
|
||||
set,
|
||||
refresh: async () => {
|
||||
const res = await GetBills();
|
||||
if (!res.success) {
|
||||
toast.error("Error getting bills " + res.error);
|
||||
} else {
|
||||
for (let i = 0; i < res.data.length; i++) {
|
||||
const bill = res.data[i];
|
||||
bills.set(bill.id, bill);
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
export const billsStore = await createStore();
|
34
frontend/src/lib/store/lastMonthPaymentsStore.ts
Normal file
34
frontend/src/lib/store/lastMonthPaymentsStore.ts
Normal file
@@ -0,0 +1,34 @@
|
||||
import { get, type Writable, writable } from "svelte/store";
|
||||
import { GetPaymentsForMonth } from "$wails/main/App";
|
||||
import { main } from "$wails/models";
|
||||
import { toast } from "svelte-sonner";
|
||||
import { scrollingTimeFrameStore } from "$lib/store/scrollingTimeFrameStore";
|
||||
|
||||
async function createStore(): Promise<Writable<main.Payment[]>> {
|
||||
const payments: main.Payment[] = [];
|
||||
const res = await GetPaymentsForMonth(get(scrollingTimeFrameStore).from);
|
||||
if (!res.success) {
|
||||
toast.error("Error getting payments " + res.error);
|
||||
} else {
|
||||
payments.push(...res.data);
|
||||
}
|
||||
|
||||
const { subscribe, update, set } = writable(payments);
|
||||
return {
|
||||
subscribe,
|
||||
update,
|
||||
set,
|
||||
};
|
||||
}
|
||||
|
||||
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 };
|
32
frontend/src/lib/store/scrollingTimeFrameStore.ts
Normal file
32
frontend/src/lib/store/scrollingTimeFrameStore.ts
Normal file
@@ -0,0 +1,32 @@
|
||||
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();
|
||||
thism.setMonth(thism.getMonth() - 1);
|
||||
lastm.setMonth(lastm.getMonth() - 2);
|
||||
|
||||
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();
|
34
frontend/src/lib/store/thisMonthPaymentsStore.ts
Normal file
34
frontend/src/lib/store/thisMonthPaymentsStore.ts
Normal file
@@ -0,0 +1,34 @@
|
||||
import { get, type Writable, writable } from "svelte/store";
|
||||
import { GetPaymentsForMonth } from "$wails/main/App";
|
||||
import { main } from "$wails/models";
|
||||
import { toast } from "svelte-sonner";
|
||||
import { scrollingTimeFrameStore } from "$lib/store/scrollingTimeFrameStore";
|
||||
|
||||
async function createStore(): Promise<Writable<main.Payment[]>> {
|
||||
const payments: main.Payment[] = [];
|
||||
const res = await GetPaymentsForMonth(get(scrollingTimeFrameStore).to);
|
||||
if (!res.success) {
|
||||
toast.error("Error getting payments " + res.error);
|
||||
} else {
|
||||
payments.push(...res.data);
|
||||
}
|
||||
|
||||
const { subscribe, update, set } = writable(payments);
|
||||
return {
|
||||
subscribe,
|
||||
update,
|
||||
set,
|
||||
};
|
||||
}
|
||||
|
||||
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 };
|
11
frontend/src/lib/types.ts
Normal file
11
frontend/src/lib/types.ts
Normal file
@@ -0,0 +1,11 @@
|
||||
import { main } from "$wails/models";
|
||||
|
||||
export type PaymentBill = {
|
||||
id: number;
|
||||
name: string;
|
||||
payment: main.Payment|null;
|
||||
};
|
||||
export type ScrollingTimeframe = {
|
||||
from: Date;
|
||||
to: Date;
|
||||
}
|
@@ -1,3 +1,7 @@
|
||||
@tailwind base;
|
||||
@tailwind components;
|
||||
@tailwind utilities;
|
||||
|
||||
html {
|
||||
background-color: rgba(27, 38, 54, 1);
|
||||
text-align: center;
|
||||
|
16
frontend/wailsjs/go/main/App.d.ts
vendored
Normal file
16
frontend/wailsjs/go/main/App.d.ts
vendored
Normal file
@@ -0,0 +1,16 @@
|
||||
// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
|
||||
// This file is automatically generated. DO NOT EDIT
|
||||
import {main} from '../models';
|
||||
import {time} from '../models';
|
||||
|
||||
export function Close():Promise<void>;
|
||||
|
||||
export function EmptyBill():Promise<main.Bill>;
|
||||
|
||||
export function EmptyPayment():Promise<main.Payment>;
|
||||
|
||||
export function GetBills():Promise<main.WailsBills>;
|
||||
|
||||
export function GetPaymentsForMonth(arg1:time.Time):Promise<main.WailsPayments>;
|
||||
|
||||
export function SetPaid(arg1:number,arg2:time.Time):Promise<main.WailsPayment>;
|
27
frontend/wailsjs/go/main/App.js
Normal file
27
frontend/wailsjs/go/main/App.js
Normal file
@@ -0,0 +1,27 @@
|
||||
// @ts-check
|
||||
// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
|
||||
// This file is automatically generated. DO NOT EDIT
|
||||
|
||||
export function Close() {
|
||||
return window['go']['main']['App']['Close']();
|
||||
}
|
||||
|
||||
export function EmptyBill() {
|
||||
return window['go']['main']['App']['EmptyBill']();
|
||||
}
|
||||
|
||||
export function EmptyPayment() {
|
||||
return window['go']['main']['App']['EmptyPayment']();
|
||||
}
|
||||
|
||||
export function GetBills() {
|
||||
return window['go']['main']['App']['GetBills']();
|
||||
}
|
||||
|
||||
export function GetPaymentsForMonth(arg1) {
|
||||
return window['go']['main']['App']['GetPaymentsForMonth'](arg1);
|
||||
}
|
||||
|
||||
export function SetPaid(arg1, arg2) {
|
||||
return window['go']['main']['App']['SetPaid'](arg1, arg2);
|
||||
}
|
174
frontend/wailsjs/go/models.ts
Normal file
174
frontend/wailsjs/go/models.ts
Normal file
@@ -0,0 +1,174 @@
|
||||
export namespace main {
|
||||
|
||||
export class Bill {
|
||||
id: number;
|
||||
name: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Bill(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
this.name = source["name"];
|
||||
}
|
||||
}
|
||||
export class Payment {
|
||||
id: number;
|
||||
billId: number;
|
||||
monthFor: time.Time;
|
||||
paymentDate: time.Time;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Payment(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
this.billId = source["billId"];
|
||||
this.monthFor = this.convertValues(source["monthFor"], time.Time);
|
||||
this.paymentDate = this.convertValues(source["paymentDate"], time.Time);
|
||||
}
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
}
|
||||
if (a.slice && a.map) {
|
||||
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||
} else if ("object" === typeof a) {
|
||||
if (asMap) {
|
||||
for (const key of Object.keys(a)) {
|
||||
a[key] = new classs(a[key]);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
return new classs(a);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
}
|
||||
export class WailsBills {
|
||||
data: Bill[];
|
||||
success: boolean;
|
||||
error: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new WailsBills(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.data = this.convertValues(source["data"], Bill);
|
||||
this.success = source["success"];
|
||||
this.error = source["error"];
|
||||
}
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
}
|
||||
if (a.slice && a.map) {
|
||||
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||
} else if ("object" === typeof a) {
|
||||
if (asMap) {
|
||||
for (const key of Object.keys(a)) {
|
||||
a[key] = new classs(a[key]);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
return new classs(a);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
}
|
||||
export class WailsPayment {
|
||||
data: Payment;
|
||||
success: boolean;
|
||||
error: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new WailsPayment(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.data = this.convertValues(source["data"], Payment);
|
||||
this.success = source["success"];
|
||||
this.error = source["error"];
|
||||
}
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
}
|
||||
if (a.slice && a.map) {
|
||||
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||
} else if ("object" === typeof a) {
|
||||
if (asMap) {
|
||||
for (const key of Object.keys(a)) {
|
||||
a[key] = new classs(a[key]);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
return new classs(a);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
}
|
||||
export class WailsPayments {
|
||||
data: Payment[];
|
||||
success: boolean;
|
||||
error: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new WailsPayments(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.data = this.convertValues(source["data"], Payment);
|
||||
this.success = source["success"];
|
||||
this.error = source["error"];
|
||||
}
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
}
|
||||
if (a.slice && a.map) {
|
||||
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||
} else if ("object" === typeof a) {
|
||||
if (asMap) {
|
||||
for (const key of Object.keys(a)) {
|
||||
a[key] = new classs(a[key]);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
return new classs(a);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
export namespace time {
|
||||
|
||||
export class Time {
|
||||
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Time(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
7
go.mod
7
go.mod
@@ -1,10 +1,13 @@
|
||||
module wails-template
|
||||
module bill-manager
|
||||
|
||||
go 1.21
|
||||
|
||||
toolchain go1.23.0
|
||||
|
||||
require github.com/wailsapp/wails/v2 v2.9.1
|
||||
require (
|
||||
github.com/mattn/go-sqlite3 v1.14.22
|
||||
github.com/wailsapp/wails/v2 v2.9.1
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/bep/debounce v1.2.1 // indirect
|
||||
|
2
go.sum
2
go.sum
@@ -35,6 +35,8 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k
|
||||
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
|
||||
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
|
||||
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
|
||||
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
|
||||
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
|
||||
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
|
||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||
|
48
main.go
48
main.go
@@ -2,22 +2,66 @@ package main
|
||||
|
||||
import (
|
||||
"embed"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
"os"
|
||||
|
||||
"github.com/wailsapp/wails/v2"
|
||||
"github.com/wailsapp/wails/v2/pkg/options"
|
||||
"github.com/wailsapp/wails/v2/pkg/options/assetserver"
|
||||
)
|
||||
|
||||
var Error *log.Logger
|
||||
var Warning *log.Logger
|
||||
|
||||
func init() {
|
||||
log.SetFlags(log.Lmicroseconds | log.Lshortfile)
|
||||
logFile, err := os.Create("main.log")
|
||||
if err != nil {
|
||||
log.Printf("Error creating log file: %v", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
logger := io.MultiWriter(os.Stdout, logFile)
|
||||
log.SetOutput(logger)
|
||||
|
||||
Error = log.New(io.MultiWriter(logFile, os.Stderr, os.Stdout),
|
||||
fmt.Sprintf("%sERROR:%s ", "\033[0;101m", "\033[0m"),
|
||||
log.Lmicroseconds|log.Lshortfile)
|
||||
Warning = log.New(io.MultiWriter(logFile, os.Stdout),
|
||||
fmt.Sprintf("%sWarning:%s ", "\033[0;93m", "\033[0m"),
|
||||
log.Lmicroseconds|log.Lshortfile)
|
||||
}
|
||||
|
||||
//go:embed all:frontend/dist
|
||||
var assets embed.FS
|
||||
|
||||
//go:embed ddl.sql
|
||||
var ddl string
|
||||
var service *BillService
|
||||
|
||||
func main() {
|
||||
db := DB{
|
||||
path: "bills.db",
|
||||
}
|
||||
db.Open()
|
||||
defer db.Close()
|
||||
err := db.Init(ddl)
|
||||
if err != nil {
|
||||
Error.Printf("Error initializing database: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
service = &BillService{
|
||||
db: &db,
|
||||
}
|
||||
|
||||
// Create an instance of the app structure
|
||||
app := NewApp()
|
||||
|
||||
// Create application with options
|
||||
err := wails.Run(&options.App{
|
||||
Title: "wails-template",
|
||||
err = wails.Run(&options.App{
|
||||
Title: "bill-manager",
|
||||
Width: 1024,
|
||||
Height: 768,
|
||||
AssetServer: &assetserver.Options{
|
||||
|
136
service.go
Normal file
136
service.go
Normal file
@@ -0,0 +1,136 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"time"
|
||||
)
|
||||
|
||||
type BillService struct {
|
||||
db *DB
|
||||
bills map[int64]Bill
|
||||
}
|
||||
|
||||
const paymentColumns = "id, billid, monthFor, paymentDate"
|
||||
const billColumns = "id, name"
|
||||
|
||||
func (s *BillService) GetPaymentsForDate(date time.Time) ([]Payment, error) {
|
||||
log.Printf("GetPaymentsForDate for %v", date)
|
||||
res := []Payment{}
|
||||
if s == nil {
|
||||
return res, fmt.Errorf("calling GetPaymentsFor on nil BillService")
|
||||
}
|
||||
if s.db == nil || !s.db.Ready {
|
||||
return res, fmt.Errorf("cannot get payments, db is nil or not ready - %v", s.db)
|
||||
}
|
||||
|
||||
rows, err := s.db.readConn.Query(fmt.Sprintf(`
|
||||
SELECT %s
|
||||
FROM Payment
|
||||
WHERE monthFor = date(strftime('%%Y-%%m-01', ?));
|
||||
`, paymentColumns), date)
|
||||
if err != nil {
|
||||
return res, fmt.Errorf("query for payments of %s failed with error: %v", date, err)
|
||||
}
|
||||
|
||||
for rows.Next() {
|
||||
payment := Payment{}
|
||||
err = rows.Scan(&payment.Id, &payment.BillId, &payment.MonthFor, &payment.PaymentDate)
|
||||
if err != nil {
|
||||
Error.Printf("failed to scan row: %v", err)
|
||||
continue
|
||||
}
|
||||
res = append(res, payment)
|
||||
}
|
||||
|
||||
return res, nil
|
||||
}
|
||||
|
||||
func (s *BillService) GetPaymentForBillAndDate(billid int64, date time.Time) (Payment, error) {
|
||||
log.Printf("GetPaymentForBillAndDate for %d and %s", billid, date)
|
||||
res := Payment{}
|
||||
if s == nil {
|
||||
return res, fmt.Errorf("calling GetPaymentsFor on nil BillService")
|
||||
}
|
||||
if s.db == nil || !s.db.Ready {
|
||||
return res, fmt.Errorf("cannot get payments, db is nil or not ready - %v", s.db)
|
||||
}
|
||||
|
||||
row := s.db.readConn.QueryRow(fmt.Sprintf(`
|
||||
SELECT %s
|
||||
FROM Payment
|
||||
WHERE billid = ? AND monthFor = date(strftime('%%Y-%%m-01', ?));
|
||||
`, paymentColumns), billid, date)
|
||||
|
||||
err := row.Scan(&res.Id, &res.BillId, &res.MonthFor, &res.PaymentDate)
|
||||
if err != nil {
|
||||
return res, fmt.Errorf("failed scanning row: %v", err)
|
||||
}
|
||||
|
||||
return res, nil
|
||||
}
|
||||
|
||||
func (s *BillService) GetAllBills() ([]Bill, error) {
|
||||
log.Printf("GetAllBills")
|
||||
res := []Bill{}
|
||||
if s == nil {
|
||||
return res, fmt.Errorf("calling GetAllBills on nil BillService")
|
||||
}
|
||||
if s.db == nil || !s.db.Ready {
|
||||
return res, fmt.Errorf("cannot get bills, db is nil or not ready - %v", s.db)
|
||||
}
|
||||
|
||||
rows, err := s.db.readConn.Query(fmt.Sprintf(`SELECT %s FROM Bill ORDER BY name`, billColumns))
|
||||
if err != nil {
|
||||
return res, fmt.Errorf("failed to query for bills: %w", err)
|
||||
}
|
||||
|
||||
for rows.Next() {
|
||||
bill := Bill{}
|
||||
err := rows.Scan(&bill.Id, &bill.Name)
|
||||
if err != nil {
|
||||
Error.Printf("failed to scan row: %v", err)
|
||||
continue
|
||||
}
|
||||
res = append(res, bill)
|
||||
}
|
||||
|
||||
s.bills = make(map[int64]Bill)
|
||||
for _, bill := range res {
|
||||
s.bills[bill.Id] = bill
|
||||
}
|
||||
|
||||
return res, nil
|
||||
}
|
||||
|
||||
func (s *BillService) MarkPaid(billid int64, monthFor time.Time, when time.Time) (Payment, error) {
|
||||
log.Printf("MarkPaid for %d, %v and %v", billid, monthFor, when)
|
||||
res := Payment{}
|
||||
if s == nil {
|
||||
return res, fmt.Errorf("calling MarkPaid on nil BillService")
|
||||
}
|
||||
if s.db == nil || !s.db.Ready {
|
||||
return res, fmt.Errorf("cannot mark bill paid, db is nil or not ready - %v", s.db)
|
||||
}
|
||||
|
||||
qres, err := s.db.writeConn.Exec(`
|
||||
INSERT INTO Payment (billid, monthFor, paymentDate)
|
||||
VALUES (?, date(strftime('%Y-%m-01', ?)), ?)
|
||||
ON CONFLICT(billid, monthFor) DO UPDATE SET
|
||||
paymentDate = excluded.paymentDate
|
||||
WHERE Payment.paymentDate IS NULL
|
||||
`, billid, monthFor, when)
|
||||
if err != nil {
|
||||
return res, fmt.Errorf("failed upserting into payment with error: %w", err)
|
||||
}
|
||||
|
||||
rows, err := qres.RowsAffected()
|
||||
if err != nil {
|
||||
return res, fmt.Errorf("failed to get rows affected: %w", err)
|
||||
}
|
||||
if rows == 0 {
|
||||
return res, fmt.Errorf("no rows affected")
|
||||
}
|
||||
|
||||
return s.GetPaymentForBillAndDate(billid, monthFor)
|
||||
}
|
32
types.go
Normal file
32
types.go
Normal file
@@ -0,0 +1,32 @@
|
||||
package main
|
||||
|
||||
import "time"
|
||||
|
||||
type (
|
||||
Bill struct {
|
||||
Id int64 `json:"id"`
|
||||
Name string `json:"name"`
|
||||
}
|
||||
Payment struct {
|
||||
Id int64 `json:"id"`
|
||||
BillId int64 `json:"billId"`
|
||||
MonthFor time.Time `json:"monthFor" time_format:"2006-01-02"`
|
||||
PaymentDate time.Time `json:"paymentDate" time_format:"2006-01-02T15:04:05"`
|
||||
}
|
||||
|
||||
WailsBills struct {
|
||||
Data []Bill `json:"data"`
|
||||
Success bool `json:"success"`
|
||||
Error string `json:"error"`
|
||||
}
|
||||
WailsPayments struct {
|
||||
Data []Payment `json:"data"`
|
||||
Success bool `json:"success"`
|
||||
Error string `json:"error"`
|
||||
}
|
||||
WailsPayment struct {
|
||||
Data Payment `json:"data"`
|
||||
Success bool `json:"success"`
|
||||
Error string `json:"error"`
|
||||
}
|
||||
)
|
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "https://wails.io/schemas/config.v2.json",
|
||||
"name": "wails-template",
|
||||
"outputfilename": "wails-template",
|
||||
"name": "bill-manager",
|
||||
"outputfilename": "bill-manager",
|
||||
"frontend:install": "pnpm install",
|
||||
"frontend:build": "pnpm build",
|
||||
"frontend:dev:watcher": "pnpm dev",
|
||||
|
Reference in New Issue
Block a user