Merge branch 'master' into iavl-convert-fuzzer-to-Go-native-fuzzer

gno.land/pkg/gnoweb/Makefile

@@ -13,7 +13,7 @@ input_css := frontend/css/input.css
 output_css := $(PUBLIC_DIR)/styles.css
 tw_version := 3.4.14
 tw_config_path := frontend/css/tx.config.js
-templates_files := $(shell find . -iname '*.gohtml')
+templates_files := $(shell find . -iname '*.html')
 
 # static config
 src_dir_static := frontend/static
@@ -79,7 +79,7 @@ dev:
 
 # Go server in development mode
 dev.gnoweb: generate
-	$(run_reflex) -s -r '.*\.go(html)?' -- \
+	$(run_reflex) -s -r '.*\.(go|html)' -- \
 		go run ../../cmd/gnoweb -assets-dir=${PUBLIC_DIR} -chainid=${CHAIN_ID} -remote=${DEV_REMOTE} \
 		2>&1 | $(run_logname) gnoweb
 

gno.land/pkg/gnoweb/alias.go

@@ -39,10 +39,10 @@ func AliasAndRedirectMiddleware(next http.Handler, analytics bool) http.Handler
 		// Check if the request path matches a redirect
 		if newPath, ok := Redirects[r.URL.Path]; ok {
 			http.Redirect(w, r, newPath, http.StatusFound)
-			components.RenderRedirectComponent(w, components.RedirectData{
+			components.RedirectView(components.RedirectData{
 				To:            newPath,
 				WithAnalytics: analytics,
-			})
+			}).Render(w)
 			return
 		}
 

gno.land/pkg/gnoweb/app.go

@@ -95,10 +95,10 @@ func NewRouter(logger *slog.Logger, cfg *AppConfig) (http.Handler, error) {
 	if cfg.FaucetURL != "" {
 		mux.Handle("/faucet", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			http.Redirect(w, r, cfg.FaucetURL, http.StatusFound)
-			components.RenderRedirectComponent(w, components.RedirectData{
+			components.RedirectView(components.RedirectData{
 				To:            cfg.FaucetURL,
 				WithAnalytics: cfg.Analytics,
-			})
+			}).Render(w)
 		}))
 	}
 

gno.land/pkg/gnoweb/components/component.go

@@ -0,0 +1,35 @@
+package components
+
+import (
+	"io"
+)
+
+type Component interface {
+	Render(w io.Writer) error
+}
+
+type TemplateComponent struct {
+	name string
+	data any
+}
+
+func (c *TemplateComponent) Render(w io.Writer) error {
+	return tmpl.ExecuteTemplate(w, c.name, c.data)
+}
+
+func NewTemplateComponent(name string, data any) Component {
+	return &TemplateComponent{name: name, data: data}
+}
+
+type readerComponent struct {
+	io.Reader
+}
+
+func NewReaderComponent(reader io.Reader) Component {
+	return &readerComponent{reader}
+}
+
+func (c *readerComponent) Render(w io.Writer) (err error) {
+	_, err = io.Copy(w, c)
+	return err
+}