added server and realm tabs to inventory screen

This commit is contained in:
Evan Carroll 2026-01-16 16:47:30 -06:00
parent ee425e224e
commit acab2f017d
12 changed files with 647 additions and 151 deletions

View file

@ -2,11 +2,15 @@
//!
//! Handles inventory listing and item management.
use axum::extract::Path;
use axum::extract::{Path, State};
use axum::Json;
use sqlx::PgPool;
use uuid::Uuid;
use chattyness_db::{models::InventoryResponse, queries::inventory};
use chattyness_db::{
models::{InventoryResponse, PublicPropsResponse},
queries::{inventory, realms},
};
use chattyness_error::AppError;
use crate::auth::{AuthUser, RlsConn};
@ -39,3 +43,31 @@ pub async fn drop_item(
Ok(Json(serde_json::json!({ "success": true })))
}
/// Get public server props.
///
/// GET /api/inventory/server
pub async fn get_server_props(
State(pool): State<PgPool>,
) -> Result<Json<PublicPropsResponse>, AppError> {
let props = inventory::list_public_server_props(&pool).await?;
Ok(Json(PublicPropsResponse { props }))
}
/// Get public realm props.
///
/// GET /api/realms/{slug}/inventory
pub async fn get_realm_props(
State(pool): State<PgPool>,
Path(slug): Path<String>,
) -> Result<Json<PublicPropsResponse>, AppError> {
// Get the realm by slug to get its ID
let realm = realms::get_realm_by_slug(&pool, &slug)
.await?
.ok_or_else(|| AppError::NotFound(format!("Realm '{}' not found", slug)))?;
let props = inventory::list_public_realm_props(&pool, realm.id).await?;
Ok(Json(PublicPropsResponse { props }))
}

View file

@ -57,4 +57,10 @@ pub fn api_router() -> Router<AppState> {
"/inventory/{item_id}",
axum::routing::delete(inventory::drop_item),
)
// Public inventory routes (public server/realm props)
.route("/inventory/server", get(inventory::get_server_props))
.route(
"/realms/{slug}/inventory",
get(inventory::get_realm_props),
)
}

View file

@ -4,7 +4,7 @@ use leptos::prelude::*;
use leptos::reactive::owner::LocalStorage;
use uuid::Uuid;
use chattyness_db::models::InventoryItem;
use chattyness_db::models::{InventoryItem, PublicProp};
#[cfg(feature = "hydrate")]
use chattyness_db::ws_messages::ClientMessage;
@ -12,25 +12,49 @@ use super::ws_client::WsSender;
/// Inventory popup component.
///
/// Shows a grid of user-owned props with drop functionality.
/// Shows a tabbed interface with:
/// - My Inventory: User-owned props with drop functionality
/// - Server: Public server-wide props
/// - Realm: Public realm-specific props
///
/// Props:
/// - `open`: Signal controlling visibility
/// - `on_close`: Callback when popup should close
/// - `ws_sender`: WebSocket sender for dropping props
/// - `realm_slug`: Current realm slug for fetching realm props
#[component]
pub fn InventoryPopup(
#[prop(into)] open: Signal<bool>,
on_close: Callback<()>,
ws_sender: StoredValue<Option<WsSender>, LocalStorage>,
#[prop(into)] realm_slug: Signal<String>,
) -> impl IntoView {
// Tab state
let (active_tab, set_active_tab) = signal("my_inventory");
// My Inventory state
let (items, set_items) = signal(Vec::<InventoryItem>::new());
let (loading, set_loading) = signal(false);
let (error, set_error) = signal(Option::<String>::None);
let (selected_item, set_selected_item) = signal(Option::<Uuid>::None);
let (dropping, set_dropping) = signal(false);
// Fetch inventory when popup opens
// Server props state
let (server_props, set_server_props) = signal(Vec::<PublicProp>::new());
let (server_loading, set_server_loading) = signal(false);
let (server_error, set_server_error) = signal(Option::<String>::None);
// Realm props state
let (realm_props, set_realm_props) = signal(Vec::<PublicProp>::new());
let (realm_loading, set_realm_loading) = signal(false);
let (realm_error, set_realm_error) = signal(Option::<String>::None);
// Track if tabs have been loaded (to avoid re-fetching)
let (my_inventory_loaded, set_my_inventory_loaded) = signal(false);
let (server_loaded, set_server_loaded) = signal(false);
let (realm_loaded, set_realm_loaded) = signal(false);
// Fetch my inventory when popup opens or tab is selected
#[cfg(feature = "hydrate")]
{
use gloo_net::http::Request;
@ -40,6 +64,14 @@ pub fn InventoryPopup(
if !open.get() {
// Reset state when closing
set_selected_item.set(None);
set_my_inventory_loaded.set(false);
set_server_loaded.set(false);
set_realm_loaded.set(false);
return;
}
// Only fetch if on my_inventory tab and not already loaded
if active_tab.get() != "my_inventory" || my_inventory_loaded.get() {
return;
}
@ -54,6 +86,7 @@ pub fn InventoryPopup(
resp.json::<chattyness_db::models::InventoryResponse>().await
{
set_items.set(data.items);
set_my_inventory_loaded.set(true);
} else {
set_error.set(Some("Failed to parse inventory data".to_string()));
}
@ -70,6 +103,94 @@ pub fn InventoryPopup(
});
}
// Fetch server props when server tab is selected
#[cfg(feature = "hydrate")]
{
use gloo_net::http::Request;
use leptos::task::spawn_local;
Effect::new(move |_| {
if !open.get() || active_tab.get() != "server" || server_loaded.get() {
return;
}
set_server_loading.set(true);
set_server_error.set(None);
spawn_local(async move {
let response = Request::get("/api/inventory/server").send().await;
match response {
Ok(resp) if resp.ok() => {
if let Ok(data) =
resp.json::<chattyness_db::models::PublicPropsResponse>().await
{
set_server_props.set(data.props);
set_server_loaded.set(true);
} else {
set_server_error.set(Some("Failed to parse server props".to_string()));
}
}
Ok(resp) => {
set_server_error
.set(Some(format!("Failed to load server props: {}", resp.status())));
}
Err(e) => {
set_server_error.set(Some(format!("Network error: {}", e)));
}
}
set_server_loading.set(false);
});
});
}
// Fetch realm props when realm tab is selected
#[cfg(feature = "hydrate")]
{
use gloo_net::http::Request;
use leptos::task::spawn_local;
Effect::new(move |_| {
if !open.get() || active_tab.get() != "realm" || realm_loaded.get() {
return;
}
let slug = realm_slug.get();
if slug.is_empty() {
set_realm_error.set(Some("No realm selected".to_string()));
return;
}
set_realm_loading.set(true);
set_realm_error.set(None);
spawn_local(async move {
let response = Request::get(&format!("/api/realms/{}/inventory", slug))
.send()
.await;
match response {
Ok(resp) if resp.ok() => {
if let Ok(data) =
resp.json::<chattyness_db::models::PublicPropsResponse>().await
{
set_realm_props.set(data.props);
set_realm_loaded.set(true);
} else {
set_realm_error.set(Some("Failed to parse realm props".to_string()));
}
}
Ok(resp) => {
set_realm_error
.set(Some(format!("Failed to load realm props: {}", resp.status())));
}
Err(e) => {
set_realm_error.set(Some(format!("Network error: {}", e)));
}
}
set_realm_loading.set(false);
});
});
}
// Handle escape key to close
#[cfg(feature = "hydrate")]
{
@ -166,141 +287,359 @@ pub fn InventoryPopup(
</button>
</div>
// Loading state
<Show when=move || loading.get()>
<div class="flex items-center justify-center py-12">
<p class="text-gray-400">"Loading inventory..."</p>
</div>
</Show>
// Tab bar
<div class="flex border-b border-gray-700 mb-4" role="tablist">
<button
type="button"
role="tab"
aria-selected=move || active_tab.get() == "my_inventory"
class=move || format!(
"px-4 py-2 font-medium transition-colors border-b-2 -mb-px {}",
if active_tab.get() == "my_inventory" {
"text-blue-400 border-blue-400"
} else {
"text-gray-400 border-transparent hover:text-gray-300"
}
)
on:click=move |_| set_active_tab.set("my_inventory")
>
"My Inventory"
</button>
<button
type="button"
role="tab"
aria-selected=move || active_tab.get() == "server"
class=move || format!(
"px-4 py-2 font-medium transition-colors border-b-2 -mb-px {}",
if active_tab.get() == "server" {
"text-blue-400 border-blue-400"
} else {
"text-gray-400 border-transparent hover:text-gray-300"
}
)
on:click=move |_| set_active_tab.set("server")
>
"Server"
</button>
<button
type="button"
role="tab"
aria-selected=move || active_tab.get() == "realm"
class=move || format!(
"px-4 py-2 font-medium transition-colors border-b-2 -mb-px {}",
if active_tab.get() == "realm" {
"text-blue-400 border-blue-400"
} else {
"text-gray-400 border-transparent hover:text-gray-300"
}
)
on:click=move |_| set_active_tab.set("realm")
>
"Realm"
</button>
</div>
// Error state
<Show when=move || error.get().is_some()>
<div class="bg-red-900/20 border border-red-600 rounded p-4 mb-4">
<p class="text-red-400">{move || error.get().unwrap_or_default()}</p>
</div>
</Show>
// Tab content
<div class="flex-1 overflow-y-auto min-h-[300px]">
// My Inventory tab
<Show when=move || active_tab.get() == "my_inventory">
<MyInventoryTab
items=items
loading=loading
error=error
selected_item=selected_item
set_selected_item=set_selected_item
dropping=dropping
on_drop=Callback::new(handle_drop)
/>
</Show>
// Empty state
<Show when=move || !loading.get() && error.get().is_none() && items.get().is_empty()>
<div class="flex flex-col items-center justify-center py-12 text-center">
<div class="w-16 h-16 rounded-full bg-gray-700/50 flex items-center justify-center mb-4">
<svg class="w-8 h-8 text-gray-500" fill="none" stroke="currentColor" viewBox="0 0 24 24" aria-hidden="true">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4"/>
</svg>
</div>
<p class="text-gray-400">"Your inventory is empty"</p>
<p class="text-gray-500 text-sm mt-1">"Collect props to see them here"</p>
</div>
</Show>
// Server tab
<Show when=move || active_tab.get() == "server">
<PublicPropsTab
props=server_props
loading=server_loading
error=server_error
tab_name="Server"
empty_message="No public server props available"
/>
</Show>
// Grid of items
<Show when=move || !loading.get() && !items.get().is_empty()>
<div class="flex-1 overflow-y-auto">
<div
class="grid grid-cols-4 sm:grid-cols-6 gap-2"
role="listbox"
aria-label="Inventory items"
>
<For
each=move || items.get()
key=|item| item.id
children=move |item: InventoryItem| {
let item_id = item.id;
let item_name = item.prop_name.clone();
let is_selected = move || selected_item.get() == Some(item_id);
let asset_path = if item.prop_asset_path.starts_with('/') {
item.prop_asset_path.clone()
} else {
format!("/static/{}", item.prop_asset_path)
};
view! {
<button
type="button"
class=move || format!(
"aspect-square rounded-lg border-2 transition-all p-1 focus:outline-none focus:ring-2 focus:ring-blue-500 {}",
if is_selected() {
"border-blue-500 bg-blue-900/30"
} else {
"border-gray-600 hover:border-gray-500 bg-gray-700/50"
}
)
on:click=move |_| {
set_selected_item.set(Some(item_id));
}
role="option"
aria-selected=is_selected
aria-label=item_name
>
<img
src=asset_path
alt=""
class="w-full h-full object-contain"
/>
</button>
}
}
/>
</div>
</div>
</Show>
// Selected item details and actions
{move || {
let item_id = selected_item.get()?;
let item = items.get().into_iter().find(|i| i.id == item_id)?;
let handle_drop = handle_drop.clone();
let is_dropping = dropping.get();
let is_droppable = item.is_droppable;
Some(view! {
<div class="mt-4 pt-4 border-t border-gray-700">
<div class="flex items-center justify-between">
<div>
<h3 class="text-white font-medium">{item.prop_name.clone()}</h3>
<p class="text-gray-400 text-sm">
{if item.is_transferable { "Transferable" } else { "Not transferable" }}
{if item.is_portable { " \u{2022} Portable" } else { "" }}
{if is_droppable { " \u{2022} Droppable" } else { " \u{2022} Essential" }}
</p>
</div>
<div class="flex gap-2">
// Drop button - disabled for non-droppable (essential) props
<button
type="button"
class=if is_droppable {
"px-4 py-2 bg-red-600 hover:bg-red-700 text-white rounded-lg transition-colors disabled:opacity-50"
} else {
"px-4 py-2 bg-gray-600 text-gray-400 rounded-lg cursor-not-allowed"
}
on:click=move |_| {
if is_droppable {
handle_drop(item_id);
}
}
disabled=is_dropping || !is_droppable
title=if is_droppable { "" } else { "Essential prop cannot be dropped" }
>
{if is_dropping { "Dropping..." } else { "Drop" }}
</button>
// Transfer button (disabled for now)
<Show when=move || item.is_transferable>
<button
type="button"
class="px-4 py-2 bg-gray-600 text-gray-400 rounded-lg cursor-not-allowed"
disabled=true
title="Transfer functionality coming soon"
>
"Transfer"
</button>
</Show>
</div>
</div>
</div>
})
}}
// Realm tab
<Show when=move || active_tab.get() == "realm">
<PublicPropsTab
props=realm_props
loading=realm_loading
error=realm_error
tab_name="Realm"
empty_message="No public realm props available"
/>
</Show>
</div>
</div>
</div>
</Show>
}
}
/// My Inventory tab content with drop functionality.
#[component]
fn MyInventoryTab(
#[prop(into)] items: Signal<Vec<InventoryItem>>,
#[prop(into)] loading: Signal<bool>,
#[prop(into)] error: Signal<Option<String>>,
#[prop(into)] selected_item: Signal<Option<Uuid>>,
set_selected_item: WriteSignal<Option<Uuid>>,
#[prop(into)] dropping: Signal<bool>,
#[prop(into)] on_drop: Callback<Uuid>,
) -> impl IntoView {
view! {
// Loading state
<Show when=move || loading.get()>
<div class="flex items-center justify-center py-12">
<p class="text-gray-400">"Loading inventory..."</p>
</div>
</Show>
// Error state
<Show when=move || error.get().is_some()>
<div class="bg-red-900/20 border border-red-600 rounded p-4 mb-4">
<p class="text-red-400">{move || error.get().unwrap_or_default()}</p>
</div>
</Show>
// Empty state
<Show when=move || !loading.get() && error.get().is_none() && items.get().is_empty()>
<div class="flex flex-col items-center justify-center py-12 text-center">
<div class="w-16 h-16 rounded-full bg-gray-700/50 flex items-center justify-center mb-4">
<svg class="w-8 h-8 text-gray-500" fill="none" stroke="currentColor" viewBox="0 0 24 24" aria-hidden="true">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4"/>
</svg>
</div>
<p class="text-gray-400">"Your inventory is empty"</p>
<p class="text-gray-500 text-sm mt-1">"Collect props to see them here"</p>
</div>
</Show>
// Grid of items
<Show when=move || !loading.get() && !items.get().is_empty()>
<div>
<div
class="grid grid-cols-4 sm:grid-cols-6 gap-2"
role="listbox"
aria-label="Inventory items"
>
<For
each=move || items.get()
key=|item| item.id
children=move |item: InventoryItem| {
let item_id = item.id;
let item_name = item.prop_name.clone();
let is_selected = move || selected_item.get() == Some(item_id);
let asset_path = if item.prop_asset_path.starts_with('/') {
item.prop_asset_path.clone()
} else {
format!("/static/{}", item.prop_asset_path)
};
view! {
<button
type="button"
class=move || format!(
"aspect-square rounded-lg border-2 transition-all p-1 focus:outline-none focus:ring-2 focus:ring-blue-500 {}",
if is_selected() {
"border-blue-500 bg-blue-900/30"
} else {
"border-gray-600 hover:border-gray-500 bg-gray-700/50"
}
)
on:click=move |_| {
set_selected_item.set(Some(item_id));
}
role="option"
aria-selected=is_selected
aria-label=item_name
>
<img
src=asset_path
alt=""
class="w-full h-full object-contain"
/>
</button>
}
}
/>
</div>
// Selected item details and actions
{move || {
let item_id = selected_item.get()?;
let item = items.get().into_iter().find(|i| i.id == item_id)?;
let on_drop = on_drop.clone();
let is_dropping = dropping.get();
let is_droppable = item.is_droppable;
Some(view! {
<div class="mt-4 pt-4 border-t border-gray-700">
<div class="flex items-center justify-between">
<div>
<h3 class="text-white font-medium">{item.prop_name.clone()}</h3>
<p class="text-gray-400 text-sm">
{if item.is_transferable { "Transferable" } else { "Not transferable" }}
{if item.is_portable { " \u{2022} Portable" } else { "" }}
{if is_droppable { " \u{2022} Droppable" } else { " \u{2022} Essential" }}
</p>
</div>
<div class="flex gap-2">
// Drop button - disabled for non-droppable (essential) props
<button
type="button"
class=if is_droppable {
"px-4 py-2 bg-red-600 hover:bg-red-700 text-white rounded-lg transition-colors disabled:opacity-50"
} else {
"px-4 py-2 bg-gray-600 text-gray-400 rounded-lg cursor-not-allowed"
}
on:click=move |_| {
if is_droppable {
on_drop.run(item_id);
}
}
disabled=is_dropping || !is_droppable
title=if is_droppable { "" } else { "Essential prop cannot be dropped" }
>
{if is_dropping { "Dropping..." } else { "Drop" }}
</button>
// Transfer button (disabled for now)
<Show when=move || item.is_transferable>
<button
type="button"
class="px-4 py-2 bg-gray-600 text-gray-400 rounded-lg cursor-not-allowed"
disabled=true
title="Transfer functionality coming soon"
>
"Transfer"
</button>
</Show>
</div>
</div>
</div>
})
}}
</div>
</Show>
}
}
/// Public props tab content (read-only display).
#[component]
fn PublicPropsTab(
#[prop(into)] props: Signal<Vec<PublicProp>>,
#[prop(into)] loading: Signal<bool>,
#[prop(into)] error: Signal<Option<String>>,
tab_name: &'static str,
empty_message: &'static str,
) -> impl IntoView {
// Selected prop for showing details
let (selected_prop, set_selected_prop) = signal(Option::<Uuid>::None);
view! {
// Loading state
<Show when=move || loading.get()>
<div class="flex items-center justify-center py-12">
<p class="text-gray-400">{format!("Loading {} props...", tab_name.to_lowercase())}</p>
</div>
</Show>
// Error state
<Show when=move || error.get().is_some()>
<div class="bg-red-900/20 border border-red-600 rounded p-4 mb-4">
<p class="text-red-400">{move || error.get().unwrap_or_default()}</p>
</div>
</Show>
// Empty state
<Show when=move || !loading.get() && error.get().is_none() && props.get().is_empty()>
<div class="flex flex-col items-center justify-center py-12 text-center">
<div class="w-16 h-16 rounded-full bg-gray-700/50 flex items-center justify-center mb-4">
<svg class="w-8 h-8 text-gray-500" fill="none" stroke="currentColor" viewBox="0 0 24 24" aria-hidden="true">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4"/>
</svg>
</div>
<p class="text-gray-400">{empty_message}</p>
<p class="text-gray-500 text-sm mt-1">"Public props will appear here when available"</p>
</div>
</Show>
// Grid of props
<Show when=move || !loading.get() && !props.get().is_empty()>
<div>
<div
class="grid grid-cols-4 sm:grid-cols-6 gap-2"
role="listbox"
aria-label=format!("{} props", tab_name)
>
<For
each=move || props.get()
key=|prop| prop.id
children=move |prop: PublicProp| {
let prop_id = prop.id;
let prop_name = prop.name.clone();
let is_selected = move || selected_prop.get() == Some(prop_id);
let asset_path = if prop.asset_path.starts_with('/') {
prop.asset_path.clone()
} else {
format!("/static/{}", prop.asset_path)
};
view! {
<button
type="button"
class=move || format!(
"aspect-square rounded-lg border-2 transition-all p-1 focus:outline-none focus:ring-2 focus:ring-blue-500 {}",
if is_selected() {
"border-blue-500 bg-blue-900/30"
} else {
"border-gray-600 hover:border-gray-500 bg-gray-700/50"
}
)
on:click=move |_| {
set_selected_prop.set(Some(prop_id));
}
role="option"
aria-selected=is_selected
aria-label=prop_name
>
<img
src=asset_path
alt=""
class="w-full h-full object-contain"
/>
</button>
}
}
/>
</div>
// Selected prop details (read-only)
{move || {
let prop_id = selected_prop.get()?;
let prop = props.get().into_iter().find(|p| p.id == prop_id)?;
Some(view! {
<div class="mt-4 pt-4 border-t border-gray-700">
<div class="flex items-center justify-between">
<div>
<h3 class="text-white font-medium">{prop.name.clone()}</h3>
{prop.description.map(|desc| view! {
<p class="text-gray-400 text-sm">{desc}</p>
})}
</div>
<p class="text-gray-500 text-sm italic">"View only"</p>
</div>
</div>
})
}}
</div>
</Show>
}
}

View file

@ -709,6 +709,7 @@ pub fn RealmPage() -> impl IntoView {
set_inventory_open.set(false);
})
ws_sender=ws_sender_for_inv
realm_slug=Signal::derive(move || slug.get())
/>
}
}