working router

Cargo.lock

@@ -840,21 +840,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "fsevent"
 version = "0.4.0"
@@ -2313,43 +2298,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
-[[package]]
-name = "openssl"
-version = "0.10.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
-dependencies = [
- "bitflags 1.3.2",
- "cfg-if 1.0.0",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-src"
-version = "111.17.0+1.1.1m"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05d6a336abd10814198f66e2a91ccd7336611f30334119ca8ce300536666fcf4"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.72"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
-dependencies = [
- "autocfg 1.0.1",
- "cc",
- "libc",
- "openssl-src",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "owning_ref"
 version = "0.4.1"
@@ -2545,7 +2493,7 @@ dependencies = [
 
 [[package]]
 name = "peach-network"
-version = "0.4.1"
+version = "0.4.2"
 dependencies = [
  "get_if_addrs",
  "miniserde",
@@ -2588,19 +2536,14 @@ name = "peach-web"
 version = "0.5.0"
 dependencies = [
  "env_logger 0.8.4",
+ "lazy_static",
  "log 0.4.14",
  "nest",
- "openssl",
  "peach-lib",
- "peach-network",
- "peach-stats",
- "percent-encoding 2.1.0",
- "regex",
  "rocket",
  "rocket_dyn_templates",
  "serde 1.0.133",
  "serde_json",
- "snafu 0.6.10",
  "tera",
  "xdg",
 ]
@@ -2734,12 +2677,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
-[[package]]
-name = "pkg-config"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"
-
 [[package]]
 name = "polyval"
 version = "0.4.5"
@@ -4546,12 +4483,6 @@ dependencies = [
  "percent-encoding 1.0.1",
 ]
 
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
 [[package]]
 name = "vec_map"
 version = "0.8.2"

peach-web/Cargo.toml

@@ -40,8 +40,8 @@ lazy_static = "1.4.0"
 log = "0.4"
 nest = "1.0.0"
 peach-lib = { path = "../peach-lib" }
-peach-network = { path = "../peach-network", features = ["serde_support"] }
+#peach-network = { path = "../peach-network", features = ["serde_support"] }
-peach-stats = { path = "../peach-stats", features = ["serde_support"] }
+#peach-stats = { path = "../peach-stats", features = ["serde_support"] }
 rocket = { version = "0.5.0-rc.1", features = ["json", "secrets"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

peach-web/src/context/mod.rs

@@ -1,2 +1,2 @@
 pub mod dns;
-pub mod network;
+// pub mod network;

peach-web/src/context/network.rs

@@ -1,398 +0,0 @@
-//! Data retrieval for the purpose of serving routes and hydrating
-//! network-related HTML templates.
-
-use std::collections::HashMap;
-
-use rocket::{
-    form::FromForm,
-    serde::{Deserialize, Serialize},
-    UriDisplayQuery,
-};
-
-use peach_network::{
-    network,
-    network::{Scan, Status, Traffic},
-};
-
-use crate::{
-    utils::{
-        monitor,
-        monitor::{Alert, Data, Threshold},
-    },
-    AP_IFACE, WLAN_IFACE,
-};
-
-#[derive(Debug, Serialize)]
-pub struct AccessPoint {
-    pub detail: Option<Scan>,
-    pub signal: Option<i32>,
-    pub state: String,
-}
-
-pub fn ap_state() -> String {
-    match network::state(&*AP_IFACE) {
-        Ok(Some(state)) => state,
-        _ => "Interface unavailable".to_string(),
-    }
-}
-
-#[derive(Debug, Deserialize, FromForm, UriDisplayQuery)]
-pub struct Ssid {
-    pub ssid: String,
-}
-
-#[derive(Debug, Deserialize, FromForm)]
-pub struct WiFi {
-    pub ssid: String,
-    pub pass: String,
-}
-
-fn convert_traffic(traffic: Traffic) -> Option<IfaceTraffic> {
-    // modify traffic values & assign measurement unit
-    // based on received and transmitted values
-    let (rx, rx_unit) = if traffic.received > 1_047_527_424 {
-        // convert to GB
-        (traffic.received / 1_073_741_824, "GB".to_string())
-    } else if traffic.received > 0 {
-        // otherwise, convert it to MB
-        ((traffic.received / 1024) / 1024, "MB".to_string())
-    } else {
-        (0, "MB".to_string())
-    };
-
-    let (tx, tx_unit) = if traffic.transmitted > 1_047_527_424 {
-        // convert to GB
-        (traffic.transmitted / 1_073_741_824, "GB".to_string())
-    } else if traffic.transmitted > 0 {
-        ((traffic.transmitted / 1024) / 1024, "MB".to_string())
-    } else {
-        (0, "MB".to_string())
-    };
-
-    Some(IfaceTraffic {
-        rx,
-        rx_unit,
-        tx,
-        tx_unit,
-    })
-}
-
-#[derive(Debug, Serialize)]
-pub struct IfaceTraffic {
-    pub rx: u64,
-    pub rx_unit: String,
-    pub tx: u64,
-    pub tx_unit: String,
-}
-
-#[derive(Debug, Serialize)]
-pub struct NetworkAlertContext {
-    pub alert: Alert,
-    pub back: Option<String>,
-    pub data_total: Option<Data>, // combined stored and current wifi traffic in bytes
-    pub flash_name: Option<String>,
-    pub flash_msg: Option<String>,
-    pub threshold: Threshold,
-    pub title: Option<String>,
-    pub traffic: Option<IfaceTraffic>, // current wifi traffic in bytes (since boot)
-}
-
-impl NetworkAlertContext {
-    pub fn build() -> NetworkAlertContext {
-        let alert = monitor::get_alerts().unwrap();
-        // stored wifi data values as bytes
-        let stored_traffic = monitor::get_data().unwrap();
-        let threshold = monitor::get_thresholds().unwrap();
-
-        let (traffic, data_total) = match network::traffic(&*WLAN_IFACE) {
-            // convert bytes to mb or gb and add appropriate units
-            Ok(Some(t)) => {
-                let current_traffic = t.received + t.transmitted;
-                let traffic = convert_traffic(t);
-                let total = stored_traffic.total + current_traffic;
-                let data_total = Data { total };
-                (traffic, Some(data_total))
-            }
-            _ => (None, None),
-        };
-
-        NetworkAlertContext {
-            alert,
-            back: None,
-            data_total,
-            flash_name: None,
-            flash_msg: None,
-            threshold,
-            title: None,
-            traffic,
-        }
-    }
-}
-
-#[derive(Debug, Serialize)]
-pub struct NetworkDetailContext {
-    pub back: Option<String>,
-    pub flash_name: Option<String>,
-    pub flash_msg: Option<String>,
-    pub selected: Option<String>,
-    pub title: Option<String>,
-    pub saved_aps: Vec<String>,
-    pub wlan_ip: String,
-    pub wlan_networks: HashMap<String, AccessPoint>,
-    pub wlan_rssi: Option<String>,
-    pub wlan_ssid: String,
-    pub wlan_state: String,
-    pub wlan_status: Option<Status>,
-    pub wlan_traffic: Option<IfaceTraffic>,
-}
-
-impl NetworkDetailContext {
-    pub fn build() -> NetworkDetailContext {
-        let wlan_ip = match network::ip(&*WLAN_IFACE) {
-            Ok(Some(ip)) => ip,
-            _ => "x.x.x.x".to_string(),
-        };
-
-        // list of networks saved in wpa_supplicant.conf
-        let wlan_list = match network::saved_networks() {
-            Ok(Some(ssids)) => ssids,
-            _ => Vec::new(),
-        };
-
-        // list of networks saved in wpa_supplicant.conf
-        let saved_aps = wlan_list.clone();
-
-        let wlan_rssi = match network::rssi_percent(&*WLAN_IFACE) {
-            Ok(rssi) => rssi,
-            Err(_) => None,
-        };
-
-        // list of networks currently in range (online & accessible)
-        let wlan_scan = match network::available_networks(&*WLAN_IFACE) {
-            Ok(Some(networks)) => networks,
-            _ => Vec::new(),
-        };
-
-        let wlan_ssid = match network::ssid(&*WLAN_IFACE) {
-            Ok(Some(ssid)) => ssid,
-            _ => "Not connected".to_string(),
-        };
-
-        let wlan_state = match network::state(&*WLAN_IFACE) {
-            Ok(Some(state)) => state,
-            _ => "Interface unavailable".to_string(),
-        };
-
-        let wlan_status = match network::status(&*WLAN_IFACE) {
-            Ok(status) => status,
-            // interface unavailable
-            _ => None,
-        };
-
-        let wlan_traffic = match network::traffic(&*WLAN_IFACE) {
-            // convert bytes to mb or gb and add appropriate units
-            Ok(Some(traffic)) => convert_traffic(traffic),
-            _ => None,
-        };
-
-        // create a hashmap to combine wlan_list & wlan_scan without repetition
-        let mut wlan_networks = HashMap::new();
-
-        for ap in wlan_scan {
-            let ssid = ap.ssid.clone();
-            let rssi = ap.signal_level.clone();
-            // parse the string to a signed integer (for math)
-            let rssi_parsed = rssi.parse::<i32>().unwrap();
-            // perform rssi (dBm) to quality (%) conversion
-            let quality_percent = 2 * (rssi_parsed + 100);
-            let ap_detail = AccessPoint {
-                detail: Some(ap),
-                state: "Available".to_string(),
-                signal: Some(quality_percent),
-            };
-            wlan_networks.insert(ssid, ap_detail);
-        }
-
-        for network in wlan_list {
-            // avoid repetition by checking that ssid is not already in list
-            if !wlan_networks.contains_key(&network) {
-                let ssid = network.clone();
-                let net_detail = AccessPoint {
-                    detail: None,
-                    state: "Not in range".to_string(),
-                    signal: None,
-                };
-                wlan_networks.insert(ssid, net_detail);
-            }
-        }
-
-        NetworkDetailContext {
-            back: None,
-            flash_name: None,
-            flash_msg: None,
-            selected: None,
-            title: None,
-            saved_aps,
-            wlan_ip,
-            wlan_networks,
-            wlan_rssi,
-            wlan_ssid,
-            wlan_state,
-            wlan_status,
-            wlan_traffic,
-        }
-    }
-}
-
-#[derive(Debug, Serialize)]
-pub struct NetworkListContext {
-    pub ap_state: String,
-    pub back: Option<String>,
-    pub flash_name: Option<String>,
-    pub flash_msg: Option<String>,
-    pub title: Option<String>,
-    pub wlan_networks: HashMap<String, String>,
-    pub wlan_ssid: String,
-}
-
-impl NetworkListContext {
-    pub fn build() -> NetworkListContext {
-        // list of networks saved in wpa_supplicant.conf
-        let wlan_list = match network::saved_networks() {
-            Ok(Some(ssids)) => ssids,
-            _ => Vec::new(),
-        };
-
-        // list of networks currently in range (online & accessible)
-        let wlan_scan = match network::available_networks(&*WLAN_IFACE) {
-            Ok(Some(networks)) => networks,
-            _ => Vec::new(),
-        };
-
-        let wlan_ssid = match network::ssid(&*WLAN_IFACE) {
-            Ok(Some(ssid)) => ssid,
-            _ => "Not connected".to_string(),
-        };
-
-        // create a hashmap to combine wlan_list & wlan_scan without repetition
-        let mut wlan_networks = HashMap::new();
-        for ap in wlan_scan {
-            wlan_networks.insert(ap.ssid, "Available".to_string());
-        }
-        for network in wlan_list {
-            // insert ssid (with state) only if it doesn't already exist
-            wlan_networks
-                .entry(network)
-                .or_insert_with(|| "Not in range".to_string());
-        }
-
-        let ap_state = match network::state(&*AP_IFACE) {
-            Ok(Some(state)) => state,
-            _ => "Interface unavailable".to_string(),
-        };
-
-        NetworkListContext {
-            ap_state,
-            back: None,
-            flash_msg: None,
-            flash_name: None,
-            title: None,
-            wlan_networks,
-            wlan_ssid,
-        }
-    }
-}
-
-#[derive(Debug, Serialize)]
-pub struct NetworkStatusContext {
-    pub ap_ip: String,
-    pub ap_ssid: String,
-    pub ap_state: String,
-    pub ap_traffic: Option<IfaceTraffic>,
-    pub wlan_ip: String,
-    pub wlan_rssi: Option<String>,
-    pub wlan_ssid: String,
-    pub wlan_state: String,
-    pub wlan_status: Option<Status>,
-    pub wlan_traffic: Option<IfaceTraffic>,
-    pub flash_name: Option<String>,
-    pub flash_msg: Option<String>,
-    // passing in the ssid of a chosen access point
-    pub selected: Option<String>,
-    pub title: Option<String>,
-    pub back: Option<String>,
-}
-
-impl NetworkStatusContext {
-    pub fn build() -> Self {
-        let ap_ip = match network::ip(&*AP_IFACE) {
-            Ok(Some(ip)) => ip,
-            _ => "x.x.x.x".to_string(),
-        };
-
-        let ap_ssid = match network::ssid(&*AP_IFACE) {
-            Ok(Some(ssid)) => ssid,
-            _ => "Not currently activated".to_string(),
-        };
-
-        let ap_state = match network::state(&*AP_IFACE) {
-            Ok(Some(state)) => state,
-            _ => "Interface unavailable".to_string(),
-        };
-
-        let ap_traffic = match network::traffic(&*AP_IFACE) {
-            // convert bytes to mb or gb and add appropriate units
-            Ok(Some(traffic)) => convert_traffic(traffic),
-            _ => None,
-        };
-
-        let wlan_ip = match network::ip(&*WLAN_IFACE) {
-            Ok(Some(ip)) => ip,
-            _ => "x.x.x.x".to_string(),
-        };
-
-        let wlan_rssi = match network::rssi_percent(&*WLAN_IFACE) {
-            Ok(rssi) => rssi,
-            _ => None,
-        };
-
-        let wlan_ssid = match network::ssid(&*WLAN_IFACE) {
-            Ok(Some(ssid)) => ssid,
-            _ => "Not connected".to_string(),
-        };
-
-        let wlan_state = match network::state(&*WLAN_IFACE) {
-            Ok(Some(state)) => state,
-            _ => "Interface unavailable".to_string(),
-        };
-
-        let wlan_status = match network::status(&*WLAN_IFACE) {
-            Ok(status) => status,
-            _ => None,
-        };
-
-        let wlan_traffic = match network::traffic(&*WLAN_IFACE) {
-            // convert bytes to mb or gb and add appropriate units
-            Ok(Some(traffic)) => convert_traffic(traffic),
-            _ => None,
-        };
-
-        NetworkStatusContext {
-            ap_ip,
-            ap_ssid,
-            ap_state,
-            ap_traffic,
-            wlan_ip,
-            wlan_rssi,
-            wlan_ssid,
-            wlan_state,
-            wlan_status,
-            wlan_traffic,
-            flash_name: None,
-            flash_msg: None,
-            selected: None,
-            title: None,
-            back: None,
-        }
-    }
-}

peach-web/src/router.rs

@@ -6,137 +6,165 @@ use crate::routes::{
     catchers::*,
     index::*,
     scuttlebutt::*,
-    settings::{admin::*, dns::*, menu::*, network::*, scuttlebutt::*},
+    settings::{admin::*, dns::*, menu::*,
-    status::{device::*, network::*},
+               // network::*,
+               scuttlebutt::*},
+    // status::{device::*, network::*},
 };
 
-/// Create minimal rocket instance and mount routes. This excludes settings
-/// and status routes related to networking and the device (memory,
-/// hard disk, CPU etc.).
 pub fn build_minimal_rocket() -> Rocket<Build> {
     rocket::build()
-        // GENERAL HTML ROUTES
+            .mount(
-        .mount(
             "/",
             routes![
                 help,
                 home,
-                login,
+                login
-                login_post,
+            ])
-                logout,
+                .mount(
-                reboot_cmd,
-                shutdown_cmd,
-                power_menu,
-                settings_menu,
-            ],
-        )
-        // ADMIN SETTINGS HTML ROUTES
-        .mount(
-            "/settings/admin",
-            routes![
-                admin_menu,
-                configure_admin,
-                add_admin,
-                add_admin_post,
-                delete_admin_post,
-                change_password,
-                change_password_post,
-                reset_password,
-                reset_password_post,
-                forgot_password_page,
-                send_password_reset_post,
-            ],
-        )
-        // SCUTTLEBUTT SETTINGS HTML ROUTES
-        .mount("/settings/scuttlebutt", routes![ssb_settings_menu])
-        // SCUTTLEBUTT SOCIAL HTML ROUTES
-        .mount(
             "/scuttlebutt",
             routes![
                 peers, friends, follows, followers, blocks, profile, private, follow, unfollow,
                 block, publish,
             ],
         )
-        // STATUS HTML ROUTES
-        // TODO: replace this with a route for `scuttlebutt_status`
-        .mount("/status", routes![device_status, network_status])
         .mount("/", FileServer::from("static"))
-        .register("/", catchers![not_found, internal_error, forbidden])
+            .register("/", catchers![not_found, internal_error, forbidden])
-        .attach(Template::fairing())
+            .attach(Template::fairing())
 }
 
-/// Create complete rocket instance and mount all routes.
 pub fn build_complete_rocket() -> Rocket<Build> {
-    rocket::build()
+    build_minimal_rocket()
-        // GENERAL HTML ROUTES
-        .mount(
-            "/",
-            routes![
-                help,
-                home,
-                login,
-                login_post,
-                logout,
-                reboot_cmd,
-                shutdown_cmd,
-                power_menu,
-                settings_menu,
-            ],
-        )
-        // ADMIN SETTINGS HTML ROUTES
-        .mount(
-            "/settings/admin",
-            routes![
-                admin_menu,
-                configure_admin,
-                add_admin,
-                add_admin_post,
-                delete_admin_post,
-                change_password,
-                change_password_post,
-                reset_password,
-                reset_password_post,
-                forgot_password_page,
-                send_password_reset_post,
-            ],
-        )
-        // NETWORK SETTINGS HTML ROUTES
-        .mount(
-            "/settings/network",
-            routes![
-                add_credentials,
-                connect_wifi,
-                configure_dns,
-                configure_dns_post,
-                disconnect_wifi,
-                deploy_ap,
-                deploy_client,
-                forget_wifi,
-                network_home,
-                add_ssid,
-                add_wifi,
-                network_detail,
-                wifi_list,
-                wifi_password,
-                wifi_set_password,
-                wifi_usage,
-                wifi_usage_alerts,
-                wifi_usage_reset,
-            ],
-        )
-        // SCUTTLEBUTT SETTINGS HTML ROUTES
-        .mount("/settings/scuttlebutt", routes![ssb_settings_menu])
-        // SCUTTLEBUTT SOCIAL HTML ROUTES
-        .mount(
-            "/scuttlebutt",
-            routes![
-                peers, friends, follows, followers, blocks, profile, private, follow, unfollow,
-                block, publish,
-            ],
-        )
-        // STATUS HTML ROUTES
-        .mount("/status", routes![device_status, network_status])
-        .mount("/", FileServer::from("static"))
-        .register("/", catchers![not_found, internal_error, forbidden])
-        .attach(Template::fairing())
 }
+
+//
+// /// Create minimal rocket instance and mount routes. This excludes settings
+// /// and status routes related to networking and the device (memory,
+// /// hard disk, CPU etc.).
+// pub fn build_minimal_rocket() -> Rocket<Build> {
+//     rocket::build()
+//         // GENERAL HTML ROUTES
+//         .mount(
+//             "/",
+//             routes![
+//                 help,
+//                 home,
+//                 login,
+//                 login_post,
+//                 logout,
+//                 reboot_cmd,
+//                 shutdown_cmd,
+//                 power_menu,
+//                 settings_menu,
+//             ],
+//         )
+//         // ADMIN SETTINGS HTML ROUTES
+//         .mount(
+//             "/settings/admin",
+//             routes![
+//                 admin_menu,
+//                 configure_admin,
+//                 add_admin,
+//                 add_admin_post,
+//                 delete_admin_post,
+//                 change_password,
+//                 change_password_post,
+//                 reset_password,
+//                 reset_password_post,
+//                 forgot_password_page,
+//                 send_password_reset_post,
+//             ],
+//         )
+//         // SCUTTLEBUTT SETTINGS HTML ROUTES
+//         .mount("/settings/scuttlebutt", routes![ssb_settings_menu])
+//         // SCUTTLEBUTT SOCIAL HTML ROUTES
+//         .mount(
+//             "/scuttlebutt",
+//             routes![
+//                 peers, friends, follows, followers, blocks, profile, private, follow, unfollow,
+//                 block, publish,
+//             ],
+//         )
+//         // STATUS HTML ROUTES
+//         // TODO: replace this with a route for `scuttlebutt_status`
+//         .mount("/status", routes![device_status, network_status])
+//         .mount("/", FileServer::from("static"))
+//         .register("/", catchers![not_found, internal_error, forbidden])
+//         .attach(Template::fairing())
+// }
+//
+// /// Create complete rocket instance and mount all routes.
+// pub fn build_complete_rocket() -> Rocket<Build> {
+//     rocket::build()
+//         // GENERAL HTML ROUTES
+//         .mount(
+//             "/",
+//             routes![
+//                 help,
+//                 home,
+//                 login,
+//                 login_post,
+//                 logout,
+//                 reboot_cmd,
+//                 shutdown_cmd,
+//                 power_menu,
+//                 settings_menu,
+//             ],
+//         )
+//         // ADMIN SETTINGS HTML ROUTES
+//         .mount(
+//             "/settings/admin",
+//             routes![
+//                 admin_menu,
+//                 configure_admin,
+//                 add_admin,
+//                 add_admin_post,
+//                 delete_admin_post,
+//                 change_password,
+//                 change_password_post,
+//                 reset_password,
+//                 reset_password_post,
+//                 forgot_password_page,
+//                 send_password_reset_post,
+//             ],
+//         )
+//         // NETWORK SETTINGS HTML ROUTES
+//         .mount(
+//             "/settings/network",
+//             routes![
+//                 add_credentials,
+//                 connect_wifi,
+//                 configure_dns,
+//                 configure_dns_post,
+//                 disconnect_wifi,
+//                 deploy_ap,
+//                 deploy_client,
+//                 forget_wifi,
+//                 network_home,
+//                 add_ssid,
+//                 add_wifi,
+//                 network_detail,
+//                 wifi_list,
+//                 wifi_password,
+//                 wifi_set_password,
+//                 wifi_usage,
+//                 wifi_usage_alerts,
+//                 wifi_usage_reset,
+//             ],
+//         )
+//         // SCUTTLEBUTT SETTINGS HTML ROUTES
+//         .mount("/settings/scuttlebutt", routes![ssb_settings_menu])
+//         // SCUTTLEBUTT SOCIAL HTML ROUTES
+//         .mount(
+//             "/scuttlebutt",
+//             routes![
+//                 peers, friends, follows, followers, blocks, profile, private, follow, unfollow,
+//                 block, publish,
+//             ],
+//         )
+//         // STATUS HTML ROUTES
+//         .mount("/status", routes![device_status, network_status])
+//         .mount("/", FileServer::from("static"))
+//         .register("/", catchers![not_found, internal_error, forbidden])
+//         .attach(Template::fairing())
+// }

peach-web/src/routes/mod.rs

@@ -3,4 +3,4 @@ pub mod catchers;
 pub mod index;
 pub mod scuttlebutt;
 pub mod settings;
-pub mod status;
+// pub mod status;

peach-web/src/routes/settings/mod.rs

@@ -1,5 +1,5 @@
 pub mod admin;
 pub mod dns;
 pub mod menu;
-pub mod network;
+// pub mod network;
 pub mod scuttlebutt;