From 91e50efb1ab69f313dc93ebe2fc40e089f6f5dd6 Mon Sep 17 00:00:00 2001 From: Ren Amamiya <123083837+reyamir@users.noreply.github.com> Date: Tue, 29 Aug 2023 16:11:17 +0700 Subject: [PATCH] yup, lume is very solid now --- src-tauri/tauri.linux.conf.json | 36 ++++++++++++------- src-tauri/tauri.macos.conf.json | 38 +++++++++++++++----- src-tauri/tauri.windows.conf.json | 34 ++++++++++++++---- src/app/auth/components/user.tsx | 16 ++++----- src/app/auth/unlock.tsx | 6 ++-- src/app/space/components/button.tsx | 6 ++-- src/app/space/components/widgets/network.tsx | 9 +++-- src/libs/ndk/cache.ts | 14 ++++---- src/shared/composer/modal.tsx | 9 +---- src/shared/icons/addWidget.tsx | 22 ++++++++++++ src/shared/icons/index.tsx | 1 + src/shared/notes/actions.tsx | 2 +- src/shared/notes/actions/more.tsx | 6 ++-- src/shared/notes/actions/zap.tsx | 23 ++++++------ src/shared/notes/child.tsx | 9 +++-- src/shared/notes/wrapper.tsx | 2 +- src/shared/titleBar.tsx | 6 ++-- src/utils/hooks/useEvent.ts | 5 ++- src/utils/hooks/useNostr.ts | 8 ----- src/utils/rawEvent.ts | 13 +++++++ 20 files changed, 177 insertions(+), 88 deletions(-) create mode 100644 src/shared/icons/addWidget.tsx create mode 100644 src/utils/rawEvent.ts diff --git a/src-tauri/tauri.linux.conf.json b/src-tauri/tauri.linux.conf.json index ccea237a..73bd8416 100644 --- a/src-tauri/tauri.linux.conf.json +++ b/src-tauri/tauri.linux.conf.json @@ -1,6 +1,16 @@ { "tauri": { "windows": [ + { + "width": 400, + "height": 500, + "decorations": false, + "title": "Lume", + "center": true, + "resizable": false, + "label": "splashscreen", + "url": "splashscreen" + }, { "width": 1080, "height": 800, @@ -14,21 +24,23 @@ "fullscreen": false, "hiddenTitle": true, "visible": false, - "fileDropEnabled": true, - "windowEffects": { - "effects": ["micaDark", "micaLight", "acrylic"], - "state": "followsWindowActiveState" - } + "fileDropEnabled": true }, { - "width": 400, - "height": 500, - "decorations": false, - "title": "Lume", - "center": true, + "width": 1080, + "height": 800, "resizable": false, - "label": "splashscreen", - "url": "splashscreen" + "theme": "Dark", + "label": "settings", + "url": "settings", + "title": "Settings", + "titleBarStyle": "Overlay", + "transparent": false, + "center": true, + "fullscreen": false, + "hiddenTitle": true, + "visible": false, + "fileDropEnabled": false } ] } diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json index 9ebe7a04..f24bb14a 100644 --- a/src-tauri/tauri.macos.conf.json +++ b/src-tauri/tauri.macos.conf.json @@ -1,6 +1,18 @@ { "tauri": { "windows": [ + { + "width": 400, + "height": 500, + "decorations": true, + "title": "Lume", + "titleBarStyle": "Overlay", + "hiddenTitle": true, + "center": true, + "resizable": false, + "label": "splashscreen", + "url": "splashscreen" + }, { "width": 1080, "height": 800, @@ -22,16 +34,24 @@ } }, { - "width": 400, - "height": 500, - "decorations": true, - "title": "Lume", - "titleBarStyle": "Overlay", - "hiddenTitle": true, - "center": true, + "width": 1080, + "height": 800, "resizable": false, - "label": "splashscreen", - "url": "splashscreen" + "theme": "Dark", + "label": "settings", + "url": "settings", + "title": "Settings", + "titleBarStyle": "Overlay", + "transparent": true, + "center": true, + "fullscreen": false, + "hiddenTitle": true, + "visible": false, + "fileDropEnabled": false, + "windowEffects": { + "effects": ["hudWindow"], + "state": "followsWindowActiveState" + } } ] } diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json index 44754cd9..5e279375 100644 --- a/src-tauri/tauri.windows.conf.json +++ b/src-tauri/tauri.windows.conf.json @@ -1,6 +1,16 @@ { "tauri": { "windows": [ + { + "width": 400, + "height": 500, + "decorations": false, + "title": "Lume", + "center": true, + "resizable": false, + "label": "splashscreen", + "url": "splashscreen" + }, { "width": 1080, "height": 800, @@ -21,14 +31,24 @@ } }, { - "width": 400, - "height": 500, - "decorations": false, - "title": "Lume", - "center": true, + "width": 1080, + "height": 800, "resizable": false, - "label": "splashscreen", - "url": "splashscreen" + "theme": "Dark", + "label": "settings", + "url": "settings", + "title": "Settings", + "titleBarStyle": "Overlay", + "transparent": true, + "center": true, + "fullscreen": false, + "hiddenTitle": true, + "visible": false, + "fileDropEnabled": false, + "windowEffects": { + "effects": ["micaDark", "micaLight", "acrylic"], + "state": "followsWindowActiveState" + } } ] } diff --git a/src/app/auth/components/user.tsx b/src/app/auth/components/user.tsx index 5429382c..fa580f7f 100644 --- a/src/app/auth/components/user.tsx +++ b/src/app/auth/components/user.tsx @@ -19,19 +19,17 @@ export function User({ pubkey, fallback }: { pubkey: string; fallback?: string } } return ( -
{user?.name || user?.display_name || user?.nip05}
- + {displayNpub(pubkey, 16)}