diff --git a/package.json b/package.json
index be1e1cc2..ad067bc0 100644
--- a/package.json
+++ b/package.json
@@ -38,8 +38,7 @@
"react-string-replace": "^1.1.0",
"react-virtuoso": "^4.2.2",
"swr": "^2.1.3",
- "tauri-plugin-sql-api": "github:tauri-apps/tauri-plugin-sql",
- "unique-names-generator": "^4.7.1"
+ "tauri-plugin-sql-api": "github:tauri-apps/tauri-plugin-sql"
},
"devDependencies": {
"@tailwindcss/typography": "^0.5.9",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ee6fef5f..af0f46da 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -52,7 +52,6 @@ specifiers:
tailwindcss: ^3.3.1
tauri-plugin-sql-api: github:tauri-apps/tauri-plugin-sql
typescript: ^4.9.5
- unique-names-generator: ^4.7.1
vite: ^4.3.1
vite-plugin-ssr: ^0.4.115
vite-tsconfig-paths: ^4.2.0
@@ -84,7 +83,6 @@ dependencies:
react-virtuoso: 4.2.2_biqbaboplfbrettd7655fr4n2y
swr: 2.1.3_react@18.2.0
tauri-plugin-sql-api: github.com/tauri-apps/tauri-plugin-sql/62b21ef24303d80e9905f57b2b6d27efc8677c23
- unique-names-generator: 4.7.1
devDependencies:
'@tailwindcss/typography': 0.5.9_tailwindcss@3.3.1
@@ -5086,12 +5084,6 @@ packages:
which-boxed-primitive: 1.0.2
dev: true
- /unique-names-generator/4.7.1:
- resolution:
- { integrity: sha512-lMx9dX+KRmG8sq6gulYYpKWZc9RlGsgBR6aoO8Qsm3qvkSJ+3rAymr+TnV8EDMrIrwuFJ4kruzMWM/OpYzPoow== }
- engines: { node: '>=8' }
- dev: false
-
/update-browserslist-db/1.0.11_browserslist@4.21.5:
resolution:
{ integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA== }
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 44eda095..83e76963 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -3,7 +3,7 @@
"beforeDevCommand": "pnpm dev",
"beforeBuildCommand": "pnpm build",
"devPath": "http://localhost:3000",
- "distDir": "../dist",
+ "distDir": "../dist/client",
"withGlobalTauri": true
},
"package": {
diff --git a/src/components/channels/channelList.tsx b/src/components/channels/channelList.tsx
index f09f3377..bde9f04d 100644
--- a/src/components/channels/channelList.tsx
+++ b/src/components/channels/channelList.tsx
@@ -3,7 +3,6 @@ import { ChannelListItem } from '@components/channels/channelListItem';
import { DEFAULT_CHANNELS } from '@stores/constants';
import { Plus } from 'iconoir-react';
-import Link from 'next/link';
import { useState } from 'react';
export default function ChannelList() {
@@ -14,9 +13,8 @@ export default function ChannelList() {
{list.map((item) => (
))}
-
@@ -25,7 +23,7 @@ export default function ChannelList() {
Add a new channel
-
+
);
}
diff --git a/src/components/layouts/newsfeed.tsx b/src/components/layouts/newsfeed.tsx
index 18b7c751..563fc421 100644
--- a/src/components/layouts/newsfeed.tsx
+++ b/src/components/layouts/newsfeed.tsx
@@ -1,5 +1,6 @@
import AppHeader from '@components/appHeader';
import MultiAccounts from '@components/multiAccounts';
+import Navigation from '@components/navigation';
export default function NewsfeedLayout({ children }: { children: React.ReactNode }) {
return (
@@ -15,7 +16,22 @@ export default function NewsfeedLayout({ children }: { children: React.ReactNode
- {children}
+
+
+
+
+
+
+
+
+ This feature hasn't implemented yet, so resize Lume to the initial size for a better experience.
+ I'm sorry for this inconvenience, and I swear I will add it soon 😁
+
+
+
+
diff --git a/src/components/relaysProvider.tsx b/src/components/relaysProvider.tsx
index 2ae54ff7..801115e3 100644
--- a/src/components/relaysProvider.tsx
+++ b/src/components/relaysProvider.tsx
@@ -8,6 +8,12 @@ export const RelayContext = createContext({});
const relays = DEFAULT_RELAYS;
export default function RelayProvider({ children }: { children: React.ReactNode }) {
- const pool = useMemo(() => new RelayPool(relays, { useEventCache: false, logSubscriptions: false }), []);
+ const pool = useMemo(() => {
+ if (typeof window !== 'undefined') {
+ return new RelayPool(relays, { useEventCache: false, logSubscriptions: false });
+ } else {
+ return null;
+ }
+ }, []);
return {children} ;
}
diff --git a/src/pages/index.page.tsx b/src/pages/index.page.tsx
index 3f618f28..fe896289 100644
--- a/src/pages/index.page.tsx
+++ b/src/pages/index.page.tsx
@@ -18,7 +18,7 @@ import LumeSymbol from '@assets/icons/Lume';
import { writeStorage } from '@rehooks/local-storage';
import { useCallback, useContext, useEffect, useRef } from 'react';
-import { navigate, prefetch } from 'vite-plugin-ssr/client/router';
+import { navigate } from 'vite-plugin-ssr/client/router';
export function Page() {
const [pool, relays]: any = useContext(RelayContext);
@@ -123,7 +123,6 @@ export function Page() {
() => {
updateLastLogin(dateToUnix(now.current));
timeout.current = setTimeout(() => {
- prefetch('/newsfeed/following');
navigate('/newsfeed/following');
}, 5000);
},
@@ -153,7 +152,6 @@ export function Page() {
// fetch data
fetchData(account, account.follows);
} else {
- prefetch('/onboarding');
navigate('/onboarding', { overwriteLastHistoryEntry: true });
}
})
diff --git a/src/pages/onboarding/create/index.page.client.tsx b/src/pages/onboarding/create/index.page.client.tsx
index bf8f452b..e4c3560d 100644
--- a/src/pages/onboarding/create/index.page.client.tsx
+++ b/src/pages/onboarding/create/index.page.client.tsx
@@ -6,13 +6,8 @@ import { createAccount } from '@utils/storage';
import { EyeClose, EyeEmpty } from 'iconoir-react';
import { generatePrivateKey, getEventHash, getPublicKey, nip19, signEvent } from 'nostr-tools';
import { useCallback, useContext, useMemo, useState } from 'react';
-import { Config, names, uniqueNamesGenerator } from 'unique-names-generator';
import { navigate } from 'vite-plugin-ssr/client/router';
-const config: Config = {
- dictionaries: [names],
-};
-
export function Page() {
const [pool, relays]: any = useContext(RelayContext);
@@ -20,7 +15,7 @@ export function Page() {
const [loading, setLoading] = useState(false);
const privkey = useMemo(() => generatePrivateKey(), []);
- const name = useMemo(() => uniqueNamesGenerator(config).toString(), []);
+ const name = 'Pleb';
const pubkey = getPublicKey(privkey);
const npub = nip19.npubEncode(pubkey);
diff --git a/vite.config.ts b/vite.config.ts
index 5fa66fa7..bdc41d6b 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -6,8 +6,6 @@ import viteTsconfigPaths from 'vite-tsconfig-paths';
export default defineConfig({
plugins: [react(), ssr({ prerender: true }), viteTsconfigPaths()],
define: {
- global: {
- window: {},
- },
+ global: 'window',
},
});