From a7cb7e3ef11f14017ecfd900205fde1b1b38f386 Mon Sep 17 00:00:00 2001 From: Florian Hoss Date: Sun, 18 Dec 2022 08:59:48 +0100 Subject: [PATCH] Pass system to template --- main.go | 18 +++++++++++++----- system/system.go | 3 ++- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/main.go b/main.go index 056c0185699caaaa47af43613fe51466d880abdf..77b5b92d64d20680fabcab94985c532554c9db33 100644 --- a/main.go +++ b/main.go @@ -41,23 +41,31 @@ func main() { defer g.logger.Sync() g.setupEchoLogging() + g.router.Use(middleware.Recover()) + g.router.Use(middleware.GzipWithConfig(middleware.GzipConfig{Level: 5})) + g.router.Pre(middleware.RemoveTrailingSlash()) + w := weather.NewWeatherService(g.logger) b := bookmarks.NewBookmarkService(g.logger) + var s *system.System if g.config.LiveSystem { - system.NewSystemService(g.logger) + s = system.NewSystemService(g.logger) } - g.router.Use(middleware.Recover()) - g.router.Use(middleware.GzipWithConfig(middleware.GzipConfig{Level: 5})) - g.router.Pre(middleware.RemoveTrailingSlash()) - g.router.GET("/", func(c echo.Context) error { return c.Render(http.StatusOK, "index.gohtml", map[string]interface{}{ "Title": g.config.Title, "Weather": w.CurrentWeather, "Bookmarks": b.Categories, + "System": s, }) }) g.router.Static("/static", "static") + g.router.Static("/storage/icons", "storage/icons") + + g.router.GET("/robots.txt", func(c echo.Context) error { + return c.String(http.StatusOK, "User-agent: *\nDisallow: /") + }) + g.router.Logger.Fatal(g.router.Start(fmt.Sprintf(":%d", g.config.Port))) } diff --git a/system/system.go b/system/system.go index f3efd8d3a754acc4bac8060017975a85217e07c9..056cbaf6b9625b616569de5c525911187aff619f 100644 --- a/system/system.go +++ b/system/system.go @@ -5,9 +5,10 @@ import ( "time" ) -func NewSystemService(logging *zap.SugaredLogger) { +func NewSystemService(logging *zap.SugaredLogger) *System { s := System{log: logging} s.Initialize() + return &s } func (s *System) UpdateLiveInformation() {