From 4d24be245762fa7aa956004e64ee04032555e43f Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Thu, 10 Jul 2025 09:33:43 -0700
Subject: [PATCH] Fix some bad photos changes

---
 src/lib/components/PhotoMetadata.svelte |  4 ++--
 src/routes/api/photos/+server.ts        |  7 +++++++
 src/routes/photos/[id]/+page.svelte     | 14 ++------------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/lib/components/PhotoMetadata.svelte b/src/lib/components/PhotoMetadata.svelte
index 447b1a4..3d96aee 100644
--- a/src/lib/components/PhotoMetadata.svelte
+++ b/src/lib/components/PhotoMetadata.svelte
@@ -118,7 +118,7 @@
 		</div>
 	{/if}
 
-	{#if albums && albums.length > 0}
+	<!-- {#if albums && albums.length > 0}
 		<div class="albums-section">
 			<h3 class="albums-title">This photo appears in:</h3>
 			<div class="albums-list">
@@ -129,7 +129,7 @@
 				{/each}
 			</div>
 		</div>
-	{/if}
+	{/if} -->
 
 	{#if showBackButton && backHref && backLabel}
 		<div class="card-footer">
diff --git a/src/routes/api/photos/+server.ts b/src/routes/api/photos/+server.ts
index 18a2a3c..47e4f23 100644
--- a/src/routes/api/photos/+server.ts
+++ b/src/routes/api/photos/+server.ts
@@ -82,6 +82,13 @@ export const GET: RequestHandler = async (event) => {
 			}
 		})
 
+		// Sort photos by the actual date taken (from EXIF or fallback dates)
+		photos.sort((a, b) => {
+			const dateA = new Date(a.createdAt).getTime()
+			const dateB = new Date(b.createdAt).getTime()
+			return dateB - dateA // Descending order (newest first)
+		})
+
 		// Apply pagination
 		const totalItems = photos.length
 		const paginatedItems = photos.slice(offset, offset + limit)
diff --git a/src/routes/photos/[id]/+page.svelte b/src/routes/photos/[id]/+page.svelte
index 32c5448..6268dba 100644
--- a/src/routes/photos/[id]/+page.svelte
+++ b/src/routes/photos/[id]/+page.svelte
@@ -410,18 +410,8 @@
 			{exifData}
 			createdAt={photo.createdAt}
 			albums={photo.albums}
-			backHref={fromAlbum
-				? `/albums/${fromAlbum}`
-				: photo.album
-					? `/albums/${photo.album.slug}`
-					: '/photos'}
-			backLabel={(() => {
-				if (fromAlbum && photo.albums) {
-					const album = photo.albums.find((a) => a.slug === fromAlbum)
-					return album ? `Back to ${album.title}` : 'Back to Photos'
-				}
-				return photo.album ? `Back to ${photo.album.title}` : 'Back to Photos'
-			})()}
+			backHref="/photos"
+			backLabel="Back to Photos"
 			showBackButton={true}
 		/>
 	</div>