add catch all for frontend and /api for be (#384)

* add catch all for frontend and /api for be

* fix asset loading

Author: zupzup

frontend/index.html

@@ -17,7 +17,7 @@ <h3>Identity:</h3>
     <script>
         async function fetchIdentity() {
             try {
-                const response = await fetch('/identity/detail'); 
+                const response = await fetch('/api/identity/detail');
                 if (!response.ok) {
                     let resp = await response.json();
                     throw new Error(`${response.status} - ${resp.error}/${resp.message}`);
@@ -31,5 +31,6 @@ <h3>Identity:</h3>
         }
         fetchIdentity();
     </script>
+    <script src="./main.js"></script>
 </body>
 </html>

frontend/main.js

@@ -0,0 +1 @@
+console.log('hello world');

src/web/handlers/mod.rs

@@ -5,9 +5,11 @@ use super::data::{
 use crate::{
     constants::VALID_CURRENCIES,
     service::{Error, Result, ServiceContext},
+    CONFIG,
 };
 use bill::get_current_identity_node_id;
-use rocket::{get, post, serde::json::Json, Shutdown, State};
+use rocket::{fs::NamedFile, get, post, serde::json::Json, Shutdown, State};
+use std::path::Path;
 
 pub mod bill;
 pub mod company;
@@ -17,6 +19,13 @@ pub mod middleware;
 pub mod notifications;
 pub mod quotes;
 
+#[get("/<_..>", rank = 10)]
+pub async fn serve_frontend() -> Option<NamedFile> {
+    NamedFile::open(Path::new(&CONFIG.frontend_serve_folder).join("index.html"))
+        .await
+        .ok()
+}
+
 #[get("/")]
 pub async fn exit(shutdown: Shutdown, state: &State<ServiceContext>) {
     log::info!("Exit called - shutting down...");

src/web/mod.rs

@@ -1,7 +1,6 @@
 use crate::service::ServiceContext;
 use api_docs::ApiDocs;
 use log::info;
-use rocket::fs::FileServer;
 use rocket::http::{Method, Status};
 use rocket::{catch, catchers, routes, Build, Config, Request, Rocket};
 use rocket_cors::{AllowedHeaders, AllowedOrigins, CorsOptions};
@@ -17,6 +16,7 @@ use crate::constants::MAX_FILE_SIZE_BYTES;
 use crate::CONFIG;
 use rocket::data::ByteUnit;
 use rocket::figment::Figment;
+use rocket::fs::FileServer;
 use rocket::serde::json::Json;
 use serde_json::json;
 
@@ -75,16 +75,16 @@ pub fn rocket_main(context: ServiceContext) -> Rocket<Build> {
 
     let rocket = rocket::custom(config)
         .attach(cors.clone())
-        .mount("/", rocket_cors::catch_all_options_routes())
+        .mount("/api/", rocket_cors::catch_all_options_routes())
         .register("/", catchers![default_catcher, not_found])
         .manage(context)
         .manage(cors)
-        .mount("/exit", routes![handlers::exit])
-        .mount("/currencies", routes![handlers::currencies])
-        .mount("/overview", routes![handlers::overview])
-        .mount("/search", routes![handlers::search])
+        .mount("/api/exit", routes![handlers::exit])
+        .mount("/api/currencies", routes![handlers::currencies])
+        .mount("/api/overview", routes![handlers::overview])
+        .mount("/api/search", routes![handlers::search])
         .mount(
-            "/identity",
+            "/api/identity",
             routes![
                 handlers::identity::create_identity,
                 handlers::identity::change_identity,
@@ -100,11 +100,7 @@ pub fn rocket_main(context: ServiceContext) -> Rocket<Build> {
             ],
         )
         .mount(
-            &CONFIG.frontend_url_path,
-            FileServer::from(&CONFIG.frontend_serve_folder),
-        )
-        .mount(
-            "/contacts",
+            "/api/contacts",
             routes![
                 handlers::contacts::new_contact,
                 handlers::contacts::edit_contact,
@@ -116,7 +112,7 @@ pub fn rocket_main(context: ServiceContext) -> Rocket<Build> {
             ],
         )
         .mount(
-            "/company",
+            "/api/company",
             routes![
                 handlers::company::check_companies_in_dht,
                 handlers::company::list,
@@ -131,7 +127,7 @@ pub fn rocket_main(context: ServiceContext) -> Rocket<Build> {
             ],
         )
         .mount(
-            "/bill",
+            "/api/bill",
             routes![
                 handlers::bill::all_bills_from_all_identities,
                 handlers::bill::issue_bill,
@@ -166,14 +162,14 @@ pub fn rocket_main(context: ServiceContext) -> Rocket<Build> {
             ],
         )
         .mount(
-            "/quote",
+            "/api/quote",
             routes![
                 handlers::quotes::return_quote,
                 handlers::quotes::accept_quote
             ],
         )
         .mount(
-            "/",
+            "/api/",
             routes![
                 handlers::notifications::list_notifications,
                 handlers::notifications::mark_notification_done,
@@ -183,9 +179,15 @@ pub fn rocket_main(context: ServiceContext) -> Rocket<Build> {
             ],
         )
         .mount(
-            "/",
+            "/api/",
             SwaggerUi::new("/swagger-ui/<_..>").url("/api-docs/openapi.json", ApiDocs::openapi()),
-        );
+        )
+        .mount(
+            &CONFIG.frontend_url_path,
+            FileServer::from(&CONFIG.frontend_serve_folder).rank(5),
+        )
+        // TODO: fall back to index, but serve static files first
+        .mount(&CONFIG.frontend_url_path, routes![handlers::serve_frontend]);
 
     info!("HTTP Server Listening on {}", conf.http_listen_url());