From 468b2e9934238c029034702df0934c6b6ab38acb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20PAILHAREY?= <rpailharey@grandlyon.com>
Date: Tue, 30 Nov 2021 15:07:08 +0000
Subject: [PATCH] Feat/add assets route
---
internal/file/file.go | 6 ++++--
internal/rootmux/rootmux.go | 4 ++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/internal/file/file.go b/internal/file/file.go
index dba702c..8466279 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 ed176b2..035192b 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)
--
GitLab