From 9f6b95cc3a7153b0313020d2bfa2c4b7ba26e726 Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Sat, 20 Dec 2025 01:07:02 -0800
Subject: [PATCH] reorder nav overflow menu, add separators

---
 src/lib/components/Navigation.svelte | 36 ++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/lib/components/Navigation.svelte b/src/lib/components/Navigation.svelte
index 7665353a..ba978190 100644
--- a/src/lib/components/Navigation.svelte
+++ b/src/lib/components/Navigation.svelte
@@ -67,6 +67,8 @@
 	const databaseSeriesHref = $derived(localizeHref('/database/series'))
 	const databaseGwEventsHref = $derived(localizeHref('/database/gw-events'))
 	const databaseArtifactSkillsHref = $derived(localizeHref('/database/artifact-skills'))
+	const databaseRaidsHref = $derived(localizeHref('/database/raids'))
+	const databaseRaidGroupsHref = $derived(localizeHref('/database/raid-groups'))
 
 	// Database route detection
 	const isDatabaseRoute = $derived($page.url.pathname.startsWith(localizeHref('/database')))
@@ -77,6 +79,7 @@
 		if (path.startsWith(databaseCharactersHref)) return 'character'
 		if (path.startsWith(databaseWeaponsHref)) return 'weapon'
 		if (path.startsWith(databaseSummonsHref)) return 'summon'
+		if (path.startsWith(databaseRaidsHref) || path.startsWith(databaseRaidGroupsHref)) return 'raid'
 		return null
 	})
 
@@ -88,7 +91,9 @@
 				? 'weapon'
 				: currentDatabaseEntity === 'summon'
 					? 'summon'
-					: null
+					: currentDatabaseEntity === 'raid'
+						? 'raid'
+						: null
 	)
 	const databaseNewHref = $derived(
 		currentDatabaseEntity === 'character'
@@ -243,14 +248,16 @@
 									<a href={databaseJobsHref}>Jobs</a>
 								</DropdownItem>
 								<DropdownItem>
-									<a href={databaseSeriesHref}>Series</a>
-								</DropdownItem>
-								<DropdownItem>
-									<a href={databaseGwEventsHref}>Unite & Fight</a>
+									<a href={databaseRaidsHref}>Raids</a>
 								</DropdownItem>
+								<DropdownMenu.Separator class="dropdown-separator" />
 								<DropdownItem>
 									<a href={databaseArtifactSkillsHref}>Artifact Skills</a>
 								</DropdownItem>
+								<DropdownMenu.Separator class="dropdown-separator" />
+								<DropdownItem>
+									<a href={databaseGwEventsHref}>Unite & Fight</a>
+								</DropdownItem>
 							</DropdownMenu.Content>
 						</DropdownMenu.Portal>
 					</DropdownMenu.Root>
@@ -364,15 +371,24 @@
 
 			<DropdownMenu.Portal>
 				<DropdownMenu.Content class="dropdown-content" sideOffset={5} align="end">
-					{#if databaseNewHref}
+					{#if currentDatabaseEntity === 'raid'}
 						<DropdownItem>
-							<a href={databaseNewHref}>Single {databaseEntityLabel}</a>
+							<a href={localizeHref('/database/raids/new')}>New raid</a>
 						</DropdownItem>
-					{/if}
-					{#if databaseImportHref}
 						<DropdownItem>
-							<a href={databaseImportHref}>Multiple {databaseEntityLabel}s</a>
+							<a href={localizeHref('/database/raid-groups/new')}>New raid group</a>
 						</DropdownItem>
+					{:else}
+						{#if databaseNewHref}
+							<DropdownItem>
+								<a href={databaseNewHref}>Single {databaseEntityLabel}</a>
+							</DropdownItem>
+						{/if}
+						{#if databaseImportHref}
+							<DropdownItem>
+								<a href={databaseImportHref}>Multiple {databaseEntityLabel}s</a>
+							</DropdownItem>
+						{/if}
 					{/if}
 				</DropdownMenu.Content>
 			</DropdownMenu.Portal>