Diffstat (limited to 'views/layouts')
| -rw-r--r-- | views/layouts/general-page.html | 187 |
1 files changed, 109 insertions, 78 deletions
diff --git a/views/layouts/general-page.html b/views/layouts/general-page.html index d787c16..b435402 100644 --- a/views/layouts/general-page.html +++ b/views/layouts/general-page.html @@ -24,6 +24,18 @@ /> <link rel="stylesheet" + href="{{ .StaticStorageBaseUrl }}/libs/font-awesome/7.2.0/css/fontawesome.min.css" + /> + <link + rel="stylesheet" + href="{{ .StaticStorageBaseUrl }}/libs/font-awesome/7.2.0/css/brands.min.css" + /> + <link + rel="stylesheet" + href="{{ .StaticStorageBaseUrl }}/libs/font-awesome/7.2.0/css/solid.min.css" + /> + <link + rel="stylesheet" href="{{ .StaticStorageBaseUrl }}/libs/leaflet/1.9.4/leaflet.css" /> <link @@ -43,11 +55,6 @@ type="image/svg+xml" media="(prefers-color-scheme: dark)" /> - <link - rel="icon" - href="/favicon.ico" - type="image/x-icon" - /> {{- with .LinkedData }} <script type="application/ld+json"> {{ . }} @@ -311,50 +318,14 @@ switchTheme(savedTheme); </script> - <script src="{{ .StaticStorageBaseUrl }}/libs/htmx/2.0.6/htmx.min.js"></script> - <script src="{{ .StaticStorageBaseUrl }}/libs/leaflet/1.9.4/leaflet.js"></script> - <script src="{{ .StaticStorageBaseUrl }}/libs/imagesloaded/5.0.0/imagesloaded.pkgd.min.js"></script> - <script src="{{ .StaticStorageBaseUrl }}/libs/packery/3.0.0/dist/packery.pkgd.min.js"></script> - - <script> - // Enable fitWidth-like attribute for Packery. Source: https://codepen.io/desandro/pen/kVmLYz - var __resetLayout = Packery.prototype._resetLayout; - Packery.prototype._resetLayout = function () { - __resetLayout.call(this); - var parentSize = getSize(this.element.parentNode); - var colW = this.columnWidth + this.gutter; - this.fitWidth = - Math.floor((parentSize.innerWidth + this.gutter) / colW) * - colW; - this.packer.width = this.fitWidth; - this.packer.height = Number.POSITIVE_INFINITY; - this.packer.reset(); - }; - - Packery.prototype._getContainerSize = function () { - var emptyWidth = 0; - for (var i = 0, len = this.packer.spaces.length; i < len; i++) { - var space = this.packer.spaces[i]; - if ( - space.y === 0 && - space.height === Number.POSITIVE_INFINITY - ) { - emptyWidth += space.width; - } - } - - return { - width: this.fitWidth - this.gutter - emptyWidth, - height: this.maxY - this.gutter, - }; - }; - - Packery.prototype.needsResizeLayout = function () { - return true; - }; - </script> - - <div id="general-page-top-embeds" class="flex">{{ .RenderedTopEmbeds }}</div> + <div + id="general-page-top-embeds" + class="flex" + hx-get="/api/v1/general-page/top-embeds{{ if .QueryString }}?{{ .QueryString }}{{ end }}" + hx-trigger="load" + hx-target="this" + hx-swap="innerHTML" + ></div> <div id="general-page-top-embeds-trigger" hx-get="/api/v1/general-page/top-embeds{{ if .QueryString }}?{{ .QueryString }}{{ end }}" @@ -375,7 +346,9 @@ class="flex flex-row w-full h-24 md:flex-col md:w-24 md:h-full bg-paper bg-background shadow-elevation-6 z-2 shrink-0" > <a - class="w-18 h-18 rounded-xl m-3 accent-button" + class="w-18 h-18 bg-conic-225 rounded-xl m-3 + from-accent-light/10 via-transparent to-accent-light/10 transition-colors duration-1500 ease-in-out + hover:cursor-pointer hover:from-accent-light/50 hover:via-transparent hover:to-accent-light/50" onclick="return changeUrl('/..', true);" href="../" id="sidebar-back-button" @@ -384,7 +357,9 @@ <svg viewBox="0 0 24 24"><use href="#icon-back"/></svg> </a> <a - class="w-18 h-18 rounded-xl m-3 accent-button" + class="w-18 h-18 bg-conic-225 rounded-xl m-3 + from-accent-light/10 via-transparent to-accent-light/10 transition-colors duration-1500 ease-in-out + hover:cursor-pointer hover:from-accent-light/50 hover:via-transparent hover:to-accent-light/50" onclick="return changeUrl('/{{ .Lang }}');" href="/{{ .Lang }}" id="sidebar-home-button" @@ -393,7 +368,9 @@ <svg viewBox="0 0 24 24"><use href="#icon-logo"/></svg> </a> <a - class="w-18 h-18 rounded-xl m-3 accent-button" + class="w-18 h-18 bg-conic-225 rounded-xl m-3 + from-accent-light/10 via-transparent to-accent-light/10 transition-colors duration-1500 ease-in-out + hover:cursor-pointer hover:from-accent-light/50 hover:via-transparent hover:to-accent-light/50" onclick="return changeUrl('/{{ .Lang }}/blog');" href="/{{ .Lang }}/blog" id="sidebar-blog-button" @@ -402,7 +379,9 @@ <svg viewBox="0 0 24 24"><use href="#icon-newspaper"/></svg> </a> <a - class="w-18 h-18 rounded-xl m-3 accent-button" + class="w-18 h-18 bg-conic-225 rounded-xl m-3 + from-accent-light/10 via-transparent to-accent-light/10 transition-colors duration-1500 ease-in-out + hover:cursor-pointer hover:from-accent-light/50 hover:via-transparent hover:to-accent-light/50" href="/{{ .Lang }}/map" id="sidebar-map-button" draggable="false" @@ -410,7 +389,9 @@ <svg viewBox="0 0 24 24"><use href="#icon-map"/></svg> </a> <div - class="w-18 h-18 rounded-xl m-3 accent-button" + class="w-18 h-18 bg-conic-225 rounded-xl m-3 + from-accent-light/10 via-transparent to-accent-light/10 transition-colors duration-1500 ease-in-out + hover:cursor-pointer hover:from-accent-light/50 hover:via-transparent hover:to-accent-light/50" onclick="toggleThemeWheel()" id="sidebar-theme-button" draggable="false" @@ -418,7 +399,9 @@ <svg class="sidebar-theme-button-content" viewBox="0 0 24 24"><use href="#icon-palette"/></svg> </div> <a - class="w-18 h-18 rounded-xl m-3 accent-button" + class="w-18 h-18 bg-conic-225 rounded-xl m-3 + from-accent-light/10 via-transparent to-accent-light/10 transition-colors duration-1500 ease-in-out + hover:cursor-pointer hover:from-accent-light/50 hover:via-transparent hover:to-accent-light/50" onclick="return changeUrl('/{{ .Lang }}/user');" href="/{{ .Lang }}/user" id="sidebar-user-button" @@ -451,11 +434,6 @@ ); function updateSidebar() { - sidebarHomeButton.classList.remove("active"); - sidebarMapButton.classList.remove("active"); - sidebarBlogButton.classList.remove("active"); - sidebarBackButton.classList.remove("active"); - sidebarUserButton.classList.remove("active"); if ( location.pathname == "" || location.pathname == "/" @@ -477,9 +455,6 @@ "onclick", `return changeUrl('/${lang}', false);`, ); - if (location.pathname == `/${lang}`) { - sidebarHomeButton.classList.add("active"); - } sidebarMapButton.setAttribute( "href", `/${lang}/map`, @@ -492,9 +467,6 @@ "onclick", `return changeUrl('/${lang}/blog', false);`, ); - if (location.pathname.startsWith(`/${lang}/blog`)) { - sidebarBlogButton.classList.add("active"); - } sidebarUserButton.setAttribute( "href", `/${lang}/user`, @@ -503,9 +475,6 @@ "onclick", `return changeUrl('/${lang}/user', false);`, ); - if (location.pathname.startsWith(`/${lang}/user`)) { - sidebarUserButton.classList.add("active"); - } } } window.addEventListener("popstate", updateSidebar); @@ -516,19 +485,23 @@ </nav> <div - class="flex flex-1 min-h-0 z-1 bg-paper bg-background shadow-elevation-3 @container/body" + class="flex flex-1 z-1 bg-paper bg-background shadow-elevation-3 @container/body" > <div class="bg-paper bg-background-dark border-r-2 border-dashed border-main-hard" ></div> <div - class="max-h-full max-w-full flex flex-col grow bg-paper bg-background-dark relative md:pt-4 md:pr-4" + class="max-h-full max-w-full flex flex-col grow bg-paper bg-background-dark relative pt-4 pr-0 md:pr-4" > <header id="general-page-header" class="max-xs:hidden [@media(max-height:32rem)]:hidden flex flex-col ml-8 basis-8" - >{{ .RenderedHeader }}</header> + hx-get="/api/v1/general-page/header{{ if .QueryString }}?{{ .QueryString }}{{ end }}" + hx-trigger="load" + hx-target="this" + hx-swap="innerHTML" + ></header> <div id="general-page-header-trigger" hx-get="/api/v1/general-page/header{{ if .QueryString }}?{{ .QueryString }}{{ end }}" @@ -543,8 +516,12 @@ <main id="general-page-body" - class="relative flex-1 overflow-y-auto" - >{{ .RenderedBody }}</main> + class="relative flex flex-col grow overflow-y-auto" + hx-get="/api/v1/general-page/body{{ if .QueryString }}?{{ .QueryString }}{{ end }}" + hx-trigger="load" + hx-target="this" + hx-swap="innerHTML" + ></main> <div id="general-page-body-trigger" hx-get="/api/v1/general-page/body{{ if .QueryString }}?{{ .QueryString }}{{ end }}" @@ -556,7 +533,11 @@ <footer id="general-page-footer" class="flex flex-row basis-4 my-1" - >{{ .RenderedFooter }}</footer> + hx-get="/api/v1/general-page/footer{{ if .QueryString }}?{{ .QueryString }}{{ end }}" + hx-trigger="load" + hx-target="this" + hx-swap="innerHTML" + ></footer> <div id="general-page-footer-trigger" hx-get="/api/v1/general-page/footer{{ if .QueryString }}?{{ .QueryString }}{{ end }}" @@ -578,7 +559,57 @@ <div class="grow bg-split-right"></div> - <div id="general-page-bottom-embeds" class="flex">{{ .RenderedBottomEmbeds }}</div> + <script src="{{ .StaticStorageBaseUrl }}/libs/htmx/2.0.6/htmx.min.js"></script> + <script src="{{ .StaticStorageBaseUrl }}/libs/leaflet/1.9.4/leaflet.js"></script> + <script src="{{ .StaticStorageBaseUrl }}/libs/imagesloaded/5.0.0/imagesloaded.pkgd.min.js"></script> + <script src="{{ .StaticStorageBaseUrl }}/libs/packery/3.0.0/dist/packery.pkgd.min.js"></script> + + <script> + // Enable fitWidth-like attribute for Packery. Source: https://codepen.io/desandro/pen/kVmLYz + var __resetLayout = Packery.prototype._resetLayout; + Packery.prototype._resetLayout = function () { + __resetLayout.call(this); + var parentSize = getSize(this.element.parentNode); + var colW = this.columnWidth + this.gutter; + this.fitWidth = + Math.floor((parentSize.innerWidth + this.gutter) / colW) * + colW; + this.packer.width = this.fitWidth; + this.packer.height = Number.POSITIVE_INFINITY; + this.packer.reset(); + }; + + Packery.prototype._getContainerSize = function () { + var emptyWidth = 0; + for (var i = 0, len = this.packer.spaces.length; i < len; i++) { + var space = this.packer.spaces[i]; + if ( + space.y === 0 && + space.height === Number.POSITIVE_INFINITY + ) { + emptyWidth += space.width; + } + } + + return { + width: this.fitWidth - this.gutter - emptyWidth, + height: this.maxY - this.gutter, + }; + }; + + Packery.prototype.needsResizeLayout = function () { + return true; + }; + </script> + + <div + id="general-page-bottom-embeds" + class="flex" + hx-get="/api/v1/general-page/bottom-embeds{{ if .QueryString }}?{{ .QueryString }}{{ end }}" + hx-trigger="load" + hx-target="this" + hx-swap="innerHTML" + ></div> <div id="general-page-bottom-embeds-trigger" hx-get="/api/v1/general-page/bottom-embeds{{ if .QueryString }}?{{ .QueryString }}{{ end }}" @@ -591,6 +622,7 @@ const themeWheel = document.getElementById("theme-wheel"); const themeButton = document.getElementById("sidebar-theme-button"); const themeIcons = document.querySelectorAll(".theme-icon"); + const themeWheelRadius = convertRemToPixels(6); themeIcons.forEach((icon) => { if (icon.getAttribute("data-theme") == savedTheme) { @@ -619,7 +651,7 @@ const clipPath = createSliceClipPath( startAngle, endAngle, - convertRemToPixels(6), + themeWheelRadius, ); icon.style.clipPath = clipPath; }); @@ -654,7 +686,6 @@ const buttonRect = themeButton.getBoundingClientRect(); const buttonCenterX = buttonRect.left + buttonRect.width / 2; const buttonCenterY = buttonRect.top + buttonRect.height / 2; - const themeWheelRadius = convertRemToPixels(6); const margin = 0; |