From 36662050ff28d6965893fb3b149d77daddaae46c Mon Sep 17 00:00:00 2001 From: Luke <39926192+LukeWasTakenn@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:32:04 +0100 Subject: [PATCH] chore: optimize imports --- package/client/resource/interface/textui.ts | 2 +- web/src/features/dev/index.tsx | 3 +-- web/src/features/dialog/AlertDialog.tsx | 2 +- web/src/features/dialog/InputDialog.tsx | 4 ++-- web/src/features/dialog/components/fields/color.tsx | 1 - web/src/features/dialog/components/fields/date.tsx | 1 - web/src/features/dialog/components/fields/input.tsx | 1 - web/src/features/dialog/components/fields/number.tsx | 1 - web/src/features/dialog/components/fields/select.tsx | 1 - web/src/features/menu/context/ContextMenu.tsx | 2 +- .../features/menu/context/components/ContextButton.tsx | 4 ++-- web/src/features/menu/context/components/HeaderButton.tsx | 1 - web/src/features/menu/list/CustomCheckbox.tsx | 2 +- web/src/features/menu/list/ListItem.tsx | 3 +-- web/src/features/menu/list/index.tsx | 3 +-- web/src/features/menu/radial/index.tsx | 1 - web/src/features/notifications/NotificationWrapper.tsx | 3 +-- web/src/features/progress/CircleProgressbar.tsx | 8 ++++---- web/src/features/progress/Progressbar.tsx | 2 +- web/src/features/skillcheck/index.tsx | 2 +- web/src/features/textui/TextUI.tsx | 3 +-- web/vite.config.ts | 1 + 22 files changed, 20 insertions(+), 31 deletions(-) diff --git a/package/client/resource/interface/textui.ts b/package/client/resource/interface/textui.ts index 84c66a9..8d76281 100644 --- a/package/client/resource/interface/textui.ts +++ b/package/client/resource/interface/textui.ts @@ -1,4 +1,4 @@ -import { IconLookup, IconName, IconPrefix } from '@fortawesome/fontawesome-common-types'; +import { IconName, IconPrefix } from '@fortawesome/fontawesome-common-types'; import { CSSProperties } from 'react'; type IconAnimation = 'spin' | 'spinPulse' | 'spinReverse' | 'pulse' | 'beat' | 'fade' | 'beatFade' | 'bounce' | 'shake'; diff --git a/web/src/features/dev/index.tsx b/web/src/features/dev/index.tsx index c6b5bfb..7cfc0a5 100644 --- a/web/src/features/dev/index.tsx +++ b/web/src/features/dev/index.tsx @@ -1,5 +1,4 @@ -import { ActionIcon, Tooltip, Drawer, Stack, Divider, Button } from '@mantine/core'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import { ActionIcon, Button, Divider, Drawer, Stack, Tooltip } from '@mantine/core'; import { debugAlert } from './debug/alert'; import { debugContext } from './debug/context'; import { debugInput } from './debug/input'; diff --git a/web/src/features/dialog/AlertDialog.tsx b/web/src/features/dialog/AlertDialog.tsx index affc774..2034d14 100644 --- a/web/src/features/dialog/AlertDialog.tsx +++ b/web/src/features/dialog/AlertDialog.tsx @@ -1,4 +1,4 @@ -import { Modal, Button, Stack, Group, useMantineTheme, createStyles } from '@mantine/core'; +import { Button, createStyles, Group, Modal, Stack, useMantineTheme } from '@mantine/core'; import { useState } from 'react'; import ReactMarkdown from 'react-markdown'; import { useNuiEvent } from '../../hooks/useNuiEvent'; diff --git a/web/src/features/dialog/InputDialog.tsx b/web/src/features/dialog/InputDialog.tsx index 7a7a54f..565e6df 100644 --- a/web/src/features/dialog/InputDialog.tsx +++ b/web/src/features/dialog/InputDialog.tsx @@ -1,8 +1,9 @@ -import { Group, Modal, Button, Stack } from '@mantine/core'; +import { Button, Group, Modal, Stack } from '@mantine/core'; import React from 'react'; import { useNuiEvent } from '../../hooks/useNuiEvent'; import { useLocales } from '../../providers/LocaleProvider'; import { fetchNui } from '../../utils/fetchNui'; +import type { InputProps } from '../../typings'; import { OptionValue } from '../../typings'; import InputField from './components/fields/input'; import CheckboxField from './components/fields/checkbox'; @@ -14,7 +15,6 @@ import ColorField from './components/fields/color'; import DateField from './components/fields/date'; import TextareaField from './components/fields/textarea'; import TimeField from './components/fields/time'; -import type { IDateInput, InputProps } from '../../typings'; import dayjs from 'dayjs'; export type FormValues = { diff --git a/web/src/features/dialog/components/fields/color.tsx b/web/src/features/dialog/components/fields/color.tsx index 6ce98f8..434f5b1 100644 --- a/web/src/features/dialog/components/fields/color.tsx +++ b/web/src/features/dialog/components/fields/color.tsx @@ -2,7 +2,6 @@ import { IColorInput } from '../../../../typings/dialog'; import { Control, useController } from 'react-hook-form'; import { FormValues } from '../../InputDialog'; import { ColorInput } from '@mantine/core'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import LibIcon from '../../../../components/LibIcon'; interface Props { diff --git a/web/src/features/dialog/components/fields/date.tsx b/web/src/features/dialog/components/fields/date.tsx index d4e007e..bf41bd4 100644 --- a/web/src/features/dialog/components/fields/date.tsx +++ b/web/src/features/dialog/components/fields/date.tsx @@ -2,7 +2,6 @@ import { IDateInput } from '../../../../typings/dialog'; import { Control, useController } from 'react-hook-form'; import { FormValues } from '../../InputDialog'; import { DatePicker, DateRangePicker } from '@mantine/dates'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import LibIcon from '../../../../components/LibIcon'; interface Props { diff --git a/web/src/features/dialog/components/fields/input.tsx b/web/src/features/dialog/components/fields/input.tsx index c0014f3..e2cfc69 100644 --- a/web/src/features/dialog/components/fields/input.tsx +++ b/web/src/features/dialog/components/fields/input.tsx @@ -1,5 +1,4 @@ import { createStyles, PasswordInput, TextInput } from '@mantine/core'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import React from 'react'; import { IInput } from '../../../../typings/dialog'; import { UseFormRegisterReturn } from 'react-hook-form'; diff --git a/web/src/features/dialog/components/fields/number.tsx b/web/src/features/dialog/components/fields/number.tsx index 982310c..803fe44 100644 --- a/web/src/features/dialog/components/fields/number.tsx +++ b/web/src/features/dialog/components/fields/number.tsx @@ -1,6 +1,5 @@ import { NumberInput } from '@mantine/core'; import { INumber } from '../../../../typings/dialog'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { Control, useController } from 'react-hook-form'; import { FormValues } from '../../InputDialog'; import LibIcon from '../../../../components/LibIcon'; diff --git a/web/src/features/dialog/components/fields/select.tsx b/web/src/features/dialog/components/fields/select.tsx index 350f710..0b2db2a 100644 --- a/web/src/features/dialog/components/fields/select.tsx +++ b/web/src/features/dialog/components/fields/select.tsx @@ -2,7 +2,6 @@ import { MultiSelect, Select } from '@mantine/core'; import { ISelect } from '../../../../typings'; import { Control, useController } from 'react-hook-form'; import { FormValues } from '../../InputDialog'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import LibIcon from '../../../../components/LibIcon'; interface Props { diff --git a/web/src/features/menu/context/ContextMenu.tsx b/web/src/features/menu/context/ContextMenu.tsx index c79f368..1c8d1f2 100644 --- a/web/src/features/menu/context/ContextMenu.tsx +++ b/web/src/features/menu/context/ContextMenu.tsx @@ -1,5 +1,5 @@ import { useNuiEvent } from '../../../hooks/useNuiEvent'; -import { Box, Stack, Text, Flex, createStyles } from '@mantine/core'; +import { Box, createStyles, Flex, Stack, Text } from '@mantine/core'; import { useEffect, useState } from 'react'; import { ContextMenuProps } from '../../../typings'; import ContextButton from './components/ContextButton'; diff --git a/web/src/features/menu/context/components/ContextButton.tsx b/web/src/features/menu/context/components/ContextButton.tsx index 6fa4134..f5d0a80 100644 --- a/web/src/features/menu/context/components/ContextButton.tsx +++ b/web/src/features/menu/context/components/ContextButton.tsx @@ -1,6 +1,6 @@ -import { Button, Box, Group, Stack, Text, Progress, HoverCard, Image, createStyles } from '@mantine/core'; +import { Button, createStyles, Group, HoverCard, Image, Progress, Stack, Text } from '@mantine/core'; import ReactMarkdown from 'react-markdown'; -import { Option, ContextMenuProps } from '../../../../typings'; +import { ContextMenuProps, Option } from '../../../../typings'; import { fetchNui } from '../../../../utils/fetchNui'; import { isIconUrl } from '../../../../utils/isIconUrl'; import { IconProp } from '@fortawesome/fontawesome-svg-core'; diff --git a/web/src/features/menu/context/components/HeaderButton.tsx b/web/src/features/menu/context/components/HeaderButton.tsx index fb77c94..933d6b3 100644 --- a/web/src/features/menu/context/components/HeaderButton.tsx +++ b/web/src/features/menu/context/components/HeaderButton.tsx @@ -1,5 +1,4 @@ import { Button, createStyles } from '@mantine/core'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { IconProp } from '@fortawesome/fontawesome-svg-core'; import LibIcon from '../../../../components/LibIcon'; diff --git a/web/src/features/menu/list/CustomCheckbox.tsx b/web/src/features/menu/list/CustomCheckbox.tsx index 99c0961..5b0926e 100644 --- a/web/src/features/menu/list/CustomCheckbox.tsx +++ b/web/src/features/menu/list/CustomCheckbox.tsx @@ -1,4 +1,4 @@ -import { Checkbox, createStyles, Stack } from '@mantine/core'; +import { Checkbox, createStyles } from '@mantine/core'; const useStyles = createStyles((theme) => ({ root: { diff --git a/web/src/features/menu/list/ListItem.tsx b/web/src/features/menu/list/ListItem.tsx index fd66420..9f930bc 100644 --- a/web/src/features/menu/list/ListItem.tsx +++ b/web/src/features/menu/list/ListItem.tsx @@ -1,8 +1,7 @@ -import { Box, Group, Stack, Text, Progress, Image } from '@mantine/core'; +import { Box, createStyles, Group, Progress, Stack, Text } from '@mantine/core'; import React, { forwardRef } from 'react'; import CustomCheckbox from './CustomCheckbox'; import type { MenuItem } from '../../../typings'; -import { createStyles } from '@mantine/core'; import { isIconUrl } from '../../../utils/isIconUrl'; import { IconProp } from '@fortawesome/fontawesome-svg-core'; import LibIcon from '../../../components/LibIcon'; diff --git a/web/src/features/menu/list/index.tsx b/web/src/features/menu/list/index.tsx index f413452..38737fd 100644 --- a/web/src/features/menu/list/index.tsx +++ b/web/src/features/menu/list/index.tsx @@ -1,11 +1,10 @@ import { Box, createStyles, Stack, Tooltip } from '@mantine/core'; -import { useCallback, useEffect, useRef, useState } from 'react'; +import React, { useCallback, useEffect, useRef, useState } from 'react'; import { useNuiEvent } from '../../../hooks/useNuiEvent'; import ListItem from './ListItem'; import Header from './Header'; import FocusTrap from 'focus-trap-react'; import { fetchNui } from '../../../utils/fetchNui'; -import React from 'react'; import type { MenuPosition, MenuSettings } from '../../../typings'; import LibIcon from '../../../components/LibIcon'; diff --git a/web/src/features/menu/radial/index.tsx b/web/src/features/menu/radial/index.tsx index d973f11..e41dbcd 100644 --- a/web/src/features/menu/radial/index.tsx +++ b/web/src/features/menu/radial/index.tsx @@ -1,5 +1,4 @@ import { Box, createStyles } from '@mantine/core'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { useEffect, useState } from 'react'; import { useNuiEvent } from '../../../hooks/useNuiEvent'; import { fetchNui } from '../../../utils/fetchNui'; diff --git a/web/src/features/notifications/NotificationWrapper.tsx b/web/src/features/notifications/NotificationWrapper.tsx index 8619eb4..e0d639d 100644 --- a/web/src/features/notifications/NotificationWrapper.tsx +++ b/web/src/features/notifications/NotificationWrapper.tsx @@ -1,8 +1,7 @@ import { useNuiEvent } from '../../hooks/useNuiEvent'; import { toast, Toaster } from 'react-hot-toast'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import ReactMarkdown from 'react-markdown'; -import { Avatar, createStyles, Group, Stack, Box, Text, keyframes, Sx } from '@mantine/core'; +import { Avatar, Box, createStyles, Group, keyframes, Stack, Text } from '@mantine/core'; import React from 'react'; import type { NotificationProps } from '../../typings'; import MarkdownComponents from '../../config/MarkdownComponents'; diff --git a/web/src/features/progress/CircleProgressbar.tsx b/web/src/features/progress/CircleProgressbar.tsx index d410014..bf9b690 100644 --- a/web/src/features/progress/CircleProgressbar.tsx +++ b/web/src/features/progress/CircleProgressbar.tsx @@ -1,9 +1,9 @@ import React from 'react'; -import { RingProgress, Text, useMantineTheme, keyframes, Stack, createStyles } from '@mantine/core'; -import { useNuiEvent } from '../../hooks/useNuiEvent'; -import { fetchNui } from '../../utils/fetchNui'; +import {createStyles, keyframes, RingProgress, Stack, Text, useMantineTheme} from '@mantine/core'; +import {useNuiEvent} from '../../hooks/useNuiEvent'; +import {fetchNui} from '../../utils/fetchNui'; import ScaleFade from '../../transitions/ScaleFade'; -import type { CircleProgressbarProps } from '../../typings'; +import type {CircleProgressbarProps} from '../../typings'; // 33.5 is the r of the circle const progressCircle = keyframes({ diff --git a/web/src/features/progress/Progressbar.tsx b/web/src/features/progress/Progressbar.tsx index 7447014..b883bf2 100644 --- a/web/src/features/progress/Progressbar.tsx +++ b/web/src/features/progress/Progressbar.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Box, Text, createStyles } from '@mantine/core'; +import { Box, createStyles, Text } from '@mantine/core'; import { useNuiEvent } from '../../hooks/useNuiEvent'; import { fetchNui } from '../../utils/fetchNui'; import ScaleFade from '../../transitions/ScaleFade'; diff --git a/web/src/features/skillcheck/index.tsx b/web/src/features/skillcheck/index.tsx index dac4d51..678d587 100644 --- a/web/src/features/skillcheck/index.tsx +++ b/web/src/features/skillcheck/index.tsx @@ -3,7 +3,7 @@ import { useNuiEvent } from '../../hooks/useNuiEvent'; import Indicator from './indicator'; import { fetchNui } from '../../utils/fetchNui'; import { Box, createStyles } from '@mantine/core'; -import type { SkillCheckProps, GameDifficulty } from '../../typings'; +import type { GameDifficulty, SkillCheckProps } from '../../typings'; export const circleCircumference = 2 * 50 * Math.PI; diff --git a/web/src/features/textui/TextUI.tsx b/web/src/features/textui/TextUI.tsx index 5b8b87b..5da9882 100644 --- a/web/src/features/textui/TextUI.tsx +++ b/web/src/features/textui/TextUI.tsx @@ -2,10 +2,9 @@ import React from 'react'; import { useNuiEvent } from '../../hooks/useNuiEvent'; import { Box, createStyles, Group } from '@mantine/core'; import ReactMarkdown from 'react-markdown'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import ScaleFade from '../../transitions/ScaleFade'; import remarkGfm from 'remark-gfm'; -import type { TextUiProps, TextUiPosition } from '../../typings'; +import type { TextUiPosition, TextUiProps } from '../../typings'; import MarkdownComponents from '../../config/MarkdownComponents'; import LibIcon from '../../components/LibIcon'; diff --git a/web/vite.config.ts b/web/vite.config.ts index 807a659..4920daa 100644 --- a/web/vite.config.ts +++ b/web/vite.config.ts @@ -1,5 +1,6 @@ import { defineConfig } from "vite"; import react from "@vitejs/plugin-react"; + const path = require("path"); // https://vitejs.dev/config/