{
diff --git a/sh-frontend/src/components/footer_components/mod.rs b/sh-frontend/src/components/footer/mod.rs
similarity index 100%
rename from sh-frontend/src/components/footer_components/mod.rs
rename to sh-frontend/src/components/footer/mod.rs
diff --git a/sh-frontend/src/components/input/field.rs b/sh-frontend/src/components/input/field.rs
new file mode 100644
index 0000000..4a086e9
--- /dev/null
+++ b/sh-frontend/src/components/input/field.rs
@@ -0,0 +1,296 @@
+// Copyright (C) 2024 Fred Clausen
+// Use of this source code is governed by an MIT-style
+// license that can be found in the LICENSE file or at
+// https://opensource.org/licenses/MIT.
+
+use heck::ToTitleCase;
+use std::{f64, fmt::Display};
+use wasm_bindgen::JsCast;
+use web_sys::HtmlInputElement;
+use yew::prelude::*;
+
+#[derive(Clone, PartialEq, Eq)]
+pub enum InputFieldType {
+ Text,
+ Number,
+ Select,
+}
+
+#[derive(Clone, PartialEq, Eq)]
+pub enum CoordinateType {
+ Latitude,
+ Longitude,
+}
+
+impl Display for InputFieldType {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ match self {
+ Self::Text => write!(f, "text"),
+ Self::Select => write!(f, "select"),
+ Self::Number => write!(f, "number"),
+ }
+ }
+}
+
+#[derive(Clone, PartialEq, Eq)]
+pub struct NumberProperties {
+ pub max: String,
+ pub min: String,
+ pub step: String,
+ pub value: String,
+}
+
+impl NumberProperties {
+ #[must_use]
+ pub fn new(coordinate_type: &CoordinateType, initial_value: String) -> Self {
+ let max = match coordinate_type {
+ CoordinateType::Latitude => "90",
+ CoordinateType::Longitude => "180",
+ }
+ .to_string();
+
+ let min = match coordinate_type {
+ CoordinateType::Latitude => "-90",
+ CoordinateType::Longitude => "-180",
+ }
+ .to_string();
+
+ Self {
+ max,
+ min,
+ step: "0.00001".to_string(),
+ value: initial_value,
+ }
+ }
+}
+
+impl Default for NumberProperties {
+ fn default() -> Self {
+ Self {
+ max: "180".to_string(),
+ min: "180".to_string(),
+ step: "0.00001".to_string(),
+ value: "0.0".to_string(),
+ }
+ }
+}
+
+#[must_use]
+pub fn make_sure_string_has_five_digits(value: &String) -> String {
+ let Ok(value) = value.parse::() else {
+ log::error!("Could not parse value as f64: {}", value);
+ return "0.0".to_string();
+ };
+
+ format!("{value:.5}")
+}
+
+#[derive(Clone, PartialEq, Properties)]
+pub struct InputFieldProps {
+ pub input_value: String,
+ // pub on_cautious_change: Callback,
+ pub label: String,
+ pub field_type: InputFieldType,
+ #[prop_or_default]
+ pub select_options: Option>,
+ #[prop_or_default]
+ pub number_properties: Option,
+ pub name: String,
+ pub input_node_ref: NodeRef,
+ #[prop_or(false)]
+ pub read_only: bool,
+}
+
+#[function_component(InputField)]
+pub fn input_field(props: &InputFieldProps) -> Html {
+ log::debug!("Rendering input field");
+
+ let InputFieldProps {
+ input_value,
+ // on_cautious_change,
+ label,
+ field_type,
+ select_options,
+ name,
+ input_node_ref,
+ read_only,
+ number_properties,
+ } = props;
+
+ let onchange = {
+ // format the number to always have 5 decimal places
+ let field_type = field_type.clone();
+
+ Callback::from(move |event: Event| {
+ event.prevent_default();
+
+ let target = event
+ .target()
+ .unwrap()
+ .dyn_into::()
+ .unwrap();
+
+ let value = target.value();
+ let value = match field_type {
+ InputFieldType::Number => make_sure_string_has_five_digits(&value),
+ _ => value,
+ };
+
+ target.set_value(&value);
+ })
+ };
+
+ let on_increase = {
+ let input_node_ref = input_node_ref.clone();
+ let number_properties = number_properties.clone();
+ let step = number_properties
+ .as_ref()
+ .unwrap_or(&NumberProperties::default())
+ .step
+ .clone()
+ .parse::()
+ .unwrap();
+
+ Callback::from(move |event: MouseEvent| {
+ event.prevent_default();
+
+ // get the value from input_node_ref
+
+ let current_value = input_node_ref.cast::().unwrap().value();
+
+ let Ok(current_value) = current_value.parse::() else {
+ log::error!("Could not parse value as f64: {}", current_value);
+ return;
+ };
+
+ let new_value = current_value + step;
+ let formatted_new_value = make_sure_string_has_five_digits(&new_value.to_string());
+ input_node_ref
+ .cast::()
+ .unwrap()
+ .set_value(&formatted_new_value);
+ })
+ };
+
+ let on_decrease = {
+ let input_node_ref = input_node_ref.clone();
+ let number_properties = number_properties.clone();
+ let step = number_properties
+ .as_ref()
+ .unwrap_or(&NumberProperties::default())
+ .step
+ .clone()
+ .parse::()
+ .unwrap();
+
+ Callback::from(move |event: MouseEvent| {
+ event.prevent_default();
+
+ // get the value from input_node_ref
+
+ let current_value = input_node_ref.cast::().unwrap().value();
+
+ let Ok(current_value) = current_value.parse::() else {
+ log::error!("Could not parse value as f64: {}", current_value);
+ return;
+ };
+
+ let new_value = current_value - step;
+ let formatted_new_value = make_sure_string_has_five_digits(&new_value.to_string());
+ input_node_ref
+ .cast::()
+ .unwrap()
+ .set_value(&formatted_new_value);
+ })
+ };
+
+ html! {
+ <>
+
+
+ {
+ match field_type {
+ InputFieldType::Text => {
+ if select_options.is_some() {
+ log::warn!("Select options were provided for a text field. Ignoring them.");
+ }
+
+ html! {
+
+ }
+ },
+ InputFieldType::Number => {
+ if number_properties.is_none() {
+ log::error!("Number properties must be provided for a number field");
+
+ return html! {
+ { "Field type is number but no number properties were provided" }
+ }
+ }
+
+ let number_properties = number_properties.as_ref().unwrap();
+
+ html! {
+ <>
+
+
+
+
+ }
+ },
+ InputFieldType::Select => {
+ if select_options.is_none() {
+ log::error!("Select options must be provided for a select field");
+
+ return html! {
+ { "Field type is select but no select options were provided" }
+ }
+ }
+
+ html! {
+
+ }
+ }
+ }
+ }
+
+
+ }
+}
diff --git a/sh-frontend/src/components/input/input_field.rs b/sh-frontend/src/components/input/input_field.rs
deleted file mode 100644
index 4f79097..0000000
--- a/sh-frontend/src/components/input/input_field.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright (C) 2024 Fred Clausen
-// Use of this source code is governed by an MIT-style
-// license that can be found in the LICENSE file or at
-// https://opensource.org/licenses/MIT.
-
-use yew::prelude::*;
-
-#[derive(Clone, PartialEq)]
-pub enum InputFieldType {
- Text,
- Select,
-}
-
-impl ToString for InputFieldType {
- fn to_string(&self) -> String {
- match self {
- InputFieldType::Text => "text".to_string(),
- InputFieldType::Select => "select".to_string(),
- }
- }
-}
-
-#[derive(Clone, PartialEq, Properties)]
-pub struct InputFieldProps {
- pub input_value: String,
- // pub on_cautious_change: Callback,
- pub label: String,
- pub field_type: InputFieldType,
- pub select_options: Option>,
- pub name: String,
- pub input_node_ref: NodeRef,
- #[prop_or(false)]
- pub read_only: bool,
-}
-
-#[function_component(InputField)]
-pub fn input_field(props: &InputFieldProps) -> Html {
- let InputFieldProps {
- input_value,
- // on_cautious_change,
- label,
- field_type,
- select_options,
- name,
- input_node_ref,
- read_only,
- } = props;
-
- log::debug!("InputField: {:?}", input_value);
- html! {
- <>
-
-
- {
- match field_type {
- InputFieldType::Text => {
- if select_options.is_some() {
- log::warn!("Select options were provided for a text field. Ignoring them.");
- }
-
- html! {
-
- }
- },
- InputFieldType::Select => {
- if select_options.is_none() {
- log::error!("Select options must be provided for a select field");
-
- return html! {
- { "Field type is select but no select options were provided" }
- }
- }
-
- html! {
-
- }
- }
- }
- }
-
-
- }
-}
diff --git a/sh-frontend/src/components/input/mod.rs b/sh-frontend/src/components/input/mod.rs
index 2a14ca3..b427700 100644
--- a/sh-frontend/src/components/input/mod.rs
+++ b/sh-frontend/src/components/input/mod.rs
@@ -3,4 +3,4 @@
// license that can be found in the LICENSE file or at
// https://opensource.org/licenses/MIT.
-pub mod input_field;
+pub mod field;
diff --git a/sh-frontend/src/components/layout_components/footer.rs b/sh-frontend/src/components/layout/footer.rs
similarity index 79%
rename from sh-frontend/src/components/layout_components/footer.rs
rename to sh-frontend/src/components/layout/footer.rs
index ff56654..73a1c30 100644
--- a/sh-frontend/src/components/layout_components/footer.rs
+++ b/sh-frontend/src/components/layout/footer.rs
@@ -3,11 +3,13 @@
// license that can be found in the LICENSE file or at
// https://opensource.org/licenses/MIT.
-use crate::components::footer_components::connected::Connected;
+use crate::components::footer::connected::Connected;
use yew::prelude::*;
#[function_component(Footer)]
pub fn footer() -> Html {
+ log::debug!("Rendering footer.");
+
html! {