Merge pull request #151 from Web3-Builders-Alliance/main

Web3-Builders-Alliance · Jul 27, 2023 · 5549f99 · 5549f99
2 parents 807aa41 + 4264d06
commit 5549f99
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 11 deletions.
diff --git a/crate/Cargo.lock b/crate/Cargo.lock
diff --git a/crate/Cargo.toml b/crate/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "soda_sol"
-version = "0.0.6"
+version = "0.0.7"
 edition = "2021"
 license = "Apache-2.0"
 description = "Generates Solana Projects from an IDL"

diff --git a/ui/context/IDL/index.tsx b/ui/context/IDL/index.tsx
@@ -37,13 +37,15 @@ const IDLProvider = ({ children }: { children: ReactNode }) => {
       .then(() => {
         if (IDL.name === "Chewing Glass") {
           invoke("new_window", { target: "bubbles" }).catch(async (e) => {
-            await message(e, { title: "Error", type: "error" });
+            console.log(e)
+            await message(e?.error ?? "Error open more windows", { title: "Error", type: "error" });
           });
         }
         setIDL(IDL);
       })
       .catch(async (e) => {
-        await message(e, { title: "Error", type: "error" });
+        console.log(e)
+        await message(e?.error ?? "Error setting IDL", { title: "Error", type: "error" });
       });
   };
 

diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ui",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "private": true,
   "scripts": {
     "dev": "next dev",

diff --git a/ui/src-tauri/Cargo.lock b/ui/src-tauri/Cargo.lock
diff --git a/ui/src-tauri/Cargo.toml b/ui/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "soda"
-version = "0.1.1"
+version = "0.1.2"
 description = "Generates source code from an IDL"
 authors = ["Juan Patricio Marchetto"]
 license = "Apache-2.0"
@@ -19,7 +19,7 @@ tauri = { version = "1.2.5", features = ["dialog-all", "fs-create-dir", "fs-read
 serde_json = "1.0.93"
 serde = "1.0.164"
 thiserror = "1.0.40"
-soda_sol = { path="../../crate"}
+soda_sol = "0.0.7"
 
 [features]
 # by default Tauri runs in production mode

diff --git a/ui/src-tauri/src/error.rs b/ui/src-tauri/src/error.rs
@@ -1,5 +1,5 @@
 use std::sync::{MutexGuard, PoisonError};
-
+use std::time::SystemTimeError;
 use crate::StateStruct;
 
 #[derive(thiserror::Error, Debug)]
@@ -59,3 +59,11 @@ impl From<tauri::Error> for Error {
         }
     }
 }
+
+impl From<SystemTimeError> for Error {
+    fn from(err: SystemTimeError) -> Error {
+        Error::CustomError {
+            message: err.to_string(),
+        }
+    }
+}
diff --git a/ui/src-tauri/src/new_window.rs b/ui/src-tauri/src/new_window.rs
@@ -1,8 +1,9 @@
+use std::time::{SystemTime, UNIX_EPOCH};
 use crate::*;
 
 #[tauri::command]
 pub async fn new_window(handle: tauri::AppHandle, target: &str) -> Result<(), Error> {
-    tauri::WindowBuilder::new(&handle, target, tauri::WindowUrl::App(target.into()))
+    tauri::WindowBuilder::new(&handle, format!("{}{}", target, SystemTime::now().duration_since(UNIX_EPOCH)?.subsec_nanos()), tauri::WindowUrl::App(target.into()))
         .title(target)
         .inner_size(800.0, 700.0)
         .build()?;

diff --git a/ui/src-tauri/tauri.conf.json b/ui/src-tauri/tauri.conf.json
@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "soda",
-    "version": "0.1.1"
+    "version": "0.1.2"
   },
   "tauri": {
     "allowlist": {