- {accounts
- ? accounts.map((account) =>
- // @ts-ignore, useless
- account.npub === params.account ? (
-
- );
-}
-
-function Inactive({ pubkey }: { pubkey: string }) {
- const { ark } = useRouteContext({ strict: false });
- const navigate = useNavigate();
-
- const changeAccount = async (npub: string) => {
- const select = await ark.load_selected_account(npub);
- if (select) navigate({ to: "/$account/home", params: { account: npub } });
- };
-
- return (
-
- );
-}
-
-function Active({ pubkey }: { pubkey: string }) {
- return (
-
-
- );
+ return (
+
-
-
-
-
-
-
-
-
- Your balance
-
-
- ₿ {value.bitcoinFormatted}
-
-
+
+ );
}
diff --git a/apps/desktop2/src/components/col.tsx b/apps/desktop2/src/components/col.tsx
index ce131aea..c6e06b8a 100644
--- a/apps/desktop2/src/components/col.tsx
+++ b/apps/desktop2/src/components/col.tsx
@@ -1,83 +1,160 @@
-import { useEffect, useRef, useState } from "react";
+import { CancelIcon, CheckIcon } from "@lume/icons";
import type { LumeColumn } from "@lume/types";
+import { cn } from "@lume/utils";
import { invoke } from "@tauri-apps/api/core";
+import { getCurrent } from "@tauri-apps/api/webviewWindow";
+import { useEffect, useRef, useState } from "react";
export function Col({
- column,
- account,
- isScroll,
- isResize,
+ column,
+ account,
+ isScroll,
+ isResize,
}: {
- column: LumeColumn;
- account: string;
- isScroll: boolean;
- isResize: boolean;
+ column: LumeColumn;
+ account: string;
+ isScroll: boolean;
+ isResize: boolean;
}) {
- const container = useRef
+
+
+
+
+
+
+
+
+ Your balance
+
+
+ ₿ {value.bitcoinFormatted}
+
+
+
+ );
+}
+
+function Header({ label, name }: { label: string; name: string }) {
+ const [title, setTitle] = useState(name);
+ const [isChanged, setIsChanged] = useState(false);
+
+ const saveNewTitle = async () => {
+ const mainWindow = getCurrent();
+ await mainWindow.emit("columns", { type: "set_title", label, title });
+
+ // update search params
+ // @ts-ignore, hahaha
+ search.name = title;
+
+ // reset state
+ setIsChanged(false);
+ };
+
+ const close = async () => {
+ const mainWindow = getCurrent();
+ await mainWindow.emit("columns", { type: "remove", label });
+ };
+
+ useEffect(() => {
+ if (title.length !== name.length) setIsChanged(true);
+ }, [title]);
+
+ return (
+
+ {column.label !== "open" ? (
+
+
+
+
+ );
}
diff --git a/apps/desktop2/src/components/conversation.tsx b/apps/desktop2/src/components/conversation.tsx
new file mode 100644
index 00000000..212577e8
--- /dev/null
+++ b/apps/desktop2/src/components/conversation.tsx
@@ -0,0 +1,55 @@
+import { ThreadIcon } from "@lume/icons";
+import type { Event } from "@lume/types";
+import { Note } from "@lume/ui";
+import { cn } from "@lume/utils";
+import { useRouteContext } from "@tanstack/react-router";
+
+export function Conversation({
+ event,
+ className,
+}: {
+ event: Event;
+ className?: string;
+}) {
+ const { ark } = useRouteContext({ strict: false });
+ const thread = ark.parse_event_thread({
+ content: event.content,
+ tags: event.tags,
+ });
+
+ return (
+
+
+
+
+
+ setTitle(e.currentTarget.textContent)}
+ className="text-sm font-medium focus:outline-none"
+ >
+ {name}
+
+ {isChanged ? (
+
+ ) : null}
+
+ {thread?.rootEventId ? (
+
+
+
+ {thread?.replyEventId ? (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
- ) : (
- Event not found
-
-
-
-
-
-
-
-
-
-
-
-
+ Reposted by
+
+
+
+ ) : isError || !repostEvent ? (
+
+ Event not found within your current relay set
+
+ ) : (
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
- setIsScroll(true)}
- onScrollEnd={() => setIsScroll(false)}
- className="scrollbar-none h-full w-full overflow-x-auto focus:outline-none"
- >
- {columns.map((column) => (
-
-
-
-
- );
-}
-
-function Pending() {
- return (
-
-
-
-
-
-
-
- );
+ return () => {
+ if (unlistenColEvent) unlistenColEvent();
+ if (unlistenWindowResize) unlistenWindowResize();
+ };
+ }, []);
+
+ return (
+
+ setIsScroll(true)}
+ onScrollEnd={() => setIsScroll(false)}
+ className="scrollbar-none h-full w-full overflow-x-auto focus:outline-none"
+ >
+ {columns.map((column) => (
+
+
+
+
+ );
}
diff --git a/apps/desktop2/src/routes/$account.tsx b/apps/desktop2/src/routes/$account.tsx
index 8d38b74b..740810f6 100644
--- a/apps/desktop2/src/routes/$account.tsx
+++ b/apps/desktop2/src/routes/$account.tsx
@@ -1,62 +1,113 @@
import { ComposeFilledIcon, PlusIcon, SearchIcon } from "@lume/icons";
-import { Outlet, createFileRoute, useNavigate } from "@tanstack/react-router";
+import type { Account } from "@lume/types";
+import { User } from "@lume/ui";
import { cn } from "@lume/utils";
-import { Accounts } from "@/components/accounts";
-import { platform } from "@tauri-apps/plugin-os";
+import { Outlet, createFileRoute } from "@tanstack/react-router";
+import { useEffect, useState } from "react";
export const Route = createFileRoute("/$account")({
- component: App,
- beforeLoad: async () => {
- const platformName = await platform();
- return { platform: platformName };
- },
+ component: Screen,
});
-function App() {
- const navigate = useNavigate();
- const { ark, platform } = Route.useRouteContext();
+function Screen() {
+ const navigate = Route.useNavigate();
+ const { ark, platform } = Route.useRouteContext();
- return (
-
+
+
+
+
-
- );
+ return (
+
-
-
-
-
-
-
-
-
-
-
+
+ );
+}
+
+export function Accounts() {
+ const navigate = Route.useNavigate();
+ const { ark } = Route.useRouteContext();
+ const { account } = Route.useParams();
+
+ const [accounts, setAccounts] = useState
+
+
+
+
+
+
+
+
+
+
+ {accounts.map((user) => (
+
+ ))}
+
+ );
}
diff --git a/apps/desktop2/src/routes/__root.tsx b/apps/desktop2/src/routes/__root.tsx
index 3935c98a..5f173e0d 100644
--- a/apps/desktop2/src/routes/__root.tsx
+++ b/apps/desktop2/src/routes/__root.tsx
@@ -1,48 +1,44 @@
-import { Outlet, createRootRouteWithContext } from "@tanstack/react-router";
-import { type Ark } from "@lume/ark";
-import { type QueryClient } from "@tanstack/react-query";
-import { type Platform } from "@tauri-apps/plugin-os";
-import type {
- Account,
- Contact,
- Interests,
- Metadata,
- Settings,
-} from "@lume/types";
+import type { Ark } from "@lume/ark";
+import type { Account, Interests, Metadata, Settings } from "@lume/types";
import { Spinner } from "@lume/ui";
-import { type Descendant } from "slate";
+import type { QueryClient } from "@tanstack/react-query";
+import { Outlet, createRootRouteWithContext } from "@tanstack/react-router";
+import type { Platform } from "@tauri-apps/plugin-os";
+import type { Descendant } from "slate";
type EditorElement = {
- type: string;
- children: Descendant[];
- eventId?: string;
+ type: string;
+ children: Descendant[];
+ eventId?: string;
};
interface RouterContext {
- ark: Ark;
- queryClient: QueryClient;
- platform?: Platform;
- locale?: string;
- settings?: Settings;
- interests?: Interests;
- accounts?: Account[];
- initialValue?: EditorElement[];
- profile?: Metadata;
- contacts?: Contact[];
+ // System
+ ark: Ark;
+ queryClient: QueryClient;
+ // App info
+ platform?: Platform;
+ locale?: string;
+ // Settings
+ settings?: Settings;
+ interests?: Interests;
+ // Profile
+ accounts?: Account[];
+ profile?: Metadata;
+ // Editor
+ initialValue?: EditorElement[];
}
export const Route = createRootRouteWithContext
-
-
- );
+ return (
+
+
+ );
}
diff --git a/apps/desktop2/src/routes/antenas.tsx b/apps/desktop2/src/routes/antenas.tsx
deleted file mode 100644
index c6318c43..00000000
--- a/apps/desktop2/src/routes/antenas.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import { RepostNote } from "@/components/repost";
-import { TextNote } from "@/components/text";
-import { ArrowRightCircleIcon, ArrowRightIcon } from "@lume/icons";
-import { ColumnRouteSearch, Event, Kind } from "@lume/types";
-import { Column, Spinner } from "@lume/ui";
-import { useInfiniteQuery } from "@tanstack/react-query";
-import { Link, createFileRoute } from "@tanstack/react-router";
-import { Virtualizer } from "virtua";
-
-export const Route = createFileRoute("/antenas")({
- validateSearch: (search: Record
-
- ) : !data.length ? (
-
- {hasNextPage ? (
-
- ) : null}
-
-
-
- );
-}
diff --git a/apps/desktop2/src/routes/auth.lazy.tsx b/apps/desktop2/src/routes/auth.lazy.tsx
index d7a0cd4e..0b2c36c6 100644
--- a/apps/desktop2/src/routes/auth.lazy.tsx
+++ b/apps/desktop2/src/routes/auth.lazy.tsx
@@ -2,15 +2,15 @@ import { Box, Container } from "@lume/ui";
import { Outlet, createLazyFileRoute } from "@tanstack/react-router";
export const Route = createLazyFileRoute("/auth")({
- component: Screen,
+ component: Screen,
});
function Screen() {
- return (
-
-
-
-
-
- Your newsfeed is empty
-- Here are few suggestions to get started. -
-
-
-
-
-
- );
+ const copyKey = async () => {
+ try {
+ await writeText(key);
+ setCopied(true);
+ } catch (e) {
+ toast.error(e);
+ }
+ };
+
+ return (
+
-
- Backup your sign in keys
-- It's use for login to Lume or other Nostr clients. You will lost - access to your account if you lose this key. -
-
-
-
-
-
- {key ? (
- <>
-
- setPassphase(e.target.value)}
- className="h-11 w-full resize-none rounded-lg border-transparent bg-neutral-100 placeholder:text-neutral-600 focus:border-blue-500 focus:ring focus:ring-blue-100 dark:bg-neutral-900 dark:focus:ring-blue-900"
- />
-
-
-
-
-
-
-
-
-
-
-
- ) : null}
- Before you continue:
-
-
-
-
- setConfirm((state) => ({ ...state, c1: !state.c1 }))
- }
- className="flex size-6 appearance-none items-center justify-center rounded-md bg-neutral-100 outline-none dark:bg-neutral-900"
- id="confirm1"
- >
-
-
-
-
-
-
-
- setConfirm((state) => ({ ...state, c2: !state.c2 }))
- }
- className="flex size-6 appearance-none items-center justify-center rounded-md bg-neutral-100 outline-none dark:bg-neutral-900"
- id="confirm2"
- >
-
-
-
-
-
-
-
- setConfirm((state) => ({ ...state, c3: !state.c3 }))
- }
- className="flex size-6 appearance-none items-center justify-center rounded-md bg-neutral-100 outline-none dark:bg-neutral-900"
- id="confirm3"
- >
-
-
-
-
-
-
-
-
-
+
+ );
}
diff --git a/apps/desktop2/src/routes/auth/new/profile.tsx b/apps/desktop2/src/routes/auth/new/profile.tsx
index 553b0f42..d026cee1 100644
--- a/apps/desktop2/src/routes/auth/new/profile.tsx
+++ b/apps/desktop2/src/routes/auth/new/profile.tsx
@@ -1,6 +1,6 @@
import { AvatarUploader } from "@/components/avatarUploader";
import { PlusIcon } from "@lume/icons";
-import { Metadata } from "@lume/types";
+import type { Metadata } from "@lume/types";
import { Spinner } from "@lume/ui";
import { createFileRoute, useNavigate } from "@tanstack/react-router";
import { useState } from "react";
@@ -9,135 +9,135 @@ import { useTranslation } from "react-i18next";
import { toast } from "sonner";
export const Route = createFileRoute("/auth/new/profile")({
- component: Screen,
- loader: ({ context }) => {
- return context.ark.create_keys();
- },
+ component: Screen,
+ loader: ({ context }) => {
+ return context.ark.create_keys();
+ },
});
function Screen() {
- const keys = Route.useLoaderData();
- const navigate = useNavigate();
+ const keys = Route.useLoaderData();
+ const navigate = useNavigate();
- const { t } = useTranslation();
- const { ark } = Route.useRouteContext();
- const { register, handleSubmit } = useForm();
+ const { t } = useTranslation();
+ const { ark } = Route.useRouteContext();
+ const { register, handleSubmit } = useForm();
- const [picture, setPicture] = useState
+
+ Backup your sign in keys
++ It's use for login to Lume or other Nostr clients. You will lost + access to your account if you lose this key. +
+
+
+
+
+
+ {key ? (
+ <>
+
+ setPassphase(e.target.value)}
+ className="w-full h-11 rounded-lg border-transparent bg-neutral-100 px-3 placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400"
+ />
+
+
+
+
+
+
+
+
+
+
+
+ ) : null}
+ Before you continue:
+
+
+
+
+ setConfirm((state) => ({ ...state, c1: !state.c1 }))
+ }
+ className="flex size-6 appearance-none items-center justify-center rounded-md bg-neutral-100 outline-none dark:bg-white/10 dark:hover:bg-white/20"
+ id="confirm1"
+ >
+
+
+
+
+
+
+
+ setConfirm((state) => ({ ...state, c2: !state.c2 }))
+ }
+ className="flex size-6 appearance-none items-center justify-center rounded-md bg-neutral-100 outline-none dark:bg-white/10 dark:hover:bg-white/20"
+ id="confirm2"
+ >
+
+
+
+
+
+
+
+ setConfirm((state) => ({ ...state, c3: !state.c3 }))
+ }
+ className="flex size-6 appearance-none items-center justify-center rounded-md bg-neutral-100 outline-none dark:bg-white/10 dark:hover:bg-white/20"
+ id="confirm3"
+ >
+
+
+
+
+
+
+
+
+
-
- );
+ return (
+
-
- Let's set up your profile.
-
-
-
-
- {picture ? (
- 
- ) : null}
-
-
-
-
+
+ );
}
diff --git a/apps/desktop2/src/routes/auth/privkey.lazy.tsx b/apps/desktop2/src/routes/auth/privkey.lazy.tsx
index b59a38e0..8a057a9d 100644
--- a/apps/desktop2/src/routes/auth/privkey.lazy.tsx
+++ b/apps/desktop2/src/routes/auth/privkey.lazy.tsx
@@ -4,87 +4,87 @@ import { useState } from "react";
import { toast } from "sonner";
export const Route = createLazyFileRoute("/auth/privkey")({
- component: Screen,
+ component: Screen,
});
function Screen() {
- const { ark } = Route.useRouteContext();
- const navigate = Route.useNavigate();
+ const { ark } = Route.useRouteContext();
+ const navigate = Route.useNavigate();
- const [key, setKey] = useState("");
- const [password, setPassword] = useState("");
- const [loading, setLoading] = useState(false);
+ const [key, setKey] = useState("");
+ const [password, setPassword] = useState("");
+ const [loading, setLoading] = useState(false);
- const submit = async () => {
- if (!key.startsWith("nsec1"))
- return toast.warning(
- "You need to enter a valid private key starts with nsec or ncryptsec",
- );
+ const submit = async () => {
+ if (!key.startsWith("nsec1"))
+ return toast.warning(
+ "You need to enter a valid private key starts with nsec or ncryptsec",
+ );
- try {
- setLoading(true);
+ try {
+ setLoading(true);
- const npub = await ark.save_account(key, password);
+ const npub = await ark.save_account(key, password);
- if (npub) {
- navigate({
- to: "/auth/settings",
- search: { account: npub },
- replace: true,
- });
- }
- } catch (e) {
- setLoading(false);
- toast.error(e);
- }
- };
+ if (npub) {
+ navigate({
+ to: "/auth/settings",
+ search: { account: npub },
+ replace: true,
+ });
+ }
+ } catch (e) {
+ setLoading(false);
+ toast.error(e);
+ }
+ };
- return (
-
+
+ Let's set up your profile.
+
+
+
+
+ {picture ? (
+
+ ) : null}
+
+
+
+
-
- );
+ return (
+
-
- Continue with Private Key
-
-
-
-
- setKey(e.target.value)}
- className="h-11 rounded-lg border-transparent bg-neutral-100 px-3 placeholder:text-neutral-500 focus:border-blue-500 focus:ring focus:ring-blue-200 dark:bg-neutral-950 dark:placeholder:text-neutral-400 dark:focus:ring-blue-800"
- />
-
-
-
- setPassword(e.target.value)}
- className="h-11 rounded-lg border-transparent bg-neutral-100 px-3 placeholder:text-neutral-500 focus:border-blue-500 focus:ring focus:ring-blue-200 dark:bg-neutral-950 dark:placeholder:text-neutral-400 dark:focus:ring-blue-800"
- />
-
-
-
+
+ );
}
diff --git a/apps/desktop2/src/routes/auth/remote.lazy.tsx b/apps/desktop2/src/routes/auth/remote.lazy.tsx
index 54890bcb..931fca9d 100644
--- a/apps/desktop2/src/routes/auth/remote.lazy.tsx
+++ b/apps/desktop2/src/routes/auth/remote.lazy.tsx
@@ -4,71 +4,71 @@ import { useState } from "react";
import { toast } from "sonner";
export const Route = createLazyFileRoute("/auth/remote")({
- component: Screen,
+ component: Screen,
});
function Screen() {
- const { ark } = Route.useRouteContext();
- const navigate = Route.useNavigate();
+ const { ark } = Route.useRouteContext();
+ const navigate = Route.useNavigate();
- const [uri, setUri] = useState("");
- const [loading, setLoading] = useState(false);
+ const [uri, setUri] = useState("");
+ const [loading, setLoading] = useState(false);
- const submit = async () => {
- if (!uri.startsWith("bunker://"))
- return toast.warning(
- "You need to enter a valid Connect URI starts with bunker://",
- );
+ const submit = async () => {
+ if (!uri.startsWith("bunker://"))
+ return toast.warning(
+ "You need to enter a valid Connect URI starts with bunker://",
+ );
- try {
- setLoading(true);
+ try {
+ setLoading(true);
- const npub = await ark.nostr_connect(uri);
+ const npub = await ark.nostr_connect(uri);
- if (npub) {
- navigate({
- to: "/auth/settings",
- search: { account: npub },
- replace: true,
- });
- }
- } catch (e) {
- setLoading(false);
- toast.error(e);
- }
- };
+ if (npub) {
+ navigate({
+ to: "/auth/settings",
+ search: { account: npub },
+ replace: true,
+ });
+ }
+ } catch (e) {
+ setLoading(false);
+ toast.error(e);
+ }
+ };
- return (
-
+
+ Continue with Private Key
+
+
+
+
+ setKey(e.target.value)}
+ className="h-11 rounded-lg border-transparent bg-neutral-100 px-3 placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400"
+ />
+
+
+
+ setPassword(e.target.value)}
+ className="h-11 rounded-lg border-transparent bg-neutral-100 px-3 placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400"
+ />
+
+
+
-
- );
+ return (
+
-
- Continue with Nostr Connect
-
-
-
-
- setUri(e.target.value)}
- className="h-11 rounded-lg border-transparent bg-neutral-100 px-3 placeholder:text-neutral-500 focus:border-blue-500 focus:ring focus:ring-blue-200 dark:bg-neutral-950 dark:placeholder:text-neutral-400 dark:focus:ring-blue-800"
- />
-
-
-
+
+ );
}
diff --git a/apps/desktop2/src/routes/auth/settings.tsx b/apps/desktop2/src/routes/auth/settings.tsx
index 16d7fa6c..26b72cd9 100644
--- a/apps/desktop2/src/routes/auth/settings.tsx
+++ b/apps/desktop2/src/routes/auth/settings.tsx
@@ -1,215 +1,215 @@
import { LaurelIcon } from "@lume/icons";
-import { createFileRoute, useNavigate } from "@tanstack/react-router";
-import { useTranslation } from "react-i18next";
-import * as Switch from "@radix-ui/react-switch";
-import { useState } from "react";
-import { AppRouteSearch, Settings } from "@lume/types";
-import {
- isPermissionGranted,
- requestPermission,
-} from "@tauri-apps/plugin-notification";
-import { toast } from "sonner";
+import type { AppRouteSearch, Settings } from "@lume/types";
import { Spinner } from "@lume/ui";
+import * as Switch from "@radix-ui/react-switch";
+import { createFileRoute, useNavigate } from "@tanstack/react-router";
+import {
+ isPermissionGranted,
+ requestPermission,
+} from "@tauri-apps/plugin-notification";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { toast } from "sonner";
export const Route = createFileRoute("/auth/settings")({
- validateSearch: (search: Record
+
+ Continue with Nostr Connect
+
+
+
+
+ setUri(e.target.value)}
+ className="h-11 rounded-lg border-transparent bg-neutral-100 px-3 placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400"
+ />
+
+
+
-
- );
+ return (
+
-
-
-
-
-
- - {t("onboardingSettings.title")} -
-- {t("onboardingSettings.subtitle")} -
-
-
-
-
-
-
- toggleNofitication()}
- className="relative mt-1 h-7 w-12 shrink-0 cursor-default rounded-full bg-neutral-200 outline-none data-[state=checked]:bg-blue-500 dark:bg-neutral-800"
- >
-
-
-
-
- Push Notification
-- Enabling push notifications will allow you to receive - notifications from Lume. -
-
- toggleEnhancedPrivacy()}
- className="relative mt-1 h-7 w-12 shrink-0 cursor-default rounded-full bg-neutral-200 outline-none data-[state=checked]:bg-blue-500 dark:bg-neutral-800"
- >
-
-
-
-
- Enhanced Privacy
-- Lume will display external resources like image, video or link - preview as plain text. -
-
- toggleAutoUpdate()}
- className="relative mt-1 h-7 w-12 shrink-0 cursor-default rounded-full bg-neutral-200 outline-none data-[state=checked]:bg-blue-500 dark:bg-neutral-800"
- >
-
-
-
-
- Auto Update
-- Automatically download and install new version. -
-
- toggleZap()}
- className="relative mt-1 h-7 w-12 shrink-0 cursor-default rounded-full bg-neutral-200 outline-none data-[state=checked]:bg-blue-500 dark:bg-neutral-800"
- >
-
-
-
-
- Zap
-- Show the Zap button in each note and user's profile screen, use - for send Bitcoin tip to other users. -
-
- toggleNsfw()}
- className="relative mt-1 h-7 w-12 shrink-0 cursor-default rounded-full bg-neutral-200 outline-none data-[state=checked]:bg-blue-500 dark:bg-neutral-800"
- >
-
-
-
-
- Filter sensitive content
-- By default, Lume will display all content which have Content - Warning tag, it's may include NSFW content. -
-
+
+ );
}
function Pending() {
- return (
-
+
+
+
+
+
+ + {t("onboardingSettings.title")} +
++ {t("onboardingSettings.subtitle")} +
+
+
+
+
+
+
+ toggleNofitication()}
+ className="relative mt-1 h-7 w-12 shrink-0 cursor-default rounded-full bg-neutral-200 outline-none data-[state=checked]:bg-blue-500 dark:bg-white/20"
+ >
+
+
+
+
+ Push Notification
++ Enabling push notifications will allow you to receive + notifications from Lume. +
+
+ toggleEnhancedPrivacy()}
+ className="relative mt-1 h-7 w-12 shrink-0 cursor-default rounded-full bg-neutral-200 outline-none data-[state=checked]:bg-blue-500 dark:bg-white/20"
+ >
+
+
+
+
+ Enhanced Privacy
++ Lume will display external resources like image, video or link + preview as plain text. +
+
+ toggleAutoUpdate()}
+ className="relative mt-1 h-7 w-12 shrink-0 cursor-default rounded-full bg-neutral-200 outline-none data-[state=checked]:bg-blue-500 dark:bg-white/20"
+ >
+
+
+
+
+ Auto Update
++ Automatically download and install new version. +
+
+ toggleZap()}
+ className="relative mt-1 h-7 w-12 shrink-0 cursor-default rounded-full bg-neutral-200 outline-none data-[state=checked]:bg-blue-500 dark:bg-white/20"
+ >
+
+
+
+
+ Zap
++ Show the Zap button in each note and user's profile screen, use + for send Bitcoin tip to other users. +
+
+ toggleNsfw()}
+ className="relative mt-1 h-7 w-12 shrink-0 cursor-default rounded-full bg-neutral-200 outline-none data-[state=checked]:bg-blue-500 dark:bg-white/20"
+ >
+
+
+
+
+ Filter sensitive content
++ By default, Lume will display all content which have Content + Warning tag, it's may include NSFW content. +
+
-
-
- );
+ return (
+
+
+
+ );
}
diff --git a/apps/desktop2/src/routes/create-group.tsx b/apps/desktop2/src/routes/create-group.tsx
index c03927c3..6e09fb33 100644
--- a/apps/desktop2/src/routes/create-group.tsx
+++ b/apps/desktop2/src/routes/create-group.tsx
@@ -1,127 +1,126 @@
import { CheckCircleIcon } from "@lume/icons";
-import { ColumnRouteSearch } from "@lume/types";
-import { Column, Spinner, User } from "@lume/ui";
+import type { ColumnRouteSearch } from "@lume/types";
+import { Spinner, User } from "@lume/ui";
import { createFileRoute, useRouter } from "@tanstack/react-router";
import { useState } from "react";
import { toast } from "sonner";
export const Route = createFileRoute("/create-group")({
- validateSearch: (search: Record
-
-
-
- setTitle(e.target.value)}
- placeholder="Nostrichs..."
- className="h-11 rounded-lg border-transparent bg-neutral-100 px-3 placeholder:text-neutral-600 focus:border-blue-500 focus:ring focus:ring-blue-200 dark:bg-neutral-950 dark:placeholder:text-neutral-400 dark:focus:ring-blue-800"
- />
-
-
-
-
- Pick user
- {`${users.length} / ∞`}
-
-
- {contacts.map((item: string) => (
-
- ))}
-
-
-
-
-
+
+ );
}
diff --git a/apps/desktop2/src/routes/editor/-components/media.tsx b/apps/desktop2/src/routes/editor/-components/media.tsx
index e367d7cf..387f9350 100644
--- a/apps/desktop2/src/routes/editor/-components/media.tsx
+++ b/apps/desktop2/src/routes/editor/-components/media.tsx
@@ -1,91 +1,91 @@
import { AddMediaIcon } from "@lume/icons";
+import { Spinner } from "@lume/ui";
import { cn, insertImage, isImagePath } from "@lume/utils";
+import * as Tooltip from "@radix-ui/react-tooltip";
+import { useRouteContext } from "@tanstack/react-router";
+import type { UnlistenFn } from "@tauri-apps/api/event";
+import { getCurrent } from "@tauri-apps/api/window";
import { useEffect, useState } from "react";
import { useSlateStatic } from "slate-react";
import { toast } from "sonner";
-import { getCurrent } from "@tauri-apps/api/window";
-import { UnlistenFn } from "@tauri-apps/api/event";
-import { useRouteContext } from "@tanstack/react-router";
-import { Spinner } from "@lume/ui";
-import * as Tooltip from "@radix-ui/react-tooltip";
export function MediaButton({ className }: { className?: string }) {
- const { ark } = useRouteContext({ strict: false });
- const editor = useSlateStatic();
+ const { ark } = useRouteContext({ strict: false });
+ const editor = useSlateStatic();
- const [loading, setLoading] = useState(false);
+ const [loading, setLoading] = useState(false);
- const uploadToNostrBuild = async () => {
- try {
- // start loading
- setLoading(true);
+ const uploadToNostrBuild = async () => {
+ try {
+ // start loading
+ setLoading(true);
- const image = await ark.upload();
- insertImage(editor, image);
+ const image = await ark.upload();
+ insertImage(editor, image);
- // reset loading
- setLoading(false);
- } catch (e) {
- setLoading(false);
- toast.error(`Upload failed, error: ${e}`);
- }
- };
+ // reset loading
+ setLoading(false);
+ } catch (e) {
+ setLoading(false);
+ toast.error(`Upload failed, error: ${e}`);
+ }
+ };
- useEffect(() => {
- let unlisten: UnlistenFn = undefined;
+ useEffect(() => {
+ let unlisten: UnlistenFn = undefined;
- async function listenFileDrop() {
- const window = getCurrent();
- if (!unlisten) {
- unlisten = await window.listen("tauri://file-drop", async (event) => {
- // @ts-ignore, lfg !!!
- const items: string[] = event.payload.paths;
- // start loading
- setLoading(true);
- // upload all images
- for (const item of items) {
- if (isImagePath(item)) {
- const image = await ark.upload(item);
- insertImage(editor, image);
- }
- }
- // stop loading
- setLoading(false);
- });
- }
- }
+ async function listenFileDrop() {
+ const window = getCurrent();
+ if (!unlisten) {
+ unlisten = await window.listen("tauri://file-drop", async (event) => {
+ // @ts-ignore, lfg !!!
+ const items: string[] = event.payload.paths;
+ // start loading
+ setLoading(true);
+ // upload all images
+ for (const item of items) {
+ if (isImagePath(item)) {
+ const image = await ark.upload(item);
+ insertImage(editor, image);
+ }
+ }
+ // stop loading
+ setLoading(false);
+ });
+ }
+ }
- listenFileDrop();
+ listenFileDrop();
- return () => {
- if (unlisten) unlisten();
- };
- }, []);
+ return () => {
+ if (unlisten) unlisten();
+ };
+ }, []);
- return (
-
+
+
+
+ setTitle(e.target.value)}
+ placeholder="Nostrichs..."
+ className="h-10 rounded-lg bg-transparent border border-neutral-300 dark:border-neutral-700 px-3 placeholder:text-neutral-600 focus:border-neutral-500 focus:ring-0 dark:placeholder:text-neutral-400"
+ />
+
+
+
+
+ Pick user
+ {`${users.length} / ∞`}
+
+
+ {contacts.map((item: string) => (
+
+ ))}
+
+
+ {users.length >= 1 ? (
+
+ ) : null}
+
+
- {
- const { selection } = editor;
+ return (
+
+
+ );
}
function Pending() {
- return (
-
+ {
+ const { selection } = editor;
- if (selection && Range.isCollapsed(selection)) {
- const [start] = Range.edges(selection);
- const wordBefore = Editor.before(editor, start, { unit: "word" });
- const before = wordBefore && Editor.before(editor, wordBefore);
- const beforeRange = before && Editor.range(editor, before, start);
- const beforeText =
- beforeRange && Editor.string(editor, beforeRange);
- const beforeMatch = beforeText?.match(/^@(\w+)$/);
- const after = Editor.after(editor, start);
- const afterRange = Editor.range(editor, start, after);
- const afterText = Editor.string(editor, afterRange);
- const afterMatch = afterText.match(/^(\s|$)/);
+ if (selection && Range.isCollapsed(selection)) {
+ const [start] = Range.edges(selection);
+ const wordBefore = Editor.before(editor, start, { unit: "word" });
+ const before = wordBefore && Editor.before(editor, wordBefore);
+ const beforeRange = before && Editor.range(editor, before, start);
+ const beforeText =
+ beforeRange && Editor.string(editor, beforeRange);
+ const beforeMatch = beforeText?.match(/^@(\w+)$/);
+ const after = Editor.after(editor, start);
+ const afterRange = Editor.range(editor, start, after);
+ const afterText = Editor.string(editor, afterRange);
+ const afterMatch = afterText.match(/^(\s|$)/);
- if (beforeMatch && afterMatch) {
- setTarget(beforeRange);
- setSearch(beforeMatch[1]);
- setIndex(0);
- return;
- }
- }
+ if (beforeMatch && afterMatch) {
+ setTarget(beforeRange);
+ setSearch(beforeMatch[1]);
+ setIndex(0);
+ return;
+ }
+ }
- setTarget(null);
- }}
- >
-
-
- );
+ setTarget(null);
+ }}
+ >
+
-
-
-
-
- {reply_to && !quote ?
-
-
-
- )}
-
-
- {filters.map((contact) => (
-
- ))}
-
-
+
+
+
+
+ {reply_to && !quote ?
+
+
+
+ )}
+
+
+ {filters.map((contact) => (
+
+ ))}
+
+
-
-
- );
+ return (
+ Loading cache...
-
+
+
+ );
}
const withNostrEvent = (editor: ReactEditor) => {
- const { insertData, isVoid } = editor;
+ const { insertData, isVoid } = editor;
- editor.isVoid = (element) => {
- // @ts-expect-error, wtf
- return element.type === "event" ? true : isVoid(element);
- };
+ editor.isVoid = (element) => {
+ // @ts-expect-error, wtf
+ return element.type === "event" ? true : isVoid(element);
+ };
- editor.insertData = (data) => {
- const text = data.getData("text/plain");
+ editor.insertData = (data) => {
+ const text = data.getData("text/plain");
- if (text.startsWith("nevent1") || text.startsWith("note1")) {
- insertNostrEvent(editor, text);
- } else {
- insertData(data);
- }
- };
+ if (text.startsWith("nevent1") || text.startsWith("note1")) {
+ insertNostrEvent(editor, text);
+ } else {
+ insertData(data);
+ }
+ };
- return editor;
+ return editor;
};
const withMentions = (editor: ReactEditor) => {
- const { isInline, isVoid, markableVoid } = editor;
+ const { isInline, isVoid, markableVoid } = editor;
- editor.isInline = (element) => {
- // @ts-expect-error, wtf
- return element.type === "mention" ? true : isInline(element);
- };
+ editor.isInline = (element) => {
+ // @ts-expect-error, wtf
+ return element.type === "mention" ? true : isInline(element);
+ };
- editor.isVoid = (element) => {
- // @ts-expect-error, wtf
- return element.type === "mention" ? true : isVoid(element);
- };
+ editor.isVoid = (element) => {
+ // @ts-expect-error, wtf
+ return element.type === "mention" ? true : isVoid(element);
+ };
- editor.markableVoid = (element) => {
- // @ts-expect-error, wtf
- return element.type === "mention" || markableVoid(element);
- };
+ editor.markableVoid = (element) => {
+ // @ts-expect-error, wtf
+ return element.type === "mention" || markableVoid(element);
+ };
- return editor;
+ return editor;
};
const withImages = (editor: ReactEditor) => {
- const { insertData, isVoid } = editor;
+ const { insertData, isVoid } = editor;
- editor.isVoid = (element) => {
- // @ts-expect-error, wtf
- return element.type === "image" ? true : isVoid(element);
- };
+ editor.isVoid = (element) => {
+ // @ts-expect-error, wtf
+ return element.type === "image" ? true : isVoid(element);
+ };
- editor.insertData = (data) => {
- const text = data.getData("text/plain");
+ editor.insertData = (data) => {
+ const text = data.getData("text/plain");
- if (isImageUrl(text)) {
- insertImage(editor, text);
- } else {
- insertData(data);
- }
- };
+ if (isImageUrl(text)) {
+ insertImage(editor, text);
+ } else {
+ insertData(data);
+ }
+ };
- return editor;
+ return editor;
};
const Image = ({ attributes, children, element }) => {
- const editor = useSlateStatic();
- const path = ReactEditor.findPath(editor as ReactEditor, element);
+ const editor = useSlateStatic();
+ const path = ReactEditor.findPath(editor as ReactEditor, element);
- const selected = useSelected();
- const focused = useFocused();
+ const selected = useSelected();
+ const focused = useFocused();
- return (
- Loading cache...
+
- {children}
-
- );
+ return (
+
- 
-
-
-
+ {children}
+
+ );
};
const Mention = ({ attributes, element }) => {
- const editor = useSlateStatic();
- const path = ReactEditor.findPath(editor as ReactEditor, element);
+ const editor = useSlateStatic();
+ const path = ReactEditor.findPath(editor as ReactEditor, element);
- return (
- Transforms.removeNodes(editor, { at: path })}
- className="inline-block align-baseline text-blue-500 hover:text-blue-600"
- >{`@${element.name}`}
- );
+ return (
+ Transforms.removeNodes(editor, { at: path })}
+ className="inline-block align-baseline text-blue-500 hover:text-blue-600"
+ >{`@${element.name}`}
+ );
};
const Event = ({ attributes, element, children }) => {
- const editor = useSlateStatic();
- const path = ReactEditor.findPath(editor as ReactEditor, element);
+ const editor = useSlateStatic();
+ const path = ReactEditor.findPath(editor as ReactEditor, element);
- return (
-
+
+
+
+
- {children}
- {/* biome-ignore lint/a11y/useKeyWithClickEvents: */}
-
- );
+ return (
+ Transforms.removeNodes(editor, { at: path })}
- className="user-select-none relative my-2"
- >
-
-
+ {children}
+ {/* biome-ignore lint/a11y/useKeyWithClickEvents: */}
+
+ );
};
const Element = (props) => {
- const { attributes, children, element } = props;
+ const { attributes, children, element } = props;
- switch (element.type) {
- case "image":
- return Transforms.removeNodes(editor, { at: path })}
+ className="user-select-none relative my-2"
+ >
+
+ - {children} -
- ); - } + switch (element.type) { + case "image": + return+ {children} +
+ ); + } }; diff --git a/apps/desktop2/src/routes/events/$eventId.lazy.tsx b/apps/desktop2/src/routes/events/$eventId.lazy.tsx deleted file mode 100644 index fa27d6e5..00000000 --- a/apps/desktop2/src/routes/events/$eventId.lazy.tsx +++ /dev/null @@ -1,71 +0,0 @@ -import { useEvent } from "@lume/ark"; -import { Box, Container, Note, Spinner, User } from "@lume/ui"; -import { createLazyFileRoute } from "@tanstack/react-router"; -import { ReplyList } from "./-components/replyList"; -import { WindowVirtualizer } from "virtua"; -import { type Event } from "@lume/types"; - -export const Route = createLazyFileRoute("/events/$eventId")({ - component: Event, -}); - -function Event() { - const { eventId } = Route.useParams(); - const { isLoading, isError, data } = useEvent(eventId); - - if (isLoading) { - return ( -
-
- );
- }
-
- if (isError) {
-
-
;
- }
-
- return (
- Not found.
-
-
-
-
-
-
-
-
-
+
+ );
+ }
+
+ if (isError) {
+
+
;
+ }
+
+ return (
+ Not found.
+
+
+ )}
+
+
+
+
+
-
-
-
-
-
-
-
- 0
- ? "my-3 mt-6 flex flex-col gap-3 divide-y divide-neutral-100 border-l-2 border-neutral-100 pl-6 dark:divide-neutral-900 dark:border-neutral-900"
- : "",
- )}
- >
- {event.replies?.length > 0
- ? event.replies?.map((childEvent) => (
-
-
+
+
+
+ 0
+ ? "py-2 pl-3 flex flex-col gap-3 divide-y divide-neutral-100 bg-neutral-50 dark:bg-white/5 border-l-2 border-blue-500 dark:divide-neutral-900"
+ : "",
+ )}
+ >
+ {event.replies?.length > 0
+ ? event.replies?.map((childEvent) => (
+
+
- {!data ? (
-
- );
+ return (
+
-
- ) : data.length === 0 ? (
-
-
- ) : (
- data.map((event) =>
-
- 👋
-- {t("note.reply.empty")} -
-
+
+ );
}
diff --git a/apps/desktop2/src/routes/events/-components/subReply.tsx b/apps/desktop2/src/routes/events/-components/subReply.tsx
index 3bdc9a50..45b15d44 100644
--- a/apps/desktop2/src/routes/events/-components/subReply.tsx
+++ b/apps/desktop2/src/routes/events/-components/subReply.tsx
@@ -1,32 +1,21 @@
-import { Event } from "@lume/types";
-import { Note, User } from "@lume/ui";
+import type { Event } from "@lume/types";
+import { Note } from "@lume/ui";
export function SubReply({ event }: { event: Event; rootEventId?: string }) {
- return (
-
+ Replies ({data?.length ?? 0})
+
+ {!data ? (
+
+
+ ) : data.length === 0 ? (
+
+
+ ) : (
+ data.map((event) =>
+
+ 👋
++ {t("note.reply.empty")} +
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
- ) : !data.length ? (
-
-
-
- ) : null}
-
+ {isFetching && !isLoading && !isFetchingNextPage ? (
+
+ {data.map((item) => renderItem(item))}
+
+ )}
+ {data?.length && hasNextPage ? (
+
+ );
}
function Empty() {
- return (
-
+
+ ) : null}
+ {isLoading ? (
+
+
+
+
+ ) : !data.length ? (
+
+
+
+ ) : null}
+
-
- );
+ return (
+
-
-
-
-
- Your newsfeed is empty
-- Here are few suggestions to get started. -
-
-
-
-
+
+ );
}
diff --git a/apps/desktop2/src/routes/global.tsx b/apps/desktop2/src/routes/global.tsx
index ffa3fe01..e67525f7 100644
--- a/apps/desktop2/src/routes/global.tsx
+++ b/apps/desktop2/src/routes/global.tsx
@@ -1,127 +1,153 @@
+import { Conversation } from "@/components/conversation";
+import { Quote } from "@/components/quote";
import { RepostNote } from "@/components/repost";
import { TextNote } from "@/components/text";
import { ArrowRightCircleIcon, ArrowRightIcon } from "@lume/icons";
-import { ColumnRouteSearch, Event, Kind } from "@lume/types";
-import { Column, Spinner } from "@lume/ui";
+import { type ColumnRouteSearch, type Event, Kind } from "@lume/types";
+import { Spinner } from "@lume/ui";
import { useInfiniteQuery } from "@tanstack/react-query";
import { Link, createFileRoute } from "@tanstack/react-router";
import { Virtualizer } from "virtua";
export const Route = createFileRoute("/global")({
- validateSearch: (search: Record
+
+
+
+
+ Your newsfeed is empty
++ Here are few suggestions to get started. +
+
+
+
+
-
-
- ) : !data.length ? (
-
-
-
- ) : null}
- ; + } + + return
+ {isFetching && !isLoading && !isFetchingNextPage ? (
+
+ {data.map((item) => renderItem(item))}
+
+ )}
+ {data?.length && hasNextPage ? (
+
+ );
}
function Empty() {
- return (
-
+
+ ) : null}
+ {isLoading ? (
+
+
+
+
+ ) : !data.length ? (
+
+
+
+ ) : null}
+
-
- );
+ return (
+
-
-
-
-
- Your newsfeed is empty
-- Here are few suggestions to get started. -
-
-
-
-
+
+ );
}
diff --git a/apps/desktop2/src/routes/group.tsx b/apps/desktop2/src/routes/group.tsx
index b183bc2d..fbfcd189 100644
--- a/apps/desktop2/src/routes/group.tsx
+++ b/apps/desktop2/src/routes/group.tsx
@@ -1,141 +1,154 @@
import { RepostNote } from "@/components/repost";
import { TextNote } from "@/components/text";
import { ArrowRightCircleIcon, ArrowRightIcon } from "@lume/icons";
-import { ColumnRouteSearch, Event, Kind } from "@lume/types";
-import { Column, Spinner } from "@lume/ui";
+import { type ColumnRouteSearch, type Event, Kind } from "@lume/types";
+import { Spinner } from "@lume/ui";
import { useInfiniteQuery } from "@tanstack/react-query";
import { Link, createFileRoute, redirect } from "@tanstack/react-router";
import { Virtualizer } from "virtua";
export const Route = createFileRoute("/group")({
- validateSearch: (search: Record
+
+
+
+
+ Your newsfeed is empty
++ Here are few suggestions to get started. +
+
+
+
+
-
- ) : !data.length ? (
-
- {hasNextPage ? (
-
- ) : null}
-
-
+ {isFetching && !isLoading && !isFetchingNextPage ? (
+
+ {data.map((item) => renderItem(item))}
+
+ )}
+ {data?.length && hasNextPage ? (
+
+ );
}
function Empty() {
- return (
-
+
+ ) : null}
+ {isLoading ? (
+
+
+
+
+ ) : !data.length ? (
+
+
+
+ ) : null}
+
-
- );
+ return (
+
-
-
-
-
- Your newsfeed is empty
-- Here are few suggestions to get started. -
-
-
-
-
+
+ );
}
diff --git a/apps/desktop2/src/routes/index.tsx b/apps/desktop2/src/routes/index.tsx
index a3c23d21..3cf16e63 100644
--- a/apps/desktop2/src/routes/index.tsx
+++ b/apps/desktop2/src/routes/index.tsx
@@ -1,124 +1,128 @@
import { PlusIcon } from "@lume/icons";
import { Spinner, User } from "@lume/ui";
import { Link } from "@tanstack/react-router";
-import { createFileRoute, redirect, useNavigate } from "@tanstack/react-router";
+import { createFileRoute, redirect } from "@tanstack/react-router";
import { useState } from "react";
export const Route = createFileRoute("/")({
- beforeLoad: async ({ context }) => {
- const ark = context.ark;
- const accounts = await ark.get_all_accounts();
+ beforeLoad: async ({ context }) => {
+ const ark = context.ark;
+ const accounts = await ark.get_all_accounts();
- switch (accounts.length) {
- // Guest account
- case 0:
- throw redirect({
- to: "/landing",
- replace: true,
- });
- // Only 1 account, skip account selection screen
- case 1:
- const account = accounts[0].npub;
- const loadedAccount = await ark.load_selected_account(account);
+ switch (accounts.length) {
+ // Guest account
+ case 0:
+ throw redirect({
+ to: "/landing",
+ replace: true,
+ });
+ // Only 1 account, skip account selection screen
+ case 1: {
+ const account = accounts[0].npub;
+ const loadedAccount = await ark.load_selected_account(account);
- if (loadedAccount) {
- throw redirect({
- to: "/$account/home",
- params: { account },
- replace: true,
- });
- }
- // Account selection
- default:
- return { accounts };
- }
- },
- component: Screen,
+ if (loadedAccount) {
+ throw redirect({
+ to: "/$account/home",
+ params: { account },
+ replace: true,
+ });
+ }
+
+ break;
+ }
+ // Account selection
+ default:
+ return { accounts };
+ }
+ },
+ component: Screen,
});
function Screen() {
- const navigate = useNavigate();
- const context = Route.useRouteContext();
+ const navigate = Route.useNavigate();
+ const context = Route.useRouteContext();
- const [loading, setLoading] = useState(false);
+ const [loading, setLoading] = useState(false);
- const select = async (npub: string) => {
- setLoading(true);
+ const select = async (npub: string) => {
+ setLoading(true);
- const ark = context.ark;
- const loadAccount = await ark.load_selected_account(npub);
+ const ark = context.ark;
+ const loadAccount = await ark.load_selected_account(npub);
- if (loadAccount) {
- return navigate({
- to: "/$account/home",
- params: { account: npub },
- replace: true,
- });
- }
- };
+ if (loadAccount) {
+ return navigate({
+ to: "/$account/home",
+ params: { account: npub },
+ replace: true,
+ });
+ }
+ };
- const currentDate = new Date().toLocaleString("default", {
- weekday: "long",
- month: "long",
- day: "numeric",
- });
+ const currentDate = new Date().toLocaleString("default", {
+ weekday: "long",
+ month: "long",
+ day: "numeric",
+ });
- return (
-
+
+
+
+
+ Your newsfeed is empty
++ Here are few suggestions to get started. +
+
+
+
+
-
- );
+ return (
+
-
-
-
-
- {currentDate}
-Welcome back!
-
- {loading ? (
-
-
-
- ) : (
- <>
- {context.accounts.map((account) => (
-
- ))}
-
-
-
-
-
- )}
-
-
- Add
-
- 
-
- Design by NoGood
-
-
-
-
- Design by NoGood
-
-
+
+ );
}
diff --git a/apps/desktop2/src/routes/interests.tsx b/apps/desktop2/src/routes/interests.tsx
index 43a1e922..b7b36bfc 100644
--- a/apps/desktop2/src/routes/interests.tsx
+++ b/apps/desktop2/src/routes/interests.tsx
@@ -1,5 +1,4 @@
-import { ColumnRouteSearch } from "@lume/types";
-import { Column } from "@lume/ui";
+import type { ColumnRouteSearch } from "@lume/types";
import { TOPICS, cn } from "@lume/utils";
import { createFileRoute, useRouter } from "@tanstack/react-router";
import { useState } from "react";
@@ -7,116 +6,114 @@ import { useTranslation } from "react-i18next";
import { toast } from "sonner";
export const Route = createFileRoute("/interests")({
- validateSearch: (search: Record
+
+
+
+
+ {currentDate}
+Welcome back!
+
+ {loading ? (
+
+
+
+ ) : (
+ <>
+ {context.accounts.map((account) => (
+
+ ))}
+
+
+
+
+
+ )}
+
+
+ Add
+
+
+
+ Design by NoGood
+
+
+
+
+ Design by NoGood
+
+
-
-
-
-
- Interests
-- Pick things you'd like to see. -
-
-
-
- {TOPICS.map((topic) => (
-
-
-
- ))}
-
-
-
- 
-
-
- {topic.title}
-
- {topic.content.map((hashtag) => (
-
- ))}
-
-
+
+ );
}
diff --git a/apps/desktop2/src/routes/landing/index.tsx b/apps/desktop2/src/routes/landing/index.tsx
index f769ac26..23cc9cb8 100644
--- a/apps/desktop2/src/routes/landing/index.tsx
+++ b/apps/desktop2/src/routes/landing/index.tsx
@@ -3,82 +3,83 @@ import { Link, createFileRoute } from "@tanstack/react-router";
import { useTranslation } from "react-i18next";
export const Route = createFileRoute("/landing/")({
- component: Screen,
+ component: Screen,
});
function Screen() {
- const { t } = useTranslation();
+ const { t } = useTranslation();
- return (
-
+
+
+
+
+ Interests
++ Pick things you'd like to see. +
+
+ {TOPICS.map((topic) => (
+
+
+
+ ))}
+
+
+
+
+
+
+ {topic.title}
+
+ {topic.content.map((hashtag) => (
+
+ ))}
+
+
-
-
- );
+ return (
+
-
-
-
-
-
-
-
- 
-
-
- - {t("welcome.title")} -
-
-
- {t("welcome.signup")}
-
-
-
-
-
- {t("login.or")}
-
-
-
-
-
-
-
- Design by NoGood
-
-
-
-
- Design by NoGood
-
-
+
+
+ );
}
diff --git a/apps/desktop2/src/routes/newsfeed.tsx b/apps/desktop2/src/routes/newsfeed.tsx
index f7f8ae62..b4c781fb 100644
--- a/apps/desktop2/src/routes/newsfeed.tsx
+++ b/apps/desktop2/src/routes/newsfeed.tsx
@@ -1,152 +1,165 @@
+import { Conversation } from "@/components/conversation";
+import { Quote } from "@/components/quote";
import { RepostNote } from "@/components/repost";
import { TextNote } from "@/components/text";
import { ArrowRightCircleIcon, ArrowRightIcon } from "@lume/icons";
-import { ColumnRouteSearch, Event, Kind } from "@lume/types";
-import { Column, Spinner } from "@lume/ui";
+import { type ColumnRouteSearch, type Event, Kind } from "@lume/types";
+import { Spinner } from "@lume/ui";
import { useInfiniteQuery } from "@tanstack/react-query";
import { Link, createFileRoute } from "@tanstack/react-router";
import { Virtualizer } from "virtua";
export const Route = createFileRoute("/newsfeed")({
- validateSearch: (search: Record
+
+
+
+
+
+
+
+ 
+
+
+ + {t("welcome.title")} +
+
+
+ {t("welcome.signup")}
+
+
+
+
+
+ {t("login.or")}
+
+
+
+
+
+
+
+ Design by NoGood
+
+
+
+
+ Design by NoGood
+
+
-
- ) : null}
- {isLoading ? (
-
-
-
-
- ) : !data.length ? (
-
-
-
- ) : null}
- ; + } + + return
+ {isFetching && !isLoading && !isFetchingNextPage ? (
+
+ {data.map((item) => renderItem(item))}
+
+ )}
+ {data?.length && hasNextPage ? (
+
+ );
}
function Empty() {
- const search = Route.useSearch();
+ const search = Route.useSearch();
- return (
-
+
+ ) : null}
+ {isLoading ? (
+
+
+
+
+ ) : !data.length ? (
+
+
+
+ ) : null}
+
-
- );
+ return (
+
-
-
-
-
- Your newsfeed is empty
-- Here are few suggestions to get started. -
-
-
-
-
+
+ );
}
diff --git a/apps/desktop2/src/routes/nwc.lazy.tsx b/apps/desktop2/src/routes/nwc.lazy.tsx
index e924d934..fa11284a 100644
--- a/apps/desktop2/src/routes/nwc.lazy.tsx
+++ b/apps/desktop2/src/routes/nwc.lazy.tsx
@@ -4,59 +4,59 @@ import { createLazyFileRoute } from "@tanstack/react-router";
import { useState } from "react";
export const Route = createLazyFileRoute("/nwc")({
- component: Screen,
+ component: Screen,
});
function Screen() {
- const { ark } = Route.useRouteContext();
+ const { ark } = Route.useRouteContext();
- const [uri, setUri] = useState("");
- const [isDone, setIsDone] = useState(false);
+ const [uri, setUri] = useState("");
+ const [isDone, setIsDone] = useState(false);
- const save = async () => {
- const nwc = await ark.set_nwc(uri);
- setIsDone(nwc);
- };
+ const save = async () => {
+ const nwc = await ark.set_nwc(uri);
+ setIsDone(nwc);
+ };
- return (
-
+
+
+
+
+ Your newsfeed is empty
++ Here are few suggestions to get started. +
+
+
+ Show global newsfeed
+
+
- {!isDone ? (
- <>
-
-
-
-
-
-
- - Connect bitcoin wallet{" "} - to start zapping to your favorite content and creator. -
-
-
-
-