css fixes

rust/src/webserver/webserver.rs

@@ -1,11 +1,11 @@
 //offer ota and config mode
 
 use std::{
-    io::{BufRead, BufReader, Read, Write},
     str::from_utf8,
     sync::{atomic::AtomicBool, Arc},
 };
 
+use esp_idf_svc::io::BufRead;
 use crate::{
     espota::OtaUpdate, get_version, map_range_moisture, plant_hal::FileInfo, BOARD_ACCESS,
 };
@@ -242,7 +242,7 @@ fn flash_bq(filename: &str, dryrun: bool) -> anyhow::Result<()> {
 
     let file_handle = board.get_file_handle(filename, false)?;
 
-    let mut reader = BufReader::with_capacity(512, file_handle).lines();
+    let mut reader = std::io::BufRead::lines(std::io::BufReader::with_capacity(512, file_handle));
     let mut line = 0;
     loop {
         board.general_fault(toggle);
@@ -373,7 +373,7 @@ pub fn httpd(_reboot_now: Arc<AtomicBool>) -> Box<EspHttpServer<'static>> {
                     let mut buffer: [u8; BUFFER_SIZE] = [0; BUFFER_SIZE];
                     let mut total_read: usize = 0;
                     loop {
-                        let read = file_handle.read(&mut buffer)?;
+                        let read = std::io::Read::read(&mut file_handle, &mut buffer)?;
                         total_read += read;
                         println!(
                             "sending {read} bytes of {total_read} for file {}",
@@ -416,7 +416,7 @@ pub fn httpd(_reboot_now: Arc<AtomicBool>) -> Box<EspHttpServer<'static>> {
                         total_read += read;
                         println!("sending {read} bytes of {total_read} for upload {filename}");
                         let to_write = &buffer[0..read];
-                        file_handle.write(to_write)?;
+                        std::io::Write::write(&mut file_handle, to_write)?;
                         println!("wrote {read} bytes of {total_read} for upload {filename}");
                         if read == 0 {
                             break;
@@ -508,9 +508,12 @@ pub fn httpd(_reboot_now: Arc<AtomicBool>) -> Box<EspHttpServer<'static>> {
         .unwrap();
     server
         .fn_handler("/bootstrap-grid.css", Method::Get, |request| {
-            request
-                .into_ok_response()?
-                .write(include_bytes!("bootstrap-grid.css"))?;
+            let headers = [
+                ("Access-Control-Allow-Origin", "*"),
+                ("Access-Control-Allow-Headers", "*"),
+                ("Content-Type", "text/css")
+            ];
+            request.into_response(200, None, &headers)?.write(include_bytes!("bootstrap-grid.css"))?;               
             anyhow::Ok(())
         })
         .unwrap();