Restructure frontend source code

treiher · Nov 3, 2024 · 8f81c13 · 8f81c13
1 parent b508f6b
commit 8f81c13
Show file tree

Hide file tree

Showing 21 changed files with 1,001 additions and 1,002 deletions.
diff --git a/frontend/src/main.rs b/frontend/src/main.rs
diff --git a/frontend/src/ui.rs b/frontend/src/ui.rs
diff --git a/frontend/src/common.rs → frontend/src/ui/common.rs b/frontend/src/common.rs → frontend/src/ui/common.rs
@@ -4,7 +4,7 @@ use chrono::{prelude::*, Duration};
 use plotters::prelude::*;
 use seed::{prelude::*, *};
 
-use crate::{data, domain};
+use crate::{domain, ui::data};
 
 pub const ENTER_KEY: u32 = 13;
 

diff --git a/frontend/src/component.rs → frontend/src/ui/component.rs b/frontend/src/component.rs → frontend/src/ui/component.rs
diff --git a/frontend/src/component/exercise_list.rs → frontend/src/ui/component/exercise_list.rs b/frontend/src/component/exercise_list.rs → frontend/src/ui/component/exercise_list.rs
@@ -1,6 +1,9 @@
 use seed::{prelude::*, *};
 
-use crate::{common, data, domain};
+use crate::{
+    domain,
+    ui::{common, data},
+};
 
 // ------ ------
 //     Model

diff --git a/frontend/src/data.rs → frontend/src/ui/data.rs b/frontend/src/data.rs → frontend/src/ui/data.rs
@@ -6,7 +6,10 @@ use gloo_storage::Storage;
 use seed::{prelude::*, *};
 use serde_json::{json, Map};
 
-use crate::{common, domain};
+use crate::{
+    domain,
+    ui::{self, common},
+};
 
 const STORAGE_KEY_SETTINGS: &str = "settings";
 const STORAGE_KEY_ONGOING_TRAINING_SESSION: &str = "ongoing training session";
@@ -1240,9 +1243,9 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
         }
         Msg::SessionReceived(Ok(new_session)) => {
             model.session = Some(new_session);
-            orders.send_msg(Msg::Refresh).request_url(
-                crate::Urls::new(model.base_url.clone().set_hash_path([""; 0])).home(),
-            );
+            orders
+                .send_msg(Msg::Refresh)
+                .request_url(ui::Urls::new(model.base_url.clone().set_hash_path([""; 0])).home());
         }
         Msg::SessionReceived(Err(message)) => {
             model.session = None;
@@ -1278,7 +1281,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
         }
         Msg::SessionDeleted(Ok(())) => {
             model.session = None;
-            orders.request_url(crate::Urls::new(&model.base_url).login());
+            orders.request_url(ui::Urls::new(&model.base_url).login());
         }
         Msg::SessionDeleted(Err(message)) => {
             model

diff --git a/frontend/src/page.rs → frontend/src/ui/page.rs b/frontend/src/page.rs → frontend/src/ui/page.rs
diff --git a/frontend/src/page/admin.rs → frontend/src/ui/page/admin.rs b/frontend/src/page/admin.rs → frontend/src/ui/page/admin.rs
@@ -1,13 +1,12 @@
 use seed::{prelude::*, *};
 
-use crate::common;
-use crate::data;
+use crate::ui::{self, common, data};
 
 // ------ ------
 //     Init
 // ------ ------
 
-pub fn init(_: Url, orders: &mut impl Orders<Msg>, navbar: &mut crate::Navbar) -> Model {
+pub fn init(_: Url, orders: &mut impl Orders<Msg>, navbar: &mut ui::Navbar) -> Model {
     orders
         .subscribe(Msg::DataEvent)
         .notify(data::Msg::ReadVersion)

diff --git a/frontend/src/page/body_fat.rs → frontend/src/ui/page/body_fat.rs b/frontend/src/page/body_fat.rs → frontend/src/ui/page/body_fat.rs
@@ -1,8 +1,7 @@
 use chrono::prelude::*;
 use seed::{prelude::*, *};
 
-use crate::common;
-use crate::data;
+use crate::ui::{self, common, data};
 
 // ------ ------
 //     Init
@@ -12,7 +11,7 @@ pub fn init(
     mut url: Url,
     orders: &mut impl Orders<Msg>,
     data_model: &data::Model,
-    navbar: &mut crate::Navbar,
+    navbar: &mut ui::Navbar,
 ) -> Model {
     if url.next_hash_path_part() == Some("add") {
         orders.send_msg(Msg::ShowAddBodyFatDialog);
@@ -211,7 +210,7 @@ pub fn update(
         }
         Msg::CloseBodyFatDialog => {
             model.dialog = Dialog::Hidden;
-            Url::go_and_replace(&crate::Urls::new(&data_model.base_url).body_fat());
+            Url::go_and_replace(&ui::Urls::new(&data_model.base_url).body_fat());
         }
 
         Msg::DateChanged(date) => match model.dialog {

diff --git a/frontend/src/page/body_weight.rs → frontend/src/ui/page/body_weight.rs b/frontend/src/page/body_weight.rs → frontend/src/ui/page/body_weight.rs
@@ -5,8 +5,7 @@ use chrono::prelude::*;
 use chrono::Duration;
 use seed::{prelude::*, *};
 
-use crate::common;
-use crate::data;
+use crate::ui::{self, common, data};
 
 // ------ ------
 //     Init
@@ -16,7 +15,7 @@ pub fn init(
     mut url: Url,
     orders: &mut impl Orders<Msg>,
     data_model: &data::Model,
-    navbar: &mut crate::Navbar,
+    navbar: &mut ui::Navbar,
 ) -> Model {
     if url.next_hash_path_part() == Some("add") {
         orders.send_msg(Msg::ShowAddBodyWeightDialog);
@@ -116,7 +115,7 @@ pub fn update(
         }
         Msg::CloseBodyWeightDialog => {
             model.dialog = Dialog::Hidden;
-            Url::go_and_replace(&crate::Urls::new(&data_model.base_url).body_weight());
+            Url::go_and_replace(&ui::Urls::new(&data_model.base_url).body_weight());
         }
 
         Msg::DateChanged(date) => match model.dialog {

diff --git a/frontend/src/page/exercise.rs → frontend/src/ui/page/exercise.rs b/frontend/src/page/exercise.rs → frontend/src/ui/page/exercise.rs
@@ -3,10 +3,10 @@ use std::collections::BTreeMap;
 use chrono::prelude::*;
 use seed::{prelude::*, *};
 
-use crate::common;
-use crate::data;
-use crate::domain;
-use crate::page::training;
+use crate::{
+    domain,
+    ui::{self, common, data, page::training},
+};
 
 // ------ ------
 //     Init
@@ -16,7 +16,7 @@ pub fn init(
     mut url: Url,
     orders: &mut impl Orders<Msg>,
     data_model: &data::Model,
-    navbar: &mut crate::Navbar,
+    navbar: &mut ui::Navbar,
 ) -> Model {
     let exercise_id = url
         .next_hash_path_part()
@@ -108,7 +108,7 @@ pub fn update(
         Msg::EditExercise => {
             model.editing = true;
             Url::go_and_push(
-                &crate::Urls::new(&data_model.base_url)
+                &ui::Urls::new(&data_model.base_url)
                     .exercise()
                     .add_hash_path_part(model.exercise_id.to_string())
                     .add_hash_path_part("edit"),
@@ -137,7 +137,7 @@ pub fn update(
             model.dialog = Dialog::Hidden;
             model.loading = false;
             Url::go_and_replace(
-                &crate::Urls::new(&data_model.base_url)
+                &ui::Urls::new(&data_model.base_url)
                     .routine()
                     .add_hash_path_part(model.exercise_id.to_string()),
             );
@@ -189,7 +189,7 @@ pub fn update(
                     model.editing = false;
                     model.mark_as_unchanged();
                     Url::go_and_push(
-                        &crate::Urls::new(&data_model.base_url)
+                        &ui::Urls::new(&data_model.base_url)
                             .exercise()
                             .add_hash_path_part(model.exercise_id.to_string()),
                     );
@@ -699,15 +699,15 @@ fn view_sets(
                         C!["mb-2"],
                         a![
                             attrs! {
-                                At::Href => crate::Urls::new(base_url).training_session().add_hash_path_part(t.id.to_string()),
+                                At::Href => ui::Urls::new(base_url).training_session().add_hash_path_part(t.id.to_string()),
                             },
                             span![style! {St::WhiteSpace => "nowrap" }, t.date.to_string()]
                         ],
                         raw!["&emsp;"],
                         if let Some(routine_id) = t.routine_id {
                             a![
                                 attrs! {
-                                    At::Href => crate::Urls::new(base_url).routine().add_hash_path_part(t.routine_id.unwrap().to_string()),
+                                    At::Href => ui::Urls::new(base_url).routine().add_hash_path_part(t.routine_id.unwrap().to_string()),
                                 },
                                 match &routines.get(&routine_id) {
                                     Some(routine) => raw![&routine.name],

diff --git a/frontend/src/page/exercises.rs → frontend/src/ui/page/exercises.rs b/frontend/src/page/exercises.rs → frontend/src/ui/page/exercises.rs
@@ -2,15 +2,13 @@ use std::collections::BTreeMap;
 
 use seed::{prelude::*, *};
 
-use crate::common;
-use crate::component;
-use crate::data;
+use crate::ui::{self, common, component, data};
 
 // ------ ------
 //     Init
 // ------ ------
 
-pub fn init(mut url: Url, orders: &mut impl Orders<Msg>, navbar: &mut crate::Navbar) -> Model {
+pub fn init(mut url: Url, orders: &mut impl Orders<Msg>, navbar: &mut ui::Navbar) -> Model {
     if url.next_hash_path_part() == Some("add") {
         orders.send_msg(Msg::ShowAddExerciseDialog);
     }
@@ -97,7 +95,7 @@ pub fn update(
         }
         Msg::CloseExerciseDialog => {
             model.dialog = Dialog::Hidden;
-            Url::go_and_replace(&crate::Urls::new(&data_model.base_url).exercises());
+            Url::go_and_replace(&ui::Urls::new(&data_model.base_url).exercises());
         }
 
         Msg::ExerciseList(msg) => {
@@ -150,7 +148,7 @@ pub fn update(
         },
 
         Msg::GoToExercise(id) => {
-            let url = crate::Urls::new(&data_model.base_url)
+            let url = ui::Urls::new(&data_model.base_url)
                 .exercise()
                 .add_hash_path_part(id.to_string());
             url.go_and_push();

diff --git a/frontend/src/page/home.rs → frontend/src/ui/page/home.rs b/frontend/src/page/home.rs → frontend/src/ui/page/home.rs
@@ -1,7 +1,7 @@
 use chrono::prelude::*;
 use seed::{prelude::*, *};
 
-use crate::{common, data};
+use crate::ui::{self, common, data};
 
 // ------ ------
 //     Init
@@ -12,7 +12,7 @@ pub fn init(
     _url: Url,
     _orders: &mut impl Orders<Msg>,
     data_model: &data::Model,
-    navbar: &mut crate::Navbar,
+    navbar: &mut ui::Navbar,
 ) -> Model {
     navbar
         .title
@@ -136,27 +136,27 @@ pub fn view(_model: &Model, data_model: &data::Model) -> Node<Msg> {
             "Training",
             &training_subtitle,
             &training_content,
-            crate::Urls::new(&data_model.base_url).training()
+            ui::Urls::new(&data_model.base_url).training()
         ),
         view_tile(
             "Body weight",
             &body_weight_subtitle,
             &body_weight_content,
-            crate::Urls::new(&data_model.base_url).body_weight()
+            ui::Urls::new(&data_model.base_url).body_weight()
         ),
         view_tile(
             "Body fat",
             &body_fat_subtitle,
             &body_fat_content,
-            crate::Urls::new(&data_model.base_url).body_fat()
+            ui::Urls::new(&data_model.base_url).body_fat()
         ),
         IF![
             data_model.session.as_ref().unwrap().sex == 0 => {
                 view_tile(
                     "Menstrual cycle",
                     &menstrual_cycle_subtitle,
                     &menstrual_cycle_content,
-                    crate::Urls::new(&data_model.base_url).menstrual_cycle())
+                    ui::Urls::new(&data_model.base_url).menstrual_cycle())
             }
         ],
     ]

diff --git a/frontend/src/page/login.rs → frontend/src/ui/page/login.rs b/frontend/src/page/login.rs → frontend/src/ui/page/login.rs
@@ -1,21 +1,18 @@
 use seed::{prelude::*, *};
 
-use crate::common;
-use crate::data;
+use crate::ui::{self, common, data};
 
 // ------ ------
 //     Init
 // ------ ------
 
-pub fn init(url: Url, orders: &mut impl Orders<Msg>, navbar: &mut crate::Navbar) -> Model {
+pub fn init(url: Url, orders: &mut impl Orders<Msg>, navbar: &mut ui::Navbar) -> Model {
     orders.notify(data::Msg::ReadUsers);
 
     navbar.title = String::from("Valens");
     navbar.items = vec![(
         ev(Ev::Click, move |_| {
-            crate::Urls::new(url.to_hash_base_url())
-                .admin()
-                .go_and_load();
+            ui::Urls::new(url.to_hash_base_url()).admin().go_and_load();
         }),
         String::from("gears"),
     )];

diff --git a/frontend/src/page/menstrual_cycle.rs → frontend/src/ui/page/menstrual_cycle.rs b/frontend/src/page/menstrual_cycle.rs → frontend/src/ui/page/menstrual_cycle.rs
@@ -1,8 +1,7 @@
 use chrono::prelude::*;
 use seed::{prelude::*, *};
 
-use crate::common;
-use crate::data;
+use crate::ui::{self, common, data};
 
 // ------ ------
 //     Init
@@ -12,7 +11,7 @@ pub fn init(
     mut url: Url,
     orders: &mut impl Orders<Msg>,
     data_model: &data::Model,
-    navbar: &mut crate::Navbar,
+    navbar: &mut ui::Navbar,
 ) -> Model {
     if url.next_hash_path_part() == Some("add") {
         orders.send_msg(Msg::ShowAddPeriodDialog);
@@ -112,7 +111,7 @@ pub fn update(
         }
         Msg::ClosePeriodDialog => {
             model.dialog = Dialog::Hidden;
-            Url::go_and_replace(&crate::Urls::new(&data_model.base_url).menstrual_cycle());
+            Url::go_and_replace(&ui::Urls::new(&data_model.base_url).menstrual_cycle());
         }
 
         Msg::DateChanged(date) => match model.dialog {

diff --git a/frontend/src/page/muscles.rs → frontend/src/ui/page/muscles.rs b/frontend/src/page/muscles.rs → frontend/src/ui/page/muscles.rs
@@ -1,15 +1,16 @@
 use chrono::prelude::*;
 use seed::{prelude::*, *};
 
-use crate::common;
-use crate::data;
-use crate::domain;
+use crate::{
+    domain,
+    ui::{self, common, data},
+};
 
 // ------ ------
 //     Init
 // ------ ------
 
-pub fn init(data_model: &data::Model, navbar: &mut crate::Navbar) -> Model {
+pub fn init(data_model: &data::Model, navbar: &mut ui::Navbar) -> Model {
     navbar.title = String::from("Muscles");
 
     Model {

diff --git a/frontend/src/page/not_found.rs → frontend/src/ui/page/not_found.rs b/frontend/src/page/not_found.rs → frontend/src/ui/page/not_found.rs
@@ -1,6 +1,6 @@
 use seed::prelude::*;
 
-use crate::common;
+use crate::ui::common;
 
 pub fn view<Ms>() -> Node<Ms> {
     common::view_error_not_found("Page")