From 8ad04de0bcc624bf569827e0dcd0a03131ae5fe3 Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 27 Oct 2022 14:22:15 +0200 Subject: [PATCH] refactor(web/input): move field components into fields folder --- web/src/features/dialog/InputDialog.tsx | 10 +++++----- .../dialog/components/{ => fields}/checkbox.tsx | 5 ++--- .../features/dialog/components/{ => fields}/input.tsx | 4 ++-- .../features/dialog/components/{ => fields}/number.tsx | 5 ++--- .../features/dialog/components/{ => fields}/select.tsx | 2 +- .../features/dialog/components/{ => fields}/slider.tsx | 4 ++-- 6 files changed, 14 insertions(+), 16 deletions(-) rename web/src/features/dialog/components/{ => fields}/checkbox.tsx (86%) rename web/src/features/dialog/components/{ => fields}/input.tsx (95%) rename web/src/features/dialog/components/{ => fields}/number.tsx (93%) rename web/src/features/dialog/components/{ => fields}/select.tsx (95%) rename web/src/features/dialog/components/{ => fields}/slider.tsx (94%) diff --git a/web/src/features/dialog/InputDialog.tsx b/web/src/features/dialog/InputDialog.tsx index 989fb9a..45b226c 100644 --- a/web/src/features/dialog/InputDialog.tsx +++ b/web/src/features/dialog/InputDialog.tsx @@ -4,11 +4,11 @@ import { useNuiEvent } from '../../hooks/useNuiEvent'; import { useLocales } from '../../providers/LocaleProvider'; import { fetchNui } from '../../utils/fetchNui'; import { IInput, ICheckbox, ISelect, INumber, ISlider } from '../../interfaces/dialog'; -import InputField from './components/input'; -import CheckboxField from './components/checkbox'; -import SelectField from './components/select'; -import NumberField from './components/number'; -import SliderField from './components/slider'; +import InputField from './components/fields/input'; +import CheckboxField from './components/fields/checkbox'; +import SelectField from './components/fields/select'; +import NumberField from './components/fields/number'; +import SliderField from './components/fields/slider'; export interface InputProps { heading: string; diff --git a/web/src/features/dialog/components/checkbox.tsx b/web/src/features/dialog/components/fields/checkbox.tsx similarity index 86% rename from web/src/features/dialog/components/checkbox.tsx rename to web/src/features/dialog/components/fields/checkbox.tsx index 9ea68b3..9b3b2fb 100644 --- a/web/src/features/dialog/components/checkbox.tsx +++ b/web/src/features/dialog/components/fields/checkbox.tsx @@ -1,8 +1,7 @@ import { Box, Checkbox, HStack, Text } from '@chakra-ui/react'; import { useEffect } from 'react'; -import { ICheckbox } from '../../../interfaces/dialog'; -import InfoTooltip from './InfoTooltip'; -import Label from './Label'; +import { ICheckbox } from '../../../../interfaces/dialog'; +import Label from '../Label'; interface Props { row: ICheckbox; diff --git a/web/src/features/dialog/components/input.tsx b/web/src/features/dialog/components/fields/input.tsx similarity index 95% rename from web/src/features/dialog/components/input.tsx rename to web/src/features/dialog/components/fields/input.tsx index c3a8920..0535e0f 100644 --- a/web/src/features/dialog/components/input.tsx +++ b/web/src/features/dialog/components/fields/input.tsx @@ -1,8 +1,8 @@ import { Box, InputGroup, InputLeftElement, InputRightElement, Input } from '@chakra-ui/react'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { useEffect } from 'react'; -import { IInput } from '../../../interfaces/dialog'; -import Label from './Label'; +import { IInput } from '../../../../interfaces/dialog'; +import Label from '../Label'; interface Props { row: IInput; diff --git a/web/src/features/dialog/components/number.tsx b/web/src/features/dialog/components/fields/number.tsx similarity index 93% rename from web/src/features/dialog/components/number.tsx rename to web/src/features/dialog/components/fields/number.tsx index b5b825b..aaa6901 100644 --- a/web/src/features/dialog/components/number.tsx +++ b/web/src/features/dialog/components/fields/number.tsx @@ -1,6 +1,5 @@ import { Box, - Text, NumberInput, NumberInputField, NumberInputStepper, @@ -9,9 +8,9 @@ import { InputLeftElement, } from '@chakra-ui/react'; import { useEffect } from 'react'; -import { INumber } from '../../../interfaces/dialog'; +import { INumber } from '../../../../interfaces/dialog'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import Label from './Label'; +import Label from '../Label'; interface Props { row: INumber; diff --git a/web/src/features/dialog/components/select.tsx b/web/src/features/dialog/components/fields/select.tsx similarity index 95% rename from web/src/features/dialog/components/select.tsx rename to web/src/features/dialog/components/fields/select.tsx index df76031..ea6c294 100644 --- a/web/src/features/dialog/components/select.tsx +++ b/web/src/features/dialog/components/fields/select.tsx @@ -1,6 +1,6 @@ import { Box, Select } from '@chakra-ui/react'; import { useEffect } from 'react'; -import { ISelect } from '../../../interfaces/dialog'; +import { ISelect } from '../../../../interfaces/dialog'; interface Props { row: ISelect; diff --git a/web/src/features/dialog/components/slider.tsx b/web/src/features/dialog/components/fields/slider.tsx similarity index 94% rename from web/src/features/dialog/components/slider.tsx rename to web/src/features/dialog/components/fields/slider.tsx index 77f83bd..562c195 100644 --- a/web/src/features/dialog/components/slider.tsx +++ b/web/src/features/dialog/components/fields/slider.tsx @@ -1,7 +1,7 @@ import { Box, Text, Slider, SliderTrack, SliderFilledTrack, SliderThumb, HStack, Tooltip } from '@chakra-ui/react'; import { useEffect, useState } from 'react'; -import { ISlider } from '../../../interfaces/dialog'; -import Label from './Label'; +import { ISlider } from '../../../../interfaces/dialog'; +import Label from '../Label'; interface Props { row: ISlider;