Refactor code changes

This commit is contained in:
Florian Hoss 2023-04-16 16:04:31 +02:00
parent b6bb575558
commit ecc8b98c45
2 changed files with 15 additions and 11 deletions

19
main.go
View file

@ -1,20 +1,23 @@
package main
import (
"context"
"fmt"
"github.com/caarlos0/env/v6"
"github.com/labstack/echo/v4"
"go.uber.org/zap"
"godash/bookmarks"
"godash/hub"
"godash/system"
"godash/weather"
"context"
"fmt"
"html/template"
"net/http"
"os"
"os/signal"
"syscall"
"time"
"github.com/caarlos0/env/v6"
"github.com/labstack/echo/v4"
"go.uber.org/zap"
)
type goDash struct {
@ -56,7 +59,7 @@ func (g *goDash) startServer() {
func (g *goDash) setupTemplateRender() {
g.router.Renderer = &TemplateRenderer{
templates: template.Must(template.ParseGlob("templates/*.gohtml")),
templates: template.Must(template.ParseGlob("templates/*.html")),
}
}
@ -79,9 +82,9 @@ func main() {
go g.startServer()
g.logger.Infof("running on %s:%d", "http://localhost", g.config.Port)
// handle graceful shutdown
quit := make(chan os.Signal, 1)
signal.Notify(quit, os.Interrupt)
// https://docs.docker.com/engine/reference/commandline/stop/
signal.Notify(quit, syscall.SIGTERM)
<-quit
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
defer cancel()

View file

@ -1,10 +1,11 @@
package main
import (
"github.com/gorilla/websocket"
"github.com/labstack/echo/v4"
"godash/hub"
"net/http"
"github.com/gorilla/websocket"
"github.com/labstack/echo/v4"
)
var (
@ -12,7 +13,7 @@ var (
)
func (g *goDash) index(c echo.Context) error {
return c.Render(http.StatusOK, "index.gohtml", map[string]interface{}{
return c.Render(http.StatusOK, "index.html", map[string]interface{}{
"Title": g.config.Title,
"Weather": g.info.weather.CurrentWeather,
"Parsed": g.info.bookmarks.Parsed,