Victor Lacasse-Beaudoin
996aa67984
Bump golang -> `1.21.4` Bump alpine -> `3.18.4` Exposer fichiers html sur `/*` Exposer fichiers css sur `/public/css/*` Exposer fichiers js sur `/public/js/*` Retirer prefix cgo de build step Ajouter `public/` à build step Retirer `public/static/` de `static/` dans run step Retirer mentions à static_dir dans `cmd/server.go` Retirer flag `server.static_dir`, `--static_dir` de serverCmd Retirer paramètre `static_dir` de `runServer` Remplacer middleware `RemoveTrailingSlash` -> `AddTrailingSlash` Ajouter `echo.Group`s pour exposition statique avec config Refactor déclaration de routes api derrière groupe `/api` Fix références de fichiers js et css dans `index.html` et `slider.js` BREAKING: static_dir n'est plus utilisé, les fichiers sont maintenant embedded
68 lines
1.8 KiB
Go
68 lines
1.8 KiB
Go
package cmd
|
|
|
|
import (
|
|
"fmt"
|
|
"log"
|
|
"net/http"
|
|
|
|
"git.agecem.com/agecem/babillard/handlers"
|
|
"git.agecem.com/agecem/babillard/public"
|
|
"github.com/labstack/echo/v4"
|
|
"github.com/labstack/echo/v4/middleware"
|
|
"github.com/spf13/cobra"
|
|
"github.com/spf13/viper"
|
|
)
|
|
|
|
// serverCmd represents the server command
|
|
var serverCmd = &cobra.Command{
|
|
Use: "server",
|
|
Short: "Démarrer le serveur web",
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
port := viper.GetInt("server.port")
|
|
//static_dir := viper.GetString("server.static_dir")
|
|
|
|
runServer(port)
|
|
},
|
|
}
|
|
|
|
func init() {
|
|
rootCmd.AddCommand(serverCmd)
|
|
declareFlags()
|
|
}
|
|
|
|
func declareFlags() {
|
|
serverCmd.Flags().IntP("port", "p", 8080, "Port réseau à utiliser (config: \"server.port\")")
|
|
viper.BindPFlag("server.port", serverCmd.Flags().Lookup("port"))
|
|
|
|
serverCmd.Flags().String("contenu_dir", "contenu", "Répertoire du contenu à exposer (config: \"server.contenu_dir\")")
|
|
viper.BindPFlag("server.contenu_dir", serverCmd.Flags().Lookup("contenu_dir"))
|
|
}
|
|
|
|
func runServer(port int) {
|
|
log.Print("[I] Starting webserver")
|
|
|
|
e := echo.New()
|
|
|
|
e.Pre(middleware.AddTrailingSlash())
|
|
|
|
e.Group("").Use(middleware.StaticWithConfig(middleware.StaticConfig{
|
|
Root: "/html/",
|
|
Filesystem: http.FS(public.HTMLFS()),
|
|
}))
|
|
e.Group("/public/css").Use(middleware.StaticWithConfig(middleware.StaticConfig{
|
|
Root: "/css/",
|
|
Filesystem: http.FS(public.CSSFS()),
|
|
}))
|
|
e.Group("/public/js").Use(middleware.StaticWithConfig(middleware.StaticConfig{
|
|
Root: "/js/",
|
|
Filesystem: http.FS(public.JSFS()),
|
|
}))
|
|
|
|
groupAPI := e.Group("/api")
|
|
|
|
groupAPI.GET("/", handlers.HandleAPIShow)
|
|
groupAPI.GET("/contenu/", handlers.HandleAPIContenuList)
|
|
groupAPI.GET("/contenu/:filename/", handlers.HandleAPIContenuFile)
|
|
|
|
e.Logger.Fatal(e.Start(fmt.Sprintf(":%d", port)))
|
|
}
|