From d8e18c00e1a5724726520cc5dc3b236e434d305f Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Mon, 29 Sep 2025 23:48:02 -0700
Subject: [PATCH] update ui components

---
 .../components/examples/SearchExample.svelte  |  4 +-
 .../party/PartySegmentedControl.svelte        |  2 +-
 .../modifications/AwakeningDisplay.svelte     | 29 +++++--
 src/lib/components/ui/DetailItem.svelte       |  4 +-
 src/lib/components/ui/Input.svelte            | 28 +++---
 src/lib/components/ui/Sidebar.svelte          | 86 +++++++++++--------
 src/lib/components/ui/SidebarHeader.svelte    |  1 -
 src/lib/services/conflict.service.ts          |  2 +-
 src/lib/services/grid.service.ts              |  3 +-
 src/lib/services/party.service.ts             |  2 +-
 src/lib/stores/sidebar.svelte.ts              | 14 ++-
 src/lib/types/api/party.ts                    |  9 +-
 src/routes/+layout.svelte                     |  1 +
 13 files changed, 113 insertions(+), 72 deletions(-)

diff --git a/src/lib/components/examples/SearchExample.svelte b/src/lib/components/examples/SearchExample.svelte
index c825b971..fe4b1fef 100644
--- a/src/lib/components/examples/SearchExample.svelte
+++ b/src/lib/components/examples/SearchExample.svelte
@@ -6,8 +6,8 @@
 -->
 
 <script lang="ts">
-	import { createSearchResource } from '$lib/api/adapters'
-	import type { SearchResult } from '$lib/api/adapters'
+	import { createSearchResource } from '$lib/api/adapters/resources/search.resource.svelte'
+	import type { SearchResult } from '$lib/api/adapters/search.adapter'
 
 	// Create a search resource with debouncing
 	const search = createSearchResource({
diff --git a/src/lib/components/party/PartySegmentedControl.svelte b/src/lib/components/party/PartySegmentedControl.svelte
index b7c6ebe1..634c55dd 100644
--- a/src/lib/components/party/PartySegmentedControl.svelte
+++ b/src/lib/components/party/PartySegmentedControl.svelte
@@ -45,7 +45,7 @@
 			selected={value === GridType.Character}
 		>
 			<CharacterRep
-				jobId={party.job?.id}
+				job={party.job}
 				element={party.element}
 				gender={userGender}
 				characters={party.characters}
diff --git a/src/lib/components/sidebar/modifications/AwakeningDisplay.svelte b/src/lib/components/sidebar/modifications/AwakeningDisplay.svelte
index 10517d60..ea0e8e54 100644
--- a/src/lib/components/sidebar/modifications/AwakeningDisplay.svelte
+++ b/src/lib/components/sidebar/modifications/AwakeningDisplay.svelte
@@ -20,13 +20,15 @@
   function getAwakeningData() {
     if (!awakening) return null
 
-    if ('type' in awakening && awakening.type) {
+    // Check if it's the awakening object with type and level
+    if (typeof awakening === 'object' && 'type' in awakening) {
       return {
         type: awakening.type,
-        level: awakening.level || 0
+        level: awakening.level ?? 0
       }
     }
 
+    // Otherwise it's just the Awakening type itself
     return {
       type: awakening as Awakening,
       level: 0
@@ -38,13 +40,17 @@
   let displayName = $derived(awakeningData?.type?.name?.en || awakeningData?.type?.name?.ja || 'Awakening')
 </script>
 
-{#if awakeningData && imageUrl}
+{#if awakeningData}
   <div class="awakening-display {size}">
-    <img
-      src={imageUrl}
-      alt={displayName}
-      class="awakening-icon"
-    />
+    {#if imageUrl}
+      <img
+        src={imageUrl}
+        alt={displayName}
+        class="awakening-icon"
+      />
+    {:else}
+      <div class="awakening-icon placeholder"></div>
+    {/if}
     <div class="awakening-info">
       <span class="awakening-name">{displayName}</span>
       {#if showLevel && awakeningData.level !== undefined}
@@ -86,6 +92,13 @@
     .awakening-icon {
       border-radius: layout.$item-corner-small;
       flex-shrink: 0;
+
+      &.placeholder {
+        background: colors.$grey-70;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
     }
 
     .awakening-info {
diff --git a/src/lib/components/ui/DetailItem.svelte b/src/lib/components/ui/DetailItem.svelte
index a6a6699b..6cef92fe 100644
--- a/src/lib/components/ui/DetailItem.svelte
+++ b/src/lib/components/ui/DetailItem.svelte
@@ -55,12 +55,12 @@
 					bind:value
 					type="number"
 					variant="number"
-					bound={true}
+					contained={true}
 					{placeholder}
 					alignRight={true}
 				/>
 			{:else}
-				<Input bind:value type="text" bound={true} {placeholder} alignRight={true} />
+				<Input bind:value type="text" contained={true} {placeholder} alignRight={true} />
 			{/if}
 		</div>
 	{:else if children}
diff --git a/src/lib/components/ui/Input.svelte b/src/lib/components/ui/Input.svelte
index 41b656f7..776643be 100644
--- a/src/lib/components/ui/Input.svelte
+++ b/src/lib/components/ui/Input.svelte
@@ -4,8 +4,8 @@
 	import Icon from '../Icon.svelte'
 
 	interface Props extends HTMLInputAttributes {
-		variant?: 'default' | 'bound' | 'duration' | 'number' | 'range'
-		bound?: boolean
+		variant?: 'default' | 'contained' | 'duration' | 'number' | 'range'
+		contained?: boolean
 		error?: string
 		label?: string
 		leftIcon?: string
@@ -21,7 +21,7 @@
 
 	let {
 		variant = 'default',
-		bound = false,
+		contained = false,
 		error,
 		label,
 		leftIcon,
@@ -54,7 +54,7 @@
 	const inputClasses = $derived(
 		[
 			'input',
-			(variant === 'bound' || bound) && 'bound',
+			(variant === 'contained' || contained) && 'contained',
 			variant === 'duration' && 'duration',
 			variant === 'number' && 'number',
 			variant === 'range' && 'range',
@@ -276,7 +276,7 @@
 				@include smooth-transition($duration-quick, border-color);
 
 				&:focus {
-					@include focus-ring($blue);
+					// @include focus-ring($blue);
 				}
 			}
 
@@ -312,20 +312,24 @@
 			&:has(.counter) input {
 				padding-right: $unit-8x;
 			}
+
+			input {
+				border: 2px solid transparent;
+			}
 		}
 
 		&[type='number']::-webkit-inner-spin-button {
 			-webkit-appearance: none;
 		}
 
-		&.bound {
+		&.contained {
 			background-color: var(--input-bound-bg);
 
 			&:hover:not(:disabled) {
 				background-color: var(--input-bound-bg-hover);
 			}
 
-			// For wrapper variant with bound
+			// For wrapper variant with contained
 			&.wrapper {
 				background-color: var(--input-bound-bg);
 
@@ -367,12 +371,12 @@
 			text-align: right;
 		}
 
-		&:hover:not(:disabled):not(.bound) {
+		&:hover:not(:disabled):not(.contained) {
 			background-color: var(--input-bg-hover);
 		}
 
 		&:focus {
-			@include focus-ring($blue);
+			// @include focus-ring($blue);
 		}
 
 		&:disabled {
@@ -400,7 +404,7 @@
 			-webkit-appearance: none;
 		}
 
-		&.bound {
+		&.contained {
 			background-color: var(--input-bound-bg);
 
 			&:hover:not(:disabled) {
@@ -443,12 +447,12 @@
 			height: 100%;
 		}
 
-		&:hover:not(:disabled):not(.bound) {
+		&:hover:not(:disabled):not(.contained) {
 			background-color: var(--input-bg-hover);
 		}
 
 		&:focus {
-			@include focus-ring($blue);
+			// @include focus-ring($blue);
 		}
 
 		&:disabled {
diff --git a/src/lib/components/ui/Sidebar.svelte b/src/lib/components/ui/Sidebar.svelte
index 44cb89d7..8bdce188 100644
--- a/src/lib/components/ui/Sidebar.svelte
+++ b/src/lib/components/ui/Sidebar.svelte
@@ -16,9 +16,11 @@
 		children?: Snippet
 		/** Optional header actions */
 		headerActions?: Snippet
+		/** Whether the sidebar content should scroll. Default true. */
+		scrollable?: boolean
 	}
 
-	const { open = false, title, onclose, children, headerActions }: Props = $props()
+	const { open = false, title, onclose, children, headerActions, scrollable = true }: Props = $props()
 </script>
 
 <aside class="sidebar" class:open style:--sidebar-width={SIDEBAR_WIDTH}>
@@ -26,7 +28,7 @@
 		<SidebarHeader {title} {onclose} actions={headerActions} />
 	{/if}
 
-	<div class="sidebar-content">
+	<div class="sidebar-content" class:scrollable>
 		{#if children}
 			{@render children()}
 		{/if}
@@ -42,13 +44,14 @@
 
 	.sidebar {
 		position: fixed;
-		top: 0;
-		right: 0;
-		height: 100vh;
-		background: var(--bg-primary);
-		border-left: 1px solid var(--border-primary);
+		top: $unit-2x;
+		right: $unit-2x;
+		height: calc(100vh - #{$unit-2x} - #{$unit-2x}); // 100vh minus top and bottom insets
+		box-sizing: border-box;
+		background: var(--sidebar-bg);
 		display: flex;
 		flex-direction: column;
+		border-radius: $page-corner;
 		flex-shrink: 0;
 		width: var(--sidebar-width);
 		overflow: hidden;
@@ -58,6 +61,8 @@
 			transform $duration-slide ease-in-out,
 			opacity $duration-slide ease-in-out;
 		z-index: 50;
+		box-shadow: $page-elevation;
+		border: 1px solid rgba(0, 0, 0, 0.14);
 
 		&.open {
 			transform: translateX(0);
@@ -66,43 +71,50 @@
 
 		.sidebar-content {
 			flex: 1;
-			overflow-y: auto;
-			overflow-x: hidden;
+			overflow: hidden;
+			display: flex;
+			flex-direction: column;
 
-			// Smooth scrolling
-			scroll-behavior: smooth;
+			// When scrollable, enable scrolling with nice scrollbars
+			&.scrollable {
+				overflow-y: auto;
+				overflow-x: hidden;
 
-			// Use overlay scrollbars that auto-hide
-			overflow-y: overlay;
+				// Smooth scrolling
+				scroll-behavior: smooth;
 
-			// Thin, minimal scrollbar styling
-			&::-webkit-scrollbar {
-				width: 10px;
-			}
+				// Use overlay scrollbars that auto-hide
+				overflow-y: overlay;
 
-			&::-webkit-scrollbar-track {
-				background: transparent;
-			}
-
-			&::-webkit-scrollbar-thumb {
-				background: rgba(0, 0, 0, 0.2);
-				border-radius: 10px;
-				border: 2px solid transparent;
-				background-clip: padding-box;
-
-				&:hover {
-					background: rgba(0, 0, 0, 0.4);
-					background-clip: padding-box;
+				// Thin, minimal scrollbar styling
+				&::-webkit-scrollbar {
+					width: 10px;
 				}
-			}
 
-			// Firefox scrollbar styling
-			scrollbar-width: thin;
-			scrollbar-color: rgba(0, 0, 0, 0.2) transparent;
+				&::-webkit-scrollbar-track {
+					background: transparent;
+				}
 
-			// Improve mobile scrolling performance
-			@media (max-width: 768px) {
-				-webkit-overflow-scrolling: touch;
+				&::-webkit-scrollbar-thumb {
+					background: rgba(0, 0, 0, 0.2);
+					border-radius: 10px;
+					border: 2px solid transparent;
+					background-clip: padding-box;
+
+					&:hover {
+						background: rgba(0, 0, 0, 0.4);
+						background-clip: padding-box;
+					}
+				}
+
+				// Firefox scrollbar styling
+				scrollbar-width: thin;
+				scrollbar-color: rgba(0, 0, 0, 0.2) transparent;
+
+				// Improve mobile scrolling performance
+				@media (max-width: 768px) {
+					-webkit-overflow-scrolling: touch;
+				}
 			}
 		}
 
diff --git a/src/lib/components/ui/SidebarHeader.svelte b/src/lib/components/ui/SidebarHeader.svelte
index 1a72dd33..3b9049ff 100644
--- a/src/lib/components/ui/SidebarHeader.svelte
+++ b/src/lib/components/ui/SidebarHeader.svelte
@@ -45,7 +45,6 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		min-height: $nav-height;
 		padding: $unit-2x;
 		border-bottom: 1px solid var(--border-primary);
 		flex-shrink: 0;
diff --git a/src/lib/services/conflict.service.ts b/src/lib/services/conflict.service.ts
index cff173e8..9fa79263 100644
--- a/src/lib/services/conflict.service.ts
+++ b/src/lib/services/conflict.service.ts
@@ -1,5 +1,5 @@
 import type { Party, GridWeapon, GridCharacter } from '$lib/types/api/party'
-import { gridAdapter } from '$lib/api/adapters'
+import { gridAdapter } from '$lib/api/adapters/grid.adapter'
 
 export interface ConflictData {
   conflicts: string[]
diff --git a/src/lib/services/grid.service.ts b/src/lib/services/grid.service.ts
index 1b26ec9b..ba6ab333 100644
--- a/src/lib/services/grid.service.ts
+++ b/src/lib/services/grid.service.ts
@@ -1,5 +1,6 @@
 import type { Party, GridWeapon, GridSummon, GridCharacter } from '$lib/types/api/party'
-import { gridAdapter, partyAdapter } from '$lib/api/adapters'
+import { gridAdapter } from '$lib/api/adapters/grid.adapter'
+import { partyAdapter } from '$lib/api/adapters/party.adapter'
 import { getDefaultMaxUncapLevel } from '$lib/utils/uncap'
 
 export interface GridOperation {
diff --git a/src/lib/services/party.service.ts b/src/lib/services/party.service.ts
index 9f437a96..229f3cad 100644
--- a/src/lib/services/party.service.ts
+++ b/src/lib/services/party.service.ts
@@ -1,5 +1,5 @@
 import type { Party } from '$lib/types/api/party'
-import { partyAdapter } from '$lib/api/adapters'
+import { partyAdapter } from '$lib/api/adapters/party.adapter'
 import { authStore } from '$lib/stores/auth.store'
 import { browser } from '$app/environment'
 
diff --git a/src/lib/stores/sidebar.svelte.ts b/src/lib/stores/sidebar.svelte.ts
index 7461844b..2aafd0f3 100644
--- a/src/lib/stores/sidebar.svelte.ts
+++ b/src/lib/stores/sidebar.svelte.ts
@@ -9,6 +9,7 @@ interface SidebarState {
 	content?: Snippet
 	component?: Component
 	componentProps?: Record<string, any>
+	scrollable?: boolean
 }
 
 class SidebarStore {
@@ -17,23 +18,26 @@ class SidebarStore {
 		title: undefined,
 		content: undefined,
 		component: undefined,
-		componentProps: undefined
+		componentProps: undefined,
+		scrollable: true
 	})
 
-	open(title?: string, content?: Snippet) {
+	open(title?: string, content?: Snippet, scrollable = true) {
 		this.state.open = true
 		this.state.title = title
 		this.state.content = content
 		this.state.component = undefined
 		this.state.componentProps = undefined
+		this.state.scrollable = scrollable
 	}
 
-	openWithComponent(title: string, component: Component, props?: Record<string, any>) {
+	openWithComponent(title: string, component: Component, props?: Record<string, any>, scrollable = true) {
 		this.state.open = true
 		this.state.title = title
 		this.state.component = component
 		this.state.componentProps = props
 		this.state.content = undefined
+		this.state.scrollable = scrollable
 	}
 
 	close() {
@@ -74,6 +78,10 @@ class SidebarStore {
 	get componentProps() {
 		return this.state.componentProps
 	}
+
+	get scrollable() {
+		return this.state.scrollable ?? true
+	}
 }
 
 export const sidebar = new SidebarStore()
\ No newline at end of file
diff --git a/src/lib/types/api/party.ts b/src/lib/types/api/party.ts
index 134cc445..0867f383 100644
--- a/src/lib/types/api/party.ts
+++ b/src/lib/types/api/party.ts
@@ -43,9 +43,12 @@ export interface GridCharacter {
   perpetuity?: boolean
   transcendenceStep?: number
   character: Character  // Named properly, not "object"
-  awakening?: Awakening
-  aetherial_mastery?: { modifier: number; strength: number }
-  over_mastery?: Array<{ modifier: number; strength: number }>
+  awakening?: {
+    type: Awakening
+    level: number
+  }
+  aetherialMastery?: { modifier: number; strength: number }
+  overMastery?: Array<{ modifier: number; strength: number }>
 }
 
 // GridSummon from GridSummonBlueprint
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 4578ed9c..35dd3c17 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -125,6 +125,7 @@
 			open={sidebar.isOpen}
 			title={sidebar.title}
 			onclose={() => sidebar.close()}
+			scrollable={sidebar.scrollable}
 		>
 			{#if sidebar.component}
 				<svelte:component this={sidebar.component} {...sidebar.componentProps} />