-
-
-
-
-
+
+
+
+
+
+
+
@@ -114,140 +118,6 @@ fn ExecuteButton() -> impl IntoView {
}
}
-#[component]
-fn DownloadButton() -> impl IntoView {
- let state = expect_context::
>();
-
- Effect::new(move || {
- state.exported().track();
-
- let Some(downloaded) = state.exported().write_untracked().take() else {
- return;
- };
- let filename = downloaded.filename;
- let buffer = downloaded.data;
- let array = js_sys::Array::new();
- array.push(&buffer);
-
- let blob = Blob::new_with_u8_array_sequence(&array).unwrap();
- let url = Url::create_object_url_with_blob(&blob).unwrap();
-
- let document = document();
- let a = document
- .create_element("a")
- .unwrap()
- .dyn_into::()
- .unwrap();
-
- a.set_href(&url);
- a.set_download(&filename);
- a.click();
-
- Url::revoke_object_url(&url).unwrap();
- });
-
- let on_click = move |_| {
- if let Some(worker) = &*state.worker().read() {
- worker.send_task(WorkerRequest::DownloadDb);
- }
- };
-
- view! { }
-}
-
-#[component]
-fn LoadButton(input_ref: NodeRef) -> impl IntoView {
- let state = expect_context::>();
-
- let (file, set_file) = signal::>>(None);
-
- Effect::new(move || {
- if let Some(file) = &*file.read() {
- let filename = file.name();
-
- if let Ok(reader) = FileReader::new() {
- let on_progress = FragileComfirmed::new(Closure::wrap(Box::new(
- move |ev: web_sys::ProgressEvent| {
- if ev.length_computable() {
- state.import_progress().set(Some(ImportProgress {
- filename: filename.clone(),
- loaded: ev.loaded(),
- total: ev.total(),
- opened: None,
- }));
- }
- },
- )
- as Box));
-
- let on_error = FragileComfirmed::new(Closure::wrap(Box::new(
- move |ev: web_sys::ProgressEvent| {
- let target = ev.target().unwrap();
- let reader = target.unchecked_into::();
- let dom_error = reader.error().unwrap();
- state.last_error().set(Some(FragileComfirmed::new(
- SQLightError::ImportDb(dom_error.message().to_string()),
- )));
- },
- )
- as Box));
-
- let on_load =
- FragileComfirmed::new(Closure::wrap(Box::new(move |ev: web_sys::Event| {
- let target = ev.target().unwrap();
- let reader = target.unchecked_into::();
- let result = reader.result().unwrap();
- let array_buffer = result.unchecked_into::();
- let data = js_sys::Uint8Array::new(&array_buffer);
- if let Some(worker) = &*state.worker().read() {
- worker.send_task(WorkerRequest::LoadDb(LoadDbOptions { data }));
- }
- })
- as Box));
-
- reader.set_onprogress(Some(on_progress.as_ref().unchecked_ref()));
- reader.set_onerror(Some(on_error.as_ref().unchecked_ref()));
- reader.set_onload(Some(on_load.as_ref().unchecked_ref()));
- reader.read_as_array_buffer(file).unwrap();
-
- on_cleanup(move || {
- drop(on_progress);
- drop(on_error);
- drop(on_load);
- });
- }
- }
- });
-
- let on_change = move |ev: Event| {
- if let Some(target) = ev.target() {
- let input = target.unchecked_into::();
- if let Some(files) = input.files() {
- if files.length() > 0 {
- let file = FragileComfirmed::new(files.get(0).unwrap());
- set_file.set(Some(file));
- } else {
- set_file.set(None);
- }
- }
- }
- };
-
- let on_click = move |_| {
- if let Some(input) = &*input_ref.read() {
- if input.onchange().is_none() {
- let callback = Closure::wrap(Box::new(on_change) as Box);
- input.set_onchange(Some(callback.as_ref().unchecked_ref::()));
- callback.forget();
- }
- input.set_value("");
- input.click();
- }
- };
-
- view! { }
-}
-
#[component]
fn VfsMenuButton(menu_container: NodeRef) -> impl IntoView {
let state = expect_context::>();
@@ -337,6 +207,173 @@ fn AdvancedOptionsMenuButton(menu_container: NodeRef) -> imp
}
}
+#[component]
+fn ToolsButton(menu_container: NodeRef) -> impl IntoView {
+ let button = |toggle, node_ref| {
+ view! {
+
+ }
+ .into_any()
+ };
+
+ view! {
+ }.into_any() })
+ menu_container=menu_container
+ >
+ }
+}
+
+#[component]
+fn DatabaseButton(
+ input_ref: NodeRef,
+ menu_container: NodeRef,
+) -> impl IntoView {
+ let state = expect_context::>();
+
+ let button = |toggle, node_ref| {
+ view! {
+
+ }
+ .into_any()
+ };
+
+ let (file, set_file) = signal::>>(None);
+
+ Effect::new(move || {
+ if let Some(file) = &*file.read() {
+ let filename = file.name();
+
+ if let Ok(reader) = FileReader::new() {
+ let on_progress = FragileComfirmed::new(Closure::wrap(Box::new(
+ move |ev: web_sys::ProgressEvent| {
+ if ev.length_computable() {
+ state.import_progress().set(Some(ImportProgress {
+ filename: filename.clone(),
+ loaded: ev.loaded(),
+ total: ev.total(),
+ opened: None,
+ }));
+ }
+ },
+ )
+ as Box));
+
+ let on_error = FragileComfirmed::new(Closure::wrap(Box::new(
+ move |ev: web_sys::ProgressEvent| {
+ let target = ev.target().unwrap();
+ let reader = target.unchecked_into::();
+ let dom_error = reader.error().unwrap();
+ state.last_error().set(Some(FragileComfirmed::new(
+ SQLightError::ImportDb(dom_error.message().to_string()),
+ )));
+ },
+ )
+ as Box));
+
+ let on_load =
+ FragileComfirmed::new(Closure::wrap(Box::new(move |ev: web_sys::Event| {
+ let target = ev.target().unwrap();
+ let reader = target.unchecked_into::();
+ let result = reader.result().unwrap();
+ let array_buffer = result.unchecked_into::();
+ let data = js_sys::Uint8Array::new(&array_buffer);
+ if let Some(worker) = &*state.worker().read_untracked() {
+ worker.send_task(WorkerRequest::LoadDb(LoadDbOptions { data }));
+ }
+ })
+ as Box));
+
+ reader.set_onprogress(Some(on_progress.as_ref().unchecked_ref()));
+ reader.set_onerror(Some(on_error.as_ref().unchecked_ref()));
+ reader.set_onload(Some(on_load.as_ref().unchecked_ref()));
+ reader.read_as_array_buffer(file).unwrap();
+
+ on_cleanup(move || {
+ drop(on_progress);
+ drop(on_error);
+ drop(on_load);
+ });
+ }
+ }
+ });
+
+ let on_change = move |ev: Event| {
+ if let Some(target) = ev.target() {
+ let input = target.unchecked_into::();
+ if let Some(files) = input.files() {
+ if files.length() > 0 {
+ let file = FragileComfirmed::new(files.get(0).unwrap());
+ set_file.set(Some(file));
+ } else {
+ set_file.set(None);
+ }
+ }
+ }
+ };
+
+ let on_load = move |_: MouseEvent| {
+ if let Some(input) = &*input_ref.read() {
+ if input.onchange().is_none() {
+ let callback = Closure::wrap(Box::new(on_change) as Box);
+ input.set_onchange(Some(callback.as_ref().unchecked_ref::()));
+ callback.forget();
+ }
+ input.set_value("");
+ input.click();
+ }
+ };
+
+ Effect::new(move || {
+ state.exported().track();
+
+ let Some(downloaded) = state.exported().write_untracked().take() else {
+ return;
+ };
+ let filename = downloaded.filename;
+ let buffer = downloaded.data;
+ let array = js_sys::Array::new();
+ array.push(&buffer);
+
+ let blob = Blob::new_with_u8_array_sequence(&array).unwrap();
+ let url = Url::create_object_url_with_blob(&blob).unwrap();
+
+ let document = document();
+ let a = document
+ .create_element("a")
+ .unwrap()
+ .dyn_into::()
+ .unwrap();
+
+ a.set_href(&url);
+ a.set_download(&filename);
+ a.click();
+
+ Url::revoke_object_url(&url).unwrap();
+ });
+
+ let on_download = move |_| {
+ if let Some(worker) = &*state.worker().read() {
+ worker.send_task(WorkerRequest::DownloadDb);
+ }
+ };
+
+ view! {
+ }.into_any()
+ })
+ menu_container=menu_container
+ >
+ }
+}
+
#[component]
fn ShareButton() -> impl IntoView {
let state = expect_context::>();
diff --git a/src/app/menu_aside.rs b/src/app/menu_aside.rs
new file mode 100644
index 0000000..ac50e55
--- /dev/null
+++ b/src/app/menu_aside.rs
@@ -0,0 +1,9 @@
+use istyles::istyles;
+use leptos::prelude::*;
+
+istyles!(styles, "assets/module.postcss/menu_aside.module.css.map");
+
+#[component]
+pub fn MenuAside(children: Children) -> impl IntoView {
+ view! { {children()}
}
+}
diff --git a/src/app/mod.rs b/src/app/mod.rs
index 1b24d4e..f5390ad 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -1,12 +1,15 @@
mod advanced_options_menu;
+mod button_menu_item;
mod button_set;
mod config_element;
mod config_menu;
mod context_menu;
+mod database_menu;
mod editor;
mod header;
mod icon;
mod loader;
+mod menu_aside;
mod menu_group;
mod menu_item;
mod output;
@@ -15,6 +18,7 @@ mod pop_button;
mod select_one;
mod selectable_menu_item;
mod state;
+mod tools_menu;
mod vfs_menu;
pub use playground::playground;
diff --git a/src/app/state.rs b/src/app/state.rs
index 77a6148..2c88fff 100644
--- a/src/app/state.rs
+++ b/src/app/state.rs
@@ -20,7 +20,7 @@ INSERT INTO blobs(data) VALUES (randomblob(12));
SELECT 'Hello World!',
datetime('now','localtime') AS TM,
- x'73716c69676874' AS BLOB_VAL,
+ unhex('73716c69676874') AS BLOB_VAL,
NULL as NULL_VAL;
SELECT * FROM blobs;";
diff --git a/src/app/tools_menu.rs b/src/app/tools_menu.rs
new file mode 100644
index 0000000..423d056
--- /dev/null
+++ b/src/app/tools_menu.rs
@@ -0,0 +1,41 @@
+use leptos::prelude::*;
+use reactive_stores::Store;
+use sqlformat::{FormatOptions, QueryParams};
+
+use crate::app::{
+ GlobalState, GlobalStateStoreFields, button_menu_item::ButtonMenuItem, menu_aside::MenuAside,
+ menu_group::MenuGroup,
+};
+
+#[component]
+pub fn ToolsMenu() -> impl IntoView {
+ let state = expect_context::>();
+ let format = move |_event| {
+ let Some(editor) = &*state.editor().read() else {
+ return;
+ };
+
+ let format_options = FormatOptions {
+ uppercase: Some(true),
+ lines_between_queries: 2,
+ ..Default::default()
+ };
+
+ let sql = sqlformat::format(
+ &editor.get_value(),
+ &QueryParams::default(),
+ &format_options,
+ );
+
+ editor.set_value(sql);
+ };
+
+ view! {
+
+
+ Format this code with sqlformat.
+ "https://crates.io/crates/sqlformat"
+
+
+ }
+}