feat: update ui

This commit is contained in:
reya
2024-07-28 20:23:54 +07:00
parent fe0864c0ee
commit c791ea802c
9 changed files with 178 additions and 50 deletions

View File

@@ -1,7 +1,8 @@
import { commands } from "@/commands";
import { cn, getReceivers, time } from "@/commons";
import { Spinner } from "@/components/spinner";
import { ArrowUp, Paperclip } from "@phosphor-icons/react";
import { User } from "@/components/user";
import { ArrowUp, DotsThree, Paperclip } from "@phosphor-icons/react";
import * as ScrollArea from "@radix-ui/react-scroll-area";
import { useQuery, useQueryClient } from "@tanstack/react-query";
import { createFileRoute } from "@tanstack/react-router";
@@ -20,11 +21,8 @@ type Payload = {
export const Route = createFileRoute("/$account/chats/$id")({
beforeLoad: async ({ params }) => {
const inboxRelays: string[] = await invoke("get_inboxes", {
id: params.id,
});
return { inboxRelays };
const inbox: string[] = await invoke("connect_inbox", { id: params.id });
return { inbox };
},
component: Screen,
pendingComponent: Pending,
@@ -41,13 +39,48 @@ function Pending() {
function Screen() {
return (
<div className="size-full flex flex-col">
<div className="h-11 shrink-0 border-b border-neutral-100 dark:border-neutral-800" />
<Header />
<List />
<Form />
</div>
);
}
function Header() {
const { account, id } = Route.useParams();
return (
<div
data-tauri-drag-region
className="h-12 shrink-0 flex items-center justify-between px-3.5 border-b border-neutral-100 dark:border-neutral-800"
>
<div>
<div className="flex -space-x-1 overflow-hidden">
<User.Provider pubkey={account}>
<User.Root className="size-7 rounded-full inline-block ring-2 ring-white dark:ring-neutral-900">
<User.Avatar className="size-7 rounded-full" />
</User.Root>
</User.Provider>
<User.Provider pubkey={id}>
<User.Root className="size-7 rounded-full inline-block ring-2 ring-white dark:ring-neutral-900">
<User.Avatar className="size-7 rounded-full" />
</User.Root>
</User.Provider>
</div>
</div>
<div className="flex items-center gap-2">
<div className="h-7 inline-flex items-center justify-center gap-1.5 px-2 rounded-full bg-neutral-100 dark:bg-neutral-900">
<span className="relative flex size-2">
<span className="animate-ping absolute inline-flex size-full rounded-full bg-teal-400 opacity-75" />
<span className="relative inline-flex rounded-full size-2 bg-teal-500" />
</span>
<div className="text-xs leading-tight">Connected</div>
</div>
</div>
</div>
);
}
function List() {
const { account, id } = Route.useParams();
const { isLoading, isError, data } = useQuery({
@@ -195,17 +228,14 @@ function List() {
function Form() {
const { id } = Route.useParams();
const { inboxRelays } = Route.useRouteContext();
const { inbox } = Route.useRouteContext();
const [newMessage, setNewMessage] = useState("");
const [isPending, startTransition] = useTransition();
// const queryClient = useQueryClient();
const submit = async () => {
startTransition(async () => {
if (!newMessage.length) return;
if (!inboxRelays?.length) return;
const res = await commands.sendMessage(id, newMessage);
@@ -220,27 +250,19 @@ function Form() {
return (
<div className="h-12 shrink-0 flex items-center justify-center px-3.5">
{!inboxRelays.length ? (
<div className="inline-flex items-center justify-center gap-2 h-9 w-fit px-3 bg-neutral-100 dark:bg-neutral-800 rounded-full text-sm">
{!inbox.length ? (
<div className="text-xs">
This user doesn't have inbox relays. You cannot send messages to them.
</div>
) : (
<div className="flex-1 flex items-center gap-2">
<div className="inline-flex gap-px">
<div className="inline-flex gap-1">
<div
title="Attach media"
className="size-9 inline-flex items-center justify-center hover:bg-neutral-100 dark:hover:bg-neutral-800 rounded-full"
>
<Paperclip className="size-5" />
</div>
{/*
<div
title="Inbox Relays"
className="size-9 inline-flex items-center justify-center hover:bg-neutral-100 dark:hover:bg-neutral-800 rounded-full"
>
<CloudArrowUp className="size-5" />
</div>
*/}
</div>
<input
placeholder="Message..."

View File

@@ -1,13 +1,14 @@
import { commands } from "@/commands";
import { ago, cn } from "@/commons";
import { User } from "@/components/user";
import { Plus, UsersThree } from "@phosphor-icons/react";
import { DotsThree, Plus, UsersThree } from "@phosphor-icons/react";
import * as ScrollArea from "@radix-ui/react-scroll-area";
import { useQuery } from "@tanstack/react-query";
import { Link, Outlet, createLazyFileRoute } from "@tanstack/react-router";
import { listen } from "@tauri-apps/api/event";
import { Menu, MenuItem, PredefinedMenuItem } from "@tauri-apps/api/menu";
import type { NostrEvent } from "nostr-tools";
import { useEffect } from "react";
import { useCallback, useEffect } from "react";
type Payload = {
event: string;
@@ -44,14 +45,14 @@ function Header() {
>
<div className="flex items-center gap-2">
<Link
to="/new"
className="size-7 rounded-md inline-flex items-center justify-center text-neutral-600 dark:text-neutral-400 hover:bg-black/10 dark:hover:bg-white/10"
to="/contacts"
className="size-7 rounded-lg inline-flex items-center justify-center text-neutral-600 dark:text-neutral-400 hover:bg-black/5 dark:hover:bg-white/5"
>
<UsersThree className="size-4" />
</Link>
<Link
to="/new"
className="h-7 w-12 rounded-t-md rounded-b-md rounded-l-md rounded-r inline-flex items-center justify-center bg-black/5 hover:bg-black/10 dark:bg-white/5 dark:hover:bg-white/10"
className="h-7 w-12 rounded-t-lg rounded-l-lg rounded-r inline-flex items-center justify-center bg-black/5 hover:bg-black/10 dark:bg-white/5 dark:hover:bg-white/10"
>
<Plus className="size-4" />
</Link>
@@ -82,7 +83,7 @@ function ChatList() {
});
useEffect(() => {
const unlisten = listen<Payload>("event", async (data) => {
const unlisten = listen<Payload>("new_chat", async (data) => {
const event: NostrEvent = JSON.parse(data.payload.event);
const chats: NostrEvent[] = await queryClient.getQueryData(["chats"]);
@@ -99,6 +100,17 @@ function ChatList() {
return [event, ...prevEvents];
},
);
} else {
const index = chats.findIndex((item) => item.pubkey === event.pubkey);
const newEvents = [...chats];
if (index !== -1) {
newEvents[index] = {
...event,
};
await queryClient.setQueryData(["chats"], newEvents);
}
}
}
});
@@ -142,7 +154,7 @@ function ChatList() {
isActive ? "bg-black/5 dark:bg-white/5" : "",
)}
>
<User.Avatar className="size-9 rounded-full" />
<User.Avatar className="size-8 rounded-full" />
<div className="flex-1 inline-flex items-center justify-between text-sm">
<div className="inline-flex leading-tight">
<User.Name className="max-w-[8rem] truncate font-semibold" />
@@ -173,16 +185,50 @@ function ChatList() {
}
function CurrentUser() {
const { account } = Route.useParams();
const params = Route.useParams();
const navigate = Route.useNavigate();
const showContextMenu = useCallback(async (e: React.MouseEvent) => {
e.preventDefault();
const menuItems = await Promise.all([
MenuItem.new({
text: "Settings",
action: () => navigate({ to: "/" }),
}),
MenuItem.new({
text: "Feedback",
action: () => navigate({ to: "/" }),
}),
PredefinedMenuItem.new({ item: "Separator" }),
MenuItem.new({
text: "Switch account",
action: () => navigate({ to: "/" }),
}),
]);
const menu = await Menu.new({
items: menuItems,
});
await menu.popup().catch((e) => console.error(e));
}, []);
return (
<div className="shrink-0 h-12 flex items-center px-3.5 border-t border-black/5 dark:border-white/5">
<User.Provider pubkey={account}>
<div className="shrink-0 h-12 flex items-center justify-between px-3.5 border-t border-black/5 dark:border-white/5">
<User.Provider pubkey={params.account}>
<User.Root className="inline-flex items-center gap-2">
<User.Avatar className="size-8 rounded-full" />
<User.Name className="text-sm font-medium leading-tight" />
</User.Root>
</User.Provider>
<button
type="button"
onClick={(e) => showContextMenu(e)}
className="size-7 inline-flex items-center justify-center rounded-md text-neutral-700 dark:text-neutral-300 hover:bg-black/5 dark:hover:bg-white/5"
>
<DotsThree className="size-5" />
</button>
</div>
);
}

View File

@@ -0,0 +1,5 @@
import { createLazyFileRoute } from '@tanstack/react-router'
export const Route = createLazyFileRoute('/contacts')({
component: () => <div>Hello /contacts!</div>
})