Theodor-Springmann-Stiftung/musenalm
1
0
Fork 0
mirror of https://github.com/Theodor-Springmann-Stiftung/musenalm.git synced 2025-10-29 17:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Slight page refactoring, text pages, tooltips

Browse Source
This commit is contained in:
Simon Martens
2025-02-22 00:11:25 +01:00
parent 0d79239fd8
commit 29576ec7a0
47 changed files with 2079 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pages/404.go
View File

@@ -13,7 +13,7 @@ const URL_ERROR_500 = "/errors/500/"
func init() {
rp := &ErrorPage{
Page: pagemodels.Page{
StaticPage: pagemodels.StaticPage{
Name: URL_ERROR_404,
},
}
@@ -21,7 +21,7 @@ func init() {
}
type ErrorPage struct {
pagemodels.Page
pagemodels.StaticPage
}
func (p *ErrorPage) Setup(router *router.Router[*core.RequestEvent], app core.App, engine *templating.Engine) error {
@@ -33,7 +33,3 @@ func (p *ErrorPage) Setup(router *router.Router[*core.RequestEvent], app core.Ap
})
return nil
}
func Error404(e *core.RequestEvent, engine *templating.Engine, err error, data map[string]interface{}) error {
return engine.Response404(e, err, data)
}

16
pages/almanach.go
View File

@@ -16,7 +16,7 @@ const (
func init() {
rp := &AlmanachPage{
Page: pagemodels.Page{
StaticPage: pagemodels.StaticPage{
Name: pagemodels.P_REIHEN_NAME,
},
}
@@ -24,7 +24,7 @@ func init() {
}
type AlmanachPage struct {
pagemodels.Page
pagemodels.StaticPage
}
func (p *AlmanachPage) Setup(router *router.Router[*core.RequestEvent], app core.App, engine *templating.Engine) error {
@@ -33,13 +33,13 @@ func (p *AlmanachPage) Setup(router *router.Router[*core.RequestEvent], app core
data := make(map[string]interface{})
entry, err := dbmodels.EntryForMusenalmID(app, id)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
data["entry"] = entry
series, srelations, _, err := dbmodels.SeriesForEntries(app, []*dbmodels.Entry{entry})
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
s := map[string]*dbmodels.Series{}
@@ -52,26 +52,26 @@ func (p *AlmanachPage) Setup(router *router.Router[*core.RequestEvent], app core
places, err := dbmodels.PlacesForEntry(app, entry)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
data["places"] = places
contents, err := dbmodels.ContentsForEntry(app, entry)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
data["contents"] = contents
agents, arelations, err := dbmodels.AgentsForEntries(app, []*dbmodels.Entry{entry})
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
data["arelations"] = arelations
if len(contents) > 0 {
cagents, crelations, err := dbmodels.AgentsForContents(app, contents)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
data["crelations"] = crelations
for k, v := range cagents {

5
pages/index.go
View File

@@ -13,7 +13,7 @@ import (
func init() {
ip := &IndexPage{
Page: pagemodels.Page{
DefaultPage: pagemodels.DefaultPage{
Name: pagemodels.P_INDEX_NAME,
},
}
@@ -21,9 +21,10 @@ func init() {
}
type IndexPage struct {
pagemodels.Page
pagemodels.DefaultPage
}
// TODO:
func (p *IndexPage) Setup(router *router.Router[*core.RequestEvent], app core.App, engine *templating.Engine) error {
router.GET("/{$}", func(e *core.RequestEvent) error {
var builder strings.Builder

2
pages/migrations_danksagungen/1739446703_insert_data_danksagungen.go
View File

@@ -26,7 +26,7 @@ func init() {
return err
}
record := pagemodels.NewDefaultPage(core.NewRecord(collection))
record := pagemodels.NewTextPage(core.NewRecord(collection))
record.SetTitle("Danksagungen")
record.SetText(TEXT)

2
pages/migrations_dokumentation/1739446703_insert_data_dokumentation.go
View File

@@ -491,7 +491,7 @@ func init() {
return err
}
record := pagemodels.NewDefaultPage(core.NewRecord(collection))
record := pagemodels.NewTextPage(core.NewRecord(collection))
record.SetTitle("Dokumentation")
record.SetText(START)

2
pages/migrations_einfuehrung/1739446703_insert_data_einfuehrung.go
View File

@@ -39,7 +39,7 @@ func init() {
return err
}
record := pagemodels.NewDefaultPage(core.NewRecord(collection))
record := pagemodels.NewTextPage(core.NewRecord(collection))
record.SetTitle("Einführung")
record.SetText(START)

2
pages/migrations_kontakt/1739446703_insert_data_kontakt.go
View File

@@ -17,7 +17,7 @@ func init() {
return err
}
record := pagemodels.NewDefaultPage(core.NewRecord(collection))
record := pagemodels.NewTextPage(core.NewRecord(collection))
record.SetTitle("Kontakt")
record.SetText(START)

2
pages/migrations_literatur/1739446703_insert_data_literatur.go
View File

@@ -122,7 +122,7 @@ func init() {
return err
}
record := pagemodels.NewDefaultPage(core.NewRecord(collection))
record := pagemodels.NewTextPage(core.NewRecord(collection))
record.SetTitle("Literatur")
record.SetText(START)

25
pages/person.go
View File

@@ -16,15 +16,18 @@ const (
func init() {
rp := &PersonPage{
Page: pagemodels.Page{
Name: URL_PERSON,
StaticPage: pagemodels.StaticPage{
Name: URL_PERSON,
Template: TEMPLATE_PERSON,
Layout: templating.DEFAULT_LAYOUT_NAME,
URL: URL_PERSON,
},
}
app.Register(rp)
}
type PersonPage struct {
pagemodels.Page
pagemodels.StaticPage
}
func (p *PersonPage) Setup(router *router.Router[*core.RequestEvent], app core.App, engine *templating.Engine) error {
@@ -35,13 +38,13 @@ func (p *PersonPage) Setup(router *router.Router[*core.RequestEvent], app core.A
agent, err := dbmodels.AgentForId(app, person)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
data["a"] = agent
series, relations, entries, err := dbmodels.SeriesForAgent(app, person)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
dbmodels.SortSeriessesByTitle(series)
@@ -51,31 +54,27 @@ func (p *PersonPage) Setup(router *router.Router[*core.RequestEvent], app core.A
contents, err := dbmodels.ContentsForAgent(app, person)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
agents, crelations, err := dbmodels.AgentsForContents(app, contents)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
data["agents"] = agents
data["crelations"] = crelations
centries, err := dbmodels.EntriesForContents(app, contents)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
data["centries"] = centries
dbmodels.SortContentsByEntryNumbering(contents, centries)
data["contents"] = contents
return p.Get(e, engine, data)
return engine.Response200(e, p.Template, data, p.Layout)
})
return nil
}
func (p *PersonPage) Get(request *core.RequestEvent, engine *templating.Engine, data map[string]interface{}) error {
return engine.Response200(request, TEMPLATE_PERSON, data)
}

12
pages/personen.go
View File

@@ -16,7 +16,7 @@ const (
func init() {
rp := &PersonenPage{
Page: pagemodels.Page{
StaticPage: pagemodels.StaticPage{
Name: pagemodels.P_REIHEN_NAME,
},
}
@@ -24,7 +24,7 @@ func init() {
}
type PersonenPage struct {
pagemodels.Page
pagemodels.StaticPage
}
func (p *PersonenPage) Setup(router *router.Router[*core.RequestEvent], app core.App, engine *templating.Engine) error {
@@ -87,7 +87,7 @@ func (p *PersonenPage) FilterRequest(app core.App, engine *templating.Engine, e
}
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
dbmodels.SortAgentsByName(agents)
data["agents"] = agents
@@ -103,7 +103,7 @@ func (p *PersonenPage) SearchRequest(app core.App, engine *templating.Engine, e
agents, altagents, err := dbmodels.BasicSearchAgents(app, search)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
dbmodels.SortAgentsByName(agents)
@@ -126,7 +126,7 @@ func (p *PersonenPage) LetterRequest(app core.App, engine *templating.Engine, e
agents, err := dbmodels.AgentsForLetter(app, letter)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
dbmodels.SortAgentsByName(agents)
data["agents"] = agents
@@ -137,7 +137,7 @@ func (p *PersonenPage) LetterRequest(app core.App, engine *templating.Engine, e
func (p *PersonenPage) Get(request *core.RequestEvent, engine *templating.Engine, data map[string]interface{}) error {
err := p.CommonData(request.App, data)
if err != nil {
return Error404(request, engine, err, data)
return engine.Response404(request, err, data)
}
return engine.Response200(request, URL_PERSONEN, data)

13
pages/reihe.go
View File

@@ -16,15 +16,18 @@ const (
func init() {
rp := &ReihePage{
Page: pagemodels.Page{
Name: pagemodels.P_REIHEN_NAME,
StaticPage: pagemodels.StaticPage{
Name: pagemodels.P_REIHEN_NAME,
URL: URL_REIHE,
Layout: templating.DEFAULT_LAYOUT_NAME,
Template: TEMPLATE_REIHE,
},
}
app.Register(rp)
}
type ReihePage struct {
pagemodels.Page
pagemodels.StaticPage
}
// TODO: data richtig seutzen, damit die Reihe mit dem template _reihe angezeigt wird
@@ -34,13 +37,13 @@ func (p *ReihePage) Setup(router *router.Router[*core.RequestEvent], app core.Ap
data := make(map[string]interface{})
reihe, err := dbmodels.SeriesForId(app, id)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
data["series"] = reihe
rmap, emap, err := dbmodels.EntriesForSeriesses(app, []*dbmodels.Series{reihe})
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
data["relations"] = rmap[reihe.Id]

41
pages/reihen.go
View File

@@ -22,7 +22,7 @@ const (
func init() {
rp := &ReihenPage{
Page: pagemodels.Page{
DefaultPage: pagemodels.DefaultPage{
Name: pagemodels.P_REIHEN_NAME,
},
}
@@ -30,7 +30,7 @@ func init() {
}
type ReihenPage struct {
pagemodels.Page
pagemodels.DefaultPage
}
func (p *ReihenPage) Setup(router *router.Router[*core.RequestEvent], app core.App, engine *templating.Engine) error {
@@ -65,12 +65,12 @@ func (p *ReihenPage) YearRequest(app core.App, engine *templating.Engine, e *cor
y, err := strconv.Atoi(year)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
series, relations, entries, err := dbmodels.SeriesForYear(app, y)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
data["entries"] = entries
data["relations"] = relations
@@ -83,13 +83,14 @@ func (p *ReihenPage) LetterRequest(app core.App, engine *templating.Engine, e *c
letter := e.Request.URL.Query().Get(PARAM_LETTER)
data := map[string]interface{}{}
if letter == "" {
data["startpage"] = true
letter = "A"
}
data[PARAM_LETTER] = letter
series, err := dbmodels.SeriesForLetter(app, letter)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
// INFO: We sort again since the query can't sort german umlauts correctly
dbmodels.SortSeriessesByTitle(series)
@@ -97,7 +98,7 @@ func (p *ReihenPage) LetterRequest(app core.App, engine *templating.Engine, e *c
rmap, bmap, err := dbmodels.EntriesForSeriesses(app, series)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
data["entries"] = bmap
data["relations"] = rmap
@@ -112,13 +113,13 @@ func (p *ReihenPage) PersonRequest(app core.App, engine *templating.Engine, e *c
agent, err := dbmodels.AgentForId(app, person)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
data["a"] = agent
series, relations, entries, err := dbmodels.SeriesForAgent(app, person)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
dbmodels.SortSeriessesByTitle(series)
data["series"] = series
@@ -135,13 +136,13 @@ func (p *ReihenPage) PlaceRequest(app core.App, engine *templating.Engine, e *co
pl, err := dbmodels.PlaceForId(app, place)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
data["p"] = pl
series, relations, entries, err := dbmodels.SeriesForPlace(app, place)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
data["series"] = series
data["relations"] = relations
@@ -159,7 +160,7 @@ func (p *ReihenPage) SearchRequest(app core.App, engine *templating.Engine, e *c
series, altseries, err := dbmodels.BasicSearchSeries(app, search)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
dbmodels.SortSeriessesByTitle(series)
dbmodels.SortSeriessesByTitle(altseries)
@@ -168,12 +169,12 @@ func (p *ReihenPage) SearchRequest(app core.App, engine *templating.Engine, e *c
rmap, bmap, err := dbmodels.EntriesForSeriesses(app, series)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
rmap2, bmap2, err := dbmodels.EntriesForSeriesses(app, altseries)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
for k, v := range rmap2 {
@@ -187,21 +188,21 @@ func (p *ReihenPage) SearchRequest(app core.App, engine *templating.Engine, e *c
if searchint, err := strconv.Atoi(search); err == nil {
identries, err := dbmodels.EntriesForID(app, searchint)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
if len(identries) != 0 {
idseries, rmap3, bmap3, err := dbmodels.SeriesForEntries(app, identries)
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
dbmodels.SortSeriessesByTitle(idseries)
data["idseries"] = idseries
if err != nil {
return Error404(e, engine, err, data)
return engine.Response404(e, err, data)
}
for k, v := range rmap3 {
@@ -246,13 +247,19 @@ func (p *ReihenPage) CommonData(app core.App, data map[string]interface{}) error
}
data["years"] = years
record, err := p.GetLatestData(app)
if err != nil {
return err
}
data["record"] = pagemodels.NewReihen(record)
return nil
}
func (p *ReihenPage) Get(request *core.RequestEvent, engine *templating.Engine, data map[string]interface{}) error {
err := p.CommonData(request.App, data)
if err != nil {
return Error404(request, engine, err, data)
return engine.Response404(request, err, data)
}
return engine.Response200(request, URL_REIHEN, data)

36
pages/static.go
View File

@@ -7,28 +7,36 @@ import (
)
func init() {
RegisterStaticPage("/datenschutz/")
RegisterDefaultPage("/edition/kontakt/", pagemodels.P_KONTAKT_NAME)
RegisterDefaultPage("/edition/danksagungen/", pagemodels.P_DANK_NAME)
RegisterDefaultPage("/edition/literatur/", pagemodels.P_LIT_NAME)
RegisterDefaultPage("/edition/einfuehrung/", pagemodels.P_EINFUEHRUNG_NAME)
RegisterStaticPage("/datenschutz/", pagemodels.P_DATENSCHUTZ_NAME)
RegisterTextPage("/edition/kontakt/", pagemodels.P_KONTAKT_NAME)
RegisterTextPage("/edition/danksagungen/", pagemodels.P_DANK_NAME)
RegisterTextPage("/edition/literatur/", pagemodels.P_LIT_NAME)
RegisterTextPage("/edition/einfuehrung/", pagemodels.P_EINFUEHRUNG_NAME)
}
func RegisterStaticPage(url string) {
app.Register(&pagemodels.Page{
Name: url,
func RegisterStaticPage(url, name string) {
app.Register(&pagemodels.StaticPage{
Name: name,
Layout: templating.DEFAULT_LAYOUT_NAME,
Template: url,
URL: url,
})
}
func RegisterTextPage(url, name string) {
app.Register(&pagemodels.TextPage{
Name: name,
Layout: templating.DEFAULT_LAYOUT_NAME,
Template: url,
URL: url,
})
}
func RegisterDefaultPage(url string, name string) {
app.Register(&pagemodels.DefaultPage{
Page: pagemodels.Page{
Name: name,
Layout: templating.DEFAULT_LAYOUT_NAME,
Template: url,
},
URL: url,
Name: name,
Layout: templating.DEFAULT_LAYOUT_NAME,
Template: url,
URL: url,
})
}