diff --git a/internal/file/file.go b/internal/file/file.go index dba702c99bb34f643fa9a30221f599c7a8e200eb..846627974d257ba0e72d4d925f27feafbe6d057c 100644 --- a/internal/file/file.go +++ b/internal/file/file.go @@ -10,10 +10,12 @@ import ( "forge.grandlyon.com/web-et-numerique/llle_project/backoffice-server/internal/common" ) -var imageFolder = common.StringValueFromEnv("IMAGE_FOLDER", "") +var ( + imageFolder = common.StringValueFromEnv("IMAGE_FOLDER", "") +) func GetEcogestureImages(w http.ResponseWriter, r *http.Request) { - filenames, err := fileNamesFromFolder(imageFolder) + filenames, err := fileNamesFromFolder(imageFolder + "/ecogesture") jsondata, err := json.Marshal(filenames) if err != nil { fmt.Printf("Error: %s", err.Error()) diff --git a/internal/rootmux/rootmux.go b/internal/rootmux/rootmux.go index ed176b2cc460be899746c0f9e4df1037239c0b6b..035192bd27e49e7286158eea649f1ad31f9f1366 100644 --- a/internal/rootmux/rootmux.go +++ b/internal/rootmux/rootmux.go @@ -5,12 +5,15 @@ import ( _ "forge.grandlyon.com/web-et-numerique/llle_project/backoffice-server/docs" "forge.grandlyon.com/web-et-numerique/llle_project/backoffice-server/internal/auth" + "forge.grandlyon.com/web-et-numerique/llle_project/backoffice-server/internal/common" "forge.grandlyon.com/web-et-numerique/llle_project/backoffice-server/internal/file" "forge.grandlyon.com/web-et-numerique/llle_project/backoffice-server/internal/models" "github.com/gorilla/mux" httpSwagger "github.com/swaggo/http-swagger" ) +var imageFolder = common.StringValueFromEnv("IMAGE_FOLDER", "") + type RootMux struct { Router *mux.Router Manager *auth.Manager @@ -35,6 +38,7 @@ func CreateRootMux() RootMux { r.Handle("/OAuth2Callback", m.HandleOAuth2Callback()) r.HandleFunc("/Logout", m.HandleLogout) r.Handle("/api/common/WhoAmI", auth.ValidateAuthMiddleware(auth.WhoAmI(), []string{"*"}, false)) + r.PathPrefix("/assets/").Handler(http.StripPrefix("/assets/", http.FileServer(http.Dir("./"+imageFolder+"/")))) r.HandleFunc("/api/common/monthlyReport", dh.GetMonthlyReport).Methods(http.MethodGet) r.HandleFunc("/api/common/monthlyReport/{year}/{month}", dh.GetMonthlyReport).Methods(http.MethodGet)