- {{if (ne .h1 "")}}{{.h1}}{{else}}{{ .title }}{{end}}
+ {{if .H1}}{{.H1}}{{else}}{{ .Title }}{{end}}
+ {{- if (ne .Err nil) }}
+
+ {{.Err}}
+
+ {{- end}}
{{end}}
\ No newline at end of file
diff --git a/rootHandler.go b/rootHandler.go
index e853149..9219b97 100644
--- a/rootHandler.go
+++ b/rootHandler.go
@@ -3,17 +3,45 @@ package main
import (
"fmt"
"net/http"
+ "strconv"
)
-func rootHandlerGet(w http.ResponseWriter, r *http.Request) {
+func listHandler(w http.ResponseWriter, r *http.Request) {
+
+ pageSize, psErr := strconv.Atoi(r.URL.Query().Get("pageSize"))
+ if psErr != nil || pageSize < 1 {
+ pageSize = 2500
+ }
+
+ count, _ := countDomains()
+ maxPages := int(count / int64(pageSize))
+ if count%int64(pageSize) > 0 {
+ maxPages++
+ }
+
+ currentPage, cpErr := strconv.Atoi(r.URL.Query().Get("page"))
+ if cpErr != nil || currentPage < 1 || currentPage > maxPages {
+ currentPage = 1
+ }
+ domains, dbErr := listDomains(int32(pageSize), int32((currentPage-1)*pageSize))
+
+ runTemplate(w, r, "bimi/list.tmpl", map[string]any{
+ "Count": count,
+ "CurrentPage": currentPage,
+ "Domains": domains,
+ "Err": dbErr,
+ "MaxPage": maxPages,
+ "PageSize": pageSize,
+ "Title": "List Domains",
+ })
- domains, dbErr := listSampleDomains(50)
+}
+
+func rootHandlerGet(w http.ResponseWriter, r *http.Request) {
- runTemplate(w, r, "index.tmpl", map[string]any{
- "domains": domains,
- "err": dbErr,
- "h1": "Welcome",
- "title": "BIMI Explorer",
+ runTemplate(w, r, "bimi/index.tmpl", map[string]any{
+ "H1": "Welcome",
+ "Title": "BIMI Explorer",
})
}
@@ -23,9 +51,40 @@ func rootHandlerPost(w http.ResponseWriter, r *http.Request) {
r.ParseForm()
domain := r.Form.Get("domain")
if domain == "" {
- http.Redirect(w, r, "/?err=You+must+enter+a+domain", http.StatusSeeOther)
+ http.Redirect(w, r, "/bimi/?err=You+must+enter+a+domain", http.StatusSeeOther)
return
}
http.Redirect(w, r, fmt.Sprintf("/bimi/%s/", domain), http.StatusSeeOther)
}
+
+func viewHandler(w http.ResponseWriter, r *http.Request) {
+
+ pageSize, psErr := strconv.Atoi(r.URL.Query().Get("pageSize"))
+ if psErr != nil || pageSize < 1 {
+ pageSize = 144
+ }
+
+ count, _ := countDomains()
+ maxPages := int(count / int64(pageSize))
+ if count%int64(pageSize) > 0 {
+ maxPages++
+ }
+
+ currentPage, cpErr := strconv.Atoi(r.URL.Query().Get("page"))
+ if cpErr != nil || currentPage < 1 || currentPage > maxPages {
+ currentPage = 1
+ }
+
+ domains, dbErr := listDomains(int32(pageSize), int32((currentPage-1)*pageSize))
+
+ runTemplate(w, r, "bimi/view.tmpl", map[string]any{
+ "CurrentPage": currentPage,
+ "Domains": domains,
+ "Err": dbErr,
+ "MaxPage": maxPages,
+ "PageSize": pageSize,
+ "Title": "View BIMI Logos",
+ })
+
+}
diff --git a/templates.go b/templates.go
index e017359..c1fe9ad 100644
--- a/templates.go
+++ b/templates.go
@@ -3,7 +3,6 @@ package main
import (
"bytes"
"embed"
- "fmt"
"io/fs"
"net/http"
"strings"
@@ -25,6 +24,19 @@ var templateCache = initTemplates()
func initTemplates() map[string]TemplateFunc {
+ funcMap := template.FuncMap{
+ "inc": func(i int) int {
+ return i + 1
+ },
+ "loop": func(from, to int) []int {
+ result := []int{}
+ for i := from; i < to; i++ {
+ result = append(result, i)
+ }
+ return result
+ },
+ }
+
theCache := make(map[string]TemplateFunc)
var partials bytes.Buffer
@@ -49,13 +61,12 @@ func initTemplates() map[string]TemplateFunc {
}
viewErr := fs.WalkDir(viewsFS, ".", func(path string, d fs.DirEntry, err error) error {
- fmt.Printf("%v\n", d)
if err != nil {
logger.Error("walkdir error", "err", err)
return err
}
if !d.IsDir() {
- logger.Info("registering view", "filename", path)
+ logger.Debug("registering view", "filename", path)
content, readErr := fs.ReadFile(viewsFS, path)
if readErr != nil {
logger.Error("unable to read view file", "err", readErr, "filename", path)
@@ -66,13 +77,12 @@ func initTemplates() map[string]TemplateFunc {
var templateBuffer bytes.Buffer
templateBuffer.Write(content)
templateBuffer.Write(partials.Bytes())
- t := template.New(name)
+ t := template.New(name).Funcs(funcMap)
template, parseErr := t.Parse(templateBuffer.String())
if parseErr != nil {
logger.Error("unable to parse template", "err", parseErr, "filename", path, "content", string(content))
return parseErr
}
- fmt.Printf("template: %s has %v\n", t.Name(), t.DefinedTemplates())
theCache[name] = func(data any) (string, error) {
var buf bytes.Buffer
err := template.Execute(&buf, data)
diff --git a/views/_bimi/index.tmpl b/views/_bimi/index.tmpl
index 7b551f7..1d258f9 100644
--- a/views/_bimi/index.tmpl
+++ b/views/_bimi/index.tmpl
@@ -1,15 +1,11 @@
{{template "above" .}}
-{{ if (ne .err nil) }}
-
- {{.err}}
-
-{{else}}
+{{ if .Bimi }}
-
+
-{{end}}
+{{ end }}
{{template "below" .}}
\ No newline at end of file
diff --git a/views/bimi/bulk.tmpl b/views/bimi/bulk.tmpl
deleted file mode 100644
index 2657c79..0000000
--- a/views/bimi/bulk.tmpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{template "above" .}}
-
-
-
-{{template "below" .}}
\ No newline at end of file
diff --git a/views/bimi/index.tmpl b/views/bimi/index.tmpl
index bac62dd..c6f3b76 100644
--- a/views/bimi/index.tmpl
+++ b/views/bimi/index.tmpl
@@ -10,9 +10,12 @@
+
{{template "below" .}}
diff --git a/views/bimi/list.tmpl b/views/bimi/list.tmpl
new file mode 100644
index 0000000..f29c50c
--- /dev/null
+++ b/views/bimi/list.tmpl
@@ -0,0 +1,40 @@
+{{template "above" .}}
+
+
+
+{{template "below" .}}
\ No newline at end of file
diff --git a/views/bimi/view.tmpl b/views/bimi/view.tmpl
new file mode 100644
index 0000000..752f4f7
--- /dev/null
+++ b/views/bimi/view.tmpl
@@ -0,0 +1,23 @@
+{{template "above" .}}
+
+