diff --git a/package.json b/package.json index 5e3cc679..00e7ac90 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "@nanostores/persistent": "^0.7.0", "@nanostores/react": "^0.4.1", "@radix-ui/react-dialog": "^1.0.2", + "@radix-ui/react-icons": "^1.2.0", "@tauri-apps/api": "^1.2.0", "@uiw/react-markdown-preview": "^4.1.8", "@uiw/react-md-editor": "^3.20.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3415ec40..612140bf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,7 @@ specifiers: '@nanostores/persistent': ^0.7.0 '@nanostores/react': ^0.4.1 '@radix-ui/react-dialog': ^1.0.2 + '@radix-ui/react-icons': ^1.2.0 '@tailwindcss/typography': ^0.5.9 '@tauri-apps/api': ^1.2.0 '@tauri-apps/cli': ^1.2.3 @@ -51,6 +52,7 @@ dependencies: '@nanostores/persistent': 0.7.0_nanostores@0.7.4 '@nanostores/react': 0.4.1_nkfnbc2tpc77iht7asm3uqwau4 '@radix-ui/react-dialog': 1.0.2_zula6vjvt3wdocc4mwcxqa6nzi + '@radix-ui/react-icons': 1.2.0_react@18.2.0 '@tauri-apps/api': 1.2.0 '@uiw/react-markdown-preview': 4.1.8_zula6vjvt3wdocc4mwcxqa6nzi '@uiw/react-md-editor': 3.20.5_zula6vjvt3wdocc4mwcxqa6nzi @@ -779,6 +781,14 @@ packages: react-dom: 18.2.0_react@18.2.0 dev: false + /@radix-ui/react-icons/1.2.0_react@18.2.0: + resolution: {integrity: sha512-NqrZxn+Ig6c6MypUt84/Nab9WBFXH75T1mhEhFjPlIYaNkp113pqlo6QdK5r7zb3b7RckDAPgUQACes0aKwcFA==} + peerDependencies: + react: ^16.x || ^17.x || ^18.x + dependencies: + react: 18.2.0 + dev: false + /@radix-ui/react-id/1.0.0_react@18.2.0: resolution: {integrity: sha512-Q6iAB/U7Tq3NTolBBQbHTgclPmGWE3OlktGGqrClPozSw4vkQ1DfQAOtzgRPecKsMdJINE05iaoDUG8tRzCBjw==} peerDependencies: diff --git a/src/assets/icons/Bitcoin.tsx b/src/assets/icons/Bitcoin.tsx deleted file mode 100644 index eab91f83..00000000 --- a/src/assets/icons/Bitcoin.tsx +++ /dev/null @@ -1,17 +0,0 @@ -export default function BitcoinIcon() { - return ( - - - - - ); -} diff --git a/src/assets/icons/Bookmark.tsx b/src/assets/icons/Bookmark.tsx deleted file mode 100644 index 9250bcfe..00000000 --- a/src/assets/icons/Bookmark.tsx +++ /dev/null @@ -1,18 +0,0 @@ -export default function BookmarkIcon() { - return ( - - - - ); -} diff --git a/src/assets/icons/CheckCircle.tsx b/src/assets/icons/CheckCircle.tsx deleted file mode 100644 index 60cd7b22..00000000 --- a/src/assets/icons/CheckCircle.tsx +++ /dev/null @@ -1,18 +0,0 @@ -export default function CheckCircleIcon({ className }: { className: string }) { - return ( - - - - ); -} diff --git a/src/assets/icons/Eye.tsx b/src/assets/icons/Eye.tsx deleted file mode 100644 index 0f318727..00000000 --- a/src/assets/icons/Eye.tsx +++ /dev/null @@ -1,18 +0,0 @@ -export default function EyeIcon({ className }: { className: string }) { - return ( - - - - - ); -} diff --git a/src/assets/icons/Home.tsx b/src/assets/icons/Home.tsx deleted file mode 100644 index a6b0a96b..00000000 --- a/src/assets/icons/Home.tsx +++ /dev/null @@ -1,18 +0,0 @@ -export default function HomeIcon() { - return ( - - - - ); -} diff --git a/src/assets/icons/Like.tsx b/src/assets/icons/Like.tsx deleted file mode 100644 index c74cf1f8..00000000 --- a/src/assets/icons/Like.tsx +++ /dev/null @@ -1,17 +0,0 @@ -export default function LikeIcon({ className }: { className: string }) { - return ( - - - - ); -} diff --git a/src/assets/icons/LikeSolid.tsx b/src/assets/icons/LikeSolid.tsx deleted file mode 100644 index a0230608..00000000 --- a/src/assets/icons/LikeSolid.tsx +++ /dev/null @@ -1,11 +0,0 @@ -export default function LikeSolidIcon({ className }: { className: string }) { - return ( - - - - ); -} diff --git a/src/assets/icons/Lume.tsx b/src/assets/icons/Lume.tsx index 358dda8f..039ddfc7 100644 --- a/src/assets/icons/Lume.tsx +++ b/src/assets/icons/Lume.tsx @@ -1,10 +1,6 @@ -export default function LumeIcon({ className }: { className: string }) { +export default function LumeSymbol({ className }: { className: string }) { return ( - + - - - ); -} diff --git a/src/assets/icons/MiniArrowRight.tsx b/src/assets/icons/MiniArrowRight.tsx deleted file mode 100644 index 0fc26caf..00000000 --- a/src/assets/icons/MiniArrowRight.tsx +++ /dev/null @@ -1,20 +0,0 @@ -export default function MiniArrowRightIcon({ - className, -}: { - className: string; -}) { - return ( - - - - ); -} diff --git a/src/assets/icons/MiniChevronDown.tsx b/src/assets/icons/MiniChevronDown.tsx deleted file mode 100644 index b29105d7..00000000 --- a/src/assets/icons/MiniChevronDown.tsx +++ /dev/null @@ -1,20 +0,0 @@ -export default function MiniChevronDownIcon({ - className, -}: { - className: string; -}) { - return ( - - - - ); -} diff --git a/src/assets/icons/MiniEdit.tsx b/src/assets/icons/MiniEdit.tsx deleted file mode 100644 index af84203f..00000000 --- a/src/assets/icons/MiniEdit.tsx +++ /dev/null @@ -1,13 +0,0 @@ -export default function MiniEditIcon({ className }: { className: string }) { - return ( - - - - - ); -} diff --git a/src/assets/icons/MiniMail.tsx b/src/assets/icons/MiniMail.tsx deleted file mode 100644 index 997f0a9c..00000000 --- a/src/assets/icons/MiniMail.tsx +++ /dev/null @@ -1,16 +0,0 @@ -export default function MiniMailIcon({ className }: { className: string }) { - return ( - - - - ); -} diff --git a/src/assets/icons/MiniPlus.tsx b/src/assets/icons/MiniPlus.tsx deleted file mode 100644 index bcb0be27..00000000 --- a/src/assets/icons/MiniPlus.tsx +++ /dev/null @@ -1,12 +0,0 @@ -export default function MiniPlusIcon({ className }: { className: string }) { - return ( - - - - ); -} diff --git a/src/assets/icons/More.tsx b/src/assets/icons/More.tsx deleted file mode 100644 index 2763a3ae..00000000 --- a/src/assets/icons/More.tsx +++ /dev/null @@ -1,18 +0,0 @@ -export default function MoreIcon() { - return ( - - - - ); -} diff --git a/src/assets/icons/MoreCircle.tsx b/src/assets/icons/MoreCircle.tsx deleted file mode 100644 index 80009cf5..00000000 --- a/src/assets/icons/MoreCircle.tsx +++ /dev/null @@ -1,18 +0,0 @@ -export default function MoreCircleIcon() { - return ( - - - - ); -} diff --git a/src/assets/icons/Plus.tsx b/src/assets/icons/Plus.tsx deleted file mode 100644 index 72a21517..00000000 --- a/src/assets/icons/Plus.tsx +++ /dev/null @@ -1,13 +0,0 @@ -export default function PlusIcon({ className }: { className: string }) { - return ( - - - - ); -} diff --git a/src/assets/icons/Post.tsx b/src/assets/icons/Post.tsx deleted file mode 100644 index 119d1056..00000000 --- a/src/assets/icons/Post.tsx +++ /dev/null @@ -1,12 +0,0 @@ -export default function PostIcon({ className }: { className: string }) { - return ( - - - - - ); -} diff --git a/src/assets/icons/Refresh.tsx b/src/assets/icons/Refresh.tsx deleted file mode 100644 index 61ed014e..00000000 --- a/src/assets/icons/Refresh.tsx +++ /dev/null @@ -1,16 +0,0 @@ -export default function RefreshIcon({ className }: { className: string }) { - return ( - - - - ); -} diff --git a/src/assets/icons/Relay.tsx b/src/assets/icons/Relay.tsx deleted file mode 100644 index 19cc304e..00000000 --- a/src/assets/icons/Relay.tsx +++ /dev/null @@ -1,13 +0,0 @@ -export default function RelayIcon({ className }: { className: string }) { - return ( - - - - - ); -} diff --git a/src/assets/icons/Reply.tsx b/src/assets/icons/Reply.tsx deleted file mode 100644 index b42487d6..00000000 --- a/src/assets/icons/Reply.tsx +++ /dev/null @@ -1,17 +0,0 @@ -export default function ReplyIcon({ className }: { className: string }) { - return ( - - - - ); -} diff --git a/src/assets/icons/Repost.tsx b/src/assets/icons/Repost.tsx deleted file mode 100644 index 1bc86598..00000000 --- a/src/assets/icons/Repost.tsx +++ /dev/null @@ -1,15 +0,0 @@ -export default function RepostIcon({ className }: { className: string }) { - return ( - - - - ); -} diff --git a/src/assets/icons/SidebarToggle.tsx b/src/assets/icons/SidebarToggle.tsx deleted file mode 100644 index 3779888c..00000000 --- a/src/assets/icons/SidebarToggle.tsx +++ /dev/null @@ -1,22 +0,0 @@ -export default function SidebarToggleIcon({ - className, -}: { - className: string; -}) { - return ( - - - - ); -} diff --git a/src/components/accountBar/index.tsx b/src/components/accountBar/index.tsx index 618c4bf3..d32cc447 100644 --- a/src/components/accountBar/index.tsx +++ b/src/components/accountBar/index.tsx @@ -3,10 +3,10 @@ import { Account } from '@components/accountBar/account'; import { currentUser } from '@stores/currentUser'; -import LumeIcon from '@assets/icons/Lume'; -import MiniPlusIcon from '@assets/icons/MiniPlus'; +import LumeSymbol from '@assets/icons/Lume'; import { useStore } from '@nanostores/react'; +import { PlusIcon } from '@radix-ui/react-icons'; import Link from 'next/link'; import { useCallback, useEffect, useState } from 'react'; import Database from 'tauri-plugin-sql-api'; @@ -28,18 +28,18 @@ export default function AccountBar() { return (
-
+
{users.map((user, index) => ( ))} - +
- +
); diff --git a/src/components/empty.tsx b/src/components/empty.tsx index 72fa252e..3790f725 100644 --- a/src/components/empty.tsx +++ b/src/components/empty.tsx @@ -1,7 +1,4 @@ -import MiniMailIcon from '@assets/icons/MiniMail'; -import MiniPlusIcon from '@assets/icons/MiniPlus'; -import RefreshIcon from '@assets/icons/Refresh'; - +import { EnvelopeClosedIcon, PlusIcon, UpdateIcon } from '@radix-ui/react-icons'; import Image from 'next/image'; const sampleData = [ @@ -56,7 +53,7 @@ export default function Empty() { placeholder="Enter an email" /> @@ -64,7 +61,7 @@ export default function Empty() {

Suggestions

- +
diff --git a/src/components/navigatorBar/index.tsx b/src/components/navigatorBar/index.tsx index 6ba8b35a..67699574 100644 --- a/src/components/navigatorBar/index.tsx +++ b/src/components/navigatorBar/index.tsx @@ -2,7 +2,7 @@ import ActiveLink from '@components/activeLink'; import CreatePost from '@components/navigatorBar/createPost'; -import PlusIcon from '@assets/icons/Plus'; +import { PlusIcon } from '@radix-ui/react-icons'; export default function NavigatorBar() { return ( @@ -10,7 +10,7 @@ export default function NavigatorBar() { {/* main */}
{/* Create post */} -
+
@@ -22,7 +22,7 @@ export default function NavigatorBar() {
@@ -49,7 +49,7 @@ export default function NavigatorBar() {
diff --git a/src/components/note/atoms/reaction.tsx b/src/components/note/atoms/reaction.tsx index dce6b7f4..8665fc78 100644 --- a/src/components/note/atoms/reaction.tsx +++ b/src/components/note/atoms/reaction.tsx @@ -1,10 +1,8 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { currentUser } from '@stores/currentUser'; -import LikeIcon from '@assets/icons/Like'; -import LikeSolidIcon from '@assets/icons/LikeSolid'; - import { useStore } from '@nanostores/react'; +import { HeartFilledIcon, HeartIcon } from '@radix-ui/react-icons'; import { dateToUnix, useNostr, useNostrEvents } from 'nostr-react'; import { getEventHash, signEvent } from 'nostr-tools'; import { useState } from 'react'; @@ -72,9 +70,9 @@ export default function Reaction({ className="group flex w-16 items-center gap-1.5 text-sm text-zinc-500">
{isReact ? ( - + ) : ( - + )}
{reaction} diff --git a/src/components/note/atoms/reply.tsx b/src/components/note/atoms/reply.tsx index c8616de7..67a3a5d9 100644 --- a/src/components/note/atoms/reply.tsx +++ b/src/components/note/atoms/reply.tsx @@ -1,5 +1,4 @@ -import ReplyIcon from '@assets/icons/Reply'; - +import { ChatBubbleIcon } from '@radix-ui/react-icons'; import { useNostrEvents } from 'nostr-react'; export default function Reply({ eventID }: { eventID: string }) { @@ -15,7 +14,7 @@ export default function Reply({ eventID }: { eventID: string }) { return ( diff --git a/src/components/note/atoms/user.tsx b/src/components/note/atoms/user.tsx index 2fe94ff3..632fe39d 100644 --- a/src/components/note/atoms/user.tsx +++ b/src/components/note/atoms/user.tsx @@ -3,8 +3,7 @@ import { ImageWithFallback } from '@components/imageWithFallback'; import { truncate } from '@utils/truncate'; -import MoreIcon from '@assets/icons/More'; - +import { DotsHorizontalIcon } from '@radix-ui/react-icons'; import Avatar from 'boring-avatars'; import { useNostrEvents } from 'nostr-react'; import { memo, useEffect, useState } from 'react'; @@ -90,7 +89,7 @@ export const User = memo(function User({ pubkey, time }: { pubkey: string; time:
- +
diff --git a/src/components/note/atoms/userWithUsername.tsx b/src/components/note/atoms/userWithUsername.tsx index 30b87ff0..abc6b50f 100644 --- a/src/components/note/atoms/userWithUsername.tsx +++ b/src/components/note/atoms/userWithUsername.tsx @@ -3,8 +3,7 @@ import { ImageWithFallback } from '@components/imageWithFallback'; import { truncate } from '@utils/truncate'; -import MoreIcon from '@assets/icons/More'; - +import { DotsHorizontalIcon } from '@radix-ui/react-icons'; import Avatar from 'boring-avatars'; import { useNostrEvents } from 'nostr-react'; import { memo, useEffect, useState } from 'react'; @@ -88,7 +87,7 @@ export const UserWithUsername = memo(function UserWithUsername({ pubkey }: { pub
- +
diff --git a/src/components/note/repost.tsx b/src/components/note/repost.tsx index c86c4340..7d6c257b 100644 --- a/src/components/note/repost.tsx +++ b/src/components/note/repost.tsx @@ -3,9 +3,8 @@ import { UserRepost } from '@components/note/atoms/userRepost'; import { Content } from '@components/note/content'; import { Placeholder } from '@components/note/placeholder'; -import RepostIcon from '@assets/icons/Repost'; - import * as Dialog from '@radix-ui/react-dialog'; +import { LoopIcon } from '@radix-ui/react-icons'; import dynamic from 'next/dynamic'; import { useNostrEvents } from 'nostr-react'; import { memo } from 'react'; @@ -30,7 +29,7 @@ export const Repost = memo(function Repost({ root, user }: { root: any; user: st
- +
diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 05d6bbda..a04a5410 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -3,7 +3,7 @@ import FullLayout from '@layouts/fullLayout'; import CheckAccount from '@components/checkAccount'; -import LumeIcon from '@assets/icons/Lume'; +import LumeSymbol from '@assets/icons/Lume'; import { motion } from 'framer-motion'; import { @@ -60,7 +60,7 @@ export default function Page() {
{/* spacer */}
- +
showNsec()} className="group absolute right-2 top-1/2 -translate-y-1/2 transform rounded p-1 hover:bg-zinc-700"> - + {type === 'password' ? ( + + ) : ( + + )}
diff --git a/src/pages/onboarding/following.tsx b/src/pages/onboarding/following.tsx index e0ad2eba..e9a60993 100644 --- a/src/pages/onboarding/following.tsx +++ b/src/pages/onboarding/following.tsx @@ -7,9 +7,9 @@ import { truncate } from '@utils/truncate'; import { currentUser } from '@stores/currentUser'; import data from '@assets/directory.json'; -import CheckCircleIcon from '@assets/icons/CheckCircle'; import { useStore } from '@nanostores/react'; +import { CheckCircledIcon } from '@radix-ui/react-icons'; import { motion } from 'framer-motion'; import Image from 'next/image'; import { useRouter } from 'next/router'; @@ -97,7 +97,7 @@ export default function Page() {
{follow.includes(item.npub) ? ( - + ) : ( <> )}