fix: fix transflow path issue

phodal · Dec 9, 2021 · 666c61d · 666c61d
1 parent f0deec0
commit 666c61d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/quake_core/src/entry/entry_paths.rs b/quake_core/src/entry/entry_paths.rs
@@ -33,8 +33,8 @@ impl EntryPaths {
         "entries.csv"
     }
 
-    pub fn transflows_yaml() -> &'static str {
-        "transflows.yaml"
+    pub fn quake() -> &'static str {
+        "_quake"
     }
 
     pub fn transfuncs() -> &'static str {

diff --git a/quake_webapp/index.html b/quake_webapp/index.html
@@ -13,12 +13,17 @@
       overflow: scroll;
       position: relative;
     }
+    #transflow-nav {
+      display: inline;
+    }
   </style>
 </head>
 <body>
 <div id="navigator">
   <a href="/">Go Home</a>
-  <a href="/transflow/show_calendar">calendar</a>
+  <div id="transflow-nav">
+    <a href="/transflow/show_calendar">calendar</a>
+  </div>
 </div>
 <div id="outlet"></div>
 </body>

diff --git a/src/server/transflow_api.rs b/src/server/transflow_api.rs
@@ -3,7 +3,6 @@ use std::path::PathBuf;
 
 use rocket::fs::NamedFile;
 use rocket::response::content::JavaScript;
-use rocket::response::status::NotFound;
 use rocket::serde::json::Json;
 use rocket::State;
 use rocket::{get, post};
@@ -53,7 +52,9 @@ pub(crate) async fn translate(
 #[get("/script")]
 pub(crate) async fn transfunc_script(config: &State<QuakeConfig>) -> Option<NamedFile> {
     let path = PathBuf::from(config.workspace.clone());
-    let fs = path.join(EntryPaths::transfuncs());
+    let fs = path
+        .join(EntryPaths::quake())
+        .join(EntryPaths::transfuncs());
 
     let file = NamedFile::open(fs);
     file.await.ok()