diff --git a/.air.toml b/.air.toml index 8e51803..077a703 100644 --- a/.air.toml +++ b/.air.toml @@ -53,7 +53,7 @@ time = false clean_on_exit = true [proxy] -app_port = 8080 +app_port = 8090 enabled = true proxy_port = 8081 diff --git a/app/pb.go b/app/pb.go index 17c2122..5105828 100644 --- a/app/pb.go +++ b/app/pb.go @@ -109,7 +109,14 @@ func (app *App) setupTestuser() { func (app *App) Serve() error { engine := templating.NewEngine(&views.LayoutFS, &views.RoutesFS) - engine.Globals(map[string]interface{}{"isDev": app.MAConfig.Debug}) + engine.Globals(map[string]interface{}{ + "isDev": app.MAConfig.Debug, + "lang": "de", + "site": map[string]interface{}{ + "title": "Musenalm", + "lang": "de", + "desc": "Bibliographie deutscher Almanache des 18. und 19. Jahrhunderts", + }}) // INFO: hot reloading for poor people if app.MAConfig.Debug { diff --git a/dbmodels/seriesses.go b/dbmodels/seriesses.go index 5aa6177..9ab55a2 100644 --- a/dbmodels/seriesses.go +++ b/dbmodels/seriesses.go @@ -2,11 +2,15 @@ package dbmodels import ( "slices" + "strings" + "github.com/Theodor-Springmann-Stiftung/musenalm/helpers/datatypes" "github.com/pocketbase/dbx" "github.com/pocketbase/pocketbase/core" + "golang.org/x/text/cases" "golang.org/x/text/collate" "golang.org/x/text/language" + "golang.org/x/text/unicode/norm" ) type SeriesEntries map[string][]*REntriesSeries @@ -19,6 +23,17 @@ func SortSeriessesByTitle(series []*Series) { } func BasicSearchSeries(app core.App, query string) ([]*Series, []*Series, error) { + query = strings.TrimSpace(query) + query = datatypes.DeleteTags(query) + query = datatypes.NormalizeString(query) + query = datatypes.RemovePunctuation(query) + query = cases.Lower(language.German).String(query) + query = norm.NFKD.String(query) + + if query == "" { + return []*Series{}, []*Series{}, nil + } + series, err := TitleSearchSeries(app, query) if err != nil { return nil, nil, err @@ -33,8 +48,20 @@ func BasicSearchSeries(app core.App, query string) ([]*Series, []*Series, error) func TitleSearchSeries(app core.App, query string) ([]*Series, error) { series := []*Series{} - err := app.RecordQuery(SERIES_TABLE). - Where(dbx.Like(SERIES_TITLE_FIELD, query).Match(true, true)). + queries := strings.Split(query, " ") + q := app.RecordQuery(SERIES_TABLE). + Where(dbx.Like(SERIES_TITLE_FIELD, queries[0]).Match(true, true)) + + if len(queries) > 1 { + for _, que := range queries[1:] { + que = strings.TrimSpace(que) + if que != "" { + q.AndWhere(dbx.Like(SERIES_TITLE_FIELD, que).Match(true, true)) + } + } + } + + err := q. OrderBy(SERIES_TITLE_FIELD). All(&series) if err != nil { diff --git a/views/assets/favicon.png b/views/assets/favicon.png index 825b9e6..357867a 100644 Binary files a/views/assets/favicon.png and b/views/assets/favicon.png differ diff --git a/views/assets/scripts.js b/views/assets/scripts.js index e256647..19883d6 100644 --- a/views/assets/scripts.js +++ b/views/assets/scripts.js @@ -1,51 +1,64 @@ -const p = "script[xslt-onload]", a = "xslt-template", u = "xslt-transformed", c = /* @__PURE__ */ new Map(); -function m() { - let t = htmx.findAll(p); - for (let e of t) - T(e); +const f = "script[xslt-onload]", i = "xslt-template", m = "xslt-transformed", c = /* @__PURE__ */ new Map(); +function u() { + let t = htmx.findAll(f); + for (let r of t) + p(r); } -function T(t) { - if (t.getAttribute(u) === "true" || !t.hasAttribute(a)) +function p(t) { + if (t.getAttribute(m) === "true" || !t.hasAttribute(i)) return; - let e = "#" + t.getAttribute(a), o = c.get(e); + let r = "#" + t.getAttribute(i), o = c.get(r); if (!o) { - let n = htmx.find(e); - if (n) { - let l = n.innerHTML ? new DOMParser().parseFromString(n.innerHTML, "application/xml") : n.contentDocument; - o = new XSLTProcessor(), o.importStylesheet(l), c.set(e, o); + let s = htmx.find(r); + if (s) { + let l = s.innerHTML ? new DOMParser().parseFromString(s.innerHTML, "application/xml") : s.contentDocument; + o = new XSLTProcessor(), o.importStylesheet(l), c.set(r, o); } else - throw new Error("Unknown XSLT template: " + e); + throw new Error("Unknown XSLT template: " + r); } - let i = new DOMParser().parseFromString(t.innerHTML, "application/xml"), s = o.transformToFragment(i, document), r = new XMLSerializer().serializeToString(s); - t.outerHTML = r; + let a = new DOMParser().parseFromString(t.innerHTML, "application/xml"), e = o.transformToFragment(a, document), n = new XMLSerializer().serializeToString(e); + t.outerHTML = n; } -function f() { - document.querySelectorAll("template[simple]").forEach((e) => { - let o = e.getAttribute("id"), i = e.content; +function d() { + document.querySelectorAll("template[simple]").forEach((r) => { + let o = r.getAttribute("id"), a = r.content; customElements.define( o, class extends HTMLElement { constructor() { - super(), this.appendChild(i.cloneNode(!0)), this.slots = this.querySelectorAll("slot"); + super(), this.appendChild(a.cloneNode(!0)), this.slots = this.querySelectorAll("slot"); } connectedCallback() { - let s = []; - this.slots.forEach((r) => { - let n = r.getAttribute("name"), l = this.querySelector(`[slot="${n}"]`); - l && (r.replaceWith(l.cloneNode(!0)), s.push(l)); - }), s.forEach((r) => { - r.remove(); + let e = []; + this.slots.forEach((n) => { + let s = n.getAttribute("name"), l = this.querySelector(`[slot="${s}"]`); + l && (n.replaceWith(l.cloneNode(!0)), e.push(l)); + }), e.forEach((n) => { + n.remove(); }); } } ); }); } -function d() { - m(), htmx.on("htmx:load", function(t) { - m(); - }), f(); +function h() { + u(), htmx.on("htmx:load", function(t) { + u(); + }), d(); +} +function T(t) { + t || (t = window.location.href); + const r = document.querySelectorAll("nav"); + if (r && r.length > 0) + for (const o of r) + o.querySelectorAll("a, [data-url]").forEach((e) => { + if (e.dataset.url && e.dataset.url !== "") { + let n = window.location.origin + e.dataset.url; + t.startsWith(n) ? e.setAttribute("aria-current", "page") : e.removeAttribute("aria-current"); + } else e.href && (t.startsWith(e.href) ? e.setAttribute("aria-current", "page") : e.removeAttribute("aria-current")); + }); } export { - d as setup + T as setMenuActive, + h as setup }; diff --git a/views/assets/style.css b/views/assets/style.css index c21a236..ce5eade 100644 --- a/views/assets/style.css +++ b/views/assets/style.css @@ -1 +1 @@ -/*! tailwindcss v4.0.5 | MIT License | https://tailwindcss.com */@layer theme{:root,:host{--font-sans:"Source Sans 3","Merriweather Sans",ui-sans-serif;--font-serif:"Merriweather",ui-serif;--font-mono:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;--color-red-500:oklch(.637 .237 25.331);--color-slate-50:oklch(.984 .003 247.858);--color-slate-700:oklch(.372 .044 257.287);--color-slate-900:oklch(.208 .042 265.755);--color-gray-200:oklch(.928 .006 264.531);--spacing:.25rem;--breakpoint-2xl:96rem;--font-weight-bold:700;--ease-in:cubic-bezier(.4,0,1,1);--default-transition-duration:.15s;--default-transition-timing-function:cubic-bezier(.4,0,.2,1);--default-font-family:var(--font-sans);--default-font-feature-settings:var(--font-sans--font-feature-settings);--default-font-variation-settings:var(--font-sans--font-variation-settings);--default-mono-font-family:var(--font-mono);--default-mono-font-feature-settings:var(--font-mono--font-feature-settings);--default-mono-font-variation-settings:var(--font-mono--font-variation-settings)}}@layer base{*,:after,:before,::backdrop{box-sizing:border-box;border:0 solid;margin:0;padding:0}::file-selector-button{box-sizing:border-box;border:0 solid;margin:0;padding:0}html,:host{-webkit-text-size-adjust:100%;-moz-tab-size:4;tab-size:4;line-height:1.5;font-family:var(--default-font-family,ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji");font-feature-settings:var(--default-font-feature-settings,normal);font-variation-settings:var(--default-font-variation-settings,normal);-webkit-tap-highlight-color:transparent}body{line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;-webkit-text-decoration:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,samp,pre{font-family:var(--default-mono-font-family,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace);font-feature-settings:var(--default-mono-font-feature-settings,normal);font-variation-settings:var(--default-mono-font-variation-settings,normal);font-size:1em}small{font-size:80%}sub,sup{vertical-align:baseline;font-size:75%;line-height:0;position:relative}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}:-moz-focusring{outline:auto}progress{vertical-align:baseline}summary{display:list-item}ol,ul,menu{list-style:none}img,svg,video,canvas,audio,iframe,embed,object{vertical-align:middle;display:block}img,video{max-width:100%;height:auto}button,input,select,optgroup,textarea{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}::file-selector-button{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}:where(select:is([multiple],[size])) optgroup{font-weight:bolder}:where(select:is([multiple],[size])) optgroup option{padding-inline-start:20px}::file-selector-button{margin-inline-end:4px}::placeholder{opacity:1;color:color-mix(in oklab,currentColor 50%,transparent)}textarea{resize:vertical}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-date-and-time-value{min-height:1lh;text-align:inherit}::-webkit-datetime-edit{display:inline-flex}::-webkit-datetime-edit-fields-wrapper{padding:0}::-webkit-datetime-edit{padding-block:0}::-webkit-datetime-edit-year-field{padding-block:0}::-webkit-datetime-edit-month-field{padding-block:0}::-webkit-datetime-edit-day-field{padding-block:0}::-webkit-datetime-edit-hour-field{padding-block:0}::-webkit-datetime-edit-minute-field{padding-block:0}::-webkit-datetime-edit-second-field{padding-block:0}::-webkit-datetime-edit-millisecond-field{padding-block:0}::-webkit-datetime-edit-meridiem-field{padding-block:0}:-moz-ui-invalid{box-shadow:none}button,input:where([type=button],[type=reset],[type=submit]){-webkit-appearance:button;-moz-appearance:button;appearance:button}::file-selector-button{-webkit-appearance:button;-moz-appearance:button;appearance:button}::-webkit-inner-spin-button{height:auto}::-webkit-outer-spin-button{height:auto}[hidden]:where(:not([hidden=until-found])){display:none!important}*,:after,:before,::backdrop{border-color:var(--color-gray-200,currentColor)}::file-selector-button{border-color:var(--color-gray-200,currentColor)}}@layer components{html{font-size:15.5px}body{background-color:var(--color-slate-50)}h1,h2,h3,h4{font-family:var(--font-serif);--tw-font-weight:var(--font-weight-bold);font-weight:var(--font-weight-bold)}a{-webkit-hyphens:none;hyphens:none;color:var(--color-slate-700);text-decoration-line:underline;text-decoration-style:dotted}@media (hover:hover){a:hover{color:var(--color-slate-900);text-decoration-style:solid}}ul{margin-block:calc(var(--spacing)*2)}li{margin-left:calc(var(--spacing)*14);list-style-type:disc}a[aria-current=page]{color:var(--color-red-500)!important}main{flex-grow:1;flex-shrink:0}}@layer utilities{.collapse{visibility:collapse}.visible{visibility:visible}.container{width:100%}@media (width>=40rem){.container{max-width:40rem}}@media (width>=48rem){.container{max-width:48rem}}@media (width>=64rem){.container{max-width:64rem}}@media (width>=80rem){.container{max-width:80rem}}@media (width>=96rem){.container{max-width:96rem}}.mx-auto{margin-inline:auto}.mt-6{margin-top:calc(var(--spacing)*6)}.mt-8{margin-top:calc(var(--spacing)*8)}.mt-12{margin-top:calc(var(--spacing)*12)}.mb-1\.5{margin-bottom:calc(var(--spacing)*1.5)}.block{display:block}.contents{display:contents}.flex{display:flex}.hidden{display:none}.inline{display:inline}.inline-block{display:inline-block}.table{display:table}.h-1{height:calc(var(--spacing)*1)}.h-2{height:calc(var(--spacing)*2)}.h-3{height:calc(var(--spacing)*3)}.h-4{height:calc(var(--spacing)*4)}.h-5{height:calc(var(--spacing)*5)}.h-6{height:calc(var(--spacing)*6)}.h-full{height:100%}.min-h-screen{min-height:100vh}.w-full{width:100%}.max-w-\(--breakpoint-2xl\){max-width:var(--breakpoint-2xl)}.translate-2{--tw-translate-x:calc(var(--spacing)*2);--tw-translate-y:calc(var(--spacing)*2);translate:var(--tw-translate-x)var(--tw-translate-y)}.transform{transform:var(--tw-rotate-x)var(--tw-rotate-y)var(--tw-rotate-z)var(--tw-skew-x)var(--tw-skew-y)}.flex-col{flex-direction:column}.flex-row{flex-direction:row}.justify-center{justify-content:center}.gap-x-2{column-gap:calc(var(--spacing)*2)}.align-bottom{vertical-align:bottom}.align-top{vertical-align:top}.font-mono{font-family:var(--font-mono)}.font-sans{font-family:var(--font-sans)}.text-wrap{text-wrap:wrap}.italic{font-style:italic}.overline{text-decoration-line:overline}.underline{text-decoration-line:underline}.filter{filter:var(--tw-blur,)var(--tw-brightness,)var(--tw-contrast,)var(--tw-grayscale,)var(--tw-hue-rotate,)var(--tw-invert,)var(--tw-saturate,)var(--tw-sepia,)var(--tw-drop-shadow,)}.transition{transition-property:color,background-color,border-color,outline-color,text-decoration-color,fill,stroke,--tw-gradient-from,--tw-gradient-via,--tw-gradient-to,opacity,box-shadow,transform,translate,scale,rotate,filter,-webkit-backdrop-filter,backdrop-filter;transition-timing-function:var(--tw-ease,var(--default-transition-timing-function));transition-duration:var(--tw-duration,var(--default-transition-duration))}.ease-in{--tw-ease:var(--ease-in);transition-timing-function:var(--ease-in)}.\[a-zA-Z\:\\-\\\.\]{a-zA-Z:\-\.}.\[\&_td\]\:\!align-top td{vertical-align:top!important}}@property --tw-translate-x{syntax:"*";inherits:false;initial-value:0}@property --tw-translate-y{syntax:"*";inherits:false;initial-value:0}@property --tw-translate-z{syntax:"*";inherits:false;initial-value:0}@property --tw-rotate-x{syntax:"*";inherits:false;initial-value:rotateX(0)}@property --tw-rotate-y{syntax:"*";inherits:false;initial-value:rotateY(0)}@property --tw-rotate-z{syntax:"*";inherits:false;initial-value:rotateZ(0)}@property --tw-skew-x{syntax:"*";inherits:false;initial-value:skewX(0)}@property --tw-skew-y{syntax:"*";inherits:false;initial-value:skewY(0)}@property --tw-blur{syntax:"*";inherits:false}@property --tw-brightness{syntax:"*";inherits:false}@property --tw-contrast{syntax:"*";inherits:false}@property --tw-grayscale{syntax:"*";inherits:false}@property --tw-hue-rotate{syntax:"*";inherits:false}@property --tw-invert{syntax:"*";inherits:false}@property --tw-opacity{syntax:"*";inherits:false}@property --tw-saturate{syntax:"*";inherits:false}@property --tw-sepia{syntax:"*";inherits:false}@property --tw-ease{syntax:"*";inherits:false}@property --tw-font-weight{syntax:"*";inherits:false} +/*! tailwindcss v4.0.5 | MIT License | https://tailwindcss.com */@layer theme{:root,:host{--font-sans:"Source Sans 3","Merriweather Sans",ui-sans-serif;--font-serif:"Merriweather",ui-serif;--font-mono:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;--color-blue-400:oklch(.707 .165 254.624);--color-slate-50:oklch(.984 .003 247.858);--color-slate-200:oklch(.929 .013 255.508);--color-slate-600:oklch(.446 .043 257.281);--color-slate-700:oklch(.372 .044 257.287);--color-slate-900:oklch(.208 .042 265.755);--color-gray-200:oklch(.928 .006 264.531);--color-zinc-200:oklch(.92 .004 286.32);--color-zinc-300:oklch(.871 .006 286.286);--spacing:.25rem;--breakpoint-xl:80rem;--font-weight-bold:700;--ease-in:cubic-bezier(.4,0,1,1);--default-transition-duration:.15s;--default-transition-timing-function:cubic-bezier(.4,0,.2,1);--default-font-family:var(--font-sans);--default-font-feature-settings:var(--font-sans--font-feature-settings);--default-font-variation-settings:var(--font-sans--font-variation-settings);--default-mono-font-family:var(--font-mono);--default-mono-font-feature-settings:var(--font-mono--font-feature-settings);--default-mono-font-variation-settings:var(--font-mono--font-variation-settings)}}@layer base{*,:after,:before,::backdrop{box-sizing:border-box;border:0 solid;margin:0;padding:0}::file-selector-button{box-sizing:border-box;border:0 solid;margin:0;padding:0}html,:host{-webkit-text-size-adjust:100%;-moz-tab-size:4;tab-size:4;line-height:1.5;font-family:var(--default-font-family,ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji");font-feature-settings:var(--default-font-feature-settings,normal);font-variation-settings:var(--default-font-variation-settings,normal);-webkit-tap-highlight-color:transparent}body{line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;-webkit-text-decoration:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,samp,pre{font-family:var(--default-mono-font-family,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace);font-feature-settings:var(--default-mono-font-feature-settings,normal);font-variation-settings:var(--default-mono-font-variation-settings,normal);font-size:1em}small{font-size:80%}sub,sup{vertical-align:baseline;font-size:75%;line-height:0;position:relative}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}:-moz-focusring{outline:auto}progress{vertical-align:baseline}summary{display:list-item}ol,ul,menu{list-style:none}img,svg,video,canvas,audio,iframe,embed,object{vertical-align:middle;display:block}img,video{max-width:100%;height:auto}button,input,select,optgroup,textarea{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}::file-selector-button{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}:where(select:is([multiple],[size])) optgroup{font-weight:bolder}:where(select:is([multiple],[size])) optgroup option{padding-inline-start:20px}::file-selector-button{margin-inline-end:4px}::placeholder{opacity:1;color:color-mix(in oklab,currentColor 50%,transparent)}textarea{resize:vertical}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-date-and-time-value{min-height:1lh;text-align:inherit}::-webkit-datetime-edit{display:inline-flex}::-webkit-datetime-edit-fields-wrapper{padding:0}::-webkit-datetime-edit{padding-block:0}::-webkit-datetime-edit-year-field{padding-block:0}::-webkit-datetime-edit-month-field{padding-block:0}::-webkit-datetime-edit-day-field{padding-block:0}::-webkit-datetime-edit-hour-field{padding-block:0}::-webkit-datetime-edit-minute-field{padding-block:0}::-webkit-datetime-edit-second-field{padding-block:0}::-webkit-datetime-edit-millisecond-field{padding-block:0}::-webkit-datetime-edit-meridiem-field{padding-block:0}:-moz-ui-invalid{box-shadow:none}button,input:where([type=button],[type=reset],[type=submit]){-webkit-appearance:button;-moz-appearance:button;appearance:button}::file-selector-button{-webkit-appearance:button;-moz-appearance:button;appearance:button}::-webkit-inner-spin-button{height:auto}::-webkit-outer-spin-button{height:auto}[hidden]:where(:not([hidden=until-found])){display:none!important}*,:after,:before,::backdrop{border-color:var(--color-gray-200,currentColor)}::file-selector-button{border-color:var(--color-gray-200,currentColor)}}@layer components{html{font-size:15.5px}body{background-color:var(--color-slate-50)}h1,h2,h3,h4{font-family:var(--font-serif)}a{-webkit-hyphens:none;hyphens:none;color:var(--color-slate-700);text-decoration-line:underline;text-decoration-style:dotted}@media (hover:hover){a:hover{color:var(--color-slate-900);text-decoration-style:solid}}ul{margin-block:calc(var(--spacing)*2)}li{margin-left:calc(var(--spacing)*14);list-style-type:disc}nav>*{border-bottom-style:var(--tw-border-style);border-color:#0000;border-bottom-width:4px}@media (hover:hover){nav>:hover{border-color:var(--color-zinc-200)!important}}nav a[aria-current=page]{color:var(--color-blue-400);border-color:var(--color-zinc-300)!important}nav.submenu a[aria-current=page]{color:var(--color-blue-400)}main{flex-grow:1;flex-shrink:0}}@layer utilities{.collapse{visibility:collapse}.visible{visibility:visible}.container{width:100%}@media (width>=40rem){.container{max-width:40rem}}@media (width>=48rem){.container{max-width:48rem}}@media (width>=64rem){.container{max-width:64rem}}@media (width>=80rem){.container{max-width:80rem}}@media (width>=96rem){.container{max-width:96rem}}.mx-auto{margin-inline:auto}.mt-6{margin-top:calc(var(--spacing)*6)}.mt-8{margin-top:calc(var(--spacing)*8)}.mt-12{margin-top:calc(var(--spacing)*12)}.mb-1\.5{margin-bottom:calc(var(--spacing)*1.5)}.block{display:block}.contents{display:contents}.flex{display:flex}.hidden{display:none}.inline{display:inline}.inline-block{display:inline-block}.table{display:table}.h-1{height:calc(var(--spacing)*1)}.h-2{height:calc(var(--spacing)*2)}.h-3{height:calc(var(--spacing)*3)}.h-4{height:calc(var(--spacing)*4)}.h-5{height:calc(var(--spacing)*5)}.h-6{height:calc(var(--spacing)*6)}.h-full{height:100%}.min-h-screen{min-height:100vh}.w-full{width:100%}.max-w-\(--breakpoint-xl\){max-width:var(--breakpoint-xl)}.translate-2{--tw-translate-x:calc(var(--spacing)*2);--tw-translate-y:calc(var(--spacing)*2);translate:var(--tw-translate-x)var(--tw-translate-y)}.transform{transform:var(--tw-rotate-x)var(--tw-rotate-y)var(--tw-rotate-z)var(--tw-skew-x)var(--tw-skew-y)}.flex-col{flex-direction:column}.flex-row{flex-direction:row}.justify-between{justify-content:space-between}.justify-end{justify-content:flex-end}.gap-x-6{column-gap:calc(var(--spacing)*6)}.self-end{align-self:flex-end}.border-b{border-bottom-style:var(--tw-border-style);border-bottom-width:1px}.border-zinc-300{border-color:var(--color-zinc-300)}.bg-slate-200{background-color:var(--color-slate-200)}.px-3{padding-inline:calc(var(--spacing)*3)}.py-2\.5{padding-block:calc(var(--spacing)*2.5)}.pt-3{padding-top:calc(var(--spacing)*3)}.pb-1\.5{padding-bottom:calc(var(--spacing)*1.5)}.align-bottom{vertical-align:bottom}.align-top{vertical-align:top}.font-mono{font-family:var(--font-mono)}.font-sans{font-family:var(--font-sans)}.font-serif{font-family:var(--font-serif)}.font-bold{--tw-font-weight:var(--font-weight-bold);font-weight:var(--font-weight-bold)}.text-wrap{text-wrap:wrap}.text-slate-600{color:var(--color-slate-600)}.italic{font-style:italic}.overline{text-decoration-line:overline}.underline{text-decoration-line:underline}.filter{filter:var(--tw-blur,)var(--tw-brightness,)var(--tw-contrast,)var(--tw-grayscale,)var(--tw-hue-rotate,)var(--tw-invert,)var(--tw-saturate,)var(--tw-sepia,)var(--tw-drop-shadow,)}.transition{transition-property:color,background-color,border-color,outline-color,text-decoration-color,fill,stroke,--tw-gradient-from,--tw-gradient-via,--tw-gradient-to,opacity,box-shadow,transform,translate,scale,rotate,filter,-webkit-backdrop-filter,backdrop-filter;transition-timing-function:var(--tw-ease,var(--default-transition-timing-function));transition-duration:var(--tw-duration,var(--default-transition-duration))}.ease-in{--tw-ease:var(--ease-in);transition-timing-function:var(--ease-in)}.\[a-zA-Z\:\\-\\\.\]{a-zA-Z:\-\.}@media (hover:hover){.hover\:cursor-pointer:hover{cursor:pointer}.hover\:text-slate-900:hover{color:var(--color-slate-900)}}.\[\&_td\]\:\!align-top td{vertical-align:top!important}.\[\&\>\*\]\:-mb-1\.5>*{margin-bottom:calc(var(--spacing)*-1.5)}.\[\&\>\*\]\:px-1\.5>*{padding-inline:calc(var(--spacing)*1.5)}.\[\&\>\*\]\:pt-1>*{padding-top:calc(var(--spacing)*1)}.\[\&\>a\]\:no-underline>a{text-decoration-line:none}}@property --tw-translate-x{syntax:"*";inherits:false;initial-value:0}@property --tw-translate-y{syntax:"*";inherits:false;initial-value:0}@property --tw-translate-z{syntax:"*";inherits:false;initial-value:0}@property --tw-rotate-x{syntax:"*";inherits:false;initial-value:rotateX(0)}@property --tw-rotate-y{syntax:"*";inherits:false;initial-value:rotateY(0)}@property --tw-rotate-z{syntax:"*";inherits:false;initial-value:rotateZ(0)}@property --tw-skew-x{syntax:"*";inherits:false;initial-value:skewX(0)}@property --tw-skew-y{syntax:"*";inherits:false;initial-value:skewY(0)}@property --tw-border-style{syntax:"*";inherits:false;initial-value:solid}@property --tw-font-weight{syntax:"*";inherits:false}@property --tw-blur{syntax:"*";inherits:false}@property --tw-brightness{syntax:"*";inherits:false}@property --tw-contrast{syntax:"*";inherits:false}@property --tw-grayscale{syntax:"*";inherits:false}@property --tw-hue-rotate{syntax:"*";inherits:false}@property --tw-invert{syntax:"*";inherits:false}@property --tw-opacity{syntax:"*";inherits:false}@property --tw-saturate{syntax:"*";inherits:false}@property --tw-sepia{syntax:"*";inherits:false}@property --tw-ease{syntax:"*";inherits:false} diff --git a/views/layouts/components/_menu.gohtml b/views/layouts/components/_menu.gohtml index 5c83481..c427e66 100644 --- a/views/layouts/components/_menu.gohtml +++ b/views/layouts/components/_menu.gohtml @@ -1,4 +1,43 @@ -
- Reihen - Personen +
+
+
+

{{ .site.title }}

+

{{ .site.desc }}

+
+ + +
+
+ + diff --git a/views/layouts/default/root.gohtml b/views/layouts/default/root.gohtml index 79d2b17..026977a 100644 --- a/views/layouts/default/root.gohtml +++ b/views/layouts/default/root.gohtml @@ -30,18 +30,14 @@ -
-
- {{ block "_header" . }} - - {{ end }} -
- -
+
+
+ + +
{{ block "body" . }} diff --git a/views/package-lock.json b/views/package-lock.json index 09fec12..76e71ff 100644 --- a/views/package-lock.json +++ b/views/package-lock.json @@ -10,6 +10,7 @@ "license": "MIT", "devDependencies": { "@tailwindcss/postcss": "^4.0.0", + "daisyui": "^5.0.0-beta.8", "postcss": "^8.4.47", "postcss-cli": "^11.0.0", "prettier": "^3.3.3", @@ -1143,6 +1144,16 @@ "dev": true, "license": "MIT" }, + "node_modules/daisyui": { + "version": "5.0.0-beta.8", + "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-5.0.0-beta.8.tgz", + "integrity": "sha512-jSokqm5i+Pv1jG80wliNzMHjmcF+iMx5xRUpk0/QExVoVNyQNWeCsaWJQubPvUq7bt9nzSsQTR2uIZBoyIIoaA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/saadeghi/daisyui?sponsor=1" + } + }, "node_modules/dependency-graph": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz", diff --git a/views/package.json b/views/package.json index a9da47b..78db5d7 100644 --- a/views/package.json +++ b/views/package.json @@ -23,6 +23,7 @@ "license": "MIT", "devDependencies": { "@tailwindcss/postcss": "^4.0.0", + "daisyui": "^5.0.0-beta.8", "postcss": "^8.4.47", "postcss-cli": "^11.0.0", "prettier": "^3.3.3", diff --git a/views/public/favicon.png b/views/public/favicon.png index 825b9e6..357867a 100644 Binary files a/views/public/favicon.png and b/views/public/favicon.png differ diff --git a/views/transform/main.js b/views/transform/main.js index 608a548..5628f64 100644 --- a/views/transform/main.js +++ b/views/transform/main.js @@ -90,4 +90,32 @@ function setup() { setup_templates(); } -export { setup }; +function setMenuActive(url) { + if (!url) { + url = window.location.href; + } + const menus = document.querySelectorAll("nav"); + if (menus && menus.length > 0) { + for (const menu of menus) { + const links = menu.querySelectorAll("a, [data-url]"); + links.forEach((link) => { + if (link.dataset.url && link.dataset.url !== "") { + let fullurl = window.location.origin + link.dataset.url; + if (url.startsWith(fullurl)) { + link.setAttribute("aria-current", "page"); + } else { + link.removeAttribute("aria-current"); + } + } else if (link.href) { + if (url.startsWith(link.href)) { + link.setAttribute("aria-current", "page"); + } else { + link.removeAttribute("aria-current"); + } + } + }); + } + } +} + +export { setup, setMenuActive }; diff --git a/views/transform/site.css b/views/transform/site.css index 3cf4949..5039b2a 100644 --- a/views/transform/site.css +++ b/views/transform/site.css @@ -1,9 +1,8 @@ -@import 'tailwindcss'; - +@import "tailwindcss"; @theme { - --font-script: Rancho, ui-serif; - --font-sans: 'Source Sans 3', 'Merriweather Sans', ui-sans-serif; - --font-serif: 'Merriweather', ui-serif; + --font-script: Rancho, ui-serif; + --font-sans: "Source Sans 3", "Merriweather Sans", ui-sans-serif; + --font-serif: "Merriweather", ui-serif; } /* @@ -15,17 +14,17 @@ color utility to any element that depends on these defaults. */ @layer base { - *, - ::after, - ::before, - ::backdrop, - ::file-selector-button { - border-color: var(--color-gray-200, currentColor); - } + *, + ::after, + ::before, + ::backdrop, + ::file-selector-button { + border-color: var(--color-gray-200, currentColor); + } } @utility font-variant-small-caps { - font-variant-caps: small-caps; + font-variant-caps: small-caps; } @layer base { @@ -44,7 +43,7 @@ h2, h3, h4 { - @apply font-serif font-bold; + @apply font-serif; } a { @@ -59,8 +58,20 @@ @apply ml-14 list-disc; } - a[aria-current="page"] { - @apply text-red-500!; + nav > * { + @apply border-b-4 border-transparent hover:!border-zinc-200; + } + + nav a[aria-current="page"] { + @apply text-blue-400; + } + + nav a[aria-current="page"] { + @apply !border-zinc-300; + } + + nav.submenu a[aria-current="page"] { + @apply text-blue-400; } main {