Add publish workflow

2024-08-10 01:15:02 +02:00
19 changed files with 129 additions and 155 deletions
--- a/.gitea/workflows/publish.yaml
+++ b/.gitea/workflows/publish.yaml
@@ -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
--- a/app.go
+++ b/app.go
@@ -2,7 +2,6 @@ package main

 import (
 	"context"
-	"os"
 )

 // App struct
@@ -136,8 +135,3 @@ func (a *App) SetSetting(key string, value int64) WailsGenericAck {
 	}
 	return WailsGenericAck{Success: true}
 }
-
-//region other
-func (a *App) Close() {
-	os.Exit(0)
-}
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -1,15 +1,12 @@
 <!DOCTYPE html>
 <html lang="en">
-
 <head>
-    <meta charset="UTF-8" />
-    <meta content="width=device-width, initial-scale=1.0" name="viewport" />
+    <meta charset="UTF-8"/>
+    <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
    <title>calorie-counter</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>
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -10,10 +10,6 @@
 		"check": "svelte-check --tsconfig ./tsconfig.json"
 	},
 	"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",
 		"@tsconfig/svelte": "^3.0.0",
 		"svelte": "^3.49.0",
@@ -25,12 +21,15 @@
 		"tailwindcss": "^3.4.3",
 		"tslib": "^2.4.0",
 		"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": {
 		"autoprefixer": "^10.4.20",
 		"chart.js": "^4.4.3",
-		"regression": "^2.0.1",
 		"svelte-chartjs": "^3.1.5"
 	}
 }
--- a/frontend/package.json.md5
+++ b/frontend/package.json.md5
@@ -1 +1 @@
-23e2cc3e28f96f9d63ed35c0a34c1dcd
+bd9b801d4541f25052f0d4cb72b7d95a
--- a/frontend/pnpm-lock.yaml
+++ b/frontend/pnpm-lock.yaml
@@ -14,9 +14,6 @@ importers:
      chart.js:
        specifier: ^4.4.3
        version: 4.4.3
-      regression:
-        specifier: ^2.0.1
-        version: 2.0.1
      svelte-chartjs:
        specifier: ^3.1.5
        version: 3.1.5(chart.js@4.4.3)(svelte@3.59.2)
@@ -717,9 +714,6 @@ packages:
    resolution: {integrity: sha512-A1PeDEYMrkLrfyOwv2jwihXbo9qxdGD3atBYQA9JJgreAx8/7rC6IUkWOw2NQlOxLp2wL0ifQbh1HuidDfYA6w==}
    engines: {node: '>=8'}

-  regression@2.0.1:
-    resolution: {integrity: sha512-A4XYsc37dsBaNOgEjkJKzfJlE394IMmUPlI/p3TTI9u3T+2a+eox5Pr/CPUqF0eszeWZJPAc6QkroAhuUpWDJQ==}
-
  resolve-from@4.0.0:
    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
    engines: {node: '>=4'}
@@ -1518,8 +1512,6 @@ snapshots:

  regexparam@2.0.2: {}

-  regression@2.0.1: {}
-
  resolve-from@4.0.0: {}

  resolve@1.22.8:
--- a/frontend/src/App.svelte
+++ b/frontend/src/App.svelte
@@ -1,30 +1,9 @@
 <script lang="ts">
 	import Header from "$lib/components/Header.svelte";
 	import Router from "$lib/router/Router.svelte";
-	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("/");
-			}
-		}
-	}
+	import { Toaster } from 'svelte-sonner'
 </script>

-<svelte:window on:keydown={keyDown} />
-
 <Toaster />
 <template>
 	<Header />
--- a/frontend/src/lib/components/Energy/Aggregated/AggregatedFoodTable.svelte
+++ b/frontend/src/lib/components/Energy/Aggregated/AggregatedFoodTable.svelte
@@ -3,7 +3,6 @@
 	import AggregatedFoodComp from "$lib/components/Energy/Aggregated/AggregatedFoodComp.svelte";
 	import { main } from "$wails/models";
 	import type { ChartData, Point } from "chart.js";
-	import regression from "regression";
 	import {
 		CategoryScale,
 		Chart as ChartJS,
@@ -14,7 +13,6 @@
 		Title,
 		Tooltip,
 	} from "chart.js";
-	import { CalculateR2 } from "$lib/utils";

 	ChartJS.register(Title, Tooltip, Legend, LineElement, LinearScale, PointElement, CategoryScale);

@@ -34,7 +32,7 @@
 		pointHoverBorderColor: "rgba(220, 220, 220, 1)",
 		pointHoverBorderWidth: 2,
 		pointRadius: 1,
-		pointHitRadius: 20,
+		pointHitRadius: 10,
 	};
 	const data: ChartData<"line", (number | Point)[]> = {
 		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>

 <template>
--- a/frontend/src/lib/components/Energy/EmptyFoodComp.svelte
+++ b/frontend/src/lib/components/Energy/EmptyFoodComp.svelte
@@ -19,7 +19,6 @@
 	let per100: string = "";
 	let per100Edited: boolean = false;
 	let per100Element: HTMLTableCellElement;
-	let nameElement: HTMLTableCellElement;

 	async function update(event: KeyboardEvent & { currentTarget: EventTarget & HTMLTableCellElement }) {
 		name = name.trim();
@@ -27,7 +26,7 @@
 		description = description.trim();
 		per100 = per100.trim();

-		if (!per100Edited && event.currentTarget == per100Element) per100Edited = true;
+		if (!per100Edited && event.currentTarget === per100Element) per100Edited = true;

 		if (event.key == "Enter") {
 			event.preventDefault();
@@ -49,7 +48,6 @@
 			}

 			foodStore.update((value) => [res.data, ...value]);
-			nameElement.focus();
 		}

 		if (!per100Edited)
@@ -77,7 +75,6 @@
 			contenteditable="true"
 			autofocus
 			on:keydown={update}
-			bind:this={nameElement}
 		>
 		</td>
 		<td
--- a/frontend/src/lib/components/Energy/EnergyToday.svelte
+++ b/frontend/src/lib/components/Energy/EnergyToday.svelte
@@ -34,10 +34,9 @@
 		remainingToday = $settingsStore.target;
 		let now = new Date();
 		let todayDate = formatter.format(now);
-		const [day, month, year] = todayDate.split("/");
+		const [day, month, year] = todayDate.split('/');
 		todayDate = `${year}-${month}-${day}`;

-		if ($foodStore) {
 		$foodStore.forEach((food) => {
 			if (food.date.split("T")[0] == todayDate) {
 				remainingToday -= food.energy;
@@ -45,7 +44,6 @@
 				return;
 			}
 		});
-		}
 		remainingToday = Math.round(remainingToday);
 		computeColor();
 	}
--- a/frontend/src/lib/components/Energy/FoodTable.svelte
+++ b/frontend/src/lib/components/Energy/FoodTable.svelte
@@ -1,11 +1,10 @@
 <script lang="ts">
-	import { GenerateColor, RemoveExistingColors } from "$lib/utils";
+	import { GenerateColor } from "$lib/utils";
 	import { main } from "$wails/models";
 	import EmptyFoodComp from "./EmptyFoodComp.svelte";
 	import FoodComp from "./FoodComp.svelte";

 	export let items: main.Food[] = [];
-	RemoveExistingColors();

 	let minCal = 1e5;
 	let maxCal = 0;
--- a/frontend/src/lib/components/Header.svelte
+++ b/frontend/src/lib/components/Header.svelte
@@ -1,10 +1,9 @@
 <script lang="ts">
 	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 Settings from "./Settings/Settings.svelte";
 	import EnergyToday from "./Energy/EnergyToday.svelte";
-	import RefreshComponent from "./RefreshComponent.svelte";
 	Fa;

 	type Link = {
@@ -89,7 +88,6 @@
 			<Fa icon={faGear} scale={2} />
 		</button>
 	</div>
-	<RefreshComponent />
 	<EnergyToday />
 </header>

--- a/frontend/src/lib/components/RefreshComponent.svelte
+++ b/frontend/src/lib/components/RefreshComponent.svelte
@@ -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>
--- a/frontend/src/lib/components/Weight/Aggregated/AggregatedWeightTable.svelte
+++ b/frontend/src/lib/components/Weight/Aggregated/AggregatedWeightTable.svelte
@@ -13,7 +13,6 @@
 		Title,
 		Tooltip,
 	} from "chart.js";
-	import { CalculateR2 } from "$lib/utils";

 	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>

 <template>
--- a/frontend/src/lib/components/Weight/WeightTable.svelte
+++ b/frontend/src/lib/components/Weight/WeightTable.svelte
@@ -1,11 +1,10 @@
 <script lang="ts">
-	import { GenerateColor, RemoveExistingColors } from "$lib/utils";
+	import { GenerateColor } from "$lib/utils";
 	import EmptyWeightComp from "$components/Weight/EmptyWeightComp.svelte";
 	import WeightComp from "$components/Weight/WeightComp.svelte";
 	import { main } from "$wails/models";

 	export let items: main.Weight[] = [];
-	RemoveExistingColors();

 	const dateColors: Map<string, string> = new Map<string, string>();

--- a/frontend/src/lib/router/routes/Weight/Weight.svelte
+++ b/frontend/src/lib/router/routes/Weight/Weight.svelte
@@ -4,6 +4,7 @@

 	let forceUpdate = false;
 	weightStore.subscribe(() => {
+		console.log("updte");
 		forceUpdate = !forceUpdate;
 	});
 </script>
--- a/frontend/src/lib/utils.ts
+++ b/frontend/src/lib/utils.ts
@@ -1,7 +1,5 @@
 import { cubicOut } from "svelte/easing";
 import type { TransitionConfig } from "svelte/transition";
-import regression from "regression";
-import type { ChartData, Point } from "chart.js";

 type FlyAndScaleParams = {
 	y?: number;
@@ -70,11 +68,8 @@ function GenerateRandomHSL(): Color {

 const existingColors: Color[] = [];

-function RemoveExistingColors() {
-	existingColors.length = 0;
-}
 function GenerateColor(): string {
-	const minDistance = 5;
+	const minDistance = 15;

 	let newColor: Color;
 	let isDistinct = false;
@@ -94,10 +89,8 @@ function GenerateColor(): string {
 				break;
 			}
 		}
-		if (isDistinct) {
 		existingColors.push(newColor);
 	}
-	}

 	// We can not reach this point without having a color generated
 	// @ts-ignore
@@ -111,10 +104,5 @@ function LerpColor(color1: Color, color2: Color, t: number): Color {
 	return { h, s, l };
 }

-function CalculateR2(input: [number, number][]): number[] {
-	const reg = regression.linear(input);
-	return reg.points.map((point: [number, number]) => point[1]);
-}
-
-export { GenerateColor, LerpColor, RemoveExistingColors, CalculateR2 };
+export { GenerateColor, LerpColor };
 export type { Color };
--- a/frontend/wailsjs/go/main/App.d.ts
+++ b/frontend/wailsjs/go/main/App.d.ts
@@ -2,8 +2,6 @@
 // This file is automatically generated. DO NOT EDIT
 import {main} from '../models';

-export function Close():Promise<void>;
-
 export function CreateFood(arg1:main.Food):Promise<main.WailsFood1>;

 export function CreateWeight(arg1:main.Weight):Promise<main.WailsWeight1>;
--- a/frontend/wailsjs/go/main/App.js
+++ b/frontend/wailsjs/go/main/App.js
@@ -2,10 +2,6 @@
 // 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 CreateFood(arg1) {
  return window['go']['main']['App']['CreateFood'](arg1);
 }