Base path for changing directories

MolotovCherry · Mar 15, 2024 · 83c0801 · 83c0801
1 parent e4c0b76
commit 83c0801
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/stegcloak-web/index.html b/stegcloak-web/index.html
@@ -6,9 +6,11 @@
     <link data-trunk rel="tailwind-css" href="tailwind.css" data-target-path="static/css" />
     <link data-trunk rel="rust" data-wasm-opt="z" data-weak-refs data-reference-types data-target-path="static/wasm" />
     <!-- 🧙🏻‍♂️ -->
-    <link rel="icon" href="/static/image/favicon.svg"/>
+    <link data-trunk rel="icon" href="public/image/favicon.svg" data-target-path="static/image"/>
 
     <script data-trunk src="public/js/init.js" data-target-path="static/js" defer />
+
+    <base data-trunk-public-url/>
   </head>
   <body>
     <noscript>

diff --git a/stegcloak-web/src/app.rs b/stegcloak-web/src/app.rs
@@ -8,6 +8,7 @@ use leptos_use::{
 
 use crate::{
     components::page_base::PageBase,
+    get_base_url,
     pages::{home::Home, not_found::NotFound},
 };
 
@@ -34,6 +35,8 @@ pub fn App() -> impl IntoView {
     provide_context(get_theme);
     provide_context(set_theme);
 
+    let base = get_base_url();
+
     view! {
         <Html lang="en"/>
 
@@ -44,10 +47,10 @@ pub fn App() -> impl IntoView {
         <Meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 
         <PageBase>
-            <Router>
+            <Router clone:base>
                 <Routes>
-                    <Route path="/" view=Home/>
-                    <Route path="/*" view=NotFound/>
+                    <Route path=base.clone() view=Home/>
+                    <Route path=format!("{base}*") view=NotFound/>
                 </Routes>
             </Router>
         </PageBase>

diff --git a/stegcloak-web/src/components/page_base.rs b/stegcloak-web/src/components/page_base.rs
@@ -6,7 +6,7 @@ use leptos::*;
 use crate::{
     app::{GetTheme, SetTheme},
     components::mockup_code::{MockupCode, Prefix},
-    Panic,
+    get_base_url, Panic,
 };
 
 #[component]
@@ -206,6 +206,8 @@ fn Footer() -> impl IntoView {
         _ => unreachable!(),
     };
 
+    let base = get_base_url();
+
     view! {
         <footer class="footer items-center p-4 bg-neutral text-neutral-content rounded-b">
             <aside class="items-center grid-flow-col">
@@ -217,11 +219,11 @@ fn Footer() -> impl IntoView {
                     {move || {
                         if is_footer_dark_mode() {
                             view! {
-                                <img src="/static/image/github-mark-white.svg" height="24" width="24" />
+                                <img src=format!("{base}static/image/github-mark-white.svg") height="24" width="24" />
                             }
                         } else {
                             view! {
-                                <img src="/static/image/github-mark.svg" height="24" width="24" />
+                                <img src=format!("{base}static/image/github-mark.svg") height="24" width="24" />
                             }
                         }
                     }}

diff --git a/stegcloak-web/src/lib.rs b/stegcloak-web/src/lib.rs
@@ -2,7 +2,19 @@ mod app;
 mod components;
 mod pages;
 
+use std::sync::OnceLock;
+
+use leptos::*;
+
 pub use app::App;
 
+static BASE_PATH: OnceLock<String> = OnceLock::new();
+
 #[derive(Debug, Clone)]
 pub struct Panic(pub String);
+
+pub fn get_base_url() -> String {
+    BASE_PATH
+        .get_or_init(|| document().location().unwrap().pathname().unwrap())
+        .clone()
+}