bug fixed escape closing panes added

mindiae · Oct 4, 2024 · 76041b1 · 76041b1
1 parent f71abcf
commit 76041b1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/cmd/webview/booksHandler.go b/cmd/webview/booksHandler.go
@@ -19,7 +19,7 @@ type Book struct {
 func BooksHandler(module string) ([]Book, error) {
 	file := filepath.Join(APP_ROOT, "database", fmt.Sprintf("%s.SQLite3", module))
 	if !fileExists(file) {
-		file = filepath.Join(configPath, "database", fmt.Sprintf("%s.SQLite3", module))
+		file = filepath.Join(configPath, fmt.Sprintf("%s.SQLite3", module))
 		if !fileExists(file) {
 			return []Book{}, errors.New("file " + module + ".SQLite3" + " does not exist")
 		}

diff --git a/cmd/webview/chapterHandler.go b/cmd/webview/chapterHandler.go
@@ -16,7 +16,7 @@ type Verse struct {
 func ChapterHandler(module string, bookNumber int16, chapter int16) ([]string, error) {
 	file := filepath.Join(APP_ROOT, "database", fmt.Sprintf("%s.SQLite3", module))
 	if !fileExists(file) {
-		file = filepath.Join(configPath, "database", fmt.Sprintf("%s.SQLite3", module))
+		file = filepath.Join(configPath, fmt.Sprintf("%s.SQLite3", module))
 		if !fileExists(file) {
 			return []string{}, errors.New("file " + module + ".SQLite3" + " does not exist")
 		}

diff --git a/cmd/webview/modulesHandler.go b/cmd/webview/modulesHandler.go
@@ -16,7 +16,7 @@ type InfoRow struct {
 
 func ModulesHandler() ([]map[string]string, error) {
 	internalDbDir := filepath.Join(APP_ROOT, "database")
-	configDbDir := filepath.Join(configPath, "database")
+	configDbDir := configPath
 
 	var emptyReturnValue []map[string]string
 	var modules []map[string]string
@@ -66,7 +66,7 @@ func ModulesHandler() ([]map[string]string, error) {
 		if err != nil {
 			return err
 		}
-		if !info.IsDir() {
+		if filepath.Ext(info.Name()) == ".SQLite3" {
 			moduleName := strings.TrimSuffix(info.Name(), filepath.Ext(info.Name()))
 			db, err := sql.Open("sqlite3", path)
 			if err != nil {

diff --git a/static/webview.html b/static/webview.html
@@ -223,6 +223,7 @@
       >
         <div
           x-on:click.outside="booksopened = false"
+          x-on:keyup.escape.window="booksopened = false"
           x-on:click="$dispatch('book-changed')"
           class="grid gap-px bg-black max-w-full max-h-full grid-cols-6"
           x-bind:style="`height: ${Math.ceil(bookstable.length/6) * 2}rem`"
@@ -248,6 +249,7 @@
       >
         <div
           x-on:click.outside="books2opened = false"
+          x-on:keyup.escape.window="books2opened = false"
           x-on:click="$dispatch('book-changed')"
           class="bg-black grid grid-cols-6 max-w-full max-h-full gap-px"
           x-bind:style="`height: ${Math.ceil(bookstable2.length/6) * 2}rem`"
@@ -271,6 +273,7 @@
       >
         <div
           x-on:click.outside="chaptersopened = false"
+          x-on:keyup.escape.window="chaptersopened = false"
           class="grid gap-px bg-black max-h-full max-w-full"
           x-bind:style="`grid-template-columns: repeat(${chaptercolumns}, minmax(0, 1fr)); width: ${chaptercolumns*3}rem`"
         >
@@ -293,6 +296,7 @@
       >
         <div
           x-on:click.outside="modulesmenuopened = false"
+          x-on:keyup.escape.window="modulesmenuopened = false"
           class="max-h-full max-w-full grid grid-cols-1 bg-black gap-px overflow-y-auto"
           x-bind:style="`height: ${(modules.length +1 ) * 2}rem`"
         >
@@ -318,6 +322,7 @@
       >
         <div
           x-on:click.outside="modules2menuopened = false"
+          x-on:keyup.escape.window="modules2menuopened = false"
           class="grid grid-cols-1 gap-px bg-black max-w-full max-h-full overflow-y-auto"
           x-bind:style="`height: ${(modules.length +1) * 2}rem`"
         >