Get the coordinates storing and fetching

Author: Ruslan

.devcontainer/Dockerfile

@@ -20,4 +20,4 @@ RUN rustup component add rustfmt
 RUN rustup target add wasm32-unknown-unknown
 
 RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
-RUN cargo binstall -y wasm-pack
+RUN cargo binstall -y trunk

Cargo.lock

@@ -20,6 +20,7 @@ serde_json = "1.0.140"
 serde_urlencoded = "0.7.1"
 slint = { version = "1.12.1", features = ["gettext"] }
 wasm-bindgen = "0.2.100"
+wasm-bindgen-futures = "0.4.50"
 web-sys = { version = "0.3.77", features = ["HtmlFormElement", "Storage"] }
 yew = { version = "0.21.0", features = ["csr"] }
 yew-hooks = "0.3.3"

Cargo.toml

@@ -1,5 +1,5 @@
-use serde::Deserialize;
-use web_sys::{Storage, Window};
+use serde::{Deserialize, Serialize};
+use web_sys::Window;
 
 use crate::{Api, Coordinates};
 
@@ -9,6 +9,12 @@ struct GeoLocationApiData {
     longitude: f32,
 }
 
+#[derive(Debug, Clone, PartialEq, Deserialize, Default, Serialize)]
+struct LocationStorage {
+    latitude: f32,
+    longitude: f32,
+}
+
 const STORAGE_KEY: &str = "coordinates";
 
 async fn fetch_location() -> GeoLocationApiData {
@@ -30,11 +36,15 @@ fn fetch_from_local(key: &str) -> Option<Coordinates> {
     if let Some(storage) = maybe_storage {
         let maybe_data = storage.get_item(key).unwrap();
         if let Some(data) = maybe_data {
-            let coordinates_result: Result<Coordinates, serde_json::Error> =
+            let coordinates_result: Result<LocationStorage, serde_json::Error> =
                 serde_json::from_str(&data);
 
             if coordinates_result.is_ok() {
-                return Some(coordinates_result.unwrap());
+                let location_storage = coordinates_result.unwrap();
+                return Some(Coordinates {
+                    latitude: location_storage.latitude,
+                    longitude: location_storage.longitude,
+                });
             }
         }
     }
@@ -45,7 +55,12 @@ fn store_into_local(key: &str, coordinates: Coordinates) {
     let window: Window = web_sys::window().unwrap();
     let maybe_storage = window.local_storage().unwrap();
     if let Some(storage) = maybe_storage {
-        let data_string = serde_json::to_string(&coordinates).unwrap();
+        let location_storage = LocationStorage {
+            latitude: coordinates.latitude,
+            longitude: coordinates.longitude,
+        };
+
+        let data_string = serde_json::to_string(&location_storage).unwrap();
         storage.set_item(key, &data_string).unwrap();
     }
 }
@@ -56,6 +71,7 @@ pub async fn set_location(api: Api<'_>) {
 
     if let Some(local) = from_location {
         api.set_coordinates(local);
+        return;
     }
 
     let data = fetch_location().await;

src/location.rs

@@ -2,7 +2,7 @@ use slint::{Timer, TimerMode};
 use std::sync::Arc;
 use wasm_bindgen::prelude::wasm_bindgen;
 
-use crate::{bins::set_bins, clock::set_time};
+use crate::{bins::set_bins, clock::set_time, location::set_location};
 
 mod bins;
 mod clock;
@@ -12,7 +12,7 @@ mod weather;
 slint::include_modules!();
 
 #[wasm_bindgen(main)]
-pub fn main() {
+pub async fn main() {
     // This provides better error messages in debug mode.
     // It's disabled in release mode so it doesn't bloat up the file size.
     #[cfg(all(debug_assertions, target_arch = "wasm32"))]
@@ -50,6 +50,7 @@ pub fn main() {
     let app_now = Arc::clone(&app_arc);
     if let Some(app) = app_now.upgrade() {
         set_bins(app.global::<Api>());
+        set_location(app.global::<Api>()).await;
     }
 
     app.run().expect("AppWindow::run() failed");

src/main.rs

@@ -1,6 +1,6 @@
 use serde::Deserialize;
 
-use crate::{location::Coordinates, Api};
+use crate::{Api, Coordinates};
 
 // Easier to deal with a single 'variable'
 #[derive(Debug, PartialEq, Clone)]

src/weather.rs

@@ -28,6 +28,14 @@ export component App inherits Window {
             }
         }
 
-        HorizontalLayout { }
+        HorizontalLayout {
+
+            Text {
+                text:  "longitude: " +Api.coordinates.longitude;
+            }
+            Text {
+                text:  "latitude: " +Api.coordinates.latitude;
+            }
+        }
     }
 }