.
This commit is contained in:
51
Cargo.lock
generated
51
Cargo.lock
generated
@@ -1228,7 +1228,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collections"
|
name = "collections"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"gpui_util",
|
"gpui_util",
|
||||||
"indexmap",
|
"indexmap",
|
||||||
@@ -1710,7 +1710,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "derive_refineable"
|
name = "derive_refineable"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
@@ -2605,7 +2605,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui"
|
name = "gpui"
|
||||||
version = "0.2.2"
|
version = "0.2.2"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"accesskit",
|
"accesskit",
|
||||||
"anyhow",
|
"anyhow",
|
||||||
@@ -2687,7 +2687,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_linux"
|
name = "gpui_linux"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"accesskit",
|
"accesskit",
|
||||||
"accesskit_unix",
|
"accesskit_unix",
|
||||||
@@ -2739,7 +2739,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_macos"
|
name = "gpui_macos"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"accesskit",
|
"accesskit",
|
||||||
"accesskit_macos",
|
"accesskit_macos",
|
||||||
@@ -2788,7 +2788,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_macros"
|
name = "gpui_macros"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"heck 0.5.0",
|
"heck 0.5.0",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
@@ -2799,7 +2799,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_platform"
|
name = "gpui_platform"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"console_error_panic_hook",
|
"console_error_panic_hook",
|
||||||
"gpui",
|
"gpui",
|
||||||
@@ -2812,7 +2812,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_shared_string"
|
name = "gpui_shared_string"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"schemars",
|
"schemars",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -2822,7 +2822,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_tokio"
|
name = "gpui_tokio"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"gpui",
|
"gpui",
|
||||||
@@ -2833,7 +2833,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_util"
|
name = "gpui_util"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"log",
|
"log",
|
||||||
@@ -2843,7 +2843,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_web"
|
name = "gpui_web"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"console_error_panic_hook",
|
"console_error_panic_hook",
|
||||||
@@ -2855,7 +2855,6 @@ dependencies = [
|
|||||||
"log",
|
"log",
|
||||||
"parking_lot",
|
"parking_lot",
|
||||||
"raw-window-handle",
|
"raw-window-handle",
|
||||||
"smallvec",
|
|
||||||
"uuid",
|
"uuid",
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
"wasm-bindgen-futures",
|
"wasm-bindgen-futures",
|
||||||
@@ -2867,7 +2866,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_wgpu"
|
name = "gpui_wgpu"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
@@ -2897,7 +2896,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_windows"
|
name = "gpui_windows"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"accesskit",
|
"accesskit",
|
||||||
"accesskit_windows",
|
"accesskit_windows",
|
||||||
@@ -3187,7 +3186,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "http_client"
|
name = "http_client"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-compression",
|
"async-compression",
|
||||||
@@ -3207,7 +3206,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "http_client_tls"
|
name = "http_client_tls"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"rustls",
|
"rustls",
|
||||||
"rustls-platform-verifier",
|
"rustls-platform-verifier",
|
||||||
@@ -4002,7 +4001,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "media"
|
name = "media"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bindgen",
|
"bindgen",
|
||||||
@@ -4905,7 +4904,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "perf"
|
name = "perf"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"collections",
|
"collections",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -5716,7 +5715,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "refineable"
|
name = "refineable"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"derive_refineable",
|
"derive_refineable",
|
||||||
]
|
]
|
||||||
@@ -5798,7 +5797,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "reqwest_client"
|
name = "reqwest_client"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bytes",
|
"bytes",
|
||||||
@@ -6113,7 +6112,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "scheduler"
|
name = "scheduler"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-task",
|
"async-task",
|
||||||
"backtrace",
|
"backtrace",
|
||||||
@@ -6736,7 +6735,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "sum_tree"
|
name = "sum_tree"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"heapless 0.9.3",
|
"heapless 0.9.3",
|
||||||
"log",
|
"log",
|
||||||
@@ -7736,7 +7735,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "util_macros"
|
name = "util_macros"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"perf",
|
"perf",
|
||||||
"quote",
|
"quote",
|
||||||
@@ -9469,7 +9468,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "zlog"
|
name = "zlog"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"chrono",
|
"chrono",
|
||||||
@@ -9486,7 +9485,7 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "ztracing"
|
name = "ztracing"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"tracing",
|
"tracing",
|
||||||
"tracing-subscriber",
|
"tracing-subscriber",
|
||||||
@@ -9497,7 +9496,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "ztracing_macro"
|
name = "ztracing_macro"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#a1510de54e99131f3c33c4fd86a8e71753cf08de"
|
source = "git+https://github.com/zed-industries/zed#8e4e5a39eed932d943cb7a3e7078885b75d1ea54"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zune-core"
|
name = "zune-core"
|
||||||
|
|||||||
@@ -222,6 +222,7 @@ impl NostrRegistry {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Check the user's credential and set the signer if valid
|
/// Check the user's credential and set the signer if valid
|
||||||
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
fn get_user_credential(&mut self, cx: &mut Context<Self>) {
|
fn get_user_credential(&mut self, cx: &mut Context<Self>) {
|
||||||
let user_keyring = cx.read_credentials(USER_KEYRING);
|
let user_keyring = cx.read_credentials(USER_KEYRING);
|
||||||
let master_keyring = self.get_master_key(cx);
|
let master_keyring = self.get_master_key(cx);
|
||||||
@@ -269,6 +270,10 @@ impl NostrRegistry {
|
|||||||
|
|
||||||
/// Get the master key that used for Nostr Connect
|
/// Get the master key that used for Nostr Connect
|
||||||
pub fn get_master_key(&self, cx: &App) -> Task<Keys> {
|
pub fn get_master_key(&self, cx: &App) -> Task<Keys> {
|
||||||
|
if cfg!(target_arch = "wasm32") {
|
||||||
|
return cx.background_spawn(async move { Keys::generate() });
|
||||||
|
}
|
||||||
|
|
||||||
let task = cx.read_credentials(MASTER_KEYRING);
|
let task = cx.read_credentials(MASTER_KEYRING);
|
||||||
|
|
||||||
cx.spawn(async move |cx| {
|
cx.spawn(async move |cx| {
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ fn main() {
|
|||||||
}]);
|
}]);
|
||||||
|
|
||||||
// Set up the window bounds
|
// Set up the window bounds
|
||||||
let bounds = Bounds::centered(None, size(px(920.0), px(700.0)), cx);
|
let bounds = Bounds::centered(None, size(px(960.0), px(720.0)), cx);
|
||||||
|
|
||||||
// Set up the window options
|
// Set up the window options
|
||||||
let opts = WindowOptions {
|
let opts = WindowOptions {
|
||||||
|
|||||||
Reference in New Issue
Block a user