From 05555a7750298237b49de51210b6c90bda0ca06a Mon Sep 17 00:00:00 2001 From: Thomas Peetz Date: Sun, 25 Oct 2026 01:23:54 +0200 Subject: [PATCH] add method to set default values for handler --- kontor-gin/internal/globals/globals.go | 15 +++++++++++++++ kontor-gin/internal/handlers/media_lofi.go | 14 +++++--------- kontor-gin/internal/handlers/mediavideo.go | 12 +++++------- kontor-gin/internal/router/router.go | 2 ++ kontor-gin/templates/layouts/navbar.html | 3 ++- 5 files changed, 29 insertions(+), 17 deletions(-) diff --git a/kontor-gin/internal/globals/globals.go b/kontor-gin/internal/globals/globals.go index 8143cea..b750d3c 100644 --- a/kontor-gin/internal/globals/globals.go +++ b/kontor-gin/internal/globals/globals.go @@ -1,5 +1,9 @@ package globals +import ( + "github.com/gin-gonic/gin" +) + var ( Secret = []byte("secret") @@ -9,3 +13,14 @@ var ( ) const UserKey = "user" + +func GetDefaultValues(user interface{}, message string) gin.H { + values := gin.H{ + "title": "Kontor MediaFiles", + "version": Version, + "message": message, + "user": user, + } + return values +} + diff --git a/kontor-gin/internal/handlers/media_lofi.go b/kontor-gin/internal/handlers/media_lofi.go index 6cd42b8..af6e9d5 100644 --- a/kontor-gin/internal/handlers/media_lofi.go +++ b/kontor-gin/internal/handlers/media_lofi.go @@ -117,15 +117,11 @@ func (handler *MediaLoFiHandler) ListPage(c *gin.Context) { return } logger.Info("MediaLoFiHandler#ListPage", "lofis count", len(lofis)) - c.HTML(http.StatusOK, "lofi", gin.H{ - "title": "Kontor MediaFiles", - "version": "0.4.0", - "message": "MediaFiles...", - "lofis": lofis, - "user": user, - "isReview": review, - "isDownload": download, - }) + data := globals.GetDefaultValues(user, "MediaFiles...") + data["lofis"] = lofis + data["isReview"] = review + data["isDownload"] = download + c.HTML(http.StatusOK, "lofi", data) } func (handler *MediaLoFiHandler) EditPage(c *gin.Context) { diff --git a/kontor-gin/internal/handlers/mediavideo.go b/kontor-gin/internal/handlers/mediavideo.go index 50cf0c6..e2aa58c 100644 --- a/kontor-gin/internal/handlers/mediavideo.go +++ b/kontor-gin/internal/handlers/mediavideo.go @@ -42,11 +42,9 @@ func (handler *MediaVideoHandler) ListPage(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) return } - c.HTML(http.StatusOK, "mediavideos", gin.H{ - "title": "Kontor MediaFiles", - "version": "0.4.0", - "message": "MediaFiles...", - "mediavideos": videos, - "user": user, - }) + data := globals.GetDefaultValues(user, "MediaFiles...") + data["title"] = "Kontor MediaFiles" + data["mediavideos"] = videos + + c.HTML(http.StatusOK, "mediavideos", data) } diff --git a/kontor-gin/internal/router/router.go b/kontor-gin/internal/router/router.go index 836a2ed..9019f77 100644 --- a/kontor-gin/internal/router/router.go +++ b/kontor-gin/internal/router/router.go @@ -60,6 +60,8 @@ func New(admin *handlers.AdminHandler, bookshelf *handlers.BookshelfHandler, com m.GET("/articles", media.MediaFileHandler.ListPage) m.GET("/media-files", media.MediaFileHandler.ListPage) m.GET("/files", media.MediaFileHandler.ListPage) + m.GET("/videos", media.MediaVideoHandler.ListPage) + m.GET("/media-videos", media.MediaVideoHandler.ListPage) m.GET("/media-lofis", media.MediaLoFiHandler.ListPage) m.GET("/media-lofis/:id/edit", media.MediaLoFiHandler.EditPage) m.POST("/media-lofis/:id/edit", media.MediaLoFiHandler.UpdatePage) diff --git a/kontor-gin/templates/layouts/navbar.html b/kontor-gin/templates/layouts/navbar.html index 9bb81da..0c9f263 100644 --- a/kontor-gin/templates/layouts/navbar.html +++ b/kontor-gin/templates/layouts/navbar.html @@ -23,7 +23,8 @@