Browse Source

Added dump function in templates, use it for queue page.

Frederic G. MARAND 2 years ago
parent
commit
34df6ffd7a
3 changed files with 32 additions and 8 deletions
  1. 2 1
      .gitignore
  2. 15 2
      back/web/routes.go
  3. 15 5
      front/templates/queue.gohtml

+ 2 - 1
.gitignore

@@ -2,4 +2,5 @@
 .yarn
 node_modules
 volume
-.DS_Store
+.DS_Store
+go-server-server-generated

+ 15 - 2
back/web/routes.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"path/filepath"
 
+	"github.com/davecgh/go-spew/spew"
 	"github.com/fgm/izidic"
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-contrib/sessions/cookie"
@@ -25,10 +26,17 @@ func SetupRoutes(rd redriver.Redriver, renderer *template.Template, secret []byt
 	store := cookie.NewStore(secret)
 	r.Use(sessions.Sessions("defaultsession", store))
 
-	r.GET("/", makeHomeHandler(rd))
+	// Done
 	r.StaticFS(assetsPrefix, PrefixFileSystem(assetsPrefix, http.FS(front.Assets)))
 	r.GET("/queue", gin.WrapH(http.RedirectHandler("/", http.StatusMovedPermanently)))
+
+	// Back done, front WIP
 	r.GET("/queue/:name", makeQueueHandler(rd))
+
+	// JSON done
+	r.GET("/", makeHomeHandler(rd))
+
+	// TODO
 	r.GET("/queue/:name/delete", makeDeleteHandler(rd))
 	r.POST("/queue/:name/delete", makeDeleteConfirmHandler(rd))
 	r.GET("/queue/:name/purge", makePurgeHandler(rd))
@@ -46,7 +54,11 @@ func HttpService(dic *izidic.Container) (any, error) {
 
 func RendererService(dic *izidic.Container) (any, error) {
 	var err error
-	renderer := template.New("redriver")
+	renderer := template.New("redriver").Funcs(template.FuncMap{
+		"dump": func(args ...any) template.HTML {
+			return template.HTML("<pre>") + template.HTML(spew.Sdump(args...)) + template.HTML("</pre>\n")
+		},
+	})
 	for _, tpl := range []struct {
 		name  string
 		value string
@@ -60,6 +72,7 @@ func RendererService(dic *izidic.Container) (any, error) {
 			return nil, fmt.Errorf("failed parsing %q template: %w", tpl.name, err)
 		}
 	}
+
 	return renderer, nil
 }
 

+ 15 - 5
front/templates/queue.gohtml

@@ -18,11 +18,11 @@
             </nav>
             <h1 class="text-3xl font-bold underline">Queue view for {{ .info.Name }}</h1>
             {{ template "flashes" .flashes }}
-            <div class="alert alert-secondary alert-dismissible fade show">
-                <ul>
-                    <li>Délai SQS info: {{ .latency.info }}</li>
-                    <li>Délai SQS messages: {{ .latency.items }}</li>
-                </ul>
+            <div class="alert alert-secondary alert-dismissible fade show row">
+                <div class="col col-2">Délai SQS info</div>
+                <div class="col col-4">{{ .latency.info }}</div>
+                <div class="col col-2">Délai SQS messages</div>
+                <div class="col col-4">{{ .latency.items }}</div>
                 <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
             </div>
             <table class="table">
@@ -44,6 +44,16 @@
                     <td><a href="{{ .info.URL }}">{{ .info.URL }}</a>
                     </td>
                 </tr>
+                <tr>
+                    <th scope="row">Info</th>
+                    <td>{{ dump .info }}</td>
+
+                </tr>
+                <tr>
+                    <th scope="row">Items</th>
+                    <td>{{ dump .items }}</td>
+
+                </tr>
                 </tbody>
             </table>
         </div>