diff --git a/.husky/.gitignore b/.husky/.gitignore new file mode 100644 index 0000000..31354ec --- /dev/null +++ b/.husky/.gitignore @@ -0,0 +1 @@ +_ diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100644 index 0000000..1b2e1c6 --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" + +cd app && yarn format diff --git a/app/package.json b/app/package.json index bf9d136..12e7b5b 100644 --- a/app/package.json +++ b/app/package.json @@ -4,7 +4,8 @@ "scripts": { "dev": "vite", "build": "vite build", - "format": "prettier --write --plugin-search-dir=. ./**/*.html ./**/*.svelte" + "format": "prettier --write --plugin-search-dir=. ./**/*.html ./**/*.svelte", + "prepare": "husky install" }, "devDependencies": { "@svitejs/vite-plugin-svelte": "^0.11.0", @@ -13,6 +14,7 @@ "axios": "^0.21.1", "glob": "^7.1.6", "html-minifier": "^4.0.0", + "husky": "^5.1.3", "prettier": "^2.2.1", "prettier-plugin-svelte": "^2.2.0", "svelte": "^3.35.0", diff --git a/app/src/App.svelte b/app/src/App.svelte index cd24a9f..c357889 100644 --- a/app/src/App.svelte +++ b/app/src/App.svelte @@ -3,7 +3,7 @@ import Login from "./Login.svelte"; import Settings from "./Settings.svelte"; import { apikey, lang, page } from "./store.js"; - $: is_configured = $apikey !== "null" && $apikey !== ""; + $: is_configured = $apikey && $apikey !== "null" && $apikey !== ""; $: settings_open = $page === "settings"; console.log($page); diff --git a/app/src/Scanner.svelte b/app/src/Scanner.svelte index 741dc92..8b07851 100644 --- a/app/src/Scanner.svelte +++ b/app/src/Scanner.svelte @@ -25,9 +25,7 @@ {hours}:{minutes}:{seconds}
-
+