diff --git a/index.html b/index.html index 5351b73c..f79e7e0b 100644 --- a/index.html +++ b/index.html @@ -1,10 +1,10 @@ - + Lume - +
diff --git a/src-tauri/tauri.linux.conf.json b/src-tauri/tauri.linux.conf.json index 19bd3611..e8824202 100644 --- a/src-tauri/tauri.linux.conf.json +++ b/src-tauri/tauri.linux.conf.json @@ -19,7 +19,6 @@ "minHeight": 800, "decorations": false, "resizable": true, - "theme": "Dark", "title": "Lume", "transparent": false, "center": true, diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json index d1e003a9..dd8da015 100644 --- a/src-tauri/tauri.macos.conf.json +++ b/src-tauri/tauri.macos.conf.json @@ -20,7 +20,6 @@ "minWidth": 1080, "minHeight": 800, "resizable": true, - "theme": "Dark", "title": "Lume", "titleBarStyle": "Overlay", "transparent": false, diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json index 200ba94b..8915cc8a 100644 --- a/src-tauri/tauri.windows.conf.json +++ b/src-tauri/tauri.windows.conf.json @@ -19,7 +19,6 @@ "minHeight": 800, "decorations": false, "resizable": true, - "theme": "Dark", "title": "Lume", "center": true, "fullscreen": false, diff --git a/src/shared/layouts/app.tsx b/src/shared/layouts/app.tsx index 989bcd79..dc9918a2 100644 --- a/src/shared/layouts/app.tsx +++ b/src/shared/layouts/app.tsx @@ -7,17 +7,19 @@ export function AppLayout() { return (
-
-
+
+
-
- - { - return location.pathname; - }} - /> +
+
+ + { + return location.pathname; + }} + /> +
diff --git a/src/shared/navigation.tsx b/src/shared/navigation.tsx index f6c994ff..c545783f 100644 --- a/src/shared/navigation.tsx +++ b/src/shared/navigation.tsx @@ -16,127 +16,149 @@ import { } from '@shared/icons'; export function Navigation() { - const { db } = useStorage(); - const navigate = useNavigate(); - return ( -
-
-
- - -
- -
-
-
- - twMerge( - 'flex h-10 items-center gap-2.5 rounded-r-lg border-l-2 px-3 font-medium', - isActive - ? 'border-interor-600 bg-zinc-100 text-zinc-900 dark:bg-zinc-900 dark:text-zinc-100' - : 'border-transparent text-zinc-500 dark:text-zinc-500' - ) - } - > - - - - Home - - - twMerge( - 'flex h-10 items-center gap-2.5 rounded-r-lg border-l-2 px-3 font-medium', - isActive - ? 'border-interor-600 bg-zinc-100 text-zinc-900 dark:bg-zinc-900 dark:text-zinc-100' - : 'border-transparent text-zinc-500 dark:text-zinc-500' - ) - } - > - - - - Chats - - - twMerge( - 'flex h-10 items-center gap-2.5 rounded-r-lg border-l-2 px-3 font-medium', - isActive - ? 'border-interor-600 bg-zinc-100 text-zinc-900 dark:bg-zinc-900 dark:text-zinc-100' - : 'border-transparent text-zinc-500 dark:text-zinc-500' - ) - } - > - - - - Communities - - - twMerge( - 'flex h-10 items-center gap-2.5 rounded-r-lg border-l-2 px-3 font-medium', - isActive - ? 'border-interor-600 bg-zinc-100 text-zinc-900 dark:bg-zinc-900 dark:text-zinc-100' - : 'border-transparent text-zinc-500 dark:text-zinc-500' - ) - } - > - - - - Relays - - - twMerge( - 'flex h-10 items-center gap-2.5 rounded-r-lg border-l-2 px-3 font-medium', - isActive - ? 'border-interor-600 bg-zinc-100 text-zinc-900 dark:bg-zinc-900 dark:text-zinc-100' - : 'border-transparent text-zinc-500 dark:text-zinc-500' - ) - } - > - - - - Explore - -
-
-
- +
+
+ + {({ isActive }) => ( + <> +
+ +
{' '} +
+ Home +
+ + )} + + + {({ isActive }) => ( + <> +
+ +
{' '} +
+ Chats +
+ + )} + + + {({ isActive }) => ( + <> +
+ +
{' '} +
+ Groups +
+ + )} + + + {({ isActive }) => ( + <> +
+ +
{' '} +
+ Relays +
+ + )} + + + {({ isActive }) => ( + <> +
+ +
{' '} +
+ Explore +
+ + )} +
); diff --git a/src/shared/user.tsx b/src/shared/user.tsx index 59c91319..8e410a0c 100644 --- a/src/shared/user.tsx +++ b/src/shared/user.tsx @@ -76,18 +76,22 @@ export const User = memo(function User({ className="h-6 w-6 rounded" /> - {pubkey} + {pubkey}
-
+
{user?.name || user?.display_name || user?.displayName || displayNpub(pubkey, 16)}
- · - {createdAt} + · + {createdAt}
); @@ -106,12 +110,16 @@ export const User = memo(function User({ className="h-14 w-14 rounded-lg" /> - {pubkey} + {pubkey}
-

+

{user?.name || user?.display_name || user?.displayName}

{user?.website}

@@ -154,14 +162,18 @@ export const User = memo(function User({ className="h-10 w-10 rounded-lg" /> - {pubkey} + {pubkey}
-

+

{user?.name || user?.display_name || user?.displayName}

-

+

{user?.nip05 || user?.username || displayNpub(pubkey, 16)}

@@ -181,7 +193,11 @@ export const User = memo(function User({ className="h-12 w-12 rounded-lg" /> - {pubkey} + {pubkey} ); @@ -202,7 +218,7 @@ export const User = memo(function User({ {pubkey} @@ -226,11 +242,15 @@ export const User = memo(function User({ className="h-6 w-6 rounded" /> - {pubkey} + {pubkey}
-
+
{user?.name || user?.display_name || user?.displayName || @@ -256,17 +276,23 @@ export const User = memo(function User({ className="h-10 w-10 rounded-lg" /> - {pubkey} + {pubkey}
-
+
{user?.name || user?.display_name || user?.displayName || 'Anon'}
- {createdAt} - · - {displayNpub(pubkey, 16)} + {createdAt} + · + + {displayNpub(pubkey, 16)} +
@@ -290,20 +316,20 @@ export const User = memo(function User({ {pubkey}
-
+
{user?.name || user?.display_name || user?.displayName || displayNpub(pubkey, 16)}
- · - {createdAt} + · + {createdAt}
@@ -325,7 +351,7 @@ export const User = memo(function User({ {pubkey} @@ -341,16 +367,16 @@ export const User = memo(function User({ ) : ( - + {displayNpub(pubkey, 16)} )}
-

+

{user?.about}

diff --git a/src/shared/widgets/eventLoader.tsx b/src/shared/widgets/eventLoader.tsx index 5cf068da..cd2a716d 100644 --- a/src/shared/widgets/eventLoader.tsx +++ b/src/shared/widgets/eventLoader.tsx @@ -57,7 +57,7 @@ export function EventLoader({ firstTime }: { firstTime: boolean }) {
) : (
-

+

Downloading all events while you're away...

diff --git a/tailwind.config.js b/tailwind.config.js index c1a7e589..164a11f7 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -4,7 +4,6 @@ const defaultTheme = require('tailwindcss/defaultTheme'); module.exports = { content: ['./src/**/*.{js,ts,jsx,tsx}', 'index.html'], - darkMode: 'class', theme: { extend: { colors: {