small updates

lumehq · Aug 12, 2023 · 9e5f15e · 9e5f15e
1 parent bb089bb
commit 9e5f15e
Show file tree

Hide file tree

Showing 10 changed files with 112 additions and 82 deletions.
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
     "@headlessui/react": "^1.7.16",
     "@nostr-dev-kit/ndk": "^0.8.11",
     "@nostr-fetch/adapter-ndk": "^0.11.0",
+    "@radix-ui/react-alert-dialog": "^1.0.4",
     "@radix-ui/react-collapsible": "^1.0.3",
     "@radix-ui/react-dialog": "^1.0.4",
     "@radix-ui/react-popover": "^1.0.6",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/app/space/components/modals/feed.tsx b/src/app/space/components/modals/feed.tsx
@@ -1,42 +1,31 @@
 import { Combobox } from '@headlessui/react';
 import * as Dialog from '@radix-ui/react-dialog';
-import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { nip19 } from 'nostr-tools';
 import { useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { useHotkeys } from 'react-hotkeys-hook';
 
 import { User } from '@app/auth/components/user';
 
-import { createWidget } from '@libs/storage';
-
 import { CancelIcon, CheckCircleIcon, CommandIcon, LoaderIcon } from '@shared/icons';
 
 import { BLOCK_KINDS, DEFAULT_AVATAR } from '@stores/constants';
 import { ADD_FEEDBLOCK_SHORTCUT } from '@stores/shortcuts';
+import { useWidgets } from '@stores/widgets';
 
 import { useAccount } from '@utils/hooks/useAccount';
 
 export function FeedModal() {
-  const queryClient = useQueryClient();
-
   const [open, setOpen] = useState(false);
   const [loading, setLoading] = useState(false);
   const [selected, setSelected] = useState([]);
   const [query, setQuery] = useState('');
 
   const { status, account } = useAccount();
 
-  useHotkeys(ADD_FEEDBLOCK_SHORTCUT, () => setOpen(true));
+  const setWidget = useWidgets((state) => state.setWidget);
 
-  const block = useMutation({
-    mutationFn: (data: { kind: number; title: string; content: string }) => {
-      return createWidget(data.kind, data.title, data.content);
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ['blocks'] });
-    },
-  });
+  useHotkeys(ADD_FEEDBLOCK_SHORTCUT, () => setOpen(true));
 
   const {
     register,
@@ -55,7 +44,7 @@ export function FeedModal() {
     });
 
     // insert to database
-    block.mutate({
+    setWidget({
       kind: BLOCK_KINDS.feed,
       title: data.title,
       content: JSON.stringify(selected),
@@ -83,7 +72,7 @@ export function FeedModal() {
               <span className="text-sm leading-none text-white">F</span>
             </div>
           </div>
-          <h5 className="font-medium text-white/50">New feed block</h5>
+          <h5 className="font-medium text-white/50">Add newsfeed widget</h5>
         </button>
       </Dialog.Trigger>
       <Dialog.Portal className="relative z-10">

diff --git a/src/app/space/components/modals/hashtag.tsx b/src/app/space/components/modals/hashtag.tsx
@@ -1,22 +1,20 @@
 import * as Dialog from '@radix-ui/react-dialog';
-import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { useHotkeys } from 'react-hotkeys-hook';
 
-import { createWidget } from '@libs/storage';
-
 import { CancelIcon, CommandIcon, LoaderIcon } from '@shared/icons';
 
 import { BLOCK_KINDS } from '@stores/constants';
 import { ADD_HASHTAGBLOCK_SHORTCUT } from '@stores/shortcuts';
+import { useWidgets } from '@stores/widgets';
 
 export function HashtagModal() {
-  const queryClient = useQueryClient();
-
   const [loading, setLoading] = useState(false);
   const [open, setOpen] = useState(false);
 
+  const setWidget = useWidgets((state) => state.setWidget);
+
   useHotkeys(ADD_HASHTAGBLOCK_SHORTCUT, () => setOpen(false));
 
   const {
@@ -26,20 +24,11 @@ export function HashtagModal() {
     formState: { isDirty, isValid },
   } = useForm();
 
-  const block = useMutation({
-    mutationFn: (data: { kind: number; title: string; content: string }) => {
-      return createWidget(data.kind, data.title, data.content);
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ['blocks'] });
-    },
-  });
-
   const onSubmit = async (data: { hashtag: string }) => {
     setLoading(true);
 
     // mutate
-    block.mutate({
+    setWidget({
       kind: BLOCK_KINDS.hashtag,
       title: data.hashtag,
       content: data.hashtag.replace('#', ''),
@@ -67,7 +56,7 @@ export function HashtagModal() {
               <span className="text-sm leading-none text-white">T</span>
             </div>
           </div>
-          <h5 className="font-medium text-white/50">New hashtag block</h5>
+          <h5 className="font-medium text-white/50">Add hashtag widget</h5>
         </button>
       </Dialog.Trigger>
       <Dialog.Portal className="relative z-10">

diff --git a/src/app/space/components/modals/image.tsx b/src/app/space/components/modals/image.tsx
@@ -1,32 +1,25 @@
 import * as Dialog from '@radix-ui/react-dialog';
-import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { useHotkeys } from 'react-hotkeys-hook';
 
-import { createWidget } from '@libs/storage';
-
 import { CancelIcon, CommandIcon, LoaderIcon } from '@shared/icons';
 import { Image } from '@shared/image';
 
 import { BLOCK_KINDS, DEFAULT_AVATAR } from '@stores/constants';
 import { ADD_IMAGEBLOCK_SHORTCUT } from '@stores/shortcuts';
+import { useWidgets } from '@stores/widgets';
 
-import { useNostr } from '@utils/hooks/useNostr';
 import { useImageUploader } from '@utils/hooks/useUploader';
 
 export function ImageModal() {
-  const queryClient = useQueryClient();
   const upload = useImageUploader();
-
-  const { publish } = useNostr();
+  const setWidget = useWidgets((state) => state.setWidget);
 
   const [open, setOpen] = useState(false);
   const [loading, setLoading] = useState(false);
   const [image, setImage] = useState('');
 
-  const tags = useRef(null);
-
   useHotkeys(ADD_IMAGEBLOCK_SHORTCUT, () => setOpen(false));
 
   const {
@@ -37,17 +30,8 @@ export function ImageModal() {
     formState: { isDirty, isValid },
   } = useForm();
 
-  const block = useMutation({
-    mutationFn: (data: { kind: number; title: string; content: string }) => {
-      return createWidget(data.kind, data.title, data.content);
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ['blocks'] });
-    },
-  });
-
   const uploadImage = async () => {
-    const image = await upload(null);
+    const image = await upload(null, true);
     if (image.url) {
       setImage(image.url);
     }
@@ -56,11 +40,8 @@ export function ImageModal() {
   const onSubmit = async (data: { kind: number; title: string; content: string }) => {
     setLoading(true);
 
-    // publish file metedata
-    await publish({ content: data.title, kind: 1063, tags: tags.current });
-
     // mutate
-    block.mutate({ kind: BLOCK_KINDS.image, title: data.title, content: data.content });
+    setWidget({ kind: BLOCK_KINDS.image, title: data.title, content: data.content });
 
     setLoading(false);
     // reset form
@@ -88,7 +69,7 @@ export function ImageModal() {
               <span className="text-sm leading-none text-white">I</span>
             </div>
           </div>
-          <h5 className="font-medium text-white/50">New image block</h5>
+          <h5 className="font-medium text-white/50">Add image widget</h5>
         </button>
       </Dialog.Trigger>
       <Dialog.Portal className="relative z-10">

diff --git a/src/app/splash.tsx b/src/app/splash.tsx
@@ -14,7 +14,8 @@ export function SplashScreen() {
   const { status, account } = useAccount();
   const { fetchChats, fetchNotes } = useNostr();
 
-  const [loading, setLoading] = useState(true);
+  const [loading, setLoading] = useState<boolean>(true);
+  const [error, setError] = useState<null | string>(null);
 
   const skip = async () => {
     await invoke('close_splashscreen');
@@ -34,6 +35,7 @@ export function SplashScreen() {
       invoke('close_splashscreen');
     } else {
       setLoading(false);
+      setError(notes.message || chats.message);
       console.log('fetch notes failed, error: ', notes.message);
       console.log('fetch chats failed, error: ', chats.message);
     }
@@ -72,9 +74,7 @@ export function SplashScreen() {
               <h3 className="text-lg font-semibold leading-none text-white">
                 Something wrong!
               </h3>
-              <p className="text-sm text-white/50">
-                Connect process failed, click skip to continue.
-              </p>
+              <p className="text-sm text-white/50">{error}</p>
               <button
                 type="button"
                 onClick={skip}

diff --git a/src/shared/notes/actions/repost.tsx b/src/shared/notes/actions/repost.tsx
@@ -1,37 +1,78 @@
+import * as AlertDialog from '@radix-ui/react-alert-dialog';
 import * as Tooltip from '@radix-ui/react-tooltip';
+import { useState } from 'react';
 
 import { RepostIcon } from '@shared/icons';
 
 import { useNostr } from '@utils/hooks/useNostr';
 
 export function NoteRepost({ id, pubkey }: { id: string; pubkey: string }) {
   const { publish } = useNostr();
+  const [open, setOpen] = useState(false);
 
   const submit = async () => {
     const tags = [
       ['e', id, 'wss://relayable.org', 'root'],
       ['p', pubkey],
     ];
-    await publish({ content: '', kind: 6, tags: tags });
+    const event = await publish({ content: '', kind: 6, tags: tags });
+    if (event) {
+      setOpen(false);
+    } else {
+      console.log('failed reposting');
+    }
   };
 
   return (
-    <Tooltip.Root delayDuration={150}>
-      <Tooltip.Trigger asChild>
-        <button
-          type="button"
-          onClick={() => submit()}
-          className="group inline-flex h-7 w-7 items-center justify-center"
-        >
-          <RepostIcon className="h-5 w-5 text-white group-hover:text-blue-400" />
-        </button>
-      </Tooltip.Trigger>
-      <Tooltip.Portal>
-        <Tooltip.Content className="-left-10 select-none rounded-md bg-black px-3.5 py-1.5 text-sm leading-none text-white will-change-[transform,opacity] data-[state=delayed-open]:data-[side=bottom]:animate-slideUpAndFade data-[state=delayed-open]:data-[side=left]:animate-slideRightAndFade data-[state=delayed-open]:data-[side=right]:animate-slideLeftAndFade data-[state=delayed-open]:data-[side=top]:animate-slideDownAndFade">
-          Repost
-          <Tooltip.Arrow className="fill-black" />
-        </Tooltip.Content>
-      </Tooltip.Portal>
-    </Tooltip.Root>
+    <AlertDialog.Root open={open} onOpenChange={setOpen}>
+      <Tooltip.Root delayDuration={150}>
+        <Tooltip.Trigger asChild>
+          <AlertDialog.Trigger asChild>
+            <button
+              type="button"
+              className="group inline-flex h-7 w-7 items-center justify-center"
+            >
+              <RepostIcon className="h-5 w-5 text-white group-hover:text-blue-400" />
+            </button>
+          </AlertDialog.Trigger>
+        </Tooltip.Trigger>
+        <Tooltip.Portal>
+          <Tooltip.Content className="-left-10 select-none rounded-md bg-black px-3.5 py-1.5 text-sm leading-none text-white will-change-[transform,opacity] data-[state=delayed-open]:data-[side=bottom]:animate-slideUpAndFade data-[state=delayed-open]:data-[side=left]:animate-slideRightAndFade data-[state=delayed-open]:data-[side=right]:animate-slideLeftAndFade data-[state=delayed-open]:data-[side=top]:animate-slideDownAndFade">
+            Repostr
+            <Tooltip.Arrow className="fill-black" />
+          </Tooltip.Content>
+        </Tooltip.Portal>
+      </Tooltip.Root>
+      <AlertDialog.Portal className="relative z-10">
+        <AlertDialog.Overlay className="fixed inset-0 z-50 bg-black/80 backdrop-blur-xl" />
+        <AlertDialog.Content className="fixed inset-0 z-50 flex min-h-full items-center justify-center">
+          <div className="relative h-min w-full max-w-xl rounded-xl bg-white/10">
+            <div className="flex flex-col gap-2 border-b border-white/5 px-5 py-4">
+              <AlertDialog.Title className="text-lg font-semibold leading-none text-white">
+                Confirm repostr this postr?
+              </AlertDialog.Title>
+              <AlertDialog.Description className="text-sm leading-none text-white/50">
+                Repostred postr will be visible to your followers, and you cannot undo
+                this action.
+              </AlertDialog.Description>
+            </div>
+            <div className="flex justify-end gap-6 px-5 py-3">
+              <AlertDialog.Cancel asChild>
+                <button className="inline-flex h-11 items-center justify-center rounded-lg bg-white/10 px-4 font-medium leading-none text-white outline-none">
+                  Cancel
+                </button>
+              </AlertDialog.Cancel>
+              <button
+                type="button"
+                onClick={() => submit()}
+                className="inline-flex h-11 items-center justify-center rounded-lg bg-fuchsia-500 px-4 font-medium leading-none text-white outline-none"
+              >
+                Yes, repostr
+              </button>
+            </div>
+          </div>
+        </AlertDialog.Content>
+      </AlertDialog.Portal>
+    </AlertDialog.Root>
   );
 }
diff --git a/src/shared/notification/types/repost.tsx b/src/shared/notification/types/repost.tsx
@@ -14,7 +14,7 @@ export function NotiRepost({ event }: { event: NDKEvent }) {
       <div className="flex items-start justify-between">
         <div className="flex items-start gap-1">
           <NotiUser pubkey={event.pubkey} />
-          <p className="leading-none text-white/50">repost your postr</p>
+          <p className="leading-none text-white/50">repostr your postr</p>
         </div>
         <div>
           <span className="leading-none text-white/50">{createdAt}</span>

diff --git a/src/shared/user.tsx b/src/shared/user.tsx
@@ -52,7 +52,7 @@ export function User({
     <Popover.Root>
       <div
         className={twMerge(
-          'relative z-30 flex',
+          'relative z-10 flex',
           size === 'small' ? 'items-center gap-2' : 'items-start gap-3'
         )}
       >