htmx improved requests sending; improved password representations

Author: Lumberj3ck

internal/api/password/show_password/password.go

@@ -3,7 +3,7 @@ package show_password
 import (
 	"encoding/base64"
 	"io"
-	"log"
+	"log/slog"
 	"net/http"
 	"path/filepath"
 
@@ -15,6 +15,10 @@ import (
 
 	templ "pass_web/internal/api/template"
 )
+type PasswordTempl struct {
+	PasswordFile   string
+	EncodedContent string
+}
 
 func Handler(w http.ResponseWriter, r *http.Request) {
 	t := templ.NewTemplate()
@@ -24,9 +28,8 @@ func Handler(w http.ResponseWriter, r *http.Request) {
 	passwordFile := passwordItem.Password
 
 	passwordPath := passwordItem.Path
-	passwordPath = filepath.Join(passwordPath, passwordItem.Password)
+	passwordPath = filepath.Join(passwordPath, passwordFile)
 
-	log.Println("Path password ", passwordPath)
 	file, err := os.Open(passwordPath)
 
 	if err != nil {
@@ -38,11 +41,12 @@ func Handler(w http.ResponseWriter, r *http.Request) {
 
 	w.Header().Set("Content-Type", "text/html")
 
-	t.Render(w, "password", struct {
-		PasswordFile   string
-		EncodedContent string
-	}{
-		PasswordFile:   passwordFile,
+	baseDir := filepath.Base(passwordItem.Path)
+	relativeFilename := filepath.Join(baseDir, passwordFile)
+	slog.Info("Password show ", "baseDir", baseDir, "relativeFilename", relativeFilename)
+
+	t.Render(w, "password", PasswordTempl{
+		PasswordFile:   relativeFilename,
 		EncodedContent: encodedContent,
 	})
 }

templates/show.tmpl

@@ -20,7 +20,7 @@ Show
              {{end}}
 
              hx-swap="innerHTML"
-             hx-trigger="click"
+             hx-trigger="click consume"
              >
          {{if .IsDir}}
         <span class="text-lg font-semibold">{{ .Password }}</span>
@@ -41,7 +41,8 @@ Show
                         hx-target="closest div.password-item"
                         hx-swap="outerHTML"
                         hx-confirm="Are you sure you want to delete this password?"
-                        onclick="event.stopPropagation()">
+                        hx-trigger="click consume"
+                        >
                         <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                             <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"/>
                         </svg>