Sorted out how to do views with Go html/template, how to put code in subdirectories for a namespace, and documented why Go's modules are so weird.

main.go

@@ -1,15 +1,15 @@
-package main
+package webapp
 
 import (
   "log"
+  "zedshaw.games/webapp/tools"
   "github.com/gofiber/fiber/v2"
   "github.com/gofiber/fiber/v2/middleware/logger"
+  "github.com/gofiber/template/html/v2"
 
    _ "github.com/mattn/go-sqlite3"
    "github.com/jmoiron/sqlx"
    sq "github.com/Masterminds/squirrel"
-
-   "github.com/go-playground/validator/v10"
 )
 
 type Link struct {
@@ -26,34 +26,6 @@ type Stream struct {
 }
 
 
-func SelectJson[T any](db *sqlx.DB, c *fiber.Ctx, err error, sql string, args ...interface{}) error {
-  if(err != nil) {
-    log.Fatalln(err)
-  }
-  var result []T
-
-  err = db.Select(&result, sql, args...)
-  if(err != nil) {
-    log.Fatalln(err);
-  }
-
-  return c.JSON(&result);
-}
-
-func GetJson[T any](db *sqlx.DB, c *fiber.Ctx, err error, sql string, args ...interface{}) error {
-  if(err != nil) {
-    log.Fatalln(err)
-  }
-  var result T
-
-  err = db.Get(&result, sql, args...)
-  if(err != nil) {
-    log.Fatalln(err);
-  }
-
-  return c.JSON(&result);
-}
-
 func main() {
   log.SetFlags(log.LstdFlags | log.Lshortfile)
 
@@ -62,41 +34,35 @@ func main() {
       log.Fatalln(err)
   }
 
-  app := fiber.New()
+  engine := html.New("./views", ".html")
+  app := fiber.New(fiber.Config{
+    Views: engine,
+  })
   app.Use(logger.New())
 
   // handler that returns one json from a sql database
   app.Get("/api/stream/", func (c *fiber.Ctx) error {
     sql, args, err := sq.Select("*").From("stream").ToSql()
-    return SelectJson[Stream](db, c, err, sql, args...)
+    return tools.SelectJson[Stream](db, c, err, sql, args...)
   })
 
   app.Get("/api/stream/:id", func (c *fiber.Ctx) error {
     sql, args, err := sq.Select("*").From("stream").Where("id", c.Params("id")).ToSql()
-    return GetJson[Stream](db, c, err, sql, args...)
+    return tools.GetJson[Stream](db, c, err, sql, args...)
   })
 
   app.Get("/api/stream/:id/links", func (c *fiber.Ctx) error {
     sql, args, err := sq.Select("*").From("stream_link").Where("stream_id", c.Params("id")).ToSql()
 
-    return SelectJson[Link](db, c, err, sql, args...)
+    return tools.SelectJson[Link](db, c, err, sql, args...)
   })
 
   app.Post("/api/link", func (c *fiber.Ctx) error {
-    link := new(Link)
+    link, err := tools.GetThing[Link](c)
 
-    if err := c.BodyParser(link); err != nil {
-      log.Println(err);
-      return c.Redirect("/live/")
-    }
-
-    var validate *validator.Validate
-    validate = validator.New(validator.WithRequiredStructEnabled())
-
-    if err := validate.Struct(link); err != nil {
-      validationErrors := err.(validator.ValidationErrors)
-      log.Println(validationErrors)
-      return c.Redirect("/live/")
+    if(err != nil) {
+      log.Println(err)
+      c.Redirect("/live/")
     }
 
     sql, args, err := sq.Insert("stream_link").Columns("stream_id", "url", "description").Values(link.StreamId, link.Url, link.Description).ToSql()
@@ -113,5 +79,11 @@ func main() {
 
   app.Static("/", "./public")
 
+  app.Get("/test/", func (c *fiber.Ctx) error {
+    return c.Render("index", fiber.Map{
+      "Title": "Hello, World!",
+    })
+  })
+
   log.Fatal(app.Listen(":5001"))
 }