support aquiring server props and test dropping them
This commit is contained in:
parent
3e1afb82c8
commit
7852790a1e
9 changed files with 858 additions and 150 deletions
|
|
@ -4,7 +4,7 @@ use leptos::prelude::*;
|
|||
use leptos::reactive::owner::LocalStorage;
|
||||
use uuid::Uuid;
|
||||
|
||||
use chattyness_db::models::{InventoryItem, PublicProp};
|
||||
use chattyness_db::models::{InventoryItem, PropAcquisitionInfo};
|
||||
#[cfg(feature = "hydrate")]
|
||||
use chattyness_db::ws_messages::ClientMessage;
|
||||
|
||||
|
|
@ -46,13 +46,13 @@ pub fn InventoryPopup(
|
|||
let (selected_item, set_selected_item) = signal(Option::<Uuid>::None);
|
||||
let (dropping, set_dropping) = signal(false);
|
||||
|
||||
// Server props state
|
||||
let (server_props, set_server_props) = signal(Vec::<PublicProp>::new());
|
||||
// Server props state (with acquisition info for authenticated users)
|
||||
let (server_props, set_server_props) = signal(Vec::<PropAcquisitionInfo>::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());
|
||||
// Realm props state (with acquisition info for authenticated users)
|
||||
let (realm_props, set_realm_props) = signal(Vec::<PropAcquisitionInfo>::new());
|
||||
let (realm_loading, set_realm_loading) = signal(false);
|
||||
let (realm_error, set_realm_error) = signal(Option::<String>::None);
|
||||
|
||||
|
|
@ -61,6 +61,9 @@ pub fn InventoryPopup(
|
|||
let (server_loaded, set_server_loaded) = signal(false);
|
||||
let (realm_loaded, set_realm_loaded) = signal(false);
|
||||
|
||||
// Trigger to refresh my inventory after acquisition
|
||||
let (inventory_refresh_trigger, set_inventory_refresh_trigger) = signal(0u32);
|
||||
|
||||
// Fetch my inventory when popup opens or tab is selected
|
||||
#[cfg(feature = "hydrate")]
|
||||
{
|
||||
|
|
@ -68,6 +71,9 @@ pub fn InventoryPopup(
|
|||
use leptos::task::spawn_local;
|
||||
|
||||
Effect::new(move |_| {
|
||||
// Track refresh trigger to refetch after acquisition
|
||||
let _refresh = inventory_refresh_trigger.get();
|
||||
|
||||
if !open.get() {
|
||||
// Reset state when closing
|
||||
set_selected_item.set(None);
|
||||
|
|
@ -86,7 +92,7 @@ pub fn InventoryPopup(
|
|||
set_error.set(None);
|
||||
|
||||
spawn_local(async move {
|
||||
let response = Request::get("/api/inventory").send().await;
|
||||
let response = Request::get("/api/user/me/inventory").send().await;
|
||||
match response {
|
||||
Ok(resp) if resp.ok() => {
|
||||
if let Ok(data) = resp
|
||||
|
|
@ -112,6 +118,7 @@ pub fn InventoryPopup(
|
|||
}
|
||||
|
||||
// Fetch server props when server tab is selected
|
||||
// Uses status endpoint if authenticated (non-guest), otherwise basic endpoint
|
||||
#[cfg(feature = "hydrate")]
|
||||
{
|
||||
use gloo_net::http::Request;
|
||||
|
|
@ -126,17 +133,19 @@ pub fn InventoryPopup(
|
|||
set_server_error.set(None);
|
||||
|
||||
spawn_local(async move {
|
||||
let response = Request::get("/api/inventory/server").send().await;
|
||||
// Single endpoint returns enriched data if authenticated
|
||||
let response = Request::get("/api/server/inventory").send().await;
|
||||
match response {
|
||||
Ok(resp) if resp.ok() => {
|
||||
if let Ok(data) = resp
|
||||
.json::<chattyness_db::models::PublicPropsResponse>()
|
||||
.json::<chattyness_db::models::PropAcquisitionListResponse>()
|
||||
.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()));
|
||||
set_server_error
|
||||
.set(Some("Failed to parse server props".to_string()));
|
||||
}
|
||||
}
|
||||
Ok(resp) => {
|
||||
|
|
@ -175,19 +184,20 @@ pub fn InventoryPopup(
|
|||
set_realm_error.set(None);
|
||||
|
||||
spawn_local(async move {
|
||||
let response = Request::get(&format!("/api/realms/{}/inventory", slug))
|
||||
.send()
|
||||
.await;
|
||||
// Single endpoint returns enriched data if authenticated
|
||||
let endpoint = format!("/api/realms/{}/inventory", slug);
|
||||
let response = Request::get(&endpoint).send().await;
|
||||
match response {
|
||||
Ok(resp) if resp.ok() => {
|
||||
if let Ok(data) = resp
|
||||
.json::<chattyness_db::models::PublicPropsResponse>()
|
||||
.json::<chattyness_db::models::PropAcquisitionListResponse>()
|
||||
.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()));
|
||||
set_realm_error
|
||||
.set(Some("Failed to parse realm props".to_string()));
|
||||
}
|
||||
}
|
||||
Ok(resp) => {
|
||||
|
|
@ -272,23 +282,40 @@ pub fn InventoryPopup(
|
|||
|
||||
// Server tab
|
||||
<Show when=move || active_tab.get() == "server">
|
||||
<PublicPropsTab
|
||||
<AcquisitionPropsTab
|
||||
props=server_props
|
||||
set_props=set_server_props
|
||||
loading=server_loading
|
||||
error=server_error
|
||||
tab_name="Server"
|
||||
empty_message="No public server props available"
|
||||
is_guest=is_guest
|
||||
acquire_endpoint="/api/server/inventory/request"
|
||||
on_acquired=Callback::new(move |_| {
|
||||
// Trigger inventory refresh and reset loaded state
|
||||
set_my_inventory_loaded.set(false);
|
||||
set_inventory_refresh_trigger.update(|n| *n += 1);
|
||||
})
|
||||
/>
|
||||
</Show>
|
||||
|
||||
// Realm tab
|
||||
<Show when=move || active_tab.get() == "realm">
|
||||
<PublicPropsTab
|
||||
<AcquisitionPropsTab
|
||||
props=realm_props
|
||||
set_props=set_realm_props
|
||||
loading=realm_loading
|
||||
error=realm_error
|
||||
tab_name="Realm"
|
||||
empty_message="No public realm props available"
|
||||
is_guest=is_guest
|
||||
acquire_endpoint_is_realm=true
|
||||
realm_slug=realm_slug
|
||||
on_acquired=Callback::new(move |_| {
|
||||
// Trigger inventory refresh and reset loaded state
|
||||
set_my_inventory_loaded.set(false);
|
||||
set_inventory_refresh_trigger.update(|n| *n += 1);
|
||||
})
|
||||
/>
|
||||
</Show>
|
||||
</div>
|
||||
|
|
@ -450,17 +477,103 @@ fn MyInventoryTab(
|
|||
}
|
||||
}
|
||||
|
||||
/// Public props tab content (read-only display).
|
||||
/// Acquisition props tab content with acquire functionality.
|
||||
#[component]
|
||||
fn PublicPropsTab(
|
||||
#[prop(into)] props: Signal<Vec<PublicProp>>,
|
||||
fn AcquisitionPropsTab(
|
||||
#[prop(into)] props: Signal<Vec<PropAcquisitionInfo>>,
|
||||
set_props: WriteSignal<Vec<PropAcquisitionInfo>>,
|
||||
#[prop(into)] loading: Signal<bool>,
|
||||
#[prop(into)] error: Signal<Option<String>>,
|
||||
tab_name: &'static str,
|
||||
empty_message: &'static str,
|
||||
#[prop(into)] is_guest: Signal<bool>,
|
||||
/// Static endpoint for server props (e.g., "/api/server/inventory/request")
|
||||
#[prop(optional)]
|
||||
acquire_endpoint: Option<&'static str>,
|
||||
/// Whether this is a realm props tab (uses dynamic endpoint with slug)
|
||||
#[prop(optional, default = false)]
|
||||
acquire_endpoint_is_realm: bool,
|
||||
/// Realm slug for realm prop acquisition (required if acquire_endpoint_is_realm is true)
|
||||
#[prop(optional, into)]
|
||||
realm_slug: Signal<String>,
|
||||
#[prop(into)] on_acquired: Callback<()>,
|
||||
) -> impl IntoView {
|
||||
// Selected prop for showing details
|
||||
let (selected_prop, set_selected_prop) = signal(Option::<Uuid>::None);
|
||||
let (acquiring, set_acquiring) = signal(false);
|
||||
let (acquire_error, set_acquire_error) = signal(Option::<String>::None);
|
||||
|
||||
// Handle acquire action
|
||||
let acquire_endpoint_opt = acquire_endpoint.map(|s| s.to_string());
|
||||
let do_acquire = Callback::new(move |prop_id: Uuid| {
|
||||
#[cfg(feature = "hydrate")]
|
||||
{
|
||||
set_acquiring.set(true);
|
||||
set_acquire_error.set(None);
|
||||
|
||||
let endpoint = if acquire_endpoint_is_realm {
|
||||
let slug = realm_slug.get();
|
||||
if slug.is_empty() {
|
||||
set_acquire_error.set(Some("No realm selected".to_string()));
|
||||
set_acquiring.set(false);
|
||||
return;
|
||||
}
|
||||
format!("/api/realms/{}/inventory/request", slug)
|
||||
} else {
|
||||
acquire_endpoint_opt.clone().unwrap_or_default()
|
||||
};
|
||||
|
||||
let on_acquired = on_acquired.clone();
|
||||
|
||||
leptos::task::spawn_local(async move {
|
||||
use gloo_net::http::Request;
|
||||
|
||||
// Simple body with just prop_id - realm_id comes from URL for realm props
|
||||
let body = serde_json::json!({
|
||||
"prop_id": prop_id
|
||||
});
|
||||
|
||||
let response = Request::post(&endpoint)
|
||||
.header("Content-Type", "application/json")
|
||||
.body(body.to_string())
|
||||
.unwrap()
|
||||
.send()
|
||||
.await;
|
||||
|
||||
match response {
|
||||
Ok(resp) if resp.ok() => {
|
||||
// Update local state to mark prop as owned
|
||||
set_props.update(|props| {
|
||||
if let Some(prop) = props.iter_mut().find(|p| p.id == prop_id) {
|
||||
prop.user_owns = true;
|
||||
}
|
||||
});
|
||||
// Notify parent to refresh inventory
|
||||
on_acquired.run(());
|
||||
}
|
||||
Ok(resp) => {
|
||||
// Try to parse error message from response
|
||||
if let Ok(error_json) = resp.json::<serde_json::Value>().await {
|
||||
let error_msg = error_json
|
||||
.get("error")
|
||||
.and_then(|e| e.as_str())
|
||||
.unwrap_or("Unknown error");
|
||||
set_acquire_error.set(Some(error_msg.to_string()));
|
||||
} else {
|
||||
set_acquire_error.set(Some(format!(
|
||||
"Failed to acquire prop: {}",
|
||||
resp.status()
|
||||
)));
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
set_acquire_error.set(Some(format!("Network error: {}", e)));
|
||||
}
|
||||
}
|
||||
set_acquiring.set(false);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
view! {
|
||||
// Loading state
|
||||
|
|
@ -477,6 +590,13 @@ fn PublicPropsTab(
|
|||
</div>
|
||||
</Show>
|
||||
|
||||
// Acquire error state
|
||||
<Show when=move || acquire_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 || acquire_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">
|
||||
|
|
@ -501,7 +621,7 @@ fn PublicPropsTab(
|
|||
<For
|
||||
each=move || props.get()
|
||||
key=|prop| prop.id
|
||||
children=move |prop: PublicProp| {
|
||||
children=move |prop: PropAcquisitionInfo| {
|
||||
let prop_id = prop.id;
|
||||
let prop_name = prop.name.clone();
|
||||
let is_selected = move || selected_prop.get() == Some(prop_id);
|
||||
|
|
@ -511,13 +631,21 @@ fn PublicPropsTab(
|
|||
format!("/static/{}", prop.asset_path)
|
||||
};
|
||||
|
||||
// Visual indicator for ownership status
|
||||
let user_owns = prop.user_owns;
|
||||
let is_claimed = prop.is_claimed;
|
||||
|
||||
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 {}",
|
||||
"aspect-square rounded-lg border-2 transition-all p-1 focus:outline-none focus:ring-2 focus:ring-blue-500 relative {}",
|
||||
if is_selected() {
|
||||
"border-blue-500 bg-blue-900/30"
|
||||
} else if user_owns {
|
||||
"border-green-500/50 bg-green-900/20"
|
||||
} else if is_claimed {
|
||||
"border-red-500/50 bg-red-900/20 opacity-50"
|
||||
} else {
|
||||
"border-gray-600 hover:border-gray-500 bg-gray-700/50"
|
||||
}
|
||||
|
|
@ -534,27 +662,63 @@ fn PublicPropsTab(
|
|||
alt=""
|
||||
class="w-full h-full object-contain"
|
||||
/>
|
||||
// Ownership badge
|
||||
<Show when=move || user_owns>
|
||||
<span class="absolute top-0 right-0 w-3 h-3 bg-green-500 rounded-full transform translate-x-1 -translate-y-1" title="Owned" />
|
||||
</Show>
|
||||
</button>
|
||||
}
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
|
||||
// Selected prop details (read-only)
|
||||
// Selected prop details with acquire button
|
||||
{move || {
|
||||
let prop_id = selected_prop.get()?;
|
||||
let prop = props.get().into_iter().find(|p| p.id == prop_id)?;
|
||||
let guest = is_guest.get();
|
||||
let is_acquiring = acquiring.get();
|
||||
|
||||
// Determine button state
|
||||
let (button_text, button_class, button_disabled, button_title) = if guest {
|
||||
("Sign in to Acquire", "bg-gray-600 text-gray-400 cursor-not-allowed", true, "Guests cannot acquire props")
|
||||
} else if prop.user_owns {
|
||||
("Already Owned", "bg-green-700 text-white cursor-default", true, "You already own this prop")
|
||||
} else if prop.is_claimed && prop.is_unique {
|
||||
("Claimed", "bg-red-700 text-white cursor-not-allowed", true, "This unique prop has been claimed by another user")
|
||||
} else if !prop.is_available {
|
||||
("Unavailable", "bg-gray-600 text-gray-400 cursor-not-allowed", true, "This prop is not currently available")
|
||||
} else if is_acquiring {
|
||||
("Acquiring...", "bg-blue-600 text-white opacity-50", true, "")
|
||||
} else {
|
||||
("Acquire", "bg-blue-600 hover:bg-blue-700 text-white", false, "Add this prop to your inventory")
|
||||
};
|
||||
|
||||
let prop_name = prop.name.clone();
|
||||
let prop_description = prop.description.clone();
|
||||
|
||||
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! {
|
||||
<h3 class="text-white font-medium">{prop_name}</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>
|
||||
<button
|
||||
type="button"
|
||||
class=format!("px-4 py-2 rounded-lg transition-colors {}", button_class)
|
||||
on:click=move |_| {
|
||||
if !button_disabled {
|
||||
do_acquire.run(prop_id);
|
||||
}
|
||||
}
|
||||
disabled=button_disabled
|
||||
title=button_title
|
||||
>
|
||||
{button_text}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
})
|
||||
|
|
@ -563,3 +727,4 @@ fn PublicPropsTab(
|
|||
</Show>
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue