diff --git a/handlers.go b/handlers.go index 8107de9..bea847a 100644 --- a/handlers.go +++ b/handlers.go @@ -96,7 +96,6 @@ func handleMetricsDisplay(w http.ResponseWriter, _ *http.Request) { } func handleCreateFeed(w http.ResponseWriter, r *http.Request, secret *string) { - tmpl := template.Must(template.ParseFiles(fmt.Sprintf("%s/created.html", s.TemplatePath))) metrics.CreateRequests.Inc() entry := createFeed(r, secret) @@ -125,6 +124,7 @@ func handleCreateFeed(w http.ResponseWriter, r *http.Request, secret *string) { ErrorMessage: entry.ErrorMessage, } + tmpl := template.Must(template.ParseFiles(fmt.Sprintf("%s/created.html", s.TemplatePath))) err := tmpl.Execute(w, data) if err != nil { log.Print("[ERROR] ", err) @@ -243,52 +243,8 @@ func handleDeleteFeed(w http.ResponseWriter, r *http.Request) { log.Printf("[ERROR] could not delete feed '%q'...Error: %s ", feedPubkey, err) } - /*items, err := getSavedEntries() - if err != nil { - log.Printf("[ERROR] %s", err) - http.Error(w, err.Error(), http.StatusInternalServerError) - } - - npub, _ := nip19.EncodePublicKey(s.RelayPubkey) - tmpl := template.Must(template.ParseFiles(fmt.Sprintf("%s/index.html", s.TemplatePath))) - - data := struct { - RelayName string - RelayPubkey string - RelayNPubkey string - RelayDescription string - RelayURL string - Count int - Entries []GUIEntry - KindTextNoteCreated string - KindTextNoteDeleted string - QueryEventsRequests string - NotesBlasted string - }{ - RelayName: s.RelayName, - RelayPubkey: s.RelayPubkey, - RelayNPubkey: npub, - RelayDescription: s.RelayDescription, - RelayURL: s.RelayURL, - Count: len(items), - Entries: items, - KindTextNoteCreated: getPrometheusMetric(metrics.KindTextNoteCreated.Desc()), - KindTextNoteDeleted: getPrometheusMetric(metrics.KindTextNoteDeleted.Desc()), - QueryEventsRequests: getPrometheusMetric(metrics.QueryEventsRequests.Desc()), - NotesBlasted: getPrometheusMetric(metrics.NotesBlasted.Desc()), - } */ - - //http.Redirect(w, r, "/", http.StatusTemporaryRedirect) - tmpl := template.New("t") tmpl.Execute(w, nil) - - /* - if err := tmpl.Execute(w, data); err != nil { - log.Printf("[ERROR] %s", err) - http.Error(w, err.Error(), http.StatusInternalServerError) - } - */ } func handleImportOpml(w http.ResponseWriter, r *http.Request) { diff --git a/web/assets/css/styles.css b/web/assets/css/styles.css index a48398c..5e1800f 100644 --- a/web/assets/css/styles.css +++ b/web/assets/css/styles.css @@ -23,4 +23,8 @@ padding: .125em; } +tr.htmx-swapping td { + opacity: 0; + transition: opacity 1s ease-out; + } diff --git a/web/templates/index.html b/web/templates/index.html index 936a6ce..564a246 100644 --- a/web/templates/index.html +++ b/web/templates/index.html @@ -1,4 +1,5 @@ - + +
@@ -7,201 +8,220 @@ - +