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

Compare commits

base: dave:1.5.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:workflow
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

1 Commits
1.5.0 ... workflow

Author SHA1 Message Date
PhatPhuckDave
64e2603542 Add publish workflow 2024-08-10 01:15:02 +02:00
19 changed files with 129 additions and 155 deletions
Expand all files Collapse all files

100
.gitea/workflows/publish.yaml Normal file
View File

@@ -0,0 +1,100 @@
# TODO: Need to install node here... How the fuck am I going to cache that bullshit...
# Figure out how to cache bullshit node
name: Release
on:
push:
tags:
- 'v*.*.*'
branches:
- master
jobs:
Publish:
runs-on: ubuntu-latest
env:
RUNNER_TOOL_CACHE: /opt/hostedtoolcache
GOMODCACHE: /opt/hostedtoolcache/go/pkg/mod
steps:
- name: Check out repository code
uses: actions/checkout@v4
- name: Get Go
uses: actions/setup-go@v3
with:
go-version-file: 'go.mod'
check-latest: true
cache: true
- name: Setup Wails
run: |
# Install Wails CLI (if needed)
go install github.com/wailsapp/wails/v2/cmd/wails@latest
- name: Build wails
run: wails build -platform darwin/amd64,darwin/arm64,windows/amd64,windows/arm64,linux/amd64,linux/arm64
- name: Create Release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
body: |
Release notes for ${{ github.ref }}
- name: Upload Windows AMD64
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: build/bin/calorie-counter-amd64.exe
asset_name: calorie-counter-amd64.exe
asset_content_type: application/octet-stream
- name: Upload Windows ARM64
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: build/bin/calorie-counter-arm64.exe
asset_name: calorie-counter-arm64.exe
asset_content_type: application/octet-stream
- name: Upload Linux AMD64
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: build/bin/calorie-counter-amd64.exe
asset_name: calorie-counter-amd64.exe
asset_content_type: application/octet-stream
- name: Upload Linux ARM64
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: build/bin/calorie-counter-arm64.exe
asset_name: calorie-counter-arm64.exe
asset_content_type: application/octet-stream
- name: Upload Darwin AMD64
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: build/bin/calorie-counter-amd64.exe
asset_name: calorie-counter-amd64.exe
asset_content_type: application/octet-stream
- name: Upload Darwin ARM64
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: build/bin/calorie-counter-arm64.exe
asset_name: calorie-counter-arm64.exe
asset_content_type: application/octet-stream

6
app.go
View File

@@ -2,7 +2,6 @@ package main
import ( import (
"context" "context"
"os"
) )
// App struct // App struct
@@ -136,8 +135,3 @@ 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,15 +1,12 @@
<!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>

11
frontend/package.json
View File

@@ -10,10 +10,6 @@
"check": "svelte-check --tsconfig ./tsconfig.json" "check": "svelte-check --tsconfig ./tsconfig.json"
}, },
"devDependencies": { "devDependencies": {
"@fortawesome/fontawesome-svg-core": "^6.5.2",
"@fortawesome/free-brands-svg-icons": "^6.5.2",
"@fortawesome/free-regular-svg-icons": "^6.5.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
"@sveltejs/vite-plugin-svelte": "^1.0.1", "@sveltejs/vite-plugin-svelte": "^1.0.1",
"@tsconfig/svelte": "^3.0.0", "@tsconfig/svelte": "^3.0.0",
"svelte": "^3.49.0", "svelte": "^3.49.0",
@@ -25,12 +21,15 @@
"tailwindcss": "^3.4.3", "tailwindcss": "^3.4.3",
"tslib": "^2.4.0", "tslib": "^2.4.0",
"typescript": "^4.6.4", "typescript": "^4.6.4",
"vite": "^3.0.7" "vite": "^3.0.7",
"@fortawesome/fontawesome-svg-core": "^6.5.2",
"@fortawesome/free-brands-svg-icons": "^6.5.2",
"@fortawesome/free-regular-svg-icons": "^6.5.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2"
}, },
"dependencies": { "dependencies": {
"autoprefixer": "^10.4.20", "autoprefixer": "^10.4.20",
"chart.js": "^4.4.3", "chart.js": "^4.4.3",
"regression": "^2.0.1",
"svelte-chartjs": "^3.1.5" "svelte-chartjs": "^3.1.5"
} }
} }

2
frontend/package.json.md5
View File

@@ -1 +1 @@
23e2cc3e28f96f9d63ed35c0a34c1dcd bd9b801d4541f25052f0d4cb72b7d95a

8
frontend/pnpm-lock.yaml generated
View File

@@ -14,9 +14,6 @@ importers:
chart.js: chart.js:
specifier: ^4.4.3 specifier: ^4.4.3
version: 4.4.3 version: 4.4.3
regression:
specifier: ^2.0.1
version: 2.0.1
svelte-chartjs: svelte-chartjs:
specifier: ^3.1.5 specifier: ^3.1.5
version: 3.1.5(chart.js@4.4.3)(svelte@3.59.2) version: 3.1.5(chart.js@4.4.3)(svelte@3.59.2)
@@ -717,9 +714,6 @@ packages:
resolution: {integrity: sha512-A1PeDEYMrkLrfyOwv2jwihXbo9qxdGD3atBYQA9JJgreAx8/7rC6IUkWOw2NQlOxLp2wL0ifQbh1HuidDfYA6w==} resolution: {integrity: sha512-A1PeDEYMrkLrfyOwv2jwihXbo9qxdGD3atBYQA9JJgreAx8/7rC6IUkWOw2NQlOxLp2wL0ifQbh1HuidDfYA6w==}
engines: {node: '>=8'} engines: {node: '>=8'}
regression@2.0.1:
resolution: {integrity: sha512-A4XYsc37dsBaNOgEjkJKzfJlE394IMmUPlI/p3TTI9u3T+2a+eox5Pr/CPUqF0eszeWZJPAc6QkroAhuUpWDJQ==}
resolve-from@4.0.0: resolve-from@4.0.0:
resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
engines: {node: '>=4'} engines: {node: '>=4'}
@@ -1518,8 +1512,6 @@ snapshots:
regexparam@2.0.2: {} regexparam@2.0.2: {}
regression@2.0.1: {}
resolve-from@4.0.0: {} resolve-from@4.0.0: {}
resolve@1.22.8: resolve@1.22.8:

23
frontend/src/App.svelte
View File

@@ -1,30 +1,9 @@
<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 { Close } from "$wails/main/App"; import { Toaster } from 'svelte-sonner'
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 />

12
frontend/src/lib/components/Energy/Aggregated/AggregatedFoodTable.svelte
View File

@@ -3,7 +3,6 @@
import AggregatedFoodComp from "$lib/components/Energy/Aggregated/AggregatedFoodComp.svelte"; import AggregatedFoodComp from "$lib/components/Energy/Aggregated/AggregatedFoodComp.svelte";
import { main } from "$wails/models"; import { main } from "$wails/models";
import type { ChartData, Point } from "chart.js"; import type { ChartData, Point } from "chart.js";
import regression from "regression";
import { import {
CategoryScale, CategoryScale,
Chart as ChartJS, Chart as ChartJS,
@@ -14,7 +13,6 @@
Title, Title,
Tooltip, Tooltip,
} from "chart.js"; } from "chart.js";
import { CalculateR2 } from "$lib/utils";
ChartJS.register(Title, Tooltip, Legend, LineElement, LinearScale, PointElement, CategoryScale); ChartJS.register(Title, Tooltip, Legend, LineElement, LinearScale, PointElement, CategoryScale);
@@ -34,7 +32,7 @@
pointHoverBorderColor: "rgba(220, 220, 220, 1)", pointHoverBorderColor: "rgba(220, 220, 220, 1)",
pointHoverBorderWidth: 2, pointHoverBorderWidth: 2,
pointRadius: 1, pointRadius: 1,
pointHitRadius: 20, pointHitRadius: 10,
}; };
const data: ChartData<"line", (number | Point)[]> = { const data: ChartData<"line", (number | Point)[]> = {
labels: reversedItems.map((f) => f.period), labels: reversedItems.map((f) => f.period),
@@ -76,14 +74,6 @@
}, },
], ],
}; };
data.datasets.push({
...defaultOptions,
label: "R2",
data: CalculateR2(reversedItems.map((f, i) => [i, f.energy])),
borderColor: "#04d1d1",
pointBorderColor: "#04d1d1",
pointRadius: 0,
});
</script> </script>
<template> <template>

5
frontend/src/lib/components/Energy/EmptyFoodComp.svelte
View File

@@ -19,7 +19,6 @@
let per100: string = ""; let per100: string = "";
let per100Edited: boolean = false; let per100Edited: boolean = false;
let per100Element: HTMLTableCellElement; let per100Element: HTMLTableCellElement;
let nameElement: HTMLTableCellElement;
async function update(event: KeyboardEvent & { currentTarget: EventTarget & HTMLTableCellElement }) { async function update(event: KeyboardEvent & { currentTarget: EventTarget & HTMLTableCellElement }) {
name = name.trim(); name = name.trim();
@@ -27,7 +26,7 @@
description = description.trim(); description = description.trim();
per100 = per100.trim(); per100 = per100.trim();
if (!per100Edited && event.currentTarget == per100Element) per100Edited = true; if (!per100Edited && event.currentTarget === per100Element) per100Edited = true;
if (event.key == "Enter") { if (event.key == "Enter") {
event.preventDefault(); event.preventDefault();
@@ -49,7 +48,6 @@
} }
foodStore.update((value) => [res.data, ...value]); foodStore.update((value) => [res.data, ...value]);
nameElement.focus();
} }
if (!per100Edited) if (!per100Edited)
@@ -77,7 +75,6 @@
contenteditable="true" contenteditable="true"
autofocus autofocus
on:keydown={update} on:keydown={update}
bind:this={nameElement}
> >
</td> </td>
<td <td

18
frontend/src/lib/components/Energy/EnergyToday.svelte
View File

@@ -34,18 +34,16 @@
remainingToday = $settingsStore.target; remainingToday = $settingsStore.target;
let now = new Date(); let now = new Date();
let todayDate = formatter.format(now); let todayDate = formatter.format(now);
const [day, month, year] = todayDate.split("/"); const [day, month, year] = todayDate.split('/');
todayDate = `${year}-${month}-${day}`; todayDate = `${year}-${month}-${day}`;
if ($foodStore) { $foodStore.forEach((food) => {
$foodStore.forEach((food) => { if (food.date.split("T")[0] == todayDate) {
if (food.date.split("T")[0] == todayDate) { remainingToday -= food.energy;
remainingToday -= food.energy; } else {
} else { return;
return; }
} });
});
}
remainingToday = Math.round(remainingToday); remainingToday = Math.round(remainingToday);
computeColor(); computeColor();
} }

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

@@ -1,11 +1,10 @@
<script lang="ts"> <script lang="ts">
import { GenerateColor, RemoveExistingColors } from "$lib/utils"; import { GenerateColor } 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;

4
frontend/src/lib/components/Header.svelte
View File

@@ -1,10 +1,9 @@
<script lang="ts"> <script lang="ts">
import { link, location } from "svelte-spa-router"; import { link, location } from "svelte-spa-router";
import { faGear} from "@fortawesome/free-solid-svg-icons"; import { faGear } from "@fortawesome/free-solid-svg-icons";
import Fa from "svelte-fa"; import Fa from "svelte-fa";
import Settings from "./Settings/Settings.svelte"; import Settings from "./Settings/Settings.svelte";
import EnergyToday from "./Energy/EnergyToday.svelte"; import EnergyToday from "./Energy/EnergyToday.svelte";
import RefreshComponent from "./RefreshComponent.svelte";
Fa; Fa;
type Link = { type Link = {
@@ -89,7 +88,6 @@
<Fa icon={faGear} scale={2} /> <Fa icon={faGear} scale={2} />
</button> </button>
</div> </div>
<RefreshComponent />
<EnergyToday /> <EnergyToday />
</header> </header>

42
frontend/src/lib/components/RefreshComponent.svelte
View File

@@ -1,42 +0,0 @@
<script lang="ts">
import { dailyFoodStore } from "$lib/store/Energy/dailyFoodStore";
import { monthlyFoodStore } from "$lib/store/Energy/monthlyFoodStore";
import { weeklyFoodStore } from "$lib/store/Energy/weeklyFoodStore";
import { yearlyFoodStore } from "$lib/store/Energy/yearlyFoodStore";
import { dailyWeightStore } from "$lib/store/Weight/dailyWeightStore";
import { monthlyWeightStore } from "$lib/store/Weight/monthlyWeightStore";
import { weeklyWeightStore } from "$lib/store/Weight/weeklyWeightStore";
import { yearlyWeightStore } from "$lib/store/Weight/yearlyWeightStore";
import { faRefresh } from "@fortawesome/free-solid-svg-icons";
import Fa from "svelte-fa";
Fa;
// YES refresh DOES exist FFS
function refreshStores() {
// @ts-ignore
dailyFoodStore.refresh();
// @ts-ignore
weeklyFoodStore.refresh();
// @ts-ignore
monthlyFoodStore.refresh();
// @ts-ignore
yearlyFoodStore.refresh();
// @ts-ignore
dailyWeightStore.refresh();
// @ts-ignore
weeklyWeightStore.refresh();
// @ts-ignore
monthlyWeightStore.refresh();
// @ts-ignore
yearlyWeightStore.refresh();
}
</script>
<template>
<!-- svelte-ignore a11y-click-events-have-key-events -->
<div class="absolute right-20 pt-4 pb-4 pr-8 pl-8 cursor-pointer" on:click={refreshStores}>
<button>
<Fa icon={faRefresh} scale={2} />
</button>
</div>
</template>

9
frontend/src/lib/components/Weight/Aggregated/AggregatedWeightTable.svelte
View File

@@ -13,7 +13,6 @@
Title, Title,
Tooltip, Tooltip,
} from "chart.js"; } from "chart.js";
import { CalculateR2 } from "$lib/utils";
ChartJS.register(Title, Tooltip, Legend, LineElement, LinearScale, PointElement, CategoryScale); ChartJS.register(Title, Tooltip, Legend, LineElement, LinearScale, PointElement, CategoryScale);
@@ -45,14 +44,6 @@
}, },
], ],
}; };
data.datasets.push({
...defaultOptions,
label: "R2",
data: CalculateR2(reversedItems.map((f, i) => [i, f.amount])),
borderColor: "#04d1d1",
pointBorderColor: "#04d1d1",
pointRadius: 0,
});
</script> </script>
<template> <template>

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

@@ -1,11 +1,10 @@
<script lang="ts"> <script lang="ts">
import { GenerateColor, RemoveExistingColors } from "$lib/utils"; import { GenerateColor } 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,6 +4,7 @@
let forceUpdate = false; let forceUpdate = false;
weightStore.subscribe(() => { weightStore.subscribe(() => {
console.log("updte");
forceUpdate = !forceUpdate; forceUpdate = !forceUpdate;
}); });
</script> </script>

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

@@ -1,7 +1,5 @@
import { cubicOut } from "svelte/easing"; import { cubicOut } from "svelte/easing";
import type { TransitionConfig } from "svelte/transition"; import type { TransitionConfig } from "svelte/transition";
import regression from "regression";
import type { ChartData, Point } from "chart.js";
type FlyAndScaleParams = { type FlyAndScaleParams = {
y?: number; y?: number;
@@ -70,11 +68,8 @@ function GenerateRandomHSL(): Color {
const existingColors: Color[] = []; const existingColors: Color[] = [];
function RemoveExistingColors() {
existingColors.length = 0;
}
function GenerateColor(): string { function GenerateColor(): string {
const minDistance = 5; const minDistance = 15;
let newColor: Color; let newColor: Color;
let isDistinct = false; let isDistinct = false;
@@ -94,9 +89,7 @@ function GenerateColor(): string {
break; break;
} }
} }
if (isDistinct) { existingColors.push(newColor);
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
@@ -111,10 +104,5 @@ function LerpColor(color1: Color, color2: Color, t: number): Color {
return { h, s, l }; return { h, s, l };
} }
function CalculateR2(input: [number, number][]): number[] { export { GenerateColor, LerpColor };
const reg = regression.linear(input);
return reg.points.map((point: [number, number]) => point[1]);
}
export { GenerateColor, LerpColor, RemoveExistingColors, CalculateR2 };
export type { Color }; export type { Color };

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

@@ -2,8 +2,6 @@
// 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,10 +2,6 @@
// 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);
} }