Basic Briefansicht + parsing

controllers/brief.go

@@ -24,5 +24,5 @@ func GetLetter(c *fiber.Ctx) error {
 	text := lib.Letters.Item(letter)
 	tradition := lib.Traditions.Item(letter)
 
-	return c.Render("/brief/", map[string]any{"meta": meta, "text": text, "tradition": tradition, "next": np.Next, "prev": np.Prev})
+	return c.Render("/brief/", fiber.Map{"meta": meta, "text": text, "tradition": tradition, "next": np.Next, "prev": np.Prev})
 }

controllers/index.go

@@ -1,27 +1,12 @@
 package controllers
 
 import (
-	"strconv"
-
-	"github.com/Theodor-Springmann-Stiftung/lenz-web/xmlmodels"
 	"github.com/gofiber/fiber/v2"
+	"strconv"
 )
 
 const DEFAULT_YEAR = 1765
 
 func GetIndex(c *fiber.Ctx) error {
-	return c.Redirect(JAHRGAENGE_URL + "/" + strconv.Itoa(DEFAULT_YEAR))
+	return c.Redirect(LETTERS_URL + "?year=" + strconv.Itoa(DEFAULT_YEAR))
-}
-
-func GetIndexYear(c *fiber.Ctx) error {
-	lib := xmlmodels.Get()
-	years, yearmap := lib.Years()
-
-	y := c.Params(YEAR_PARAM)
-	year, err := strconv.Atoi(y)
-	if _, ok := yearmap[year]; (err != nil || !ok) && y != "all" {
-		return c.SendStatus(fiber.StatusNotFound)
-	}
-
-	return c.Render(JAHRGAENGE_URL+"/", map[string]any{"years": years, "yearmap": yearmap, "year": year, "all": y == "all"})
 }

controllers/routes.go

@@ -6,30 +6,37 @@ import (
 	"github.com/Theodor-Springmann-Stiftung/lenz-web/server"
 	"github.com/Theodor-Springmann-Stiftung/lenz-web/views"
 
+	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/compress"
 )
 
-const INDEX_URL = "/"
+const (
-const ASSETS_URL = "/assets"
+	INDEX_URL       = "/"
-const DATENSCHUTZ_URL = "/datenschutz"
+	ASSETS_URL      = "/assets"
-const JAHRGAENGE_URL = "/jahrgang"
+	DATENSCHUTZ_URL = "/datenschutz"
-const ZITATION_URL = "/ausgabe/zitation"
+	LETTERS_URL     = "/briefe"
-const EDITION_URL = "/ausgabe/edition"
+	ZITATION_URL    = "/ausgabe/zitation"
-const KONTAKT_URL = "/kontakt"
+	EDITION_URL     = "/ausgabe/edition"
-
+	KONTAKT_URL     = "/kontakt"
-var INDEX_YEAR_URL = JAHRGAENGE_URL + "/:" + YEAR_PARAM
+	LETTER_URL      = "/brief/:" + LETTER_PARAM
-var LETTER_URL = "/brief/:" + LETTER_PARAM
+	YEAR_PARAM      = "year"
-
+	LETTER_PARAM    = "letter"
-const YEAR_PARAM = "year"
+)
-const LETTER_PARAM = "letter"
 
 func Register(server server.Server, cfg config.Config) {
 	server.Server.Use(ASSETS_URL, compress.New(compress.Config{
 		Level: compress.LevelBestSpeed,
 	}))
 	server.Server.Use(ASSETS_URL, middleware.StaticHandler(&views.StaticFS))
+
+	server.Server.Use(func(ctx *fiber.Ctx) error {
+		ctx.Locals("cfg", cfg)
+		ctx.Locals("path", ctx.Path())
+		return ctx.Next()
+	})
+
 	server.Server.Get(INDEX_URL, GetIndex)
-	server.Server.Get(INDEX_YEAR_URL, GetIndexYear)
+	server.Server.Get(LETTERS_URL, GetLetters)
 	server.Server.Get(LETTER_URL, GetLetter)
 	server.Server.Get(DATENSCHUTZ_URL, Static(DATENSCHUTZ_URL+"/"))
 

controllers/static.go

@@ -11,6 +11,6 @@ func Static(url string) fiber.Handler {
 		url += "/"
 	}
 	return func(c *fiber.Ctx) error {
-		return c.Render(url, map[string]any{})
+		return c.Render(url, fiber.Map{"Was": "Static"})
 	}
 }

controllers/uebersicht.go

@@ -0,0 +1,23 @@
+package controllers
+
+import (
+	"strconv"
+
+	"github.com/Theodor-Springmann-Stiftung/lenz-web/xmlmodels"
+	"github.com/gofiber/fiber/v2"
+)
+
+func GetLetters(c *fiber.Ctx) error {
+	lib := xmlmodels.Get()
+	years, yearmap := lib.Years()
+	y := c.Query(YEAR_PARAM, strconv.Itoa(DEFAULT_YEAR))
+	// TODO: does not work ATM
+	c.Locals("path", c.Path())
+
+	year, err := strconv.Atoi(y)
+	if _, ok := yearmap[year]; (err != nil || !ok) && y != "all" {
+		return c.SendStatus(fiber.StatusNotFound)
+	}
+
+	return c.Render(LETTERS_URL+"/", fiber.Map{"years": years, "yearmap": yearmap, "year": year, "all": y == "all"})
+}

helpers/functions/string.go

@@ -1,6 +1,11 @@
 package functions
 
-import "html/template"
+import (
+	"html/template"
+	"strings"
+
+	xmlparsing "github.com/Theodor-Springmann-Stiftung/lenz-web/xml"
+)
 
 func FirstLetter(s string) string {
 	if len(s) == 0 {
@@ -15,3 +20,41 @@ func Safe(s string) template.HTML {
 	}
 	return template.HTML(s)
 }
+
+type LenzParseState struct{}
+
+func ParseGeneric(s string) string {
+	if len(s) == 0 {
+		return ""
+	}
+
+	builder := strings.Builder{}
+	for elem, err := range xmlparsing.Iterate(s, LenzParseState{}) {
+		if err != nil {
+			return err.Error()
+		}
+		switch elem.Token.Type {
+		case xmlparsing.StartElement:
+			builder.WriteString("<div class=\"")
+			builder.WriteString(elem.Token.Name)
+			for key, value := range elem.Token.Attributes {
+				builder.WriteString(" ")
+				builder.WriteString(key)
+				builder.WriteString("-")
+				builder.WriteString(value)
+			}
+
+			builder.WriteString("\">")
+		}
+
+		if elem.Token.Type == xmlparsing.CharData {
+			builder.WriteString(elem.Token.Data)
+		}
+
+		if elem.Token.Type == xmlparsing.EndElement {
+			builder.WriteString("</div>")
+		}
+	}
+
+	return builder.String()
+}

lenz.go

@@ -9,6 +9,7 @@ import (
 	"github.com/Theodor-Springmann-Stiftung/lenz-web/config"
 	"github.com/Theodor-Springmann-Stiftung/lenz-web/controllers"
 	gitprovider "github.com/Theodor-Springmann-Stiftung/lenz-web/git"
+	"github.com/Theodor-Springmann-Stiftung/lenz-web/helpers/functions"
 	"github.com/Theodor-Springmann-Stiftung/lenz-web/server"
 	"github.com/Theodor-Springmann-Stiftung/lenz-web/templating"
 	"github.com/Theodor-Springmann-Stiftung/lenz-web/views"
@@ -52,7 +53,7 @@ func main() {
 
 	engine := templating.New(&views.LayoutFS, &views.RoutesFS)
 	engine.AddFuncs(lib.FuncMap())
-
+	engine.AddFunc("ParseGeneric", functions.ParseGeneric)
 	storage := memory.New(memory.Config{
 		GCInterval: 24 * time.Hour,
 	})

server/server.go

@@ -47,14 +47,6 @@ func New(engine *templating.Engine, storage fiber.Storage, debug bool) Server {
 		PassLocalsToViews: true,
 	})
 
-	if debug {
-		server.Use(logger.New())
-	}
-
-	if !debug {
-		server.Use(recover.New())
-	}
-
 	if debug {
 		server.Use(cache.New(cache.Config{
 			Next:         CacheFunc,
@@ -62,13 +54,17 @@ func New(engine *templating.Engine, storage fiber.Storage, debug bool) Server {
 			CacheControl: false,
 			Storage:      storage,
 		}))
-	} else {
+		server.Use(logger.New())
+	}
+
+	if !debug {
 		server.Use(cache.New(cache.Config{
 			Next:         CacheFunc,
 			Expiration:   CACHE_TIME,
 			CacheControl: true,
 			Storage:      storage,
 		}))
+		server.Use(recover.New())
 	}
 
 	return Server{

templating/engine.go

@@ -11,6 +11,7 @@ import (
 	"sync"
 
 	"github.com/Theodor-Springmann-Stiftung/lenz-web/helpers/functions"
+	"github.com/gofiber/fiber/v2"
 	"golang.org/x/net/websocket"
 )
 
@@ -188,18 +189,14 @@ func (e *Engine) AddFuncs(funcs template.FuncMap) {
 }
 
 func (e *Engine) Render(out io.Writer, path string, data any, layout ...string) error {
-	slog.Debug("Rendering template", "path", path, "layout", layout, "data", data)
+	slog.Debug("Rendering", "path", path, "layout", layout, "data", data)
 	e.mu.RLock()
-	ld := data.(map[string]any)
+	ld := data.(fiber.Map)
 	if e.GlobalData != nil {
 		maps.Copy(ld, e.GlobalData)
 	}
 	e.mu.RUnlock()
 
-	if e.debug {
-		slog.Debug("Rendering template", "path", path, "layout", layout, "data", ld)
-	}
-
 	e.regmu.RLock()
 	defer e.regmu.RUnlock()
 	var l *template.Template

views/layouts/components/_menu.gohtml

@@ -1,10 +1,8 @@
 {{ $model := . }}
 
-
 <nav class="flex flex-row gap-x-1 justify-between">
 	<div>
 		<a class="inline-block px-0.5" href="/"> J.M.R. Lenz: Kritische Briefausgabe </a>
 	</div>
-	<a href="/jahrgang/1765" class="inline-block px-0.5">Jahrgänge </a>
+	<a href="/briefe?year=1765" class="inline-block px-0.5">Jahrgänge </a>
-	{{ .path }}
 </nav>

views/routes/brief/body.gohtml

@@ -6,3 +6,5 @@
 {{ if .next }}
 	<a href="/brief/{{ .next.Letter }}" class="stdlink">Nächster</a>
 {{ end }}
+
+{{- Safe (ParseGeneric .text.Content) -}}

views/routes/briefe/body.gohtml

@@ -5,14 +5,14 @@
 	{{- range $y := .years -}}
 		<a
 			class="inline-block stdlink px-0.5"
-			href="/jahrgang/{{ $y }}"
+			href="/briefe?year={{ $y }}"
 			{{ if eq $model.year $y -}}aria-current="page"{{- end }}
 			>{{ $y }}</a
 		>
 	{{- end -}}
 	<a
 		class="inline-block stdlink px-0.5"
-		href="/jahrgang/all"
+		href="/briefe?year=all"
 		{{ if .all -}}aria-current="page"{{- end }}
 		>Alle</a
 	>