more Element subdirectories

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";

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";

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";

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";

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";

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";

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;

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) {

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";

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";
 

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;

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";

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";

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";

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";

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";

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";
 

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";
 

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;

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";

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";

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();