-
+
{user?.nip05 ||
- user?.displayName ||
user?.name ||
+ user?.displayName ||
shortenKey(data.sender_pubkey)}
diff --git a/src/app/settings/account.tsx b/src/app/settings/account.tsx
new file mode 100644
index 00000000..984d1c70
--- /dev/null
+++ b/src/app/settings/account.tsx
@@ -0,0 +1,7 @@
+export function AccountSettingsScreen() {
+ return (
+
+
Account
+
+ );
+}
diff --git a/src/app/settings/general.tsx b/src/app/settings/general.tsx
new file mode 100644
index 00000000..df9e5701
--- /dev/null
+++ b/src/app/settings/general.tsx
@@ -0,0 +1,7 @@
+export function GeneralSettingsScreen() {
+ return (
+
+
General
+
+ );
+}
diff --git a/src/app/settings/shortcuts.tsx b/src/app/settings/shortcuts.tsx
new file mode 100644
index 00000000..610fce3b
--- /dev/null
+++ b/src/app/settings/shortcuts.tsx
@@ -0,0 +1,7 @@
+export function ShortcutsSettingsScreen() {
+ return (
+
+
Shortcuts
+
+ );
+}
diff --git a/src/app/settings/update.tsx b/src/app/settings/update.tsx
new file mode 100644
index 00000000..362a35a1
--- /dev/null
+++ b/src/app/settings/update.tsx
@@ -0,0 +1,7 @@
+export function UpdateSettingsScreen() {
+ return (
+
+
Update
+
+ );
+}
diff --git a/src/app/user/components/feed.tsx b/src/app/user/components/feed.tsx
index 79309bee..16b2e30f 100644
--- a/src/app/user/components/feed.tsx
+++ b/src/app/user/components/feed.tsx
@@ -1,19 +1,32 @@
-import { getNotesByPubkey } from "@libs/storage";
+import { NDKFilter } from "@nostr-dev-kit/ndk";
import { Note } from "@shared/notes/note";
+import { RelayContext } from "@shared/relayProvider";
import { useQuery } from "@tanstack/react-query";
+import { dateToUnix, getHourAgo } from "@utils/date";
import { LumeEvent } from "@utils/types";
+import { useContext } from "react";
export function UserFeed({ pubkey }: { pubkey: string }) {
+ const ndk = useContext(RelayContext);
const { status, data } = useQuery(["user-feed", pubkey], async () => {
- return await getNotesByPubkey(pubkey);
+ const now = new Date();
+ const filter: NDKFilter = {
+ kinds: [1],
+ authors: [pubkey],
+ since: dateToUnix(getHourAgo(48, now)),
+ };
+ const events = await ndk.fetchEvents(filter);
+ return [...events];
});
return (
-
+
{status === "loading" ? (
-
Loading...
+
) : (
- data.map((note: LumeEvent) =>
)
+ data.map((note: LumeEvent) =>
)
)}
);
diff --git a/src/app/user/index.tsx b/src/app/user/index.tsx
index 8ed02fec..66fdb1b1 100644
--- a/src/app/user/index.tsx
+++ b/src/app/user/index.tsx
@@ -145,7 +145,7 @@ export function UserScreen() {
} font-medium inline-flex items-center gap-2 h-10 border-t`}
>
- Posts
+ Activities from 48 hours ago
)}
diff --git a/src/libs/storage.tsx b/src/libs/storage.tsx
index 2bab3ebc..1f02bcd2 100644
--- a/src/libs/storage.tsx
+++ b/src/libs/storage.tsx
@@ -400,7 +400,21 @@ export async function createBlock(kind: number, title: string, content: any) {
);
}
+// remove block
export async function removeBlock(id: string) {
const db = await connect();
return await db.execute(`DELETE FROM blocks WHERE id = "${id}";`);
}
+
+// logout
+export async function removeAll() {
+ const db = await connect();
+ await db.execute(`UPDATE settings SET value = "0" WHERE key = "last_login";`);
+ await db.execute("DELETE FROM replies;");
+ await db.execute("DELETE FROM notes;");
+ await db.execute("DELETE FROM blacklist;");
+ await db.execute("DELETE FROM blocks;");
+ await db.execute("DELETE FROM chats;");
+ await db.execute("DELETE FROM accounts;");
+ return true;
+}
diff --git a/src/shared/icons/index.tsx b/src/shared/icons/index.tsx
index 5c4c0c9f..5e4db457 100644
--- a/src/shared/icons/index.tsx
+++ b/src/shared/icons/index.tsx
@@ -39,4 +39,6 @@ export * from "./cmd";
export * from "./verticalDots";
export * from "./signal";
export * from "./unverified";
+export * from "./settings";
+export * from "./logout";
// @endindex
diff --git a/src/shared/icons/logout.tsx b/src/shared/icons/logout.tsx
new file mode 100644
index 00000000..aa31d985
--- /dev/null
+++ b/src/shared/icons/logout.tsx
@@ -0,0 +1,24 @@
+import { SVGProps } from "react";
+
+export function LogoutIcon(
+ props: JSX.IntrinsicAttributes & SVGProps
,
+) {
+ return (
+
+ );
+}
diff --git a/src/shared/icons/settings.tsx b/src/shared/icons/settings.tsx
new file mode 100644
index 00000000..f7a59720
--- /dev/null
+++ b/src/shared/icons/settings.tsx
@@ -0,0 +1,29 @@
+import { SVGProps } from "react";
+
+export function SettingsIcon(
+ props: JSX.IntrinsicAttributes & SVGProps,
+) {
+ return (
+
+ );
+}
diff --git a/src/shared/logout.tsx b/src/shared/logout.tsx
new file mode 100644
index 00000000..86aeb4cb
--- /dev/null
+++ b/src/shared/logout.tsx
@@ -0,0 +1,123 @@
+import { Dialog, Transition } from "@headlessui/react";
+import { removeAll } from "@libs/storage";
+import { CancelIcon, LogoutIcon } from "@shared/icons";
+import { useQueryClient } from "@tanstack/react-query";
+import { relaunch } from "@tauri-apps/api/process";
+import { Fragment, useState } from "react";
+
+export function Logout() {
+ const queryClient = useQueryClient();
+ const [isOpen, setIsOpen] = useState(false);
+
+ const closeModal = () => {
+ setIsOpen(false);
+ };
+
+ const openModal = () => {
+ setIsOpen(true);
+ };
+
+ const logout = async () => {
+ // reset database
+ await removeAll();
+ // reset react query
+ queryClient.clear();
+ // navigate
+ await relaunch();
+ };
+
+ return (
+ <>
+
+
+
+
+
+ );
+}
diff --git a/src/shared/lumeBar.tsx b/src/shared/lumeBar.tsx
index b86810f1..292c095a 100644
--- a/src/shared/lumeBar.tsx
+++ b/src/shared/lumeBar.tsx
@@ -1,68 +1,30 @@
-import { Transition } from "@headlessui/react";
-import { getActiveAccount } from "@libs/storage";
import { ActiveAccount } from "@shared/accounts/active";
-import { VerticalDotsIcon } from "@shared/icons";
-import { RelayManager } from "@shared/relayManager";
-import { useQuery } from "@tanstack/react-query";
-import { useState } from "react";
+import { SettingsIcon } from "@shared/icons";
+import { Logout } from "@shared/logout";
+import { Notification } from "@shared/notification";
+import { useAccount } from "@utils/hooks/useAccount";
import { Link } from "react-router-dom";
export function LumeBar() {
- const { status, data: activeAccount } = useQuery(
- ["activeAccount"],
- async () => {
- return await getActiveAccount();
- },
- );
-
- const [open, setOpen] = useState(false);
-
- const toggleMenu = () => {
- setOpen((isOpen) => !isOpen);
- };
+ const { status, account } = useAccount();
return (
-
+
-
- {status === "loading" ? (
-
- ) : (
-
- )}
-
-
-
+
+
+
-
-
- Settings
-
-
- Logout
-
-
);
}
diff --git a/src/shared/navigation.tsx b/src/shared/navigation.tsx
index 6b3d9312..68a9325f 100644
--- a/src/shared/navigation.tsx
+++ b/src/shared/navigation.tsx
@@ -7,14 +7,10 @@ import { LumeBar } from "@shared/lumeBar";
import { NavLink } from "react-router-dom";
import { twMerge } from "tailwind-merge";
-export function Navigation({ reverse = false }: { reverse?: boolean }) {
+export function Navigation() {
return (
-
-
+
+
@@ -117,7 +113,7 @@ export function Navigation({ reverse = false }: { reverse?: boolean }) {
)}
-
diff --git a/src/shared/notification.tsx b/src/shared/notification.tsx
new file mode 100644
index 00000000..9ef57384
--- /dev/null
+++ b/src/shared/notification.tsx
@@ -0,0 +1,58 @@
+import { Dialog, Transition } from "@headlessui/react";
+import { BellIcon } from "@shared/icons";
+import { Fragment, useState } from "react";
+
+export function Notification() {
+ const [isOpen, setIsOpen] = useState(false);
+
+ const closeModal = () => {
+ setIsOpen(false);
+ };
+
+ const openModal = () => {
+ setIsOpen(true);
+ };
+
+ return (
+ <>
+
+
+
+
+
+ );
+}
diff --git a/src/shared/relayManager.tsx b/src/shared/relayManager.tsx
deleted file mode 100644
index c249835d..00000000
--- a/src/shared/relayManager.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { SignalIcon } from "@shared/icons";
-
-export function RelayManager() {
- return (
-
- );
-}
diff --git a/src/shared/settingsLayout.tsx b/src/shared/settingsLayout.tsx
new file mode 100644
index 00000000..f5a79bcf
--- /dev/null
+++ b/src/shared/settingsLayout.tsx
@@ -0,0 +1,74 @@
+import { AppHeader } from "@shared/appHeader";
+import { NavLink, Outlet, ScrollRestoration } from "react-router-dom";
+import { twMerge } from "tailwind-merge";
+
+export function SettingsLayout() {
+ return (
+
+
+
+
+
+
+
+
+ Settings
+
+
+
+
+ twMerge(
+ "flex h-9 items-center gap-2.5 rounded-md px-2.5 text-zinc-200",
+ isActive ? "bg-zinc-900/50" : "",
+ )
+ }
+ >
+ General
+
+
+ twMerge(
+ "flex h-9 items-center gap-2.5 rounded-md px-2.5 text-zinc-200",
+ isActive ? "bg-zinc-900/50" : "",
+ )
+ }
+ >
+ Shortcuts
+
+
+ twMerge(
+ "flex h-9 items-center gap-2.5 rounded-md px-2.5 text-zinc-200",
+ isActive ? "bg-zinc-900/50" : "",
+ )
+ }
+ >
+ Account
+
+
+ twMerge(
+ "flex h-9 items-center gap-2.5 rounded-md px-2.5 text-zinc-200",
+ isActive ? "bg-zinc-900/50" : "",
+ )
+ }
+ >
+ Update
+
+
+
+
+
+
+
+
+
+
+
+ );
+}