From 81c826c099e1782a7662c95ee73f5cbefefb2949 Mon Sep 17 00:00:00 2001 From: Franklin Date: Mon, 24 Apr 2023 13:23:17 -0400 Subject: [PATCH] changed unit details and added admin tag to project comp --- .DS_Store | Bin 0 -> 6148 bytes src/components/admin_project.rs | 11 ++++++----- src/components/admin_unit.rs | 6 +++--- src/pages/admin/agents.rs | 3 ++- 4 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d19c4a40d0052580842db4732d6a40068495449b GIT binary patch literal 6148 zcmeHKL2uJA82#LaF71TW0|+iik+@c+Fora7Dcv}5T@V}qm86NbXlXnpDMhL(UpeW=?5cBknacZS;#VHCSI7EQcaWz$+WPpAB9QtPI?kK4R48nCH$2 zT4xPSmrlVCpqc}R$fNpQls8|uylG=3In5d@cH;_GxGXNsI{7`kOp~Gvh+?egDDJ)9FPz&*Ucz93il@ ztGH=!1D{baQ~u!RSt>KOkl7s=tX~qmQgu7jgWk4d)0@R>cfdSYm)8Ir)&c8)bzs{8 zULQOp#<9UlqgpzUsUrZ;LA45$`7Z!#JcDC{l}5B6gq8xeRG1@%&~ns!hBr1?Y1DEO z=I|lRorO7}2z7V#?WunzoJ4hZMOKbc@k zW^dh@9PhOr(t9Kh=2aS%1ew{6Re`tSyGSa~=5YZyHdtvy4Z{8rP&U}iI&iHH{05uO ByM_P& literal 0 HcmV?d00001 diff --git a/src/components/admin_project.rs b/src/components/admin_project.rs index 3d6e205..16ee516 100644 --- a/src/components/admin_project.rs +++ b/src/components/admin_project.rs @@ -7,8 +7,6 @@ use crate::{ routes::main_router::Route, }; -//TODO: Add admin tag - #[function_component(AdminProject)] pub fn admin_project(props: &AdminProjectProps) -> Html { let navigator = use_navigator().unwrap(); @@ -50,9 +48,12 @@ pub fn admin_project(props: &AdminProjectProps) -> Html { {props.project.project_condition.clone()}
- {match props.project.project_state { - ProjectState::InConstruction => "En Construcción", - ProjectState::Finished => "Terminado", + {match props.project.admin_tag.clone() { + Some(admin_tag) => {admin_tag}, + None => match props.project.project_state { + ProjectState::InConstruction => String::from("En Construcción"), + ProjectState::Finished => String::from("Terminado"), + } }}
diff --git a/src/components/admin_unit.rs b/src/components/admin_unit.rs index f3811e1..b3ada59 100644 --- a/src/components/admin_unit.rs +++ b/src/components/admin_unit.rs @@ -12,7 +12,7 @@ use crate::{ pub fn admin_project(props: &AdminUnitProps) -> Html { let navigator = use_navigator().unwrap(); let price_usd = format!( - "Desde US${}", + "${}", { let price_separated = props.unit.price_usd.separate_with_commas(); if price_separated.contains(".") { @@ -59,10 +59,10 @@ pub fn admin_project(props: &AdminUnitProps) -> Html { }}
- {props.unit.rooms.clone()} + {format!("{} habs.", props.unit.rooms.clone())}
- {props.unit.bathrooms.clone()} + {format!("{} baños", props.unit.bathrooms.clone())}
diff --git a/src/pages/admin/agents.rs b/src/pages/admin/agents.rs index 13962bf..f361d12 100644 --- a/src/pages/admin/agents.rs +++ b/src/pages/admin/agents.rs @@ -1,6 +1,6 @@ use yew::prelude::*; -use crate::{api::backend::get_all_agents, components::{admin_nav_bar::AdminNavigationBar, admin_agent::AdminAgent}}; +use crate::{api::backend::get_all_agents, components::{admin_nav_bar::AdminNavigationBar, admin_agent::AdminAgent, new_widget::NewThingWidget}, pages::admin::edit::EditItem}; #[function_component(AdminAgents)] pub fn admin_agents() -> Html { @@ -21,6 +21,7 @@ pub fn admin_agents() -> Html { html! { <> +
{"Agentes"}