feat(gallery): image detail view

internal/components/gallery/image.go

@@ -129,7 +129,7 @@ func (s *Service) GetImages(ctx context.Context) (images []Image, err error) {
 func (s *Service) GetPrevAndNext(ctx context.Context, uid string) (previous *Image, next *Image, err error) {
 	imgs, err := s.GetImages(ctx)
 	if err != nil {
-		return
+		return nil, nil, err
 	}
 
 	for i := range imgs {
@@ -137,20 +137,20 @@ func (s *Service) GetPrevAndNext(ctx context.Context, uid string) (previous *Ima
 			continue
 		}
 
-		if i-1 >= 0 {
+		if i > 0 {
-			previous = &imgs[i-1]
+			prevImg := imgs[i-1]
+			previous = &prevImg
 		}
-		if i+1 >= len(imgs) {
+		if i+1 < len(imgs) {
-			next = &imgs[i+1]
+			nextImg := imgs[i+1]
+			next = &nextImg
 		}
 
-		return
+		return previous, next, nil
 	}
 
-	err = &rest.Error{
+	return nil, nil, &rest.Error{
 		Type:    rest.ErrorTypeNotFound,
 		Message: "could not find image with uid",
 	}
-
-	return
 }

internal/server/factory.go

@@ -77,7 +77,9 @@ func (s *Server) dynamicRoutes() (h http.Handler, err error) {
 		func() http.Handler {
 			mux := http.NewServeMux()
 
-			mux.Handle("/"+s.cfg.Gallery.Path, restgallery.New(renderer, gallery.New(fs, s.cfg.Gallery, imageSrv, valkeyClient), s.cfg.Gallery))
+			galleryMux := restgallery.New(renderer, gallery.New(fs, s.cfg.Gallery, imageSrv, valkeyClient), s.cfg.Gallery)
+			mux.Handle("/"+s.cfg.Gallery.Path, galleryMux)
+			mux.Handle("/"+s.cfg.Gallery.Path+"/", galleryMux)
 			mux.Handle("/", resthome.New(renderer, page.New(fs)))
 
 			return mux

web/components/modal.templ

@@ -1,7 +1,27 @@
 package components
 
+// Modal renders a modal dialog.
+//
+// The <dialog> itself must never be an htmx swap target: swapping its
+// innerHTML would replace the wrapper below (centering + close button) and
+// break the layout. Content is swapped into the inner element with id
+// "<id>-content" instead.
 templ Modal(id string) {
-	<dialog id={ id } popover class="m-auto">
+	<dialog
+		id={ id }
+		class="m-auto backdrop:bg-black/90 bg-transparent p-0 w-full h-full max-w-none max-h-none"
+		hx-on::after-swap="if (!this.open) this.showModal()"
+	>
+		<div class="relative w-full h-full flex items-center justify-center overflow-hidden">
+			<button
+				class="absolute right-5 top-5 z-10 p-2 text-white"
+				hx-on:click="this.closest('dialog').close()"
+			>
+				X
+			</button>
+			<div id={ id + "-content" } class="w-full h-full flex items-center justify-center overflow-hidden">
 				{ children... }
+			</div>
+		</div>
 	</dialog>
 }

web/pages/gallery.templ

@@ -9,21 +9,37 @@ import (
 
 const detailsID = "imgs-details"
 
+// detailsContentID is the inner element of the modal that htmx swaps into.
+// It is defined by components.Modal and must not be the dialog itself.
+const detailsContentID = detailsID + "-content"
+
 templ GallerySet(g gallery.Set) {
 	<div class="p-5">
 		@components.Modal(detailsID) {
-			@GalleryImage(g.SM.Images[0].UID, &gallery.Image{}, &gallery.Image{})
+			// Placeholder: only visible until the first image is swapped in.
+			// prev/next are nil because relative links would be resolved
+			// against the gallery index, not the image page.
+			if len(g.SM.Images) > 0 {
+				@GalleryImage(g.SM.Images[0].UID, nil, nil)
+			}
 		}
 		<div
 			class="grid gap-5 grid-cols-1 lg:hidden"
 		>
 			for _,img := range g.SM.Images {
+				<button
+					hx-get={ templer.RelativePath(ctx, "./"+img.UID) }
+					hx-target={ "#" + detailsContentID }
+					hx-swap="innerHTML"
+					class="block w-full cursor-pointer"
+				>
 					<img
 						src={ "/images/" + img.UID + "?w=600" }
 						loading="lazy"
 						class="w-full"
 						alt="Gallery item"
 					/>
+				</button>
 			}
 		</div>
 		<div class="hidden lg:block 3xl:hidden">
@@ -39,15 +55,12 @@ templ GallerySet(g gallery.Set) {
 }
 
 templ GalleryImage(image string, next *gallery.Image, prev *gallery.Image) {
-	if next != nil {
+	<div class="relative w-10/12 h-10/12 flex items-center justify-center overflow-hidden ">
-	}
-	<div>
-		<div class="relative inline-block w-full overflow-hidden">
 		<!-- 1. Preloaded Base Image (w=800) -->
 		<img
 			src={ "/images/" + image + "?w=800" }
 			alt=""
-				class="block w-full h-auto"
+			class="absolute inset-0 w-full h-full object-contain"
 		/>
 		<!-- 2. Responsive Image Layer (Overlaid on top) -->
 		<img
@@ -56,21 +69,30 @@ templ GalleryImage(image string, next *gallery.Image, prev *gallery.Image) {
 			sizes="(max-width: 600px) 400px, (max-width: 1200px) 800px, 1200px"
 			alt="Image description"
 			onload="this.classList.remove('opacity-0')"
-				class="absolute inset-0 w-full h-full object-cover opacity-0 transition-opacity duration-300"
+			class="absolute inset-0 w-full h-full object-contain transition-opacity duration-300"
 		/>
 		<!-- 3. Navigation Controls -->
 		if prev != nil {
-				<button class="absolute left-4 top-1/2 -translate-y-1/2 z-10 p-2 text-white">
+			<button
+				hx-get={ templer.RelativePath(ctx, "../"+prev.UID) }
+				hx-target={ "#" + detailsContentID }
+				hx-swap="innerHTML"
+				class="absolute left-4 top-1/2 -translate-y-1/2 z-10 p-2 text-white"
+			>
 				&lt;
 			</button>
 		}
 		if next != nil {
-				<button class="absolute right-4 top-1/2 -translate-y-1/2 z-10 text-white">
+			<button
+				hx-get={ templer.RelativePath(ctx, "../"+next.UID) }
+				hx-target={ "#" + detailsContentID }
+				hx-swap="innerHTML"
+				class="absolute right-4 top-1/2 -translate-y-1/2 z-10 p-2 text-white"
+			>
 				&gt;
 			</button>
 		}
 	</div>
-	</div>
 }
 
 templ Gallery(g gallery.Gallery) {
@@ -84,9 +106,8 @@ templ Gallery(g gallery.Gallery) {
 				class="overflow-hidden shadow-sm"
 			>
 				<button
-					popovertarget={ detailsID }
 					hx-get={ templer.RelativePath(ctx, "./"+img.UID) }
-					hx-target={ "#" + detailsID }
+					hx-target={ "#" + detailsContentID }
 					hx-swap="innerHTML"
 				>
 					<img

web/static/css/output.css

@@ -1,2 +1,2 @@
 /*! tailwindcss v4.1.18 | MIT License | https://tailwindcss.com */
-@layer properties{@supports (((-webkit-hyphens:none)) and (not (margin-trim:inline))) or ((-moz-orient:inline) and (not (color:rgb(from red r g b)))){*,:before,:after,::backdrop{--tw-translate-x:0;--tw-translate-y:0;--tw-translate-z:0;--tw-font-weight:initial;--tw-shadow:0 0 #0000;--tw-shadow-color:initial;--tw-shadow-alpha:100%;--tw-inset-shadow:0 0 #0000;--tw-inset-shadow-color:initial;--tw-inset-shadow-alpha:100%;--tw-ring-color:initial;--tw-ring-shadow:0 0 #0000;--tw-inset-ring-color:initial;--tw-inset-ring-shadow:0 0 #0000;--tw-ring-inset:initial;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-offset-shadow:0 0 #0000;--tw-duration:initial;--tw-text-shadow-color:initial;--tw-text-shadow-alpha:100%}}}@layer theme{:root,:host{--font-sans:"Outfit","outfit",sans-serif;--font-mono:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;--color-black:#000;--color-white:#fff;--spacing:.25rem;--container-6xl:72rem;--text-2xl:1.5rem;--text-2xl--line-height:calc(2/1.5);--text-3xl:1.875rem;--text-3xl--line-height:calc(2.25/1.875);--font-weight-bold:700;--text-shadow-lg:0px 0px 20px #000;--default-transition-duration:.15s;--default-transition-timing-function:cubic-bezier(.4,0,.2,1);--default-font-family:var(--font-sans);--default-mono-font-family:var(--font-mono)}}@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%;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}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;-webkit-text-decoration: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}@supports (not ((-webkit-appearance:-apple-pay-button))) or (contain-intrinsic-size:1px){::placeholder{color:currentColor}@supports (color:color-mix(in lab, red, red)){::placeholder{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}::-webkit-calendar-picker-indicator{line-height:1}:-moz-ui-invalid{box-shadow:none}button,input:where([type=button],[type=reset],[type=submit]){appearance:button}::file-selector-button{appearance:button}::-webkit-inner-spin-button{height:auto}::-webkit-outer-spin-button{height:auto}[hidden]:where(:not([hidden=until-found])){display:none!important}}@layer components{.prose img{max-height:90vh;margin-left:auto;margin-right:auto;display:block}}@layer utilities{.pLine truncated
+@layer properties{@supports (((-webkit-hyphens:none)) and (not (margin-trim:inline))) or ((-moz-orient:inline) and (not (color:rgb(from red r g b)))){*,:before,:after,::backdrop{--tw-translate-x:0;--tw-translate-y:0;--tw-translate-z:0;--tw-font-weight:initial;--tw-shadow:0 0 #0000;--tw-shadow-color:initial;--tw-shadow-alpha:100%;--tw-inset-shadow:0 0 #0000;--tw-inset-shadow-color:initial;--tw-inset-shadow-alpha:100%;--tw-ring-color:initial;--tw-ring-shadow:0 0 #0000;--tw-inset-ring-color:initial;--tw-inset-ring-shadow:0 0 #0000;--tw-ring-inset:initial;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-offset-shadow:0 0 #0000;--tw-duration:initial;--tw-text-shadow-color:initial;--tw-text-shadow-alpha:100%}}}@layer theme{:root,:host{--font-sans:"Outfit","outfit",sans-serif;--font-mono:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;--color-black:#000;--color-white:#fff;--spacing:.25rem;--container-6xl:72rem;--text-2xl:1.5rem;--text-2xl--line-height:calc(2/1.5);--text-3xl:1.875rem;--text-3xl--line-height:calc(2.25/1.875);--font-weight-bold:700;--text-shadow-lg:0px 0px 20px #000;--default-transition-duration:.15s;--default-transition-timing-function:cubic-bezier(.4,0,.2,1);--default-font-family:var(--font-sans);--default-mono-font-family:var(--font-mono)}}@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%;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}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;-webkit-text-decoration: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}@supports (not ((-webkit-appearance:-apple-pay-button))) or (contain-intrinsic-size:1px){::placeholder{color:currentColor}@supports (color:color-mix(in lab, red, red)){::placeholder{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}::-webkit-calendar-picker-indicator{line-height:1}:-moz-ui-invalid{box-shadow:none}button,input:where([type=button],[type=reset],[type=submit]){appearance:button}::file-selector-button{appearance:button}::-webkit-inner-spin-button{height:auto}::-webkit-outer-spin-button{height:auto}[hidden]:where(:not([hidden=until-found])){display:none!important}}@layer components{.prose img{max-height:90vh;margin-left:auto;margin-right:auto;display:block}}@layer utilities{.pLine truncated