// Search Results Content
@@ -66,34 +146,5 @@ pub fn search_page(_props: &SearchPageProperties) -> Html {
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Properties)]
pub struct SearchPageProperties {
- pub property_state: PropertyState
-}
-
-
-#[derive(Debug, Clone, Default, PartialEq, Eq, PartialOrd, Ord)]
-pub enum PropertyState {
- Finished,
- #[default]
- InConstruction,
-}
-
-impl Display for PropertyState {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- match self {
- PropertyState::Finished => write!(f, "Finished"),
- PropertyState::InConstruction => write!(f, "InConstruction"),
- }
- }
-}
-
-impl FromStr for PropertyState {
- type Err = ();
-
- fn from_str(s: &str) -> Result
{
- match s {
- "Finished" => Ok(Self::Finished),
- "InConstruction" => Ok(Self::InConstruction),
- _ => Err(())
- }
- }
+ pub property_state: ProjectState
}
\ No newline at end of file
diff --git a/src/routes/main_router.rs b/src/routes/main_router.rs
index a011bba..556f93a 100644
--- a/src/routes/main_router.rs
+++ b/src/routes/main_router.rs
@@ -1,16 +1,17 @@
+use jl_types::domain::project_state::ProjectState;
use yew_router::prelude::*;
use yew::prelude::*;
use uuid::Uuid;
-use crate::{pages::{landing::LandingPage, search::{SearchPage, PropertyState}, details::DetailsPage, not_found::NotFoundPage, contact::ContactPage}};
+use crate::{pages::{landing::LandingPage, search::{SearchPage}, details::DetailsPage, not_found::NotFoundPage, contact::ContactPage}};
#[derive(Clone, Routable, PartialEq)]
pub enum Route {
#[at("/")]
LandingPage,
#[at("/search/:property_state")]
- Search { property_state: PropertyState },
+ Search { property_state: ProjectState },
#[at("/details/:property_id")]
Details { property_id: Uuid },
#[at("/contact")]
diff --git a/src/utils/get_value.rs b/src/utils/get_value.rs
new file mode 100644
index 0000000..e69de29
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
new file mode 100644
index 0000000..f329ff6
--- /dev/null
+++ b/src/utils/mod.rs
@@ -0,0 +1 @@
+pub mod get_value;
\ No newline at end of file