From 3b4f17dddfcb2143e05bf18b8e910b8643985f33 Mon Sep 17 00:00:00 2001 From: Martti Malmi Date: Thu, 28 Sep 2023 12:20:39 +0300 Subject: [PATCH 1/3] Element/Embed directory --- .../Element/{ => Embed}/AppleMusicEmbed.tsx | 0 .../app/src/Element/{ => Embed}/CashuNuts.css | 0 .../app/src/Element/{ => Embed}/CashuNuts.tsx | 0 .../src/Element/{ => Embed}/LinkPreview.css | 0 .../src/Element/{ => Embed}/LinkPreview.tsx | 2 +- .../src/Element/{ => Embed}/MagnetLink.tsx | 0 .../src/Element/{ => Embed}/MediaElement.tsx | 0 .../app/src/Element/{ => Embed}/Mention.tsx | 0 .../src/Element/{ => Embed}/MixCloudEmbed.tsx | 0 .../app/src/Element/{ => Embed}/NostrLink.tsx | 2 +- .../Element/{ => Embed}/NostrNestsEmbed.tsx | 0 .../Element/{ => Embed}/SoundCloudEmded.tsx | 0 .../src/Element/{ => Embed}/SpotifyEmbed.tsx | 0 .../src/Element/{ => Embed}/TidalEmbed.tsx | 0 .../src/Element/{ => Embed}/TwitchEmbed.tsx | 0 .../src/Element/{ => Embed}/WavlakeEmbed.tsx | 0 .../src/Element/{ => Embed}/ZapstrEmbed.css | 0 .../src/Element/{ => Embed}/ZapstrEmbed.tsx | 0 packages/app/src/Element/HyperText.tsx | 20 +++++++++---------- packages/app/src/Element/NostrFileHeader.tsx | 2 +- packages/app/src/Element/Note.tsx | 2 +- packages/app/src/Element/RevealMedia.tsx | 2 +- packages/app/src/Element/Text.tsx | 2 +- 23 files changed, 16 insertions(+), 16 deletions(-) rename packages/app/src/Element/{ => Embed}/AppleMusicEmbed.tsx (100%) rename packages/app/src/Element/{ => Embed}/CashuNuts.css (100%) rename packages/app/src/Element/{ => Embed}/CashuNuts.tsx (100%) rename packages/app/src/Element/{ => Embed}/LinkPreview.css (100%) rename packages/app/src/Element/{ => Embed}/LinkPreview.tsx (98%) rename packages/app/src/Element/{ => Embed}/MagnetLink.tsx (100%) rename packages/app/src/Element/{ => Embed}/MediaElement.tsx (100%) rename packages/app/src/Element/{ => Embed}/Mention.tsx (100%) rename packages/app/src/Element/{ => Embed}/MixCloudEmbed.tsx (100%) rename packages/app/src/Element/{ => Embed}/NostrLink.tsx (95%) rename packages/app/src/Element/{ => Embed}/NostrNestsEmbed.tsx (100%) rename packages/app/src/Element/{ => Embed}/SoundCloudEmded.tsx (100%) rename packages/app/src/Element/{ => Embed}/SpotifyEmbed.tsx (100%) rename packages/app/src/Element/{ => Embed}/TidalEmbed.tsx (100%) rename packages/app/src/Element/{ => Embed}/TwitchEmbed.tsx (100%) rename packages/app/src/Element/{ => Embed}/WavlakeEmbed.tsx (100%) rename packages/app/src/Element/{ => Embed}/ZapstrEmbed.css (100%) rename packages/app/src/Element/{ => Embed}/ZapstrEmbed.tsx (100%) diff --git a/packages/app/src/Element/AppleMusicEmbed.tsx b/packages/app/src/Element/Embed/AppleMusicEmbed.tsx similarity index 100% rename from packages/app/src/Element/AppleMusicEmbed.tsx rename to packages/app/src/Element/Embed/AppleMusicEmbed.tsx diff --git a/packages/app/src/Element/CashuNuts.css b/packages/app/src/Element/Embed/CashuNuts.css similarity index 100% rename from packages/app/src/Element/CashuNuts.css rename to packages/app/src/Element/Embed/CashuNuts.css diff --git a/packages/app/src/Element/CashuNuts.tsx b/packages/app/src/Element/Embed/CashuNuts.tsx similarity index 100% rename from packages/app/src/Element/CashuNuts.tsx rename to packages/app/src/Element/Embed/CashuNuts.tsx diff --git a/packages/app/src/Element/LinkPreview.css b/packages/app/src/Element/Embed/LinkPreview.css similarity index 100% rename from packages/app/src/Element/LinkPreview.css rename to packages/app/src/Element/Embed/LinkPreview.css diff --git a/packages/app/src/Element/LinkPreview.tsx b/packages/app/src/Element/Embed/LinkPreview.tsx similarity index 98% rename from packages/app/src/Element/LinkPreview.tsx rename to packages/app/src/Element/Embed/LinkPreview.tsx index cb453446f..5c8fb5a3e 100644 --- a/packages/app/src/Element/LinkPreview.tsx +++ b/packages/app/src/Element/Embed/LinkPreview.tsx @@ -4,7 +4,7 @@ import { CSSProperties, useEffect, useState } from "react"; import Spinner from "Icons/Spinner"; import SnortApi, { LinkPreviewData } from "SnortApi"; import useImgProxy from "Hooks/useImgProxy"; -import { MediaElement } from "Element/MediaElement"; +import { MediaElement } from "Element/Embed/MediaElement"; async function fetchUrlPreviewInfo(url: string) { const api = new SnortApi(); diff --git a/packages/app/src/Element/MagnetLink.tsx b/packages/app/src/Element/Embed/MagnetLink.tsx similarity index 100% rename from packages/app/src/Element/MagnetLink.tsx rename to packages/app/src/Element/Embed/MagnetLink.tsx diff --git a/packages/app/src/Element/MediaElement.tsx b/packages/app/src/Element/Embed/MediaElement.tsx similarity index 100% rename from packages/app/src/Element/MediaElement.tsx rename to packages/app/src/Element/Embed/MediaElement.tsx diff --git a/packages/app/src/Element/Mention.tsx b/packages/app/src/Element/Embed/Mention.tsx similarity index 100% rename from packages/app/src/Element/Mention.tsx rename to packages/app/src/Element/Embed/Mention.tsx diff --git a/packages/app/src/Element/MixCloudEmbed.tsx b/packages/app/src/Element/Embed/MixCloudEmbed.tsx similarity index 100% rename from packages/app/src/Element/MixCloudEmbed.tsx rename to packages/app/src/Element/Embed/MixCloudEmbed.tsx diff --git a/packages/app/src/Element/NostrLink.tsx b/packages/app/src/Element/Embed/NostrLink.tsx similarity index 95% rename from packages/app/src/Element/NostrLink.tsx rename to packages/app/src/Element/Embed/NostrLink.tsx index bbbdbb6ac..810a400cf 100644 --- a/packages/app/src/Element/NostrLink.tsx +++ b/packages/app/src/Element/Embed/NostrLink.tsx @@ -1,7 +1,7 @@ import { Link } from "react-router-dom"; import { NostrPrefix, tryParseNostrLink } from "@snort/system"; -import Mention from "Element/Mention"; +import Mention from "Element/Embed/Mention"; import NoteQuote from "Element/NoteQuote"; export default function NostrLink({ link, depth }: { link: string; depth?: number }) { diff --git a/packages/app/src/Element/NostrNestsEmbed.tsx b/packages/app/src/Element/Embed/NostrNestsEmbed.tsx similarity index 100% rename from packages/app/src/Element/NostrNestsEmbed.tsx rename to packages/app/src/Element/Embed/NostrNestsEmbed.tsx diff --git a/packages/app/src/Element/SoundCloudEmded.tsx b/packages/app/src/Element/Embed/SoundCloudEmded.tsx similarity index 100% rename from packages/app/src/Element/SoundCloudEmded.tsx rename to packages/app/src/Element/Embed/SoundCloudEmded.tsx diff --git a/packages/app/src/Element/SpotifyEmbed.tsx b/packages/app/src/Element/Embed/SpotifyEmbed.tsx similarity index 100% rename from packages/app/src/Element/SpotifyEmbed.tsx rename to packages/app/src/Element/Embed/SpotifyEmbed.tsx diff --git a/packages/app/src/Element/TidalEmbed.tsx b/packages/app/src/Element/Embed/TidalEmbed.tsx similarity index 100% rename from packages/app/src/Element/TidalEmbed.tsx rename to packages/app/src/Element/Embed/TidalEmbed.tsx diff --git a/packages/app/src/Element/TwitchEmbed.tsx b/packages/app/src/Element/Embed/TwitchEmbed.tsx similarity index 100% rename from packages/app/src/Element/TwitchEmbed.tsx rename to packages/app/src/Element/Embed/TwitchEmbed.tsx diff --git a/packages/app/src/Element/WavlakeEmbed.tsx b/packages/app/src/Element/Embed/WavlakeEmbed.tsx similarity index 100% rename from packages/app/src/Element/WavlakeEmbed.tsx rename to packages/app/src/Element/Embed/WavlakeEmbed.tsx diff --git a/packages/app/src/Element/ZapstrEmbed.css b/packages/app/src/Element/Embed/ZapstrEmbed.css similarity index 100% rename from packages/app/src/Element/ZapstrEmbed.css rename to packages/app/src/Element/Embed/ZapstrEmbed.css diff --git a/packages/app/src/Element/ZapstrEmbed.tsx b/packages/app/src/Element/Embed/ZapstrEmbed.tsx similarity index 100% rename from packages/app/src/Element/ZapstrEmbed.tsx rename to packages/app/src/Element/Embed/ZapstrEmbed.tsx diff --git a/packages/app/src/Element/HyperText.tsx b/packages/app/src/Element/HyperText.tsx index 22ddebd9b..83c6e5a55 100644 --- a/packages/app/src/Element/HyperText.tsx +++ b/packages/app/src/Element/HyperText.tsx @@ -13,16 +13,16 @@ import { WavlakeRegex, } from "Const"; import { magnetURIDecode } from "SnortUtils"; -import SoundCloudEmbed from "Element/SoundCloudEmded"; -import MixCloudEmbed from "Element/MixCloudEmbed"; -import SpotifyEmbed from "Element/SpotifyEmbed"; -import TidalEmbed from "Element/TidalEmbed"; -import TwitchEmbed from "Element/TwitchEmbed"; -import AppleMusicEmbed from "Element/AppleMusicEmbed"; -import WavlakeEmbed from "Element/WavlakeEmbed"; -import LinkPreview from "Element/LinkPreview"; -import NostrLink from "Element/NostrLink"; -import MagnetLink from "Element/MagnetLink"; +import SoundCloudEmbed from "Element/Embed/SoundCloudEmded"; +import MixCloudEmbed from "Element/Embed/MixCloudEmbed"; +import SpotifyEmbed from "Element/Embed/SpotifyEmbed"; +import TidalEmbed from "Element/Embed/TidalEmbed"; +import TwitchEmbed from "Element/Embed/TwitchEmbed"; +import AppleMusicEmbed from "Element/Embed/AppleMusicEmbed"; +import WavlakeEmbed from "Element/Embed/WavlakeEmbed"; +import LinkPreview from "Element/Embed/LinkPreview"; +import NostrLink from "Element/Embed/NostrLink"; +import MagnetLink from "Element/Embed/MagnetLink"; interface HypeTextProps { link: string; diff --git a/packages/app/src/Element/NostrFileHeader.tsx b/packages/app/src/Element/NostrFileHeader.tsx index 09be6b380..080ae1a06 100644 --- a/packages/app/src/Element/NostrFileHeader.tsx +++ b/packages/app/src/Element/NostrFileHeader.tsx @@ -5,7 +5,7 @@ import { findTag } from "SnortUtils"; import { useEventFeed } from "Feed/EventFeed"; import PageSpinner from "Element/PageSpinner"; import Reveal from "Element/Reveal"; -import { MediaElement } from "Element/MediaElement"; +import { MediaElement } from "Element/Embed/MediaElement"; export default function NostrFileHeader({ link }: { link: NostrLink }) { const ev = useEventFeed(link); diff --git a/packages/app/src/Element/Note.tsx b/packages/app/src/Element/Note.tsx index 7081125ab..d424064a2 100644 --- a/packages/app/src/Element/Note.tsx +++ b/packages/app/src/Element/Note.tsx @@ -29,7 +29,7 @@ import Poll from "Element/Poll"; import useLogin from "Hooks/useLogin"; import { setBookmarked, setPinned } from "Login"; import { NostrFileElement } from "Element/NostrFileHeader"; -import ZapstrEmbed from "Element/ZapstrEmbed"; +import ZapstrEmbed from "Element/Embed/ZapstrEmbed"; import PubkeyList from "Element/PubkeyList"; import { LiveEvent } from "Element/LiveEvent"; import { NoteContextMenu, NoteTranslation } from "Element/NoteContextMenu"; diff --git a/packages/app/src/Element/RevealMedia.tsx b/packages/app/src/Element/RevealMedia.tsx index 9be7c627a..30742385c 100644 --- a/packages/app/src/Element/RevealMedia.tsx +++ b/packages/app/src/Element/RevealMedia.tsx @@ -3,7 +3,7 @@ import FormattedMessage from "Element/FormattedMessage"; import { FileExtensionRegex } from "Const"; import Reveal from "Element/Reveal"; import useLogin from "Hooks/useLogin"; -import { MediaElement } from "Element/MediaElement"; +import { MediaElement } from "Element/Embed/MediaElement"; import { Link } from "react-router-dom"; interface RevealMediaProps { diff --git a/packages/app/src/Element/Text.tsx b/packages/app/src/Element/Text.tsx index 852bb4703..18ad96b8f 100644 --- a/packages/app/src/Element/Text.tsx +++ b/packages/app/src/Element/Text.tsx @@ -5,7 +5,7 @@ import { HexKey, ParsedFragment } from "@snort/system"; import Invoice from "Element/Invoice"; import Hashtag from "Element/Hashtag"; import HyperText from "Element/HyperText"; -import CashuNuts from "Element/CashuNuts"; +import CashuNuts from "Element/Embed/CashuNuts"; import RevealMedia from "./RevealMedia"; import { ProxyImg } from "./ProxyImg"; import { SpotlightMediaModal } from "./SpotlightMedia"; From 8b9f55493eb547687856210e7f225dba31770978 Mon Sep 17 00:00:00 2001 From: Martti Malmi Date: Thu, 28 Sep 2023 12:26:10 +0300 Subject: [PATCH 2/3] more Element subdirectories --- packages/app/src/Element/Bookmarks.tsx | 2 +- .../Element/{ => Chat}/ChatParticipant.tsx | 4 +-- packages/app/src/Element/{ => Chat}/DM.css | 0 packages/app/src/Element/{ => Chat}/DM.tsx | 6 ++--- .../app/src/Element/{ => Chat}/DmWindow.css | 0 .../app/src/Element/{ => Chat}/DmWindow.tsx | 6 ++--- .../src/Element/{ => Chat}/WriteMessage.tsx | 2 +- packages/app/src/Element/Collapsed.tsx | 2 +- packages/app/src/Element/Deck/Articles.tsx | 2 +- packages/app/src/Element/Deck/Nav.tsx | 2 +- .../src/Element/{ => Deck}/SpotlightMedia.css | 0 .../src/Element/{ => Deck}/SpotlightMedia.tsx | 0 .../app/src/Element/{ => Embed}/Hashtag.css | 0 .../app/src/Element/{ => Embed}/Hashtag.tsx | 0 .../app/src/Element/{ => Embed}/Invoice.css | 0 .../app/src/Element/{ => Embed}/Invoice.tsx | 2 +- packages/app/src/Element/Embed/Mention.tsx | 2 +- packages/app/src/Element/Embed/NostrLink.tsx | 2 +- .../src/Element/{ => Embed}/PubkeyList.tsx | 4 +-- .../app/src/Element/Embed/ZapstrEmbed.tsx | 2 +- .../Element/{ => Event}/NostrFileHeader.tsx | 2 +- packages/app/src/Element/{ => Event}/Note.css | 0 packages/app/src/Element/{ => Event}/Note.tsx | 26 +++++++++---------- .../Element/{ => Event}/NoteContextMenu.tsx | 2 +- .../src/Element/{ => Event}/NoteCreator.css | 0 .../src/Element/{ => Event}/NoteCreator.tsx | 4 +-- .../src/Element/{ => Event}/NoteFooter.tsx | 8 +++--- .../app/src/Element/{ => Event}/NoteGhost.tsx | 2 +- .../app/src/Element/{ => Event}/NoteQuote.tsx | 2 +- .../src/Element/{ => Event}/NoteReaction.css | 0 .../src/Element/{ => Event}/NoteReaction.tsx | 4 +-- .../app/src/Element/{ => Event}/NoteTime.tsx | 0 packages/app/src/Element/{ => Event}/Poll.tsx | 0 .../app/src/Element/{ => Event}/Reactions.css | 0 .../app/src/Element/{ => Event}/Reactions.tsx | 4 +-- .../app/src/Element/{ => Event}/Reveal.tsx | 2 +- .../src/Element/{ => Event}/RevealMedia.tsx | 2 +- .../app/src/Element/{ => Event}/ShowMore.css | 0 .../app/src/Element/{ => Event}/ShowMore.tsx | 2 +- .../app/src/Element/{ => Event}/Thread.css | 0 .../app/src/Element/{ => Event}/Thread.tsx | 6 ++--- packages/app/src/Element/{ => Event}/Zap.css | 0 packages/app/src/Element/{ => Event}/Zap.tsx | 4 +-- .../app/src/Element/{ => Event}/ZapButton.css | 0 .../app/src/Element/{ => Event}/ZapButton.tsx | 0 .../app/src/Element/{ => Event}/ZapGoal.css | 0 .../app/src/Element/{ => Event}/ZapGoal.tsx | 2 +- .../app/src/Element/{ => Feed}/LoadMore.tsx | 2 +- .../app/src/Element/{ => Feed}/Timeline.css | 0 .../app/src/Element/{ => Feed}/Timeline.tsx | 4 +-- .../Element/{ => Feed}/TimelineFollows.tsx | 6 ++--- .../src/Element/{ => Feed}/TrendingPosts.tsx | 2 +- packages/app/src/Element/LiveEvent.tsx | 2 +- .../app/src/Element/{ => Relay}/Relay.css | 0 .../app/src/Element/{ => Relay}/Relay.tsx | 2 +- .../Element/{ => Relay}/RelaysMetadata.css | 0 .../Element/{ => Relay}/RelaysMetadata.tsx | 0 packages/app/src/Element/SendSats.tsx | 2 +- .../app/src/Element/SuggestedProfiles.tsx | 2 +- packages/app/src/Element/Text.tsx | 8 +++--- packages/app/src/Element/Textarea.tsx | 4 +-- packages/app/src/Element/TrendingUsers.tsx | 2 +- .../app/src/Element/{ => User}/Avatar.css | 0 .../app/src/Element/{ => User}/Avatar.tsx | 2 +- .../src/Element/{ => User}/AvatarEditor.css | 0 .../src/Element/{ => User}/AvatarEditor.tsx | 0 .../app/src/Element/{ => User}/BadgeList.css | 0 .../app/src/Element/{ => User}/BadgeList.tsx | 2 +- .../src/Element/{ => User}/BlockButton.tsx | 2 +- .../app/src/Element/{ => User}/BlockList.tsx | 4 +-- .../src/Element/{ => User}/FollowButton.css | 0 .../src/Element/{ => User}/FollowButton.tsx | 2 +- .../src/Element/{ => User}/FollowListBase.tsx | 6 ++--- .../app/src/Element/{ => User}/Following.css | 0 .../app/src/Element/{ => User}/Following.tsx | 0 .../app/src/Element/{ => User}/FollowsYou.css | 0 .../app/src/Element/{ => User}/FollowsYou.tsx | 2 +- .../app/src/Element/{ => User}/MuteButton.tsx | 2 +- .../app/src/Element/{ => User}/MutedList.tsx | 6 ++--- packages/app/src/Element/{ => User}/Nip05.css | 0 packages/app/src/Element/{ => User}/Nip05.tsx | 0 .../app/src/Element/{ => User}/NoteToSelf.css | 0 .../app/src/Element/{ => User}/NoteToSelf.tsx | 2 +- .../src/Element/{ => User}/ProfileImage.css | 0 .../src/Element/{ => User}/ProfileImage.tsx | 4 +-- .../src/Element/{ => User}/ProfilePreview.css | 0 .../src/Element/{ => User}/ProfilePreview.tsx | 4 +-- .../app/src/Element/{ => User}/Username.tsx | 0 packages/app/src/Notifications.ts | 2 +- packages/app/src/Pages/DeckLayout.tsx | 6 ++--- packages/app/src/Pages/Discover.tsx | 2 +- packages/app/src/Pages/DonatePage.tsx | 4 +-- packages/app/src/Pages/HashTagsPage.tsx | 2 +- packages/app/src/Pages/Layout.tsx | 4 +-- packages/app/src/Pages/LoginPage.tsx | 2 +- packages/app/src/Pages/MessagesPage.tsx | 14 +++++----- packages/app/src/Pages/Notifications.tsx | 4 +-- packages/app/src/Pages/ProfilePage.tsx | 26 +++++++++---------- packages/app/src/Pages/Root.tsx | 6 ++--- packages/app/src/Pages/SearchPage.tsx | 4 +-- packages/app/src/Pages/WalletPage.tsx | 2 +- packages/app/src/Pages/ZapPool.tsx | 2 +- .../app/src/Pages/new/DiscoverFollows.tsx | 2 +- packages/app/src/Pages/new/GetVerified.tsx | 2 +- packages/app/src/Pages/new/ImportFollows.tsx | 2 +- packages/app/src/Pages/new/ProfileSetup.tsx | 2 +- packages/app/src/Pages/settings/Accounts.tsx | 2 +- packages/app/src/Pages/settings/Profile.tsx | 2 +- packages/app/src/Pages/settings/RelayInfo.tsx | 2 +- packages/app/src/Pages/settings/Relays.tsx | 2 +- .../src/Pages/subscribe/SubscriptionCard.tsx | 2 +- packages/app/src/ZapPoolController.ts | 2 +- packages/app/src/index.tsx | 2 +- 113 files changed, 143 insertions(+), 143 deletions(-) rename packages/app/src/Element/{ => Chat}/ChatParticipant.tsx (82%) rename packages/app/src/Element/{ => Chat}/DM.css (100%) rename packages/app/src/Element/{ => Chat}/DM.tsx (93%) rename packages/app/src/Element/{ => Chat}/DmWindow.css (100%) rename packages/app/src/Element/{ => Chat}/DmWindow.tsx (92%) rename packages/app/src/Element/{ => Chat}/WriteMessage.tsx (98%) rename packages/app/src/Element/{ => Deck}/SpotlightMedia.css (100%) rename packages/app/src/Element/{ => Deck}/SpotlightMedia.tsx (100%) rename packages/app/src/Element/{ => Embed}/Hashtag.css (100%) rename packages/app/src/Element/{ => Embed}/Hashtag.tsx (100%) rename packages/app/src/Element/{ => Embed}/Invoice.css (100%) rename packages/app/src/Element/{ => Embed}/Invoice.tsx (98%) rename packages/app/src/Element/{ => Embed}/PubkeyList.tsx (95%) rename packages/app/src/Element/{ => Event}/NostrFileHeader.tsx (96%) rename packages/app/src/Element/{ => Event}/Note.css (100%) rename packages/app/src/Element/{ => Event}/Note.tsx (95%) rename packages/app/src/Element/{ => Event}/NoteContextMenu.tsx (99%) rename packages/app/src/Element/{ => Event}/NoteCreator.css (100%) rename packages/app/src/Element/{ => Event}/NoteCreator.tsx (99%) rename packages/app/src/Element/{ => Event}/NoteFooter.tsx (97%) rename packages/app/src/Element/{ => Event}/NoteGhost.tsx (89%) rename packages/app/src/Element/{ => Event}/NoteQuote.tsx (92%) rename packages/app/src/Element/{ => Event}/NoteReaction.css (100%) rename packages/app/src/Element/{ => Event}/NoteReaction.tsx (96%) rename packages/app/src/Element/{ => Event}/NoteTime.tsx (100%) rename packages/app/src/Element/{ => Event}/Poll.tsx (100%) rename packages/app/src/Element/{ => Event}/Reactions.css (100%) rename packages/app/src/Element/{ => Event}/Reactions.tsx (97%) rename packages/app/src/Element/{ => Event}/Reveal.tsx (96%) rename packages/app/src/Element/{ => Event}/RevealMedia.tsx (98%) rename packages/app/src/Element/{ => Event}/ShowMore.css (100%) rename packages/app/src/Element/{ => Event}/ShowMore.tsx (94%) rename packages/app/src/Element/{ => Event}/Thread.css (100%) rename packages/app/src/Element/{ => Event}/Thread.tsx (98%) rename packages/app/src/Element/{ => Event}/Zap.css (100%) rename packages/app/src/Element/{ => Event}/Zap.tsx (96%) rename packages/app/src/Element/{ => Event}/ZapButton.css (100%) rename packages/app/src/Element/{ => Event}/ZapButton.tsx (100%) rename packages/app/src/Element/{ => Event}/ZapGoal.css (100%) rename packages/app/src/Element/{ => Event}/ZapGoal.tsx (97%) rename packages/app/src/Element/{ => Feed}/LoadMore.tsx (95%) rename packages/app/src/Element/{ => Feed}/Timeline.css (100%) rename packages/app/src/Element/{ => Feed}/Timeline.tsx (97%) rename packages/app/src/Element/{ => Feed}/TimelineFollows.tsx (97%) rename packages/app/src/Element/{ => Feed}/TrendingPosts.tsx (95%) rename packages/app/src/Element/{ => Relay}/Relay.css (100%) rename packages/app/src/Element/{ => Relay}/Relay.tsx (98%) rename packages/app/src/Element/{ => Relay}/RelaysMetadata.css (100%) rename packages/app/src/Element/{ => Relay}/RelaysMetadata.tsx (100%) rename packages/app/src/Element/{ => User}/Avatar.css (100%) rename packages/app/src/Element/{ => User}/Avatar.tsx (96%) rename packages/app/src/Element/{ => User}/AvatarEditor.css (100%) rename packages/app/src/Element/{ => User}/AvatarEditor.tsx (100%) rename packages/app/src/Element/{ => User}/BadgeList.css (100%) rename packages/app/src/Element/{ => User}/BadgeList.tsx (98%) rename packages/app/src/Element/{ => User}/BlockButton.tsx (94%) rename packages/app/src/Element/{ => User}/BlockList.tsx (75%) rename packages/app/src/Element/{ => User}/FollowButton.css (100%) rename packages/app/src/Element/{ => User}/FollowButton.tsx (97%) rename packages/app/src/Element/{ => User}/FollowListBase.tsx (92%) rename packages/app/src/Element/{ => User}/Following.css (100%) rename packages/app/src/Element/{ => User}/Following.tsx (100%) rename packages/app/src/Element/{ => User}/FollowsYou.css (100%) rename packages/app/src/Element/{ => User}/FollowsYou.tsx (90%) rename packages/app/src/Element/{ => User}/MuteButton.tsx (94%) rename packages/app/src/Element/{ => User}/MutedList.tsx (87%) rename packages/app/src/Element/{ => User}/Nip05.css (100%) rename packages/app/src/Element/{ => User}/Nip05.tsx (100%) rename packages/app/src/Element/{ => User}/NoteToSelf.css (100%) rename packages/app/src/Element/{ => User}/NoteToSelf.tsx (97%) rename packages/app/src/Element/{ => User}/ProfileImage.css (100%) rename packages/app/src/Element/{ => User}/ProfileImage.tsx (97%) rename packages/app/src/Element/{ => User}/ProfilePreview.css (100%) rename packages/app/src/Element/{ => User}/ProfilePreview.tsx (93%) rename packages/app/src/Element/{ => User}/Username.tsx (100%) diff --git a/packages/app/src/Element/Bookmarks.tsx b/packages/app/src/Element/Bookmarks.tsx index 31abfbafb..e900f3abb 100644 --- a/packages/app/src/Element/Bookmarks.tsx +++ b/packages/app/src/Element/Bookmarks.tsx @@ -2,7 +2,7 @@ import { useState, useMemo, ChangeEvent } from "react"; import FormattedMessage from "Element/FormattedMessage"; import { HexKey, TaggedNostrEvent } from "@snort/system"; -import Note from "Element/Note"; +import Note from "Element/Event/Note"; import useLogin from "Hooks/useLogin"; import { UserCache } from "Cache"; diff --git a/packages/app/src/Element/ChatParticipant.tsx b/packages/app/src/Element/Chat/ChatParticipant.tsx similarity index 82% rename from packages/app/src/Element/ChatParticipant.tsx rename to packages/app/src/Element/Chat/ChatParticipant.tsx index 2ccaca098..e79c6faf6 100644 --- a/packages/app/src/Element/ChatParticipant.tsx +++ b/packages/app/src/Element/Chat/ChatParticipant.tsx @@ -1,6 +1,6 @@ import { ChatParticipant } from "chat"; -import NoteToSelf from "./NoteToSelf"; -import ProfileImage from "./ProfileImage"; +import NoteToSelf from "../User/NoteToSelf"; +import ProfileImage from "../User/ProfileImage"; import useLogin from "Hooks/useLogin"; export function ChatParticipantProfile({ participant }: { participant: ChatParticipant }) { diff --git a/packages/app/src/Element/DM.css b/packages/app/src/Element/Chat/DM.css similarity index 100% rename from packages/app/src/Element/DM.css rename to packages/app/src/Element/Chat/DM.css diff --git a/packages/app/src/Element/DM.tsx b/packages/app/src/Element/Chat/DM.tsx similarity index 93% rename from packages/app/src/Element/DM.tsx rename to packages/app/src/Element/Chat/DM.tsx index b5296de35..42e9be7dc 100644 --- a/packages/app/src/Element/DM.tsx +++ b/packages/app/src/Element/Chat/DM.tsx @@ -4,13 +4,13 @@ import { FormattedMessage, useIntl } from "react-intl"; import { useInView } from "react-intersection-observer"; import useEventPublisher from "Hooks/useEventPublisher"; -import NoteTime from "Element/NoteTime"; +import NoteTime from "Element/Event/NoteTime"; import Text from "Element/Text"; import useLogin from "Hooks/useLogin"; import { Chat, ChatMessage, ChatType, setLastReadIn } from "chat"; -import ProfileImage from "./ProfileImage"; +import ProfileImage from "../User/ProfileImage"; -import messages from "./messages"; +import messages from "../messages"; export interface DMProps { chat: Chat; diff --git a/packages/app/src/Element/DmWindow.css b/packages/app/src/Element/Chat/DmWindow.css similarity index 100% rename from packages/app/src/Element/DmWindow.css rename to packages/app/src/Element/Chat/DmWindow.css diff --git a/packages/app/src/Element/DmWindow.tsx b/packages/app/src/Element/Chat/DmWindow.tsx similarity index 92% rename from packages/app/src/Element/DmWindow.tsx rename to packages/app/src/Element/Chat/DmWindow.tsx index ff2682c88..aada81654 100644 --- a/packages/app/src/Element/DmWindow.tsx +++ b/packages/app/src/Element/Chat/DmWindow.tsx @@ -1,10 +1,10 @@ import "./DmWindow.css"; import { useMemo } from "react"; -import ProfileImage from "Element/ProfileImage"; -import DM from "Element/DM"; +import ProfileImage from "Element/User/ProfileImage"; +import DM from "Element/Chat/DM"; import useLogin from "Hooks/useLogin"; -import WriteMessage from "Element/WriteMessage"; +import WriteMessage from "Element/Chat/WriteMessage"; import { Chat, createEmptyChatObject, useChatSystem } from "chat"; import FormattedMessage from "Element/FormattedMessage"; import { ChatParticipantProfile } from "./ChatParticipant"; diff --git a/packages/app/src/Element/WriteMessage.tsx b/packages/app/src/Element/Chat/WriteMessage.tsx similarity index 98% rename from packages/app/src/Element/WriteMessage.tsx rename to packages/app/src/Element/Chat/WriteMessage.tsx index bfcf77e25..26eb34299 100644 --- a/packages/app/src/Element/WriteMessage.tsx +++ b/packages/app/src/Element/Chat/WriteMessage.tsx @@ -5,7 +5,7 @@ import Spinner from "Icons/Spinner"; import { useState } from "react"; import useFileUpload from "Upload"; import { openFile } from "SnortUtils"; -import Textarea from "./Textarea"; +import Textarea from "../Textarea"; import { System } from "index"; import { Chat } from "chat"; diff --git a/packages/app/src/Element/Collapsed.tsx b/packages/app/src/Element/Collapsed.tsx index b315d6723..85e09fe1e 100644 --- a/packages/app/src/Element/Collapsed.tsx +++ b/packages/app/src/Element/Collapsed.tsx @@ -1,7 +1,7 @@ import { useState, ReactNode } from "react"; import Icon from "Icons/Icon"; -import ShowMore from "Element/ShowMore"; +import ShowMore from "Element/Event/ShowMore"; interface CollapsedProps { text?: string; diff --git a/packages/app/src/Element/Deck/Articles.tsx b/packages/app/src/Element/Deck/Articles.tsx index b63c7498d..fa9b4a987 100644 --- a/packages/app/src/Element/Deck/Articles.tsx +++ b/packages/app/src/Element/Deck/Articles.tsx @@ -1,7 +1,7 @@ import { NostrLink } from "@snort/system"; import { useArticles } from "Feed/ArticlesFeed"; import { orderDescending } from "SnortUtils"; -import Note from "../Note"; +import Note from "../Event/Note"; import { useReactions } from "Feed/Reactions"; export default function Articles() { diff --git a/packages/app/src/Element/Deck/Nav.tsx b/packages/app/src/Element/Deck/Nav.tsx index 5fa0df156..0915964f3 100644 --- a/packages/app/src/Element/Deck/Nav.tsx +++ b/packages/app/src/Element/Deck/Nav.tsx @@ -1,5 +1,5 @@ import { useUserProfile } from "@snort/system-react"; -import Avatar from "Element/Avatar"; +import Avatar from "Element/User/Avatar"; import useLogin from "Hooks/useLogin"; import "./Nav.css"; import Icon from "Icons/Icon"; diff --git a/packages/app/src/Element/SpotlightMedia.css b/packages/app/src/Element/Deck/SpotlightMedia.css similarity index 100% rename from packages/app/src/Element/SpotlightMedia.css rename to packages/app/src/Element/Deck/SpotlightMedia.css diff --git a/packages/app/src/Element/SpotlightMedia.tsx b/packages/app/src/Element/Deck/SpotlightMedia.tsx similarity index 100% rename from packages/app/src/Element/SpotlightMedia.tsx rename to packages/app/src/Element/Deck/SpotlightMedia.tsx diff --git a/packages/app/src/Element/Hashtag.css b/packages/app/src/Element/Embed/Hashtag.css similarity index 100% rename from packages/app/src/Element/Hashtag.css rename to packages/app/src/Element/Embed/Hashtag.css diff --git a/packages/app/src/Element/Hashtag.tsx b/packages/app/src/Element/Embed/Hashtag.tsx similarity index 100% rename from packages/app/src/Element/Hashtag.tsx rename to packages/app/src/Element/Embed/Hashtag.tsx diff --git a/packages/app/src/Element/Invoice.css b/packages/app/src/Element/Embed/Invoice.css similarity index 100% rename from packages/app/src/Element/Invoice.css rename to packages/app/src/Element/Embed/Invoice.css diff --git a/packages/app/src/Element/Invoice.tsx b/packages/app/src/Element/Embed/Invoice.tsx similarity index 98% rename from packages/app/src/Element/Invoice.tsx rename to packages/app/src/Element/Embed/Invoice.tsx index a679517d1..73bbbd73c 100644 --- a/packages/app/src/Element/Invoice.tsx +++ b/packages/app/src/Element/Embed/Invoice.tsx @@ -8,7 +8,7 @@ import SendSats from "Element/SendSats"; import Icon from "Icons/Icon"; import { useWallet } from "Wallet"; -import messages from "./messages"; +import messages from "../messages"; export interface InvoiceProps { invoice: string; diff --git a/packages/app/src/Element/Embed/Mention.tsx b/packages/app/src/Element/Embed/Mention.tsx index 216774a69..a54ec56c6 100644 --- a/packages/app/src/Element/Embed/Mention.tsx +++ b/packages/app/src/Element/Embed/Mention.tsx @@ -4,7 +4,7 @@ import { HexKey } from "@snort/system"; import { useUserProfile } from "@snort/system-react"; import { profileLink } from "SnortUtils"; -import { getDisplayName } from "Element/ProfileImage"; +import { getDisplayName } from "Element/User/ProfileImage"; export default function Mention({ pubkey, relays }: { pubkey: HexKey; relays?: Array | string }) { const user = useUserProfile(pubkey); diff --git a/packages/app/src/Element/Embed/NostrLink.tsx b/packages/app/src/Element/Embed/NostrLink.tsx index 810a400cf..178f5a43e 100644 --- a/packages/app/src/Element/Embed/NostrLink.tsx +++ b/packages/app/src/Element/Embed/NostrLink.tsx @@ -2,7 +2,7 @@ import { Link } from "react-router-dom"; import { NostrPrefix, tryParseNostrLink } from "@snort/system"; import Mention from "Element/Embed/Mention"; -import NoteQuote from "Element/NoteQuote"; +import NoteQuote from "Element/Event/NoteQuote"; export default function NostrLink({ link, depth }: { link: string; depth?: number }) { const nav = tryParseNostrLink(link); diff --git a/packages/app/src/Element/PubkeyList.tsx b/packages/app/src/Element/Embed/PubkeyList.tsx similarity index 95% rename from packages/app/src/Element/PubkeyList.tsx rename to packages/app/src/Element/Embed/PubkeyList.tsx index 013f10e43..d604563d1 100644 --- a/packages/app/src/Element/PubkeyList.tsx +++ b/packages/app/src/Element/Embed/PubkeyList.tsx @@ -3,11 +3,11 @@ import { FormattedMessage, FormattedNumber } from "react-intl"; import { LNURL } from "@snort/shared"; import { dedupe, hexToBech32 } from "SnortUtils"; -import FollowListBase from "Element/FollowListBase"; +import FollowListBase from "Element/User/FollowListBase"; import AsyncButton from "Element/AsyncButton"; import { useWallet } from "Wallet"; import { Toastore } from "Toaster"; -import { getDisplayName } from "Element/ProfileImage"; +import { getDisplayName } from "Element/User/ProfileImage"; import { UserCache } from "Cache"; import useLogin from "Hooks/useLogin"; import useEventPublisher from "Hooks/useEventPublisher"; diff --git a/packages/app/src/Element/Embed/ZapstrEmbed.tsx b/packages/app/src/Element/Embed/ZapstrEmbed.tsx index f7f41c44e..ab0cb71ce 100644 --- a/packages/app/src/Element/Embed/ZapstrEmbed.tsx +++ b/packages/app/src/Element/Embed/ZapstrEmbed.tsx @@ -3,7 +3,7 @@ import { Link } from "react-router-dom"; import { NostrEvent, NostrLink } from "@snort/system"; import { ProxyImg } from "Element/ProxyImg"; -import ProfileImage from "Element/ProfileImage"; +import ProfileImage from "Element/User/ProfileImage"; import FormattedMessage from "Element/FormattedMessage"; export default function ZapstrEmbed({ ev }: { ev: NostrEvent }) { diff --git a/packages/app/src/Element/NostrFileHeader.tsx b/packages/app/src/Element/Event/NostrFileHeader.tsx similarity index 96% rename from packages/app/src/Element/NostrFileHeader.tsx rename to packages/app/src/Element/Event/NostrFileHeader.tsx index 080ae1a06..0b0fa4b95 100644 --- a/packages/app/src/Element/NostrFileHeader.tsx +++ b/packages/app/src/Element/Event/NostrFileHeader.tsx @@ -4,7 +4,7 @@ import { NostrEvent, NostrLink } from "@snort/system"; import { findTag } from "SnortUtils"; import { useEventFeed } from "Feed/EventFeed"; import PageSpinner from "Element/PageSpinner"; -import Reveal from "Element/Reveal"; +import Reveal from "Element/Event/Reveal"; import { MediaElement } from "Element/Embed/MediaElement"; export default function NostrFileHeader({ link }: { link: NostrLink }) { diff --git a/packages/app/src/Element/Note.css b/packages/app/src/Element/Event/Note.css similarity index 100% rename from packages/app/src/Element/Note.css rename to packages/app/src/Element/Event/Note.css diff --git a/packages/app/src/Element/Note.tsx b/packages/app/src/Element/Event/Note.tsx similarity index 95% rename from packages/app/src/Element/Note.tsx rename to packages/app/src/Element/Event/Note.tsx index d424064a2..a5897d41f 100644 --- a/packages/app/src/Element/Note.tsx +++ b/packages/app/src/Element/Event/Note.tsx @@ -8,7 +8,7 @@ import { TaggedNostrEvent, HexKey, EventKind, NostrPrefix, Lists, EventExt, pars import { System } from "index"; import useEventPublisher from "Hooks/useEventPublisher"; import Icon from "Icons/Icon"; -import ProfileImage from "Element/ProfileImage"; +import ProfileImage from "Element/User/ProfileImage"; import Text from "Element/Text"; import { getReactions, @@ -20,26 +20,26 @@ import { profileLink, findTag, } from "SnortUtils"; -import NoteFooter from "Element/NoteFooter"; -import NoteTime from "Element/NoteTime"; -import Reveal from "Element/Reveal"; +import NoteFooter from "Element/Event/NoteFooter"; +import NoteTime from "Element/Event/NoteTime"; +import Reveal from "Element/Event/Reveal"; import useModeration from "Hooks/useModeration"; import { UserCache } from "Cache"; -import Poll from "Element/Poll"; +import Poll from "Element/Event/Poll"; import useLogin from "Hooks/useLogin"; import { setBookmarked, setPinned } from "Login"; -import { NostrFileElement } from "Element/NostrFileHeader"; +import { NostrFileElement } from "Element/Event/NostrFileHeader"; import ZapstrEmbed from "Element/Embed/ZapstrEmbed"; -import PubkeyList from "Element/PubkeyList"; +import PubkeyList from "Element/Embed/PubkeyList"; import { LiveEvent } from "Element/LiveEvent"; -import { NoteContextMenu, NoteTranslation } from "Element/NoteContextMenu"; -import Reactions from "Element/Reactions"; -import { ZapGoal } from "Element/ZapGoal"; -import NoteReaction from "Element/NoteReaction"; -import ProfilePreview from "Element/ProfilePreview"; +import { NoteContextMenu, NoteTranslation } from "Element/Event/NoteContextMenu"; +import Reactions from "Element/Event/Reactions"; +import { ZapGoal } from "Element/Event/ZapGoal"; +import NoteReaction from "Element/Event/NoteReaction"; +import ProfilePreview from "Element/User/ProfilePreview"; import { ProxyImg } from "Element/ProxyImg"; -import messages from "./messages"; +import messages from "../messages"; export interface NoteProps { data: TaggedNostrEvent; diff --git a/packages/app/src/Element/NoteContextMenu.tsx b/packages/app/src/Element/Event/NoteContextMenu.tsx similarity index 99% rename from packages/app/src/Element/NoteContextMenu.tsx rename to packages/app/src/Element/Event/NoteContextMenu.tsx index a06f62a99..04e9988c3 100644 --- a/packages/app/src/Element/NoteContextMenu.tsx +++ b/packages/app/src/Element/Event/NoteContextMenu.tsx @@ -10,7 +10,7 @@ import messages from "Element/messages"; import useLogin from "Hooks/useLogin"; import useModeration from "Hooks/useModeration"; import useEventPublisher from "Hooks/useEventPublisher"; -import { ReBroadcaster } from "./ReBroadcaster"; +import { ReBroadcaster } from "../ReBroadcaster"; import { useState } from "react"; export interface NoteTranslation { diff --git a/packages/app/src/Element/NoteCreator.css b/packages/app/src/Element/Event/NoteCreator.css similarity index 100% rename from packages/app/src/Element/NoteCreator.css rename to packages/app/src/Element/Event/NoteCreator.css diff --git a/packages/app/src/Element/NoteCreator.tsx b/packages/app/src/Element/Event/NoteCreator.tsx similarity index 99% rename from packages/app/src/Element/NoteCreator.tsx rename to packages/app/src/Element/Event/NoteCreator.tsx index 03029ae0f..37a207aef 100644 --- a/packages/app/src/Element/NoteCreator.tsx +++ b/packages/app/src/Element/Event/NoteCreator.tsx @@ -15,9 +15,9 @@ import useEventPublisher from "Hooks/useEventPublisher"; import { openFile } from "SnortUtils"; import Textarea from "Element/Textarea"; import Modal from "Element/Modal"; -import ProfileImage from "Element/ProfileImage"; +import ProfileImage from "Element/User/ProfileImage"; import useFileUpload from "Upload"; -import Note from "Element/Note"; +import Note from "Element/Event/Note"; import { ClipboardEventHandler } from "react"; import useLogin from "Hooks/useLogin"; diff --git a/packages/app/src/Element/NoteFooter.tsx b/packages/app/src/Element/Event/NoteFooter.tsx similarity index 97% rename from packages/app/src/Element/NoteFooter.tsx rename to packages/app/src/Element/Event/NoteFooter.tsx index 795998875..eed07d577 100644 --- a/packages/app/src/Element/NoteFooter.tsx +++ b/packages/app/src/Element/Event/NoteFooter.tsx @@ -7,9 +7,9 @@ import { SnortContext, useUserProfile } from "@snort/system-react"; import { formatShort } from "Number"; import useEventPublisher from "Hooks/useEventPublisher"; import { delay, findTag, normalizeReaction } from "SnortUtils"; -import { NoteCreator } from "Element/NoteCreator"; +import { NoteCreator } from "Element/Event/NoteCreator"; import SendSats from "Element/SendSats"; -import { ZapsSummary } from "Element/Zap"; +import { ZapsSummary } from "Element/Event/Zap"; import { AsyncIcon } from "Element/AsyncIcon"; import { useWallet } from "Wallet"; @@ -18,10 +18,10 @@ import { useInteractionCache } from "Hooks/useInteractionCache"; import { ZapPoolController } from "ZapPoolController"; import { System } from "index"; import { Zapper, ZapTarget } from "Zapper"; -import { getDisplayName } from "./ProfileImage"; +import { getDisplayName } from "../User/ProfileImage"; import { useNoteCreator } from "State/NoteCreator"; -import messages from "./messages"; +import messages from "../messages"; let isZapperBusy = false; const barrierZapper = async (then: () => Promise): Promise => { diff --git a/packages/app/src/Element/NoteGhost.tsx b/packages/app/src/Element/Event/NoteGhost.tsx similarity index 89% rename from packages/app/src/Element/NoteGhost.tsx rename to packages/app/src/Element/Event/NoteGhost.tsx index 1604f51c1..fcdfac734 100644 --- a/packages/app/src/Element/NoteGhost.tsx +++ b/packages/app/src/Element/Event/NoteGhost.tsx @@ -1,5 +1,5 @@ import "./Note.css"; -import ProfileImage from "Element/ProfileImage"; +import ProfileImage from "Element/User/ProfileImage"; interface NoteGhostProps { className?: string; diff --git a/packages/app/src/Element/NoteQuote.tsx b/packages/app/src/Element/Event/NoteQuote.tsx similarity index 92% rename from packages/app/src/Element/NoteQuote.tsx rename to packages/app/src/Element/Event/NoteQuote.tsx index d7e333802..cba78dcba 100644 --- a/packages/app/src/Element/NoteQuote.tsx +++ b/packages/app/src/Element/Event/NoteQuote.tsx @@ -1,6 +1,6 @@ import { useEventFeed } from "Feed/EventFeed"; import { NostrLink } from "@snort/system"; -import Note from "Element/Note"; +import Note from "Element/Event/Note"; import PageSpinner from "Element/PageSpinner"; export default function NoteQuote({ link, depth }: { link: NostrLink; depth?: number }) { diff --git a/packages/app/src/Element/NoteReaction.css b/packages/app/src/Element/Event/NoteReaction.css similarity index 100% rename from packages/app/src/Element/NoteReaction.css rename to packages/app/src/Element/Event/NoteReaction.css diff --git a/packages/app/src/Element/NoteReaction.tsx b/packages/app/src/Element/Event/NoteReaction.tsx similarity index 96% rename from packages/app/src/Element/NoteReaction.tsx rename to packages/app/src/Element/Event/NoteReaction.tsx index 5b10d2f80..a398c3355 100644 --- a/packages/app/src/Element/NoteReaction.tsx +++ b/packages/app/src/Element/Event/NoteReaction.tsx @@ -3,8 +3,8 @@ import { Link } from "react-router-dom"; import { useMemo } from "react"; import { EventKind, NostrEvent, TaggedNostrEvent, NostrPrefix, EventExt } from "@snort/system"; -import Note from "Element/Note"; -import { getDisplayName } from "Element/ProfileImage"; +import Note from "Element/Event/Note"; +import { getDisplayName } from "Element/User/ProfileImage"; import { eventLink, hexToBech32 } from "SnortUtils"; import useModeration from "Hooks/useModeration"; import FormattedMessage from "Element/FormattedMessage"; diff --git a/packages/app/src/Element/NoteTime.tsx b/packages/app/src/Element/Event/NoteTime.tsx similarity index 100% rename from packages/app/src/Element/NoteTime.tsx rename to packages/app/src/Element/Event/NoteTime.tsx diff --git a/packages/app/src/Element/Poll.tsx b/packages/app/src/Element/Event/Poll.tsx similarity index 100% rename from packages/app/src/Element/Poll.tsx rename to packages/app/src/Element/Event/Poll.tsx diff --git a/packages/app/src/Element/Reactions.css b/packages/app/src/Element/Event/Reactions.css similarity index 100% rename from packages/app/src/Element/Reactions.css rename to packages/app/src/Element/Event/Reactions.css diff --git a/packages/app/src/Element/Reactions.tsx b/packages/app/src/Element/Event/Reactions.tsx similarity index 97% rename from packages/app/src/Element/Reactions.tsx rename to packages/app/src/Element/Event/Reactions.tsx index 5ccf5dfda..a30d4d85e 100644 --- a/packages/app/src/Element/Reactions.tsx +++ b/packages/app/src/Element/Event/Reactions.tsx @@ -7,11 +7,11 @@ import { TaggedNostrEvent, ParsedZap } from "@snort/system"; import { formatShort } from "Number"; import Icon from "Icons/Icon"; import { Tab } from "Element/Tabs"; -import ProfileImage from "Element/ProfileImage"; +import ProfileImage from "Element/User/ProfileImage"; import Tabs from "Element/Tabs"; import Modal from "Element/Modal"; -import messages from "./messages"; +import messages from "../messages"; interface ReactionsProps { show: boolean; diff --git a/packages/app/src/Element/Reveal.tsx b/packages/app/src/Element/Event/Reveal.tsx similarity index 96% rename from packages/app/src/Element/Reveal.tsx rename to packages/app/src/Element/Event/Reveal.tsx index dc5f17348..0eb2d9f30 100644 --- a/packages/app/src/Element/Reveal.tsx +++ b/packages/app/src/Element/Event/Reveal.tsx @@ -1,4 +1,4 @@ -import "./Reveal.css"; +import "../Reveal.css"; import Icon from "Icons/Icon"; import { useState } from "react"; diff --git a/packages/app/src/Element/RevealMedia.tsx b/packages/app/src/Element/Event/RevealMedia.tsx similarity index 98% rename from packages/app/src/Element/RevealMedia.tsx rename to packages/app/src/Element/Event/RevealMedia.tsx index 30742385c..e55e175f3 100644 --- a/packages/app/src/Element/RevealMedia.tsx +++ b/packages/app/src/Element/Event/RevealMedia.tsx @@ -1,7 +1,7 @@ import FormattedMessage from "Element/FormattedMessage"; import { FileExtensionRegex } from "Const"; -import Reveal from "Element/Reveal"; +import Reveal from "Element/Event/Reveal"; import useLogin from "Hooks/useLogin"; import { MediaElement } from "Element/Embed/MediaElement"; import { Link } from "react-router-dom"; diff --git a/packages/app/src/Element/ShowMore.css b/packages/app/src/Element/Event/ShowMore.css similarity index 100% rename from packages/app/src/Element/ShowMore.css rename to packages/app/src/Element/Event/ShowMore.css diff --git a/packages/app/src/Element/ShowMore.tsx b/packages/app/src/Element/Event/ShowMore.tsx similarity index 94% rename from packages/app/src/Element/ShowMore.tsx rename to packages/app/src/Element/Event/ShowMore.tsx index 5d4bcf78f..ce120626b 100644 --- a/packages/app/src/Element/ShowMore.tsx +++ b/packages/app/src/Element/Event/ShowMore.tsx @@ -1,7 +1,7 @@ import "./ShowMore.css"; import { useIntl } from "react-intl"; -import messages from "./messages"; +import messages from "../messages"; interface ShowMoreProps { text?: string; diff --git a/packages/app/src/Element/Thread.css b/packages/app/src/Element/Event/Thread.css similarity index 100% rename from packages/app/src/Element/Thread.css rename to packages/app/src/Element/Event/Thread.css diff --git a/packages/app/src/Element/Thread.tsx b/packages/app/src/Element/Event/Thread.tsx similarity index 98% rename from packages/app/src/Element/Thread.tsx rename to packages/app/src/Element/Event/Thread.tsx index efd0e30c4..6fd8192c4 100644 --- a/packages/app/src/Element/Thread.tsx +++ b/packages/app/src/Element/Event/Thread.tsx @@ -6,12 +6,12 @@ import { TaggedNostrEvent, u256, NostrPrefix, EventExt, parseNostrLink } from "@ import { getReactions, getAllReactions } from "SnortUtils"; import BackButton from "Element/BackButton"; -import Note from "Element/Note"; -import NoteGhost from "Element/NoteGhost"; +import Note from "Element/Event/Note"; +import NoteGhost from "Element/Event/NoteGhost"; import Collapsed from "Element/Collapsed"; import { ThreadContext, ThreadContextWrapper, chainKey } from "Hooks/useThreadContext"; -import messages from "./messages"; +import messages from "../messages"; interface DividerProps { variant?: "regular" | "small"; diff --git a/packages/app/src/Element/Zap.css b/packages/app/src/Element/Event/Zap.css similarity index 100% rename from packages/app/src/Element/Zap.css rename to packages/app/src/Element/Event/Zap.css diff --git a/packages/app/src/Element/Zap.tsx b/packages/app/src/Element/Event/Zap.tsx similarity index 96% rename from packages/app/src/Element/Zap.tsx rename to packages/app/src/Element/Event/Zap.tsx index 96071297d..13232836f 100644 --- a/packages/app/src/Element/Zap.tsx +++ b/packages/app/src/Element/Event/Zap.tsx @@ -6,10 +6,10 @@ import { FormattedMessage, useIntl } from "react-intl"; import { unwrap } from "SnortUtils"; import { formatShort } from "Number"; import Text from "Element/Text"; -import ProfileImage from "Element/ProfileImage"; +import ProfileImage from "Element/User/ProfileImage"; import useLogin from "Hooks/useLogin"; -import messages from "./messages"; +import messages from "../messages"; const Zap = ({ zap, showZapped = true }: { zap: ParsedZap; showZapped?: boolean }) => { const { amount, content, sender, valid, receiver } = zap; diff --git a/packages/app/src/Element/ZapButton.css b/packages/app/src/Element/Event/ZapButton.css similarity index 100% rename from packages/app/src/Element/ZapButton.css rename to packages/app/src/Element/Event/ZapButton.css diff --git a/packages/app/src/Element/ZapButton.tsx b/packages/app/src/Element/Event/ZapButton.tsx similarity index 100% rename from packages/app/src/Element/ZapButton.tsx rename to packages/app/src/Element/Event/ZapButton.tsx diff --git a/packages/app/src/Element/ZapGoal.css b/packages/app/src/Element/Event/ZapGoal.css similarity index 100% rename from packages/app/src/Element/ZapGoal.css rename to packages/app/src/Element/Event/ZapGoal.css diff --git a/packages/app/src/Element/ZapGoal.tsx b/packages/app/src/Element/Event/ZapGoal.tsx similarity index 97% rename from packages/app/src/Element/ZapGoal.tsx rename to packages/app/src/Element/Event/ZapGoal.tsx index 97cd972eb..a871e5f95 100644 --- a/packages/app/src/Element/ZapGoal.tsx +++ b/packages/app/src/Element/Event/ZapGoal.tsx @@ -5,7 +5,7 @@ import useZapsFeed from "Feed/ZapsFeed"; import { formatShort } from "Number"; import { findTag } from "SnortUtils"; import Icon from "Icons/Icon"; -import SendSats from "./SendSats"; +import SendSats from "../SendSats"; import { Zapper } from "Zapper"; export function ZapGoal({ ev }: { ev: NostrEvent }) { diff --git a/packages/app/src/Element/LoadMore.tsx b/packages/app/src/Element/Feed/LoadMore.tsx similarity index 95% rename from packages/app/src/Element/LoadMore.tsx rename to packages/app/src/Element/Feed/LoadMore.tsx index 90ef4fb26..eb4634bc2 100644 --- a/packages/app/src/Element/LoadMore.tsx +++ b/packages/app/src/Element/Feed/LoadMore.tsx @@ -2,7 +2,7 @@ import { useEffect, useState } from "react"; import FormattedMessage from "Element/FormattedMessage"; import { useInView } from "react-intersection-observer"; -import messages from "./messages"; +import messages from "../messages"; export default function LoadMore({ onLoadMore, diff --git a/packages/app/src/Element/Timeline.css b/packages/app/src/Element/Feed/Timeline.css similarity index 100% rename from packages/app/src/Element/Timeline.css rename to packages/app/src/Element/Feed/Timeline.css diff --git a/packages/app/src/Element/Timeline.tsx b/packages/app/src/Element/Feed/Timeline.tsx similarity index 97% rename from packages/app/src/Element/Timeline.tsx rename to packages/app/src/Element/Feed/Timeline.tsx index 10de3cd86..f89d4becb 100644 --- a/packages/app/src/Element/Timeline.tsx +++ b/packages/app/src/Element/Feed/Timeline.tsx @@ -6,9 +6,9 @@ import { TaggedNostrEvent, EventKind, u256 } from "@snort/system"; import Icon from "Icons/Icon"; import { dedupeByPubkey, findTag } from "SnortUtils"; -import ProfileImage from "Element/ProfileImage"; +import ProfileImage from "Element/User/ProfileImage"; import useTimelineFeed, { TimelineFeed, TimelineSubject } from "Feed/TimelineFeed"; -import Note from "Element/Note"; +import Note from "Element/Event/Note"; import useModeration from "Hooks/useModeration"; import { LiveStreams } from "Element/LiveStreams"; diff --git a/packages/app/src/Element/TimelineFollows.tsx b/packages/app/src/Element/Feed/TimelineFollows.tsx similarity index 97% rename from packages/app/src/Element/TimelineFollows.tsx rename to packages/app/src/Element/Feed/TimelineFollows.tsx index f376945b3..46b519fb5 100644 --- a/packages/app/src/Element/TimelineFollows.tsx +++ b/packages/app/src/Element/Feed/TimelineFollows.tsx @@ -7,14 +7,14 @@ import { SnortContext } from "@snort/system-react"; import { useInView } from "react-intersection-observer"; import { dedupeByPubkey, findTag, orderDescending } from "SnortUtils"; -import Note from "Element/Note"; +import Note from "Element/Event/Note"; import useModeration from "Hooks/useModeration"; import { FollowsFeed } from "Cache"; import { LiveStreams } from "Element/LiveStreams"; import { useReactions } from "Feed/Reactions"; -import AsyncButton from "./AsyncButton"; +import AsyncButton from "../AsyncButton"; import useLogin from "Hooks/useLogin"; -import ProfileImage from "Element/ProfileImage"; +import ProfileImage from "Element/User/ProfileImage"; import Icon from "Icons/Icon"; export interface TimelineFollowsProps { diff --git a/packages/app/src/Element/TrendingPosts.tsx b/packages/app/src/Element/Feed/TrendingPosts.tsx similarity index 95% rename from packages/app/src/Element/TrendingPosts.tsx rename to packages/app/src/Element/Feed/TrendingPosts.tsx index 66c6c64e5..6c9bfcb57 100644 --- a/packages/app/src/Element/TrendingPosts.tsx +++ b/packages/app/src/Element/Feed/TrendingPosts.tsx @@ -2,7 +2,7 @@ import { useEffect, useState } from "react"; import { NostrEvent, NostrLink, TaggedNostrEvent } from "@snort/system"; import PageSpinner from "Element/PageSpinner"; -import Note from "Element/Note"; +import Note from "Element/Event/Note"; import NostrBandApi from "External/NostrBand"; import { useReactions } from "Feed/Reactions"; diff --git a/packages/app/src/Element/LiveEvent.tsx b/packages/app/src/Element/LiveEvent.tsx index 2bf3dcbf3..fa4469183 100644 --- a/packages/app/src/Element/LiveEvent.tsx +++ b/packages/app/src/Element/LiveEvent.tsx @@ -3,7 +3,7 @@ import FormattedMessage from "Element/FormattedMessage"; import { Link } from "react-router-dom"; import { findTag } from "SnortUtils"; -import ProfileImage from "./ProfileImage"; +import ProfileImage from "./User/ProfileImage"; import Icon from "Icons/Icon"; export function LiveEvent({ ev }: { ev: NostrEvent }) { diff --git a/packages/app/src/Element/Relay.css b/packages/app/src/Element/Relay/Relay.css similarity index 100% rename from packages/app/src/Element/Relay.css rename to packages/app/src/Element/Relay/Relay.css diff --git a/packages/app/src/Element/Relay.tsx b/packages/app/src/Element/Relay/Relay.tsx similarity index 98% rename from packages/app/src/Element/Relay.tsx rename to packages/app/src/Element/Relay/Relay.tsx index 8f145dea5..a576e6b48 100644 --- a/packages/app/src/Element/Relay.tsx +++ b/packages/app/src/Element/Relay/Relay.tsx @@ -12,7 +12,7 @@ import useLogin from "Hooks/useLogin"; import { setRelays } from "Login"; import Icon from "Icons/Icon"; -import messages from "./messages"; +import messages from "../messages"; export interface RelayProps { addr: string; diff --git a/packages/app/src/Element/RelaysMetadata.css b/packages/app/src/Element/Relay/RelaysMetadata.css similarity index 100% rename from packages/app/src/Element/RelaysMetadata.css rename to packages/app/src/Element/Relay/RelaysMetadata.css diff --git a/packages/app/src/Element/RelaysMetadata.tsx b/packages/app/src/Element/Relay/RelaysMetadata.tsx similarity index 100% rename from packages/app/src/Element/RelaysMetadata.tsx rename to packages/app/src/Element/Relay/RelaysMetadata.tsx diff --git a/packages/app/src/Element/SendSats.tsx b/packages/app/src/Element/SendSats.tsx index 46d791fec..7bbd7a78d 100644 --- a/packages/app/src/Element/SendSats.tsx +++ b/packages/app/src/Element/SendSats.tsx @@ -9,7 +9,7 @@ import { LNURLSuccessAction } from "@snort/shared"; import { formatShort } from "Number"; import Icon from "Icons/Icon"; import useEventPublisher from "Hooks/useEventPublisher"; -import ProfileImage from "Element/ProfileImage"; +import ProfileImage from "Element/User/ProfileImage"; import Modal from "Element/Modal"; import QrCode from "Element/QrCode"; import Copy from "Element/Copy"; diff --git a/packages/app/src/Element/SuggestedProfiles.tsx b/packages/app/src/Element/SuggestedProfiles.tsx index 6d8026beb..cd931cb1f 100644 --- a/packages/app/src/Element/SuggestedProfiles.tsx +++ b/packages/app/src/Element/SuggestedProfiles.tsx @@ -2,7 +2,7 @@ import { useEffect, useState } from "react"; import { HexKey, NostrPrefix } from "@snort/system"; import FormattedMessage from "Element/FormattedMessage"; -import FollowListBase from "Element/FollowListBase"; +import FollowListBase from "Element/User/FollowListBase"; import PageSpinner from "Element/PageSpinner"; import NostrBandApi from "External/NostrBand"; import SemisolDevApi from "External/SemisolDev"; diff --git a/packages/app/src/Element/Text.tsx b/packages/app/src/Element/Text.tsx index 18ad96b8f..aa2d6522b 100644 --- a/packages/app/src/Element/Text.tsx +++ b/packages/app/src/Element/Text.tsx @@ -2,13 +2,13 @@ import "./Text.css"; import { useState } from "react"; import { HexKey, ParsedFragment } from "@snort/system"; -import Invoice from "Element/Invoice"; -import Hashtag from "Element/Hashtag"; +import Invoice from "Element/Embed/Invoice"; +import Hashtag from "Element/Embed/Hashtag"; import HyperText from "Element/HyperText"; import CashuNuts from "Element/Embed/CashuNuts"; -import RevealMedia from "./RevealMedia"; +import RevealMedia from "./Event/RevealMedia"; import { ProxyImg } from "./ProxyImg"; -import { SpotlightMediaModal } from "./SpotlightMedia"; +import { SpotlightMediaModal } from "./Deck/SpotlightMedia"; import { useTextTransformer } from "Hooks/useTextTransformCache"; export interface TextProps { diff --git a/packages/app/src/Element/Textarea.tsx b/packages/app/src/Element/Textarea.tsx index d9249524b..3333bd49d 100644 --- a/packages/app/src/Element/Textarea.tsx +++ b/packages/app/src/Element/Textarea.tsx @@ -6,8 +6,8 @@ import ReactTextareaAutocomplete from "@webscopeio/react-textarea-autocomplete"; import TextareaAutosize from "react-textarea-autosize"; import { NostrPrefix, MetadataCache } from "@snort/system"; -import Avatar from "Element/Avatar"; -import Nip05 from "Element/Nip05"; +import Avatar from "Element/User/Avatar"; +import Nip05 from "Element/User/Nip05"; import { hexToBech32 } from "SnortUtils"; import { UserCache } from "Cache"; import searchEmoji from "emoji-search"; diff --git a/packages/app/src/Element/TrendingUsers.tsx b/packages/app/src/Element/TrendingUsers.tsx index af5cd25c4..d4e43ab16 100644 --- a/packages/app/src/Element/TrendingUsers.tsx +++ b/packages/app/src/Element/TrendingUsers.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from "react"; import { HexKey } from "@snort/system"; -import FollowListBase from "Element/FollowListBase"; +import FollowListBase from "Element/User/FollowListBase"; import PageSpinner from "Element/PageSpinner"; import NostrBandApi from "External/NostrBand"; diff --git a/packages/app/src/Element/Avatar.css b/packages/app/src/Element/User/Avatar.css similarity index 100% rename from packages/app/src/Element/Avatar.css rename to packages/app/src/Element/User/Avatar.css diff --git a/packages/app/src/Element/Avatar.tsx b/packages/app/src/Element/User/Avatar.tsx similarity index 96% rename from packages/app/src/Element/Avatar.tsx rename to packages/app/src/Element/User/Avatar.tsx index e43885f4e..49b91e3e1 100644 --- a/packages/app/src/Element/Avatar.tsx +++ b/packages/app/src/Element/User/Avatar.tsx @@ -4,7 +4,7 @@ import { CSSProperties, ReactNode, useEffect, useState } from "react"; import type { UserMetadata } from "@snort/system"; import useImgProxy from "Hooks/useImgProxy"; -import { getDisplayName } from "Element/ProfileImage"; +import { getDisplayName } from "Element/User/ProfileImage"; import { defaultAvatar } from "SnortUtils"; interface AvatarProps { diff --git a/packages/app/src/Element/AvatarEditor.css b/packages/app/src/Element/User/AvatarEditor.css similarity index 100% rename from packages/app/src/Element/AvatarEditor.css rename to packages/app/src/Element/User/AvatarEditor.css diff --git a/packages/app/src/Element/AvatarEditor.tsx b/packages/app/src/Element/User/AvatarEditor.tsx similarity index 100% rename from packages/app/src/Element/AvatarEditor.tsx rename to packages/app/src/Element/User/AvatarEditor.tsx diff --git a/packages/app/src/Element/BadgeList.css b/packages/app/src/Element/User/BadgeList.css similarity index 100% rename from packages/app/src/Element/BadgeList.css rename to packages/app/src/Element/User/BadgeList.css diff --git a/packages/app/src/Element/BadgeList.tsx b/packages/app/src/Element/User/BadgeList.tsx similarity index 98% rename from packages/app/src/Element/BadgeList.tsx rename to packages/app/src/Element/User/BadgeList.tsx index 35f53125d..b9cf13268 100644 --- a/packages/app/src/Element/BadgeList.tsx +++ b/packages/app/src/Element/User/BadgeList.tsx @@ -8,7 +8,7 @@ import { TaggedNostrEvent } from "@snort/system"; import { ProxyImg } from "Element/ProxyImg"; import Icon from "Icons/Icon"; import Modal from "Element/Modal"; -import Username from "Element/Username"; +import Username from "Element/User/Username"; import { findTag } from "SnortUtils"; export default function BadgeList({ badges }: { badges: TaggedNostrEvent[] }) { diff --git a/packages/app/src/Element/BlockButton.tsx b/packages/app/src/Element/User/BlockButton.tsx similarity index 94% rename from packages/app/src/Element/BlockButton.tsx rename to packages/app/src/Element/User/BlockButton.tsx index 120115753..d5503f9e9 100644 --- a/packages/app/src/Element/BlockButton.tsx +++ b/packages/app/src/Element/User/BlockButton.tsx @@ -2,7 +2,7 @@ import FormattedMessage from "Element/FormattedMessage"; import { HexKey } from "@snort/system"; import useModeration from "Hooks/useModeration"; -import messages from "./messages"; +import messages from "../messages"; interface BlockButtonProps { pubkey: HexKey; diff --git a/packages/app/src/Element/BlockList.tsx b/packages/app/src/Element/User/BlockList.tsx similarity index 75% rename from packages/app/src/Element/BlockList.tsx rename to packages/app/src/Element/User/BlockList.tsx index 1104fb891..7fc353d4d 100644 --- a/packages/app/src/Element/BlockList.tsx +++ b/packages/app/src/Element/User/BlockList.tsx @@ -1,5 +1,5 @@ -import BlockButton from "Element/BlockButton"; -import ProfilePreview from "Element/ProfilePreview"; +import BlockButton from "Element/User/BlockButton"; +import ProfilePreview from "Element/User/ProfilePreview"; import useModeration from "Hooks/useModeration"; export default function BlockList() { diff --git a/packages/app/src/Element/FollowButton.css b/packages/app/src/Element/User/FollowButton.css similarity index 100% rename from packages/app/src/Element/FollowButton.css rename to packages/app/src/Element/User/FollowButton.css diff --git a/packages/app/src/Element/FollowButton.tsx b/packages/app/src/Element/User/FollowButton.tsx similarity index 97% rename from packages/app/src/Element/FollowButton.tsx rename to packages/app/src/Element/User/FollowButton.tsx index b8464ae4a..5952b7fdf 100644 --- a/packages/app/src/Element/FollowButton.tsx +++ b/packages/app/src/Element/User/FollowButton.tsx @@ -8,7 +8,7 @@ import useLogin from "Hooks/useLogin"; import AsyncButton from "Element/AsyncButton"; import { System } from "index"; -import messages from "./messages"; +import messages from "../messages"; import { FollowsFeed } from "Cache"; export interface FollowButtonProps { diff --git a/packages/app/src/Element/FollowListBase.tsx b/packages/app/src/Element/User/FollowListBase.tsx similarity index 92% rename from packages/app/src/Element/FollowListBase.tsx rename to packages/app/src/Element/User/FollowListBase.tsx index 33bbccdda..d169d0862 100644 --- a/packages/app/src/Element/FollowListBase.tsx +++ b/packages/app/src/Element/User/FollowListBase.tsx @@ -3,13 +3,13 @@ import FormattedMessage from "Element/FormattedMessage"; import { HexKey } from "@snort/system"; import useEventPublisher from "Hooks/useEventPublisher"; -import ProfilePreview from "Element/ProfilePreview"; +import ProfilePreview from "Element/User/ProfilePreview"; import useLogin from "Hooks/useLogin"; import { System } from "index"; -import messages from "./messages"; +import messages from "../messages"; import { FollowsFeed } from "Cache"; -import AsyncButton from "./AsyncButton"; +import AsyncButton from "../AsyncButton"; import { setFollows } from "Login"; import { dedupe } from "@snort/shared"; diff --git a/packages/app/src/Element/Following.css b/packages/app/src/Element/User/Following.css similarity index 100% rename from packages/app/src/Element/Following.css rename to packages/app/src/Element/User/Following.css diff --git a/packages/app/src/Element/Following.tsx b/packages/app/src/Element/User/Following.tsx similarity index 100% rename from packages/app/src/Element/Following.tsx rename to packages/app/src/Element/User/Following.tsx diff --git a/packages/app/src/Element/FollowsYou.css b/packages/app/src/Element/User/FollowsYou.css similarity index 100% rename from packages/app/src/Element/FollowsYou.css rename to packages/app/src/Element/User/FollowsYou.css diff --git a/packages/app/src/Element/FollowsYou.tsx b/packages/app/src/Element/User/FollowsYou.tsx similarity index 90% rename from packages/app/src/Element/FollowsYou.tsx rename to packages/app/src/Element/User/FollowsYou.tsx index 8dc1fd6fa..865fc98e0 100644 --- a/packages/app/src/Element/FollowsYou.tsx +++ b/packages/app/src/Element/User/FollowsYou.tsx @@ -1,7 +1,7 @@ import "./FollowsYou.css"; import { useIntl } from "react-intl"; -import messages from "./messages"; +import messages from "../messages"; export interface FollowsYouProps { followsMe: boolean; diff --git a/packages/app/src/Element/MuteButton.tsx b/packages/app/src/Element/User/MuteButton.tsx similarity index 94% rename from packages/app/src/Element/MuteButton.tsx rename to packages/app/src/Element/User/MuteButton.tsx index 647b2db3e..c3b7786ab 100644 --- a/packages/app/src/Element/MuteButton.tsx +++ b/packages/app/src/Element/User/MuteButton.tsx @@ -2,7 +2,7 @@ import FormattedMessage from "Element/FormattedMessage"; import { HexKey } from "@snort/system"; import useModeration from "Hooks/useModeration"; -import messages from "./messages"; +import messages from "../messages"; interface MuteButtonProps { pubkey: HexKey; diff --git a/packages/app/src/Element/MutedList.tsx b/packages/app/src/Element/User/MutedList.tsx similarity index 87% rename from packages/app/src/Element/MutedList.tsx rename to packages/app/src/Element/User/MutedList.tsx index d74a3df37..fefb1f771 100644 --- a/packages/app/src/Element/MutedList.tsx +++ b/packages/app/src/Element/User/MutedList.tsx @@ -1,10 +1,10 @@ import FormattedMessage from "Element/FormattedMessage"; import { HexKey } from "@snort/system"; -import MuteButton from "Element/MuteButton"; -import ProfilePreview from "Element/ProfilePreview"; +import MuteButton from "Element/User/MuteButton"; +import ProfilePreview from "Element/User/ProfilePreview"; import useModeration from "Hooks/useModeration"; -import messages from "./messages"; +import messages from "../messages"; export interface MutedListProps { pubkeys: HexKey[]; diff --git a/packages/app/src/Element/Nip05.css b/packages/app/src/Element/User/Nip05.css similarity index 100% rename from packages/app/src/Element/Nip05.css rename to packages/app/src/Element/User/Nip05.css diff --git a/packages/app/src/Element/Nip05.tsx b/packages/app/src/Element/User/Nip05.tsx similarity index 100% rename from packages/app/src/Element/Nip05.tsx rename to packages/app/src/Element/User/Nip05.tsx diff --git a/packages/app/src/Element/NoteToSelf.css b/packages/app/src/Element/User/NoteToSelf.css similarity index 100% rename from packages/app/src/Element/NoteToSelf.css rename to packages/app/src/Element/User/NoteToSelf.css diff --git a/packages/app/src/Element/NoteToSelf.tsx b/packages/app/src/Element/User/NoteToSelf.tsx similarity index 97% rename from packages/app/src/Element/NoteToSelf.tsx rename to packages/app/src/Element/User/NoteToSelf.tsx index b665dc2bd..d06547770 100644 --- a/packages/app/src/Element/NoteToSelf.tsx +++ b/packages/app/src/Element/User/NoteToSelf.tsx @@ -3,7 +3,7 @@ import { Link, useNavigate } from "react-router-dom"; import FormattedMessage from "Element/FormattedMessage"; import { profileLink } from "SnortUtils"; -import messages from "./messages"; +import messages from "../messages"; import Icon from "Icons/Icon"; export interface NoteToSelfProps { diff --git a/packages/app/src/Element/ProfileImage.css b/packages/app/src/Element/User/ProfileImage.css similarity index 100% rename from packages/app/src/Element/ProfileImage.css rename to packages/app/src/Element/User/ProfileImage.css diff --git a/packages/app/src/Element/ProfileImage.tsx b/packages/app/src/Element/User/ProfileImage.tsx similarity index 97% rename from packages/app/src/Element/ProfileImage.tsx rename to packages/app/src/Element/User/ProfileImage.tsx index ebaaa34f0..007f50c2f 100644 --- a/packages/app/src/Element/ProfileImage.tsx +++ b/packages/app/src/Element/User/ProfileImage.tsx @@ -6,8 +6,8 @@ import { HexKey, NostrPrefix, UserMetadata } from "@snort/system"; import { useUserProfile } from "@snort/system-react"; import { hexToBech32, profileLink } from "SnortUtils"; -import Avatar from "Element/Avatar"; -import Nip05 from "Element/Nip05"; +import Avatar from "Element/User/Avatar"; +import Nip05 from "Element/User/Nip05"; import useLogin from "Hooks/useLogin"; import Icon from "Icons/Icon"; diff --git a/packages/app/src/Element/ProfilePreview.css b/packages/app/src/Element/User/ProfilePreview.css similarity index 100% rename from packages/app/src/Element/ProfilePreview.css rename to packages/app/src/Element/User/ProfilePreview.css diff --git a/packages/app/src/Element/ProfilePreview.tsx b/packages/app/src/Element/User/ProfilePreview.tsx similarity index 93% rename from packages/app/src/Element/ProfilePreview.tsx rename to packages/app/src/Element/User/ProfilePreview.tsx index dffd1da61..1fd655178 100644 --- a/packages/app/src/Element/ProfilePreview.tsx +++ b/packages/app/src/Element/User/ProfilePreview.tsx @@ -4,8 +4,8 @@ import { HexKey, UserMetadata } from "@snort/system"; import { useUserProfile } from "@snort/system-react"; import { useInView } from "react-intersection-observer"; -import ProfileImage from "Element/ProfileImage"; -import FollowButton from "Element/FollowButton"; +import ProfileImage from "Element/User/ProfileImage"; +import FollowButton from "Element/User/FollowButton"; export interface ProfilePreviewProps { pubkey: HexKey; diff --git a/packages/app/src/Element/Username.tsx b/packages/app/src/Element/User/Username.tsx similarity index 100% rename from packages/app/src/Element/Username.tsx rename to packages/app/src/Element/User/Username.tsx diff --git a/packages/app/src/Notifications.ts b/packages/app/src/Notifications.ts index 5f308ff49..4da9df5a0 100644 --- a/packages/app/src/Notifications.ts +++ b/packages/app/src/Notifications.ts @@ -1,5 +1,5 @@ import { TaggedNostrEvent, EventKind, MetadataCache } from "@snort/system"; -import { getDisplayName } from "Element/ProfileImage"; +import { getDisplayName } from "Element/User/ProfileImage"; import { MentionRegex } from "Const"; import { defaultAvatar, tagFilterOfTextRepost, unwrap } from "SnortUtils"; import { UserCache } from "Cache"; diff --git a/packages/app/src/Pages/DeckLayout.tsx b/packages/app/src/Pages/DeckLayout.tsx index 320d8ae91..8d8f35d9e 100644 --- a/packages/app/src/Pages/DeckLayout.tsx +++ b/packages/app/src/Pages/DeckLayout.tsx @@ -9,15 +9,15 @@ import useLoginFeed from "Feed/LoginFeed"; import { useLoginRelays } from "Hooks/useLoginRelays"; import { useTheme } from "Hooks/useTheme"; import Articles from "Element/Deck/Articles"; -import TimelineFollows from "Element/TimelineFollows"; +import TimelineFollows from "Element/Feed/TimelineFollows"; import { transformTextCached } from "Hooks/useTextTransformCache"; import Icon from "Icons/Icon"; import NotificationsPage from "./Notifications"; import useImgProxy from "Hooks/useImgProxy"; import Modal from "Element/Modal"; -import { Thread } from "Element/Thread"; +import { Thread } from "Element/Event/Thread"; import { RootTabs } from "Element/RootTabs"; -import { SpotlightMedia } from "Element/SpotlightMedia"; +import { SpotlightMedia } from "Element/Deck/SpotlightMedia"; import { ThreadContext, ThreadContextWrapper } from "Hooks/useThreadContext"; import Toaster from "Toaster"; import useLogin from "Hooks/useLogin"; diff --git a/packages/app/src/Pages/Discover.tsx b/packages/app/src/Pages/Discover.tsx index 7e99963ae..0c2ce1937 100644 --- a/packages/app/src/Pages/Discover.tsx +++ b/packages/app/src/Pages/Discover.tsx @@ -1,6 +1,6 @@ import SuggestedProfiles from "Element/SuggestedProfiles"; import { Tab, TabElement } from "Element/Tabs"; -import TrendingNotes from "Element/TrendingPosts"; +import TrendingNotes from "Element/Feed/TrendingPosts"; import TrendingUsers from "Element/TrendingUsers"; import { useState } from "react"; import { useIntl } from "react-intl"; diff --git a/packages/app/src/Pages/DonatePage.tsx b/packages/app/src/Pages/DonatePage.tsx index 5374fee2e..a57b74030 100644 --- a/packages/app/src/Pages/DonatePage.tsx +++ b/packages/app/src/Pages/DonatePage.tsx @@ -3,8 +3,8 @@ import FormattedMessage from "Element/FormattedMessage"; import { HexKey } from "@snort/system"; import { ApiHost, KieranPubKey, SnortPubKey } from "Const"; -import ProfilePreview from "Element/ProfilePreview"; -import ZapButton from "Element/ZapButton"; +import ProfilePreview from "Element/User/ProfilePreview"; +import ZapButton from "Element/Event/ZapButton"; import { bech32ToHex } from "SnortUtils"; import SnortApi, { RevenueSplit, RevenueToday } from "SnortApi"; import Modal from "Element/Modal"; diff --git a/packages/app/src/Pages/HashTagsPage.tsx b/packages/app/src/Pages/HashTagsPage.tsx index 39d007d73..132b92836 100644 --- a/packages/app/src/Pages/HashTagsPage.tsx +++ b/packages/app/src/Pages/HashTagsPage.tsx @@ -2,7 +2,7 @@ import { useMemo } from "react"; import { useParams } from "react-router-dom"; import FormattedMessage from "Element/FormattedMessage"; -import Timeline from "Element/Timeline"; +import Timeline from "Element/Feed/Timeline"; import useEventPublisher from "Hooks/useEventPublisher"; import useLogin from "Hooks/useLogin"; import { setTags } from "Login"; diff --git a/packages/app/src/Pages/Layout.tsx b/packages/app/src/Pages/Layout.tsx index 86845dea0..a02150fdf 100644 --- a/packages/app/src/Pages/Layout.tsx +++ b/packages/app/src/Pages/Layout.tsx @@ -9,10 +9,10 @@ import messages from "./messages"; import Icon from "Icons/Icon"; import useLoginFeed from "Feed/LoginFeed"; -import { NoteCreator } from "Element/NoteCreator"; +import { NoteCreator } from "Element/Event/NoteCreator"; import { mapPlanName } from "./subscribe"; import useLogin from "Hooks/useLogin"; -import Avatar from "Element/Avatar"; +import Avatar from "Element/User/Avatar"; import { profileLink } from "SnortUtils"; import { getCurrentSubscription } from "Subscription"; import Toaster from "Toaster"; diff --git a/packages/app/src/Pages/LoginPage.tsx b/packages/app/src/Pages/LoginPage.tsx index 09f1448bb..91cd7891a 100644 --- a/packages/app/src/Pages/LoginPage.tsx +++ b/packages/app/src/Pages/LoginPage.tsx @@ -6,7 +6,7 @@ import { useIntl, FormattedMessage } from "react-intl"; import { HexKey, Nip46Signer, PinEncrypted, PrivateKeySigner } from "@snort/system"; import { bech32ToHex, getPublicKey, unwrap } from "SnortUtils"; -import ZapButton from "Element/ZapButton"; +import ZapButton from "Element/Event/ZapButton"; import useImgProxy from "Hooks/useImgProxy"; import Icon from "Icons/Icon"; import { generateNewLogin, LoginSessionType, LoginStore } from "Login"; diff --git a/packages/app/src/Pages/MessagesPage.tsx b/packages/app/src/Pages/MessagesPage.tsx index 2d7026407..e3c69585e 100644 --- a/packages/app/src/Pages/MessagesPage.tsx +++ b/packages/app/src/Pages/MessagesPage.tsx @@ -7,24 +7,24 @@ import { NostrLink, NostrPrefix, TLVEntryType, UserMetadata, decodeTLV } from "@ import { useUserProfile, useUserSearch } from "@snort/system-react"; import UnreadCount from "Element/UnreadCount"; -import ProfileImage, { getDisplayName } from "Element/ProfileImage"; +import ProfileImage, { getDisplayName } from "Element/User/ProfileImage"; import { appendDedupe, debounce, parseId } from "SnortUtils"; -import NoteToSelf from "Element/NoteToSelf"; +import NoteToSelf from "Element/User/NoteToSelf"; import useModeration from "Hooks/useModeration"; import useLogin from "Hooks/useLogin"; import usePageWidth from "Hooks/usePageWidth"; -import NoteTime from "Element/NoteTime"; -import DmWindow from "Element/DmWindow"; -import Avatar from "Element/Avatar"; +import NoteTime from "Element/Event/NoteTime"; +import DmWindow from "Element/Chat/DmWindow"; +import Avatar from "Element/User/Avatar"; import Icon from "Icons/Icon"; import Text from "Element/Text"; import { Chat, ChatType, createChatLink, useChatSystem } from "chat"; import Modal from "Element/Modal"; -import ProfilePreview from "Element/ProfilePreview"; +import ProfilePreview from "Element/User/ProfilePreview"; import { useEventFeed } from "Feed/EventFeed"; import { LoginSession, LoginStore } from "Login"; import { Nip28ChatSystem } from "chat/nip28"; -import { ChatParticipantProfile } from "Element/ChatParticipant"; +import { ChatParticipantProfile } from "Element/Chat/ChatParticipant"; const TwoCol = 768; const ThreeCol = 1500; diff --git a/packages/app/src/Pages/Notifications.tsx b/packages/app/src/Pages/Notifications.tsx index 1d47a684f..3e0325a57 100644 --- a/packages/app/src/Pages/Notifications.tsx +++ b/packages/app/src/Pages/Notifications.tsx @@ -12,13 +12,13 @@ import { markNotificationsRead } from "Login"; import { Notifications, UserCache } from "Cache"; import { dedupe, findTag, orderDescending } from "SnortUtils"; import Icon from "Icons/Icon"; -import ProfileImage, { getDisplayName } from "Element/ProfileImage"; +import ProfileImage, { getDisplayName } from "Element/User/ProfileImage"; import useModeration from "Hooks/useModeration"; import { useEventFeed } from "Feed/EventFeed"; import Text from "Element/Text"; import { formatShort } from "Number"; import { LiveEvent } from "Element/LiveEvent"; -import ProfilePreview from "Element/ProfilePreview"; +import ProfilePreview from "Element/User/ProfilePreview"; function notificationContext(ev: TaggedNostrEvent) { switch (ev.kind) { diff --git a/packages/app/src/Pages/ProfilePage.tsx b/packages/app/src/Pages/ProfilePage.tsx index d30b8f41c..9d4d44066 100644 --- a/packages/app/src/Pages/ProfilePage.tsx +++ b/packages/app/src/Pages/ProfilePage.tsx @@ -17,9 +17,9 @@ import { useUserProfile } from "@snort/system-react"; import { findTag, getReactions, unwrap } from "SnortUtils"; import { formatShort } from "Number"; -import Note from "Element/Note"; +import Note from "Element/Event/Note"; import Bookmarks from "Element/Bookmarks"; -import RelaysMetadata from "Element/RelaysMetadata"; +import RelaysMetadata from "Element/Relay/RelaysMetadata"; import { Tab, TabElement } from "Element/Tabs"; import Icon from "Icons/Icon"; import useMutedFeed from "Feed/MuteList"; @@ -31,24 +31,24 @@ import useFollowsFeed from "Feed/FollowsFeed"; import useProfileBadges from "Feed/BadgesFeed"; import useModeration from "Hooks/useModeration"; import useZapsFeed from "Feed/ZapsFeed"; -import { default as ZapElement } from "Element/Zap"; -import FollowButton from "Element/FollowButton"; +import { default as ZapElement } from "Element/Event/Zap"; +import FollowButton from "Element/User/FollowButton"; import { parseId, hexToBech32 } from "SnortUtils"; -import Avatar from "Element/Avatar"; -import Timeline from "Element/Timeline"; +import Avatar from "Element/User/Avatar"; +import Timeline from "Element/Feed/Timeline"; import Text from "Element/Text"; import SendSats from "Element/SendSats"; -import Nip05 from "Element/Nip05"; +import Nip05 from "Element/User/Nip05"; import Copy from "Element/Copy"; -import ProfileImage from "Element/ProfileImage"; -import BlockList from "Element/BlockList"; -import MutedList from "Element/MutedList"; -import FollowsList from "Element/FollowListBase"; +import ProfileImage from "Element/User/ProfileImage"; +import BlockList from "Element/User/BlockList"; +import MutedList from "Element/User/MutedList"; +import FollowsList from "Element/User/FollowListBase"; import IconButton from "Element/IconButton"; -import FollowsYou from "Element/FollowsYou"; +import FollowsYou from "Element/User/FollowsYou"; import QrCode from "Element/QrCode"; import Modal from "Element/Modal"; -import BadgeList from "Element/BadgeList"; +import BadgeList from "Element/User/BadgeList"; import { ProxyImg } from "Element/ProxyImg"; import useHorizontalScroll from "Hooks/useHorizontalScroll"; import { EmailRegex } from "Const"; diff --git a/packages/app/src/Pages/Root.tsx b/packages/app/src/Pages/Root.tsx index ddb19c424..69255d008 100644 --- a/packages/app/src/Pages/Root.tsx +++ b/packages/app/src/Pages/Root.tsx @@ -4,18 +4,18 @@ import FormattedMessage from "Element/FormattedMessage"; import { unixNow } from "@snort/shared"; import { NostrLink } from "@snort/system"; -import Timeline from "Element/Timeline"; +import Timeline from "Element/Feed/Timeline"; import { System } from "index"; import { TimelineSubject } from "Feed/TimelineFeed"; import { debounce, getRelayName, sha256 } from "SnortUtils"; import useLogin from "Hooks/useLogin"; import Discover from "Pages/Discover"; import TrendingUsers from "Element/TrendingUsers"; -import TrendingNotes from "Element/TrendingPosts"; +import TrendingNotes from "Element/Feed/TrendingPosts"; import HashTagsPage from "Pages/HashTagsPage"; import SuggestedProfiles from "Element/SuggestedProfiles"; import { TaskList } from "Tasks/TaskList"; -import TimelineFollows from "Element/TimelineFollows"; +import TimelineFollows from "Element/Feed/TimelineFollows"; import { RootTabs } from "Element/RootTabs"; import { DeckContext } from "Pages/DeckLayout"; diff --git a/packages/app/src/Pages/SearchPage.tsx b/packages/app/src/Pages/SearchPage.tsx index 79d5b5560..637a9f91a 100644 --- a/packages/app/src/Pages/SearchPage.tsx +++ b/packages/app/src/Pages/SearchPage.tsx @@ -1,13 +1,13 @@ import { useIntl, FormattedMessage } from "react-intl"; import { useParams } from "react-router-dom"; -import Timeline from "Element/Timeline"; +import Timeline from "Element/Feed/Timeline"; import { Tab, TabElement } from "Element/Tabs"; import { useEffect, useState } from "react"; import { debounce } from "SnortUtils"; import { router } from "index"; import TrendingUsers from "Element/TrendingUsers"; -import TrendingNotes from "Element/TrendingPosts"; +import TrendingNotes from "Element/Feed/TrendingPosts"; const NOTES = 0; const PROFILES = 1; diff --git a/packages/app/src/Pages/WalletPage.tsx b/packages/app/src/Pages/WalletPage.tsx index 8364f95cb..362a04b5e 100644 --- a/packages/app/src/Pages/WalletPage.tsx +++ b/packages/app/src/Pages/WalletPage.tsx @@ -4,7 +4,7 @@ import { useEffect, useState } from "react"; import { RouteObject, useNavigate } from "react-router-dom"; import { FormattedMessage, FormattedNumber, useIntl } from "react-intl"; -import NoteTime from "Element/NoteTime"; +import NoteTime from "Element/Event/NoteTime"; import { WalletInvoice, Sats, WalletInfo, WalletInvoiceState, useWallet, LNWallet, Wallets } from "Wallet"; import AsyncButton from "Element/AsyncButton"; import { unwrap } from "SnortUtils"; diff --git a/packages/app/src/Pages/ZapPool.tsx b/packages/app/src/Pages/ZapPool.tsx index 26664371e..3d1504a3d 100644 --- a/packages/app/src/Pages/ZapPool.tsx +++ b/packages/app/src/Pages/ZapPool.tsx @@ -5,7 +5,7 @@ import { FormattedMessage, FormattedNumber } from "react-intl"; import { useUserProfile } from "@snort/system-react"; import { SnortPubKey } from "Const"; -import ProfilePreview from "Element/ProfilePreview"; +import ProfilePreview from "Element/User/ProfilePreview"; import useLogin from "Hooks/useLogin"; import { UploaderServices } from "Upload"; import { bech32ToHex, getRelayName, unwrap } from "SnortUtils"; diff --git a/packages/app/src/Pages/new/DiscoverFollows.tsx b/packages/app/src/Pages/new/DiscoverFollows.tsx index 7a0afcca8..804797681 100644 --- a/packages/app/src/Pages/new/DiscoverFollows.tsx +++ b/packages/app/src/Pages/new/DiscoverFollows.tsx @@ -4,7 +4,7 @@ import { useNavigate, Link } from "react-router-dom"; import { RecommendedFollows } from "Const"; import Logo from "Element/Logo"; -import FollowListBase from "Element/FollowListBase"; +import FollowListBase from "Element/User/FollowListBase"; import { clearEntropy } from "Login"; import useLogin from "Hooks/useLogin"; import TrendingUsers from "Element/TrendingUsers"; diff --git a/packages/app/src/Pages/new/GetVerified.tsx b/packages/app/src/Pages/new/GetVerified.tsx index 6a3a80467..c9ce92f75 100644 --- a/packages/app/src/Pages/new/GetVerified.tsx +++ b/packages/app/src/Pages/new/GetVerified.tsx @@ -6,7 +6,7 @@ import { useUserProfile } from "@snort/system-react"; import Logo from "Element/Logo"; import { Nip5Services } from "Pages/NostrAddressPage"; import Nip5Service from "Element/Nip5Service"; -import ProfileImage from "Element/ProfileImage"; +import ProfileImage from "Element/User/ProfileImage"; import useLogin from "Hooks/useLogin"; import messages from "./messages"; diff --git a/packages/app/src/Pages/new/ImportFollows.tsx b/packages/app/src/Pages/new/ImportFollows.tsx index 3a1654c51..3e0d6f63d 100644 --- a/packages/app/src/Pages/new/ImportFollows.tsx +++ b/packages/app/src/Pages/new/ImportFollows.tsx @@ -5,7 +5,7 @@ import { useNavigate } from "react-router-dom"; import { ApiHost } from "Const"; import Logo from "Element/Logo"; import AsyncButton from "Element/AsyncButton"; -import FollowListBase from "Element/FollowListBase"; +import FollowListBase from "Element/User/FollowListBase"; import { bech32ToHex } from "SnortUtils"; import SnortApi from "SnortApi"; import useLogin from "Hooks/useLogin"; diff --git a/packages/app/src/Pages/new/ProfileSetup.tsx b/packages/app/src/Pages/new/ProfileSetup.tsx index 4724ea699..dd4d17a6e 100644 --- a/packages/app/src/Pages/new/ProfileSetup.tsx +++ b/packages/app/src/Pages/new/ProfileSetup.tsx @@ -8,7 +8,7 @@ import Logo from "Element/Logo"; import useEventPublisher from "Hooks/useEventPublisher"; import useLogin from "Hooks/useLogin"; import { UserCache } from "Cache"; -import AvatarEditor from "Element/AvatarEditor"; +import AvatarEditor from "Element/User/AvatarEditor"; import { DISCOVER } from "."; import { System } from "index"; diff --git a/packages/app/src/Pages/settings/Accounts.tsx b/packages/app/src/Pages/settings/Accounts.tsx index 5d8d9cf07..e91271a47 100644 --- a/packages/app/src/Pages/settings/Accounts.tsx +++ b/packages/app/src/Pages/settings/Accounts.tsx @@ -1,7 +1,7 @@ import FormattedMessage from "Element/FormattedMessage"; import { Link } from "react-router-dom"; -import ProfilePreview from "Element/ProfilePreview"; +import ProfilePreview from "Element/User/ProfilePreview"; import { LoginStore } from "Login"; import { getActiveSubscriptions } from "Subscription"; diff --git a/packages/app/src/Pages/settings/Profile.tsx b/packages/app/src/Pages/settings/Profile.tsx index 61f0969e4..8a8a5a708 100644 --- a/packages/app/src/Pages/settings/Profile.tsx +++ b/packages/app/src/Pages/settings/Profile.tsx @@ -13,7 +13,7 @@ import AsyncButton from "Element/AsyncButton"; import { UserCache } from "Cache"; import useLogin from "Hooks/useLogin"; import Icon from "Icons/Icon"; -import Avatar from "Element/Avatar"; +import Avatar from "Element/User/Avatar"; export interface ProfileSettingsProps { avatar?: boolean; diff --git a/packages/app/src/Pages/settings/RelayInfo.tsx b/packages/app/src/Pages/settings/RelayInfo.tsx index 337d402f3..196dc47fd 100644 --- a/packages/app/src/Pages/settings/RelayInfo.tsx +++ b/packages/app/src/Pages/settings/RelayInfo.tsx @@ -1,5 +1,5 @@ import FormattedMessage from "Element/FormattedMessage"; -import ProfilePreview from "Element/ProfilePreview"; +import ProfilePreview from "Element/User/ProfilePreview"; import useRelayState from "Feed/RelayState"; import { useNavigate, useParams } from "react-router-dom"; import { parseId, unwrap } from "SnortUtils"; diff --git a/packages/app/src/Pages/settings/Relays.tsx b/packages/app/src/Pages/settings/Relays.tsx index 0144838a6..035d9f398 100644 --- a/packages/app/src/Pages/settings/Relays.tsx +++ b/packages/app/src/Pages/settings/Relays.tsx @@ -3,7 +3,7 @@ import FormattedMessage from "Element/FormattedMessage"; import { unixNowMs } from "@snort/shared"; import { randomSample } from "SnortUtils"; -import Relay from "Element/Relay"; +import Relay from "Element/Relay/Relay"; import useEventPublisher from "Hooks/useEventPublisher"; import { System } from "index"; import useLogin from "Hooks/useLogin"; diff --git a/packages/app/src/Pages/subscribe/SubscriptionCard.tsx b/packages/app/src/Pages/subscribe/SubscriptionCard.tsx index f0b752f63..610cd39f6 100644 --- a/packages/app/src/Pages/subscribe/SubscriptionCard.tsx +++ b/packages/app/src/Pages/subscribe/SubscriptionCard.tsx @@ -9,7 +9,7 @@ import useEventPublisher from "Hooks/useEventPublisher"; import SendSats from "Element/SendSats"; import Nip5Service from "Element/Nip5Service"; import { SnortNostrAddressService } from "Pages/NostrAddressPage"; -import Nip05 from "Element/Nip05"; +import Nip05 from "Element/User/Nip05"; export default function SubscriptionCard({ sub }: { sub: Subscription }) { const publisher = useEventPublisher(); diff --git a/packages/app/src/ZapPoolController.ts b/packages/app/src/ZapPoolController.ts index 617933bc8..99a290d47 100644 --- a/packages/app/src/ZapPoolController.ts +++ b/packages/app/src/ZapPoolController.ts @@ -1,5 +1,5 @@ import { UserCache } from "Cache"; -import { getDisplayName } from "Element/ProfileImage"; +import { getDisplayName } from "Element/User/ProfileImage"; import { LNURL, ExternalStore, unixNow } from "@snort/shared"; import { Toastore } from "Toaster"; import { LNWallet, WalletInvoiceState, Wallets } from "Wallet"; diff --git a/packages/app/src/index.tsx b/packages/app/src/index.tsx index 76f88d5ca..316cf2781 100644 --- a/packages/app/src/index.tsx +++ b/packages/app/src/index.tsx @@ -37,7 +37,7 @@ import HelpPage from "Pages/HelpPage"; import { NewUserRoutes } from "Pages/new"; import { WalletRoutes } from "Pages/WalletPage"; import NostrLinkHandler from "Pages/NostrLinkHandler"; -import { ThreadRoute } from "Element/Thread"; +import { ThreadRoute } from "Element/Event/Thread"; import { SubscribeRoutes } from "Pages/subscribe"; import ZapPoolPage from "Pages/ZapPool"; import DebugPage from "Pages/Debug"; From b993c3ff3cd3aa261ef71788b345ebc8f273aa5e Mon Sep 17 00:00:00 2001 From: Martti Malmi Date: Thu, 28 Sep 2023 12:52:32 +0300 Subject: [PATCH 3/3] use ForwardedRef in AsyncButton --- packages/app/src/Element/AsyncButton.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/app/src/Element/AsyncButton.tsx b/packages/app/src/Element/AsyncButton.tsx index 55c38e4bb..93a912393 100644 --- a/packages/app/src/Element/AsyncButton.tsx +++ b/packages/app/src/Element/AsyncButton.tsx @@ -1,15 +1,14 @@ import "./AsyncButton.css"; -import { useState } from "react"; +import React, { useState, ForwardedRef } from "react"; import Spinner from "../Icons/Spinner"; interface AsyncButtonProps extends React.ButtonHTMLAttributes { disabled?: boolean; onClick(e: React.MouseEvent): Promise | void; children?: React.ReactNode; - ref?: React.Ref; } -export default function AsyncButton(props: AsyncButtonProps) { +const AsyncButton = React.forwardRef((props, ref) => { const [loading, setLoading] = useState(false); async function handle(e: React.MouseEvent) { @@ -30,7 +29,7 @@ export default function AsyncButton(props: AsyncButtonProps) { return ( ); -} +}); + +export default AsyncButton;