From dcfc9517974c8db41143221c9955ff7e621394fc Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Wed, 3 Apr 2024 17:16:37 +0800 Subject: [PATCH] revert import order change --- .../templates/navMenu/LibraryLegacyMenu.tsx | 30 ++++++------ .../templates/navMenu/LibraryMenu.tsx | 48 +++++++++---------- packages/web/pages/settings/shortcuts.tsx | 48 +++++++++++-------- 3 files changed, 67 insertions(+), 59 deletions(-) diff --git a/packages/web/components/templates/navMenu/LibraryLegacyMenu.tsx b/packages/web/components/templates/navMenu/LibraryLegacyMenu.tsx index 58bf59f03..8590c3578 100644 --- a/packages/web/components/templates/navMenu/LibraryLegacyMenu.tsx +++ b/packages/web/components/templates/navMenu/LibraryLegacyMenu.tsx @@ -1,26 +1,26 @@ -import { useRegisterActions } from 'kbar' -import Link from 'next/link' -import { Circle, X } from 'phosphor-react' import { ReactNode, useEffect, useMemo, useRef } from 'react' -import { usePersistedState } from '../../../lib/hooks/usePersistedState' -import { Label } from '../../../lib/networking/fragments/labelFragment' -import { SavedSearch } from '../../../lib/networking/fragments/savedSearchFragment' -import { useGetLabelsQuery } from '../../../lib/networking/queries/useGetLabelsQuery' -import { useGetSavedSearchQuery } from '../../../lib/networking/queries/useGetSavedSearchQuery' +import { StyledText } from '../../elements/StyledText' +import { Box, HStack, SpanBox, VStack } from '../../elements/LayoutPrimitives' +import { Button } from '../../elements/Button' +import { Circle, NewspaperClipping, X } from 'phosphor-react' import { Subscription, SubscriptionType, useGetSubscriptionsQuery, } from '../../../lib/networking/queries/useGetSubscriptionsQuery' -import { escapeQuotes } from '../../../utils/helper' -import { Button } from '../../elements/Button' -import { ToggleCaretDownIcon } from '../../elements/icons/ToggleCaretDownIcon' -import { ToggleCaretRightIcon } from '../../elements/icons/ToggleCaretRightIcon' -import { Box, HStack, SpanBox, VStack } from '../../elements/LayoutPrimitives' -import { LogoBox } from '../../elements/LogoBox' -import { StyledText } from '../../elements/StyledText' +import { useGetLabelsQuery } from '../../../lib/networking/queries/useGetLabelsQuery' +import { Label } from '../../../lib/networking/fragments/labelFragment' import { theme } from '../../tokens/stitches.config' +import { useRegisterActions } from 'kbar' +import { LogoBox } from '../../elements/LogoBox' +import { usePersistedState } from '../../../lib/hooks/usePersistedState' +import { useGetSavedSearchQuery } from '../../../lib/networking/queries/useGetSavedSearchQuery' +import { SavedSearch } from '../../../lib/networking/fragments/savedSearchFragment' +import { ToggleCaretDownIcon } from '../../elements/icons/ToggleCaretDownIcon' +import Link from 'next/link' +import { ToggleCaretRightIcon } from '../../elements/icons/ToggleCaretRightIcon' import { NavMenuFooter } from './Footer' +import { escapeQuotes } from '../../../utils/helper' export const LIBRARY_LEFT_MENU_WIDTH = '275px' diff --git a/packages/web/components/templates/navMenu/LibraryMenu.tsx b/packages/web/components/templates/navMenu/LibraryMenu.tsx index 165a257ad..a2c5cbb05 100644 --- a/packages/web/components/templates/navMenu/LibraryMenu.tsx +++ b/packages/web/components/templates/navMenu/LibraryMenu.tsx @@ -1,37 +1,37 @@ -import { useRegisterActions } from 'kbar' -import Link from 'next/link' -import { useRouter } from 'next/router' +import { ReactNode, useEffect, useMemo, useRef, useState } from "react" +import { StyledText } from '../../elements/StyledText' +import { Box, HStack, SpanBox, VStack } from '../../elements/LayoutPrimitives' +import { Button } from '../../elements/Button' import { Circle, DotsThree, MagnifyingGlass, X } from 'phosphor-react' -import { ReactNode, useEffect, useMemo, useRef, useState } from 'react' -import { usePersistedState } from '../../../lib/hooks/usePersistedState' -import { Label } from '../../../lib/networking/fragments/labelFragment' -import { SavedSearch } from '../../../lib/networking/fragments/savedSearchFragment' -import { useGetLabelsQuery } from '../../../lib/networking/queries/useGetLabelsQuery' -import { useGetSavedSearchQuery } from '../../../lib/networking/queries/useGetSavedSearchQuery' import { Subscription, SubscriptionType, useGetSubscriptionsQuery, } from '../../../lib/networking/queries/useGetSubscriptionsQuery' -import { Shortcut } from '../../../pages/settings/shortcuts' -import { escapeQuotes } from '../../../utils/helper' -import { Button } from '../../elements/Button' -import { CoverImage } from '../../elements/CoverImage' -import { Dropdown, DropdownOption } from '../../elements/DropdownElements' -import { DiscoverIcon } from '../../elements/icons/DiscoverIcon' +import { useGetLabelsQuery } from '../../../lib/networking/queries/useGetLabelsQuery' +import { Label } from '../../../lib/networking/fragments/labelFragment' +import { theme } from '../../tokens/stitches.config' +import { useRegisterActions } from 'kbar' +import { LogoBox } from '../../elements/LogoBox' +import { usePersistedState } from '../../../lib/hooks/usePersistedState' +import { useGetSavedSearchQuery } from '../../../lib/networking/queries/useGetSavedSearchQuery' +import { SavedSearch } from '../../../lib/networking/fragments/savedSearchFragment' +import { ToggleCaretDownIcon } from '../../elements/icons/ToggleCaretDownIcon' +import Link from 'next/link' +import { ToggleCaretRightIcon } from '../../elements/icons/ToggleCaretRightIcon' +import { NavMenuFooter } from './Footer' import { FollowingIcon } from '../../elements/icons/FollowingIcon' -import { HighlightsIcon } from '../../elements/icons/HighlightsIcon' import { HomeIcon } from '../../elements/icons/HomeIcon' import { LibraryIcon } from '../../elements/icons/LibraryIcon' -import { NewsletterIcon } from '../../elements/icons/NewsletterIcon' -import { ToggleCaretDownIcon } from '../../elements/icons/ToggleCaretDownIcon' -import { ToggleCaretRightIcon } from '../../elements/icons/ToggleCaretRightIcon' -import { Box, HStack, SpanBox, VStack } from '../../elements/LayoutPrimitives' -import { LogoBox } from '../../elements/LogoBox' +import { HighlightsIcon } from '../../elements/icons/HighlightsIcon' +import { CoverImage } from '../../elements/CoverImage' +import { Shortcut } from '../../../pages/settings/shortcuts' import { OutlinedLabelChip } from '../../elements/OutlinedLabelChip' -import { StyledText } from '../../elements/StyledText' -import { theme } from '../../tokens/stitches.config' -import { NavMenuFooter } from './Footer' +import { NewsletterIcon } from '../../elements/icons/NewsletterIcon' +import { Dropdown, DropdownOption } from '../../elements/DropdownElements' +import { useRouter } from 'next/router' +import { DiscoverIcon } from "../../elements/icons/DiscoverIcon" +import { escapeQuotes } from "../../../utils/helper" export const LIBRARY_LEFT_MENU_WIDTH = '275px' diff --git a/packages/web/pages/settings/shortcuts.tsx b/packages/web/pages/settings/shortcuts.tsx index 09355ee2b..f9fddfec2 100644 --- a/packages/web/pages/settings/shortcuts.tsx +++ b/packages/web/pages/settings/shortcuts.tsx @@ -1,31 +1,39 @@ -import { styled } from '@stitches/react' -import { CheckSquare, Square } from 'phosphor-react' -import { ReactNode, useCallback, useEffect, useMemo, useReducer } from 'react' -import { Toaster } from 'react-hot-toast' -import { Button } from '../../components/elements/Button' -import { CoverImage } from '../../components/elements/CoverImage' -import { DragIcon } from '../../components/elements/icons/DragIcon' -import { LabelChip } from '../../components/elements/LabelChip' import { - Box, - HStack, - Separator, - SpanBox, - VStack, -} from '../../components/elements/LayoutPrimitives' -import { StyledText } from '../../components/elements/StyledText' -import { SettingsLayout } from '../../components/templates/SettingsLayout' -import { usePersistedState } from '../../lib/hooks/usePersistedState' -import { Label } from '../../lib/networking/fragments/labelFragment' -import { SavedSearch } from '../../lib/networking/fragments/savedSearchFragment' + ReactNode, + useCallback, + useEffect, + useMemo, + useReducer, + useState, +} from 'react' +import { applyStoredTheme } from '../../lib/themeUpdater' + import { useGetLabelsQuery } from '../../lib/networking/queries/useGetLabelsQuery' import { useGetSavedSearchQuery } from '../../lib/networking/queries/useGetSavedSearchQuery' +import { SettingsLayout } from '../../components/templates/SettingsLayout' +import { Toaster } from 'react-hot-toast' +import { + Box, + VStack, + HStack, + 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 { applyStoredTheme } from '../../lib/themeUpdater' +import { DragIcon } from '../../components/elements/icons/DragIcon' +import { CoverImage } from '../../components/elements/CoverImage' +import { Label } from '../../lib/networking/fragments/labelFragment' +import { usePersistedState } from '../../lib/hooks/usePersistedState' +import { CheckSquare, Square } from 'phosphor-react' +import { Button } from '../../components/elements/Button' +import { styled } from '@stitches/react' +import { SavedSearch } from '../../lib/networking/fragments/savedSearchFragment' import { escapeQuotes } from '../../utils/helper' type ListAction = 'RESET' | 'ADD_ITEM' | 'REMOVE_ITEM'