From ed65bc059e63c93afa31cf4d84edc9782230c4d8 Mon Sep 17 00:00:00 2001 From: Derick M <58572875+TurtIeSocks@users.noreply.github.com> Date: Sun, 3 Mar 2024 15:45:53 -0500 Subject: [PATCH] fix: some clipped imports --- src/App.jsx | 2 +- src/components/ErrorBoundary.jsx | 3 +-- .../builder/components/CustomTile.jsx | 1 - src/features/drawer/Extras.jsx | 2 +- src/features/drawer/SelectorList.jsx | 1 - src/features/pokestop/usePokestopMarker.js | 3 +-- src/features/webhooks/Tracked.jsx | 2 +- .../webhooks/human/area/AreaSelection.jsx | 4 ++-- .../webhooks/{Webhook.jsx => index.jsx} | 0 src/pages/map/components/Nav.jsx | 20 +++++++++---------- 10 files changed, 17 insertions(+), 21 deletions(-) rename src/features/webhooks/{Webhook.jsx => index.jsx} (100%) diff --git a/src/App.jsx b/src/App.jsx index 2691adf86..faaff8db4 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -6,7 +6,7 @@ import 'leaflet/dist/leaflet.css' import * as React from 'react' import { BrowserRouter } from 'react-router-dom' import CssBaseline from '@mui/material/CssBaseline' -import { ThemeProvider } from '@mui/material/styles' +import ThemeProvider from '@mui/material/styles/ThemeProvider' import { ApolloProvider } from '@apollo/client' import useCustomTheme from '@assets/theme' diff --git a/src/components/ErrorBoundary.jsx b/src/components/ErrorBoundary.jsx index 11675262c..9a82cff88 100644 --- a/src/components/ErrorBoundary.jsx +++ b/src/components/ErrorBoundary.jsx @@ -1,6 +1,5 @@ -/* eslint-disable no-bitwise */ // @ts-check -/* eslint-disable no-console */ +/* eslint-disable no-bitwise */ /* eslint-disable react/destructuring-assignment */ import * as React from 'react' import Grid from '@mui/material/Grid' diff --git a/src/features/builder/components/CustomTile.jsx b/src/features/builder/components/CustomTile.jsx index 3c5d2cf94..99349c7bb 100644 --- a/src/features/builder/components/CustomTile.jsx +++ b/src/features/builder/components/CustomTile.jsx @@ -1,5 +1,4 @@ // @ts-check -/* eslint-disable react/jsx-props-no-spreading */ import * as React from 'react' import Grid from '@mui/material/Unstable_Grid2' diff --git a/src/features/drawer/Extras.jsx b/src/features/drawer/Extras.jsx index 0bb390866..022ba083d 100644 --- a/src/features/drawer/Extras.jsx +++ b/src/features/drawer/Extras.jsx @@ -1,6 +1,6 @@ +// @ts-check /* eslint-disable no-fallthrough */ /* eslint-disable default-case */ -// @ts-check import * as React from 'react' import Box from '@mui/material/Box' import ListItem from '@mui/material/ListItem' diff --git a/src/features/drawer/SelectorList.jsx b/src/features/drawer/SelectorList.jsx index 1de5252fa..708d73be2 100644 --- a/src/features/drawer/SelectorList.jsx +++ b/src/features/drawer/SelectorList.jsx @@ -1,4 +1,3 @@ -/* eslint-disable no-fallthrough */ // @ts-check import * as React from 'react' import TuneIcon from '@mui/icons-material/Tune' diff --git a/src/features/pokestop/usePokestopMarker.js b/src/features/pokestop/usePokestopMarker.js index 4154f5acf..e9ca643ce 100644 --- a/src/features/pokestop/usePokestopMarker.js +++ b/src/features/pokestop/usePokestopMarker.js @@ -1,5 +1,4 @@ // @ts-check -/* eslint-disable no-nested-ternary */ import { divIcon } from 'leaflet' import { basicEqualFn, useMemory } from '@hooks/useMemory' import { useStorage } from '@hooks/useStorage' @@ -42,7 +41,7 @@ export function usePokestopMarker({ hasInvasion, hasQuest && userSettings.pokestops.hasQuestIndicator, ar_scan_eligible && - (userSettings.pokestops.showArBadge || power_up_level), + (userSettings.pokestops.showArBadge || !!power_up_level), power_up_level, hasEvent ? Math.max(...events.map((event) => event.display_type)).toString() diff --git a/src/features/webhooks/Tracked.jsx b/src/features/webhooks/Tracked.jsx index 983447222..09034f9d4 100644 --- a/src/features/webhooks/Tracked.jsx +++ b/src/features/webhooks/Tracked.jsx @@ -1,5 +1,5 @@ -/* eslint-disable react/no-unstable-nested-components */ // @ts-check +/* eslint-disable react/no-unstable-nested-components */ import * as React from 'react' import { useTranslation } from 'react-i18next' import { Virtuoso } from 'react-virtuoso' diff --git a/src/features/webhooks/human/area/AreaSelection.jsx b/src/features/webhooks/human/area/AreaSelection.jsx index a9cd8bffc..9fea47b8e 100644 --- a/src/features/webhooks/human/area/AreaSelection.jsx +++ b/src/features/webhooks/human/area/AreaSelection.jsx @@ -3,9 +3,9 @@ import * as React from 'react' import { useQuery } from '@apollo/client' import { useTranslation } from 'react-i18next' +import { ScanAreaTile } from '@features/scanArea' import { WEBHOOK_GEOJSON } from '@services/queries/webhook' import { Loading } from '@components/Loading' -import MemoScanArea from '@features/scanArea/ScanAreaTile' import { useWebhookStore } from '../../store' @@ -36,7 +36,7 @@ export default function WebhookAreaSelection() { return {t('loading', { category: t('areas') })} } if (webhookMode === 'areas' && data?.webhookGeojson) { - return + return } return null } diff --git a/src/features/webhooks/Webhook.jsx b/src/features/webhooks/index.jsx similarity index 100% rename from src/features/webhooks/Webhook.jsx rename to src/features/webhooks/index.jsx diff --git a/src/pages/map/components/Nav.jsx b/src/pages/map/components/Nav.jsx index 49f6325f6..12ffb2f8b 100644 --- a/src/pages/map/components/Nav.jsx +++ b/src/pages/map/components/Nav.jsx @@ -1,27 +1,27 @@ +// @ts-check import * as React from 'react' -import { useMemory } from '@hooks/useMemory' - -import Drawer from '@features/drawer' -import FilterMenu from '@components/dialogs/filters/FilterMenu' -import UserOptions from '@components/dialogs/UserOptions' import Tutorial from '@features/tutorial' import UserProfile from '@features/profile' +import Drawer from '@features/drawer' import Search from '@features/search' -import MessageOfTheDay from '@features/builder/Motd' -import DonorPage from '@features/builder/DonorPage' +import Webhook from '@features/webhooks' +import { DonorPage, MessageOfTheDay } from '@features/builder' +import ScanDialog from '@features/scanner/ScanDialog' +import { WebhookNotification } from '@features/webhooks/Notification' import Feedback from '@components/dialogs/Feedback' +import FilterMenu from '@components/dialogs/filters/FilterMenu' +import UserOptions from '@components/dialogs/UserOptions' import ResetFilters from '@components/dialogs/ResetFilters' -import ScanDialog from '@features/scanner/ScanDialog' -import Webhook from '@features/webhooks/Webhook' import ClientError from '@components/dialogs/ClientError' -import { WebhookNotification } from '@features/webhooks/Notification' import AdvancedFilter from '@components/dialogs/filters/Advanced' import BadgeSelection from '@components/dialogs/BadgeSelection' import WebhookAdvanced from '@features/webhooks/WebhookAdv' import SlotSelection from '@components/dialogs/filters/SlotSelection' import { HelpDialog } from '@components/dialogs/Help' import { PkmnFilterHelp } from '@components/dialogs/filters/PkmnFilterHelp' +import { useMemory } from '@hooks/useMemory' + import { FloatingButtonsMemo } from './FloatingBtn' export const Nav = React.memo(