diff --git a/packages/web/components/nav-containers/HomeContainer.tsx b/packages/web/components/nav-containers/HomeContainer.tsx index bf4c111d1..c5cbbabc5 100644 --- a/packages/web/components/nav-containers/HomeContainer.tsx +++ b/packages/web/components/nav-containers/HomeContainer.tsx @@ -33,7 +33,6 @@ import { useGetSubscriptionsQuery, } from '../../lib/networking/queries/useGetSubscriptionsQuery' import { Box, HStack, SpanBox, VStack } from '../elements/LayoutPrimitives' -import { Toaster } from 'react-hot-toast' import useLibraryItemActions from '../../lib/hooks/useLibraryItemActions' import { SyncLoader } from 'react-spinners' import { useGetLibraryItems } from '../../lib/networking/library_items/useLibraryItems' @@ -423,7 +422,6 @@ export function HomeContainer(): JSX.Element { }, }} > - void | Promise -} - -export const OnboardingLayout = ({ - pageNumber, - title, - subTitle, - description, - image, - children, - nextPage, - reduceSpace, - onNext, -}: OnboardingLayoutProps) => { - const router = useRouter() - - const NextButton = () => { - const handleNext = async () => { - onNext && (await onNext()) - router.push(nextPage ?? `/onboarding/0${pageNumber + 1}`) - } - - return ( - - ) - } - - return ( - <> - - - - - - - - - - Omnivore - - - - {title} - - - {subTitle} - - {image && ( - - {image} - - )} - - - - - - - - {description && ( - - {description} - - )} - {children} - - - - - - - - ) -} diff --git a/packages/web/components/templates/discoverFeed/DiscoverFeed/DiscoverFeed.tsx b/packages/web/components/templates/discoverFeed/DiscoverFeed/DiscoverFeed.tsx index 0d2844d3b..04c3222de 100644 --- a/packages/web/components/templates/discoverFeed/DiscoverFeed/DiscoverFeed.tsx +++ b/packages/web/components/templates/discoverFeed/DiscoverFeed/DiscoverFeed.tsx @@ -1,13 +1,12 @@ -import { HStack, VStack } from "../../../elements/LayoutPrimitives" -import { Toaster } from 'react-hot-toast' +import { HStack, VStack } from '../../../elements/LayoutPrimitives' import { LayoutType } from '../../homeFeed/HomeFeedContainer' import { UserBasicData } from '../../../../lib/networking/queries/useGetViewerQuery' import { DiscoverItems } from '../DiscoverItems/DiscoverItems' -import { SaveDiscoverArticleOutput } from "../../../../lib/networking/mutations/saveDiscoverArticle" -import { HeaderText } from "../DiscoverHeader/HeaderText" -import React from "react" -import { TopicTabData } from "../DiscoverContainer" -import { DiscoverFeedItem } from "../../../../lib/networking/queries/useGetDiscoverFeedItems" +import { SaveDiscoverArticleOutput } from '../../../../lib/networking/mutations/saveDiscoverArticle' +import { HeaderText } from '../DiscoverHeader/HeaderText' +import React from 'react' +import { TopicTabData } from '../DiscoverContainer' +import { DiscoverFeedItem } from '../../../../lib/networking/queries/useGetDiscoverFeedItems' type DiscoverItemFeedProps = { items: DiscoverFeedItem[] @@ -33,7 +32,6 @@ export const DiscoverItemFeed = (props: DiscoverItemFeedProps) => { minHeight: '100vh', }} > - - - - { export const SettingsTable = (props: SettingsTableProps): JSX.Element => { return ( - - - + -
diff --git a/packages/web/pages/settings/account.tsx b/packages/web/pages/settings/account.tsx index 40d215c91..a863a1543 100644 --- a/packages/web/pages/settings/account.tsx +++ b/packages/web/pages/settings/account.tsx @@ -1,5 +1,4 @@ import { useCallback, useEffect, useMemo, useState } from 'react' -import { Toaster } from 'react-hot-toast' import { Button } from '../../components/elements/Button' import { Box, @@ -224,12 +223,6 @@ export default function Account(): JSX.Element { return ( - - - - - - -
Integrations diff --git a/packages/web/pages/settings/labels.tsx b/packages/web/pages/settings/labels.tsx index 149673484..83e006e13 100644 --- a/packages/web/pages/settings/labels.tsx +++ b/packages/web/pages/settings/labels.tsx @@ -8,7 +8,6 @@ import { HStack, VStack, } from '../../components/elements/LayoutPrimitives' -import { Toaster } from 'react-hot-toast' import { applyStoredTheme, isDarkTheme } from '../../lib/themeUpdater' import { showErrorToast, showSuccessToast } from '../../lib/toastHelpers' import { Label, LabelColor } from '../../lib/networking/fragments/labelFragment' @@ -156,9 +155,8 @@ export default function LabelsPage(): JSX.Element { const [descriptionInputText, setDescriptionInputText] = useState('') const [isCreateMode, setIsCreateMode] = useState(false) const [windowWidth, setWindowWidth] = useState(0) - const [confirmRemoveLabelId, setConfirmRemoveLabelId] = useState< - string | null - >(null) + const [confirmRemoveLabelId, setConfirmRemoveLabelId] = + useState(null) const [showLabelPageHelp, setShowLabelPageHelp] = usePersistedState({ key: `--settings-labels-show-help`, initialValue: true, @@ -262,11 +260,6 @@ export default function LabelsPage(): JSX.Element { return ( - - { } } - const [actionType, setActionType] = useState( - undefined - ) + const [actionType, setActionType] = + useState(undefined) return ( ( - undefined - ) + const [createActionRule, setCreateActionRule] = + useState(undefined) const dataSource = useMemo(() => { return rules.map((rule: Rule) => { @@ -435,12 +432,6 @@ export default function Rules(): JSX.Element { return ( - - (null) const [isCreateMode, setIsCreateMode] = useState(false) const [windowWidth, setWindowWidth] = useState(0) - const [confirmRemoveSavedSearchId, setConfirmRemoveSavedSearchId] = useState< - string | null - >(null) + const [confirmRemoveSavedSearchId, setConfirmRemoveSavedSearchId] = + useState(null) const [draggedElementId, setDraggedElementId] = useState(null) - const [draggedElementPosition, setDraggedElementPosition] = useState<{ - x: number - y: number - } | null>(null) + const [draggedElementPosition, setDraggedElementPosition] = + useState<{ + x: number + y: number + } | null>(null) const [sortedSavedSearch, setSortedSavedSearch] = useState([]) // Some theming stuff here. @@ -330,11 +329,6 @@ export default function SavedSearchesPage(): JSX.Element { return ( - - >(DEFAULT_STYLE) + const [style, setStyle] = + useState< + Partial<{ + position: string | null + top: string + left: string + maxWidth: string + }> + >(DEFAULT_STYLE) const handleEdit = () => { editingId && updateSavedSearch(editingId) setEditingId(null) diff --git a/packages/web/pages/settings/shortcuts.tsx b/packages/web/pages/settings/shortcuts.tsx index cc1b14569..11835475c 100644 --- a/packages/web/pages/settings/shortcuts.tsx +++ b/packages/web/pages/settings/shortcuts.tsx @@ -7,12 +7,7 @@ import { useRef, useState, } from 'react' -import { applyStoredTheme } from '../../lib/themeUpdater' - import { SettingsLayout } from '../../components/templates/SettingsLayout' -import { NavigationLayout } from '../../components/templates/NavigationLayout' - -import { Toaster } from 'react-hot-toast' import { Box, VStack, @@ -20,36 +15,24 @@ import { SpanBox, Separator, } from '../../components/elements/LayoutPrimitives' -import { LabelChip } from '../../components/elements/LabelChip' import { StyledText } from '../../components/elements/StyledText' -import { - Subscription, - SubscriptionType, - useGetSubscriptionsQuery, -} from '../../lib/networking/queries/useGetSubscriptionsQuery' -import { DragIcon } from '../../components/elements/icons/DragIcon' +import { SubscriptionType } from '../../lib/networking/queries/useGetSubscriptionsQuery' import { CoverImage } from '../../components/elements/CoverImage' import { Label } from '../../lib/networking/fragments/labelFragment' -import { usePersistedState } from '../../lib/hooks/usePersistedState' -import { CheckSquare, Square, Tag } from '@phosphor-icons/react' -import { Button } from '../../components/elements/Button' -import { styled } from '@stitches/react' -import { SavedSearch } from '../../lib/networking/fragments/savedSearchFragment' -import { escapeQuotes } from '../../utils/helper' import { useGetLabels } from '../../lib/networking/labels/useLabels' import { useGetSavedSearches } from '../../lib/networking/savedsearches/useSavedSearches' import { Shortcut, ShortcutType, useGetShortcuts, - useResetShortcuts, useSetShortcuts, } from '../../lib/networking/shortcuts/useShortcuts' import * as Switch from '@radix-ui/react-switch' import { useGetSubscriptions } from '../../lib/networking/subscriptions/useGetSubscriptions' import { NewsletterIcon } from '../../components/elements/icons/NewsletterIcon' import { FollowingIcon } from '../../components/elements/icons/FollowingIcon' -import { LIBRARY_LEFT_MENU_WIDTH } from '../../components/templates/navMenu/NavigationMenu' +import { escapeQuotes } from '../../utils/helper' +import { Tag } from '@phosphor-icons/react' function flattenShortcuts(shortcuts: Shortcut[]): string[] { let result: string[] = [] diff --git a/packages/web/pages/settings/webhooks.tsx b/packages/web/pages/settings/webhooks.tsx index 6a27518be..75b92d4ef 100644 --- a/packages/web/pages/settings/webhooks.tsx +++ b/packages/web/pages/settings/webhooks.tsx @@ -1,5 +1,4 @@ import { SettingsLayout } from '../../components/templates/SettingsLayout' -import { Toaster } from 'react-hot-toast' import { VStack } from '../../components/elements/LayoutPrimitives' import Link from 'next/link' import { StyledText } from '../../components/elements/StyledText' @@ -7,11 +6,6 @@ import { StyledText } from '../../components/elements/StyledText' export default function Webhooks(): JSX.Element { return ( - - -const Template = ({ showToast, position }: { showToast: () => void; position?: ToastPosition }) => ( -
- -
- -
-
-) - -export const SuccessSnackbar: ComponentStory = (args: any) => { - return ( -