2 Commits
2.1.0 ... 2.2.0

Author SHA1 Message Date
ec5310a1f3 Embed spellfix.dll 2024-09-04 23:57:13 +02:00
ec1c196752 Fix issue with focusout preventing onclick from autocomplete 2024-08-15 22:09:13 +02:00
2 changed files with 42 additions and 8 deletions

View File

@@ -117,6 +117,18 @@
autocompleteList.style.left = `${left}px`; autocompleteList.style.left = `${left}px`;
} }
} }
let timeout: number;
function handleFocusOut() {
timeout = setTimeout(() => {
foodSearch = [];
}, 100);
}
function handleFocusIn() {
clearTimeout(timeout);
updateAutocomplete();
}
</script> </script>
<!-- <svelte:window on:keydown={navigateList} /> --> <!-- <svelte:window on:keydown={navigateList} /> -->
@@ -136,8 +148,8 @@
contenteditable="true" contenteditable="true"
autofocus autofocus
on:keydown={update} on:keydown={update}
on:focusin={updateAutocomplete} on:focusin={handleFocusIn}
on:focusout={() => foodSearch = []} on:focusout={handleFocusOut}
bind:this={nameElement} bind:this={nameElement}
/> />
<td <td

34
main.go
View File

@@ -24,7 +24,7 @@ func init() {
logFile, err := os.Create("main.log") logFile, err := os.Create("main.log")
if err != nil { if err != nil {
log.Printf("Error creating log file: %v", err) log.Printf("Error creating log file: %v", err)
os.Exit(1) return
} }
logger := io.MultiWriter(os.Stdout, logFile) logger := io.MultiWriter(os.Stdout, logFile)
log.SetOutput(logger) log.SetOutput(logger)
@@ -42,37 +42,59 @@ var (
//go:embed food.ddl //go:embed food.ddl
var foodDDL string var foodDDL string
//go:embed spellfix.dll
var spellfixDll []byte
// TODO: Embed food.ddl and create DB if no exists // TODO: Embed food.ddl and create DB if no exists
// TODO: Add averages to graphs (ie. R2) https://stackoverflow.com/questions/60622195/how-to-draw-a-linear-regression-line-in-chart-js // TODO: Add averages to graphs (ie. R2) https://stackoverflow.com/questions/60622195/how-to-draw-a-linear-regression-line-in-chart-js
func main() { func main() {
_, err := os.Open("spellfix.dll")
if err != nil && !os.IsNotExist(err) {
Error.Printf("Error looking for spellfix.dll: %v", err)
return
}
if err != nil && os.IsNotExist(err) {
log.Printf("No spellfix.dll found, creating...")
file, err := os.Create("spellfix.dll")
if err != nil {
Error.Printf("Error creating spellfix.dll: %v", err)
return
}
_, err = file.Write(spellfixDll)
if err != nil {
Error.Printf("Error writing spellfix.dll: %v", err)
return
}
file.Close()
}
dbpath := flag.String("db", "food.db", "Path to the database file") dbpath := flag.String("db", "food.db", "Path to the database file")
flag.Parse() flag.Parse()
db := DB{path: *dbpath} db := DB{path: *dbpath}
err := db.Open() err = db.Open()
if err != nil { if err != nil {
Error.Printf("%++v", err) Error.Printf("%++v", err)
os.Exit(1) return
} }
defer db.Close() defer db.Close()
err = db.Init(foodDDL) err = db.Init(foodDDL)
if err != nil { if err != nil {
Error.Printf("Error initializing database: %++v", err) Error.Printf("Error initializing database: %++v", err)
os.Exit(1) return
} }
settingsService = &SettingsService{db: &db} settingsService = &SettingsService{db: &db}
err = settingsService.LoadSettings() err = settingsService.LoadSettings()
if err != nil { if err != nil {
Error.Printf("%++v", err) Error.Printf("%++v", err)
os.Exit(1) return
} }
log.Printf("Loaded settings as: %++v", Settings) log.Printf("Loaded settings as: %++v", Settings)
foodService = &FoodService{db: &db} foodService = &FoodService{db: &db}
weightService = &WeightService{db: &db} weightService = &WeightService{db: &db}
// Create an instance of the app structure // Create an instance of the app structure
app := NewApp() app := NewApp()