dave/calorie-counter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

Compare commits

base: dave:1.2.0
Branches Tags
dave:master dave:workflow
dave:2.3.0 dave:2.2.1 dave:2.2.0 dave:2.1.1 dave:2.1.0 dave:2.0.1 dave:2.0.0 dave:1.6.1 dave:1.6.0 dave:1.5.0 dave:1.4.0 dave:1.3.0 dave:1.2.0 dave:1.1.0 dave:1.0.1 dave:1.0.0
...
compare: dave:1.3.0
Branches Tags
dave:master dave:workflow
dave:2.3.0 dave:2.2.1 dave:2.2.0 dave:2.1.1 dave:2.1.0 dave:2.0.1 dave:2.0.0 dave:1.6.1 dave:1.6.0 dave:1.5.0 dave:1.4.0 dave:1.3.0 dave:1.2.0 dave:1.1.0 dave:1.0.1 dave:1.0.0

3 Commits
1.2.0 ... 1.3.0

Author SHA1 Message Date
PhatPhuckDave
376201373e Improve and fix issues with color generation 2024-08-10 19:36:26 +02:00
PhatPhuckDave
84002d1856 Implement ctrl-tab navigation between weight and energy 2024-08-10 19:36:17 +02:00
PhatPhuckDave
3118069297 Implement refresh on ctrl-r and close on ctrl-w 2024-08-10 19:22:19 +02:00
9 changed files with 54 additions and 12 deletions
Expand all files Collapse all files

6
app.go
View File

@@ -2,6 +2,7 @@ package main
import ( import (
"context" "context"
"os"
) )
// App struct // App struct
@@ -135,3 +136,8 @@ func (a *App) SetSetting(key string, value int64) WailsGenericAck {
} }
return WailsGenericAck{Success: true} return WailsGenericAck{Success: true}
} }
//region other
func (a *App) Close() {
os.Exit(0)
}

13
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>calorie-counter</title> <title>calorie-counter</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>

23
frontend/src/App.svelte
View File

@@ -1,9 +1,30 @@
<script lang="ts"> <script lang="ts">
import Header from "$lib/components/Header.svelte"; import Header from "$lib/components/Header.svelte";
import Router from "$lib/router/Router.svelte"; import Router from "$lib/router/Router.svelte";
import { Toaster } from 'svelte-sonner' import { Close } from "$wails/main/App";
import { Toaster } from "svelte-sonner";
import * as srouter from "svelte-spa-router";
import { location } from "svelte-spa-router";
function keyDown(event: KeyboardEvent) {
if (event.ctrlKey && event.key == "r") {
window.location.reload();
}
if (event.ctrlKey && event.key == "w") {
Close();
}
if (event.ctrlKey && event.key == "Tab") {
if ($location == "/") {
srouter.replace("/Weight");
} else if ($location == "/Weight") {
srouter.replace("/");
}
}
}
</script> </script>
<svelte:window on:keydown={keyDown} />
<Toaster /> <Toaster />
<template> <template>
<Header /> <Header />

3
frontend/src/lib/components/Energy/FoodTable.svelte
View File

@@ -1,10 +1,11 @@
<script lang="ts"> <script lang="ts">
import { GenerateColor } from "$lib/utils"; import { GenerateColor, RemoveExistingColors } from "$lib/utils";
import { main } from "$wails/models"; import { main } from "$wails/models";
import EmptyFoodComp from "./EmptyFoodComp.svelte"; import EmptyFoodComp from "./EmptyFoodComp.svelte";
import FoodComp from "./FoodComp.svelte"; import FoodComp from "./FoodComp.svelte";
export let items: main.Food[] = []; export let items: main.Food[] = [];
RemoveExistingColors();
let minCal = 1e5; let minCal = 1e5;
let maxCal = 0; let maxCal = 0;

3
frontend/src/lib/components/Weight/WeightTable.svelte
View File

@@ -1,10 +1,11 @@
<script lang="ts"> <script lang="ts">
import { GenerateColor } from "$lib/utils"; import { GenerateColor, RemoveExistingColors } from "$lib/utils";
import EmptyWeightComp from "$components/Weight/EmptyWeightComp.svelte"; import EmptyWeightComp from "$components/Weight/EmptyWeightComp.svelte";
import WeightComp from "$components/Weight/WeightComp.svelte"; import WeightComp from "$components/Weight/WeightComp.svelte";
import { main } from "$wails/models"; import { main } from "$wails/models";
export let items: main.Weight[] = []; export let items: main.Weight[] = [];
RemoveExistingColors();
const dateColors: Map<string, string> = new Map<string, string>(); const dateColors: Map<string, string> = new Map<string, string>();

1
frontend/src/lib/router/routes/Weight/Weight.svelte
View File

@@ -4,7 +4,6 @@
let forceUpdate = false; let forceUpdate = false;
weightStore.subscribe(() => { weightStore.subscribe(() => {
console.log("updte");
forceUpdate = !forceUpdate; forceUpdate = !forceUpdate;
}); });
</script> </script>

11
frontend/src/lib/utils.ts
View File

@@ -68,8 +68,11 @@ function GenerateRandomHSL(): Color {
const existingColors: Color[] = []; const existingColors: Color[] = [];
function RemoveExistingColors() {
existingColors.length = 0;
}
function GenerateColor(): string { function GenerateColor(): string {
const minDistance = 15; const minDistance = 5;
let newColor: Color; let newColor: Color;
let isDistinct = false; let isDistinct = false;
@@ -89,7 +92,9 @@ function GenerateColor(): string {
break; break;
} }
} }
existingColors.push(newColor); if (isDistinct) {
existingColors.push(newColor);
}
} }
// We can not reach this point without having a color generated // We can not reach this point without having a color generated
@@ -104,5 +109,5 @@ function LerpColor(color1: Color, color2: Color, t: number): Color {
return { h, s, l }; return { h, s, l };
} }
export { GenerateColor, LerpColor }; export { GenerateColor, LerpColor, RemoveExistingColors };
export type { Color }; export type { Color };

2
frontend/wailsjs/go/main/App.d.ts vendored
View File

@@ -2,6 +2,8 @@
// This file is automatically generated. DO NOT EDIT // This file is automatically generated. DO NOT EDIT
import {main} from '../models'; import {main} from '../models';
export function Close():Promise<void>;
export function CreateFood(arg1:main.Food):Promise<main.WailsFood1>; export function CreateFood(arg1:main.Food):Promise<main.WailsFood1>;
export function CreateWeight(arg1:main.Weight):Promise<main.WailsWeight1>; export function CreateWeight(arg1:main.Weight):Promise<main.WailsWeight1>;

4
frontend/wailsjs/go/main/App.js
View File

@@ -2,6 +2,10 @@
// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
// This file is automatically generated. DO NOT EDIT // This file is automatically generated. DO NOT EDIT
export function Close() {
return window['go']['main']['App']['Close']();
}
export function CreateFood(arg1) { export function CreateFood(arg1) {
return window['go']['main']['App']['CreateFood'](arg1); return window['go']['main']['App']['CreateFood'](arg1);
} }