From 3432005ade80eb19093fde20786251b73246cd37 Mon Sep 17 00:00:00 2001 From: Ren Amamiya <123083837+reyamir@users.noreply.github.com> Date: Thu, 3 Aug 2023 15:17:28 +0700 Subject: [PATCH] polish --- package.json | 4 +-- pnpm-lock.yaml | 32 +++++++++---------- src/app/chats/components/list.tsx | 16 +++++----- src/app/chats/components/self.tsx | 4 +-- src/app/note/index.tsx | 2 +- src/app/space/components/blocks/feed.tsx | 2 +- src/app/space/components/blocks/following.tsx | 2 +- src/app/space/components/blocks/image.tsx | 4 +-- src/app/space/components/blocks/thread.tsx | 2 +- src/app/space/components/blocks/user.tsx | 2 +- src/app/space/components/modals/image.tsx | 11 ++----- src/shared/composer/modal.tsx | 8 +++-- src/shared/notes/preview/link.tsx | 8 ++--- src/shared/notification/modal.tsx | 13 +++----- src/shared/notification/types/mention.tsx | 12 +++---- src/shared/notification/types/reaction.tsx | 6 ++-- src/shared/notification/types/repost.tsx | 4 +-- src/shared/notification/user.tsx | 20 ++++++------ 18 files changed, 69 insertions(+), 83 deletions(-) diff --git a/package.json b/package.json index 3014ede9..14399053 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ }, "dependencies": { "@headlessui/react": "^1.7.16", - "@nostr-dev-kit/ndk": "^0.8.0", + "@nostr-dev-kit/ndk": "^0.8.1", "@nostr-fetch/adapter-ndk": "^0.11.0", "@radix-ui/react-collapsible": "^1.0.3", "@radix-ui/react-dialog": "^1.0.4", @@ -93,7 +93,7 @@ "csstype": "^3.1.2", "encoding": "^0.1.13", "eslint": "^8.46.0", - "eslint-config-prettier": "^8.9.0", + "eslint-config-prettier": "^8.10.0", "eslint-plugin-jsx-a11y": "^6.7.1", "eslint-plugin-react": "^7.33.1", "eslint-plugin-simple-import-sort": "^10.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 30f77345..1d68aff6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,11 +5,11 @@ dependencies: specifier: ^1.7.16 version: 1.7.16(react-dom@18.2.0)(react@18.2.0) '@nostr-dev-kit/ndk': - specifier: ^0.8.0 - version: 0.8.0(typescript@4.9.5) + specifier: ^0.8.1 + version: 0.8.1(typescript@4.9.5) '@nostr-fetch/adapter-ndk': specifier: ^0.11.0 - version: 0.11.0(@nostr-dev-kit/ndk@0.8.0)(nostr-fetch@0.12.2) + version: 0.11.0(@nostr-dev-kit/ndk@0.8.1)(nostr-fetch@0.12.2) '@radix-ui/react-collapsible': specifier: ^1.0.3 version: 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.18)(react-dom@18.2.0)(react@18.2.0) @@ -226,8 +226,8 @@ devDependencies: specifier: ^8.46.0 version: 8.46.0 eslint-config-prettier: - specifier: ^8.9.0 - version: 8.9.0(eslint@8.46.0) + specifier: ^8.10.0 + version: 8.10.0(eslint@8.46.0) eslint-plugin-jsx-a11y: specifier: ^6.7.1 version: 6.7.1(eslint@8.46.0) @@ -1131,8 +1131,8 @@ packages: '@nodelib/fs.scandir': 2.1.5 fastq: 1.15.0 - /@nostr-dev-kit/ndk@0.8.0(typescript@4.9.5): - resolution: {integrity: sha512-SFrB7dW80kMZgquw33OUEjDpE5JJD11PsS/ET4Lxl5FtYMHP/unR61BmcIsCPhBXLm+0Pf2QqAq+N5/BYVZqEA==} + /@nostr-dev-kit/ndk@0.8.1(typescript@4.9.5): + resolution: {integrity: sha512-uI41sCs+7CxtKGIKXQGZjdwvksfeCwd83bB2yrJCePx4oIkEMMH1gVRYsNfQIMFBPejnU2bfBqcO2zEP9RzIFg==} dependencies: '@noble/hashes': 1.3.1 '@noble/secp256k1': 2.0.0 @@ -1143,7 +1143,7 @@ packages: esbuild: 0.17.19 esbuild-plugin-alias: 0.2.1 eslint: 8.46.0 - eslint-config-prettier: 8.9.0(eslint@8.46.0) + eslint-config-prettier: 8.10.0(eslint@8.46.0) eslint-plugin-import: 2.28.0(@typescript-eslint/parser@5.62.0)(eslint@8.46.0) esm-loader-typescript: 1.0.5 eventemitter3: 5.0.1 @@ -1160,13 +1160,13 @@ packages: - typescript dev: false - /@nostr-fetch/adapter-ndk@0.11.0(@nostr-dev-kit/ndk@0.8.0)(nostr-fetch@0.12.2): + /@nostr-fetch/adapter-ndk@0.11.0(@nostr-dev-kit/ndk@0.8.1)(nostr-fetch@0.12.2): resolution: {integrity: sha512-Otl7SEzm9ecqyHB10bpYXBu1qpqJEnipp7dZ4qcA9LeJAtM38fnYKUD34HX0JXA9EDjtc6VS5UNZe544xC9GCg==} peerDependencies: '@nostr-dev-kit/ndk': ^0.5.0 nostr-fetch: ^0.11.0 dependencies: - '@nostr-dev-kit/ndk': 0.8.0(typescript@4.9.5) + '@nostr-dev-kit/ndk': 0.8.1(typescript@4.9.5) '@nostr-fetch/kernel': 0.11.0 nostr-fetch: 0.12.2 dev: false @@ -2837,7 +2837,7 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.21.10 - caniuse-lite: 1.0.30001518 + caniuse-lite: 1.0.30001519 fraction.js: 4.2.0 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -2908,7 +2908,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001518 + caniuse-lite: 1.0.30001519 electron-to-chromium: 1.4.482 node-releases: 2.0.13 update-browserslist-db: 1.0.11(browserslist@4.21.10) @@ -2968,8 +2968,8 @@ packages: engines: {node: '>=6'} dev: false - /caniuse-lite@1.0.30001518: - resolution: {integrity: sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==} + /caniuse-lite@1.0.30001519: + resolution: {integrity: sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==} /case-anything@2.1.13: resolution: {integrity: sha512-zlOQ80VrQ2Ue+ymH5OuM/DlDq64mEm+B9UTdHULv5osUMD6HalNTblf2b1u/m6QecjsnOkBpqVZ+XPwIVsy7Ng==} @@ -3596,8 +3596,8 @@ packages: engines: {node: '>=12'} dev: false - /eslint-config-prettier@8.9.0(eslint@8.46.0): - resolution: {integrity: sha512-+sbni7NfVXnOpnRadUA8S28AUlsZt9GjgFvABIRL9Hkn8KqNzOp+7Lw4QWtrwn20KzU3wqu1QoOj2m+7rKRqkA==} + /eslint-config-prettier@8.10.0(eslint@8.46.0): + resolution: {integrity: sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==} hasBin: true peerDependencies: eslint: '>=7.0.0' diff --git a/src/app/chats/components/list.tsx b/src/app/chats/components/list.tsx index 82f22cf5..3caa260b 100644 --- a/src/app/chats/components/list.tsx +++ b/src/app/chats/components/list.tsx @@ -34,12 +34,12 @@ export function ChatsList() { return (
-
-
+
+
-
-
+
+
); @@ -51,15 +51,15 @@ export function ChatsList() { ) : (
-
-
+
+
)} {chats.follows.map((item) => renderItem(item))} {isFetching && (
-
-
+
+
)} {chats.unknowns.length > 0 && } diff --git a/src/app/chats/components/self.tsx b/src/app/chats/components/self.tsx index 576097cd..2e3b2ca8 100644 --- a/src/app/chats/components/self.tsx +++ b/src/app/chats/components/self.tsx @@ -14,9 +14,9 @@ export function ChatsListSelfItem({ data }: { data: { pubkey: string } }) { if (status === 'loading') { return (
-
+
-
+
); diff --git a/src/app/note/index.tsx b/src/app/note/index.tsx index bd019934..36433de4 100644 --- a/src/app/note/index.tsx +++ b/src/app/note/index.tsx @@ -23,7 +23,7 @@ export function NoteScreen() {
{status === 'loading' ? (
-
+
diff --git a/src/app/space/components/blocks/feed.tsx b/src/app/space/components/blocks/feed.tsx index aaedb74e..90fa5479 100644 --- a/src/app/space/components/blocks/feed.tsx +++ b/src/app/space/components/blocks/feed.tsx @@ -156,7 +156,7 @@ export function FeedBlock({ params }: { params: Block }) { )} {isFetchingNextPage && (
-
+
diff --git a/src/app/space/components/blocks/following.tsx b/src/app/space/components/blocks/following.tsx index c1c799af..9a6aff52 100644 --- a/src/app/space/components/blocks/following.tsx +++ b/src/app/space/components/blocks/following.tsx @@ -177,7 +177,7 @@ export function FollowingBlock() { )} {isFetchingNextPage && (
-
+
diff --git a/src/app/space/components/blocks/image.tsx b/src/app/space/components/blocks/image.tsx index 890961cc..1ead2a53 100644 --- a/src/app/space/components/blocks/image.tsx +++ b/src/app/space/components/blocks/image.tsx @@ -10,7 +10,7 @@ export function ImageBlock({ params }: { params: Block }) { const { remove } = useBlock(); return ( -
+
@@ -28,7 +28,7 @@ export function ImageBlock({ params }: { params: Block }) { src={params.content} fallback={DEFAULT_AVATAR} alt={params.title} - className="h-full w-full rounded-xl border-t border-zinc-800/50 object-cover" + className="h-full w-full rounded-xl object-cover" />
diff --git a/src/app/space/components/blocks/thread.tsx b/src/app/space/components/blocks/thread.tsx index 30a24464..4bd33794 100644 --- a/src/app/space/components/blocks/thread.tsx +++ b/src/app/space/components/blocks/thread.tsx @@ -27,7 +27,7 @@ export function ThreadBlock({ params }: { params: Block }) {
{status === 'loading' ? (
-
+
diff --git a/src/app/space/components/blocks/user.tsx b/src/app/space/components/blocks/user.tsx index 14d6e627..4604d6c8 100644 --- a/src/app/space/components/blocks/user.tsx +++ b/src/app/space/components/blocks/user.tsx @@ -51,7 +51,7 @@ export function UserBlock({ params }: { params: Block }) {
{status === 'loading' ? (
-
+
diff --git a/src/app/space/components/modals/image.tsx b/src/app/space/components/modals/image.tsx index 06a8dc99..487d9692 100644 --- a/src/app/space/components/modals/image.tsx +++ b/src/app/space/components/modals/image.tsx @@ -116,12 +116,7 @@ export function ImageModal() { onSubmit={handleSubmit(onSubmit)} className="mb-0 flex h-full w-full flex-col gap-3" > - +
-
+
uploadImage()} type="button" - className="inline-flex h-6 items-center justify-center rounded bg-zinc-900 px-3 text-sm font-medium text-zinc-300 ring-1 ring-zinc-800 hover:bg-zinc-800" + className="inline-flex h-6 items-center justify-center rounded bg-white/10 px-3 text-sm font-medium text-white hover:bg-fuchsia-500" > Upload diff --git a/src/shared/composer/modal.tsx b/src/shared/composer/modal.tsx index f3a0e4f8..446f4248 100644 --- a/src/shared/composer/modal.tsx +++ b/src/shared/composer/modal.tsx @@ -1,7 +1,6 @@ import * as Dialog from '@radix-ui/react-dialog'; import { useHotkeys } from 'react-hotkeys-hook'; -import { Button } from '@shared/button'; import { Composer, ComposerUser } from '@shared/composer'; import { CancelIcon, @@ -28,10 +27,13 @@ export function ComposerModal() { return ( - + diff --git a/src/shared/notes/preview/link.tsx b/src/shared/notes/preview/link.tsx index 4b8ce8de..42b374d4 100644 --- a/src/shared/notes/preview/link.tsx +++ b/src/shared/notes/preview/link.tsx @@ -10,11 +10,11 @@ export function LinkPreview({ urls }: { urls: string[] }) {
{status === 'loading' ? (
-
+
-
-
- +
+
+ {domain.hostname}
diff --git a/src/shared/notification/modal.tsx b/src/shared/notification/modal.tsx index e9eb7504..33e615a8 100644 --- a/src/shared/notification/modal.tsx +++ b/src/shared/notification/modal.tsx @@ -60,19 +60,14 @@ export function NotificationModal({ pubkey }: { pubkey: string }) {
-
+
Notification - - + +
@@ -80,7 +75,7 @@ export function NotificationModal({ pubkey }: { pubkey: string }) {
-
+
{status === 'loading' ? (
diff --git a/src/shared/notification/types/mention.tsx b/src/shared/notification/types/mention.tsx index 03e6bb3b..b6ff48db 100644 --- a/src/shared/notification/types/mention.tsx +++ b/src/shared/notification/types/mention.tsx @@ -13,20 +13,16 @@ export function NotiMention({ event }: { event: NDKEvent }) { const content = useMemo(() => parser(event), [event]); return ( -
+

reply your post

-
- {createdAt} -
+ {createdAt}
-
-
- -
+
+ {replyTo && }
diff --git a/src/shared/notification/types/reaction.tsx b/src/shared/notification/types/reaction.tsx index 2d589988..948f7811 100644 --- a/src/shared/notification/types/reaction.tsx +++ b/src/shared/notification/types/reaction.tsx @@ -10,17 +10,17 @@ export function NotiReaction({ event }: { event: NDKEvent }) { const createdAt = formatCreatedAt(event.created_at); return ( -
+

reacted {event.content}

- {createdAt} + {createdAt}
-
{root && }
+
{root && }
); } diff --git a/src/shared/notification/types/repost.tsx b/src/shared/notification/types/repost.tsx index 4c6e9f3f..a721880a 100644 --- a/src/shared/notification/types/repost.tsx +++ b/src/shared/notification/types/repost.tsx @@ -10,7 +10,7 @@ export function NotiRepost({ event }: { event: NDKEvent }) { const createdAt = formatCreatedAt(event.created_at); return ( -
+
@@ -20,7 +20,7 @@ export function NotiRepost({ event }: { event: NDKEvent }) { {createdAt}
-
{root && }
+
{root && }
); } diff --git a/src/shared/notification/user.tsx b/src/shared/notification/user.tsx index 9c58b61c..bc7dbe29 100644 --- a/src/shared/notification/user.tsx +++ b/src/shared/notification/user.tsx @@ -20,17 +20,15 @@ export function NotiUser({ pubkey }: { pubkey: string }) { } return ( -
-
- {pubkey} -
- - {user?.nip05 || user?.name || user?.displayName || displayNpub(pubkey, 16)} +
+ {pubkey} + + {user?.nip05 || user?.name || user?.display_name || displayNpub(pubkey, 16)}
);