webapp: structure sources

typhon-ci · Oct 18, 2023 · d1e3c63 · d1e3c63
1 parent 2b49a16
commit d1e3c63
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 15 deletions.
diff --git a/typhon-webapp/src/logo.svg → typhon-webapp/assets/images/logo.svg b/typhon-webapp/src/logo.svg → typhon-webapp/assets/images/logo.svg
diff --git a/typhon-webapp/index.scss → typhon-webapp/assets/style/index.scss b/typhon-webapp/index.scss → typhon-webapp/assets/style/index.scss
diff --git a/typhon-webapp/index.html b/typhon-webapp/index.html
@@ -5,8 +5,8 @@
     <meta charset="utf-8" />
     <title>Typhon</title>
     <link data-trunk rel="copy-dir" href="node_modules/@fontsource" data-target-path="@fontsource" />
-    <link data-trunk rel="sass" href="index.scss" />
     <link data-trunk rel="css" href="node_modules/remixicon/fonts/remixicon.css" />
+    <link data-trunk rel="sass" href="assets/style/index.scss" />
     <script type="application/json" id="settings">null</script>
   </head>
   <body>

diff --git a/typhon-webapp/src/lib.rs b/typhon-webapp/src/lib.rs
@@ -1,21 +1,17 @@
-mod drv_log;
-mod editable_text;
-mod evaluation;
-mod home;
-mod job;
-mod jobset;
-mod login;
-mod project;
+mod pages;
 mod streams;
-mod timestamp;
+mod widgets;
+
+use pages::*;
+
+use typhon_types::*;
 
 use gloo_console::log;
 use gloo_net::http;
 use gloo_storage::LocalStorage;
 use gloo_storage::Storage;
 use seed::{prelude::*, *};
 use serde::{Deserialize, Serialize};
-use typhon_types::*;
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Settings {
@@ -412,7 +408,7 @@ fn header(base_url: &Url, model: &Model) -> Node<Msg> {
     let urls_2 = Urls::new(base_url);
     header![
         main![a![
-            raw![std::str::from_utf8(include_bytes!("./logo.svg")).unwrap()],
+            raw![std::str::from_utf8(include_bytes!("../assets/images/logo.svg")).unwrap()],
             span!["Typhon"],
             attrs! { At::Href => urls_1.home() }
         ]],

diff --git a/typhon-webapp/src/evaluation.rs → typhon-webapp/src/pages/evaluation.rs b/typhon-webapp/src/evaluation.rs → typhon-webapp/src/pages/evaluation.rs
diff --git a/typhon-webapp/src/home.rs → typhon-webapp/src/pages/home.rs b/typhon-webapp/src/home.rs → typhon-webapp/src/pages/home.rs
diff --git a/typhon-webapp/src/job.rs → typhon-webapp/src/pages/job.rs b/typhon-webapp/src/job.rs → typhon-webapp/src/pages/job.rs
@@ -1,7 +1,7 @@
-use crate::drv_log;
 use crate::perform_request;
 use crate::view_error;
 use crate::view_log;
+use crate::widgets::drv_log;
 use crate::Settings;
 
 use typhon_types::*;

diff --git a/typhon-webapp/src/jobset.rs → typhon-webapp/src/pages/jobset.rs b/typhon-webapp/src/jobset.rs → typhon-webapp/src/pages/jobset.rs
@@ -1,6 +1,6 @@
 use crate::perform_request;
-use crate::timestamp;
 use crate::view_error;
+use crate::widgets::timestamp;
 
 use seed::{prelude::*, *};
 use typhon_types::*;

diff --git a/typhon-webapp/src/login.rs → typhon-webapp/src/pages/login.rs b/typhon-webapp/src/login.rs → typhon-webapp/src/pages/login.rs
diff --git a/typhon-webapp/src/pages/mod.rs b/typhon-webapp/src/pages/mod.rs
@@ -0,0 +1,6 @@
+pub mod evaluation;
+pub mod home;
+pub mod job;
+pub mod jobset;
+pub mod login;
+pub mod project;
diff --git a/typhon-webapp/src/project.rs → typhon-webapp/src/pages/project.rs b/typhon-webapp/src/project.rs → typhon-webapp/src/pages/project.rs
@@ -1,6 +1,6 @@
-use crate::editable_text;
 use crate::perform_request;
 use crate::view_error;
+use crate::widgets::editable_text;
 
 use seed::{prelude::*, *};
 

diff --git a/typhon-webapp/src/drv_log.rs → typhon-webapp/src/widgets/drv_log.rs b/typhon-webapp/src/drv_log.rs → typhon-webapp/src/widgets/drv_log.rs
diff --git a/typhon-webapp/src/editable_text.rs → typhon-webapp/src/widgets/editable_text.rs b/typhon-webapp/src/editable_text.rs → typhon-webapp/src/widgets/editable_text.rs
diff --git a/typhon-webapp/src/widgets/mod.rs b/typhon-webapp/src/widgets/mod.rs
@@ -0,0 +1,3 @@
+pub mod drv_log;
+pub mod editable_text;
+pub mod timestamp;
diff --git a/typhon-webapp/src/timestamp.rs → typhon-webapp/src/widgets/timestamp.rs b/typhon-webapp/src/timestamp.rs → typhon-webapp/src/widgets/timestamp.rs