2 Commits
1.5.0 ... 1.6.1

Author SHA1 Message Date
abb25c1357 Fix issue with /Weight redirecting to /Energy which does not exist 2024-08-10 20:56:22 +02:00
e0eb7f9748 Make ctrl+tab work a little better
Hopefully I'll stop getting ideas soon..
2024-08-10 20:14:16 +02:00
3 changed files with 9 additions and 4 deletions

View File

@@ -6,6 +6,8 @@
import * as srouter from "svelte-spa-router"; import * as srouter from "svelte-spa-router";
import { location } from "svelte-spa-router"; import { location } from "svelte-spa-router";
const energyLocRegex = /^\/(?:Energy)?(?!Weight)/;
const weightLocRegex = /^\/(?:Weight)(?!Energy)/;
function keyDown(event: KeyboardEvent) { function keyDown(event: KeyboardEvent) {
if (event.ctrlKey && event.key == "r") { if (event.ctrlKey && event.key == "r") {
window.location.reload(); window.location.reload();
@@ -14,10 +16,10 @@
Close(); Close();
} }
if (event.ctrlKey && event.key == "Tab") { if (event.ctrlKey && event.key == "Tab") {
if ($location == "/") { if (energyLocRegex.test($location)) {
srouter.replace("/Weight"); srouter.replace($location.replace(energyLocRegex, "/Weight"));
} else if ($location == "/Weight") { } else if (weightLocRegex.test($location)) {
srouter.replace("/"); srouter.replace($location.replace(weightLocRegex, "/Energy"));
} }
} }
} }

View File

@@ -13,6 +13,7 @@
const routes = { const routes = {
'/': Energy, '/': Energy,
'/Energy': Energy,
'/Energy/daily': Daily, '/Energy/daily': Daily,
'/Energy/weekly': Weekly, '/Energy/weekly': Weekly,
'/Energy/monthly': Monthly, '/Energy/monthly': Monthly,

View File

@@ -1,5 +1,7 @@
<script lang="ts"> <script lang="ts">
import FoodTable from "$lib/components/Energy/FoodTable.svelte"; import FoodTable from "$lib/components/Energy/FoodTable.svelte";
import * as srouter from "svelte-spa-router";
import { location } from "svelte-spa-router";
import { foodStore } from "$lib/store/Energy/foodStore"; import { foodStore } from "$lib/store/Energy/foodStore";
// Fuck this hacky shit // Fuck this hacky shit