internal logging library
This commit is contained in:
@@ -3,7 +3,6 @@ package templates
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
@@ -15,6 +14,7 @@ import (
|
||||
"ruben/inventory2/internal/domains/accounts"
|
||||
etsy_platform "ruben/inventory2/internal/domains/platforms/etsy"
|
||||
"ruben/inventory2/internal/domains/raw_events"
|
||||
"ruben/inventory2/internal/logging"
|
||||
"ruben/inventory2/internal/server/middleware"
|
||||
"ruben/inventory2/internal/server/response"
|
||||
"ruben/inventory2/internal/server/router"
|
||||
@@ -23,7 +23,7 @@ import (
|
||||
)
|
||||
|
||||
type webpageRouter struct {
|
||||
log *slog.Logger
|
||||
log *logging.Logger
|
||||
contentDir string
|
||||
templater *templater.Templater
|
||||
rawEvents *raw_events.Store
|
||||
@@ -33,7 +33,7 @@ type webpageRouter struct {
|
||||
}
|
||||
|
||||
func NewWebpageRouter(
|
||||
logger *slog.Logger,
|
||||
logger *logging.Logger,
|
||||
contentDir string,
|
||||
tmpl *templater.Templater,
|
||||
rawEvents *raw_events.Store,
|
||||
@@ -66,8 +66,6 @@ func NewWebpageRouter(
|
||||
// compiles the page template or component template matching the url
|
||||
// func (s *Server) serveTemplates(r *http.Request) (response.Response, error) {
|
||||
func (s *webpageRouter) serveTemplates(r *http.Request) (response.Response, error) {
|
||||
fmt.Println("webpageRouter.serveTemplates:", r.URL)
|
||||
|
||||
name, args := s.getTemplateNameAndArgs(r, s.contentDir+"/templates/component_bodies")
|
||||
|
||||
b, err := s.templater.ExecuteComponentBody(name, args...)
|
||||
@@ -90,7 +88,6 @@ func (s *webpageRouter) serveTemplates(r *http.Request) (response.Response, erro
|
||||
|
||||
// func (s *Server) getTemplateNameAndArgs(r *http.Request, templateDir string) (name string, args []any) {
|
||||
func (s *webpageRouter) getTemplateNameAndArgs(r *http.Request, templateDir string) (name string, args []any) {
|
||||
fmt.Println("webpageRouter.getTemplateNameAndArgs:", r.URL)
|
||||
ctx := r.Context()
|
||||
name, pathParams := getTemplateNameForURL(r.URL, templateDir)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user