diff --git a/packages/app/src/Cache/EventInteractionCache.ts b/packages/app/src/Cache/EventInteractionCache.ts index a1e5f600..5ecbfa04 100644 --- a/packages/app/src/Cache/EventInteractionCache.ts +++ b/packages/app/src/Cache/EventInteractionCache.ts @@ -1,7 +1,7 @@ import { FeedCache } from "@snort/shared"; import { db, EventInteraction } from "@/Db"; -import { LoginStore } from "@/Login"; -import { sha256 } from "@/SnortUtils"; +import { LoginStore } from "@/Utils/Login"; +import { sha256 } from "@/Utils"; export class EventInteractionCache extends FeedCache { constructor() { diff --git a/packages/app/src/Cache/FollowListCache.ts b/packages/app/src/Cache/FollowListCache.ts index a4a20454..6b57db3f 100644 --- a/packages/app/src/Cache/FollowListCache.ts +++ b/packages/app/src/Cache/FollowListCache.ts @@ -2,7 +2,7 @@ import { db } from "@/Db"; import { unixNowMs } from "@snort/shared"; import { EventKind, RequestBuilder, socialGraphInstance, TaggedNostrEvent } from "@snort/system"; import { RefreshFeedCache } from "./RefreshFeedCache"; -import { LoginSession } from "@/Login"; +import { LoginSession } from "@/Utils/Login"; export class FollowListCache extends RefreshFeedCache { constructor() { diff --git a/packages/app/src/Cache/FollowsFeed.ts b/packages/app/src/Cache/FollowsFeed.ts index 04735dd8..3557a955 100644 --- a/packages/app/src/Cache/FollowsFeed.ts +++ b/packages/app/src/Cache/FollowsFeed.ts @@ -4,8 +4,8 @@ import { unixNow, unixNowMs } from "@snort/shared"; import { db } from "@/Db"; import { RefreshFeedCache, TWithCreated } from "./RefreshFeedCache"; -import { LoginSession } from "@/Login"; -import { Day, Hour } from "@/Const"; +import { LoginSession } from "@/Utils/Login"; +import { Day, Hour } from "@/Utils/Const"; const WindowSize = Hour * 6; const MaxCacheWindow = Day * 7; diff --git a/packages/app/src/Cache/GiftWrapCache.ts b/packages/app/src/Cache/GiftWrapCache.ts index 0505e992..f277d380 100644 --- a/packages/app/src/Cache/GiftWrapCache.ts +++ b/packages/app/src/Cache/GiftWrapCache.ts @@ -1,8 +1,8 @@ import { EventKind, EventPublisher, RequestBuilder, TaggedNostrEvent } from "@snort/system"; import { UnwrappedGift, db } from "@/Db"; -import { findTag, unwrap } from "@/SnortUtils"; +import { findTag, unwrap } from "@/Utils"; import { RefreshFeedCache } from "./RefreshFeedCache"; -import { LoginSession, LoginSessionType } from "@/Login"; +import { LoginSession, LoginSessionType } from "@/Utils/Login"; export class GiftWrapCache extends RefreshFeedCache { constructor() { diff --git a/packages/app/src/Cache/Notifications.ts b/packages/app/src/Cache/Notifications.ts index 58177a06..d07cc057 100644 --- a/packages/app/src/Cache/Notifications.ts +++ b/packages/app/src/Cache/Notifications.ts @@ -1,8 +1,8 @@ import { EventKind, NostrEvent, RequestBuilder, TaggedNostrEvent } from "@snort/system"; import { RefreshFeedCache, TWithCreated } from "./RefreshFeedCache"; -import { LoginSession } from "@/Login"; +import { LoginSession } from "@/Utils/Login"; import { NostrEventForSession, db } from "@/Db"; -import { Day } from "@/Const"; +import { Day } from "@/Utils/Const"; import { unixNow } from "@snort/shared"; export class NotificationsCache extends RefreshFeedCache { diff --git a/packages/app/src/Cache/RefreshFeedCache.ts b/packages/app/src/Cache/RefreshFeedCache.ts index 96de9f64..ce1ba80a 100644 --- a/packages/app/src/Cache/RefreshFeedCache.ts +++ b/packages/app/src/Cache/RefreshFeedCache.ts @@ -1,6 +1,6 @@ import { FeedCache } from "@snort/shared"; import { EventPublisher, RequestBuilder, TaggedNostrEvent } from "@snort/system"; -import { LoginSession } from "@/Login"; +import { LoginSession } from "@/Utils/Login"; export type TWithCreated = (T | Readonly) & { created_at: number }; diff --git a/packages/app/src/Element/Button/AsyncButton.css b/packages/app/src/Components/Button/AsyncButton.css similarity index 100% rename from packages/app/src/Element/Button/AsyncButton.css rename to packages/app/src/Components/Button/AsyncButton.css diff --git a/packages/app/src/Element/Button/AsyncButton.tsx b/packages/app/src/Components/Button/AsyncButton.tsx similarity index 95% rename from packages/app/src/Element/Button/AsyncButton.tsx rename to packages/app/src/Components/Button/AsyncButton.tsx index 3365b8c0..037fb74d 100644 --- a/packages/app/src/Element/Button/AsyncButton.tsx +++ b/packages/app/src/Components/Button/AsyncButton.tsx @@ -1,6 +1,6 @@ import "./AsyncButton.css"; import React, { ForwardedRef } from "react"; -import Spinner from "../../Icons/Spinner"; +import Spinner from "@/Components/Icons/Spinner"; import useLoading from "@/Hooks/useLoading"; import classNames from "classnames"; diff --git a/packages/app/src/Element/Button/AsyncIcon.tsx b/packages/app/src/Components/Button/AsyncIcon.tsx similarity index 88% rename from packages/app/src/Element/Button/AsyncIcon.tsx rename to packages/app/src/Components/Button/AsyncIcon.tsx index e0820461..ffb53648 100644 --- a/packages/app/src/Element/Button/AsyncIcon.tsx +++ b/packages/app/src/Components/Button/AsyncIcon.tsx @@ -1,6 +1,6 @@ -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; import useLoading from "@/Hooks/useLoading"; -import Spinner from "@/Icons/Spinner"; +import Spinner from "@/Components/Icons/Spinner"; export type AsyncIconProps = React.HTMLProps & { iconName: string; diff --git a/packages/app/src/Element/Button/BackButton.css b/packages/app/src/Components/Button/BackButton.css similarity index 100% rename from packages/app/src/Element/Button/BackButton.css rename to packages/app/src/Components/Button/BackButton.css diff --git a/packages/app/src/Element/Button/BackButton.tsx b/packages/app/src/Components/Button/BackButton.tsx similarity index 92% rename from packages/app/src/Element/Button/BackButton.tsx rename to packages/app/src/Components/Button/BackButton.tsx index 2680c01b..9dd21611 100644 --- a/packages/app/src/Element/Button/BackButton.tsx +++ b/packages/app/src/Components/Button/BackButton.tsx @@ -1,7 +1,7 @@ import "./BackButton.css"; import { useIntl } from "react-intl"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; import messages from "../messages"; diff --git a/packages/app/src/Element/Button/CloseButton.tsx b/packages/app/src/Components/Button/CloseButton.tsx similarity index 90% rename from packages/app/src/Element/Button/CloseButton.tsx rename to packages/app/src/Components/Button/CloseButton.tsx index ff769e33..400c80ff 100644 --- a/packages/app/src/Element/Button/CloseButton.tsx +++ b/packages/app/src/Components/Button/CloseButton.tsx @@ -1,4 +1,4 @@ -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; import classNames from "classnames"; export default function CloseButton({ onClick, className }: { onClick?: () => void; className?: string }) { diff --git a/packages/app/src/Element/Button/IconButton.tsx b/packages/app/src/Components/Button/IconButton.tsx similarity index 88% rename from packages/app/src/Element/Button/IconButton.tsx rename to packages/app/src/Components/Button/IconButton.tsx index d2373b0b..eae1edd6 100644 --- a/packages/app/src/Element/Button/IconButton.tsx +++ b/packages/app/src/Components/Button/IconButton.tsx @@ -1,5 +1,5 @@ import classNames from "classnames"; -import Icon, { IconProps } from "@/Icons/Icon"; +import Icon, { IconProps } from "@/Components/Icons/Icon"; import type { ReactNode } from "react"; interface IconButtonProps { diff --git a/packages/app/src/Element/Button/LogoutButton.tsx b/packages/app/src/Components/Button/LogoutButton.tsx similarity index 93% rename from packages/app/src/Element/Button/LogoutButton.tsx rename to packages/app/src/Components/Button/LogoutButton.tsx index 0d138a66..b29a603b 100644 --- a/packages/app/src/Element/Button/LogoutButton.tsx +++ b/packages/app/src/Components/Button/LogoutButton.tsx @@ -1,7 +1,7 @@ import { FormattedMessage } from "react-intl"; import { useNavigate } from "react-router-dom"; -import { logout } from "@/Login"; +import { logout } from "@/Utils/Login"; import useLogin from "@/Hooks/useLogin"; import messages from "../messages"; diff --git a/packages/app/src/Element/Button/NavLink.tsx b/packages/app/src/Components/Button/NavLink.tsx similarity index 100% rename from packages/app/src/Element/Button/NavLink.tsx rename to packages/app/src/Components/Button/NavLink.tsx diff --git a/packages/app/src/Element/Collapsed.tsx b/packages/app/src/Components/Collapsed.tsx similarity index 93% rename from packages/app/src/Element/Collapsed.tsx rename to packages/app/src/Components/Collapsed.tsx index a1d9aa15..fb5986ae 100644 --- a/packages/app/src/Element/Collapsed.tsx +++ b/packages/app/src/Components/Collapsed.tsx @@ -1,8 +1,8 @@ import { useState, ReactNode } from "react"; import classNames from "classnames"; -import Icon from "@/Icons/Icon"; -import ShowMore from "@/Element/Event/ShowMore"; +import Icon from "@/Components/Icons/Icon"; +import ShowMore from "@/Components/Event/ShowMore"; interface CollapsedProps { text?: string; diff --git a/packages/app/src/Element/CommunityLeaders/Award.tsx b/packages/app/src/Components/CommunityLeaders/Award.tsx similarity index 100% rename from packages/app/src/Element/CommunityLeaders/Award.tsx rename to packages/app/src/Components/CommunityLeaders/Award.tsx diff --git a/packages/app/src/Element/CommunityLeaders/LeaderBadge.tsx b/packages/app/src/Components/CommunityLeaders/LeaderBadge.tsx similarity index 98% rename from packages/app/src/Element/CommunityLeaders/LeaderBadge.tsx rename to packages/app/src/Components/CommunityLeaders/LeaderBadge.tsx index 49599951..a883efec 100644 --- a/packages/app/src/Element/CommunityLeaders/LeaderBadge.tsx +++ b/packages/app/src/Components/CommunityLeaders/LeaderBadge.tsx @@ -1,7 +1,7 @@ import { useState } from "react"; import { FormattedMessage } from "react-intl"; import AwardIcon from "./Award"; -import Modal from "../Modal"; +import Modal from "../Modal/Modal"; import { Link } from "react-router-dom"; import CloseButton from "../Button/CloseButton"; diff --git a/packages/app/src/Element/Copy.css b/packages/app/src/Components/Copy/Copy.css similarity index 100% rename from packages/app/src/Element/Copy.css rename to packages/app/src/Components/Copy/Copy.css diff --git a/packages/app/src/Element/Copy.tsx b/packages/app/src/Components/Copy/Copy.tsx similarity index 90% rename from packages/app/src/Element/Copy.tsx rename to packages/app/src/Components/Copy/Copy.tsx index 73a6ce93..f7f4223c 100644 --- a/packages/app/src/Element/Copy.tsx +++ b/packages/app/src/Components/Copy/Copy.tsx @@ -1,7 +1,7 @@ import "./Copy.css"; import classNames from "classnames"; -import Icon from "@/Icons/Icon"; -import { useCopy } from "@/useCopy"; +import Icon from "@/Components/Icons/Icon"; +import { useCopy } from "@/Hooks/useCopy"; export interface CopyProps { text: string; diff --git a/packages/app/src/Element/Embed/AppleMusicEmbed.tsx b/packages/app/src/Components/Embed/AppleMusicEmbed.tsx similarity index 100% rename from packages/app/src/Element/Embed/AppleMusicEmbed.tsx rename to packages/app/src/Components/Embed/AppleMusicEmbed.tsx diff --git a/packages/app/src/Element/Embed/CashuNuts.css b/packages/app/src/Components/Embed/CashuNuts.css similarity index 100% rename from packages/app/src/Element/Embed/CashuNuts.css rename to packages/app/src/Components/Embed/CashuNuts.css diff --git a/packages/app/src/Element/Embed/CashuNuts.tsx b/packages/app/src/Components/Embed/CashuNuts.tsx similarity index 99% rename from packages/app/src/Element/Embed/CashuNuts.tsx rename to packages/app/src/Components/Embed/CashuNuts.tsx index 55686c3e..7a29dfbe 100644 --- a/packages/app/src/Element/Embed/CashuNuts.tsx +++ b/packages/app/src/Components/Embed/CashuNuts.tsx @@ -4,7 +4,7 @@ import { FormattedMessage, FormattedNumber } from "react-intl"; import { useUserProfile } from "@snort/system-react"; import useLogin from "@/Hooks/useLogin"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; interface Token { token: Array<{ diff --git a/packages/app/src/Element/Embed/Hashtag.css b/packages/app/src/Components/Embed/Hashtag.css similarity index 100% rename from packages/app/src/Element/Embed/Hashtag.css rename to packages/app/src/Components/Embed/Hashtag.css diff --git a/packages/app/src/Element/Embed/Hashtag.tsx b/packages/app/src/Components/Embed/Hashtag.tsx similarity index 100% rename from packages/app/src/Element/Embed/Hashtag.tsx rename to packages/app/src/Components/Embed/Hashtag.tsx diff --git a/packages/app/src/Element/Embed/HyperText.tsx b/packages/app/src/Components/Embed/HyperText.tsx similarity index 80% rename from packages/app/src/Element/Embed/HyperText.tsx rename to packages/app/src/Components/Embed/HyperText.tsx index ea7db7ba..6e4db5d7 100644 --- a/packages/app/src/Element/Embed/HyperText.tsx +++ b/packages/app/src/Components/Embed/HyperText.tsx @@ -8,18 +8,18 @@ import { AppleMusicRegex, NostrNestsRegex, WavlakeRegex, -} from "@/Const"; -import { magnetURIDecode } from "@/SnortUtils"; -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"; +} from "@/Utils/Const"; +import { magnetURIDecode } from "@/Utils"; +import SoundCloudEmbed from "@/Components/Embed/SoundCloudEmded"; +import MixCloudEmbed from "@/Components/Embed/MixCloudEmbed"; +import SpotifyEmbed from "@/Components/Embed/SpotifyEmbed"; +import TidalEmbed from "@/Components/Embed/TidalEmbed"; +import TwitchEmbed from "@/Components/Embed/TwitchEmbed"; +import AppleMusicEmbed from "@/Components/Embed/AppleMusicEmbed"; +import WavlakeEmbed from "@/Components/Embed/WavlakeEmbed"; +import LinkPreview from "@/Components/Embed/LinkPreview"; +import NostrLink from "@/Components/Embed/NostrLink"; +import MagnetLink from "@/Components/Embed/MagnetLink"; import { ReactNode } from "react"; interface HypeTextProps { diff --git a/packages/app/src/Element/Embed/Invoice.css b/packages/app/src/Components/Embed/Invoice.css similarity index 100% rename from packages/app/src/Element/Embed/Invoice.css rename to packages/app/src/Components/Embed/Invoice.css diff --git a/packages/app/src/Element/Embed/Invoice.tsx b/packages/app/src/Components/Embed/Invoice.tsx similarity index 96% rename from packages/app/src/Element/Embed/Invoice.tsx rename to packages/app/src/Components/Embed/Invoice.tsx index 14d69abc..99618a09 100644 --- a/packages/app/src/Element/Embed/Invoice.tsx +++ b/packages/app/src/Components/Embed/Invoice.tsx @@ -5,8 +5,8 @@ import { useMemo } from "react"; import { decodeInvoice } from "@snort/shared"; import classNames from "classnames"; -import SendSats from "@/Element/SendSats"; -import Icon from "@/Icons/Icon"; +import SendSats from "@/Components/SendSats/SendSats"; +import Icon from "@/Components/Icons/Icon"; import { useWallet } from "@/Wallet"; import messages from "../messages"; diff --git a/packages/app/src/Element/Embed/LinkPreview.css b/packages/app/src/Components/Embed/LinkPreview.css similarity index 100% rename from packages/app/src/Element/Embed/LinkPreview.css rename to packages/app/src/Components/Embed/LinkPreview.css diff --git a/packages/app/src/Element/Embed/LinkPreview.tsx b/packages/app/src/Components/Embed/LinkPreview.tsx similarity index 96% rename from packages/app/src/Element/Embed/LinkPreview.tsx rename to packages/app/src/Components/Embed/LinkPreview.tsx index 66873d30..1ab9cb68 100644 --- a/packages/app/src/Element/Embed/LinkPreview.tsx +++ b/packages/app/src/Components/Embed/LinkPreview.tsx @@ -1,10 +1,10 @@ import "./LinkPreview.css"; import { CSSProperties, useEffect, useState } from "react"; -import Spinner from "@/Icons/Spinner"; +import Spinner from "@/Components/Icons/Spinner"; import SnortApi, { LinkPreviewData } from "@/External/SnortApi"; import useImgProxy from "@/Hooks/useImgProxy"; -import { MediaElement } from "@/Element/Embed/MediaElement"; +import { MediaElement } from "@/Components/Embed/MediaElement"; async function fetchUrlPreviewInfo(url: string) { const api = new SnortApi(); diff --git a/packages/app/src/Element/Embed/MagnetLink.tsx b/packages/app/src/Components/Embed/MagnetLink.tsx similarity index 91% rename from packages/app/src/Element/Embed/MagnetLink.tsx rename to packages/app/src/Components/Embed/MagnetLink.tsx index a2cfc73d..2d9a6d81 100644 --- a/packages/app/src/Element/Embed/MagnetLink.tsx +++ b/packages/app/src/Components/Embed/MagnetLink.tsx @@ -1,6 +1,6 @@ import { FormattedMessage } from "react-intl"; -import { Magnet } from "@/SnortUtils"; +import { Magnet } from "@/Utils"; interface MagnetLinkProps { magnet: Magnet; diff --git a/packages/app/src/Element/Embed/MediaElement.tsx b/packages/app/src/Components/Embed/MediaElement.tsx similarity index 98% rename from packages/app/src/Element/Embed/MediaElement.tsx rename to packages/app/src/Components/Embed/MediaElement.tsx index 02474c7c..2a9da30e 100644 --- a/packages/app/src/Element/Embed/MediaElement.tsx +++ b/packages/app/src/Components/Embed/MediaElement.tsx @@ -1,4 +1,4 @@ -import { ProxyImg } from "@/Element/ProxyImg"; +import { ProxyImg } from "@/Components/ProxyImg"; import useImgProxy from "@/Hooks/useImgProxy"; import { IMeta } from "@snort/system"; import React, { CSSProperties, useEffect, useMemo, useRef } from "react"; diff --git a/packages/app/src/Element/Embed/Mention.tsx b/packages/app/src/Components/Embed/Mention.tsx similarity index 88% rename from packages/app/src/Element/Embed/Mention.tsx rename to packages/app/src/Components/Embed/Mention.tsx index 51c8961b..e91b1786 100644 --- a/packages/app/src/Element/Embed/Mention.tsx +++ b/packages/app/src/Components/Embed/Mention.tsx @@ -1,9 +1,9 @@ import { NostrLink, NostrPrefix } from "@snort/system"; import { useUserProfile } from "@snort/system-react"; -import DisplayName from "@/Element/User/DisplayName"; -import { ProfileCard } from "@/Element/User/ProfileCard"; -import { ProfileLink } from "@/Element/User/ProfileLink"; +import DisplayName from "@/Components/User/DisplayName"; +import { ProfileCard } from "@/Components/User/ProfileCard"; +import { ProfileLink } from "@/Components/User/ProfileLink"; import { useCallback, useRef, useState } from "react"; export default function Mention({ link }: { link: NostrLink }) { diff --git a/packages/app/src/Element/Embed/MixCloudEmbed.tsx b/packages/app/src/Components/Embed/MixCloudEmbed.tsx similarity index 93% rename from packages/app/src/Element/Embed/MixCloudEmbed.tsx rename to packages/app/src/Components/Embed/MixCloudEmbed.tsx index 7c0698c9..6350a6e6 100644 --- a/packages/app/src/Element/Embed/MixCloudEmbed.tsx +++ b/packages/app/src/Components/Embed/MixCloudEmbed.tsx @@ -1,4 +1,4 @@ -import { MixCloudRegex } from "@/Const"; +import { MixCloudRegex } from "@/Utils/Const"; import useLogin from "@/Hooks/useLogin"; const MixCloudEmbed = ({ link }: { link: string }) => { diff --git a/packages/app/src/Element/Embed/NostrLink.tsx b/packages/app/src/Components/Embed/NostrLink.tsx similarity index 91% rename from packages/app/src/Element/Embed/NostrLink.tsx rename to packages/app/src/Components/Embed/NostrLink.tsx index 639dcd02..21852063 100644 --- a/packages/app/src/Element/Embed/NostrLink.tsx +++ b/packages/app/src/Components/Embed/NostrLink.tsx @@ -1,8 +1,8 @@ import { Link } from "react-router-dom"; import { NostrPrefix, tryParseNostrLink } from "@snort/system"; -import Mention from "@/Element/Embed/Mention"; -import NoteQuote from "@/Element/Event/NoteQuote"; +import Mention from "@/Components/Embed/Mention"; +import NoteQuote from "@/Components/Event/NoteQuote"; export default function NostrLink({ link, depth }: { link: string; depth?: number }) { const nav = tryParseNostrLink(link); diff --git a/packages/app/src/Element/Embed/NostrNestsEmbed.tsx b/packages/app/src/Components/Embed/NostrNestsEmbed.tsx similarity index 100% rename from packages/app/src/Element/Embed/NostrNestsEmbed.tsx rename to packages/app/src/Components/Embed/NostrNestsEmbed.tsx diff --git a/packages/app/src/Element/Embed/PubkeyList.tsx b/packages/app/src/Components/Embed/PubkeyList.tsx similarity index 93% rename from packages/app/src/Element/Embed/PubkeyList.tsx rename to packages/app/src/Components/Embed/PubkeyList.tsx index cbba09cc..5973a237 100644 --- a/packages/app/src/Element/Embed/PubkeyList.tsx +++ b/packages/app/src/Components/Embed/PubkeyList.tsx @@ -2,11 +2,11 @@ import { NostrEvent } from "@snort/system"; import { FormattedMessage, FormattedNumber } from "react-intl"; import { LNURL } from "@snort/shared"; -import { dedupe, findTag, hexToBech32, getDisplayName } from "@/SnortUtils"; -import FollowListBase from "@/Element/User/FollowListBase"; -import AsyncButton from "@/Element/Button/AsyncButton"; +import { dedupe, findTag, hexToBech32, getDisplayName } from "@/Utils"; +import FollowListBase from "@/Components/User/FollowListBase"; +import AsyncButton from "@/Components/Button/AsyncButton"; import { useWallet } from "@/Wallet"; -import { Toastore } from "@/Toaster"; +import { Toastore } from "@/Components/Toaster/Toaster"; import { UserCache } from "@/Cache"; import useLogin from "@/Hooks/useLogin"; import useEventPublisher from "@/Hooks/useEventPublisher"; diff --git a/packages/app/src/Element/Embed/SoundCloudEmded.tsx b/packages/app/src/Components/Embed/SoundCloudEmded.tsx similarity index 100% rename from packages/app/src/Element/Embed/SoundCloudEmded.tsx rename to packages/app/src/Components/Embed/SoundCloudEmded.tsx diff --git a/packages/app/src/Element/Embed/SpotifyEmbed.tsx b/packages/app/src/Components/Embed/SpotifyEmbed.tsx similarity index 100% rename from packages/app/src/Element/Embed/SpotifyEmbed.tsx rename to packages/app/src/Components/Embed/SpotifyEmbed.tsx diff --git a/packages/app/src/Element/Embed/TidalEmbed.tsx b/packages/app/src/Components/Embed/TidalEmbed.tsx similarity index 97% rename from packages/app/src/Element/Embed/TidalEmbed.tsx rename to packages/app/src/Components/Embed/TidalEmbed.tsx index 3477cf9f..b106c630 100644 --- a/packages/app/src/Element/Embed/TidalEmbed.tsx +++ b/packages/app/src/Components/Embed/TidalEmbed.tsx @@ -1,5 +1,5 @@ import { useEffect, useState } from "react"; -import { TidalRegex } from "@/Const"; +import { TidalRegex } from "@/Utils/Const"; // Re-use dom parser across instances of TidalEmbed const domParser = new DOMParser(); diff --git a/packages/app/src/Element/Embed/TwitchEmbed.tsx b/packages/app/src/Components/Embed/TwitchEmbed.tsx similarity index 100% rename from packages/app/src/Element/Embed/TwitchEmbed.tsx rename to packages/app/src/Components/Embed/TwitchEmbed.tsx diff --git a/packages/app/src/Element/Embed/WavlakeEmbed.tsx b/packages/app/src/Components/Embed/WavlakeEmbed.tsx similarity index 100% rename from packages/app/src/Element/Embed/WavlakeEmbed.tsx rename to packages/app/src/Components/Embed/WavlakeEmbed.tsx diff --git a/packages/app/src/Element/Embed/ZapstrEmbed.css b/packages/app/src/Components/Embed/ZapstrEmbed.css similarity index 100% rename from packages/app/src/Element/Embed/ZapstrEmbed.css rename to packages/app/src/Components/Embed/ZapstrEmbed.css diff --git a/packages/app/src/Element/Embed/ZapstrEmbed.tsx b/packages/app/src/Components/Embed/ZapstrEmbed.tsx similarity index 92% rename from packages/app/src/Element/Embed/ZapstrEmbed.tsx rename to packages/app/src/Components/Embed/ZapstrEmbed.tsx index a213c93f..7d612282 100644 --- a/packages/app/src/Element/Embed/ZapstrEmbed.tsx +++ b/packages/app/src/Components/Embed/ZapstrEmbed.tsx @@ -2,8 +2,8 @@ import "./ZapstrEmbed.css"; import { Link } from "react-router-dom"; import { NostrEvent, NostrLink } from "@snort/system"; -import { ProxyImg } from "@/Element/ProxyImg"; -import ProfileImage from "@/Element/User/ProfileImage"; +import { ProxyImg } from "@/Components/ProxyImg"; +import ProfileImage from "@/Components/User/ProfileImage"; import { FormattedMessage } from "react-intl"; export default function ZapstrEmbed({ ev }: { ev: NostrEvent }) { diff --git a/packages/app/src/Element/ErrorBoundary.tsx b/packages/app/src/Components/ErrorBoundary.tsx similarity index 100% rename from packages/app/src/Element/ErrorBoundary.tsx rename to packages/app/src/Components/ErrorBoundary.tsx diff --git a/packages/app/src/Element/ErrorOrOffline.tsx b/packages/app/src/Components/ErrorOrOffline.tsx similarity index 93% rename from packages/app/src/Element/ErrorOrOffline.tsx rename to packages/app/src/Components/ErrorOrOffline.tsx index 7db9dafc..0783e775 100644 --- a/packages/app/src/Element/ErrorOrOffline.tsx +++ b/packages/app/src/Components/ErrorOrOffline.tsx @@ -1,7 +1,7 @@ import { OfflineError } from "@snort/shared"; import { Offline } from "./Offline"; import classNames from "classnames"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; export function ErrorOrOffline({ error, diff --git a/packages/app/src/Element/Event/Create/NoteCreator.css b/packages/app/src/Components/Event/Create/NoteCreator.css similarity index 100% rename from packages/app/src/Element/Event/Create/NoteCreator.css rename to packages/app/src/Components/Event/Create/NoteCreator.css diff --git a/packages/app/src/Element/Event/Create/NoteCreator.tsx b/packages/app/src/Components/Event/Create/NoteCreator.tsx similarity index 96% rename from packages/app/src/Element/Event/Create/NoteCreator.tsx rename to packages/app/src/Components/Event/Create/NoteCreator.tsx index 42667362..84f5d577 100644 --- a/packages/app/src/Element/Event/Create/NoteCreator.tsx +++ b/packages/app/src/Components/Event/Create/NoteCreator.tsx @@ -4,30 +4,30 @@ import { EventBuilder, EventKind, NostrLink, NostrPrefix, TaggedNostrEvent, tryP import classNames from "classnames"; import { TagsInput } from "react-tag-input-component"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; import useEventPublisher from "@/Hooks/useEventPublisher"; -import { appendDedupe, openFile, trackEvent } from "@/SnortUtils"; -import Textarea from "@/Element/Textarea"; -import Modal from "@/Element/Modal"; -import ProfileImage from "@/Element/User/ProfileImage"; -import useFileUpload from "@/Upload"; -import Note from "@/Element/Event/Note"; +import { appendDedupe, openFile, trackEvent } from "@/Utils"; +import Textarea from "@/Components/Textarea/Textarea"; +import Modal from "@/Components/Modal/Modal"; +import ProfileImage from "@/Components/User/ProfileImage"; +import useFileUpload from "@/Utils/Upload"; +import Note from "@/Components/Event/Note"; import { ClipboardEventHandler, DragEvent, useEffect } from "react"; import useLogin from "@/Hooks/useLogin"; -import AsyncButton from "@/Element/Button/AsyncButton"; -import { AsyncIcon } from "@/Element/Button/AsyncIcon"; +import AsyncButton from "@/Components/Button/AsyncButton"; +import { AsyncIcon } from "@/Components/Button/AsyncIcon"; import { fetchNip05Pubkey, unixNow } from "@snort/shared"; -import { ZapTarget } from "@/Zapper"; +import { ZapTarget } from "@/Utils/Zapper"; import { useNoteCreator } from "@/State/NoteCreator"; import FileUploadProgress from "../FileUpload"; -import { ToggleSwitch } from "@/Icons/Toggle"; -import { sendEventToRelays } from "@/Element/Event/Create/util"; -import { TrendingHashTagsLine } from "@/Element/Event/Create/TrendingHashTagsLine"; -import { Toastore } from "@/Toaster"; +import { ToggleSwitch } from "@/Components/Icons/Toggle"; +import { sendEventToRelays } from "@/Components/Event/Create/util"; +import { TrendingHashTagsLine } from "@/Components/Event/Create/TrendingHashTagsLine"; +import { Toastore } from "@/Components/Toaster/Toaster"; import { OkResponseRow } from "./OkResponseRow"; -import CloseButton from "@/Element/Button/CloseButton"; -import { GetPowWorker } from "@/wasm"; +import CloseButton from "@/Components/Button/CloseButton"; +import { GetPowWorker } from "@/Utils/wasm"; export function NoteCreator() { const { formatMessage } = useIntl(); diff --git a/packages/app/src/Element/Event/Create/NoteCreatorButton.tsx b/packages/app/src/Components/Event/Create/NoteCreatorButton.tsx similarity index 96% rename from packages/app/src/Element/Event/Create/NoteCreatorButton.tsx rename to packages/app/src/Components/Event/Create/NoteCreatorButton.tsx index c7847207..2a9441d9 100644 --- a/packages/app/src/Element/Event/Create/NoteCreatorButton.tsx +++ b/packages/app/src/Components/Event/Create/NoteCreatorButton.tsx @@ -2,10 +2,10 @@ import { useRef, useMemo } from "react"; import { useLocation } from "react-router-dom"; import classNames from "classnames"; -import { isFormElement } from "@/SnortUtils"; +import { isFormElement } from "@/Utils"; import useKeyboardShortcut from "@/Hooks/useKeyboardShortcut"; import useLogin from "@/Hooks/useLogin"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; import { useNoteCreator } from "@/State/NoteCreator"; import { NoteCreator } from "./NoteCreator"; import { FormattedMessage } from "react-intl"; diff --git a/packages/app/src/Element/Event/Create/OkResponseRow.tsx b/packages/app/src/Components/Event/Create/OkResponseRow.tsx similarity index 89% rename from packages/app/src/Element/Event/Create/OkResponseRow.tsx rename to packages/app/src/Components/Event/Create/OkResponseRow.tsx index 283a622c..730d64d9 100644 --- a/packages/app/src/Element/Event/Create/OkResponseRow.tsx +++ b/packages/app/src/Components/Event/Create/OkResponseRow.tsx @@ -1,11 +1,11 @@ -import AsyncButton from "@/Element/Button/AsyncButton"; -import IconButton from "@/Element/Button/IconButton"; +import AsyncButton from "@/Components/Button/AsyncButton"; +import IconButton from "@/Components/Button/IconButton"; import useEventPublisher from "@/Hooks/useEventPublisher"; import useLogin from "@/Hooks/useLogin"; -import Icon from "@/Icons/Icon"; -import { removeRelay } from "@/Login"; +import Icon from "@/Components/Icons/Icon"; +import { removeRelay } from "@/Utils/Login"; import { saveRelays } from "@/Pages/settings/Relays"; -import { getRelayName } from "@/SnortUtils"; +import { getRelayName } from "@/Utils"; import { unwrap, sanitizeRelayUrl } from "@snort/shared"; import { OkResponse } from "@snort/system"; import { useState } from "react"; diff --git a/packages/app/src/Element/Event/Create/TrendingHashTagsLine.tsx b/packages/app/src/Components/Event/Create/TrendingHashTagsLine.tsx similarity index 95% rename from packages/app/src/Element/Event/Create/TrendingHashTagsLine.tsx rename to packages/app/src/Components/Event/Create/TrendingHashTagsLine.tsx index 0f8fe042..9fd42e50 100644 --- a/packages/app/src/Element/Event/Create/TrendingHashTagsLine.tsx +++ b/packages/app/src/Components/Event/Create/TrendingHashTagsLine.tsx @@ -2,7 +2,7 @@ import { useLocale } from "@/IntlProvider"; import NostrBandApi from "@/External/NostrBand"; import { FormattedMessage } from "react-intl"; import useCachedFetch from "@/Hooks/useCachedFetch"; -import { ErrorOrOffline } from "@/Element/ErrorOrOffline"; +import { ErrorOrOffline } from "@/Components/ErrorOrOffline"; export function TrendingHashTagsLine(props: { onClick: (tag: string) => void }) { const { lang } = useLocale(); diff --git a/packages/app/src/Element/Event/Create/util.ts b/packages/app/src/Components/Event/Create/util.ts similarity index 100% rename from packages/app/src/Element/Event/Create/util.ts rename to packages/app/src/Components/Event/Create/util.ts diff --git a/packages/app/src/Element/Event/FileUpload.tsx b/packages/app/src/Components/Event/FileUpload.tsx similarity index 77% rename from packages/app/src/Element/Event/FileUpload.tsx rename to packages/app/src/Components/Event/FileUpload.tsx index 4b5f7dd2..357407ee 100644 --- a/packages/app/src/Element/Event/FileUpload.tsx +++ b/packages/app/src/Components/Event/FileUpload.tsx @@ -1,5 +1,5 @@ -import Progress from "@/Element/Progress"; -import { UploadProgress } from "@/Upload"; +import Progress from "@/Components/Progress/Progress"; +import { UploadProgress } from "@/Utils/Upload"; export default function FileUploadProgress({ progress }: { progress: Array }) { return ( diff --git a/packages/app/src/Element/Event/HiddenNote.tsx b/packages/app/src/Components/Event/HiddenNote.tsx similarity index 100% rename from packages/app/src/Element/Event/HiddenNote.tsx rename to packages/app/src/Components/Event/HiddenNote.tsx diff --git a/packages/app/src/Element/Event/LongFormText.css b/packages/app/src/Components/Event/LongFormText.css similarity index 100% rename from packages/app/src/Element/Event/LongFormText.css rename to packages/app/src/Components/Event/LongFormText.css diff --git a/packages/app/src/Element/Event/LongFormText.tsx b/packages/app/src/Components/Event/LongFormText.tsx similarity index 97% rename from packages/app/src/Element/Event/LongFormText.tsx rename to packages/app/src/Components/Event/LongFormText.tsx index 9b5ead71..7eb73930 100644 --- a/packages/app/src/Element/Event/LongFormText.tsx +++ b/packages/app/src/Components/Event/LongFormText.tsx @@ -4,11 +4,11 @@ import { FormattedMessage, FormattedNumber } from "react-intl"; import { NostrLink, TaggedNostrEvent } from "@snort/system"; import { useEventReactions } from "@snort/system-react"; -import { findTag } from "@/SnortUtils"; -import Text from "@/Element/Text"; +import { findTag } from "@/Utils"; +import Text from "@/Components/Text/Text"; import { Markdown } from "./Markdown"; import useImgProxy from "@/Hooks/useImgProxy"; -import ProfilePreview from "@/Element/User/ProfilePreview"; +import ProfilePreview from "@/Components/User/ProfilePreview"; import NoteFooter from "./NoteFooter"; import NoteTime from "./NoteTime"; import classNames from "classnames"; diff --git a/packages/app/src/Element/Event/Markdown.css b/packages/app/src/Components/Event/Markdown.css similarity index 100% rename from packages/app/src/Element/Event/Markdown.css rename to packages/app/src/Components/Event/Markdown.css diff --git a/packages/app/src/Element/Event/Markdown.tsx b/packages/app/src/Components/Event/Markdown.tsx similarity index 97% rename from packages/app/src/Element/Event/Markdown.tsx rename to packages/app/src/Components/Event/Markdown.tsx index 6ffac7a2..f2ea53e9 100644 --- a/packages/app/src/Element/Event/Markdown.tsx +++ b/packages/app/src/Components/Event/Markdown.tsx @@ -6,8 +6,8 @@ import { marked, Token } from "marked"; import { Link } from "react-router-dom"; import markedFootnote, { Footnotes, Footnote, FootnoteRef } from "marked-footnote"; -import { ProxyImg } from "@/Element/ProxyImg"; -import NostrLink from "@/Element/Embed/NostrLink"; +import { ProxyImg } from "@/Components/ProxyImg"; +import NostrLink from "@/Components/Embed/NostrLink"; interface MarkdownProps { content: string; diff --git a/packages/app/src/Element/Event/NostrFileHeader.tsx b/packages/app/src/Components/Event/NostrFileHeader.tsx similarity index 86% rename from packages/app/src/Element/Event/NostrFileHeader.tsx rename to packages/app/src/Components/Event/NostrFileHeader.tsx index dc923ef5..7312fdbe 100644 --- a/packages/app/src/Element/Event/NostrFileHeader.tsx +++ b/packages/app/src/Components/Event/NostrFileHeader.tsx @@ -2,10 +2,10 @@ import { FormattedMessage } from "react-intl"; import { NostrEvent, NostrLink } from "@snort/system"; import { useEventFeed } from "@snort/system-react"; -import { findTag } from "@/SnortUtils"; -import PageSpinner from "@/Element/PageSpinner"; -import Reveal from "@/Element/Event/Reveal"; -import { MediaElement } from "@/Element/Embed/MediaElement"; +import { findTag } from "@/Utils"; +import PageSpinner from "@/Components/PageSpinner"; +import Reveal from "@/Components/Event/Reveal"; +import { MediaElement } from "@/Components/Embed/MediaElement"; export default function NostrFileHeader({ link }: { link: NostrLink }) { const ev = useEventFeed(link); diff --git a/packages/app/src/Element/Event/Note.css b/packages/app/src/Components/Event/Note.css similarity index 100% rename from packages/app/src/Element/Event/Note.css rename to packages/app/src/Components/Event/Note.css diff --git a/packages/app/src/Element/Event/Note.tsx b/packages/app/src/Components/Event/Note.tsx similarity index 83% rename from packages/app/src/Element/Event/Note.tsx rename to packages/app/src/Components/Event/Note.tsx index 478251b7..58769b80 100644 --- a/packages/app/src/Element/Event/Note.tsx +++ b/packages/app/src/Components/Event/Note.tsx @@ -1,16 +1,16 @@ import "./Note.css"; import { ReactNode } from "react"; import { EventKind, NostrEvent, TaggedNostrEvent } from "@snort/system"; -import { NostrFileElement } from "@/Element/Event/NostrFileHeader"; -import ZapstrEmbed from "@/Element/Embed/ZapstrEmbed"; -import PubkeyList from "@/Element/Embed/PubkeyList"; -import { LiveEvent } from "@/Element/LiveEvent"; -import { ZapGoal } from "@/Element/Event/ZapGoal"; -import NoteReaction from "@/Element/Event/NoteReaction"; -import ProfilePreview from "@/Element/User/ProfilePreview"; +import { NostrFileElement } from "@/Components/Event/NostrFileHeader"; +import ZapstrEmbed from "@/Components/Embed/ZapstrEmbed"; +import PubkeyList from "@/Components/Embed/PubkeyList"; +import { LiveEvent } from "@/Components/LiveStream/LiveEvent"; +import { ZapGoal } from "@/Components/Event/ZapGoal"; +import NoteReaction from "@/Components/Event/NoteReaction"; +import ProfilePreview from "@/Components/User/ProfilePreview"; import { NoteInner } from "./NoteInner"; import { LongFormText } from "./LongFormText"; -import ErrorBoundary from "@/Element/ErrorBoundary"; +import ErrorBoundary from "@/Components/ErrorBoundary"; export interface NoteProps { data: TaggedNostrEvent; diff --git a/packages/app/src/Element/Event/NoteContextMenu.tsx b/packages/app/src/Components/Event/NoteContextMenu.tsx similarity index 96% rename from packages/app/src/Element/Event/NoteContextMenu.tsx rename to packages/app/src/Components/Event/NoteContextMenu.tsx index bc29c7be..311a869c 100644 --- a/packages/app/src/Element/Event/NoteContextMenu.tsx +++ b/packages/app/src/Components/Event/NoteContextMenu.tsx @@ -3,15 +3,15 @@ import { FormattedMessage, useIntl } from "react-intl"; import { HexKey, NostrLink, NostrPrefix, TaggedNostrEvent } from "@snort/system"; import { Menu, MenuItem } from "@szhsin/react-menu"; -import Icon from "@/Icons/Icon"; -import { setPinned, setBookmarked } from "@/Login"; -import messages from "@/Element/messages"; +import Icon from "@/Components/Icons/Icon"; +import { setPinned, setBookmarked } from "@/Utils/Login"; +import messages from "@/Components/messages"; import useLogin from "@/Hooks/useLogin"; import useModeration from "@/Hooks/useModeration"; import useEventPublisher from "@/Hooks/useEventPublisher"; import { ReBroadcaster } from "../ReBroadcaster"; import SnortApi from "@/External/SnortApi"; -import { SubscriptionType, getCurrentSubscription } from "@/Subscription"; +import { SubscriptionType, getCurrentSubscription } from "@/Utils/Subscription"; export interface NoteTranslation { text: string; diff --git a/packages/app/src/Element/Event/NoteFooter.tsx b/packages/app/src/Components/Event/NoteFooter.tsx similarity index 95% rename from packages/app/src/Element/Event/NoteFooter.tsx rename to packages/app/src/Components/Event/NoteFooter.tsx index 6b3319ce..760c6a9b 100644 --- a/packages/app/src/Element/Event/NoteFooter.tsx +++ b/packages/app/src/Components/Event/NoteFooter.tsx @@ -7,20 +7,20 @@ import { useUserProfile } from "@snort/system-react"; import { Menu, MenuItem } from "@szhsin/react-menu"; import classNames from "classnames"; -import { formatShort } from "@/Number"; +import { formatShort } from "@/Utils/Number"; import useEventPublisher from "@/Hooks/useEventPublisher"; -import { delay, findTag, getDisplayName } from "@/SnortUtils"; -import SendSats from "@/Element/SendSats"; -import { ZapsSummary } from "@/Element/Event/Zap"; -import { AsyncIcon, AsyncIconProps } from "@/Element/Button/AsyncIcon"; +import { delay, findTag, getDisplayName } from "@/Utils"; +import SendSats from "@/Components/SendSats/SendSats"; +import { ZapsSummary } from "@/Components/Event/Zap"; +import { AsyncIcon, AsyncIconProps } from "@/Components/Button/AsyncIcon"; import { useWallet } from "@/Wallet"; import useLogin from "@/Hooks/useLogin"; import { useInteractionCache } from "@/Hooks/useInteractionCache"; -import { ZapPoolController } from "@/ZapPoolController"; -import { Zapper, ZapTarget } from "@/Zapper"; +import { ZapPoolController } from "@/Utils/ZapPoolController"; +import { Zapper, ZapTarget } from "@/Utils/Zapper"; import { useNoteCreator } from "@/State/NoteCreator"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; import messages from "../messages"; diff --git a/packages/app/src/Element/Event/NoteGhost.tsx b/packages/app/src/Components/Event/NoteGhost.tsx similarity index 88% rename from packages/app/src/Element/Event/NoteGhost.tsx rename to packages/app/src/Components/Event/NoteGhost.tsx index c5c5b81d..ace147c8 100644 --- a/packages/app/src/Element/Event/NoteGhost.tsx +++ b/packages/app/src/Components/Event/NoteGhost.tsx @@ -1,5 +1,5 @@ import "./Note.css"; -import ProfileImage from "@/Element/User/ProfileImage"; +import ProfileImage from "@/Components/User/ProfileImage"; interface NoteGhostProps { className?: string; diff --git a/packages/app/src/Element/Event/NoteInner.tsx b/packages/app/src/Components/Event/NoteInner.tsx similarity index 97% rename from packages/app/src/Element/Event/NoteInner.tsx rename to packages/app/src/Components/Event/NoteInner.tsx index ecb6fd5c..89ffb3ca 100644 --- a/packages/app/src/Element/Event/NoteInner.tsx +++ b/packages/app/src/Components/Event/NoteInner.tsx @@ -6,27 +6,27 @@ import classNames from "classnames"; import { EventExt, EventKind, HexKey, NostrLink, NostrPrefix, TaggedNostrEvent } from "@snort/system"; import { useEventReactions } from "@snort/system-react"; -import { findTag, hexToBech32 } from "@/SnortUtils"; +import { findTag, hexToBech32 } from "@/Utils"; import useModeration from "@/Hooks/useModeration"; import useLogin from "@/Hooks/useLogin"; import useEventPublisher from "@/Hooks/useEventPublisher"; import { NoteContextMenu, NoteTranslation } from "./NoteContextMenu"; import { UserCache } from "@/Cache"; import messages from "../messages"; -import { setBookmarked, setPinned } from "@/Login"; -import Text from "../Text"; +import { setBookmarked, setPinned } from "@/Utils/Login"; +import Text from "../Text/Text"; import Reveal from "./Reveal"; import Poll from "./Poll"; import ProfileImage from "../User/ProfileImage"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; import NoteTime from "./NoteTime"; import NoteFooter from "./NoteFooter"; import Reactions from "./Reactions"; import HiddenNote from "./HiddenNote"; import { NoteProps } from "./Note"; import { chainKey } from "@/Hooks/useThreadContext"; -import { ProfileLink } from "@/Element/User/ProfileLink"; -import DisplayName from "@/Element/User/DisplayName"; +import { ProfileLink } from "@/Components/User/ProfileLink"; +import DisplayName from "@/Components/User/DisplayName"; const TEXT_TRUNCATE_LENGTH = 400; diff --git a/packages/app/src/Element/Event/NoteQuote.tsx b/packages/app/src/Components/Event/NoteQuote.tsx similarity index 85% rename from packages/app/src/Element/Event/NoteQuote.tsx rename to packages/app/src/Components/Event/NoteQuote.tsx index 58b74919..f0aa7a0c 100644 --- a/packages/app/src/Element/Event/NoteQuote.tsx +++ b/packages/app/src/Components/Event/NoteQuote.tsx @@ -1,8 +1,8 @@ import { NostrLink } from "@snort/system"; import { useEventFeed } from "@snort/system-react"; -import Note from "@/Element/Event/Note"; -import PageSpinner from "@/Element/PageSpinner"; +import Note from "@/Components/Event/Note"; +import PageSpinner from "@/Components/PageSpinner"; export default function NoteQuote({ link, depth }: { link: NostrLink; depth?: number }) { const ev = useEventFeed(link); diff --git a/packages/app/src/Element/Event/NoteReaction.css b/packages/app/src/Components/Event/NoteReaction.css similarity index 100% rename from packages/app/src/Element/Event/NoteReaction.css rename to packages/app/src/Components/Event/NoteReaction.css diff --git a/packages/app/src/Element/Event/NoteReaction.tsx b/packages/app/src/Components/Event/NoteReaction.tsx similarity index 95% rename from packages/app/src/Element/Event/NoteReaction.tsx rename to packages/app/src/Components/Event/NoteReaction.tsx index f2b37104..d2f4365d 100644 --- a/packages/app/src/Element/Event/NoteReaction.tsx +++ b/packages/app/src/Components/Event/NoteReaction.tsx @@ -3,11 +3,11 @@ import { Link } from "react-router-dom"; import { useMemo } from "react"; import { EventKind, NostrEvent, TaggedNostrEvent, NostrPrefix, EventExt } from "@snort/system"; -import Note from "@/Element/Event/Note"; -import { eventLink, hexToBech32, getDisplayName } from "@/SnortUtils"; +import Note from "@/Components/Event/Note"; +import { eventLink, hexToBech32, getDisplayName } from "@/Utils"; import useModeration from "@/Hooks/useModeration"; import { FormattedMessage } from "react-intl"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; import { useUserProfile } from "@snort/system-react"; import { useInView } from "react-intersection-observer"; diff --git a/packages/app/src/Element/Event/NoteTime.tsx b/packages/app/src/Components/Event/NoteTime.tsx similarity index 100% rename from packages/app/src/Element/Event/NoteTime.tsx rename to packages/app/src/Components/Event/NoteTime.tsx diff --git a/packages/app/src/Element/Event/Poll.tsx b/packages/app/src/Components/Event/Poll.tsx similarity index 96% rename from packages/app/src/Element/Event/Poll.tsx rename to packages/app/src/Components/Event/Poll.tsx index 931f02a1..e5ca3b94 100644 --- a/packages/app/src/Element/Event/Poll.tsx +++ b/packages/app/src/Components/Event/Poll.tsx @@ -6,10 +6,10 @@ import { useUserProfile } from "@snort/system-react"; import useEventPublisher from "@/Hooks/useEventPublisher"; import { useWallet } from "@/Wallet"; -import { unwrap } from "@/SnortUtils"; -import { formatShort } from "@/Number"; -import Spinner from "@/Icons/Spinner"; -import SendSats from "@/Element/SendSats"; +import { unwrap } from "@/Utils"; +import { formatShort } from "@/Utils/Number"; +import Spinner from "@/Components/Icons/Spinner"; +import SendSats from "@/Components/SendSats/SendSats"; import useLogin from "@/Hooks/useLogin"; interface PollProps { diff --git a/packages/app/src/Element/Event/Reactions.css b/packages/app/src/Components/Event/Reactions.css similarity index 100% rename from packages/app/src/Element/Event/Reactions.css rename to packages/app/src/Components/Event/Reactions.css diff --git a/packages/app/src/Element/Event/Reactions.tsx b/packages/app/src/Components/Event/Reactions.tsx similarity index 92% rename from packages/app/src/Element/Event/Reactions.tsx rename to packages/app/src/Components/Event/Reactions.tsx index 435e9f96..47ce6150 100644 --- a/packages/app/src/Element/Event/Reactions.tsx +++ b/packages/app/src/Components/Event/Reactions.tsx @@ -4,15 +4,15 @@ import { useState, useMemo, useEffect } from "react"; import { useIntl, FormattedMessage } from "react-intl"; import { TaggedNostrEvent, ParsedZap } from "@snort/system"; -import { formatShort } from "@/Number"; -import Icon from "@/Icons/Icon"; -import { Tab } from "@/Element/Tabs"; -import ProfileImage from "@/Element/User/ProfileImage"; -import Tabs from "@/Element/Tabs"; -import Modal from "@/Element/Modal"; +import { formatShort } from "@/Utils/Number"; +import Icon from "@/Components/Icons/Icon"; +import { Tab } from "@/Components/Tabs/Tabs"; +import ProfileImage from "@/Components/User/ProfileImage"; +import Tabs from "@/Components/Tabs/Tabs"; +import Modal from "@/Components/Modal/Modal"; import messages from "../messages"; -import CloseButton from "@/Element/Button/CloseButton"; +import CloseButton from "@/Components/Button/CloseButton"; interface ReactionsProps { show: boolean; diff --git a/packages/app/src/Element/Event/Reveal.tsx b/packages/app/src/Components/Event/Reveal.tsx similarity index 84% rename from packages/app/src/Element/Event/Reveal.tsx rename to packages/app/src/Components/Event/Reveal.tsx index 009ec9ac..ef465311 100644 --- a/packages/app/src/Element/Event/Reveal.tsx +++ b/packages/app/src/Components/Event/Reveal.tsx @@ -1,4 +1,4 @@ -import { WarningNotice } from "@/Element/WarningNotice"; +import { WarningNotice } from "@/Components/WarningNotice/WarningNotice"; import { useState } from "react"; interface RevealProps { diff --git a/packages/app/src/Element/Event/RevealMedia.tsx b/packages/app/src/Components/Event/RevealMedia.tsx similarity index 93% rename from packages/app/src/Element/Event/RevealMedia.tsx rename to packages/app/src/Components/Event/RevealMedia.tsx index f4636ea1..1fe0dcfb 100644 --- a/packages/app/src/Element/Event/RevealMedia.tsx +++ b/packages/app/src/Components/Event/RevealMedia.tsx @@ -1,9 +1,9 @@ import { FormattedMessage } from "react-intl"; -import { FileExtensionRegex } from "@/Const"; -import Reveal from "@/Element/Event/Reveal"; +import { FileExtensionRegex } from "@/Utils/Const"; +import Reveal from "@/Components/Event/Reveal"; import useLogin from "@/Hooks/useLogin"; -import { MediaElement } from "@/Element/Embed/MediaElement"; +import { MediaElement } from "@/Components/Embed/MediaElement"; import { Link } from "react-router-dom"; import { IMeta } from "@snort/system"; diff --git a/packages/app/src/Element/Event/ShowMore.css b/packages/app/src/Components/Event/ShowMore.css similarity index 100% rename from packages/app/src/Element/Event/ShowMore.css rename to packages/app/src/Components/Event/ShowMore.css diff --git a/packages/app/src/Element/Event/ShowMore.tsx b/packages/app/src/Components/Event/ShowMore.tsx similarity index 100% rename from packages/app/src/Element/Event/ShowMore.tsx rename to packages/app/src/Components/Event/ShowMore.tsx diff --git a/packages/app/src/Element/Event/Thread.css b/packages/app/src/Components/Event/Thread.css similarity index 100% rename from packages/app/src/Element/Event/Thread.css rename to packages/app/src/Components/Event/Thread.css diff --git a/packages/app/src/Element/Event/Thread.tsx b/packages/app/src/Components/Event/Thread.tsx similarity index 97% rename from packages/app/src/Element/Event/Thread.tsx rename to packages/app/src/Components/Event/Thread.tsx index 3d3eb796..52735eba 100644 --- a/packages/app/src/Element/Event/Thread.tsx +++ b/packages/app/src/Components/Event/Thread.tsx @@ -5,11 +5,11 @@ import { useNavigate, useParams } from "react-router-dom"; import { TaggedNostrEvent, u256, NostrPrefix, EventExt, parseNostrLink, NostrLink } from "@snort/system"; import classNames from "classnames"; -import { getAllLinkReactions, getLinkReactions } from "@/SnortUtils"; -import BackButton from "@/Element/Button/BackButton"; -import Note from "@/Element/Event/Note"; -import NoteGhost from "@/Element/Event/NoteGhost"; -import Collapsed from "@/Element/Collapsed"; +import { getAllLinkReactions, getLinkReactions } from "@/Utils"; +import BackButton from "@/Components/Button/BackButton"; +import Note from "@/Components/Event/Note"; +import NoteGhost from "@/Components/Event/NoteGhost"; +import Collapsed from "@/Components/Collapsed"; import { ThreadContext, ThreadContextWrapper, chainKey } from "@/Hooks/useThreadContext"; import messages from "../messages"; diff --git a/packages/app/src/Element/Event/Zap.css b/packages/app/src/Components/Event/Zap.css similarity index 100% rename from packages/app/src/Element/Event/Zap.css rename to packages/app/src/Components/Event/Zap.css diff --git a/packages/app/src/Element/Event/Zap.tsx b/packages/app/src/Components/Event/Zap.tsx similarity index 92% rename from packages/app/src/Element/Event/Zap.tsx rename to packages/app/src/Components/Event/Zap.tsx index 58cb9717..9d5eef53 100644 --- a/packages/app/src/Element/Event/Zap.tsx +++ b/packages/app/src/Components/Event/Zap.tsx @@ -3,10 +3,10 @@ import { useMemo } from "react"; import { ParsedZap } from "@snort/system"; import { FormattedMessage, useIntl } from "react-intl"; -import { unwrap } from "@/SnortUtils"; -import { formatShort } from "@/Number"; -import Text from "@/Element/Text"; -import ProfileImage from "@/Element/User/ProfileImage"; +import { unwrap } from "@/Utils"; +import { formatShort } from "@/Utils/Number"; +import Text from "@/Components/Text/Text"; +import ProfileImage from "@/Components/User/ProfileImage"; import useLogin from "@/Hooks/useLogin"; import messages from "../messages"; diff --git a/packages/app/src/Element/Event/ZapButton.css b/packages/app/src/Components/Event/ZapButton.css similarity index 100% rename from packages/app/src/Element/Event/ZapButton.css rename to packages/app/src/Components/Event/ZapButton.css diff --git a/packages/app/src/Element/Event/ZapButton.tsx b/packages/app/src/Components/Event/ZapButton.tsx similarity index 87% rename from packages/app/src/Element/Event/ZapButton.tsx rename to packages/app/src/Components/Event/ZapButton.tsx index c14dc88e..8e732b7d 100644 --- a/packages/app/src/Element/Event/ZapButton.tsx +++ b/packages/app/src/Components/Event/ZapButton.tsx @@ -3,9 +3,9 @@ import { useState } from "react"; import { HexKey } from "@snort/system"; import { useUserProfile } from "@snort/system-react"; -import SendSats from "@/Element/SendSats"; -import Icon from "@/Icons/Icon"; -import { ZapTarget } from "@/Zapper"; +import SendSats from "@/Components/SendSats/SendSats"; +import Icon from "@/Components/Icons/Icon"; +import { ZapTarget } from "@/Utils/Zapper"; const ZapButton = ({ pubkey, diff --git a/packages/app/src/Element/Event/ZapGoal.css b/packages/app/src/Components/Event/ZapGoal.css similarity index 100% rename from packages/app/src/Element/Event/ZapGoal.css rename to packages/app/src/Components/Event/ZapGoal.css diff --git a/packages/app/src/Element/Event/ZapGoal.tsx b/packages/app/src/Components/Event/ZapGoal.tsx similarity index 81% rename from packages/app/src/Element/Event/ZapGoal.tsx rename to packages/app/src/Components/Event/ZapGoal.tsx index a6c54aca..65795e4a 100644 --- a/packages/app/src/Element/Event/ZapGoal.tsx +++ b/packages/app/src/Components/Event/ZapGoal.tsx @@ -2,12 +2,12 @@ import "./ZapGoal.css"; import { useState } from "react"; import { NostrEvent, NostrLink } from "@snort/system"; import useZapsFeed from "@/Feed/ZapsFeed"; -import { formatShort } from "@/Number"; -import { findTag } from "@/SnortUtils"; -import Icon from "@/Icons/Icon"; -import SendSats from "../SendSats"; -import { Zapper } from "@/Zapper"; -import Progress from "@/Element/Progress"; +import { formatShort } from "@/Utils/Number"; +import { findTag } from "@/Utils"; +import Icon from "@/Components/Icons/Icon"; +import SendSats from "../SendSats/SendSats"; +import { Zapper } from "@/Utils/Zapper"; +import Progress from "@/Components/Progress/Progress"; import { FormattedNumber } from "react-intl"; export function ZapGoal({ ev }: { ev: NostrEvent }) { diff --git a/packages/app/src/Element/Event/getEventMedia.ts b/packages/app/src/Components/Event/getEventMedia.ts similarity index 100% rename from packages/app/src/Element/Event/getEventMedia.ts rename to packages/app/src/Components/Event/getEventMedia.ts diff --git a/packages/app/src/Element/Feed/Articles.tsx b/packages/app/src/Components/Feed/Articles.tsx similarity index 94% rename from packages/app/src/Element/Feed/Articles.tsx rename to packages/app/src/Components/Feed/Articles.tsx index 4cd8d6ca..b85b5006 100644 --- a/packages/app/src/Element/Feed/Articles.tsx +++ b/packages/app/src/Components/Feed/Articles.tsx @@ -2,7 +2,7 @@ import { NostrLink } from "@snort/system"; import { useReactions } from "@snort/system-react"; import { useArticles } from "@/Feed/ArticlesFeed"; -import { orderDescending } from "@/SnortUtils"; +import { orderDescending } from "@/Utils"; import Note from "../Event/Note"; import { useContext } from "react"; import { DeckContext } from "@/Pages/DeckLayout"; diff --git a/packages/app/src/Element/Feed/DisplayAsSelector.tsx b/packages/app/src/Components/Feed/DisplayAsSelector.tsx similarity index 93% rename from packages/app/src/Element/Feed/DisplayAsSelector.tsx rename to packages/app/src/Components/Feed/DisplayAsSelector.tsx index c56bc66b..7cc6def1 100644 --- a/packages/app/src/Element/Feed/DisplayAsSelector.tsx +++ b/packages/app/src/Components/Feed/DisplayAsSelector.tsx @@ -1,5 +1,5 @@ -import Icon from "@/Icons/Icon"; -import { LoginStore } from "@/Login"; +import Icon from "@/Components/Icons/Icon"; +import { LoginStore } from "@/Utils/Login"; import useLogin from "@/Hooks/useLogin"; import { useCallback } from "react"; diff --git a/packages/app/src/Element/Feed/Generic.tsx b/packages/app/src/Components/Feed/Generic.tsx similarity index 93% rename from packages/app/src/Element/Feed/Generic.tsx rename to packages/app/src/Components/Feed/Generic.tsx index 48e59bec..6e118233 100644 --- a/packages/app/src/Element/Feed/Generic.tsx +++ b/packages/app/src/Components/Feed/Generic.tsx @@ -2,7 +2,7 @@ import { NostrLink, NoteCollection, ReqFilter, RequestBuilder } from "@snort/sys import { useReactions, useRequestBuilder } from "@snort/system-react"; import { useMemo } from "react"; -import { TimelineRenderer } from "@/Element/Feed/TimelineRenderer"; +import { TimelineRenderer } from "@/Components/Feed/TimelineRenderer"; export function GenericFeed({ link }: { link: NostrLink }) { const sub = useMemo(() => { diff --git a/packages/app/src/Element/Feed/ImageGridItem.tsx b/packages/app/src/Components/Feed/ImageGridItem.tsx similarity index 88% rename from packages/app/src/Element/Feed/ImageGridItem.tsx rename to packages/app/src/Components/Feed/ImageGridItem.tsx index e047ec23..17c06f22 100644 --- a/packages/app/src/Element/Feed/ImageGridItem.tsx +++ b/packages/app/src/Components/Feed/ImageGridItem.tsx @@ -1,9 +1,9 @@ import { NostrLink, TaggedNostrEvent } from "@snort/system"; import { MouseEvent } from "react"; import { Link } from "react-router-dom"; -import Icon from "@/Icons/Icon"; -import getEventMedia from "@/Element/Event/getEventMedia"; -import { ProxyImg } from "@/Element/ProxyImg"; +import Icon from "@/Components/Icons/Icon"; +import getEventMedia from "@/Components/Event/getEventMedia"; +import { ProxyImg } from "@/Components/ProxyImg"; const ImageGridItem = (props: { event: TaggedNostrEvent; onClick: (e: MouseEvent) => void }) => { const { event, onClick } = props; diff --git a/packages/app/src/Element/Feed/LoadMore.tsx b/packages/app/src/Components/Feed/LoadMore.tsx similarity index 100% rename from packages/app/src/Element/Feed/LoadMore.tsx rename to packages/app/src/Components/Feed/LoadMore.tsx diff --git a/packages/app/src/Element/Feed/RootTabs.css b/packages/app/src/Components/Feed/RootTabs.css similarity index 100% rename from packages/app/src/Element/Feed/RootTabs.css rename to packages/app/src/Components/Feed/RootTabs.css diff --git a/packages/app/src/Element/Feed/RootTabs.tsx b/packages/app/src/Components/Feed/RootTabs.tsx similarity index 98% rename from packages/app/src/Element/Feed/RootTabs.tsx rename to packages/app/src/Components/Feed/RootTabs.tsx index d3dbefb7..159846a0 100644 --- a/packages/app/src/Element/Feed/RootTabs.tsx +++ b/packages/app/src/Components/Feed/RootTabs.tsx @@ -5,8 +5,8 @@ import { Menu, MenuItem } from "@szhsin/react-menu"; import { FormattedMessage } from "react-intl"; import useLogin from "@/Hooks/useLogin"; -import Icon from "@/Icons/Icon"; -import { Newest } from "@/Login"; +import Icon from "@/Components/Icons/Icon"; +import { Newest } from "@/Utils/Login"; export type RootTab = | "following" diff --git a/packages/app/src/Element/Feed/Timeline.css b/packages/app/src/Components/Feed/Timeline.css similarity index 100% rename from packages/app/src/Element/Feed/Timeline.css rename to packages/app/src/Components/Feed/Timeline.css diff --git a/packages/app/src/Element/Feed/Timeline.tsx b/packages/app/src/Components/Feed/Timeline.tsx similarity index 93% rename from packages/app/src/Element/Feed/Timeline.tsx rename to packages/app/src/Components/Feed/Timeline.tsx index 76a74296..3edf1a8e 100644 --- a/packages/app/src/Element/Feed/Timeline.tsx +++ b/packages/app/src/Components/Feed/Timeline.tsx @@ -3,13 +3,13 @@ import { FormattedMessage } from "react-intl"; import { useCallback, useMemo, useState } from "react"; import { TaggedNostrEvent, EventKind, socialGraphInstance } from "@snort/system"; -import { dedupeByPubkey, findTag } from "@/SnortUtils"; +import { dedupeByPubkey, findTag } from "@/Utils"; import useTimelineFeed, { TimelineFeed, TimelineSubject } from "@/Feed/TimelineFeed"; import useModeration from "@/Hooks/useModeration"; -import { LiveStreams } from "@/Element/LiveStreams"; +import { LiveStreams } from "@/Components/LiveStream/LiveStreams"; import { unixNow } from "@snort/shared"; -import { TimelineRenderer } from "@/Element/Feed/TimelineRenderer"; -import { DisplayAs, DisplayAsSelector } from "@/Element/Feed/DisplayAsSelector"; +import { TimelineRenderer } from "@/Components/Feed/TimelineRenderer"; +import { DisplayAs, DisplayAsSelector } from "@/Components/Feed/DisplayAsSelector"; import useLogin from "@/Hooks/useLogin"; export interface TimelineProps { diff --git a/packages/app/src/Element/Feed/TimelineFollows.tsx b/packages/app/src/Components/Feed/TimelineFollows.tsx similarity index 92% rename from packages/app/src/Element/Feed/TimelineFollows.tsx rename to packages/app/src/Components/Feed/TimelineFollows.tsx index e7bb36dd..4081d4af 100644 --- a/packages/app/src/Element/Feed/TimelineFollows.tsx +++ b/packages/app/src/Components/Feed/TimelineFollows.tsx @@ -5,15 +5,15 @@ import { EventKind, NostrEvent, NostrLink, TaggedNostrEvent } from "@snort/syste import { unixNow } from "@snort/shared"; import { SnortContext, useReactions } from "@snort/system-react"; -import { dedupeByPubkey, findTag, orderDescending } from "@/SnortUtils"; +import { dedupeByPubkey, findTag, orderDescending } from "@/Utils"; import useModeration from "@/Hooks/useModeration"; import { FollowsFeed } from "@/Cache"; -import { LiveStreams } from "@/Element/LiveStreams"; +import { LiveStreams } from "@/Components/LiveStream/LiveStreams"; import useLogin from "@/Hooks/useLogin"; import useHashtagsFeed from "@/Feed/HashtagsFeed"; -import { ShowMoreInView } from "@/Element/Event/ShowMore"; -import { TimelineRenderer } from "@/Element/Feed/TimelineRenderer"; -import { DisplayAs, DisplayAsSelector } from "@/Element/Feed/DisplayAsSelector"; +import { ShowMoreInView } from "@/Components/Event/ShowMore"; +import { TimelineRenderer } from "@/Components/Feed/TimelineRenderer"; +import { DisplayAs, DisplayAsSelector } from "@/Components/Feed/DisplayAsSelector"; export interface TimelineFollowsProps { postsOnly: boolean; diff --git a/packages/app/src/Element/Feed/TimelineFragment.tsx b/packages/app/src/Components/Feed/TimelineFragment.tsx similarity index 93% rename from packages/app/src/Element/Feed/TimelineFragment.tsx rename to packages/app/src/Components/Feed/TimelineFragment.tsx index aa81b546..3a652975 100644 --- a/packages/app/src/Element/Feed/TimelineFragment.tsx +++ b/packages/app/src/Components/Feed/TimelineFragment.tsx @@ -1,8 +1,8 @@ import { ReactNode, useCallback } from "react"; import { TaggedNostrEvent } from "@snort/system"; -import Note from "@/Element/Event/Note"; -import { findTag } from "@/SnortUtils"; +import Note from "@/Components/Event/Note"; +import { findTag } from "@/Utils"; export interface TimelineFragment { events: Array; diff --git a/packages/app/src/Element/Feed/TimelineRenderer.tsx b/packages/app/src/Components/Feed/TimelineRenderer.tsx similarity index 91% rename from packages/app/src/Element/Feed/TimelineRenderer.tsx rename to packages/app/src/Components/Feed/TimelineRenderer.tsx index 0f9e3655..fde548b1 100644 --- a/packages/app/src/Element/Feed/TimelineRenderer.tsx +++ b/packages/app/src/Components/Feed/TimelineRenderer.tsx @@ -1,15 +1,15 @@ import { useInView } from "react-intersection-observer"; -import ProfileImage from "@/Element/User/ProfileImage"; +import ProfileImage from "@/Components/User/ProfileImage"; import { FormattedMessage } from "react-intl"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; import { TaggedNostrEvent } from "@snort/system"; import { ReactNode, useEffect, useMemo, useRef, useState } from "react"; -import { TimelineFragment } from "@/Element/Feed/TimelineFragment"; -import { DisplayAs } from "@/Element/Feed/DisplayAsSelector"; -import { SpotlightThreadModal } from "@/Element/Spotlight/SpotlightThreadModal"; -import ImageGridItem from "@/Element/Feed/ImageGridItem"; -import ErrorBoundary from "@/Element/ErrorBoundary"; -import getEventMedia from "@/Element/Event/getEventMedia"; +import { TimelineFragment } from "@/Components/Feed/TimelineFragment"; +import { DisplayAs } from "@/Components/Feed/DisplayAsSelector"; +import { SpotlightThreadModal } from "@/Components/Spotlight/SpotlightThreadModal"; +import ImageGridItem from "@/Components/Feed/ImageGridItem"; +import ErrorBoundary from "@/Components/ErrorBoundary"; +import getEventMedia from "@/Components/Event/getEventMedia"; export interface TimelineRendererProps { frags: Array; diff --git a/packages/app/src/Element/Feed/UsersFeed.tsx b/packages/app/src/Components/Feed/UsersFeed.tsx similarity index 89% rename from packages/app/src/Element/Feed/UsersFeed.tsx rename to packages/app/src/Components/Feed/UsersFeed.tsx index 03d42de5..9b776599 100644 --- a/packages/app/src/Element/Feed/UsersFeed.tsx +++ b/packages/app/src/Components/Feed/UsersFeed.tsx @@ -2,8 +2,8 @@ import { useCallback, useMemo } from "react"; import { TaggedNostrEvent } from "@snort/system"; import useTimelineFeed, { TimelineFeed } from "@/Feed/TimelineFeed"; -import FollowListBase from "@/Element/User/FollowListBase"; -import PageSpinner from "@/Element/PageSpinner"; +import FollowListBase from "@/Components/User/FollowListBase"; +import PageSpinner from "@/Components/PageSpinner"; import useModeration from "@/Hooks/useModeration"; export default function UsersFeed({ keyword, sortPopular = true }: { keyword: string; sortPopular?: boolean }) { diff --git a/packages/app/src/Element/HighlightedText.tsx b/packages/app/src/Components/HighlightedText.tsx similarity index 100% rename from packages/app/src/Element/HighlightedText.tsx rename to packages/app/src/Components/HighlightedText.tsx diff --git a/packages/app/src/Icons/Alby.tsx b/packages/app/src/Components/Icons/Alby.tsx similarity index 100% rename from packages/app/src/Icons/Alby.tsx rename to packages/app/src/Components/Icons/Alby.tsx diff --git a/packages/app/src/Icons/BlueWallet.tsx b/packages/app/src/Components/Icons/BlueWallet.tsx similarity index 100% rename from packages/app/src/Icons/BlueWallet.tsx rename to packages/app/src/Components/Icons/BlueWallet.tsx diff --git a/packages/app/src/Icons/Cashu.tsx b/packages/app/src/Components/Icons/Cashu.tsx similarity index 100% rename from packages/app/src/Icons/Cashu.tsx rename to packages/app/src/Components/Icons/Cashu.tsx diff --git a/packages/app/src/Icons/Icon.tsx b/packages/app/src/Components/Icons/Icon.tsx similarity index 90% rename from packages/app/src/Icons/Icon.tsx rename to packages/app/src/Components/Icons/Icon.tsx index 2ced681b..63d5e9d1 100644 --- a/packages/app/src/Icons/Icon.tsx +++ b/packages/app/src/Components/Icons/Icon.tsx @@ -1,5 +1,5 @@ import { MouseEventHandler } from "react"; -import IconsSvg from "@/icons.svg"; +import IconsSvg from "@/Components/Icons/icons.svg"; export interface IconProps { name: string; diff --git a/packages/app/src/Icons/Nostrich.tsx b/packages/app/src/Components/Icons/Nostrich.tsx similarity index 100% rename from packages/app/src/Icons/Nostrich.tsx rename to packages/app/src/Components/Icons/Nostrich.tsx diff --git a/packages/app/src/Icons/Spinner.css b/packages/app/src/Components/Icons/Spinner.css similarity index 100% rename from packages/app/src/Icons/Spinner.css rename to packages/app/src/Components/Icons/Spinner.css diff --git a/packages/app/src/Icons/Spinner.tsx b/packages/app/src/Components/Icons/Spinner.tsx similarity index 100% rename from packages/app/src/Icons/Spinner.tsx rename to packages/app/src/Components/Icons/Spinner.tsx diff --git a/packages/app/src/Icons/Toggle.css b/packages/app/src/Components/Icons/Toggle.css similarity index 100% rename from packages/app/src/Icons/Toggle.css rename to packages/app/src/Components/Icons/Toggle.css diff --git a/packages/app/src/Icons/Toggle.tsx b/packages/app/src/Components/Icons/Toggle.tsx similarity index 100% rename from packages/app/src/Icons/Toggle.tsx rename to packages/app/src/Components/Icons/Toggle.tsx diff --git a/packages/app/src/icons.svg b/packages/app/src/Components/Icons/icons.svg similarity index 100% rename from packages/app/src/icons.svg rename to packages/app/src/Components/Icons/icons.svg diff --git a/packages/app/src/Element/Invite.tsx b/packages/app/src/Components/Invite.tsx similarity index 93% rename from packages/app/src/Element/Invite.tsx rename to packages/app/src/Components/Invite.tsx index 676735e3..5838ed8d 100644 --- a/packages/app/src/Element/Invite.tsx +++ b/packages/app/src/Components/Invite.tsx @@ -1,11 +1,11 @@ import SnortApi from "@/External/SnortApi"; -import { getCurrentRefCode, getDisplayName } from "@/SnortUtils"; +import { getCurrentRefCode, getDisplayName } from "@/Utils"; import { useUserProfile } from "@snort/system-react"; import Lottie from "lottie-react"; import { useState, useEffect } from "react"; import { FormattedMessage } from "react-intl"; import { Link, useNavigate } from "react-router-dom"; -import Modal from "./Modal"; +import Modal from "./Modal/Modal"; import Hugs from "@/hug.json"; const InviteModal = () => { diff --git a/packages/app/src/Element/IrisAccount/AccountName.tsx b/packages/app/src/Components/IrisAccount/AccountName.tsx similarity index 100% rename from packages/app/src/Element/IrisAccount/AccountName.tsx rename to packages/app/src/Components/IrisAccount/AccountName.tsx diff --git a/packages/app/src/Element/IrisAccount/ActiveAccount.tsx b/packages/app/src/Components/IrisAccount/ActiveAccount.tsx similarity index 100% rename from packages/app/src/Element/IrisAccount/ActiveAccount.tsx rename to packages/app/src/Components/IrisAccount/ActiveAccount.tsx diff --git a/packages/app/src/Element/IrisAccount/IrisAccount.tsx b/packages/app/src/Components/IrisAccount/IrisAccount.tsx similarity index 99% rename from packages/app/src/Element/IrisAccount/IrisAccount.tsx rename to packages/app/src/Components/IrisAccount/IrisAccount.tsx index e4018ea6..a2cb150a 100644 --- a/packages/app/src/Element/IrisAccount/IrisAccount.tsx +++ b/packages/app/src/Components/IrisAccount/IrisAccount.tsx @@ -1,13 +1,13 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Component, FormEvent } from "react"; -import { LoginStore } from "@/Login"; +import { LoginStore } from "@/Utils/Login"; import AccountName from "./AccountName"; import ActiveAccount from "./ActiveAccount"; import ReservedAccount from "./ReservedAccount"; import { FormattedMessage } from "react-intl"; import { injectIntl } from "react-intl"; -import messages from "@/Element/messages"; +import messages from "@/Components/messages"; import { ProfileLoader } from "@/system"; declare global { diff --git a/packages/app/src/Element/IrisAccount/ReservedAccount.tsx b/packages/app/src/Components/IrisAccount/ReservedAccount.tsx similarity index 100% rename from packages/app/src/Element/IrisAccount/ReservedAccount.tsx rename to packages/app/src/Components/IrisAccount/ReservedAccount.tsx diff --git a/packages/app/src/Element/LiveEvent.tsx b/packages/app/src/Components/LiveStream/LiveEvent.tsx similarity index 94% rename from packages/app/src/Element/LiveEvent.tsx rename to packages/app/src/Components/LiveStream/LiveEvent.tsx index 580dcca3..9c19665b 100644 --- a/packages/app/src/Element/LiveEvent.tsx +++ b/packages/app/src/Components/LiveStream/LiveEvent.tsx @@ -2,9 +2,9 @@ import { NostrEvent, NostrLink } from "@snort/system"; import { FormattedMessage } from "react-intl"; import { Link } from "react-router-dom"; -import { findTag } from "@/SnortUtils"; -import ProfileImage from "./User/ProfileImage"; -import Icon from "@/Icons/Icon"; +import { findTag } from "@/Utils"; +import ProfileImage from "../User/ProfileImage"; +import Icon from "@/Components/Icons/Icon"; export function LiveEvent({ ev }: { ev: NostrEvent }) { const title = findTag(ev, "title"); diff --git a/packages/app/src/Element/LiveStreams.css b/packages/app/src/Components/LiveStream/LiveStreams.css similarity index 100% rename from packages/app/src/Element/LiveStreams.css rename to packages/app/src/Components/LiveStream/LiveStreams.css diff --git a/packages/app/src/Element/LiveStreams.tsx b/packages/app/src/Components/LiveStream/LiveStreams.tsx similarity index 95% rename from packages/app/src/Element/LiveStreams.tsx rename to packages/app/src/Components/LiveStream/LiveStreams.tsx index 3adeeab4..6fb741c3 100644 --- a/packages/app/src/Element/LiveStreams.tsx +++ b/packages/app/src/Components/LiveStream/LiveStreams.tsx @@ -1,10 +1,10 @@ import "./LiveStreams.css"; import { NostrEvent, NostrLink } from "@snort/system"; -import { findTag } from "@/SnortUtils"; +import { findTag } from "@/Utils"; import { CSSProperties, useMemo } from "react"; import { Link } from "react-router-dom"; import useImgProxy from "@/Hooks/useImgProxy"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; export function LiveStreams({ evs }: { evs: Array }) { const streams = useMemo(() => { diff --git a/packages/app/src/Element/Modal.css b/packages/app/src/Components/Modal/Modal.css similarity index 100% rename from packages/app/src/Element/Modal.css rename to packages/app/src/Components/Modal/Modal.css diff --git a/packages/app/src/Element/Modal.tsx b/packages/app/src/Components/Modal/Modal.tsx similarity index 100% rename from packages/app/src/Element/Modal.tsx rename to packages/app/src/Components/Modal/Modal.tsx diff --git a/packages/app/src/Element/Nip5Service.tsx b/packages/app/src/Components/Nip5Service.tsx similarity index 96% rename from packages/app/src/Element/Nip5Service.tsx rename to packages/app/src/Components/Nip5Service.tsx index d49487b1..07e5e7b5 100644 --- a/packages/app/src/Element/Nip5Service.tsx +++ b/packages/app/src/Components/Nip5Service.tsx @@ -3,8 +3,8 @@ import { useIntl, FormattedMessage } from "react-intl"; import { useNavigate } from "react-router-dom"; import { UserMetadata, mapEventToProfile } from "@snort/system"; -import { unwrap } from "@/SnortUtils"; -import { formatShort } from "@/Number"; +import { unwrap } from "@/Utils"; +import { formatShort } from "@/Utils/Number"; import { ServiceProvider, ServiceConfig, @@ -13,15 +13,15 @@ import { ServiceErrorCode, HandleRegisterResponse, CheckRegisterResponse, -} from "@/Nip05/ServiceProvider"; -import AsyncButton from "@/Element/Button/AsyncButton"; -import SendSats from "@/Element/SendSats"; -import Copy from "@/Element/Copy"; +} from "@/Utils/Nip05/ServiceProvider"; +import AsyncButton from "@/Components/Button/AsyncButton"; +import SendSats from "@/Components/SendSats/SendSats"; +import Copy from "@/Components/Copy/Copy"; import { useUserProfile } from "@snort/system-react"; import useEventPublisher from "@/Hooks/useEventPublisher"; -import { debounce } from "@/SnortUtils"; +import { debounce } from "@/Utils"; import useLogin from "@/Hooks/useLogin"; -import SnortServiceProvider from "@/Nip05/SnortServiceProvider"; +import SnortServiceProvider from "@/Utils/Nip05/SnortServiceProvider"; import { UserCache } from "@/Cache"; import messages from "./messages"; diff --git a/packages/app/src/Element/Offline.tsx b/packages/app/src/Components/Offline.tsx similarity index 93% rename from packages/app/src/Element/Offline.tsx rename to packages/app/src/Components/Offline.tsx index afb5e1ea..b4d8aae6 100644 --- a/packages/app/src/Element/Offline.tsx +++ b/packages/app/src/Components/Offline.tsx @@ -1,4 +1,4 @@ -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; import AsyncButton from "./Button/AsyncButton"; import { FormattedMessage } from "react-intl"; import classNames from "classnames"; diff --git a/packages/app/src/Element/PageSpinner.tsx b/packages/app/src/Components/PageSpinner.tsx similarity index 76% rename from packages/app/src/Element/PageSpinner.tsx rename to packages/app/src/Components/PageSpinner.tsx index feb1ea43..cd6b9f0e 100644 --- a/packages/app/src/Element/PageSpinner.tsx +++ b/packages/app/src/Components/PageSpinner.tsx @@ -1,4 +1,4 @@ -import Spinner from "@/Icons/Spinner"; +import Spinner from "@/Components/Icons/Spinner"; export default function PageSpinner() { return ( diff --git a/packages/app/src/Element/PinPrompt.css b/packages/app/src/Components/PinPrompt/PinPrompt.css similarity index 100% rename from packages/app/src/Element/PinPrompt.css rename to packages/app/src/Components/PinPrompt/PinPrompt.css diff --git a/packages/app/src/Element/PinPrompt.tsx b/packages/app/src/Components/PinPrompt/PinPrompt.tsx similarity index 97% rename from packages/app/src/Element/PinPrompt.tsx rename to packages/app/src/Components/PinPrompt/PinPrompt.tsx index 76205166..f2c64f21 100644 --- a/packages/app/src/Element/PinPrompt.tsx +++ b/packages/app/src/Components/PinPrompt/PinPrompt.tsx @@ -6,11 +6,11 @@ import { unwrap } from "@snort/shared"; import { EventPublisher, InvalidPinError, PinEncrypted } from "@snort/system"; import useEventPublisher from "@/Hooks/useEventPublisher"; -import { LoginStore, createPublisher, sessionNeedsPin } from "@/Login"; -import Modal from "./Modal"; -import AsyncButton from "./Button/AsyncButton"; +import { LoginStore, createPublisher, sessionNeedsPin } from "@/Utils/Login"; +import Modal from "../Modal/Modal"; +import AsyncButton from "../Button/AsyncButton"; -import { GetPowWorker } from "@/wasm"; +import { GetPowWorker } from "@/Utils/wasm"; export function PinPrompt({ onResult, diff --git a/packages/app/src/Element/Progress.css b/packages/app/src/Components/Progress/Progress.css similarity index 100% rename from packages/app/src/Element/Progress.css rename to packages/app/src/Components/Progress/Progress.css diff --git a/packages/app/src/Element/Progress.tsx b/packages/app/src/Components/Progress/Progress.tsx similarity index 100% rename from packages/app/src/Element/Progress.tsx rename to packages/app/src/Components/Progress/Progress.tsx diff --git a/packages/app/src/Element/ProxyImg.tsx b/packages/app/src/Components/ProxyImg.tsx similarity index 97% rename from packages/app/src/Element/ProxyImg.tsx rename to packages/app/src/Components/ProxyImg.tsx index 7b3fd3f6..41781d17 100644 --- a/packages/app/src/Element/ProxyImg.tsx +++ b/packages/app/src/Components/ProxyImg.tsx @@ -1,7 +1,7 @@ import useImgProxy from "@/Hooks/useImgProxy"; import { HTMLProps, ReactNode, forwardRef, useState, useMemo, useEffect } from "react"; import { FormattedMessage } from "react-intl"; -import { getUrlHostname } from "@/SnortUtils"; +import { getUrlHostname } from "@/Utils"; type ProxyImgProps = HTMLProps & { size?: number; diff --git a/packages/app/src/Element/QrCode.tsx b/packages/app/src/Components/QrCode.tsx similarity index 100% rename from packages/app/src/Element/QrCode.tsx rename to packages/app/src/Components/QrCode.tsx diff --git a/packages/app/src/Element/ReBroadcaster.tsx b/packages/app/src/Components/ReBroadcaster.tsx similarity index 97% rename from packages/app/src/Element/ReBroadcaster.tsx rename to packages/app/src/Components/ReBroadcaster.tsx index d6b0c63e..f47e7797 100644 --- a/packages/app/src/Element/ReBroadcaster.tsx +++ b/packages/app/src/Components/ReBroadcaster.tsx @@ -3,7 +3,7 @@ import { FormattedMessage } from "react-intl"; import { TaggedNostrEvent } from "@snort/system"; import { SnortContext } from "@snort/system-react"; -import Modal from "@/Element/Modal"; +import Modal from "@/Components/Modal/Modal"; import messages from "./messages"; import useLogin from "@/Hooks/useLogin"; import AsyncButton from "./Button/AsyncButton"; diff --git a/packages/app/src/Element/Relay/Relay.css b/packages/app/src/Components/Relay/Relay.css similarity index 100% rename from packages/app/src/Element/Relay/Relay.css rename to packages/app/src/Components/Relay/Relay.css diff --git a/packages/app/src/Element/Relay/Relay.tsx b/packages/app/src/Components/Relay/Relay.tsx similarity index 94% rename from packages/app/src/Element/Relay/Relay.tsx rename to packages/app/src/Components/Relay/Relay.tsx index 1f2fd660..74f6215d 100644 --- a/packages/app/src/Element/Relay/Relay.tsx +++ b/packages/app/src/Components/Relay/Relay.tsx @@ -7,11 +7,11 @@ import classNames from "classnames"; import useRelayState from "@/Feed/RelayState"; import { SnortContext } from "@snort/system-react"; -import { getRelayName, unwrap } from "@/SnortUtils"; +import { getRelayName, unwrap } from "@/Utils"; import useLogin from "@/Hooks/useLogin"; -import { removeRelay, setRelays } from "@/Login"; +import { removeRelay, setRelays } from "@/Utils/Login"; import { RelayFavicon } from "./RelaysMetadata"; -import { AsyncIcon } from "@/Element/Button/AsyncIcon"; +import { AsyncIcon } from "@/Components/Button/AsyncIcon"; export interface RelayProps { addr: string; diff --git a/packages/app/src/Element/Relay/RelaysMetadata.css b/packages/app/src/Components/Relay/RelaysMetadata.css similarity index 100% rename from packages/app/src/Element/Relay/RelaysMetadata.css rename to packages/app/src/Components/Relay/RelaysMetadata.css diff --git a/packages/app/src/Element/Relay/RelaysMetadata.tsx b/packages/app/src/Components/Relay/RelaysMetadata.tsx similarity index 93% rename from packages/app/src/Element/Relay/RelaysMetadata.tsx rename to packages/app/src/Components/Relay/RelaysMetadata.tsx index 14b73109..9b9f8539 100644 --- a/packages/app/src/Element/Relay/RelaysMetadata.tsx +++ b/packages/app/src/Components/Relay/RelaysMetadata.tsx @@ -1,9 +1,9 @@ import "./RelaysMetadata.css"; -import Nostrich from "@/nostrich.webp"; +import Nostrich from "@/img/nostrich.webp"; import { useState } from "react"; import { FullRelaySettings } from "@snort/system"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; export const RelayFavicon = ({ url }: { url: string }) => { const cleanUrl = url diff --git a/packages/app/src/Element/SearchBox.css b/packages/app/src/Components/SearchBox/SearchBox.css similarity index 100% rename from packages/app/src/Element/SearchBox.css rename to packages/app/src/Components/SearchBox/SearchBox.css diff --git a/packages/app/src/Element/SearchBox.tsx b/packages/app/src/Components/SearchBox/SearchBox.tsx similarity index 95% rename from packages/app/src/Element/SearchBox.tsx rename to packages/app/src/Components/SearchBox/SearchBox.tsx index e40a8b6f..b13494e0 100644 --- a/packages/app/src/Element/SearchBox.tsx +++ b/packages/app/src/Components/SearchBox/SearchBox.tsx @@ -1,16 +1,16 @@ import "./SearchBox.css"; -import Spinner from "../Icons/Spinner"; -import Icon from "../Icons/Icon"; +import Spinner from "@/Components/Icons/Spinner"; +import Icon from "@/Components/Icons/Icon"; import { FormattedMessage, useIntl } from "react-intl"; -import { fetchNip05Pubkey } from "../Nip05/Verifier"; +import { fetchNip05Pubkey } from "@/Utils/Nip05/Verifier"; import { ChangeEvent, useEffect, useRef, useState } from "react"; import { NostrLink, tryParseNostrLink } from "@snort/system"; import { useLocation, useNavigate } from "react-router-dom"; import { unixNow } from "@snort/shared"; -import useTimelineFeed, { TimelineFeedOptions, TimelineSubject } from "../Feed/TimelineFeed"; -import ProfileImage from "@/Element/User/ProfileImage"; +import useTimelineFeed, { TimelineFeedOptions, TimelineSubject } from "../../Feed/TimelineFeed"; +import ProfileImage from "@/Components/User/ProfileImage"; import { socialGraphInstance } from "@snort/system"; -import fuzzySearch, { FuzzySearchResult } from "@/FuzzySearch"; +import fuzzySearch, { FuzzySearchResult } from "@/Db/FuzzySearch"; const MAX_RESULTS = 3; diff --git a/packages/app/src/Element/SendSats.css b/packages/app/src/Components/SendSats/SendSats.css similarity index 100% rename from packages/app/src/Element/SendSats.css rename to packages/app/src/Components/SendSats/SendSats.css diff --git a/packages/app/src/Element/SendSats.tsx b/packages/app/src/Components/SendSats/SendSats.tsx similarity index 95% rename from packages/app/src/Element/SendSats.tsx rename to packages/app/src/Components/SendSats/SendSats.tsx index 7b7554a2..25a0b661 100644 --- a/packages/app/src/Element/SendSats.tsx +++ b/packages/app/src/Components/SendSats/SendSats.tsx @@ -5,21 +5,21 @@ import { useIntl, FormattedMessage } from "react-intl"; import { HexKey } from "@snort/system"; import { LNURLSuccessAction } from "@snort/shared"; -import { formatShort } from "@/Number"; -import Icon from "@/Icons/Icon"; +import { formatShort } from "@/Utils/Number"; +import Icon from "@/Components/Icons/Icon"; import useEventPublisher from "@/Hooks/useEventPublisher"; -import ProfileImage from "@/Element/User/ProfileImage"; -import Modal from "@/Element/Modal"; -import QrCode from "@/Element/QrCode"; -import Copy from "@/Element/Copy"; -import { debounce } from "@/SnortUtils"; +import ProfileImage from "@/Components/User/ProfileImage"; +import Modal from "@/Components/Modal/Modal"; +import QrCode from "@/Components/QrCode"; +import Copy from "@/Components/Copy/Copy"; +import { debounce } from "@/Utils"; import { LNWallet, useWallet } from "@/Wallet"; import useLogin from "@/Hooks/useLogin"; -import AsyncButton from "@/Element/Button/AsyncButton"; -import { ZapTarget, ZapTargetResult, Zapper } from "@/Zapper"; +import AsyncButton from "@/Components/Button/AsyncButton"; +import { ZapTarget, ZapTargetResult, Zapper } from "@/Utils/Zapper"; -import messages from "./messages"; -import CloseButton from "@/Element/Button/CloseButton"; +import messages from "../messages"; +import CloseButton from "@/Components/Button/CloseButton"; enum ZapType { PublicZap = 1, diff --git a/packages/app/src/Element/Spotlight/SpotlightMedia.tsx b/packages/app/src/Components/Spotlight/SpotlightMedia.tsx similarity index 96% rename from packages/app/src/Element/Spotlight/SpotlightMedia.tsx rename to packages/app/src/Components/Spotlight/SpotlightMedia.tsx index ed770eba..9a1eab92 100644 --- a/packages/app/src/Element/Spotlight/SpotlightMedia.tsx +++ b/packages/app/src/Components/Spotlight/SpotlightMedia.tsx @@ -1,7 +1,7 @@ import { useCallback, useEffect, useMemo, useState } from "react"; -import Modal from "@/Element/Modal"; -import Icon from "@/Icons/Icon"; -import { ProxyImg } from "@/Element/ProxyImg"; +import Modal from "@/Components/Modal/Modal"; +import Icon from "@/Components/Icons/Icon"; +import { ProxyImg } from "@/Components/ProxyImg"; import useImgProxy from "@/Hooks/useImgProxy"; interface SpotlightMediaProps { diff --git a/packages/app/src/Element/Spotlight/SpotlightThreadModal.tsx b/packages/app/src/Components/Spotlight/SpotlightThreadModal.tsx similarity index 89% rename from packages/app/src/Element/Spotlight/SpotlightThreadModal.tsx rename to packages/app/src/Components/Spotlight/SpotlightThreadModal.tsx index 83433b0d..f3a6391a 100644 --- a/packages/app/src/Element/Spotlight/SpotlightThreadModal.tsx +++ b/packages/app/src/Components/Spotlight/SpotlightThreadModal.tsx @@ -1,9 +1,9 @@ -import Modal from "@/Element/Modal"; +import Modal from "@/Components/Modal/Modal"; import { ThreadContextWrapper } from "@/Hooks/useThreadContext"; -import { Thread } from "@/Element/Event/Thread"; -import { SpotlightMedia } from "@/Element/Spotlight/SpotlightMedia"; +import { Thread } from "@/Components/Event/Thread"; +import { SpotlightMedia } from "@/Components/Spotlight/SpotlightMedia"; import { NostrLink, TaggedNostrEvent } from "@snort/system"; -import getEventMedia from "@/Element/Event/getEventMedia"; +import getEventMedia from "@/Components/Event/getEventMedia"; interface SpotlightThreadModalProps { thread?: NostrLink; diff --git a/packages/app/src/Element/SuggestedProfiles.tsx b/packages/app/src/Components/SuggestedProfiles.tsx similarity index 91% rename from packages/app/src/Element/SuggestedProfiles.tsx rename to packages/app/src/Components/SuggestedProfiles.tsx index c915f5d4..ebab2333 100644 --- a/packages/app/src/Element/SuggestedProfiles.tsx +++ b/packages/app/src/Components/SuggestedProfiles.tsx @@ -2,15 +2,15 @@ import { useState } from "react"; import { HexKey, NostrPrefix } from "@snort/system"; import { FormattedMessage } from "react-intl"; -import FollowListBase from "@/Element/User/FollowListBase"; -import PageSpinner from "@/Element/PageSpinner"; +import FollowListBase from "@/Components/User/FollowListBase"; +import PageSpinner from "@/Components/PageSpinner"; import NostrBandApi from "@/External/NostrBand"; import SemisolDevApi from "@/External/SemisolDev"; import useLogin from "@/Hooks/useLogin"; -import { hexToBech32 } from "@/SnortUtils"; +import { hexToBech32 } from "@/Utils"; import { ErrorOrOffline } from "./ErrorOrOffline"; import useCachedFetch from "@/Hooks/useCachedFetch"; -import TrendingUsers from "@/Element/Trending/TrendingUsers"; +import TrendingUsers from "@/Components/Trending/TrendingUsers"; enum Provider { NostrBand = 1, diff --git a/packages/app/src/Element/Tabs.css b/packages/app/src/Components/Tabs/Tabs.css similarity index 100% rename from packages/app/src/Element/Tabs.css rename to packages/app/src/Components/Tabs/Tabs.css diff --git a/packages/app/src/Element/Tabs.tsx b/packages/app/src/Components/Tabs/Tabs.tsx similarity index 100% rename from packages/app/src/Element/Tabs.tsx rename to packages/app/src/Components/Tabs/Tabs.tsx diff --git a/packages/app/src/Tasks/BackupKey.tsx b/packages/app/src/Components/Tasks/BackupKey.tsx similarity index 91% rename from packages/app/src/Tasks/BackupKey.tsx rename to packages/app/src/Components/Tasks/BackupKey.tsx index 54f011dd..0dd211ad 100644 --- a/packages/app/src/Tasks/BackupKey.tsx +++ b/packages/app/src/Components/Tasks/BackupKey.tsx @@ -1,9 +1,9 @@ import { FormattedMessage } from "react-intl"; import { Link } from "react-router-dom"; -import { BaseUITask } from "@/Tasks"; +import { BaseUITask } from "@/Components/Tasks/index"; import { MetadataCache } from "@snort/system"; -import { LoginSession } from "@/Login"; -import Icon from "@/Icons/Icon"; +import { LoginSession } from "@/Utils/Login"; +import Icon from "@/Components/Icons/Icon"; export class BackupKeyTask extends BaseUITask { id = "backup-key"; diff --git a/packages/app/src/Tasks/DonateTask.tsx b/packages/app/src/Components/Tasks/DonateTask.tsx similarity index 92% rename from packages/app/src/Tasks/DonateTask.tsx rename to packages/app/src/Components/Tasks/DonateTask.tsx index a56b580d..7742d456 100644 --- a/packages/app/src/Tasks/DonateTask.tsx +++ b/packages/app/src/Components/Tasks/DonateTask.tsx @@ -1,6 +1,6 @@ import { FormattedMessage } from "react-intl"; import { Link } from "react-router-dom"; -import { BaseUITask } from "@/Tasks"; +import { BaseUITask } from "@/Components/Tasks/index"; export class DonateTask extends BaseUITask { id = "donate"; diff --git a/packages/app/src/Tasks/Nip5Task.tsx b/packages/app/src/Components/Tasks/Nip5Task.tsx similarity index 93% rename from packages/app/src/Tasks/Nip5Task.tsx rename to packages/app/src/Components/Tasks/Nip5Task.tsx index 93bee4aa..4b68d75c 100644 --- a/packages/app/src/Tasks/Nip5Task.tsx +++ b/packages/app/src/Components/Tasks/Nip5Task.tsx @@ -1,7 +1,7 @@ import { FormattedMessage } from "react-intl"; import { Link } from "react-router-dom"; import { MetadataCache } from "@snort/system"; -import { BaseUITask } from "@/Tasks"; +import { BaseUITask } from "@/Components/Tasks/index"; export class Nip5Task extends BaseUITask { id = "buy-nip5"; diff --git a/packages/app/src/Tasks/NoticeZapPool.tsx b/packages/app/src/Components/Tasks/NoticeZapPool.tsx similarity index 95% rename from packages/app/src/Tasks/NoticeZapPool.tsx rename to packages/app/src/Components/Tasks/NoticeZapPool.tsx index 7617c0a3..b13c3562 100644 --- a/packages/app/src/Tasks/NoticeZapPool.tsx +++ b/packages/app/src/Components/Tasks/NoticeZapPool.tsx @@ -1,6 +1,6 @@ import { FormattedMessage, FormattedNumber } from "react-intl"; import { Link } from "react-router-dom"; -import { BaseUITask } from "@/Tasks"; +import { BaseUITask } from "@/Components/Tasks/index"; export class NoticeZapPoolDefault extends BaseUITask { id = "zap-pool-default"; diff --git a/packages/app/src/Tasks/RenewSubscription.tsx b/packages/app/src/Components/Tasks/RenewSubscription.tsx similarity index 81% rename from packages/app/src/Tasks/RenewSubscription.tsx rename to packages/app/src/Components/Tasks/RenewSubscription.tsx index 4837f40b..77a746fe 100644 --- a/packages/app/src/Tasks/RenewSubscription.tsx +++ b/packages/app/src/Components/Tasks/RenewSubscription.tsx @@ -1,9 +1,9 @@ import { FormattedMessage } from "react-intl"; import { MetadataCache } from "@snort/system"; -import { BaseUITask } from "@/Tasks"; -import { LoginSession } from "@/Login"; -import { getCurrentSubscription } from "@/Subscription"; +import { BaseUITask } from "@/Components/Tasks/index"; +import { LoginSession } from "@/Utils/Login"; +import { getCurrentSubscription } from "@/Utils/Subscription"; import { RenewSub } from "@/Pages/subscribe/RenewSub"; export class RenewSubTask extends BaseUITask { diff --git a/packages/app/src/Tasks/TaskList.css b/packages/app/src/Components/Tasks/TaskList.css similarity index 100% rename from packages/app/src/Tasks/TaskList.css rename to packages/app/src/Components/Tasks/TaskList.css diff --git a/packages/app/src/Tasks/TaskList.tsx b/packages/app/src/Components/Tasks/TaskList.tsx similarity index 92% rename from packages/app/src/Tasks/TaskList.tsx rename to packages/app/src/Components/Tasks/TaskList.tsx index b932d991..ad5039be 100644 --- a/packages/app/src/Tasks/TaskList.tsx +++ b/packages/app/src/Components/Tasks/TaskList.tsx @@ -3,15 +3,15 @@ import { Fragment, useSyncExternalStore } from "react"; import { useUserProfile } from "@snort/system-react"; import useLogin from "@/Hooks/useLogin"; -import Icon from "@/Icons/Icon"; -import { UITask } from "@/Tasks"; +import Icon from "@/Components/Icons/Icon"; +import { UITask } from "@/Components/Tasks/index"; import { DonateTask } from "./DonateTask"; import { Nip5Task } from "./Nip5Task"; import { RenewSubTask } from "./RenewSubscription"; import { NoticeZapPoolDefault } from "./NoticeZapPool"; import { BackupKeyTask } from "./BackupKey"; import { ExternalStore } from "@snort/shared"; -import CloseButton from "@/Element/Button/CloseButton"; +import CloseButton from "@/Components/Button/CloseButton"; class TaskStore extends ExternalStore> { #tasks: Array; diff --git a/packages/app/src/Tasks/index.ts b/packages/app/src/Components/Tasks/index.ts similarity index 95% rename from packages/app/src/Tasks/index.ts rename to packages/app/src/Components/Tasks/index.ts index a0bba592..b4796649 100644 --- a/packages/app/src/Tasks/index.ts +++ b/packages/app/src/Components/Tasks/index.ts @@ -1,5 +1,5 @@ import { MetadataCache } from "@snort/system"; -import { LoginSession } from "@/Login"; +import { LoginSession } from "@/Utils/Login"; export interface UITask { id: string; diff --git a/packages/app/src/Element/Text.css b/packages/app/src/Components/Text/Text.css similarity index 100% rename from packages/app/src/Element/Text.css rename to packages/app/src/Components/Text/Text.css diff --git a/packages/app/src/Element/Text.tsx b/packages/app/src/Components/Text/Text.tsx similarity index 95% rename from packages/app/src/Element/Text.tsx rename to packages/app/src/Components/Text/Text.tsx index f27ae5dc..b6269a13 100644 --- a/packages/app/src/Element/Text.tsx +++ b/packages/app/src/Components/Text/Text.tsx @@ -3,14 +3,14 @@ import { ReactNode, useState } from "react"; import { HexKey, ParsedFragment, parseIMeta } from "@snort/system"; import classNames from "classnames"; -import Invoice from "@/Element/Embed/Invoice"; -import Hashtag from "@/Element/Embed/Hashtag"; -import HyperText from "@/Element/Embed/HyperText"; -import CashuNuts from "@/Element/Embed/CashuNuts"; -import RevealMedia from "./Event/RevealMedia"; -import { ProxyImg } from "./ProxyImg"; -import { SpotlightMediaModal } from "./Spotlight/SpotlightMedia"; -import HighlightedText from "./HighlightedText"; +import Invoice from "@/Components/Embed/Invoice"; +import Hashtag from "@/Components/Embed/Hashtag"; +import HyperText from "@/Components/Embed/HyperText"; +import CashuNuts from "@/Components/Embed/CashuNuts"; +import RevealMedia from "../Event/RevealMedia"; +import { ProxyImg } from "../ProxyImg"; +import { SpotlightMediaModal } from "../Spotlight/SpotlightMedia"; +import HighlightedText from "../HighlightedText"; import { useTextTransformer } from "@/Hooks/useTextTransformCache"; export interface TextProps { diff --git a/packages/app/src/Element/Textarea.css b/packages/app/src/Components/Textarea/Textarea.css similarity index 100% rename from packages/app/src/Element/Textarea.css rename to packages/app/src/Components/Textarea/Textarea.css diff --git a/packages/app/src/Element/Textarea.tsx b/packages/app/src/Components/Textarea/Textarea.tsx similarity index 92% rename from packages/app/src/Element/Textarea.tsx rename to packages/app/src/Components/Textarea/Textarea.tsx index ffd4a9d3..89f4b565 100644 --- a/packages/app/src/Element/Textarea.tsx +++ b/packages/app/src/Components/Textarea/Textarea.tsx @@ -6,13 +6,13 @@ import ReactTextareaAutocomplete from "@webscopeio/react-textarea-autocomplete"; import TextareaAutosize from "react-textarea-autosize"; import { NostrPrefix, MetadataCache } from "@snort/system"; -import Avatar from "@/Element/User/Avatar"; -import Nip05 from "@/Element/User/Nip05"; -import { hexToBech32 } from "@/SnortUtils"; +import Avatar from "@/Components/User/Avatar"; +import Nip05 from "@/Components/User/Nip05"; +import { hexToBech32 } from "@/Utils"; import { UserCache } from "@/Cache"; -import searchEmoji from "@/emoji-search"; +import searchEmoji from "@/Utils/emoji-search"; -import messages from "./messages"; +import messages from "../messages"; interface EmojiItemProps { name: string; diff --git a/packages/app/src/Toaster.css b/packages/app/src/Components/Toaster/Toaster.css similarity index 100% rename from packages/app/src/Toaster.css rename to packages/app/src/Components/Toaster/Toaster.css diff --git a/packages/app/src/Toaster.tsx b/packages/app/src/Components/Toaster/Toaster.tsx similarity index 97% rename from packages/app/src/Toaster.tsx rename to packages/app/src/Components/Toaster/Toaster.tsx index bf37728b..5ef87138 100644 --- a/packages/app/src/Toaster.tsx +++ b/packages/app/src/Components/Toaster/Toaster.tsx @@ -3,7 +3,7 @@ import { ReactNode, useSyncExternalStore } from "react"; import { createPortal } from "react-dom"; import { v4 as uuid } from "uuid"; import { ExternalStore, unixNow } from "@snort/shared"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; interface ToastNotification { element: ReactNode | ((remove: () => void) => ReactNode); diff --git a/packages/app/src/Element/Trending/ShortNote.tsx b/packages/app/src/Components/Trending/ShortNote.tsx similarity index 85% rename from packages/app/src/Element/Trending/ShortNote.tsx rename to packages/app/src/Components/Trending/ShortNote.tsx index aa30fc2b..a5344f63 100644 --- a/packages/app/src/Element/Trending/ShortNote.tsx +++ b/packages/app/src/Components/Trending/ShortNote.tsx @@ -1,8 +1,8 @@ import { NostrLink, TaggedNostrEvent } from "@snort/system"; -import ProfileImage from "@/Element/User/ProfileImage"; -import Text from "@/Element/Text"; +import ProfileImage from "@/Components/User/ProfileImage"; +import Text from "@/Components/Text/Text"; import { Link } from "react-router-dom"; -import NoteTime from "@/Element/Event/NoteTime"; +import NoteTime from "@/Components/Event/NoteTime"; export default function ShortNote({ event }: { event: TaggedNostrEvent }) { // replace newlines with spaces, replace double spaces with single spaces diff --git a/packages/app/src/Element/Trending/TrendingHashtags.tsx b/packages/app/src/Components/Trending/TrendingHashtags.tsx similarity index 96% rename from packages/app/src/Element/Trending/TrendingHashtags.tsx rename to packages/app/src/Components/Trending/TrendingHashtags.tsx index d4e11a1e..d3e88d1b 100644 --- a/packages/app/src/Element/Trending/TrendingHashtags.tsx +++ b/packages/app/src/Components/Trending/TrendingHashtags.tsx @@ -6,7 +6,7 @@ import { useLocale } from "@/IntlProvider"; import classNames from "classnames"; import { Link } from "react-router-dom"; import useCachedFetch from "@/Hooks/useCachedFetch"; -import PageSpinner from "@/Element/PageSpinner"; +import PageSpinner from "@/Components/PageSpinner"; export default function TrendingHashtags({ title, diff --git a/packages/app/src/Element/Trending/TrendingPosts.tsx b/packages/app/src/Components/Trending/TrendingPosts.tsx similarity index 88% rename from packages/app/src/Element/Trending/TrendingPosts.tsx rename to packages/app/src/Components/Trending/TrendingPosts.tsx index 9141695e..d09ff411 100644 --- a/packages/app/src/Element/Trending/TrendingPosts.tsx +++ b/packages/app/src/Components/Trending/TrendingPosts.tsx @@ -2,17 +2,17 @@ import { useState } from "react"; import { NostrEvent, NostrLink, TaggedNostrEvent } from "@snort/system"; import { useReactions } from "@snort/system-react"; -import PageSpinner from "@/Element/PageSpinner"; -import Note from "@/Element/Event/Note"; +import PageSpinner from "@/Components/PageSpinner"; +import Note from "@/Components/Event/Note"; import NostrBandApi from "@/External/NostrBand"; -import { ErrorOrOffline } from "@/Element/ErrorOrOffline"; +import { ErrorOrOffline } from "@/Components/ErrorOrOffline"; import { useLocale } from "@/IntlProvider"; import useModeration from "@/Hooks/useModeration"; -import ShortNote from "@/Element/Trending/ShortNote"; +import ShortNote from "@/Components/Trending/ShortNote"; import classNames from "classnames"; -import { DisplayAs, DisplayAsSelector } from "@/Element/Feed/DisplayAsSelector"; -import ImageGridItem from "@/Element/Feed/ImageGridItem"; -import { SpotlightThreadModal } from "@/Element/Spotlight/SpotlightThreadModal"; +import { DisplayAs, DisplayAsSelector } from "@/Components/Feed/DisplayAsSelector"; +import ImageGridItem from "@/Components/Feed/ImageGridItem"; +import { SpotlightThreadModal } from "@/Components/Spotlight/SpotlightThreadModal"; import useLogin from "@/Hooks/useLogin"; import useCachedFetch from "@/Hooks/useCachedFetch"; import { removeUndefined } from "@snort/shared"; diff --git a/packages/app/src/Element/Trending/TrendingUsers.tsx b/packages/app/src/Components/Trending/TrendingUsers.tsx similarity index 89% rename from packages/app/src/Element/Trending/TrendingUsers.tsx rename to packages/app/src/Components/Trending/TrendingUsers.tsx index 6438fed7..0427c2e5 100644 --- a/packages/app/src/Element/Trending/TrendingUsers.tsx +++ b/packages/app/src/Components/Trending/TrendingUsers.tsx @@ -1,7 +1,7 @@ import { ReactNode } from "react"; import { HexKey } from "@snort/system"; -import FollowListBase from "@/Element/User/FollowListBase"; -import PageSpinner from "@/Element/PageSpinner"; +import FollowListBase from "@/Components/User/FollowListBase"; +import PageSpinner from "@/Components/PageSpinner"; import NostrBandApi from "@/External/NostrBand"; import { ErrorOrOffline } from "../ErrorOrOffline"; import useCachedFetch from "@/Hooks/useCachedFetch"; diff --git a/packages/app/src/Element/User/AnimalName.ts b/packages/app/src/Components/User/AnimalName.ts similarity index 100% rename from packages/app/src/Element/User/AnimalName.ts rename to packages/app/src/Components/User/AnimalName.ts diff --git a/packages/app/src/Element/User/Avatar.css b/packages/app/src/Components/User/Avatar.css similarity index 100% rename from packages/app/src/Element/User/Avatar.css rename to packages/app/src/Components/User/Avatar.css diff --git a/packages/app/src/Element/User/Avatar.tsx b/packages/app/src/Components/User/Avatar.tsx similarity index 91% rename from packages/app/src/Element/User/Avatar.tsx rename to packages/app/src/Components/User/Avatar.tsx index 0fc6b282..5e1bd729 100644 --- a/packages/app/src/Element/User/Avatar.tsx +++ b/packages/app/src/Components/User/Avatar.tsx @@ -4,9 +4,9 @@ import { ReactNode, useMemo } from "react"; import type { UserMetadata } from "@snort/system"; import classNames from "classnames"; -import { defaultAvatar, getDisplayName } from "@/SnortUtils"; -import { ProxyImg } from "@/Element/ProxyImg"; -import Icon from "@/Icons/Icon"; +import { defaultAvatar, getDisplayName } from "@/Utils"; +import { ProxyImg } from "@/Components/ProxyImg"; +import Icon from "@/Components/Icons/Icon"; interface AvatarProps { pubkey: string; diff --git a/packages/app/src/Element/User/AvatarEditor.css b/packages/app/src/Components/User/AvatarEditor.css similarity index 100% rename from packages/app/src/Element/User/AvatarEditor.css rename to packages/app/src/Components/User/AvatarEditor.css diff --git a/packages/app/src/Element/User/AvatarEditor.tsx b/packages/app/src/Components/User/AvatarEditor.tsx similarity index 88% rename from packages/app/src/Element/User/AvatarEditor.tsx rename to packages/app/src/Components/User/AvatarEditor.tsx index c25fed01..b03329cd 100644 --- a/packages/app/src/Element/User/AvatarEditor.tsx +++ b/packages/app/src/Components/User/AvatarEditor.tsx @@ -1,9 +1,9 @@ import "./AvatarEditor.css"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; import { useState } from "react"; -import useFileUpload from "@/Upload"; -import { openFile, unwrap } from "@/SnortUtils"; -import Spinner from "@/Icons/Spinner"; +import useFileUpload from "@/Utils/Upload"; +import { openFile, unwrap } from "@/Utils"; +import Spinner from "@/Components/Icons/Spinner"; interface AvatarEditorProps { picture?: string; diff --git a/packages/app/src/Element/User/BadgeList.css b/packages/app/src/Components/User/BadgeList.css similarity index 100% rename from packages/app/src/Element/User/BadgeList.css rename to packages/app/src/Components/User/BadgeList.css diff --git a/packages/app/src/Element/User/BadgeList.tsx b/packages/app/src/Components/User/BadgeList.tsx similarity index 90% rename from packages/app/src/Element/User/BadgeList.tsx rename to packages/app/src/Components/User/BadgeList.tsx index 762f24e5..a83bd217 100644 --- a/packages/app/src/Element/User/BadgeList.tsx +++ b/packages/app/src/Components/User/BadgeList.tsx @@ -5,11 +5,11 @@ import { FormattedMessage } from "react-intl"; import { TaggedNostrEvent } from "@snort/system"; -import { ProxyImg } from "@/Element/ProxyImg"; -import Modal from "@/Element/Modal"; -import Username from "@/Element/User/Username"; -import { findTag } from "@/SnortUtils"; -import CloseButton from "@/Element/Button/CloseButton"; +import { ProxyImg } from "@/Components/ProxyImg"; +import Modal from "@/Components/Modal/Modal"; +import Username from "@/Components/User/Username"; +import { findTag } from "@/Utils"; +import CloseButton from "@/Components/Button/CloseButton"; export default function BadgeList({ badges }: { badges: TaggedNostrEvent[] }) { const [showModal, setShowModal] = useState(false); diff --git a/packages/app/src/Element/User/BlockButton.tsx b/packages/app/src/Components/User/BlockButton.tsx similarity index 100% rename from packages/app/src/Element/User/BlockButton.tsx rename to packages/app/src/Components/User/BlockButton.tsx diff --git a/packages/app/src/Element/User/BlockList.tsx b/packages/app/src/Components/User/BlockList.tsx similarity index 74% rename from packages/app/src/Element/User/BlockList.tsx rename to packages/app/src/Components/User/BlockList.tsx index 362bb1f2..46b8fd2d 100644 --- a/packages/app/src/Element/User/BlockList.tsx +++ b/packages/app/src/Components/User/BlockList.tsx @@ -1,5 +1,5 @@ -import BlockButton from "@/Element/User/BlockButton"; -import ProfilePreview from "@/Element/User/ProfilePreview"; +import BlockButton from "@/Components/User/BlockButton"; +import ProfilePreview from "@/Components/User/ProfilePreview"; import useModeration from "@/Hooks/useModeration"; export default function BlockList() { diff --git a/packages/app/src/Element/User/Bookmarks.tsx b/packages/app/src/Components/User/Bookmarks.tsx similarity index 97% rename from packages/app/src/Element/User/Bookmarks.tsx rename to packages/app/src/Components/User/Bookmarks.tsx index f0b33850..a02c2c45 100644 --- a/packages/app/src/Element/User/Bookmarks.tsx +++ b/packages/app/src/Components/User/Bookmarks.tsx @@ -2,7 +2,7 @@ import { useState, useMemo, ChangeEvent } from "react"; import { FormattedMessage } from "react-intl"; import { HexKey, TaggedNostrEvent } from "@snort/system"; -import Note from "@/Element/Event/Note"; +import Note from "@/Components/Event/Note"; import useLogin from "@/Hooks/useLogin"; import { UserCache } from "@/Cache"; diff --git a/packages/app/src/Element/User/DisplayName.css b/packages/app/src/Components/User/DisplayName.css similarity index 100% rename from packages/app/src/Element/User/DisplayName.css rename to packages/app/src/Components/User/DisplayName.css diff --git a/packages/app/src/Element/User/DisplayName.tsx b/packages/app/src/Components/User/DisplayName.tsx similarity index 91% rename from packages/app/src/Element/User/DisplayName.tsx rename to packages/app/src/Components/User/DisplayName.tsx index 1f52c9cb..586e67ff 100644 --- a/packages/app/src/Element/User/DisplayName.tsx +++ b/packages/app/src/Components/User/DisplayName.tsx @@ -1,7 +1,7 @@ import "./DisplayName.css"; import { useMemo } from "react"; import { HexKey, UserMetadata } from "@snort/system"; -import { getDisplayNameOrPlaceHolder } from "@/SnortUtils"; +import { getDisplayNameOrPlaceHolder } from "@/Utils"; import { useUserProfile } from "@snort/system-react"; import classNames from "classnames"; diff --git a/packages/app/src/Element/User/FollowButton.tsx b/packages/app/src/Components/User/FollowButton.tsx similarity index 94% rename from packages/app/src/Element/User/FollowButton.tsx rename to packages/app/src/Components/User/FollowButton.tsx index 6d39da61..163bbeac 100644 --- a/packages/app/src/Element/User/FollowButton.tsx +++ b/packages/app/src/Components/User/FollowButton.tsx @@ -2,9 +2,9 @@ import { FormattedMessage } from "react-intl"; import { HexKey } from "@snort/system"; import useEventPublisher from "@/Hooks/useEventPublisher"; -import { parseId } from "@/SnortUtils"; +import { parseId } from "@/Utils"; import useLogin from "@/Hooks/useLogin"; -import AsyncButton from "@/Element/Button/AsyncButton"; +import AsyncButton from "@/Components/Button/AsyncButton"; import messages from "../messages"; import { FollowsFeed } from "@/Cache"; diff --git a/packages/app/src/Element/User/FollowDistanceIndicator.tsx b/packages/app/src/Components/User/FollowDistanceIndicator.tsx similarity index 96% rename from packages/app/src/Element/User/FollowDistanceIndicator.tsx rename to packages/app/src/Components/User/FollowDistanceIndicator.tsx index 2016f6ef..1a839357 100644 --- a/packages/app/src/Element/User/FollowDistanceIndicator.tsx +++ b/packages/app/src/Components/User/FollowDistanceIndicator.tsx @@ -1,6 +1,6 @@ import React from "react"; import { HexKey, socialGraphInstance } from "@snort/system"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; import classNames from "classnames"; interface FollowDistanceIndicatorProps { diff --git a/packages/app/src/Element/User/FollowListBase.tsx b/packages/app/src/Components/User/FollowListBase.tsx similarity index 94% rename from packages/app/src/Element/User/FollowListBase.tsx rename to packages/app/src/Components/User/FollowListBase.tsx index 48db8ff9..cf7bb36c 100644 --- a/packages/app/src/Element/User/FollowListBase.tsx +++ b/packages/app/src/Components/User/FollowListBase.tsx @@ -4,13 +4,13 @@ import { HexKey } from "@snort/system"; import { dedupe } from "@snort/shared"; import useEventPublisher from "@/Hooks/useEventPublisher"; -import ProfilePreview from "@/Element/User/ProfilePreview"; +import ProfilePreview from "@/Components/User/ProfilePreview"; import useLogin from "@/Hooks/useLogin"; import messages from "../messages"; import { FollowsFeed } from "@/Cache"; import AsyncButton from "../Button/AsyncButton"; -import { setFollows } from "@/Login"; +import { setFollows } from "@/Utils/Login"; export interface FollowListBaseProps { pubkeys: HexKey[]; diff --git a/packages/app/src/Element/User/FollowedBy.tsx b/packages/app/src/Components/User/FollowedBy.tsx similarity index 89% rename from packages/app/src/Element/User/FollowedBy.tsx rename to packages/app/src/Components/User/FollowedBy.tsx index 596fc08d..a5bf209b 100644 --- a/packages/app/src/Element/User/FollowedBy.tsx +++ b/packages/app/src/Components/User/FollowedBy.tsx @@ -1,9 +1,9 @@ -import FollowDistanceIndicator from "@/Element/User/FollowDistanceIndicator"; -import ProfileImage from "@/Element/User/ProfileImage"; +import FollowDistanceIndicator from "@/Components/User/FollowDistanceIndicator"; +import ProfileImage from "@/Components/User/ProfileImage"; import { FormattedMessage } from "react-intl"; import { Fragment } from "react"; -import { ProfileLink } from "@/Element/User/ProfileLink"; -import DisplayName from "@/Element/User/DisplayName"; +import { ProfileLink } from "@/Components/User/ProfileLink"; +import DisplayName from "@/Components/User/DisplayName"; import { socialGraphInstance } from "@snort/system"; const MAX_FOLLOWED_BY_FRIENDS = 3; diff --git a/packages/app/src/Element/User/Following.css b/packages/app/src/Components/User/Following.css similarity index 100% rename from packages/app/src/Element/User/Following.css rename to packages/app/src/Components/User/Following.css diff --git a/packages/app/src/Element/User/Following.tsx b/packages/app/src/Components/User/Following.tsx similarity index 92% rename from packages/app/src/Element/User/Following.tsx rename to packages/app/src/Components/User/Following.tsx index 3536e93d..c4d5a000 100644 --- a/packages/app/src/Element/User/Following.tsx +++ b/packages/app/src/Components/User/Following.tsx @@ -2,7 +2,7 @@ import "./Following.css"; import { FormattedMessage } from "react-intl"; import useLogin from "@/Hooks/useLogin"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; export function FollowingMark({ pubkey }: { pubkey: string }) { const { follows } = useLogin(s => ({ follows: s.follows })); diff --git a/packages/app/src/Element/User/FollowsYou.css b/packages/app/src/Components/User/FollowsYou.css similarity index 100% rename from packages/app/src/Element/User/FollowsYou.css rename to packages/app/src/Components/User/FollowsYou.css diff --git a/packages/app/src/Element/User/FollowsYou.tsx b/packages/app/src/Components/User/FollowsYou.tsx similarity index 100% rename from packages/app/src/Element/User/FollowsYou.tsx rename to packages/app/src/Components/User/FollowsYou.tsx diff --git a/packages/app/src/Element/User/MuteButton.tsx b/packages/app/src/Components/User/MuteButton.tsx similarity index 100% rename from packages/app/src/Element/User/MuteButton.tsx rename to packages/app/src/Components/User/MuteButton.tsx diff --git a/packages/app/src/Element/User/MutedList.tsx b/packages/app/src/Components/User/MutedList.tsx similarity index 89% rename from packages/app/src/Element/User/MutedList.tsx rename to packages/app/src/Components/User/MutedList.tsx index 51d3e127..3d11d715 100644 --- a/packages/app/src/Element/User/MutedList.tsx +++ b/packages/app/src/Components/User/MutedList.tsx @@ -1,7 +1,7 @@ import { FormattedMessage } from "react-intl"; import { HexKey } from "@snort/system"; -import MuteButton from "@/Element/User/MuteButton"; -import ProfilePreview from "@/Element/User/ProfilePreview"; +import MuteButton from "@/Components/User/MuteButton"; +import ProfilePreview from "@/Components/User/ProfilePreview"; import useModeration from "@/Hooks/useModeration"; import messages from "../messages"; diff --git a/packages/app/src/Element/User/Nip05.css b/packages/app/src/Components/User/Nip05.css similarity index 100% rename from packages/app/src/Element/User/Nip05.css rename to packages/app/src/Components/User/Nip05.css diff --git a/packages/app/src/Element/User/Nip05.tsx b/packages/app/src/Components/User/Nip05.tsx similarity index 100% rename from packages/app/src/Element/User/Nip05.tsx rename to packages/app/src/Components/User/Nip05.tsx diff --git a/packages/app/src/Element/User/NoteToSelf.css b/packages/app/src/Components/User/NoteToSelf.css similarity index 100% rename from packages/app/src/Element/User/NoteToSelf.css rename to packages/app/src/Components/User/NoteToSelf.css diff --git a/packages/app/src/Element/User/NoteToSelf.tsx b/packages/app/src/Components/User/NoteToSelf.tsx similarity index 94% rename from packages/app/src/Element/User/NoteToSelf.tsx rename to packages/app/src/Components/User/NoteToSelf.tsx index 5e1479f7..20be5073 100644 --- a/packages/app/src/Element/User/NoteToSelf.tsx +++ b/packages/app/src/Components/User/NoteToSelf.tsx @@ -1,7 +1,7 @@ import "./NoteToSelf.css"; import classNames from "classnames"; import { FormattedMessage } from "react-intl"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; import messages from "../messages"; diff --git a/packages/app/src/Element/User/ProfileCard.css b/packages/app/src/Components/User/ProfileCard.css similarity index 100% rename from packages/app/src/Element/User/ProfileCard.css rename to packages/app/src/Components/User/ProfileCard.css diff --git a/packages/app/src/Element/User/ProfileCard.tsx b/packages/app/src/Components/User/ProfileCard.tsx similarity index 95% rename from packages/app/src/Element/User/ProfileCard.tsx rename to packages/app/src/Components/User/ProfileCard.tsx index 6153890d..4998f315 100644 --- a/packages/app/src/Element/User/ProfileCard.tsx +++ b/packages/app/src/Components/User/ProfileCard.tsx @@ -6,10 +6,10 @@ import { UserMetadata } from "@snort/system"; import FollowButton from "./FollowButton"; import ProfileImage from "./ProfileImage"; import { UserWebsiteLink } from "./UserWebsiteLink"; -import Text from "@/Element/Text"; +import Text from "@/Components/Text/Text"; import { useEffect, useState } from "react"; import useLogin from "../../Hooks/useLogin"; -import FollowedBy from "@/Element/User/FollowedBy"; +import FollowedBy from "@/Components/User/FollowedBy"; export function ProfileCard({ pubkey, diff --git a/packages/app/src/Element/User/ProfileImage.css b/packages/app/src/Components/User/ProfileImage.css similarity index 100% rename from packages/app/src/Element/User/ProfileImage.css rename to packages/app/src/Components/User/ProfileImage.css diff --git a/packages/app/src/Element/User/ProfileImage.tsx b/packages/app/src/Components/User/ProfileImage.tsx similarity index 95% rename from packages/app/src/Element/User/ProfileImage.tsx rename to packages/app/src/Components/User/ProfileImage.tsx index c433a55f..1a054ffa 100644 --- a/packages/app/src/Element/User/ProfileImage.tsx +++ b/packages/app/src/Components/User/ProfileImage.tsx @@ -5,13 +5,13 @@ import { HexKey, UserMetadata } from "@snort/system"; import { useUserProfile } from "@snort/system-react"; import classNames from "classnames"; -import Avatar from "@/Element/User/Avatar"; +import Avatar from "@/Components/User/Avatar"; import DisplayName from "./DisplayName"; import { ProfileLink } from "./ProfileLink"; import { ProfileCard } from "./ProfileCard"; -import FollowDistanceIndicator from "@/Element/User/FollowDistanceIndicator"; +import FollowDistanceIndicator from "@/Components/User/FollowDistanceIndicator"; import { useCommunityLeader } from "@/Hooks/useCommunityLeaders"; -import { LeaderBadge } from "@/Element/CommunityLeaders/LeaderBadge"; +import { LeaderBadge } from "@/Components/CommunityLeaders/LeaderBadge"; export interface ProfileImageProps { pubkey: HexKey; diff --git a/packages/app/src/Element/User/ProfileLink.tsx b/packages/app/src/Components/User/ProfileLink.tsx similarity index 96% rename from packages/app/src/Element/User/ProfileLink.tsx rename to packages/app/src/Components/User/ProfileLink.tsx index a157e3c6..c56908c8 100644 --- a/packages/app/src/Element/User/ProfileLink.tsx +++ b/packages/app/src/Components/User/ProfileLink.tsx @@ -2,7 +2,7 @@ import { ReactNode, useContext } from "react"; import { Link, LinkProps } from "react-router-dom"; import { UserMetadata, NostrLink, NostrPrefix, MetadataCache } from "@snort/system"; import { SnortContext } from "@snort/system-react"; -import { randomSample } from "@/SnortUtils"; +import { randomSample } from "@/Utils"; export function ProfileLink({ pubkey, diff --git a/packages/app/src/Element/User/ProfilePreview.css b/packages/app/src/Components/User/ProfilePreview.css similarity index 100% rename from packages/app/src/Element/User/ProfilePreview.css rename to packages/app/src/Components/User/ProfilePreview.css diff --git a/packages/app/src/Element/User/ProfilePreview.tsx b/packages/app/src/Components/User/ProfilePreview.tsx similarity index 93% rename from packages/app/src/Element/User/ProfilePreview.tsx rename to packages/app/src/Components/User/ProfilePreview.tsx index 0e3911ac..ba0c7fcf 100644 --- a/packages/app/src/Element/User/ProfilePreview.tsx +++ b/packages/app/src/Components/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/User/ProfileImage"; -import FollowButton from "@/Element/User/FollowButton"; +import ProfileImage from "@/Components/User/ProfileImage"; +import FollowButton from "@/Components/User/FollowButton"; export interface ProfilePreviewProps { pubkey: HexKey; diff --git a/packages/app/src/Element/User/UserWebsiteLink.css b/packages/app/src/Components/User/UserWebsiteLink.css similarity index 100% rename from packages/app/src/Element/User/UserWebsiteLink.css rename to packages/app/src/Components/User/UserWebsiteLink.css diff --git a/packages/app/src/Element/User/UserWebsiteLink.tsx b/packages/app/src/Components/User/UserWebsiteLink.tsx similarity index 94% rename from packages/app/src/Element/User/UserWebsiteLink.tsx rename to packages/app/src/Components/User/UserWebsiteLink.tsx index fadf5739..f483cece 100644 --- a/packages/app/src/Element/User/UserWebsiteLink.tsx +++ b/packages/app/src/Components/User/UserWebsiteLink.tsx @@ -1,6 +1,6 @@ import "./UserWebsiteLink.css"; import { MetadataCache, UserMetadata } from "@snort/system"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; export function UserWebsiteLink({ user }: { user?: MetadataCache | UserMetadata }) { const website_url = diff --git a/packages/app/src/Element/User/Username.tsx b/packages/app/src/Components/User/Username.tsx similarity index 100% rename from packages/app/src/Element/User/Username.tsx rename to packages/app/src/Components/User/Username.tsx diff --git a/packages/app/src/Element/WarningNotice.css b/packages/app/src/Components/WarningNotice/WarningNotice.css similarity index 100% rename from packages/app/src/Element/WarningNotice.css rename to packages/app/src/Components/WarningNotice/WarningNotice.css diff --git a/packages/app/src/Element/WarningNotice.tsx b/packages/app/src/Components/WarningNotice/WarningNotice.tsx similarity index 89% rename from packages/app/src/Element/WarningNotice.tsx rename to packages/app/src/Components/WarningNotice/WarningNotice.tsx index 4b228fb1..7cd6aa2e 100644 --- a/packages/app/src/Element/WarningNotice.tsx +++ b/packages/app/src/Components/WarningNotice/WarningNotice.tsx @@ -1,5 +1,5 @@ import "./WarningNotice.css"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; export function WarningNotice({ children, onClick }: { children: React.ReactNode; onClick?: () => void }) { return ( diff --git a/packages/app/src/Element/messages.ts b/packages/app/src/Components/messages.ts similarity index 100% rename from packages/app/src/Element/messages.ts rename to packages/app/src/Components/messages.ts diff --git a/packages/app/src/FuzzySearch.ts b/packages/app/src/Db/FuzzySearch.ts similarity index 100% rename from packages/app/src/FuzzySearch.ts rename to packages/app/src/Db/FuzzySearch.ts diff --git a/packages/app/src/Cache/IndexedDB.ts b/packages/app/src/Db/IndexedDB.ts similarity index 100% rename from packages/app/src/Cache/IndexedDB.ts rename to packages/app/src/Db/IndexedDB.ts diff --git a/packages/app/src/External/SnortApi.ts b/packages/app/src/External/SnortApi.ts index 1b49b12e..982cde57 100644 --- a/packages/app/src/External/SnortApi.ts +++ b/packages/app/src/External/SnortApi.ts @@ -1,8 +1,8 @@ import { throwIfOffline } from "@snort/shared"; import { EventKind, EventPublisher } from "@snort/system"; -import { ApiHost } from "@/Const"; -import { unwrap } from "@/SnortUtils"; -import { SubscriptionType } from "@/Subscription"; +import { ApiHost } from "@/Utils/Const"; +import { unwrap } from "@/Utils"; +import { SubscriptionType } from "@/Utils/Subscription"; export interface RevenueToday { donations: number; diff --git a/packages/app/src/Feed/BadgesFeed.ts b/packages/app/src/Feed/BadgesFeed.ts index 0abd172c..ba42f219 100644 --- a/packages/app/src/Feed/BadgesFeed.ts +++ b/packages/app/src/Feed/BadgesFeed.ts @@ -2,7 +2,7 @@ import { useMemo } from "react"; import { EventKind, HexKey, RequestBuilder, ReplaceableNoteStore, NoteCollection } from "@snort/system"; import { useRequestBuilder } from "@snort/system-react"; -import { unwrap, findTag, chunks } from "@/SnortUtils"; +import { unwrap, findTag, chunks } from "@/Utils"; type BadgeAwards = { pubkeys: string[]; diff --git a/packages/app/src/Feed/HashtagsFeed.ts b/packages/app/src/Feed/HashtagsFeed.ts index d4b6f6b2..9cc87d25 100644 --- a/packages/app/src/Feed/HashtagsFeed.ts +++ b/packages/app/src/Feed/HashtagsFeed.ts @@ -4,7 +4,7 @@ import { unixNow } from "@snort/shared"; import { useRequestBuilder } from "@snort/system-react"; import useLogin from "@/Hooks/useLogin"; -import { Hour } from "@/Const"; +import { Hour } from "@/Utils/Const"; export default function useHashtagsFeed() { const { hashtags } = useLogin(s => ({ hashtags: s.tags.item })); diff --git a/packages/app/src/Feed/LoginFeed.ts b/packages/app/src/Feed/LoginFeed.ts index 69d97e67..989518d1 100644 --- a/packages/app/src/Feed/LoginFeed.ts +++ b/packages/app/src/Feed/LoginFeed.ts @@ -2,7 +2,7 @@ import { useEffect, useMemo } from "react"; import { TaggedNostrEvent, EventKind, RequestBuilder, NoteCollection, NostrLink, parseRelayTags } from "@snort/system"; import { useRequestBuilder } from "@snort/system-react"; -import { bech32ToHex, debounce, getNewest, getNewestEventTagsByKey, unwrap } from "@/SnortUtils"; +import { bech32ToHex, debounce, getNewest, getNewestEventTagsByKey, unwrap } from "@/Utils"; import useEventPublisher from "@/Hooks/useEventPublisher"; import useLogin from "@/Hooks/useLogin"; import { @@ -17,9 +17,9 @@ import { setPinned, setRelays, setTags, -} from "@/Login"; -import { SnortPubKey } from "@/Const"; -import { SubscriptionEvent } from "@/Subscription"; +} from "@/Utils/Login"; +import { SnortPubKey } from "@/Utils/Const"; +import { SubscriptionEvent } from "@/Utils/Subscription"; import { FollowLists, FollowsFeed, GiftsCache, Notifications, UserRelays } from "@/Cache"; import { Nip28Chats, Nip4Chats } from "@/chat"; import { useRefreshFeedCache } from "@/Hooks/useRefreshFeedcache"; diff --git a/packages/app/src/Feed/StatusFeed.ts b/packages/app/src/Feed/StatusFeed.ts index 8c384ddc..03a4872e 100644 --- a/packages/app/src/Feed/StatusFeed.ts +++ b/packages/app/src/Feed/StatusFeed.ts @@ -1,7 +1,7 @@ import { unixNow } from "@snort/shared"; import { EventKind, NoteCollection, RequestBuilder } from "@snort/system"; import { useRequestBuilder } from "@snort/system-react"; -import { findTag } from "@/SnortUtils"; +import { findTag } from "@/Utils"; import { useMemo } from "react"; export function useStatusFeed(id?: string, leaveOpen = false) { diff --git a/packages/app/src/Feed/TimelineFeed.ts b/packages/app/src/Feed/TimelineFeed.ts index 0f702e9a..d330b44d 100644 --- a/packages/app/src/Feed/TimelineFeed.ts +++ b/packages/app/src/Feed/TimelineFeed.ts @@ -5,7 +5,7 @@ import { unixNow } from "@snort/shared"; import useTimelineWindow from "@/Hooks/useTimelineWindow"; import useLogin from "@/Hooks/useLogin"; -import { SearchRelays } from "@/Const"; +import { SearchRelays } from "@/Utils/Const"; export interface TimelineFeedOptions { method: "TIME_RANGE" | "LIMIT_UNTIL"; diff --git a/packages/app/src/useCopy.ts b/packages/app/src/Hooks/useCopy.ts similarity index 100% rename from packages/app/src/useCopy.ts rename to packages/app/src/Hooks/useCopy.ts diff --git a/packages/app/src/Hooks/useEventPublisher.tsx b/packages/app/src/Hooks/useEventPublisher.tsx index e6fa4520..ee1b7782 100644 --- a/packages/app/src/Hooks/useEventPublisher.tsx +++ b/packages/app/src/Hooks/useEventPublisher.tsx @@ -1,7 +1,7 @@ import { useContext } from "react"; import { SnortContext } from "@snort/system-react"; import useLogin from "@/Hooks/useLogin"; -import { LoginStore, createPublisher, sessionNeedsPin } from "@/Login"; +import { LoginStore, createPublisher, sessionNeedsPin } from "@/Utils/Login"; export default function useEventPublisher() { const login = useLogin(); diff --git a/packages/app/src/Hooks/useImgProxy.ts b/packages/app/src/Hooks/useImgProxy.ts index f581232a..4e5c2a43 100644 --- a/packages/app/src/Hooks/useImgProxy.ts +++ b/packages/app/src/Hooks/useImgProxy.ts @@ -1,6 +1,6 @@ import * as utils from "@noble/curves/abstract/utils"; import { base64 } from "@scure/base"; -import { hmacSha256, unwrap } from "@/SnortUtils"; +import { hmacSha256, unwrap } from "@/Utils"; import useLogin from "@/Hooks/useLogin"; export interface ImgProxySettings { diff --git a/packages/app/src/Hooks/useInteractionCache.tsx b/packages/app/src/Hooks/useInteractionCache.tsx index d5517517..c288b524 100644 --- a/packages/app/src/Hooks/useInteractionCache.tsx +++ b/packages/app/src/Hooks/useInteractionCache.tsx @@ -3,7 +3,7 @@ import { HexKey, u256 } from "@snort/system"; import { InteractionCache } from "@/Cache"; import { EventInteraction } from "@/Db"; -import { sha256, unwrap } from "@/SnortUtils"; +import { sha256, unwrap } from "@/Utils"; export function useInteractionCache(pubkey?: HexKey, event?: u256) { const id = event && pubkey ? sha256(event + pubkey) : undefined; diff --git a/packages/app/src/Hooks/useLogin.tsx b/packages/app/src/Hooks/useLogin.tsx index 5c92b27d..132359c2 100644 --- a/packages/app/src/Hooks/useLogin.tsx +++ b/packages/app/src/Hooks/useLogin.tsx @@ -1,4 +1,4 @@ -import { LoginSession, LoginStore } from "@/Login"; +import { LoginSession, LoginStore } from "@/Utils/Login"; import { useSyncExternalStoreWithSelector } from "use-sync-external-store/with-selector"; export default function useLogin(selector?: (v: LoginSession) => T) { diff --git a/packages/app/src/Hooks/useLoginHandler.tsx b/packages/app/src/Hooks/useLoginHandler.tsx index fe44ae18..fb1e65cd 100644 --- a/packages/app/src/Hooks/useLoginHandler.tsx +++ b/packages/app/src/Hooks/useLoginHandler.tsx @@ -2,10 +2,10 @@ import { useIntl } from "react-intl"; import { Nip46Signer, KeyStorage } from "@snort/system"; import { fetchNip05Pubkey, unwrap } from "@snort/shared"; -import { EmailRegex, MnemonicRegex } from "@/Const"; -import { LoginSessionType, LoginStore } from "@/Login"; -import { generateBip39Entropy, entropyToPrivateKey } from "@/nip6"; -import { bech32ToHex } from "@/SnortUtils"; +import { EmailRegex, MnemonicRegex } from "@/Utils/Const"; +import { LoginSessionType, LoginStore } from "@/Utils/Login"; +import { generateBip39Entropy, entropyToPrivateKey } from "@/Utils/nip6"; +import { bech32ToHex } from "@/Utils"; export default function useLoginHandler() { const { formatMessage } = useIntl(); diff --git a/packages/app/src/Hooks/useModeration.tsx b/packages/app/src/Hooks/useModeration.tsx index 34ca172e..2aea7c4a 100644 --- a/packages/app/src/Hooks/useModeration.tsx +++ b/packages/app/src/Hooks/useModeration.tsx @@ -1,8 +1,8 @@ import { HexKey, NostrEvent, TaggedNostrEvent } from "@snort/system"; import useEventPublisher from "@/Hooks/useEventPublisher"; import useLogin from "@/Hooks/useLogin"; -import { setBlocked, setMuted } from "@/Login"; -import { appendDedupe } from "@/SnortUtils"; +import { setBlocked, setMuted } from "@/Utils/Login"; +import { appendDedupe } from "@/Utils"; export default function useModeration() { const login = useLogin(); diff --git a/packages/app/src/Pages/About.tsx b/packages/app/src/Pages/About.tsx index 13435195..9a3cdab9 100644 --- a/packages/app/src/Pages/About.tsx +++ b/packages/app/src/Pages/About.tsx @@ -1,7 +1,7 @@ import Changelog from "@/../CHANGELOG.md"; import { FormattedMessage } from "react-intl"; import { useEffect, useState } from "react"; -import { Markdown } from "@/Element/Event/Markdown"; +import { Markdown } from "@/Components/Event/Markdown"; export function AboutPage() { const [changelog, setChangelog] = useState(""); diff --git a/packages/app/src/Pages/DeckLayout.tsx b/packages/app/src/Pages/DeckLayout.tsx index b3d474a6..2eca9d38 100644 --- a/packages/app/src/Pages/DeckLayout.tsx +++ b/packages/app/src/Pages/DeckLayout.tsx @@ -7,21 +7,21 @@ import { NostrLink, TaggedNostrEvent } from "@snort/system"; import useLoginFeed from "@/Feed/LoginFeed"; import { useLoginRelays } from "@/Hooks/useLoginRelays"; import { useTheme } from "@/Hooks/useTheme"; -import Articles from "@/Element/Feed/Articles"; -import TimelineFollows from "@/Element/Feed/TimelineFollows"; +import Articles from "@/Components/Feed/Articles"; +import TimelineFollows from "@/Components/Feed/TimelineFollows"; import { transformTextCached } from "@/Hooks/useTextTransformCache"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; import NotificationsPage from "./Notifications/Notifications"; -import Modal from "@/Element/Modal"; -import { RootTabs } from "@/Element/Feed/RootTabs"; -import Toaster from "@/Toaster"; +import Modal from "@/Components/Modal/Modal"; +import { RootTabs } from "@/Components/Feed/RootTabs"; +import Toaster from "@/Components/Toaster/Toaster"; import useLogin from "@/Hooks/useLogin"; -import { LongFormText } from "@/Element/Event/LongFormText"; +import { LongFormText } from "@/Components/Event/LongFormText"; import NavSidebar from "@/Pages/Layout/NavSidebar"; -import ErrorBoundary from "@/Element/ErrorBoundary"; -import { getCurrentSubscription } from "@/Subscription"; +import ErrorBoundary from "@/Components/ErrorBoundary"; +import { getCurrentSubscription } from "@/Utils/Subscription"; import { mapPlanName } from "./subscribe"; -import { SpotlightThreadModal } from "@/Element/Spotlight/SpotlightThreadModal"; +import { SpotlightThreadModal } from "@/Components/Spotlight/SpotlightThreadModal"; type Cols = "notes" | "articles" | "media" | "streams" | "notifications"; diff --git a/packages/app/src/Pages/Discover.tsx b/packages/app/src/Pages/Discover.tsx index 48ad3fb4..43081b7b 100644 --- a/packages/app/src/Pages/Discover.tsx +++ b/packages/app/src/Pages/Discover.tsx @@ -1,7 +1,7 @@ -import SuggestedProfiles from "@/Element/SuggestedProfiles"; -import { Tab, TabElement } from "@/Element/Tabs"; -import TrendingNotes from "@/Element/Trending/TrendingPosts"; -import TrendingUsers from "@/Element/Trending/TrendingUsers"; +import SuggestedProfiles from "@/Components/SuggestedProfiles"; +import { Tab, TabElement } from "@/Components/Tabs/Tabs"; +import TrendingNotes from "@/Components/Trending/TrendingPosts"; +import TrendingUsers from "@/Components/Trending/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 e770b11c..86e390f3 100644 --- a/packages/app/src/Pages/DonatePage.tsx +++ b/packages/app/src/Pages/DonatePage.tsx @@ -2,17 +2,17 @@ import { useEffect, useState, useSyncExternalStore } from "react"; import { FormattedMessage } from "react-intl"; import { HexKey } from "@snort/system"; -import { ApiHost, DeveloperAccounts, SnortPubKey } from "@/Const"; -import ProfilePreview from "@/Element/User/ProfilePreview"; -import ZapButton from "@/Element/Event/ZapButton"; -import { bech32ToHex, unwrap } from "@/SnortUtils"; +import { ApiHost, DeveloperAccounts, SnortPubKey } from "@/Utils/Const"; +import ProfilePreview from "@/Components/User/ProfilePreview"; +import ZapButton from "@/Components/Event/ZapButton"; +import { bech32ToHex, unwrap } from "@/Utils"; import SnortApi, { RevenueSplit, RevenueToday } from "@/External/SnortApi"; -import Modal from "@/Element/Modal"; -import AsyncButton from "@/Element/Button/AsyncButton"; -import QrCode from "@/Element/QrCode"; -import Copy from "@/Element/Copy"; +import Modal from "@/Components/Modal/Modal"; +import AsyncButton from "@/Components/Button/AsyncButton"; +import QrCode from "@/Components/QrCode"; +import Copy from "@/Components/Copy/Copy"; import { Link } from "react-router-dom"; -import { ZapPoolController, ZapPoolRecipientType } from "@/ZapPoolController"; +import { ZapPoolController, ZapPoolRecipientType } from "@/Utils/ZapPoolController"; import { ZapPoolTarget } from "./ZapPool"; const Contributors = [ diff --git a/packages/app/src/Pages/ErrorPage.tsx b/packages/app/src/Pages/ErrorPage.tsx index 6e5ccc6d..279048f1 100644 --- a/packages/app/src/Pages/ErrorPage.tsx +++ b/packages/app/src/Pages/ErrorPage.tsx @@ -1,5 +1,5 @@ import { db } from "@/Db"; -import AsyncButton from "@/Element/Button/AsyncButton"; +import AsyncButton from "@/Components/Button/AsyncButton"; import { FormattedMessage } from "react-intl"; import { useRouteError } from "react-router-dom"; diff --git a/packages/app/src/Pages/FreeNostrAddressPage.tsx b/packages/app/src/Pages/FreeNostrAddressPage.tsx index 3623c19f..67737924 100644 --- a/packages/app/src/Pages/FreeNostrAddressPage.tsx +++ b/packages/app/src/Pages/FreeNostrAddressPage.tsx @@ -1,5 +1,5 @@ import { FormattedMessage } from "react-intl"; -import IrisAccount from "@/Element/IrisAccount/IrisAccount"; +import IrisAccount from "@/Components/IrisAccount/IrisAccount"; import messages from "./messages"; diff --git a/packages/app/src/Pages/HashTagsPage.tsx b/packages/app/src/Pages/HashTagsPage.tsx index 249a9e3a..01d3badd 100644 --- a/packages/app/src/Pages/HashTagsPage.tsx +++ b/packages/app/src/Pages/HashTagsPage.tsx @@ -5,14 +5,14 @@ import { EventKind, NoteCollection, RequestBuilder } from "@snort/system"; import { dedupe } from "@snort/shared"; import { useRequestBuilder } from "@snort/system-react"; -import Timeline from "@/Element/Feed/Timeline"; +import Timeline from "@/Components/Feed/Timeline"; import useEventPublisher from "@/Hooks/useEventPublisher"; import useLogin from "@/Hooks/useLogin"; -import { setTags } from "@/Login"; -import AsyncButton from "@/Element/Button/AsyncButton"; -import ProfileImage from "@/Element/User/ProfileImage"; +import { setTags } from "@/Utils/Login"; +import AsyncButton from "@/Components/Button/AsyncButton"; +import ProfileImage from "@/Components/User/ProfileImage"; import classNames from "classnames"; -import { formatShort } from "@/Number"; +import { formatShort } from "@/Utils/Number"; const HashTagsPage = () => { const params = useParams(); diff --git a/packages/app/src/Pages/HelpPage.tsx b/packages/app/src/Pages/HelpPage.tsx index db139204..3eba4834 100644 --- a/packages/app/src/Pages/HelpPage.tsx +++ b/packages/app/src/Pages/HelpPage.tsx @@ -1,8 +1,8 @@ import { Link } from "react-router-dom"; -import { KieranPubKey } from "@/Const"; +import { KieranPubKey } from "@/Utils/Const"; import { FormattedMessage } from "react-intl"; import { TLVEntryType, encodeTLVEntries, NostrPrefix } from "@snort/system"; -import { bech32ToHex } from "@/SnortUtils"; +import { bech32ToHex } from "@/Utils"; export default function HelpPage() { return ( diff --git a/packages/app/src/Pages/Layout/Footer.tsx b/packages/app/src/Pages/Layout/Footer.tsx index c075ec6f..7516786a 100644 --- a/packages/app/src/Pages/Layout/Footer.tsx +++ b/packages/app/src/Pages/Layout/Footer.tsx @@ -1,12 +1,12 @@ import React, { useState } from "react"; -import NavLink from "@/Element/Button/NavLink"; +import NavLink from "@/Components/Button/NavLink"; import useLogin from "@/Hooks/useLogin"; -import Icon from "@/Icons/Icon"; -import { ProfileLink } from "@/Element/User/ProfileLink"; -import { NoteCreatorButton } from "@/Element/Event/Create/NoteCreatorButton"; +import Icon from "@/Components/Icons/Icon"; +import { ProfileLink } from "@/Components/User/ProfileLink"; +import { NoteCreatorButton } from "@/Components/Event/Create/NoteCreatorButton"; import classNames from "classnames"; import { useUserProfile } from "@snort/system-react"; -import Avatar from "@/Element/User/Avatar"; +import Avatar from "@/Components/User/Avatar"; import { useIntl } from "react-intl"; type MenuItem = { diff --git a/packages/app/src/Pages/Layout/Header.tsx b/packages/app/src/Pages/Layout/Header.tsx index b6440fca..a8e0511b 100644 --- a/packages/app/src/Pages/Layout/Header.tsx +++ b/packages/app/src/Pages/Layout/Header.tsx @@ -2,15 +2,15 @@ import { useLocation, useNavigate } from "react-router-dom"; import React, { useCallback, useMemo } from "react"; import classNames from "classnames"; import { LogoHeader } from "@/Pages/Layout/LogoHeader"; -import { rootTabItems, RootTabs } from "@/Element/Feed/RootTabs"; +import { rootTabItems, RootTabs } from "@/Components/Feed/RootTabs"; import NotificationsHeader from "@/Pages/Layout/NotificationsHeader"; import { NostrLink, NostrPrefix, parseNostrLink } from "@snort/system"; -import { bech32ToHex } from "@/SnortUtils"; +import { bech32ToHex } from "@/Utils"; import { useEventFeed } from "@snort/system-react"; import { FormattedMessage } from "react-intl"; -import DisplayName from "@/Element/User/DisplayName"; +import DisplayName from "@/Components/User/DisplayName"; import useLogin from "@/Hooks/useLogin"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; export function Header() { const navigate = useNavigate(); diff --git a/packages/app/src/Pages/Layout/LogoHeader.tsx b/packages/app/src/Pages/Layout/LogoHeader.tsx index a0198169..5f9b9bb0 100644 --- a/packages/app/src/Pages/Layout/LogoHeader.tsx +++ b/packages/app/src/Pages/Layout/LogoHeader.tsx @@ -1,11 +1,11 @@ import useLogin from "../../Hooks/useLogin"; -import { getCurrentSubscription } from "../../Subscription"; -import { isBirthday, isChristmas, isHalloween, isStPatricksDay } from "../../SnortUtils"; +import { getCurrentSubscription } from "../../Utils/Subscription"; +import { isBirthday, isChristmas, isHalloween, isStPatricksDay } from "../../Utils"; import { Link } from "react-router-dom"; import { mapPlanName } from "../subscribe"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; import { unixNowMs } from "@snort/shared"; -import { Birthday, Day } from "@/Const"; +import { Birthday, Day } from "@/Utils/Const"; const getExtra = () => { if (isBirthday()) { diff --git a/packages/app/src/Pages/Layout/NavSidebar.tsx b/packages/app/src/Pages/Layout/NavSidebar.tsx index 5b2a7eb4..e5ac27fd 100644 --- a/packages/app/src/Pages/Layout/NavSidebar.tsx +++ b/packages/app/src/Pages/Layout/NavSidebar.tsx @@ -1,17 +1,17 @@ import { LogoHeader } from "./LogoHeader"; import { Link, useNavigate } from "react-router-dom"; -import Icon from "@/Icons/Icon"; -import { ProfileLink } from "../../Element/User/ProfileLink"; -import Avatar from "../../Element/User/Avatar"; +import Icon from "@/Components/Icons/Icon"; +import { ProfileLink } from "@/Components/User/ProfileLink"; +import Avatar from "@/Components/User/Avatar"; import useLogin from "../../Hooks/useLogin"; import { useUserProfile } from "@snort/system-react"; -import { NoteCreatorButton } from "../../Element/Event/Create/NoteCreatorButton"; +import { NoteCreatorButton } from "@/Components/Event/Create/NoteCreatorButton"; import { FormattedMessage, FormattedNumber, useIntl } from "react-intl"; import classNames from "classnames"; -import { getCurrentSubscription } from "@/Subscription"; +import { getCurrentSubscription } from "@/Utils/Subscription"; import { HasNotificationsMarker } from "@/Pages/Layout/HasNotificationsMarker"; -import NavLink from "@/Element/Button/NavLink"; -import { subscribeToNotifications } from "@/Notifications"; +import NavLink from "@/Components/Button/NavLink"; +import { subscribeToNotifications } from "@/Utils/Notifications"; import useEventPublisher from "@/Hooks/useEventPublisher"; import { Sats, useWallet } from "@/Wallet"; import { useEffect, useState } from "react"; diff --git a/packages/app/src/Pages/Layout/NotificationsHeader.tsx b/packages/app/src/Pages/Layout/NotificationsHeader.tsx index f90d36a9..2ad07dbf 100644 --- a/packages/app/src/Pages/Layout/NotificationsHeader.tsx +++ b/packages/app/src/Pages/Layout/NotificationsHeader.tsx @@ -1,13 +1,13 @@ import { useNavigate } from "react-router-dom"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; import useKeyboardShortcut from "@/Hooks/useKeyboardShortcut"; -import { isFormElement } from "@/SnortUtils"; +import { isFormElement } from "@/Utils"; import useLogin from "@/Hooks/useLogin"; import useEventPublisher from "@/Hooks/useEventPublisher"; import { HasNotificationsMarker } from "@/Pages/Layout/HasNotificationsMarker"; -import NavLink from "@/Element/Button/NavLink"; +import NavLink from "@/Components/Button/NavLink"; import classNames from "classnames"; -import { subscribeToNotifications } from "@/Notifications"; +import { subscribeToNotifications } from "@/Utils/Notifications"; const NotificationsHeader = () => { const navigate = useNavigate(); diff --git a/packages/app/src/Pages/Layout/RightColumn.tsx b/packages/app/src/Pages/Layout/RightColumn.tsx index f68ea2ac..94975637 100644 --- a/packages/app/src/Pages/Layout/RightColumn.tsx +++ b/packages/app/src/Pages/Layout/RightColumn.tsx @@ -1,6 +1,6 @@ -import SearchBox from "@/Element/SearchBox"; -import TrendingNotes from "@/Element/Trending/TrendingPosts"; -import TrendingHashtags from "@/Element/Trending/TrendingHashtags"; +import SearchBox from "@/Components/SearchBox/SearchBox"; +import TrendingNotes from "@/Components/Trending/TrendingPosts"; +import TrendingHashtags from "@/Components/Trending/TrendingHashtags"; import { FormattedMessage } from "react-intl"; import classNames from "classnames"; import useLogin from "@/Hooks/useLogin"; diff --git a/packages/app/src/Pages/Layout/index.tsx b/packages/app/src/Pages/Layout/index.tsx index 0af64450..d258ddac 100644 --- a/packages/app/src/Pages/Layout/index.tsx +++ b/packages/app/src/Pages/Layout/index.tsx @@ -3,20 +3,20 @@ import { useCallback } from "react"; import { Outlet, useLocation } from "react-router-dom"; import useLogin from "@/Hooks/useLogin"; -import { isFormElement } from "@/SnortUtils"; -import Toaster from "@/Toaster"; +import { isFormElement } from "@/Utils"; +import Toaster from "@/Components/Toaster/Toaster"; import { useTheme } from "@/Hooks/useTheme"; import { useLoginRelays } from "@/Hooks/useLoginRelays"; -import { LoginUnlock } from "@/Element/PinPrompt"; +import { LoginUnlock } from "@/Components/PinPrompt/PinPrompt"; import useKeyboardShortcut from "@/Hooks/useKeyboardShortcut"; -import { LoginStore } from "@/Login"; +import { LoginStore } from "@/Utils/Login"; import NavSidebar from "./NavSidebar"; import RightColumn from "./RightColumn"; import useLoginFeed from "@/Feed/LoginFeed"; -import ErrorBoundary from "@/Element/ErrorBoundary"; +import ErrorBoundary from "@/Components/ErrorBoundary"; import Footer from "@/Pages/Layout/Footer"; import { Header } from "@/Pages/Layout/Header"; -import CloseButton from "@/Element/Button/CloseButton"; +import CloseButton from "@/Components/Button/CloseButton"; import { useCommunityLeaders } from "@/Hooks/useCommunityLeaders"; export default function Index() { diff --git a/packages/app/src/Pages/ListFeedPage.tsx b/packages/app/src/Pages/ListFeedPage.tsx index 80eec8b8..930f27ca 100644 --- a/packages/app/src/Pages/ListFeedPage.tsx +++ b/packages/app/src/Pages/ListFeedPage.tsx @@ -4,9 +4,9 @@ import { useEventFeed } from "@snort/system-react"; import { FormattedMessage } from "react-intl"; import { useParams } from "react-router-dom"; -import { Hour } from "@/Const"; -import Timeline from "@/Element/Feed/Timeline"; -import PageSpinner from "@/Element/PageSpinner"; +import { Hour } from "@/Utils/Const"; +import Timeline from "@/Components/Feed/Timeline"; +import PageSpinner from "@/Components/PageSpinner"; export function ListFeedPage() { const { id } = useParams(); diff --git a/packages/app/src/Pages/Messages/ChatParticipant.tsx b/packages/app/src/Pages/Messages/ChatParticipant.tsx index 57eb694f..d09535c2 100644 --- a/packages/app/src/Pages/Messages/ChatParticipant.tsx +++ b/packages/app/src/Pages/Messages/ChatParticipant.tsx @@ -1,8 +1,8 @@ import { MetadataCache } from "@snort/system"; import { ChatParticipant } from "@/chat"; -import NoteToSelf from "../../Element/User/NoteToSelf"; -import ProfileImage from "../../Element/User/ProfileImage"; +import NoteToSelf from "@/Components/User/NoteToSelf"; +import ProfileImage from "@/Components/User/ProfileImage"; import useLogin from "@/Hooks/useLogin"; export function ChatParticipantProfile({ participant }: { participant: ChatParticipant }) { diff --git a/packages/app/src/Pages/Messages/DM.tsx b/packages/app/src/Pages/Messages/DM.tsx index 3599aea3..82ed011b 100644 --- a/packages/app/src/Pages/Messages/DM.tsx +++ b/packages/app/src/Pages/Messages/DM.tsx @@ -5,13 +5,13 @@ import { FormattedMessage, useIntl } from "react-intl"; import { useInView } from "react-intersection-observer"; import useEventPublisher from "@/Hooks/useEventPublisher"; -import NoteTime from "@/Element/Event/NoteTime"; -import Text from "@/Element/Text"; +import NoteTime from "@/Components/Event/NoteTime"; +import Text from "@/Components/Text/Text"; import useLogin from "@/Hooks/useLogin"; import { Chat, ChatMessage, ChatType, setLastReadIn } from "@/chat"; -import ProfileImage from "../../Element/User/ProfileImage"; +import ProfileImage from "@/Components/User/ProfileImage"; -import messages from "../../Element/messages"; +import messages from "@/Components/messages"; export interface DMProps { chat: Chat; diff --git a/packages/app/src/Pages/Messages/DmWindow.tsx b/packages/app/src/Pages/Messages/DmWindow.tsx index 9acb5369..19ff7b01 100644 --- a/packages/app/src/Pages/Messages/DmWindow.tsx +++ b/packages/app/src/Pages/Messages/DmWindow.tsx @@ -1,5 +1,5 @@ import { useEffect, useMemo, useRef } from "react"; -import ProfileImage from "@/Element/User/ProfileImage"; +import ProfileImage from "@/Components/User/ProfileImage"; import DM from "@/Pages/Messages/DM"; import useLogin from "@/Hooks/useLogin"; import WriteMessage from "@/Pages/Messages/WriteMessage"; diff --git a/packages/app/src/Pages/Messages/MessagesPage.tsx b/packages/app/src/Pages/Messages/MessagesPage.tsx index 18bd94be..771347a0 100644 --- a/packages/app/src/Pages/Messages/MessagesPage.tsx +++ b/packages/app/src/Pages/Messages/MessagesPage.tsx @@ -3,12 +3,12 @@ import { FormattedMessage, useIntl } from "react-intl"; import { useNavigate, useParams } from "react-router-dom"; import UnreadCount from "@/Pages/Messages/UnreadCount"; -import ProfileImage from "@/Element/User/ProfileImage"; -import { parseId } from "@/SnortUtils"; -import NoteToSelf from "@/Element/User/NoteToSelf"; +import ProfileImage from "@/Components/User/ProfileImage"; +import { parseId } from "@/Utils"; +import NoteToSelf from "@/Components/User/NoteToSelf"; import useLogin from "@/Hooks/useLogin"; import usePageWidth from "@/Hooks/usePageWidth"; -import NoteTime from "@/Element/Event/NoteTime"; +import NoteTime from "@/Components/Event/NoteTime"; import DmWindow from "@/Pages/Messages/DmWindow"; import { Chat, ChatType, useChatSystem } from "@/chat"; import { ChatParticipantProfile } from "@/Pages/Messages/ChatParticipant"; diff --git a/packages/app/src/Pages/Messages/NewChatWindow.tsx b/packages/app/src/Pages/Messages/NewChatWindow.tsx index 0ec37574..39d90a03 100644 --- a/packages/app/src/Pages/Messages/NewChatWindow.tsx +++ b/packages/app/src/Pages/Messages/NewChatWindow.tsx @@ -3,15 +3,15 @@ import { useNavigate } from "react-router-dom"; import { useUserSearch } from "@snort/system-react"; import useLogin from "@/Hooks/useLogin"; import useEventPublisher from "@/Hooks/useEventPublisher"; -import { appendDedupe, debounce } from "@/SnortUtils"; +import { appendDedupe, debounce } from "@/Utils"; import { ChatType, createChatLink } from "@/chat"; -import Icon from "@/Icons/Icon"; -import Modal from "@/Element/Modal"; +import Icon from "@/Components/Icons/Icon"; +import Modal from "@/Components/Modal/Modal"; import { FormattedMessage } from "react-intl"; -import ProfileImage from "@/Element/User/ProfileImage"; -import ProfilePreview from "@/Element/User/ProfilePreview"; +import ProfileImage from "@/Components/User/ProfileImage"; +import ProfilePreview from "@/Components/User/ProfilePreview"; import { Nip28ChatSystem } from "@/chat/nip28"; -import { LoginSession, LoginStore } from "@/Login"; +import { LoginSession, LoginStore } from "@/Utils/Login"; import { decodeTLV, EventKind } from "@snort/system"; import Nip28ChatProfile from "@/Pages/Messages/Nip28ChatProfile"; diff --git a/packages/app/src/Pages/Messages/Nip28ChatProfile.tsx b/packages/app/src/Pages/Messages/Nip28ChatProfile.tsx index a11c4b3f..e0ec2760 100644 --- a/packages/app/src/Pages/Messages/Nip28ChatProfile.tsx +++ b/packages/app/src/Pages/Messages/Nip28ChatProfile.tsx @@ -1,6 +1,6 @@ import { useEventFeed } from "@snort/system-react"; import { NostrLink, UserMetadata } from "@snort/system"; -import ProfilePreview from "@/Element/User/ProfilePreview"; +import ProfilePreview from "@/Components/User/ProfilePreview"; import React from "react"; export default function Nip28ChatProfile({ id, onClick }: { id: string; onClick: (id: string) => void }) { diff --git a/packages/app/src/Pages/Messages/WriteMessage.tsx b/packages/app/src/Pages/Messages/WriteMessage.tsx index 6d3fa198..c82ed4f8 100644 --- a/packages/app/src/Pages/Messages/WriteMessage.tsx +++ b/packages/app/src/Pages/Messages/WriteMessage.tsx @@ -1,8 +1,8 @@ import { useState } from "react"; import useEventPublisher from "@/Hooks/useEventPublisher"; -import Textarea from "../../Element/Textarea"; +import Textarea from "@/Components/Textarea/Textarea"; import { Chat } from "@/chat"; -import { AsyncIcon } from "@/Element/Button/AsyncIcon"; +import { AsyncIcon } from "@/Components/Button/AsyncIcon"; export default function WriteMessage({ chat }: { chat: Chat }) { const [msg, setMsg] = useState(""); diff --git a/packages/app/src/Pages/NetworkGraph.tsx b/packages/app/src/Pages/NetworkGraph.tsx index b5d2ab22..ddc672f2 100644 --- a/packages/app/src/Pages/NetworkGraph.tsx +++ b/packages/app/src/Pages/NetworkGraph.tsx @@ -2,11 +2,11 @@ import { NodeObject } from "react-force-graph-3d"; import { useContext, useEffect, useState } from "react"; import { MetadataCache, socialGraphInstance, STR, UID } from "@snort/system"; import { SnortContext } from "@snort/system-react"; -import { defaultAvatar } from "../SnortUtils"; +import { defaultAvatar } from "../Utils"; import { proxyImg } from "@/Hooks/useImgProxy"; -import { LoginStore } from "@/Login"; +import { LoginStore } from "@/Utils/Login"; import { FormattedMessage } from "react-intl"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; interface GraphNode { id: UID; diff --git a/packages/app/src/Pages/NostrAddressPage.tsx b/packages/app/src/Pages/NostrAddressPage.tsx index d694a873..7da6fca7 100644 --- a/packages/app/src/Pages/NostrAddressPage.tsx +++ b/packages/app/src/Pages/NostrAddressPage.tsx @@ -1,7 +1,7 @@ import { FormattedMessage } from "react-intl"; -import { ApiHost } from "@/Const"; -import Nip5Service from "@/Element/Nip5Service"; +import { ApiHost } from "@/Utils/Const"; +import Nip5Service from "@/Components/Nip5Service"; import messages from "./messages"; diff --git a/packages/app/src/Pages/NostrLinkHandler.tsx b/packages/app/src/Pages/NostrLinkHandler.tsx index 91bccaee..30fc7f67 100644 --- a/packages/app/src/Pages/NostrLinkHandler.tsx +++ b/packages/app/src/Pages/NostrLinkHandler.tsx @@ -1,10 +1,10 @@ import React, { useEffect, useState } from "react"; import { useParams, useLocation } from "react-router-dom"; import { fetchNip05Pubkey } from "@snort/shared"; -import Spinner from "@/Icons/Spinner"; +import Spinner from "@/Components/Icons/Spinner"; import ProfilePage from "@/Pages/Profile/ProfilePage"; -import { ThreadRoute } from "@/Element/Event/Thread"; -import { GenericFeed } from "@/Element/Feed/Generic"; +import { ThreadRoute } from "@/Components/Event/Thread"; +import { GenericFeed } from "@/Components/Feed/Generic"; import { NostrPrefix, tryParseNostrLink } from "@snort/system"; import { FormattedMessage } from "react-intl"; diff --git a/packages/app/src/Pages/Notifications/NotificationChart.tsx b/packages/app/src/Pages/Notifications/NotificationChart.tsx index 490d1b1c..ce77c445 100644 --- a/packages/app/src/Pages/Notifications/NotificationChart.tsx +++ b/packages/app/src/Pages/Notifications/NotificationChart.tsx @@ -1,14 +1,14 @@ -import { Day } from "@/Const"; -import Icon from "@/Icons/Icon"; -import { formatShort } from "@/Number"; -import { orderAscending } from "@/SnortUtils"; +import { Day } from "@/Utils/Const"; +import Icon from "@/Components/Icons/Icon"; +import { formatShort } from "@/Utils/Number"; +import { orderAscending } from "@/Utils"; import { unixNow, unwrap } from "@snort/shared"; import { TaggedNostrEvent, EventKind } from "@snort/system"; import classNames from "classnames"; import { useState, useMemo } from "react"; import { FormattedMessage } from "react-intl"; -import { AsyncIcon } from "../../Element/Button/AsyncIcon"; -import Tabs, { Tab } from "../../Element/Tabs"; +import { AsyncIcon } from "@/Components/Button/AsyncIcon"; +import Tabs, { Tab } from "@/Components/Tabs/Tabs"; import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from "recharts"; interface StatSlot { diff --git a/packages/app/src/Pages/Notifications/Notifications.tsx b/packages/app/src/Pages/Notifications/Notifications.tsx index fad6075e..cfa55e0d 100644 --- a/packages/app/src/Pages/Notifications/Notifications.tsx +++ b/packages/app/src/Pages/Notifications/Notifications.tsx @@ -8,18 +8,18 @@ import { FormattedMessage, useIntl } from "react-intl"; import { useNavigate } from "react-router-dom"; import useLogin from "@/Hooks/useLogin"; -import { markNotificationsRead } from "@/Login"; +import { markNotificationsRead } from "@/Utils/Login"; import { Notifications } from "@/Cache"; -import { dedupe, orderDescending, getDisplayName } from "@/SnortUtils"; -import Icon from "@/Icons/Icon"; -import ProfileImage from "@/Element/User/ProfileImage"; +import { dedupe, orderDescending, getDisplayName } from "@/Utils"; +import Icon from "@/Components/Icons/Icon"; +import ProfileImage from "@/Components/User/ProfileImage"; import useModeration from "@/Hooks/useModeration"; -import Text from "@/Element/Text"; -import { formatShort } from "@/Number"; -import { LiveEvent } from "@/Element/LiveEvent"; -import ProfilePreview from "@/Element/User/ProfilePreview"; -import { ShowMoreInView } from "@/Element/Event/ShowMore"; -import PageSpinner from "@/Element/PageSpinner"; +import Text from "@/Components/Text/Text"; +import { formatShort } from "@/Utils/Number"; +import { LiveEvent } from "@/Components/LiveStream/LiveEvent"; +import ProfilePreview from "@/Components/User/ProfilePreview"; +import { ShowMoreInView } from "@/Components/Event/ShowMore"; +import PageSpinner from "@/Components/PageSpinner"; const NotificationGraph = lazy(() => import("@/Pages/Notifications/NotificationChart")); function notificationContext(ev: TaggedNostrEvent) { diff --git a/packages/app/src/Pages/Profile/ProfilePage.tsx b/packages/app/src/Pages/Profile/ProfilePage.tsx index 6ea2006a..5b301de9 100644 --- a/packages/app/src/Pages/Profile/ProfilePage.tsx +++ b/packages/app/src/Pages/Profile/ProfilePage.tsx @@ -14,36 +14,36 @@ import { import { fetchNip05Pubkey, LNURL } from "@snort/shared"; import { useUserProfile } from "@snort/system-react"; -import { findTag, getLinkReactions, hexToBech32, parseId, unwrap } from "@/SnortUtils"; -import Note from "@/Element/Event/Note"; -import { Tab, TabElement } from "@/Element/Tabs"; -import Icon from "@/Icons/Icon"; +import { findTag, getLinkReactions, hexToBech32, parseId, unwrap } from "@/Utils"; +import Note from "@/Components/Event/Note"; +import { Tab, TabElement } from "@/Components/Tabs/Tabs"; +import Icon from "@/Components/Icons/Icon"; import useFollowsFeed from "@/Feed/FollowsFeed"; import useProfileBadges from "@/Feed/BadgesFeed"; import useModeration from "@/Hooks/useModeration"; -import FollowButton from "@/Element/User/FollowButton"; -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/User/Nip05"; -import Copy from "@/Element/Copy"; -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/Button/IconButton"; -import FollowsYou from "@/Element/User/FollowsYou"; -import QrCode from "@/Element/QrCode"; -import Modal from "@/Element/Modal"; -import BadgeList from "@/Element/User/BadgeList"; -import { ProxyImg } from "@/Element/ProxyImg"; +import FollowButton from "@/Components/User/FollowButton"; +import Avatar from "@/Components/User/Avatar"; +import Timeline from "@/Components/Feed/Timeline"; +import Text from "@/Components/Text/Text"; +import SendSats from "@/Components/SendSats/SendSats"; +import Nip05 from "@/Components/User/Nip05"; +import Copy from "@/Components/Copy/Copy"; +import ProfileImage from "@/Components/User/ProfileImage"; +import BlockList from "@/Components/User/BlockList"; +import MutedList from "@/Components/User/MutedList"; +import FollowsList from "@/Components/User/FollowListBase"; +import IconButton from "@/Components/Button/IconButton"; +import FollowsYou from "@/Components/User/FollowsYou"; +import QrCode from "@/Components/QrCode"; +import Modal from "@/Components/Modal/Modal"; +import BadgeList from "@/Components/User/BadgeList"; +import { ProxyImg } from "@/Components/ProxyImg"; import useHorizontalScroll from "@/Hooks/useHorizontalScroll"; -import { EmailRegex } from "@/Const"; +import { EmailRegex } from "@/Utils/Const"; import useLogin from "@/Hooks/useLogin"; -import { ZapTarget } from "@/Zapper"; +import { ZapTarget } from "@/Utils/Zapper"; import { useStatusFeed } from "@/Feed/StatusFeed"; -import { SpotlightMediaModal } from "@/Element/Spotlight/SpotlightMedia"; +import { SpotlightMediaModal } from "@/Components/Spotlight/SpotlightMedia"; import ProfileTab, { BookMarksTab, FollowersTab, @@ -52,10 +52,10 @@ import ProfileTab, { RelaysTab, ZapsProfileTab, } from "@/Pages/Profile/ProfileTab"; -import DisplayName from "@/Element/User/DisplayName"; -import { UserWebsiteLink } from "@/Element/User/UserWebsiteLink"; +import DisplayName from "@/Components/User/DisplayName"; +import { UserWebsiteLink } from "@/Components/User/UserWebsiteLink"; import { useMuteList, usePinList } from "@/Hooks/useLists"; -import FollowedBy from "@/Element/User/FollowedBy"; +import FollowedBy from "@/Components/User/FollowedBy"; interface ProfilePageProps { id?: string; diff --git a/packages/app/src/Pages/Profile/ProfileTab.tsx b/packages/app/src/Pages/Profile/ProfileTab.tsx index f196d2f9..03c65cd1 100644 --- a/packages/app/src/Pages/Profile/ProfileTab.tsx +++ b/packages/app/src/Pages/Profile/ProfileTab.tsx @@ -3,16 +3,16 @@ import { HexKey, NostrLink, NostrPrefix } from "@snort/system"; import { useReactions } from "@snort/system-react"; import useZapsFeed from "@/Feed/ZapsFeed"; -import { formatShort } from "@/Number"; +import { formatShort } from "@/Utils/Number"; import useFollowersFeed from "@/Feed/FollowersFeed"; -import FollowsList from "@/Element/User/FollowListBase"; +import FollowsList from "@/Components/User/FollowListBase"; import useFollowsFeed from "@/Feed/FollowsFeed"; import useRelaysFeed from "@/Feed/RelaysFeed"; -import RelaysMetadata from "@/Element/Relay/RelaysMetadata"; -import Bookmarks from "@/Element/User/Bookmarks"; -import Icon from "@/Icons/Icon"; -import { Tab } from "@/Element/Tabs"; -import { default as ZapElement } from "@/Element/Event/Zap"; +import RelaysMetadata from "@/Components/Relay/RelaysMetadata"; +import Bookmarks from "@/Components/User/Bookmarks"; +import Icon from "@/Components/Icons/Icon"; +import { Tab } from "@/Components/Tabs/Tabs"; +import { default as ZapElement } from "@/Components/Event/Zap"; import { useBookmarkList } from "@/Hooks/useLists"; import messages from "../messages"; diff --git a/packages/app/src/Pages/Root.tsx b/packages/app/src/Pages/Root.tsx index 30babfb1..78234d2f 100644 --- a/packages/app/src/Pages/Root.tsx +++ b/packages/app/src/Pages/Root.tsx @@ -5,20 +5,20 @@ import { unixNow } from "@snort/shared"; import { NostrLink } from "@snort/system"; import { SnortContext } from "@snort/system-react"; -import Timeline from "@/Element/Feed/Timeline"; +import Timeline from "@/Components/Feed/Timeline"; import { TimelineSubject } from "@/Feed/TimelineFeed"; -import { debounce, getCurrentRefCode, getRelayName, sha256 } from "@/SnortUtils"; +import { debounce, getCurrentRefCode, getRelayName, sha256 } from "@/Utils"; import useLogin from "@/Hooks/useLogin"; import Discover from "@/Pages/Discover"; -import TrendingNotes from "@/Element/Trending/TrendingPosts"; +import TrendingNotes from "@/Components/Trending/TrendingPosts"; import HashTagsPage from "@/Pages/HashTagsPage"; -import SuggestedProfiles from "@/Element/SuggestedProfiles"; -import { TaskList } from "@/Tasks/TaskList"; -import TimelineFollows from "@/Element/Feed/TimelineFollows"; +import SuggestedProfiles from "@/Components/SuggestedProfiles"; +import { TaskList } from "@/Components/Tasks/TaskList"; +import TimelineFollows from "@/Components/Feed/TimelineFollows"; import { DeckContext } from "@/Pages/DeckLayout"; import { TopicsPage } from "./TopicsPage"; -import TrendingHashtags from "@/Element/Trending/TrendingHashtags"; -const InviteModal = lazy(() => import("@/Element/Invite")); +import TrendingHashtags from "@/Components/Trending/TrendingHashtags"; +const InviteModal = lazy(() => import("@/Components/Invite")); import messages from "./messages"; import useHistoryState from "@/Hooks/useHistoryState"; diff --git a/packages/app/src/Pages/SearchPage.tsx b/packages/app/src/Pages/SearchPage.tsx index 48cb6f46..b2254f79 100644 --- a/packages/app/src/Pages/SearchPage.tsx +++ b/packages/app/src/Pages/SearchPage.tsx @@ -1,14 +1,14 @@ import { useIntl, FormattedMessage } from "react-intl"; import { useParams } from "react-router-dom"; -import Timeline from "@/Element/Feed/Timeline"; -import Tabs, { Tab } from "@/Element/Tabs"; +import Timeline from "@/Components/Feed/Timeline"; +import Tabs, { Tab } from "@/Components/Tabs/Tabs"; import { useEffect, useState } from "react"; -import { debounce } from "@/SnortUtils"; +import { debounce } from "@/Utils"; import { router } from "@/index"; -import TrendingUsers from "@/Element/Trending/TrendingUsers"; +import TrendingUsers from "@/Components/Trending/TrendingUsers"; -import TrendingNotes from "@/Element/Trending/TrendingPosts"; -import UsersFeed from "@/Element/Feed/UsersFeed"; +import TrendingNotes from "@/Components/Trending/TrendingPosts"; +import UsersFeed from "@/Components/Feed/UsersFeed"; const NOTES = 0; const PROFILES = 1; diff --git a/packages/app/src/Pages/TopicsPage.tsx b/packages/app/src/Pages/TopicsPage.tsx index bfe996e3..575a0c9a 100644 --- a/packages/app/src/Pages/TopicsPage.tsx +++ b/packages/app/src/Pages/TopicsPage.tsx @@ -1,4 +1,4 @@ -import Timeline from "@/Element/Feed/Timeline"; +import Timeline from "@/Components/Feed/Timeline"; import useLogin from "@/Hooks/useLogin"; export function TopicsPage() { diff --git a/packages/app/src/Pages/WalletPage.tsx b/packages/app/src/Pages/WalletPage.tsx index c14c85bb..71f20839 100644 --- a/packages/app/src/Pages/WalletPage.tsx +++ b/packages/app/src/Pages/WalletPage.tsx @@ -4,13 +4,13 @@ import { useEffect, useState } from "react"; import { useNavigate } from "react-router-dom"; import { FormattedMessage, FormattedNumber, useIntl } from "react-intl"; -import NoteTime from "@/Element/Event/NoteTime"; +import NoteTime from "@/Components/Event/NoteTime"; import { WalletInvoice, Sats, useWallet, LNWallet, Wallets } from "@/Wallet"; -import AsyncButton from "@/Element/Button/AsyncButton"; -import { unwrap } from "@/SnortUtils"; -import Icon from "@/Icons/Icon"; +import AsyncButton from "@/Components/Button/AsyncButton"; +import { unwrap } from "@/Utils"; +import Icon from "@/Components/Icons/Icon"; import { useRates } from "@/Hooks/useRates"; -import { AsyncIcon } from "@/Element/Button/AsyncIcon"; +import { AsyncIcon } from "@/Components/Button/AsyncIcon"; import classNames from "classnames"; export default function WalletPage(props: { showHistory: boolean }) { diff --git a/packages/app/src/Pages/ZapPool.tsx b/packages/app/src/Pages/ZapPool.tsx index 4616e270..ebe2fe3d 100644 --- a/packages/app/src/Pages/ZapPool.tsx +++ b/packages/app/src/Pages/ZapPool.tsx @@ -4,13 +4,13 @@ import { useMemo, useSyncExternalStore } from "react"; import { FormattedMessage, FormattedNumber } from "react-intl"; import { useUserProfile } from "@snort/system-react"; -import { SnortPubKey } from "@/Const"; -import ProfilePreview from "@/Element/User/ProfilePreview"; +import { SnortPubKey } from "@/Utils/Const"; +import ProfilePreview from "@/Components/User/ProfilePreview"; import useLogin from "@/Hooks/useLogin"; -import { UploaderServices } from "@/Upload"; -import { bech32ToHex, getRelayName, trackEvent, unwrap } from "@/SnortUtils"; -import { ZapPoolController, ZapPoolRecipient, ZapPoolRecipientType } from "@/ZapPoolController"; -import AsyncButton from "@/Element/Button/AsyncButton"; +import { UploaderServices } from "@/Utils/Upload"; +import { bech32ToHex, getRelayName, trackEvent, unwrap } from "@/Utils"; +import { ZapPoolController, ZapPoolRecipient, ZapPoolRecipientType } from "@/Utils/ZapPoolController"; +import AsyncButton from "@/Components/Button/AsyncButton"; import { useWallet } from "@/Wallet"; import useEventPublisher from "@/Hooks/useEventPublisher"; diff --git a/packages/app/src/Pages/onboarding/discover.tsx b/packages/app/src/Pages/onboarding/discover.tsx index 02be6590..c29bde35 100644 --- a/packages/app/src/Pages/onboarding/discover.tsx +++ b/packages/app/src/Pages/onboarding/discover.tsx @@ -1,8 +1,8 @@ import { FormattedMessage } from "react-intl"; import { useLocation, useNavigate } from "react-router-dom"; -import AsyncButton from "@/Element/Button/AsyncButton"; +import AsyncButton from "@/Components/Button/AsyncButton"; import { NewUserState } from "."; -import TrendingUsers from "@/Element/Trending/TrendingUsers"; +import TrendingUsers from "@/Components/Trending/TrendingUsers"; export function Discover() { const location = useLocation(); diff --git a/packages/app/src/Pages/onboarding/index.tsx b/packages/app/src/Pages/onboarding/index.tsx index a7cbda4e..7aa2f930 100644 --- a/packages/app/src/Pages/onboarding/index.tsx +++ b/packages/app/src/Pages/onboarding/index.tsx @@ -2,7 +2,7 @@ import "./index.css"; import { Outlet, RouteObject } from "react-router-dom"; import { SignIn, SignUp } from "./start"; import { AllLanguageCodes } from "@/Pages/settings/Preferences"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; import { Profile } from "./profile"; import { Topics } from "./topics"; import { Discover } from "./discover"; diff --git a/packages/app/src/Pages/onboarding/moderation.tsx b/packages/app/src/Pages/onboarding/moderation.tsx index 7fb6240e..288ec7e9 100644 --- a/packages/app/src/Pages/onboarding/moderation.tsx +++ b/packages/app/src/Pages/onboarding/moderation.tsx @@ -3,10 +3,10 @@ import { FormattedMessage } from "react-intl"; import { useNavigate } from "react-router-dom"; import { unixNowMs } from "@snort/shared"; -import AsyncButton from "@/Element/Button/AsyncButton"; -import { appendDedupe } from "@/SnortUtils"; -import { ToggleSwitch } from "@/Icons/Toggle"; -import { updateAppData } from "@/Login"; +import AsyncButton from "@/Components/Button/AsyncButton"; +import { appendDedupe } from "@/Utils"; +import { ToggleSwitch } from "@/Components/Icons/Toggle"; +import { updateAppData } from "@/Utils/Login"; import useLogin from "@/Hooks/useLogin"; export const FixedModeration = { diff --git a/packages/app/src/Pages/onboarding/profile.tsx b/packages/app/src/Pages/onboarding/profile.tsx index d6d1a6d3..587d62f1 100644 --- a/packages/app/src/Pages/onboarding/profile.tsx +++ b/packages/app/src/Pages/onboarding/profile.tsx @@ -1,13 +1,13 @@ -import AsyncButton from "@/Element/Button/AsyncButton"; -import AvatarEditor from "@/Element/User/AvatarEditor"; +import AsyncButton from "@/Components/Button/AsyncButton"; +import AvatarEditor from "@/Components/User/AvatarEditor"; import { useContext, useState } from "react"; import { FormattedMessage } from "react-intl"; import { useLocation, useNavigate } from "react-router-dom"; -import { generateNewLogin } from "@/Login"; +import { generateNewLogin } from "@/Utils/Login"; import { SnortContext } from "@snort/system-react"; import { NotEncrypted } from "@snort/system"; import { NewUserState } from "."; -import { trackEvent } from "@/SnortUtils"; +import { trackEvent } from "@/Utils"; export function Profile() { const system = useContext(SnortContext); diff --git a/packages/app/src/Pages/onboarding/start.tsx b/packages/app/src/Pages/onboarding/start.tsx index ba84cd86..a3bebafb 100644 --- a/packages/app/src/Pages/onboarding/start.tsx +++ b/packages/app/src/Pages/onboarding/start.tsx @@ -3,14 +3,14 @@ import { useState } from "react"; import { Link, useNavigate } from "react-router-dom"; import { unwrap } from "@snort/shared"; -import AsyncButton from "@/Element/Button/AsyncButton"; -import Icon from "@/Icons/Icon"; +import AsyncButton from "@/Components/Button/AsyncButton"; +import Icon from "@/Components/Icons/Icon"; import { NewUserState } from "."; -import { LoginSessionType, LoginStore } from "@/Login"; +import { LoginSessionType, LoginStore } from "@/Utils/Login"; import useLoginHandler from "@/Hooks/useLoginHandler"; import { NotEncrypted } from "@snort/system"; import classNames from "classnames"; -import { trackEvent } from "@/SnortUtils"; +import { trackEvent } from "@/Utils"; const NSEC_NPUB_REGEX = /(nsec1|npub1)[a-zA-Z0-9]{20,65}/gi; diff --git a/packages/app/src/Pages/onboarding/topics.tsx b/packages/app/src/Pages/onboarding/topics.tsx index 4c81bc00..51f8ac11 100644 --- a/packages/app/src/Pages/onboarding/topics.tsx +++ b/packages/app/src/Pages/onboarding/topics.tsx @@ -1,9 +1,9 @@ import { ReactNode, useState } from "react"; import { FormattedMessage } from "react-intl"; import { useNavigate } from "react-router-dom"; -import AsyncButton from "@/Element/Button/AsyncButton"; +import AsyncButton from "@/Components/Button/AsyncButton"; import classNames from "classnames"; -import { appendDedupe } from "@/SnortUtils"; +import { appendDedupe } from "@/Utils"; import useEventPublisher from "@/Hooks/useEventPublisher"; import { EventKind } from "@snort/system"; diff --git a/packages/app/src/Pages/settings/Accounts.tsx b/packages/app/src/Pages/settings/Accounts.tsx index 0e38fbab..d1ccea74 100644 --- a/packages/app/src/Pages/settings/Accounts.tsx +++ b/packages/app/src/Pages/settings/Accounts.tsx @@ -1,9 +1,9 @@ import { FormattedMessage } from "react-intl"; import { Link } from "react-router-dom"; -import ProfilePreview from "@/Element/User/ProfilePreview"; -import { LoginStore } from "@/Login"; -import { getActiveSubscriptions } from "@/Subscription"; +import ProfilePreview from "@/Components/User/ProfilePreview"; +import { LoginStore } from "@/Utils/Login"; +import { getActiveSubscriptions } from "@/Utils/Subscription"; export default function AccountsPage() { const logins = LoginStore.getSessions(); diff --git a/packages/app/src/Pages/settings/Cache.tsx b/packages/app/src/Pages/settings/Cache.tsx index f83f7de6..3da68147 100644 --- a/packages/app/src/Pages/settings/Cache.tsx +++ b/packages/app/src/Pages/settings/Cache.tsx @@ -11,7 +11,7 @@ import { UserCache, UserRelays, } from "@/Cache"; -import AsyncButton from "@/Element/Button/AsyncButton"; +import AsyncButton from "@/Components/Button/AsyncButton"; import { ReactNode, useSyncExternalStore } from "react"; import { FormattedMessage, FormattedNumber } from "react-intl"; diff --git a/packages/app/src/Pages/settings/Keys.tsx b/packages/app/src/Pages/settings/Keys.tsx index c246d30e..97afc94a 100644 --- a/packages/app/src/Pages/settings/Keys.tsx +++ b/packages/app/src/Pages/settings/Keys.tsx @@ -2,10 +2,10 @@ import "./Keys.css"; import { FormattedMessage } from "react-intl"; import { encodeTLV, KeyStorage, NostrPrefix } from "@snort/system"; -import Copy from "@/Element/Copy"; +import Copy from "@/Components/Copy/Copy"; import useLogin from "@/Hooks/useLogin"; -import { hexToMnemonic } from "@/nip6"; -import { hexToBech32 } from "@/SnortUtils"; +import { hexToMnemonic } from "@/Utils/nip6"; +import { hexToBech32 } from "@/Utils"; export default function ExportKeys() { const { publicKey, privateKeyData, generatedEntropy } = useLogin(); diff --git a/packages/app/src/Pages/settings/Menu.tsx b/packages/app/src/Pages/settings/Menu.tsx index 456d0e22..312df03e 100644 --- a/packages/app/src/Pages/settings/Menu.tsx +++ b/packages/app/src/Pages/settings/Menu.tsx @@ -1,11 +1,11 @@ import { ReactNode, useCallback } from "react"; import { FormattedMessage } from "react-intl"; import { Link, useNavigate } from "react-router-dom"; -import Icon from "@/Icons/Icon"; -import { LoginStore, logout } from "@/Login"; +import Icon from "@/Components/Icons/Icon"; +import { LoginStore, logout } from "@/Utils/Login"; import useLogin from "@/Hooks/useLogin"; import classNames from "classnames"; -import { getCurrentSubscription } from "@/Subscription"; +import { getCurrentSubscription } from "@/Utils/Subscription"; export type SettingsMenuItems = Array<{ title: ReactNode; diff --git a/packages/app/src/Pages/settings/Moderation.tsx b/packages/app/src/Pages/settings/Moderation.tsx index f3c852ca..be2a0bed 100644 --- a/packages/app/src/Pages/settings/Moderation.tsx +++ b/packages/app/src/Pages/settings/Moderation.tsx @@ -1,7 +1,7 @@ import { unixNowMs } from "@snort/shared"; import useLogin from "@/Hooks/useLogin"; -import { SnortAppData, updateAppData } from "@/Login"; -import { appendDedupe } from "@/SnortUtils"; +import { SnortAppData, updateAppData } from "@/Utils/Login"; +import { appendDedupe } from "@/Utils"; import { useState } from "react"; import { FormattedMessage } from "react-intl"; diff --git a/packages/app/src/Pages/settings/Notifications.tsx b/packages/app/src/Pages/settings/Notifications.tsx index 1e8bd4f2..1ecb3f9d 100644 --- a/packages/app/src/Pages/settings/Notifications.tsx +++ b/packages/app/src/Pages/settings/Notifications.tsx @@ -1,8 +1,8 @@ import { FormattedMessage } from "react-intl"; import { useEffect, useState } from "react"; -import Icon from "@/Icons/Icon"; +import Icon from "@/Components/Icons/Icon"; import useLogin from "@/Hooks/useLogin"; -import { subscribeToNotifications } from "@/Notifications"; +import { subscribeToNotifications } from "@/Utils/Notifications"; import useEventPublisher from "@/Hooks/useEventPublisher"; import messages from "./messages"; diff --git a/packages/app/src/Pages/settings/Preferences.tsx b/packages/app/src/Pages/settings/Preferences.tsx index 236ab3ff..04bf6f2c 100644 --- a/packages/app/src/Pages/settings/Preferences.tsx +++ b/packages/app/src/Pages/settings/Preferences.tsx @@ -2,9 +2,9 @@ import "./Preferences.css"; import { FormattedMessage, useIntl } from "react-intl"; import useLogin from "@/Hooks/useLogin"; -import { updatePreferences, UserPreferences } from "@/Login"; -import { DefaultImgProxy } from "@/Const"; -import { unwrap } from "@/SnortUtils"; +import { updatePreferences, UserPreferences } from "@/Utils/Login"; +import { DefaultImgProxy } from "@/Utils/Const"; +import { unwrap } from "@/Utils"; import { useLocale } from "@/IntlProvider"; import messages from "./messages"; diff --git a/packages/app/src/Pages/settings/Profile.tsx b/packages/app/src/Pages/settings/Profile.tsx index 0078ebb4..df521f87 100644 --- a/packages/app/src/Pages/settings/Profile.tsx +++ b/packages/app/src/Pages/settings/Profile.tsx @@ -5,18 +5,18 @@ import { mapEventToProfile } from "@snort/system"; import { useUserProfile } from "@snort/system-react"; import useEventPublisher from "@/Hooks/useEventPublisher"; -import { openFile, debounce } from "@/SnortUtils"; -import useFileUpload from "@/Upload"; -import AsyncButton from "@/Element/Button/AsyncButton"; +import { openFile, debounce } from "@/Utils"; +import useFileUpload from "@/Utils/Upload"; +import AsyncButton from "@/Components/Button/AsyncButton"; import { UserCache } from "@/Cache"; import useLogin from "@/Hooks/useLogin"; -import Icon from "@/Icons/Icon"; -import Avatar from "@/Element/User/Avatar"; +import Icon from "@/Components/Icons/Icon"; +import Avatar from "@/Components/User/Avatar"; import { FormattedMessage, useIntl } from "react-intl"; -import { ErrorOrOffline } from "@/Element/ErrorOrOffline"; +import { ErrorOrOffline } from "@/Components/ErrorOrOffline"; import { LNURL, fetchNip05Pubkey } from "@snort/shared"; -import messages from "@/Element/messages"; -import { MaxAboutLength, MaxUsernameLength } from "@/Const"; +import messages from "@/Components/messages"; +import { MaxAboutLength, MaxUsernameLength } from "@/Utils/Const"; export interface ProfileSettingsProps { avatar?: boolean; diff --git a/packages/app/src/Pages/settings/Referrals.tsx b/packages/app/src/Pages/settings/Referrals.tsx index fc7ef2bd..5b3dcc05 100644 --- a/packages/app/src/Pages/settings/Referrals.tsx +++ b/packages/app/src/Pages/settings/Referrals.tsx @@ -1,6 +1,6 @@ -import AsyncButton from "@/Element/Button/AsyncButton"; -import { LeaderBadge } from "@/Element/CommunityLeaders/LeaderBadge"; -import Copy from "@/Element/Copy"; +import AsyncButton from "@/Components/Button/AsyncButton"; +import { LeaderBadge } from "@/Components/CommunityLeaders/LeaderBadge"; +import Copy from "@/Components/Copy/Copy"; import SnortApi, { RefCodeResponse } from "@/External/SnortApi"; import useEventPublisher from "@/Hooks/useEventPublisher"; import { useEffect, useState } from "react"; diff --git a/packages/app/src/Pages/settings/RelayInfo.tsx b/packages/app/src/Pages/settings/RelayInfo.tsx index ef3b3eb5..d9e6ff09 100644 --- a/packages/app/src/Pages/settings/RelayInfo.tsx +++ b/packages/app/src/Pages/settings/RelayInfo.tsx @@ -1,9 +1,9 @@ import { FormattedMessage } from "react-intl"; -import ProfilePreview from "@/Element/User/ProfilePreview"; +import ProfilePreview from "@/Components/User/ProfilePreview"; import useRelayState from "@/Feed/RelayState"; import { useNavigate, useParams } from "react-router-dom"; -import { parseId, unwrap } from "@/SnortUtils"; -import { removeRelay } from "@/Login"; +import { parseId, unwrap } from "@/Utils"; +import { removeRelay } from "@/Utils/Login"; import useLogin from "@/Hooks/useLogin"; import messages from "./messages"; diff --git a/packages/app/src/Pages/settings/Relays.tsx b/packages/app/src/Pages/settings/Relays.tsx index 57493b57..547722e5 100644 --- a/packages/app/src/Pages/settings/Relays.tsx +++ b/packages/app/src/Pages/settings/Relays.tsx @@ -3,15 +3,15 @@ import { FormattedMessage } from "react-intl"; import { unixNowMs, unwrap } from "@snort/shared"; import { EventPublisher, FullRelaySettings, RelaySettings, SystemInterface } from "@snort/system"; -import Relay from "@/Element/Relay/Relay"; +import Relay from "@/Components/Relay/Relay"; import useEventPublisher from "@/Hooks/useEventPublisher"; import useLogin from "@/Hooks/useLogin"; -import { setRelays } from "@/Login"; -import AsyncButton from "@/Element/Button/AsyncButton"; +import { setRelays } from "@/Utils/Login"; +import AsyncButton from "@/Components/Button/AsyncButton"; import SnortApi, { RelayDistance } from "@/External/SnortApi"; -import { getCountry, getRelayName, sanitizeRelayUrl } from "@/SnortUtils"; -import { formatShort } from "@/Number"; -import { Blasters } from "@/Const"; +import { getCountry, getRelayName, sanitizeRelayUrl } from "@/Utils"; +import { formatShort } from "@/Utils/Number"; +import { Blasters } from "@/Utils/Const"; import messages from "./messages"; diff --git a/packages/app/src/Pages/settings/WalletSettings.tsx b/packages/app/src/Pages/settings/WalletSettings.tsx index d83deda0..3f759d00 100644 --- a/packages/app/src/Pages/settings/WalletSettings.tsx +++ b/packages/app/src/Pages/settings/WalletSettings.tsx @@ -1,13 +1,13 @@ -import LndLogo from "@/lnd-logo.png"; +import LndLogo from "@/img/lnd-logo.png"; import { ReactNode } from "react"; import { FormattedMessage } from "react-intl"; import { useNavigate } from "react-router-dom"; -import BlueWallet from "@/Icons/BlueWallet"; -import NostrIcon from "@/Icons/Nostrich"; -import CashuIcon from "@/Icons/Cashu"; -import AlbyIcon from "@/Icons/Alby"; -import Icon from "@/Icons/Icon"; +import BlueWallet from "@/Components/Icons/BlueWallet"; +import NostrIcon from "@/Components/Icons/Nostrich"; +import CashuIcon from "@/Components/Icons/Cashu"; +import AlbyIcon from "@/Components/Icons/Alby"; +import Icon from "@/Components/Icons/Icon"; import { getAlbyOAuth } from "./wallet/Alby"; const WalletRow = (props: { diff --git a/packages/app/src/Pages/settings/handle/LNAddress.tsx b/packages/app/src/Pages/settings/handle/LNAddress.tsx index 60fb73a0..4759253f 100644 --- a/packages/app/src/Pages/settings/handle/LNAddress.tsx +++ b/packages/app/src/Pages/settings/handle/LNAddress.tsx @@ -2,10 +2,10 @@ import { useState } from "react"; import { FormattedMessage, useIntl } from "react-intl"; import { LNURL } from "@snort/shared"; -import { ApiHost } from "@/Const"; -import AsyncButton from "@/Element/Button/AsyncButton"; +import { ApiHost } from "@/Utils/Const"; +import AsyncButton from "@/Components/Button/AsyncButton"; import useEventPublisher from "@/Hooks/useEventPublisher"; -import SnortServiceProvider, { ForwardType, ManageHandle } from "@/Nip05/SnortServiceProvider"; +import SnortServiceProvider, { ForwardType, ManageHandle } from "@/Utils/Nip05/SnortServiceProvider"; export default function LNForwardAddress({ handle }: { handle: ManageHandle }) { const { formatMessage } = useIntl(); diff --git a/packages/app/src/Pages/settings/handle/ListHandles.tsx b/packages/app/src/Pages/settings/handle/ListHandles.tsx index b3b4a903..4097f476 100644 --- a/packages/app/src/Pages/settings/handle/ListHandles.tsx +++ b/packages/app/src/Pages/settings/handle/ListHandles.tsx @@ -2,10 +2,10 @@ import { useEffect, useState } from "react"; import { FormattedMessage } from "react-intl"; import { Link, useNavigate } from "react-router-dom"; -import { ApiHost } from "@/Const"; +import { ApiHost } from "@/Utils/Const"; import useEventPublisher from "@/Hooks/useEventPublisher"; -import SnortServiceProvider, { ManageHandle } from "@/Nip05/SnortServiceProvider"; -import { ErrorOrOffline } from "@/Element/ErrorOrOffline"; +import SnortServiceProvider, { ManageHandle } from "@/Utils/Nip05/SnortServiceProvider"; +import { ErrorOrOffline } from "@/Components/ErrorOrOffline"; export default function ListHandles() { const navigate = useNavigate(); diff --git a/packages/app/src/Pages/settings/handle/Manage.tsx b/packages/app/src/Pages/settings/handle/Manage.tsx index 7cd0b30e..9b2cc13b 100644 --- a/packages/app/src/Pages/settings/handle/Manage.tsx +++ b/packages/app/src/Pages/settings/handle/Manage.tsx @@ -1,4 +1,4 @@ -import { ManageHandle } from "@/Nip05/SnortServiceProvider"; +import { ManageHandle } from "@/Utils/Nip05/SnortServiceProvider"; import { Navigate, useLocation } from "react-router-dom"; import LNForwardAddress from "./LNAddress"; import TransferHandle from "./TransferHandle"; diff --git a/packages/app/src/Pages/settings/handle/TransferHandle.tsx b/packages/app/src/Pages/settings/handle/TransferHandle.tsx index d57d4c3b..1b254def 100644 --- a/packages/app/src/Pages/settings/handle/TransferHandle.tsx +++ b/packages/app/src/Pages/settings/handle/TransferHandle.tsx @@ -2,11 +2,11 @@ import { useState } from "react"; import { FormattedMessage, useIntl } from "react-intl"; import { useNavigate } from "react-router-dom"; -import { ApiHost } from "@/Const"; -import AsyncButton from "@/Element/Button/AsyncButton"; +import { ApiHost } from "@/Utils/Const"; +import AsyncButton from "@/Components/Button/AsyncButton"; import useEventPublisher from "@/Hooks/useEventPublisher"; -import { ServiceError } from "@/Nip05/ServiceProvider"; -import SnortServiceProvider, { ManageHandle } from "@/Nip05/SnortServiceProvider"; +import { ServiceError } from "@/Utils/Nip05/ServiceProvider"; +import SnortServiceProvider, { ManageHandle } from "@/Utils/Nip05/SnortServiceProvider"; export default function TransferHandle({ handle }: { handle: ManageHandle }) { const { publisher } = useEventPublisher(); diff --git a/packages/app/src/Pages/settings/tools/follows-relay-health.tsx b/packages/app/src/Pages/settings/tools/follows-relay-health.tsx index 4d046479..0d5fc25e 100644 --- a/packages/app/src/Pages/settings/tools/follows-relay-health.tsx +++ b/packages/app/src/Pages/settings/tools/follows-relay-health.tsx @@ -1,7 +1,7 @@ -import { CollapsedSection } from "@/Element/Collapsed"; -import ProfilePreview from "@/Element/User/ProfilePreview"; +import { CollapsedSection } from "@/Components/Collapsed"; +import ProfilePreview from "@/Components/User/ProfilePreview"; import useLogin from "@/Hooks/useLogin"; -import { getRelayName } from "@/SnortUtils"; +import { getRelayName } from "@/Utils"; import { dedupe } from "@snort/shared"; import { pickTopRelays } from "@snort/system"; import { SnortContext } from "@snort/system-react"; diff --git a/packages/app/src/Pages/settings/tools/prune-follows.tsx b/packages/app/src/Pages/settings/tools/prune-follows.tsx index f116e15e..7b7de438 100644 --- a/packages/app/src/Pages/settings/tools/prune-follows.tsx +++ b/packages/app/src/Pages/settings/tools/prune-follows.tsx @@ -1,14 +1,14 @@ -import { Day } from "@/Const"; -import AsyncButton from "@/Element/Button/AsyncButton"; +import { Day } from "@/Utils/Const"; +import AsyncButton from "@/Components/Button/AsyncButton"; import useLogin from "@/Hooks/useLogin"; import { dedupe, unixNow } from "@snort/shared"; import { RequestBuilder } from "@snort/system"; import { useMemo, useState } from "react"; import { FormattedMessage, FormattedNumber } from "react-intl"; import { FollowsRelayHealth } from "./follows-relay-health"; -import ProfileImage from "@/Element/User/ProfileImage"; +import ProfileImage from "@/Components/User/ProfileImage"; import useEventPublisher from "@/Hooks/useEventPublisher"; -import { setFollows } from "@/Login"; +import { setFollows } from "@/Utils/Login"; const enum PruneStage { FetchLastPostTimestamp, diff --git a/packages/app/src/Pages/settings/wallet/Alby.tsx b/packages/app/src/Pages/settings/wallet/Alby.tsx index 90926d72..49be2fd5 100644 --- a/packages/app/src/Pages/settings/wallet/Alby.tsx +++ b/packages/app/src/Pages/settings/wallet/Alby.tsx @@ -1,4 +1,4 @@ -import PageSpinner from "@/Element/PageSpinner"; +import PageSpinner from "@/Components/PageSpinner"; import { WalletConfig, WalletKind, Wallets } from "@/Wallet"; import AlbyWallet from "@/Wallet/AlbyWallet"; import { sha256 } from "@noble/hashes/sha256"; diff --git a/packages/app/src/Pages/settings/wallet/Cashu.tsx b/packages/app/src/Pages/settings/wallet/Cashu.tsx index 65597d88..6754fd2c 100644 --- a/packages/app/src/Pages/settings/wallet/Cashu.tsx +++ b/packages/app/src/Pages/settings/wallet/Cashu.tsx @@ -2,8 +2,8 @@ import { useState } from "react"; import { FormattedMessage, useIntl } from "react-intl"; import { v4 as uuid } from "uuid"; -import AsyncButton from "@/Element/Button/AsyncButton"; -import { unwrap } from "@/SnortUtils"; +import AsyncButton from "@/Components/Button/AsyncButton"; +import { unwrap } from "@/Utils"; import { WalletConfig, WalletKind, Wallets } from "@/Wallet"; import { useNavigate } from "react-router-dom"; diff --git a/packages/app/src/Pages/settings/wallet/LNC.tsx b/packages/app/src/Pages/settings/wallet/LNC.tsx index 46fbd36e..bb94e73a 100644 --- a/packages/app/src/Pages/settings/wallet/LNC.tsx +++ b/packages/app/src/Pages/settings/wallet/LNC.tsx @@ -3,9 +3,9 @@ import { FormattedMessage, useIntl } from "react-intl"; import { useNavigate } from "react-router-dom"; import { v4 as uuid } from "uuid"; -import AsyncButton from "@/Element/Button/AsyncButton"; +import AsyncButton from "@/Components/Button/AsyncButton"; import { LNWallet, WalletInfo, WalletKind, Wallets } from "@/Wallet"; -import { unwrap } from "@/SnortUtils"; +import { unwrap } from "@/Utils"; const ConnectLNC = () => { const { formatMessage } = useIntl(); diff --git a/packages/app/src/Pages/settings/wallet/LNDHub.tsx b/packages/app/src/Pages/settings/wallet/LNDHub.tsx index 4b61c518..8606cc0a 100644 --- a/packages/app/src/Pages/settings/wallet/LNDHub.tsx +++ b/packages/app/src/Pages/settings/wallet/LNDHub.tsx @@ -2,8 +2,8 @@ import { useState } from "react"; import { FormattedMessage, useIntl } from "react-intl"; import { v4 as uuid } from "uuid"; -import AsyncButton from "@/Element/Button/AsyncButton"; -import { unwrap } from "@/SnortUtils"; +import AsyncButton from "@/Components/Button/AsyncButton"; +import { unwrap } from "@/Utils"; import LNDHubWallet from "@/Wallet/LNDHub"; import { WalletConfig, WalletKind, Wallets } from "@/Wallet"; import { useNavigate } from "react-router-dom"; diff --git a/packages/app/src/Pages/settings/wallet/NWC.tsx b/packages/app/src/Pages/settings/wallet/NWC.tsx index 790a0ec7..1e9e77b4 100644 --- a/packages/app/src/Pages/settings/wallet/NWC.tsx +++ b/packages/app/src/Pages/settings/wallet/NWC.tsx @@ -2,8 +2,8 @@ import { useState } from "react"; import { FormattedMessage, useIntl } from "react-intl"; import { v4 as uuid } from "uuid"; -import AsyncButton from "@/Element/Button/AsyncButton"; -import { unwrap } from "@/SnortUtils"; +import AsyncButton from "@/Components/Button/AsyncButton"; +import { unwrap } from "@/Utils"; import { WalletConfig, WalletKind, Wallets } from "@/Wallet"; import { Link, useNavigate } from "react-router-dom"; import { NostrConnectWallet } from "@/Wallet/NostrWalletConnect"; diff --git a/packages/app/src/Pages/subscribe/ManageSubscription.tsx b/packages/app/src/Pages/subscribe/ManageSubscription.tsx index d2f4f88f..49794710 100644 --- a/packages/app/src/Pages/subscribe/ManageSubscription.tsx +++ b/packages/app/src/Pages/subscribe/ManageSubscription.tsx @@ -2,12 +2,12 @@ import { useEffect, useState } from "react"; import { FormattedMessage } from "react-intl"; import { Link, useNavigate } from "react-router-dom"; -import PageSpinner from "@/Element/PageSpinner"; +import PageSpinner from "@/Components/PageSpinner"; import useEventPublisher from "@/Hooks/useEventPublisher"; import SnortApi, { Subscription, SubscriptionError } from "@/External/SnortApi"; import { mapSubscriptionErrorCode } from "."; import SubscriptionCard from "./SubscriptionCard"; -import { ErrorOrOffline } from "@/Element/ErrorOrOffline"; +import { ErrorOrOffline } from "@/Components/ErrorOrOffline"; export default function ManageSubscriptionPage() { const { publisher } = useEventPublisher(); diff --git a/packages/app/src/Pages/subscribe/RenewSub.tsx b/packages/app/src/Pages/subscribe/RenewSub.tsx index efd99eb5..b53024c2 100644 --- a/packages/app/src/Pages/subscribe/RenewSub.tsx +++ b/packages/app/src/Pages/subscribe/RenewSub.tsx @@ -2,13 +2,13 @@ import { useState } from "react"; import { FormattedMessage, useIntl } from "react-intl"; import { unixNow, unwrap } from "@snort/shared"; -import AsyncButton from "@/Element/Button/AsyncButton"; -import SendSats from "@/Element/SendSats"; +import AsyncButton from "@/Components/Button/AsyncButton"; +import SendSats from "@/Components/SendSats/SendSats"; import useEventPublisher from "@/Hooks/useEventPublisher"; import SnortApi, { Subscription, SubscriptionError } from "@/External/SnortApi"; import { mapPlanName, mapSubscriptionErrorCode } from "."; import useLogin from "@/Hooks/useLogin"; -import { mostRecentSubscription } from "@/Subscription"; +import { mostRecentSubscription } from "@/Utils/Subscription"; export function RenewSub({ sub: s }: { sub?: Subscription }) { const { subscriptions } = useLogin(s => ({ subscriptions: s.subscriptions })); diff --git a/packages/app/src/Pages/subscribe/SubscriptionCard.tsx b/packages/app/src/Pages/subscribe/SubscriptionCard.tsx index 802721b9..2f41e8b7 100644 --- a/packages/app/src/Pages/subscribe/SubscriptionCard.tsx +++ b/packages/app/src/Pages/subscribe/SubscriptionCard.tsx @@ -2,10 +2,10 @@ import { FormattedMessage, FormattedDate, FormattedNumber } from "react-intl"; import { Subscription } from "@/External/SnortApi"; import { mapPlanName } from "."; -import Icon from "@/Icons/Icon"; -import Nip5Service from "@/Element/Nip5Service"; +import Icon from "@/Components/Icons/Icon"; +import Nip5Service from "@/Components/Nip5Service"; import { SnortNostrAddressService } from "@/Pages/NostrAddressPage"; -import Nip05 from "@/Element/User/Nip05"; +import Nip05 from "@/Components/User/Nip05"; import { RenewSub } from "./RenewSub"; export default function SubscriptionCard({ sub }: { sub: Subscription }) { diff --git a/packages/app/src/Pages/subscribe/index.tsx b/packages/app/src/Pages/subscribe/index.tsx index 5db6bc08..a1066deb 100644 --- a/packages/app/src/Pages/subscribe/index.tsx +++ b/packages/app/src/Pages/subscribe/index.tsx @@ -4,15 +4,15 @@ import { useState } from "react"; import { FormattedMessage } from "react-intl"; import { RouteObject } from "react-router-dom"; -import { formatShort } from "@/Number"; -import { LockedFeatures, Plans, SubscriptionType } from "@/Subscription"; +import { formatShort } from "@/Utils/Number"; +import { LockedFeatures, Plans, SubscriptionType } from "@/Utils/Subscription"; import ManageSubscriptionPage from "@/Pages/subscribe/ManageSubscription"; -import AsyncButton from "@/Element/Button/AsyncButton"; +import AsyncButton from "@/Components/Button/AsyncButton"; import useEventPublisher from "@/Hooks/useEventPublisher"; import SnortApi, { SubscriptionError, SubscriptionErrorCode } from "@/External/SnortApi"; -import SendSats from "@/Element/SendSats"; +import SendSats from "@/Components/SendSats/SendSats"; import classNames from "classnames"; -import { getRefCode } from "@/SnortUtils"; +import { getRefCode } from "@/Utils"; export function mapPlanName(id: number) { switch (id) { diff --git a/packages/app/src/State/NoteCreator.tsx b/packages/app/src/State/NoteCreator.ts similarity index 98% rename from packages/app/src/State/NoteCreator.tsx rename to packages/app/src/State/NoteCreator.ts index 2208391d..dd0909a1 100644 --- a/packages/app/src/State/NoteCreator.tsx +++ b/packages/app/src/State/NoteCreator.ts @@ -1,6 +1,6 @@ import { ExternalStore } from "@snort/shared"; import { NostrEvent, TaggedNostrEvent } from "@snort/system"; -import { ZapTarget } from "@/Zapper"; +import { ZapTarget } from "@/Utils/Zapper"; import { useSyncExternalStoreWithSelector } from "use-sync-external-store/with-selector"; interface NoteCreatorDataSnapshot { diff --git a/packages/app/src/Const.ts b/packages/app/src/Utils/Const.ts similarity index 100% rename from packages/app/src/Const.ts rename to packages/app/src/Utils/Const.ts diff --git a/packages/app/src/Login/Functions.ts b/packages/app/src/Utils/Login/Functions.ts similarity index 96% rename from packages/app/src/Login/Functions.ts rename to packages/app/src/Utils/Login/Functions.ts index ccbdae89..5b285560 100644 --- a/packages/app/src/Login/Functions.ts +++ b/packages/app/src/Utils/Login/Functions.ts @@ -12,11 +12,11 @@ import { unixNowMs } from "@snort/shared"; import * as secp from "@noble/curves/secp256k1"; import * as utils from "@noble/curves/abstract/utils"; -import { Blasters } from "@/Const"; -import { LoginStore, UserPreferences, LoginSession, LoginSessionType, SnortAppData, Newest } from "@/Login"; -import { generateBip39Entropy, entropyToPrivateKey } from "@/nip6"; -import { bech32ToHex, dedupeById, deleteRefCode, getCountry, sanitizeRelayUrl, unwrap } from "@/SnortUtils"; -import { SubscriptionEvent } from "@/Subscription"; +import { Blasters } from "@/Utils/Const"; +import { LoginStore, UserPreferences, LoginSession, LoginSessionType, SnortAppData, Newest } from "@/Utils/Login/index"; +import { generateBip39Entropy, entropyToPrivateKey } from "@/Utils/nip6"; +import { bech32ToHex, dedupeById, deleteRefCode, getCountry, sanitizeRelayUrl, unwrap } from "@/Utils"; +import { SubscriptionEvent } from "@/Utils/Subscription"; import { Chats, FollowsFeed, GiftsCache, Notifications } from "@/Cache"; import { Nip7OsSigner } from "./Nip7OsSigner"; import SnortApi from "@/External/SnortApi"; diff --git a/packages/app/src/Login/LoginSession.ts b/packages/app/src/Utils/Login/LoginSession.ts similarity index 92% rename from packages/app/src/Login/LoginSession.ts rename to packages/app/src/Utils/Login/LoginSession.ts index 070893a7..6b0997ba 100644 --- a/packages/app/src/Login/LoginSession.ts +++ b/packages/app/src/Utils/Login/LoginSession.ts @@ -1,7 +1,7 @@ import { HexKey, RelaySettings, u256, KeyStorage } from "@snort/system"; -import { UserPreferences } from "@/Login"; -import { SubscriptionEvent } from "@/Subscription"; -import { DisplayAs } from "@/Element/Feed/DisplayAsSelector"; +import { UserPreferences } from "@/Utils/Login/index"; +import { SubscriptionEvent } from "@/Utils/Subscription"; +import { DisplayAs } from "@/Components/Feed/DisplayAsSelector"; /** * Stores latest copy of an item diff --git a/packages/app/src/Login/MultiAccountStore.ts b/packages/app/src/Utils/Login/MultiAccountStore.ts similarity index 99% rename from packages/app/src/Login/MultiAccountStore.ts rename to packages/app/src/Utils/Login/MultiAccountStore.ts index 8f24ba83..dcea7957 100644 --- a/packages/app/src/Login/MultiAccountStore.ts +++ b/packages/app/src/Utils/Login/MultiAccountStore.ts @@ -5,7 +5,7 @@ import { v4 as uuid } from "uuid"; import { HexKey, RelaySettings, EventPublisher, KeyStorage, NotEncrypted, socialGraphInstance } from "@snort/system"; import { deepClone, unwrap, ExternalStore } from "@snort/shared"; -import { LoginSession, LoginSessionType, createPublisher } from "@/Login"; +import { LoginSession, LoginSessionType, createPublisher } from "@/Utils/Login/index"; import { DefaultPreferences, UserPreferences } from "./Preferences"; const AccountStoreKey = "sessions"; diff --git a/packages/app/src/Login/Nip7OsSigner.ts b/packages/app/src/Utils/Login/Nip7OsSigner.ts similarity index 96% rename from packages/app/src/Login/Nip7OsSigner.ts rename to packages/app/src/Utils/Login/Nip7OsSigner.ts index fe0f821e..cfaae073 100644 --- a/packages/app/src/Login/Nip7OsSigner.ts +++ b/packages/app/src/Utils/Login/Nip7OsSigner.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ import { EventSigner, NostrEvent } from "@snort/system"; -import { Nip7os } from "@/Login"; +import { Nip7os } from "@/Utils/Login/index"; export class Nip7OsSigner implements EventSigner { #interface: Nip7os; diff --git a/packages/app/src/Login/Preferences.ts b/packages/app/src/Utils/Login/Preferences.ts similarity index 97% rename from packages/app/src/Login/Preferences.ts rename to packages/app/src/Utils/Login/Preferences.ts index 76024ed1..7e8d5d1f 100644 --- a/packages/app/src/Login/Preferences.ts +++ b/packages/app/src/Utils/Login/Preferences.ts @@ -1,4 +1,4 @@ -import { DefaultImgProxy } from "@/Const"; +import { DefaultImgProxy } from "@/Utils/Const"; import { ImgProxySettings } from "@/Hooks/useImgProxy"; export interface UserPreferences { diff --git a/packages/app/src/Login/index.ts b/packages/app/src/Utils/Login/index.ts similarity index 100% rename from packages/app/src/Login/index.ts rename to packages/app/src/Utils/Login/index.ts diff --git a/packages/app/src/Nip05/ServiceProvider.ts b/packages/app/src/Utils/Nip05/ServiceProvider.ts similarity index 100% rename from packages/app/src/Nip05/ServiceProvider.ts rename to packages/app/src/Utils/Nip05/ServiceProvider.ts diff --git a/packages/app/src/Nip05/SnortServiceProvider.ts b/packages/app/src/Utils/Nip05/SnortServiceProvider.ts similarity index 100% rename from packages/app/src/Nip05/SnortServiceProvider.ts rename to packages/app/src/Utils/Nip05/SnortServiceProvider.ts diff --git a/packages/app/src/Nip05/Verifier.ts b/packages/app/src/Utils/Nip05/Verifier.ts similarity index 100% rename from packages/app/src/Nip05/Verifier.ts rename to packages/app/src/Utils/Nip05/Verifier.ts diff --git a/packages/app/src/Notifications.ts b/packages/app/src/Utils/Notifications.ts similarity index 96% rename from packages/app/src/Notifications.ts rename to packages/app/src/Utils/Notifications.ts index 907f8a95..352facf7 100644 --- a/packages/app/src/Notifications.ts +++ b/packages/app/src/Utils/Notifications.ts @@ -1,8 +1,8 @@ import { TaggedNostrEvent, EventKind, MetadataCache, EventPublisher } from "@snort/system"; -import { MentionRegex } from "@/Const"; -import { defaultAvatar, tagFilterOfTextRepost, getDisplayName } from "@/SnortUtils"; +import { MentionRegex } from "@/Utils/Const"; +import { defaultAvatar, tagFilterOfTextRepost, getDisplayName } from "@/Utils/index"; import { UserCache } from "@/Cache"; -import { LoginSession } from "@/Login"; +import { LoginSession } from "@/Utils/Login"; import { removeUndefined, unwrap } from "@snort/shared"; import SnortApi from "@/External/SnortApi"; import { base64 } from "@scure/base"; diff --git a/packages/app/src/Number.ts b/packages/app/src/Utils/Number.ts similarity index 100% rename from packages/app/src/Number.ts rename to packages/app/src/Utils/Number.ts diff --git a/packages/app/src/Subscription/index.ts b/packages/app/src/Utils/Subscription/index.ts similarity index 100% rename from packages/app/src/Subscription/index.ts rename to packages/app/src/Utils/Subscription/index.ts diff --git a/packages/app/src/Upload/Nip96.ts b/packages/app/src/Utils/Upload/Nip96.ts similarity index 100% rename from packages/app/src/Upload/Nip96.ts rename to packages/app/src/Utils/Upload/Nip96.ts diff --git a/packages/app/src/Upload/NostrBuild.ts b/packages/app/src/Utils/Upload/NostrBuild.ts similarity index 97% rename from packages/app/src/Upload/NostrBuild.ts rename to packages/app/src/Utils/Upload/NostrBuild.ts index cd5cb115..0a872493 100644 --- a/packages/app/src/Upload/NostrBuild.ts +++ b/packages/app/src/Utils/Upload/NostrBuild.ts @@ -1,7 +1,7 @@ import { base64 } from "@scure/base"; import { throwIfOffline } from "@snort/shared"; import { EventKind, EventPublisher } from "@snort/system"; -import { UploadResult } from "@/Upload"; +import { UploadResult } from "@/Utils/Upload/index"; export default async function NostrBuild(file: File | Blob, publisher?: EventPublisher): Promise { const auth = publisher diff --git a/packages/app/src/Upload/NostrImg.ts b/packages/app/src/Utils/Upload/NostrImg.ts similarity index 94% rename from packages/app/src/Upload/NostrImg.ts rename to packages/app/src/Utils/Upload/NostrImg.ts index 1d8a3a55..8e87688f 100644 --- a/packages/app/src/Upload/NostrImg.ts +++ b/packages/app/src/Utils/Upload/NostrImg.ts @@ -1,5 +1,5 @@ import { throwIfOffline } from "@snort/shared"; -import { UploadResult } from "@/Upload"; +import { UploadResult } from "@/Utils/Upload/index"; export default async function NostrImg(file: File | Blob): Promise { throwIfOffline(); diff --git a/packages/app/src/Upload/VoidCat.ts b/packages/app/src/Utils/Upload/VoidCat.ts similarity index 96% rename from packages/app/src/Upload/VoidCat.ts rename to packages/app/src/Utils/Upload/VoidCat.ts index 606d7c75..2dbee1dd 100644 --- a/packages/app/src/Upload/VoidCat.ts +++ b/packages/app/src/Utils/Upload/VoidCat.ts @@ -1,8 +1,8 @@ import { EventKind, EventPublisher } from "@snort/system"; import { UploadState, VoidApi } from "@void-cat/api"; -import { FileExtensionRegex } from "@/Const"; -import { UploadResult } from "@/Upload"; +import { FileExtensionRegex } from "@/Utils/Const"; +import { UploadResult } from "@/Utils/Upload/index"; import { base64 } from "@scure/base"; import { throwIfOffline } from "@snort/shared"; diff --git a/packages/app/src/Upload/index.ts b/packages/app/src/Utils/Upload/index.ts similarity index 94% rename from packages/app/src/Upload/index.ts rename to packages/app/src/Utils/Upload/index.ts index 9bb8681e..f6a683c2 100644 --- a/packages/app/src/Upload/index.ts +++ b/packages/app/src/Utils/Upload/index.ts @@ -3,11 +3,11 @@ import useLogin from "@/Hooks/useLogin"; import { NostrEvent } from "@snort/system"; import { v4 as uuid } from "uuid"; -import NostrBuild from "@/Upload/NostrBuild"; -import VoidCat from "@/Upload/VoidCat"; -import NostrImg from "@/Upload/NostrImg"; -import { KieranPubKey } from "@/Const"; -import { bech32ToHex, unwrap } from "@/SnortUtils"; +import NostrBuild from "@/Utils/Upload/NostrBuild"; +import VoidCat from "@/Utils/Upload/VoidCat"; +import NostrImg from "@/Utils/Upload/NostrImg"; +import { KieranPubKey } from "@/Utils/Const"; +import { bech32ToHex, unwrap } from "@/Utils"; import useEventPublisher from "@/Hooks/useEventPublisher"; import { Nip96Uploader } from "./Nip96"; diff --git a/packages/app/src/SnortUtils/Utils.test.ts b/packages/app/src/Utils/Utils.test.ts similarity index 100% rename from packages/app/src/SnortUtils/Utils.test.ts rename to packages/app/src/Utils/Utils.test.ts diff --git a/packages/app/src/ZapPoolController.ts b/packages/app/src/Utils/ZapPoolController.ts similarity index 96% rename from packages/app/src/ZapPoolController.ts rename to packages/app/src/Utils/ZapPoolController.ts index f10e9a33..9827a74a 100644 --- a/packages/app/src/ZapPoolController.ts +++ b/packages/app/src/Utils/ZapPoolController.ts @@ -1,9 +1,9 @@ import { UserCache } from "@/Cache"; import { LNURL, ExternalStore, unixNow } from "@snort/shared"; -import { Toastore } from "@/Toaster"; +import { Toastore } from "@/Components/Toaster/Toaster"; import { LNWallet, WalletInvoiceState, Wallets } from "@/Wallet"; -import { bech32ToHex, getDisplayName, trackEvent } from "@/SnortUtils"; -import { SnortPubKey } from "@/Const"; +import { bech32ToHex, getDisplayName, trackEvent } from "@/Utils/index"; +import { SnortPubKey } from "@/Utils/Const"; export enum ZapPoolRecipientType { Generic = 0, diff --git a/packages/app/src/Zapper.ts b/packages/app/src/Utils/Zapper.ts similarity index 99% rename from packages/app/src/Zapper.ts rename to packages/app/src/Utils/Zapper.ts index b8e2349e..2ef5299c 100644 --- a/packages/app/src/Zapper.ts +++ b/packages/app/src/Utils/Zapper.ts @@ -1,6 +1,6 @@ import { LNURL, isHex } from "@snort/shared"; import { EventPublisher, NostrEvent, NostrLink, SystemInterface } from "@snort/system"; -import { generateRandomKey } from "@/Login"; +import { generateRandomKey } from "@/Utils/Login"; import { LNWallet, WalletInvoiceState } from "@/Wallet"; export interface ZapTarget { diff --git a/packages/app/src/emoji-search.ts b/packages/app/src/Utils/emoji-search.ts similarity index 100% rename from packages/app/src/emoji-search.ts rename to packages/app/src/Utils/emoji-search.ts diff --git a/packages/app/src/SnortUtils/index.ts b/packages/app/src/Utils/index.ts similarity index 99% rename from packages/app/src/SnortUtils/index.ts rename to packages/app/src/Utils/index.ts index f43f5202..e61b9e12 100644 --- a/packages/app/src/SnortUtils/index.ts +++ b/packages/app/src/Utils/index.ts @@ -1,5 +1,5 @@ import TZ from "../tz.json"; -import Nostrich from "../nostrich.webp"; +import Nostrich from "../img/nostrich.webp"; import * as secp from "@noble/curves/secp256k1"; import * as utils from "@noble/curves/abstract/utils"; import { sha256 as hash } from "@noble/hashes/sha256"; @@ -19,8 +19,8 @@ import { UserMetadata, } from "@snort/system"; import { isHex, isOffline } from "@snort/shared"; -import { Birthday, Day } from "@/Const"; -import AnimalName from "@/Element/User/AnimalName"; +import { Birthday, Day } from "@/Utils/Const"; +import AnimalName from "@/Components/User/AnimalName"; export const sha256 = (str: string | Uint8Array): u256 => { return utils.bytesToHex(hash(str)); diff --git a/packages/app/src/nip6.ts b/packages/app/src/Utils/nip6.ts similarity index 95% rename from packages/app/src/nip6.ts rename to packages/app/src/Utils/nip6.ts index ec56e216..ed8cfc71 100644 --- a/packages/app/src/nip6.ts +++ b/packages/app/src/Utils/nip6.ts @@ -3,7 +3,7 @@ import * as bip39 from "@scure/bip39"; import { wordlist } from "@scure/bip39/wordlists/english"; import { HDKey } from "@scure/bip32"; -import { DerivationPath } from "@/Const"; +import { DerivationPath } from "@/Utils/Const"; export function generateBip39Entropy(mnemonic?: string): Uint8Array { try { diff --git a/packages/app/src/wasm.ts b/packages/app/src/Utils/wasm.ts similarity index 88% rename from packages/app/src/wasm.ts rename to packages/app/src/Utils/wasm.ts index d1e612d2..9ba26c56 100644 --- a/packages/app/src/wasm.ts +++ b/packages/app/src/Utils/wasm.ts @@ -6,12 +6,12 @@ import { pow, schnorr_verify_event, default as wasmInit, -} from "@snort/system-wasm"; -import WasmPath from "@snort/system-wasm/pkg/system_wasm_bg.wasm"; +} from "../../../system-wasm/pkg/system_wasm"; +import WasmPath from "../../../system-wasm/pkg/system_wasm_bg.wasm"; import { FlatReqFilter, NostrEvent, Optimizer, PowMiner, PowWorker, ReqFilter } from "@snort/system"; import PowWorkerURL from "@snort/system/src/pow-worker.ts?worker&url"; -import { unwrap } from "@/SnortUtils"; +import { unwrap } from "@/Utils/index"; export const WasmOptimizer = { expandFilter: (f: ReqFilter) => { diff --git a/packages/app/src/Wallet/LNCWallet.ts b/packages/app/src/Wallet/LNCWallet.ts index 6f0184cc..13447f22 100644 --- a/packages/app/src/Wallet/LNCWallet.ts +++ b/packages/app/src/Wallet/LNCWallet.ts @@ -1,5 +1,5 @@ import LNC from "@lightninglabs/lnc-web"; -import { unwrap } from "@/SnortUtils"; +import { unwrap } from "@/Utils"; import { InvoiceRequest, LNWallet, diff --git a/packages/app/src/Wallet/index.ts b/packages/app/src/Wallet/index.ts index 8c0ebd9f..e383b45b 100644 --- a/packages/app/src/Wallet/index.ts +++ b/packages/app/src/Wallet/index.ts @@ -1,7 +1,7 @@ import { useEffect, useSyncExternalStore } from "react"; import { ExternalStore, decodeInvoice } from "@snort/shared"; -import { unwrap } from "@/SnortUtils"; +import { unwrap } from "@/Utils"; import LNDHubWallet from "./LNDHub"; import { NostrConnectWallet } from "./NostrWalletConnect"; import { WebLNWallet } from "./WebLN"; diff --git a/packages/app/src/chat/index.ts b/packages/app/src/chat/index.ts index c9be42ee..4895bf8c 100644 --- a/packages/app/src/chat/index.ts +++ b/packages/app/src/chat/index.ts @@ -15,12 +15,12 @@ import { } from "@snort/system"; import { unwrap, unixNow } from "@snort/shared"; import { Chats, GiftsCache } from "@/Cache"; -import { findTag } from "@/SnortUtils"; +import { findTag } from "@/Utils"; import { Nip29ChatSystem } from "./nip29"; import useModeration from "@/Hooks/useModeration"; import useLogin from "@/Hooks/useLogin"; import { Nip24ChatSystem } from "./nip24"; -import { LoginSession } from "@/Login"; +import { LoginSession } from "@/Utils/Login"; import { Nip28ChatSystem } from "./nip28"; export enum ChatType { diff --git a/packages/app/src/chat/nip24.ts b/packages/app/src/chat/nip24.ts index 9af579bd..651922c9 100644 --- a/packages/app/src/chat/nip24.ts +++ b/packages/app/src/chat/nip24.ts @@ -4,7 +4,7 @@ import { GiftWrapCache } from "@/Cache/GiftWrapCache"; import { UnwrappedGift } from "@/Db"; import { Chat, ChatSystem, ChatType, lastReadInChat } from "@/chat"; -import { GetPowWorker } from "@/wasm"; +import { GetPowWorker } from "@/Utils/wasm"; export class Nip24ChatSystem extends ExternalStore> implements ChatSystem { #cache: GiftWrapCache; diff --git a/packages/app/src/chat/nip28.ts b/packages/app/src/chat/nip28.ts index 0b244427..e47c37f3 100644 --- a/packages/app/src/chat/nip28.ts +++ b/packages/app/src/chat/nip28.ts @@ -13,8 +13,8 @@ import { encodeTLVEntries, } from "@snort/system"; -import { LoginSession } from "@/Login"; -import { findTag } from "@/SnortUtils"; +import { LoginSession } from "@/Utils/Login"; +import { findTag } from "@/Utils"; import { Chat, ChatParticipant, ChatSystem, ChatType, lastReadInChat } from "@/chat"; export class Nip28ChatSystem extends ExternalStore> implements ChatSystem { diff --git a/packages/app/src/chat/nip29.ts b/packages/app/src/chat/nip29.ts index e6726315..a2b90fd5 100644 --- a/packages/app/src/chat/nip29.ts +++ b/packages/app/src/chat/nip29.ts @@ -1,6 +1,6 @@ import { ExternalStore, FeedCache, dedupe, removeUndefined } from "@snort/shared"; import { RequestBuilder, NostrEvent, EventKind, SystemInterface, TaggedNostrEvent } from "@snort/system"; -import { LoginSession } from "@/Login"; +import { LoginSession } from "@/Utils/Login"; import { Chat, ChatSystem, ChatType, lastReadInChat } from "@/chat"; export class Nip29ChatSystem extends ExternalStore> implements ChatSystem { diff --git a/packages/app/src/chat/nip4.ts b/packages/app/src/chat/nip4.ts index 2bccbe3d..4087d0ee 100644 --- a/packages/app/src/chat/nip4.ts +++ b/packages/app/src/chat/nip4.ts @@ -10,7 +10,7 @@ import { TaggedNostrEvent, decodeTLV, } from "@snort/system"; -import { LoginSession } from "@/Login"; +import { LoginSession } from "@/Utils/Login"; import { Chat, ChatSystem, ChatType, inChatWith, lastReadInChat } from "@/chat"; import { debug } from "debug"; diff --git a/packages/app/src/cashu.png b/packages/app/src/img/cashu.png similarity index 100% rename from packages/app/src/cashu.png rename to packages/app/src/img/cashu.png diff --git a/packages/app/src/lnd-logo.png b/packages/app/src/img/lnd-logo.png similarity index 100% rename from packages/app/src/lnd-logo.png rename to packages/app/src/img/lnd-logo.png diff --git a/packages/app/src/nostrich.webp b/packages/app/src/img/nostrich.webp similarity index 100% rename from packages/app/src/nostrich.webp rename to packages/app/src/img/nostrich.webp diff --git a/packages/app/src/index.tsx b/packages/app/src/index.tsx index 5c1539ad..211eb7ad 100644 --- a/packages/app/src/index.tsx +++ b/packages/app/src/index.tsx @@ -10,7 +10,7 @@ import { SnortContext } from "@snort/system-react"; import * as serviceWorkerRegistration from "@/serviceWorkerRegistration"; import { IntlProvider } from "@/IntlProvider"; -import { getCountry, storeRefCode, unwrap } from "@/SnortUtils"; +import { getCountry, storeRefCode, unwrap } from "@/Utils"; import Layout from "@/Pages/Layout"; import ProfilePage from "@/Pages/Profile/ProfilePage"; import { RootRoutes, RootTabRoutes } from "@/Pages/Root"; @@ -23,12 +23,12 @@ import DonatePage from "@/Pages/DonatePage"; import SearchPage from "@/Pages/SearchPage"; import HelpPage from "@/Pages/HelpPage"; import NostrLinkHandler from "@/Pages/NostrLinkHandler"; -import { ThreadRoute } from "@/Element/Event/Thread"; +import { ThreadRoute } from "@/Components/Event/Thread"; import { SubscribeRoutes } from "@/Pages/subscribe"; import ZapPoolPage from "@/Pages/ZapPool"; import { db } from "@/Db"; import { preload } from "@/Cache"; -import { LoginStore } from "@/Login"; +import { LoginStore } from "@/Utils/Login"; import { SnortDeckLayout } from "@/Pages/DeckLayout"; import FreeNostrAddressPage from "@/Pages/FreeNostrAddressPage"; import { ListFeedPage } from "@/Pages/ListFeedPage"; @@ -39,7 +39,7 @@ import { setupWebLNWalletConfig } from "@/Wallet/WebLN"; import { Wallets } from "@/Wallet"; import NetworkGraph from "@/Pages/NetworkGraph"; import WalletPage from "./Pages/WalletPage"; -import { hasWasm, wasmInit, WasmPath } from "@/wasm"; +import { hasWasm, wasmInit, WasmPath } from "@/Utils/wasm"; import { System } from "@/system"; declare global { diff --git a/packages/app/src/service-worker.ts b/packages/app/src/service-worker.ts index 53679238..07ac53fb 100644 --- a/packages/app/src/service-worker.ts +++ b/packages/app/src/service-worker.ts @@ -4,8 +4,8 @@ declare const self: ServiceWorkerGlobalScope & { }; import { NostrLink, NostrPrefix, TLVEntryType, encodeTLVEntries, tryParseNostrLink } from "@snort/system"; -import { formatShort } from "@/Number"; -import { defaultAvatar, hexToBech32 } from "@/SnortUtils"; +import { formatShort } from "@/Utils/Number"; +import { defaultAvatar, hexToBech32 } from "@/Utils"; import { clientsClaim } from "workbox-core"; import { registerRoute } from "workbox-routing"; import { CacheFirst, StaleWhileRevalidate } from "workbox-strategies"; diff --git a/packages/app/src/system.ts b/packages/app/src/system.ts index 08770357..25a73448 100644 --- a/packages/app/src/system.ts +++ b/packages/app/src/system.ts @@ -8,12 +8,12 @@ import { TaggedNostrEvent, } from "@snort/system"; import { RelayMetrics, SystemDb, UserCache, UserRelays } from "@/Cache"; -import { hasWasm, WasmOptimizer } from "@/wasm"; +import { hasWasm, WasmOptimizer } from "@/Utils/wasm"; import * as Comlink from "comlink"; -import IndexedDBWorker from "@/Cache/IndexedDB?worker"; +import IndexedDBWorker from "@/Db/IndexedDB?worker"; import { removeUndefined, throwIfOffline } from "@snort/shared"; -import { LoginStore } from "@/Login"; -import { addEventToFuzzySearch } from "@/FuzzySearch"; +import { LoginStore } from "@/Utils/Login"; +import { addEventToFuzzySearch } from "@/Db/FuzzySearch"; export const indexedDB = Comlink.wrap(new IndexedDBWorker()); /**