Added search

Added a search page and fixed som error with migration

pkg/conf/conf.go

@@ -3,14 +3,18 @@ package conf
 import (
 	"embed"
 	"fmt"
+	"io/fs"
 	"log"
+	"music-server/cmd/web"
 	"music-server/pkg/api"
 	"music-server/pkg/db"
 	"music-server/pkg/helpers"
 	"music-server/pkg/server"
+	"net/http"
 	"os"
 	"strconv"
 
+	"github.com/a-h/templ"
 	"github.com/gin-contrib/static"
 	"github.com/gin-gonic/gin"
 )
@@ -77,7 +81,7 @@ func CloseDb() {
 	defer db.CloseDb()
 }
 
-func SetupRestServer(swagger embed.FS, search embed.FS) {
+func SetupRestServer(swagger embed.FS) {
 
 	router := gin.Default()
 	router.Use(helpers.SetCorsAndNoCacheHeaders())
@@ -114,12 +118,20 @@ func SetupRestServer(swagger embed.FS, search embed.FS) {
 
 	index := api.NewIndex()
 	router.GET("/version", index.GetVersion)
-	router.GET("/test", index.GetDBTest)
+	router.GET("/health", index.GetDBTest)
 	router.StaticFS("/swagger", helpers.EmbedFolder(swagger, "swagger", false))
-	router.StaticFS("/search", helpers.EmbedFolder(search, "search", true))
 	router.Use(static.Serve("/", static.LocalFile("/frontend", true)))
 	router.Use(static.Serve("/new", static.LocalFile("/newFrontend", true)))
-	//router.Use(static.Serve("/search", static.LocalFile("/search", true)))
+
+	staticFiles, _ := fs.Sub(web.Files, "assets")
+	router.StaticFS("/assets", http.FS(staticFiles))
+	router.GET("/search", func(c *gin.Context) {
+		templ.Handler(web.HelloForm()).ServeHTTP(c.Writer, c.Request)
+	})
+
+	router.POST("/find", func(c *gin.Context) {
+		web.FindGameWebHandler(c.Writer, c.Request)
+	})
 
 	port := os.Getenv("PORT")
 	if port == "" {

pkg/db/dbHelper.go

@@ -5,12 +5,14 @@ import (
 	"database/sql"
 	"fmt"
 	"log"
+	newDb "music-server/db"
 	"os"
 
-	"github.com/golang-migrate/migrate"
-	"github.com/golang-migrate/migrate/database/postgres"
-	_ "github.com/golang-migrate/migrate/database/postgres"
-	_ "github.com/golang-migrate/migrate/source/file"
+	"github.com/golang-migrate/migrate/v4"
+	"github.com/golang-migrate/migrate/v4/database/postgres"
+	_ "github.com/golang-migrate/migrate/v4/database/postgres"
+	_ "github.com/golang-migrate/migrate/v4/source/file"
+	"github.com/golang-migrate/migrate/v4/source/iofs"
 	"github.com/jackc/pgx/v5/pgxpool"
 	_ "github.com/lib/pq"
 )
@@ -84,12 +86,20 @@ func Migrate_db(host string, port int, user string, password string, dbname stri
 	if err != nil {
 		log.Println(err)
 	}
-	m, err := migrate.NewWithDatabaseInstance(
+	files, err := iofs.New(newDb.MigrationsFs, "migrations")
+	if err != nil {
+		log.Fatal(err)
+	}
+	m, err := migrate.NewWithInstance("iofs", files, "postgres", driver)
+	if err != nil {
+		log.Fatal(err)
+	}
+	/*m, err := migrate.NewWithDatabaseInstance(
 		"file://./db/migrations/",
 		"postgres", driver)
 	if err != nil {
 		log.Println(err)
-	}
+	}*/
 
 	version, _, err := m.Version()
 	if err != nil {