diff --git a/theseus_gui/package.json b/theseus_gui/package.json index 198fc6b5c..7a70c6d97 100644 --- a/theseus_gui/package.json +++ b/theseus_gui/package.json @@ -15,7 +15,7 @@ "dependencies": { "@tauri-apps/api": "^1.2.0", "ofetch": "^1.0.1", - "omorphia": "^0.4.16", + "omorphia": "^0.4.17", "pinia": "^2.0.33", "vite-svg-loader": "^4.0.0", "vue": "^3.2.45", diff --git a/theseus_gui/src-tauri/src/api/mod.rs b/theseus_gui/src-tauri/src/api/mod.rs index 3905de054..6cd337f68 100644 --- a/theseus_gui/src-tauri/src/api/mod.rs +++ b/theseus_gui/src-tauri/src/api/mod.rs @@ -13,15 +13,15 @@ pub mod profile_create; pub mod settings; pub mod tags; -pub type Result = std::result::Result; +pub type Result = std::result::Result; -// Main returnable Theseus GUI error -// Needs to be Serializable to be returned to the JavaScript side -#[derive(Error, Debug, Serialize)] -pub enum TheseusGuiError { - #[error(transparent)] - Serializable(TheseusSerializableError), -} +// // Main returnable Theseus GUI error +// // Needs to be Serializable to be returned to the JavaScript side +// #[derive(Error, Debug, Serialize)] +// pub enum TheseusGuiError { +// #[error(transparent)] +// Serializable(), +// } // Serializable error intermediary, so TheseusGuiError can be Serializable (eg: so that we can return theseus::Errors in Tauri directly) #[derive(Error, Debug)] @@ -34,14 +34,14 @@ pub enum TheseusSerializableError { } // Generic implementation of From for ErrorTypeA -impl From for TheseusGuiError -where - TheseusSerializableError: From, -{ - fn from(error: T) -> Self { - TheseusGuiError::Serializable(TheseusSerializableError::from(error)) - } -} +// impl From for TheseusGuiError +// where +// TheseusSerializableError: From, +// { +// fn from(error: T) -> Self { +// TheseusGuiError::Serializable(TheseusSerializableError::from(error)) +// } +// } // Lists active progress bars // Create a new HashMap with the same keys diff --git a/theseus_gui/src/App.vue b/theseus_gui/src/App.vue index fc9109196..7f590efaf 100644 --- a/theseus_gui/src/App.vue +++ b/theseus_gui/src/App.vue @@ -1,8 +1,16 @@