agecem/agecem-org
4
1
Fork 0
Code Issues 8 Pull requests 1 Packages 1 Activity

Séparer templates de public/ -> templates/

Browse source 
Séparer embedFS en publicFS et templatesFS
This commit is contained in:
Victor Lacasse-Beaudoin 2023-07-04 21:57:13 -04:00
parent 129e8fbf1b
commit 2eee1f2fd2
14 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cmd/server.go
View file

@ -25,6 +25,7 @@ import (
"git.agecem.com/agecem/agecem-org/config"
"git.agecem.com/agecem/agecem-org/media"
"git.agecem.com/agecem/agecem-org/public"
"git.agecem.com/agecem/agecem-org/templates"
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v4/middleware"
)
@ -35,7 +36,10 @@ type Template struct {
var cfg config.Config
var embedFS embed.FS
var (
publicFS embed.FS
templatesFS embed.FS
)
// serverCmd represents the server command
var serverCmd = &cobra.Command{
@ -64,7 +68,8 @@ var serverCmd = &cobra.Command{
func init() {
rootCmd.AddCommand(serverCmd)
embedFS = public.GetEmbedFS()
publicFS = public.GetPublicFS()
templatesFS = templates.GetTemplatesFS()
// server.port - --server-port
serverCmd.Flags().Int("server-port", 8080, "Port to run the webserver on (config: server.port)")
@ -122,7 +127,7 @@ func RunServer() {
e := echo.New()
t := &Template{
templates: template.Must(template.ParseFS(embedFS, "html/*.gohtml")),
templates: template.Must(template.ParseFS(templatesFS, "html/*.gohtml")),
}
e.Renderer = t
@ -745,12 +750,12 @@ func handleAdminDocumentsUploadPOST(c echo.Context) error {
func handleStaticCSSIndex(c echo.Context) error {
// TODO Ajouter gestion d'erreurs
data, _ := embedFS.ReadFile("css/index.css")
data, _ := publicFS.ReadFile("css/index.css")
return c.Blob(http.StatusOK, "text/css", data)
}
func handleStaticCSSGeneral(c echo.Context) error {
// TODO Ajouter gestion d'erreurs
data, _ := embedFS.ReadFile("css/general.css")
data, _ := publicFS.ReadFile("css/general.css")
return c.Blob(http.StatusOK, "text/css", data)
}