Fix import bug

opensourcecheemsburgers · Jun 5, 2023 · 52b6b92 · 52b6b92
1 parent cdfc467
commit 52b6b92
Show file tree

Hide file tree

Showing 74 changed files with 16 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ Cargo.lock
 src-tauri/target/
 src-tauri/Cargo.lock
 src-tauri/.idea/
+src-tauri/icons
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/README.md b/README.md
diff --git a/frontend/Cargo.toml b/frontend/Cargo.toml
diff --git a/frontend/css/fonts.css b/frontend/css/fonts.css
diff --git a/frontend/css/input.css b/frontend/css/input.css
diff --git a/frontend/css/scrollbar.css b/frontend/css/scrollbar.css
diff --git a/frontend/css/textarea.css b/frontend/css/textarea.css
diff --git a/frontend/fonts/comfortaa.woff2 b/frontend/fonts/comfortaa.woff2
diff --git a/frontend/fonts/inconsolata.woff2 b/frontend/fonts/inconsolata.woff2
diff --git a/frontend/img/404.json b/frontend/img/404.json
diff --git a/frontend/index_desktop.html b/frontend/index_desktop.html
diff --git a/frontend/index_web.html b/frontend/index_web.html
diff --git a/frontend/package.json b/frontend/package.json
diff --git a/frontend/src/components/container.rs b/frontend/src/components/container.rs
diff --git a/frontend/src/components/divider.rs b/frontend/src/components/divider.rs
diff --git a/frontend/src/components/dual_view.rs b/frontend/src/components/dual_view.rs
diff --git a/frontend/src/components/header.rs b/frontend/src/components/header.rs
diff --git a/frontend/src/components/link_btn.rs b/frontend/src/components/link_btn.rs
diff --git a/frontend/src/components/markdown_input.rs b/frontend/src/components/markdown_input.rs
diff --git a/frontend/src/components/markdown_preview.rs b/frontend/src/components/markdown_preview.rs
diff --git a/frontend/src/components/mod.rs b/frontend/src/components/mod.rs
diff --git a/frontend/src/components/modal.rs b/frontend/src/components/modal.rs
diff --git a/frontend/src/components/single_view.rs b/frontend/src/components/single_view.rs
diff --git a/frontend/src/components/theme_card.rs b/frontend/src/components/theme_card.rs
diff --git a/frontend/src/components/tooltip.rs b/frontend/src/components/tooltip.rs
diff --git a/frontend/src/components/welcome_hero.rs b/frontend/src/components/welcome_hero.rs
diff --git a/frontend/src/contexts/config.rs b/frontend/src/contexts/config.rs
diff --git a/frontend/src/contexts/markdown.rs b/frontend/src/contexts/markdown.rs
@@ -10,6 +10,8 @@ use yew::prelude::*;
 use gloo::storage::LocalStorage;
 use gloo::storage::Storage;
 
+pub const MD_KEY: AttrValue = AttrValue::Static("md_key");
+
 #[derive(Clone, Debug, PartialEq)]
 pub struct Markdown {
     pub text: AttrValue,
@@ -26,12 +28,12 @@ impl Markdown {
     }
 
     fn load_from_storage() -> Option<Markdown> {
-        let load_result: Result<String, StorageError> = LocalStorage::get(DOCS_KEY);
+        let load_result: Result<String, StorageError> = LocalStorage::get(MD_KEY);
 
         match load_result {
             Ok(item) => {
                 let text = AttrValue::from(item);
-                Some(Markdown::from(text, DOCS_KEY))
+                Some(Markdown::from(text, MD_KEY))
             }, 
             Err(err) => {
                 log!("Err: {}", err.to_string());
@@ -54,7 +56,7 @@ impl MarkdownContext {
     }
 
     pub fn update_markdown(&self, text: AttrValue) -> Result<(), UbiquityError> {
-        let markdown = Markdown::from(text.clone(), DOCS_KEY);
+        let markdown = Markdown::from(text.clone(), MD_KEY);
         self.inner.set(markdown);
         self.save_to_browser_storage(text)?;
         Ok(())
@@ -91,7 +93,7 @@ impl MarkdownContext {
 
             let read_file: String = tauri_sys::tauri::invoke("read_file", &MarkdownPath {path}).await.unwrap();
             let text: AttrValue = AttrValue::from(read_file);
-            let key: AttrValue = AttrValue::from("read_file_md");
+            let key: AttrValue = MD_KEY;
             ctx_clone.add_markdown(Markdown::from(text, key));
         });
         Ok(())

diff --git a/frontend/src/contexts/mod.rs b/frontend/src/contexts/mod.rs
diff --git a/frontend/src/contexts/modals.rs b/frontend/src/contexts/modals.rs
diff --git a/frontend/src/errors/mod.rs b/frontend/src/errors/mod.rs
diff --git a/frontend/src/icons/mod.rs b/frontend/src/icons/mod.rs
diff --git a/frontend/src/main.rs b/frontend/src/main.rs
diff --git a/frontend/src/pages/about.rs b/frontend/src/pages/about.rs
diff --git a/frontend/src/pages/background.rs b/frontend/src/pages/background.rs
diff --git a/frontend/src/pages/home.rs b/frontend/src/pages/home.rs
diff --git a/frontend/src/pages/mod.rs b/frontend/src/pages/mod.rs
diff --git a/frontend/src/pages/settings.rs b/frontend/src/pages/settings.rs
diff --git a/frontend/src/pages/welcome.rs b/frontend/src/pages/welcome.rs
diff --git a/frontend/src/strings/strings.ron b/frontend/src/strings/strings.ron
diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
diff --git a/screenshots/ubi.png b/screenshots/ubi.png
diff --git a/screenshots/ubi_about.png b/screenshots/ubi_about.png
diff --git a/screenshots/ubi_settings.png b/screenshots/ubi_settings.png
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
diff --git a/src-tauri/build.rs b/src-tauri/build.rs
diff --git a/src-tauri/icons/128x128.png b/src-tauri/icons/128x128.png
diff --git a/src-tauri/icons/[email protected] b/src-tauri/icons/[email protected]
diff --git a/src-tauri/icons/32x32.png b/src-tauri/icons/32x32.png
diff --git a/src-tauri/icons/Square107x107Logo.png b/src-tauri/icons/Square107x107Logo.png
diff --git a/src-tauri/icons/Square142x142Logo.png b/src-tauri/icons/Square142x142Logo.png
diff --git a/src-tauri/icons/Square150x150Logo.png b/src-tauri/icons/Square150x150Logo.png
diff --git a/src-tauri/icons/Square284x284Logo.png b/src-tauri/icons/Square284x284Logo.png
diff --git a/src-tauri/icons/Square30x30Logo.png b/src-tauri/icons/Square30x30Logo.png
diff --git a/src-tauri/icons/Square310x310Logo.png b/src-tauri/icons/Square310x310Logo.png
diff --git a/src-tauri/icons/Square44x44Logo.png b/src-tauri/icons/Square44x44Logo.png
diff --git a/src-tauri/icons/Square71x71Logo.png b/src-tauri/icons/Square71x71Logo.png
diff --git a/src-tauri/icons/Square89x89Logo.png b/src-tauri/icons/Square89x89Logo.png
diff --git a/src-tauri/icons/StoreLogo.png b/src-tauri/icons/StoreLogo.png
diff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns
diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico
diff --git a/src-tauri/icons/icon.png b/src-tauri/icons/icon.png
diff --git a/src-tauri/icons/icon.svg b/src-tauri/icons/icon.svg
diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -7,8 +7,8 @@
         "withGlobalTauri": true
     },
     "package": {
-        "productName": "ubiquity",
-        "version": "0.0.1"
+        "productName": "Ubiquity",
+        "version": "0.1.0"
     },
     "tauri": {
         "allowlist": {
@@ -85,7 +85,7 @@
             }
         },
         "security": {
-            "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'wasm-unsafe-eval' 'unsafe-eval' 'unsafe-inline' 'self'; script-src blob: data: filesystem: ws: wss: http: https: tauri: 'wasm-unsafe-eval' 'unsafe-eval' 'unsafe-inline' 'self'"
+            "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'wasm-unsafe-eval' 'self'; script-src blob: data: filesystem: ws: wss: http: https: tauri: 'wasm-unsafe-eval' 'self'"
         },
         "updater": {
             "active": false

diff --git a/ubi-crates/config/Cargo.toml b/ubi-crates/config/Cargo.toml
diff --git a/ubi-crates/config/src/error.rs b/ubi-crates/config/src/error.rs
diff --git a/ubi-crates/config/src/lib.rs b/ubi-crates/config/src/lib.rs
diff --git a/ubi-crates/error/Cargo.toml b/ubi-crates/error/Cargo.toml
diff --git a/ubi-crates/error/src/lib.rs b/ubi-crates/error/src/lib.rs