diff --git a/components/ErrorSection/index.tsx b/components/ErrorSection/index.tsx index 5f8c4cae..b606c798 100644 --- a/components/ErrorSection/index.tsx +++ b/components/ErrorSection/index.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react' import Link from 'next/link' import { useTranslation } from 'next-i18next' -import Button from '~components/Button' +import Button from '~components/common/Button' import { ResponseStatus } from '~types' import './index.scss' diff --git a/components/FilterBar/index.tsx b/components/FilterBar/index.tsx index 116d8bf2..11b5332f 100644 --- a/components/FilterBar/index.tsx +++ b/components/FilterBar/index.tsx @@ -5,9 +5,9 @@ import equals from 'fast-deep-equal' import FilterModal from '~components/FilterModal' import RaidDropdown from '~components/RaidDropdown' -import Select from '~components/Select' -import SelectItem from '~components/SelectItem' -import Button from '~components/Button' +import Select from '~components/common/Select' +import SelectItem from '~components/common/SelectItem' +import Button from '~components/common/Button' import { defaultFilterset } from '~utils/defaultFilters' diff --git a/components/FilterModal/index.tsx b/components/FilterModal/index.tsx index c6a09bb7..7eaec126 100644 --- a/components/FilterModal/index.tsx +++ b/components/FilterModal/index.tsx @@ -8,15 +8,15 @@ import { DialogTrigger, DialogClose, DialogTitle, -} from '~components/Dialog' -import DialogContent from '~components/DialogContent' +} from '~components/common/Dialog' +import DialogContent from '~components/common/DialogContent' -import Button from '~components/Button' -import InputTableField from '~components/InputTableField' -import SelectTableField from '~components/SelectTableField' -import SliderTableField from '~components/SliderTableField' -import SwitchTableField from '~components/SwitchTableField' -import SelectItem from '~components/SelectItem' +import Button from '~components/common/Button' +import InputTableField from '~components/common/InputTableField' +import SelectTableField from '~components/common/SelectTableField' +import SliderTableField from '~components/common/SliderTableField' +import SwitchTableField from '~components/common/SwitchTableField' +import SelectItem from '~components/common/SelectItem' import type { DialogProps } from '@radix-ui/react-dialog' diff --git a/components/GridRep/index.tsx b/components/GridRep/index.tsx index f2b17fac..6c3bc029 100644 --- a/components/GridRep/index.tsx +++ b/components/GridRep/index.tsx @@ -9,7 +9,7 @@ import 'fix-date' import { accountState } from '~utils/accountState' import { formatTimeAgo } from '~utils/timeAgo' -import Button from '~components/Button' +import Button from '~components/common/Button' import SaveIcon from '~public/icons/Save.svg' import ShieldIcon from '~public/icons/Shield.svg' diff --git a/components/Header/index.tsx b/components/Header/index.tsx index 011362a4..4fac2dea 100644 --- a/components/Header/index.tsx +++ b/components/Header/index.tsx @@ -22,13 +22,13 @@ import { DropdownMenuItem, DropdownMenuSeparator, DropdownMenuLabel, -} from '~components/DropdownMenuContent' -import LoginModal from '~components/LoginModal' -import SignupModal from '~components/SignupModal' -import AccountModal from '~components/AccountModal' -import Toast from '~components/Toast' -import Button from '~components/Button' -import Tooltip from '~components/Tooltip' +} from '~components/common/DropdownMenuContent' +import LoginModal from '~components/auth/LoginModal' +import SignupModal from '~components/auth/SignupModal' +import AccountModal from '~components/auth/AccountModal' +import Toast from '~components/common/Toast' +import Button from '~components/common/Button' +import Tooltip from '~components/common/Tooltip' import * as Switch from '@radix-ui/react-switch' import ArrowIcon from '~public/icons/Arrow.svg' diff --git a/components/Layout/index.tsx b/components/Layout/index.tsx index cb1c3777..6f1505d9 100644 --- a/components/Layout/index.tsx +++ b/components/Layout/index.tsx @@ -6,7 +6,7 @@ import { getCookie } from 'cookies-next' import { appState } from '~utils/appState' import TopHeader from '~components/Header' -import UpdateToast from '~components/UpdateToast' +import UpdateToast from '~components/about/UpdateToast' import './index.scss' diff --git a/components/RaidDropdown/index.tsx b/components/RaidDropdown/index.tsx index 27becd91..e3d6b70d 100644 --- a/components/RaidDropdown/index.tsx +++ b/components/RaidDropdown/index.tsx @@ -1,9 +1,9 @@ import React, { useCallback, useEffect, useState } from 'react' import { useRouter } from 'next/router' -import Select from '~components/Select' -import SelectItem from '~components/SelectItem' -import SelectGroup from '~components/SelectGroup' +import Select from '~components/common/Select' +import SelectItem from '~components/common/SelectItem' +import SelectGroup from '~components/common/SelectGroup' import api from '~utils/api' import organizeRaids from '~utils/organizeRaids' diff --git a/components/AboutHead/index.tsx b/components/about/AboutHead/index.tsx similarity index 100% rename from components/AboutHead/index.tsx rename to components/about/AboutHead/index.tsx diff --git a/components/AboutPage/index.scss b/components/about/AboutPage/index.scss similarity index 100% rename from components/AboutPage/index.scss rename to components/about/AboutPage/index.scss diff --git a/components/AboutPage/index.tsx b/components/about/AboutPage/index.tsx similarity index 100% rename from components/AboutPage/index.tsx rename to components/about/AboutPage/index.tsx diff --git a/components/ChangelogUnit/index.scss b/components/about/ChangelogUnit/index.scss similarity index 100% rename from components/ChangelogUnit/index.scss rename to components/about/ChangelogUnit/index.scss diff --git a/components/ChangelogUnit/index.tsx b/components/about/ChangelogUnit/index.tsx similarity index 100% rename from components/ChangelogUnit/index.tsx rename to components/about/ChangelogUnit/index.tsx diff --git a/components/ContentUpdate/index.scss b/components/about/ContentUpdate/index.scss similarity index 100% rename from components/ContentUpdate/index.scss rename to components/about/ContentUpdate/index.scss diff --git a/components/ContentUpdate/index.tsx b/components/about/ContentUpdate/index.tsx similarity index 98% rename from components/ContentUpdate/index.tsx rename to components/about/ContentUpdate/index.tsx index 13df3c85..6506e098 100644 --- a/components/ContentUpdate/index.tsx +++ b/components/about/ContentUpdate/index.tsx @@ -1,6 +1,6 @@ import React from 'react' import { useTranslation } from 'next-i18next' -import ChangelogUnit from '~components/ChangelogUnit' +import ChangelogUnit from '~components/about/ChangelogUnit' import './index.scss' diff --git a/components/RoadmapPage/index.scss b/components/about/RoadmapPage/index.scss similarity index 100% rename from components/RoadmapPage/index.scss rename to components/about/RoadmapPage/index.scss diff --git a/components/RoadmapPage/index.tsx b/components/about/RoadmapPage/index.tsx similarity index 100% rename from components/RoadmapPage/index.tsx rename to components/about/RoadmapPage/index.tsx diff --git a/components/UpdateToast/index.scss b/components/about/UpdateToast/index.scss similarity index 100% rename from components/UpdateToast/index.scss rename to components/about/UpdateToast/index.scss diff --git a/components/UpdateToast/index.tsx b/components/about/UpdateToast/index.tsx similarity index 94% rename from components/UpdateToast/index.tsx rename to components/about/UpdateToast/index.tsx index cc7b64f2..2d2d9efc 100644 --- a/components/UpdateToast/index.tsx +++ b/components/about/UpdateToast/index.tsx @@ -4,8 +4,8 @@ import { setCookie } from 'cookies-next' import { add, format } from 'date-fns' import classNames from 'classnames' -import Button from '~components/Button' -import Toast from '~components/Toast' +import Button from '~components/common/Button' +import Toast from '~components/common/Toast' import './index.scss' import { useTranslation } from 'next-i18next' diff --git a/components/UpdatesPage/index.scss b/components/about/UpdatesPage/index.scss similarity index 100% rename from components/UpdatesPage/index.scss rename to components/about/UpdatesPage/index.scss diff --git a/components/UpdatesPage/index.tsx b/components/about/UpdatesPage/index.tsx similarity index 99% rename from components/UpdatesPage/index.tsx rename to components/about/UpdatesPage/index.tsx index 84e902c6..668b3cb3 100644 --- a/components/UpdatesPage/index.tsx +++ b/components/about/UpdatesPage/index.tsx @@ -2,8 +2,8 @@ import React from 'react' import { useTranslation } from 'next-i18next' -import ContentUpdate from '~components/ContentUpdate' -import ChangelogUnit from '~components/ChangelogUnit' +import ContentUpdate from '~components/about/ContentUpdate' +import ChangelogUnit from '~components/about/ChangelogUnit' import './index.scss' diff --git a/components/AccountModal/index.scss b/components/auth/AccountModal/index.scss similarity index 100% rename from components/AccountModal/index.scss rename to components/auth/AccountModal/index.scss diff --git a/components/AccountModal/index.tsx b/components/auth/AccountModal/index.tsx similarity index 96% rename from components/AccountModal/index.tsx rename to components/auth/AccountModal/index.tsx index 72518faa..9b37b831 100644 --- a/components/AccountModal/index.tsx +++ b/components/auth/AccountModal/index.tsx @@ -9,12 +9,12 @@ import { DialogClose, DialogTitle, DialogTrigger, -} from '~components/Dialog' -import DialogContent from '~components/DialogContent' -import Button from '~components/Button' -import SelectItem from '~components/SelectItem' -import PictureSelectItem from '~components/PictureSelectItem' -import SelectTableField from '~components/SelectTableField' +} from '~components/common/Dialog' +import DialogContent from '~components/common/DialogContent' +import Button from '~components/common/Button' +import SelectItem from '~components/common/SelectItem' +import PictureSelectItem from '~components/common/PictureSelectItem' +import SelectTableField from '~components/common/SelectTableField' // import * as Switch from '@radix-ui/react-switch' import api from '~utils/api' diff --git a/components/LoginModal/index.scss b/components/auth/LoginModal/index.scss similarity index 100% rename from components/LoginModal/index.scss rename to components/auth/LoginModal/index.scss diff --git a/components/LoginModal/index.tsx b/components/auth/LoginModal/index.tsx similarity index 97% rename from components/LoginModal/index.tsx rename to components/auth/LoginModal/index.tsx index 49d72e61..49ae2ff2 100644 --- a/components/LoginModal/index.tsx +++ b/components/auth/LoginModal/index.tsx @@ -8,10 +8,10 @@ import api from '~utils/api' import { setHeaders } from '~utils/userToken' import { accountState } from '~utils/accountState' -import Button from '~components/Button' -import Input from '~components/Input' -import { Dialog, DialogTrigger, DialogClose } from '~components/Dialog' -import DialogContent from '~components/DialogContent' +import Button from '~components/common/Button' +import Input from '~components/common/Input' +import { Dialog, DialogTrigger, DialogClose } from '~components/common/Dialog' +import DialogContent from '~components/common/DialogContent' import changeLanguage from '~utils/changeLanguage' import CrossIcon from '~public/icons/Cross.svg' diff --git a/components/SignupModal/index.scss b/components/auth/SignupModal/index.scss similarity index 100% rename from components/SignupModal/index.scss rename to components/auth/SignupModal/index.scss diff --git a/components/SignupModal/index.tsx b/components/auth/SignupModal/index.tsx similarity index 98% rename from components/SignupModal/index.tsx rename to components/auth/SignupModal/index.tsx index 2a00e995..67f24c6f 100644 --- a/components/SignupModal/index.tsx +++ b/components/auth/SignupModal/index.tsx @@ -8,10 +8,10 @@ import api from '~utils/api' import { setHeaders } from '~utils/userToken' import { accountState } from '~utils/accountState' -import Button from '~components/Button' -import Input from '~components/Input' -import { Dialog, DialogTrigger, DialogClose } from '~components/Dialog' -import DialogContent from '~components/DialogContent' +import Button from '~components/common/Button' +import Input from '~components/common/Input' +import { Dialog, DialogTrigger, DialogClose } from '~components/common/Dialog' +import DialogContent from '~components/common/DialogContent' import CrossIcon from '~public/icons/Cross.svg' import './index.scss' diff --git a/components/CharacterConflictModal/index.scss b/components/character/CharacterConflictModal/index.scss similarity index 100% rename from components/CharacterConflictModal/index.scss rename to components/character/CharacterConflictModal/index.scss diff --git a/components/CharacterConflictModal/index.tsx b/components/character/CharacterConflictModal/index.tsx similarity index 94% rename from components/CharacterConflictModal/index.tsx rename to components/character/CharacterConflictModal/index.tsx index 535d6305..72418460 100644 --- a/components/CharacterConflictModal/index.tsx +++ b/components/character/CharacterConflictModal/index.tsx @@ -2,10 +2,10 @@ import React, { useEffect, useState } from 'react' import { useRouter } from 'next/router' import { Trans, useTranslation } from 'next-i18next' -import { Dialog } from '~components/Dialog' -import DialogContent from '~components/DialogContent' -import Button from '~components/Button' -import Overlay from '~components/Overlay' +import { Dialog } from '~components/common/Dialog' +import DialogContent from '~components/common/DialogContent' +import Button from '~components/common/Button' +import Overlay from '~components/common/Overlay' import { appState } from '~utils/appState' diff --git a/components/CharacterGrid/index.scss b/components/character/CharacterGrid/index.scss similarity index 100% rename from components/CharacterGrid/index.scss rename to components/character/CharacterGrid/index.scss diff --git a/components/CharacterGrid/index.tsx b/components/character/CharacterGrid/index.tsx similarity index 98% rename from components/CharacterGrid/index.tsx rename to components/character/CharacterGrid/index.tsx index 9cd2d54f..958d374e 100644 --- a/components/CharacterGrid/index.tsx +++ b/components/character/CharacterGrid/index.tsx @@ -7,10 +7,10 @@ import { useTranslation } from 'next-i18next' import { AxiosError, AxiosResponse } from 'axios' import debounce from 'lodash.debounce' -import Alert from '~components/Alert' -import JobSection from '~components/JobSection' -import CharacterUnit from '~components/CharacterUnit' -import CharacterConflictModal from '~components/CharacterConflictModal' +import Alert from '~components/common/Alert' +import JobSection from '~components/job/JobSection' +import CharacterUnit from '~components/character/CharacterUnit' +import CharacterConflictModal from '~components/character/CharacterConflictModal' import type { DetailsObject, JobSkillObject, SearchableObject } from '~types' diff --git a/components/CharacterHovercard/index.scss b/components/character/CharacterHovercard/index.scss similarity index 100% rename from components/CharacterHovercard/index.scss rename to components/character/CharacterHovercard/index.scss diff --git a/components/CharacterHovercard/index.tsx b/components/character/CharacterHovercard/index.tsx similarity index 97% rename from components/CharacterHovercard/index.tsx rename to components/character/CharacterHovercard/index.tsx index 76eb2c4d..47d066ff 100644 --- a/components/CharacterHovercard/index.tsx +++ b/components/character/CharacterHovercard/index.tsx @@ -6,10 +6,10 @@ import { Hovercard, HovercardContent, HovercardTrigger, -} from '~components/Hovercard' -import Button from '~components/Button' -import WeaponLabelIcon from '~components/WeaponLabelIcon' -import UncapIndicator from '~components/UncapIndicator' +} from '~components/common/Hovercard' +import Button from '~components/common/Button' +import WeaponLabelIcon from '~components/weapon/WeaponLabelIcon' +import UncapIndicator from '~components/uncap/UncapIndicator' import { overMastery, diff --git a/components/CharacterModal/index.scss b/components/character/CharacterModal/index.scss similarity index 100% rename from components/CharacterModal/index.scss rename to components/character/CharacterModal/index.scss diff --git a/components/CharacterModal/index.tsx b/components/character/CharacterModal/index.tsx similarity index 95% rename from components/CharacterModal/index.tsx rename to components/character/CharacterModal/index.tsx index 6605c6ee..c23fc881 100644 --- a/components/CharacterModal/index.tsx +++ b/components/character/CharacterModal/index.tsx @@ -16,13 +16,13 @@ import { DialogClose, DialogTitle, DialogTrigger, -} from '~components/Dialog' -import DialogContent from '~components/DialogContent' -import Button from '~components/Button' -import SelectWithInput from '~components/SelectWithInput' -import AwakeningSelect from '~components/AwakeningSelect' -import RingSelect from '~components/RingSelect' -import Switch from '~components/Switch' +} from '~components/common/Dialog' +import DialogContent from '~components/common/DialogContent' +import Button from '~components/common/Button' +import SelectWithInput from '~components/common/SelectWithInput' +import AwakeningSelect from '~components/mastery/AwakeningSelect' +import RingSelect from '~components/mastery/RingSelect' +import Switch from '~components/common/Switch' // Utilities import api from '~utils/api' diff --git a/components/CharacterResult/index.scss b/components/character/CharacterResult/index.scss similarity index 100% rename from components/CharacterResult/index.scss rename to components/character/CharacterResult/index.scss diff --git a/components/CharacterResult/index.tsx b/components/character/CharacterResult/index.tsx similarity index 91% rename from components/CharacterResult/index.tsx rename to components/character/CharacterResult/index.tsx index 7b09409b..e98e3a73 100644 --- a/components/CharacterResult/index.tsx +++ b/components/character/CharacterResult/index.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useRouter } from 'next/router' -import UncapIndicator from '~components/UncapIndicator' -import WeaponLabelIcon from '~components/WeaponLabelIcon' +import UncapIndicator from '~components/uncap/UncapIndicator' +import WeaponLabelIcon from '~components/weapon/WeaponLabelIcon' import './index.scss' diff --git a/components/CharacterSearchFilterBar/index.scss b/components/character/CharacterSearchFilterBar/index.scss similarity index 100% rename from components/CharacterSearchFilterBar/index.scss rename to components/character/CharacterSearchFilterBar/index.scss diff --git a/components/CharacterSearchFilterBar/index.tsx b/components/character/CharacterSearchFilterBar/index.tsx similarity index 98% rename from components/CharacterSearchFilterBar/index.tsx rename to components/character/CharacterSearchFilterBar/index.tsx index 3ab0e1a4..0f454af5 100644 --- a/components/CharacterSearchFilterBar/index.tsx +++ b/components/character/CharacterSearchFilterBar/index.tsx @@ -5,8 +5,8 @@ import cloneDeep from 'lodash.clonedeep' import * as DropdownMenu from '@radix-ui/react-dropdown-menu' -import SearchFilter from '~components/SearchFilter' -import SearchFilterCheckboxItem from '~components/SearchFilterCheckboxItem' +import SearchFilter from '~components/search/SearchFilter' +import SearchFilterCheckboxItem from '~components/search/SearchFilterCheckboxItem' import './index.scss' import { diff --git a/components/CharacterUnit/index.scss b/components/character/CharacterUnit/index.scss similarity index 100% rename from components/CharacterUnit/index.scss rename to components/character/CharacterUnit/index.scss diff --git a/components/CharacterUnit/index.tsx b/components/character/CharacterUnit/index.tsx similarity index 95% rename from components/CharacterUnit/index.tsx rename to components/character/CharacterUnit/index.tsx index f2d115b7..6b460760 100644 --- a/components/CharacterUnit/index.tsx +++ b/components/character/CharacterUnit/index.tsx @@ -5,18 +5,18 @@ import { Trans, useTranslation } from 'next-i18next' import { AxiosResponse } from 'axios' import classNames from 'classnames' -import Alert from '~components/Alert' -import Button from '~components/Button' -import CharacterHovercard from '~components/CharacterHovercard' -import CharacterModal from '~components/CharacterModal' +import Alert from '~components/common/Alert' +import Button from '~components/common/Button' +import CharacterHovercard from '~components/character/CharacterHovercard' +import CharacterModal from '~components/character/CharacterModal' import { ContextMenu, ContextMenuTrigger, ContextMenuContent, -} from '~components/ContextMenu' -import ContextMenuItem from '~components/ContextMenuItem' -import SearchModal from '~components/SearchModal' -import UncapIndicator from '~components/UncapIndicator' +} from '~components/common/ContextMenu' +import ContextMenuItem from '~components/common/ContextMenuItem' +import SearchModal from '~components/search/SearchModal' +import UncapIndicator from '~components/uncap/UncapIndicator' import api from '~utils/api' import { appState } from '~utils/appState' diff --git a/components/Alert/index.scss b/components/common/Alert/index.scss similarity index 100% rename from components/Alert/index.scss rename to components/common/Alert/index.scss diff --git a/components/Alert/index.tsx b/components/common/Alert/index.tsx similarity index 94% rename from components/Alert/index.tsx rename to components/common/Alert/index.tsx index 8315495d..dc6d49c9 100644 --- a/components/Alert/index.tsx +++ b/components/common/Alert/index.tsx @@ -2,8 +2,8 @@ import React from 'react' import * as AlertDialog from '@radix-ui/react-alert-dialog' import './index.scss' -import Button from '~components/Button' -import Overlay from '~components/Overlay' +import Button from '~components/common/Button' +import Overlay from '~components/common/Overlay' // Props interface Props { diff --git a/components/Button/index.scss b/components/common/Button/index.scss similarity index 100% rename from components/Button/index.scss rename to components/common/Button/index.scss diff --git a/components/Button/index.tsx b/components/common/Button/index.tsx similarity index 100% rename from components/Button/index.tsx rename to components/common/Button/index.tsx diff --git a/components/CharLimitedFieldset/index.scss b/components/common/CharLimitedFieldset/index.scss similarity index 100% rename from components/CharLimitedFieldset/index.scss rename to components/common/CharLimitedFieldset/index.scss diff --git a/components/CharLimitedFieldset/index.tsx b/components/common/CharLimitedFieldset/index.tsx similarity index 100% rename from components/CharLimitedFieldset/index.tsx rename to components/common/CharLimitedFieldset/index.tsx diff --git a/components/ContextMenu/index.scss b/components/common/ContextMenu/index.scss similarity index 100% rename from components/ContextMenu/index.scss rename to components/common/ContextMenu/index.scss diff --git a/components/ContextMenu/index.tsx b/components/common/ContextMenu/index.tsx similarity index 100% rename from components/ContextMenu/index.tsx rename to components/common/ContextMenu/index.tsx diff --git a/components/ContextMenuItem/index.scss b/components/common/ContextMenuItem/index.scss similarity index 100% rename from components/ContextMenuItem/index.scss rename to components/common/ContextMenuItem/index.scss diff --git a/components/ContextMenuItem/index.tsx b/components/common/ContextMenuItem/index.tsx similarity index 100% rename from components/ContextMenuItem/index.tsx rename to components/common/ContextMenuItem/index.tsx diff --git a/components/Dialog/index.scss b/components/common/Dialog/index.scss similarity index 100% rename from components/Dialog/index.scss rename to components/common/Dialog/index.scss diff --git a/components/Dialog/index.tsx b/components/common/Dialog/index.tsx similarity index 100% rename from components/Dialog/index.tsx rename to components/common/Dialog/index.tsx diff --git a/components/DialogContent/index.scss b/components/common/DialogContent/index.scss similarity index 100% rename from components/DialogContent/index.scss rename to components/common/DialogContent/index.scss diff --git a/components/DialogContent/index.tsx b/components/common/DialogContent/index.tsx similarity index 98% rename from components/DialogContent/index.tsx rename to components/common/DialogContent/index.tsx index 455cb7a3..26e06339 100644 --- a/components/DialogContent/index.tsx +++ b/components/common/DialogContent/index.tsx @@ -3,7 +3,7 @@ import * as DialogPrimitive from '@radix-ui/react-dialog' import classNames from 'classnames' import debounce from 'lodash.debounce' -import Overlay from '~components/Overlay' +import Overlay from '~components/common/Overlay' import './index.scss' interface Props diff --git a/components/DropdownMenuContent/index.scss b/components/common/DropdownMenuContent/index.scss similarity index 100% rename from components/DropdownMenuContent/index.scss rename to components/common/DropdownMenuContent/index.scss diff --git a/components/DropdownMenuContent/index.tsx b/components/common/DropdownMenuContent/index.tsx similarity index 100% rename from components/DropdownMenuContent/index.tsx rename to components/common/DropdownMenuContent/index.tsx diff --git a/components/DurationInput/index.scss b/components/common/DurationInput/index.scss similarity index 100% rename from components/DurationInput/index.scss rename to components/common/DurationInput/index.scss diff --git a/components/DurationInput/index.tsx b/components/common/DurationInput/index.tsx similarity index 99% rename from components/DurationInput/index.tsx rename to components/common/DurationInput/index.tsx index c0dd6918..91513838 100644 --- a/components/DurationInput/index.tsx +++ b/components/common/DurationInput/index.tsx @@ -1,7 +1,7 @@ import React, { useState, ChangeEvent, KeyboardEvent } from 'react' import classNames from 'classnames' -import Input from '~components/Input' +import Input from '~components/common/Input' import './index.scss' interface Props diff --git a/components/Hovercard/index.scss b/components/common/Hovercard/index.scss similarity index 100% rename from components/Hovercard/index.scss rename to components/common/Hovercard/index.scss diff --git a/components/Hovercard/index.tsx b/components/common/Hovercard/index.tsx similarity index 100% rename from components/Hovercard/index.tsx rename to components/common/Hovercard/index.tsx diff --git a/components/Input/index.scss b/components/common/Input/index.scss similarity index 100% rename from components/Input/index.scss rename to components/common/Input/index.scss diff --git a/components/Input/index.tsx b/components/common/Input/index.tsx similarity index 100% rename from components/Input/index.tsx rename to components/common/Input/index.tsx diff --git a/components/InputTableField/index.scss b/components/common/InputTableField/index.scss similarity index 100% rename from components/InputTableField/index.scss rename to components/common/InputTableField/index.scss diff --git a/components/InputTableField/index.tsx b/components/common/InputTableField/index.tsx similarity index 91% rename from components/InputTableField/index.tsx rename to components/common/InputTableField/index.tsx index 5295f8a2..26fdac25 100644 --- a/components/InputTableField/index.tsx +++ b/components/common/InputTableField/index.tsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' -import Input from '~components/Input' -import TableField from '~components/TableField' +import Input from '~components/common/Input' +import TableField from '~components/common/TableField' import './index.scss' diff --git a/components/LabelledInput/index.scss b/components/common/LabelledInput/index.scss similarity index 100% rename from components/LabelledInput/index.scss rename to components/common/LabelledInput/index.scss diff --git a/components/LabelledInput/index.tsx b/components/common/LabelledInput/index.tsx similarity index 100% rename from components/LabelledInput/index.tsx rename to components/common/LabelledInput/index.tsx diff --git a/components/Overlay/index.scss b/components/common/Overlay/index.scss similarity index 100% rename from components/Overlay/index.scss rename to components/common/Overlay/index.scss diff --git a/components/Overlay/index.tsx b/components/common/Overlay/index.tsx similarity index 100% rename from components/Overlay/index.tsx rename to components/common/Overlay/index.tsx diff --git a/components/PictureSelectItem/index.scss b/components/common/PictureSelectItem/index.scss similarity index 100% rename from components/PictureSelectItem/index.scss rename to components/common/PictureSelectItem/index.scss diff --git a/components/PictureSelectItem/index.tsx b/components/common/PictureSelectItem/index.tsx similarity index 100% rename from components/PictureSelectItem/index.tsx rename to components/common/PictureSelectItem/index.tsx diff --git a/components/PopoverContent/index.scss b/components/common/PopoverContent/index.scss similarity index 100% rename from components/PopoverContent/index.scss rename to components/common/PopoverContent/index.scss diff --git a/components/PopoverContent/index.tsx b/components/common/PopoverContent/index.tsx similarity index 100% rename from components/PopoverContent/index.tsx rename to components/common/PopoverContent/index.tsx diff --git a/components/Segment/index.scss b/components/common/Segment/index.scss similarity index 100% rename from components/Segment/index.scss rename to components/common/Segment/index.scss diff --git a/components/Segment/index.tsx b/components/common/Segment/index.tsx similarity index 100% rename from components/Segment/index.tsx rename to components/common/Segment/index.tsx diff --git a/components/SegmentedControl/index.scss b/components/common/SegmentedControl/index.scss similarity index 100% rename from components/SegmentedControl/index.scss rename to components/common/SegmentedControl/index.scss diff --git a/components/SegmentedControl/index.tsx b/components/common/SegmentedControl/index.tsx similarity index 100% rename from components/SegmentedControl/index.tsx rename to components/common/SegmentedControl/index.tsx diff --git a/components/Select/index.scss b/components/common/Select/index.scss similarity index 100% rename from components/Select/index.scss rename to components/common/Select/index.scss diff --git a/components/Select/index.tsx b/components/common/Select/index.tsx similarity index 98% rename from components/Select/index.tsx rename to components/common/Select/index.tsx index b1a6bcb9..d633b155 100644 --- a/components/Select/index.tsx +++ b/components/common/Select/index.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react' import * as RadixSelect from '@radix-ui/react-select' import classNames from 'classnames' -import Overlay from '~components/Overlay' +import Overlay from '~components/common/Overlay' import ArrowIcon from '~public/icons/Arrow.svg' diff --git a/components/SelectGroup/index.scss b/components/common/SelectGroup/index.scss similarity index 100% rename from components/SelectGroup/index.scss rename to components/common/SelectGroup/index.scss diff --git a/components/SelectGroup/index.tsx b/components/common/SelectGroup/index.tsx similarity index 100% rename from components/SelectGroup/index.tsx rename to components/common/SelectGroup/index.tsx diff --git a/components/SelectItem/index.scss b/components/common/SelectItem/index.scss similarity index 100% rename from components/SelectItem/index.scss rename to components/common/SelectItem/index.scss diff --git a/components/SelectItem/index.tsx b/components/common/SelectItem/index.tsx similarity index 100% rename from components/SelectItem/index.tsx rename to components/common/SelectItem/index.tsx diff --git a/components/SelectTableField/index.scss b/components/common/SelectTableField/index.scss similarity index 100% rename from components/SelectTableField/index.scss rename to components/common/SelectTableField/index.scss diff --git a/components/SelectTableField/index.tsx b/components/common/SelectTableField/index.tsx similarity index 91% rename from components/SelectTableField/index.tsx rename to components/common/SelectTableField/index.tsx index 1b0682dd..2eded956 100644 --- a/components/SelectTableField/index.tsx +++ b/components/common/SelectTableField/index.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames' import { useEffect, useState } from 'react' -import Select from '~components/Select' -import TableField from '~components/TableField' +import Select from '~components/common/Select' +import TableField from '~components/common/TableField' import './index.scss' diff --git a/components/SelectWithInput/index.scss b/components/common/SelectWithInput/index.scss similarity index 100% rename from components/SelectWithInput/index.scss rename to components/common/SelectWithInput/index.scss diff --git a/components/SelectWithInput/index.tsx b/components/common/SelectWithInput/index.tsx similarity index 97% rename from components/SelectWithInput/index.tsx rename to components/common/SelectWithInput/index.tsx index 966db681..0e044855 100644 --- a/components/SelectWithInput/index.tsx +++ b/components/common/SelectWithInput/index.tsx @@ -5,9 +5,9 @@ import { useTranslation } from 'next-i18next' import classNames from 'classnames' // UI Dependencies -import Input from '~components/Input' -import Select from '~components/Select' -import SelectItem from '~components/SelectItem' +import Input from '~components/common/Input' +import Select from '~components/common/Select' +import SelectItem from '~components/common/SelectItem' // Styles and icons import './index.scss' diff --git a/components/Slider/index.scss b/components/common/Slider/index.scss similarity index 100% rename from components/Slider/index.scss rename to components/common/Slider/index.scss diff --git a/components/Slider/index.tsx b/components/common/Slider/index.tsx similarity index 100% rename from components/Slider/index.tsx rename to components/common/Slider/index.tsx diff --git a/components/SliderTableField/index.scss b/components/common/SliderTableField/index.scss similarity index 100% rename from components/SliderTableField/index.scss rename to components/common/SliderTableField/index.scss diff --git a/components/SliderTableField/index.tsx b/components/common/SliderTableField/index.tsx similarity index 91% rename from components/SliderTableField/index.tsx rename to components/common/SliderTableField/index.tsx index ff2409d2..33673f98 100644 --- a/components/SliderTableField/index.tsx +++ b/components/common/SliderTableField/index.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from 'react' -import Input from '~components/Input' -import Slider from '~components/Slider' -import TableField from '~components/TableField' +import Input from '~components/common/Input' +import Slider from '~components/common/Slider' +import TableField from '~components/common/TableField' import './index.scss' diff --git a/components/Switch/index.scss b/components/common/Switch/index.scss similarity index 100% rename from components/Switch/index.scss rename to components/common/Switch/index.scss diff --git a/components/Switch/index.tsx b/components/common/Switch/index.tsx similarity index 100% rename from components/Switch/index.tsx rename to components/common/Switch/index.tsx diff --git a/components/SummonHovercard/index.scss b/components/common/SwitchTableField/index.scss similarity index 100% rename from components/SummonHovercard/index.scss rename to components/common/SwitchTableField/index.scss diff --git a/components/SwitchTableField/index.tsx b/components/common/SwitchTableField/index.tsx similarity index 90% rename from components/SwitchTableField/index.tsx rename to components/common/SwitchTableField/index.tsx index 0861526b..db9c5352 100644 --- a/components/SwitchTableField/index.tsx +++ b/components/common/SwitchTableField/index.tsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' -import Switch from '~components/Switch' -import TableField from '~components/TableField' +import Switch from '~components/common/Switch' +import TableField from '~components/common/TableField' import './index.scss' diff --git a/components/TableField/index.scss b/components/common/TableField/index.scss similarity index 100% rename from components/TableField/index.scss rename to components/common/TableField/index.scss diff --git a/components/TableField/index.tsx b/components/common/TableField/index.tsx similarity index 100% rename from components/TableField/index.tsx rename to components/common/TableField/index.tsx diff --git a/components/TextFieldset/index.scss b/components/common/TextFieldset/index.scss similarity index 100% rename from components/TextFieldset/index.scss rename to components/common/TextFieldset/index.scss diff --git a/components/TextFieldset/index.tsx b/components/common/TextFieldset/index.tsx similarity index 100% rename from components/TextFieldset/index.tsx rename to components/common/TextFieldset/index.tsx diff --git a/components/Toast/index.scss b/components/common/Toast/index.scss similarity index 100% rename from components/Toast/index.scss rename to components/common/Toast/index.scss diff --git a/components/Toast/index.tsx b/components/common/Toast/index.tsx similarity index 100% rename from components/Toast/index.tsx rename to components/common/Toast/index.tsx diff --git a/components/ToggleSwitch/index.scss b/components/common/ToggleSwitch/index.scss similarity index 100% rename from components/ToggleSwitch/index.scss rename to components/common/ToggleSwitch/index.scss diff --git a/components/ToggleSwitch/index.tsx b/components/common/ToggleSwitch/index.tsx similarity index 100% rename from components/ToggleSwitch/index.tsx rename to components/common/ToggleSwitch/index.tsx diff --git a/components/Token/index.scss b/components/common/Token/index.scss similarity index 100% rename from components/Token/index.scss rename to components/common/Token/index.scss diff --git a/components/Token/index.tsx b/components/common/Token/index.tsx similarity index 100% rename from components/Token/index.tsx rename to components/common/Token/index.tsx diff --git a/components/Tooltip/index.scss b/components/common/Tooltip/index.scss similarity index 100% rename from components/Tooltip/index.scss rename to components/common/Tooltip/index.scss diff --git a/components/Tooltip/index.tsx b/components/common/Tooltip/index.tsx similarity index 100% rename from components/Tooltip/index.tsx rename to components/common/Tooltip/index.tsx diff --git a/components/JobAccessoryItem/index.scss b/components/job/JobAccessoryItem/index.scss similarity index 100% rename from components/JobAccessoryItem/index.scss rename to components/job/JobAccessoryItem/index.scss diff --git a/components/JobAccessoryItem/index.tsx b/components/job/JobAccessoryItem/index.tsx similarity index 100% rename from components/JobAccessoryItem/index.tsx rename to components/job/JobAccessoryItem/index.tsx diff --git a/components/JobAccessoryPopover/index.scss b/components/job/JobAccessoryPopover/index.scss similarity index 100% rename from components/JobAccessoryPopover/index.scss rename to components/job/JobAccessoryPopover/index.scss diff --git a/components/JobAccessoryPopover/index.tsx b/components/job/JobAccessoryPopover/index.tsx similarity index 95% rename from components/JobAccessoryPopover/index.tsx rename to components/job/JobAccessoryPopover/index.tsx index 8f7ae501..45314a45 100644 --- a/components/JobAccessoryPopover/index.tsx +++ b/components/job/JobAccessoryPopover/index.tsx @@ -6,13 +6,13 @@ import classNames from 'classnames' import capitalizeFirstLetter from '~utils/capitalizeFirstLetter' import * as RadioGroup from '@radix-ui/react-radio-group' -import Button from '~components/Button' +import Button from '~components/common/Button' import { Popover, PopoverTrigger, PopoverContent, -} from '~components/PopoverContent' -import JobAccessoryItem from '~components/JobAccessoryItem' +} from '~components/common/PopoverContent' +import JobAccessoryItem from '~components/job/JobAccessoryItem' import './index.scss' diff --git a/components/JobDropdown/index.scss b/components/job/JobDropdown/index.scss similarity index 100% rename from components/JobDropdown/index.scss rename to components/job/JobDropdown/index.scss diff --git a/components/JobDropdown/index.tsx b/components/job/JobDropdown/index.tsx similarity index 96% rename from components/JobDropdown/index.tsx rename to components/job/JobDropdown/index.tsx index 7d4b0ab7..ceabe75c 100644 --- a/components/JobDropdown/index.tsx +++ b/components/job/JobDropdown/index.tsx @@ -3,9 +3,9 @@ import { useRouter } from 'next/router' import { useSnapshot } from 'valtio' import { useTranslation } from 'next-i18next' -import Select from '~components/Select' -import SelectItem from '~components/SelectItem' -import SelectGroup from '~components/SelectGroup' +import Select from '~components/common/Select' +import SelectItem from '~components/common/SelectItem' +import SelectGroup from '~components/common/SelectGroup' import { appState } from '~utils/appState' import { jobGroups } from '~data/jobGroups' diff --git a/components/JobImage/index.scss b/components/job/JobImage/index.scss similarity index 100% rename from components/JobImage/index.scss rename to components/job/JobImage/index.scss diff --git a/components/JobImage/index.tsx b/components/job/JobImage/index.tsx similarity index 95% rename from components/JobImage/index.tsx rename to components/job/JobImage/index.tsx index 91339331..15a5f8da 100644 --- a/components/JobImage/index.tsx +++ b/components/job/JobImage/index.tsx @@ -1,8 +1,8 @@ import React, { useState } from 'react' import { useRouter } from 'next/router' -import Button from '~components/Button' -import JobAccessoryPopover from '~components/JobAccessoryPopover' +import Button from '~components/common/Button' +import JobAccessoryPopover from '~components/job/JobAccessoryPopover' import ShieldIcon from '~public/icons/Shield.svg' import ManaturaIcon from '~public/icons/Manatura.svg' diff --git a/components/JobSection/index.scss b/components/job/JobSection/index.scss similarity index 100% rename from components/JobSection/index.scss rename to components/job/JobSection/index.scss diff --git a/components/JobSection/index.tsx b/components/job/JobSection/index.tsx similarity index 96% rename from components/JobSection/index.tsx rename to components/job/JobSection/index.tsx index e9323597..e9e2b1b9 100644 --- a/components/JobSection/index.tsx +++ b/components/job/JobSection/index.tsx @@ -3,10 +3,10 @@ import { useRouter } from 'next/router' import { useSnapshot } from 'valtio' import { useTranslation } from 'next-i18next' -import JobDropdown from '~components/JobDropdown' -import JobImage from '~components/JobImage' -import JobSkillItem from '~components/JobSkillItem' -import SearchModal from '~components/SearchModal' +import JobDropdown from '~components/job/JobDropdown' +import JobImage from '~components/job/JobImage' +import JobSkillItem from '~components/job/JobSkillItem' +import SearchModal from '~components/search/SearchModal' import api from '~utils/api' import { appState } from '~utils/appState' diff --git a/components/JobSkillItem/index.scss b/components/job/JobSkillItem/index.scss similarity index 100% rename from components/JobSkillItem/index.scss rename to components/job/JobSkillItem/index.scss diff --git a/components/JobSkillItem/index.tsx b/components/job/JobSkillItem/index.tsx similarity index 100% rename from components/JobSkillItem/index.tsx rename to components/job/JobSkillItem/index.tsx diff --git a/components/JobSkillResult/index.scss b/components/job/JobSkillResult/index.scss similarity index 100% rename from components/JobSkillResult/index.scss rename to components/job/JobSkillResult/index.scss diff --git a/components/JobSkillResult/index.tsx b/components/job/JobSkillResult/index.tsx similarity index 100% rename from components/JobSkillResult/index.tsx rename to components/job/JobSkillResult/index.tsx diff --git a/components/JobSkillSearchFilterBar/index.scss b/components/job/JobSkillSearchFilterBar/index.scss similarity index 100% rename from components/JobSkillSearchFilterBar/index.scss rename to components/job/JobSkillSearchFilterBar/index.scss diff --git a/components/JobSkillSearchFilterBar/index.tsx b/components/job/JobSkillSearchFilterBar/index.tsx similarity index 94% rename from components/JobSkillSearchFilterBar/index.tsx rename to components/job/JobSkillSearchFilterBar/index.tsx index 7eadbc2b..e58f011d 100644 --- a/components/JobSkillSearchFilterBar/index.tsx +++ b/components/job/JobSkillSearchFilterBar/index.tsx @@ -1,8 +1,8 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import Select from '~components/Select' -import SelectItem from '~components/SelectItem' +import Select from '~components/common/Select' +import SelectItem from '~components/common/SelectItem' import './index.scss' diff --git a/components/AwakeningSelect/index.scss b/components/mastery/AwakeningSelect/index.scss similarity index 100% rename from components/AwakeningSelect/index.scss rename to components/mastery/AwakeningSelect/index.scss diff --git a/components/AwakeningSelect/index.tsx b/components/mastery/AwakeningSelect/index.tsx similarity index 97% rename from components/AwakeningSelect/index.tsx rename to components/mastery/AwakeningSelect/index.tsx index b3feeebf..3271403e 100644 --- a/components/AwakeningSelect/index.tsx +++ b/components/mastery/AwakeningSelect/index.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react' import cloneDeep from 'lodash.clonedeep' -import SelectWithInput from '~components/SelectWithInput' +import SelectWithInput from '~components/common/SelectWithInput' import { weaponAwakening, characterAwakening } from '~data/awakening' import './index.scss' diff --git a/components/AxSelect/index.scss b/components/mastery/AxSelect/index.scss similarity index 100% rename from components/AxSelect/index.scss rename to components/mastery/AxSelect/index.scss diff --git a/components/AxSelect/index.tsx b/components/mastery/AxSelect/index.tsx similarity index 99% rename from components/AxSelect/index.tsx rename to components/mastery/AxSelect/index.tsx index 265eb536..6fc0af8f 100644 --- a/components/AxSelect/index.tsx +++ b/components/mastery/AxSelect/index.tsx @@ -2,8 +2,8 @@ import React, { ForwardedRef, useEffect, useState } from 'react' import { useRouter } from 'next/router' import { useTranslation } from 'next-i18next' -import Select from '~components/Select' -import SelectItem from '~components/SelectItem' +import Select from '~components/common/Select' +import SelectItem from '~components/common/SelectItem' import classNames from 'classnames' diff --git a/components/ExtendedMasterySelect/index.scss b/components/mastery/ExtendedMasterySelect/index.scss similarity index 100% rename from components/ExtendedMasterySelect/index.scss rename to components/mastery/ExtendedMasterySelect/index.scss diff --git a/components/ExtendedMasterySelect/index.tsx b/components/mastery/ExtendedMasterySelect/index.tsx similarity index 97% rename from components/ExtendedMasterySelect/index.tsx rename to components/mastery/ExtendedMasterySelect/index.tsx index ae97d9ae..3fdd7425 100644 --- a/components/ExtendedMasterySelect/index.tsx +++ b/components/mastery/ExtendedMasterySelect/index.tsx @@ -5,8 +5,8 @@ import { useTranslation } from 'next-i18next' import classNames from 'classnames' // UI Dependencies -import Select from '~components/Select' -import SelectItem from '~components/SelectItem' +import Select from '~components/common/Select' +import SelectItem from '~components/common/SelectItem' // Styles and icons import './index.scss' diff --git a/components/RingSelect/index.scss b/components/mastery/RingSelect/index.scss similarity index 100% rename from components/RingSelect/index.scss rename to components/mastery/RingSelect/index.scss diff --git a/components/RingSelect/index.tsx b/components/mastery/RingSelect/index.tsx similarity index 97% rename from components/RingSelect/index.tsx rename to components/mastery/RingSelect/index.tsx index 25727a32..b998b07d 100644 --- a/components/RingSelect/index.tsx +++ b/components/mastery/RingSelect/index.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react' // UI dependencies -import ExtendedMasterySelect from '~components/ExtendedMasterySelect' +import ExtendedMasterySelect from '~components/mastery/ExtendedMasterySelect' // Data import { overMastery } from '~data/overMastery' diff --git a/components/Party/index.scss b/components/party/Party/index.scss similarity index 100% rename from components/Party/index.scss rename to components/party/Party/index.scss diff --git a/components/Party/index.tsx b/components/party/Party/index.tsx similarity index 97% rename from components/Party/index.tsx rename to components/party/Party/index.tsx index 900898fb..4462b861 100644 --- a/components/Party/index.tsx +++ b/components/party/Party/index.tsx @@ -4,11 +4,11 @@ import { useRouter } from 'next/router' import { subscribe, useSnapshot } from 'valtio' import clonedeep from 'lodash.clonedeep' -import PartySegmentedControl from '~components/PartySegmentedControl' -import PartyDetails from '~components/PartyDetails' -import WeaponGrid from '~components/WeaponGrid' -import SummonGrid from '~components/SummonGrid' -import CharacterGrid from '~components/CharacterGrid' +import PartySegmentedControl from '~components/party/PartySegmentedControl' +import PartyDetails from '~components/party/PartyDetails' +import WeaponGrid from '~components/weapon/WeaponGrid' +import SummonGrid from '~components/summon/SummonGrid' +import CharacterGrid from '~components/character/CharacterGrid' import api from '~utils/api' import { accountState } from '~utils/accountState' diff --git a/components/PartyDetails/index.scss b/components/party/PartyDetails/index.scss similarity index 100% rename from components/PartyDetails/index.scss rename to components/party/PartyDetails/index.scss diff --git a/components/PartyDetails/index.tsx b/components/party/PartyDetails/index.tsx similarity index 98% rename from components/PartyDetails/index.tsx rename to components/party/PartyDetails/index.tsx index 6b2d914e..45b29554 100644 --- a/components/PartyDetails/index.tsx +++ b/components/party/PartyDetails/index.tsx @@ -10,18 +10,18 @@ import LiteYouTubeEmbed from 'react-lite-youtube-embed' import classNames from 'classnames' import reactStringReplace from 'react-string-replace' -import Alert from '~components/Alert' -import Button from '~components/Button' -import CharLimitedFieldset from '~components/CharLimitedFieldset' -import DurationInput from '~components/DurationInput' +import Alert from '~components/common/Alert' +import Button from '~components/common/Button' +import CharLimitedFieldset from '~components/common/CharLimitedFieldset' +import DurationInput from '~components/common/DurationInput' import GridRepCollection from '~components/GridRepCollection' import GridRep from '~components/GridRep' -import Input from '~components/Input' +import Input from '~components/common/Input' import RaidDropdown from '~components/RaidDropdown' -import Switch from '~components/Switch' -import Tooltip from '~components/Tooltip' -import TextFieldset from '~components/TextFieldset' -import Token from '~components/Token' +import Switch from '~components/common/Switch' +import Tooltip from '~components/common/Tooltip' +import TextFieldset from '~components/common/TextFieldset' +import Token from '~components/common/Token' import api from '~utils/api' import { accountState } from '~utils/accountState' diff --git a/components/PartyHead/index.tsx b/components/party/PartyHead/index.tsx similarity index 100% rename from components/PartyHead/index.tsx rename to components/party/PartyHead/index.tsx diff --git a/components/PartySegmentedControl/index.scss b/components/party/PartySegmentedControl/index.scss similarity index 100% rename from components/PartySegmentedControl/index.scss rename to components/party/PartySegmentedControl/index.scss diff --git a/components/PartySegmentedControl/index.tsx b/components/party/PartySegmentedControl/index.tsx similarity index 93% rename from components/PartySegmentedControl/index.tsx rename to components/party/PartySegmentedControl/index.tsx index c8ecf9d0..1c807dfb 100644 --- a/components/PartySegmentedControl/index.tsx +++ b/components/party/PartySegmentedControl/index.tsx @@ -4,9 +4,9 @@ import { useTranslation } from 'next-i18next' import { appState } from '~utils/appState' -import SegmentedControl from '~components/SegmentedControl' -import Segment from '~components/Segment' -import ToggleSwitch from '~components/ToggleSwitch' +import SegmentedControl from '~components/common/SegmentedControl' +import Segment from '~components/common/Segment' +import ToggleSwitch from '~components/common/ToggleSwitch' import { GridType } from '~utils/enums' diff --git a/components/SearchFilter/index.scss b/components/search/SearchFilter/index.scss similarity index 100% rename from components/SearchFilter/index.scss rename to components/search/SearchFilter/index.scss diff --git a/components/SearchFilter/index.tsx b/components/search/SearchFilter/index.tsx similarity index 100% rename from components/SearchFilter/index.tsx rename to components/search/SearchFilter/index.tsx diff --git a/components/SearchFilterCheckboxItem/index.scss b/components/search/SearchFilterCheckboxItem/index.scss similarity index 100% rename from components/SearchFilterCheckboxItem/index.scss rename to components/search/SearchFilterCheckboxItem/index.scss diff --git a/components/SearchFilterCheckboxItem/index.tsx b/components/search/SearchFilterCheckboxItem/index.tsx similarity index 100% rename from components/SearchFilterCheckboxItem/index.tsx rename to components/search/SearchFilterCheckboxItem/index.tsx diff --git a/components/SearchModal/index.scss b/components/search/SearchModal/index.scss similarity index 100% rename from components/SearchModal/index.scss rename to components/search/SearchModal/index.scss diff --git a/components/SearchModal/index.tsx b/components/search/SearchModal/index.tsx similarity index 93% rename from components/SearchModal/index.tsx rename to components/search/SearchModal/index.tsx index b8edf073..a35184c2 100644 --- a/components/SearchModal/index.tsx +++ b/components/search/SearchModal/index.tsx @@ -7,18 +7,18 @@ import cloneDeep from 'lodash.clonedeep' import api from '~utils/api' -import { Dialog, DialogTrigger, DialogClose } from '~components/Dialog' -import DialogContent from '~components/DialogContent' -import Input from '~components/LabelledInput' -import CharacterSearchFilterBar from '~components/CharacterSearchFilterBar' -import WeaponSearchFilterBar from '~components/WeaponSearchFilterBar' -import SummonSearchFilterBar from '~components/SummonSearchFilterBar' -import JobSkillSearchFilterBar from '~components/JobSkillSearchFilterBar' +import { Dialog, DialogTrigger, DialogClose } from '~components/common/Dialog' +import DialogContent from '~components/common/DialogContent' +import Input from '~components/common/LabelledInput' +import CharacterSearchFilterBar from '~components/character/CharacterSearchFilterBar' +import WeaponSearchFilterBar from '~components/weapon/WeaponSearchFilterBar' +import SummonSearchFilterBar from '~components/summon/SummonSearchFilterBar' +import JobSkillSearchFilterBar from '~components/job/JobSkillSearchFilterBar' -import CharacterResult from '~components/CharacterResult' -import WeaponResult from '~components/WeaponResult' -import SummonResult from '~components/SummonResult' -import JobSkillResult from '~components/JobSkillResult' +import CharacterResult from '~components/character/CharacterResult' +import WeaponResult from '~components/weapon/WeaponResult' +import SummonResult from '~components/summon/SummonResult' +import JobSkillResult from '~components/job/JobSkillResult' import type { DialogProps } from '@radix-ui/react-dialog' import type { SearchableObject, SearchableObjectArray } from '~types' diff --git a/components/ExtraSummons/index.scss b/components/summon/ExtraSummons/index.scss similarity index 100% rename from components/ExtraSummons/index.scss rename to components/summon/ExtraSummons/index.scss diff --git a/components/ExtraSummons/index.tsx b/components/summon/ExtraSummons/index.tsx similarity index 96% rename from components/ExtraSummons/index.tsx rename to components/summon/ExtraSummons/index.tsx index 58383ede..7c6ba706 100644 --- a/components/ExtraSummons/index.tsx +++ b/components/summon/ExtraSummons/index.tsx @@ -1,6 +1,6 @@ import React from 'react' import { useTranslation } from 'next-i18next' -import SummonUnit from '~components/SummonUnit' +import SummonUnit from '~components/summon/SummonUnit' import { SearchableObject } from '~types' import './index.scss' diff --git a/components/SummonGrid/index.scss b/components/summon/SummonGrid/index.scss similarity index 100% rename from components/SummonGrid/index.scss rename to components/summon/SummonGrid/index.scss diff --git a/components/SummonGrid/index.tsx b/components/summon/SummonGrid/index.tsx similarity index 98% rename from components/SummonGrid/index.tsx rename to components/summon/SummonGrid/index.tsx index 2df000a2..75f2b089 100644 --- a/components/SummonGrid/index.tsx +++ b/components/summon/SummonGrid/index.tsx @@ -7,9 +7,9 @@ import { useTranslation } from 'next-i18next' import { AxiosError, AxiosResponse } from 'axios' import debounce from 'lodash.debounce' -import Alert from '~components/Alert' -import SummonUnit from '~components/SummonUnit' -import ExtraSummons from '~components/ExtraSummons' +import Alert from '~components/common/Alert' +import SummonUnit from '~components/summon/SummonUnit' +import ExtraSummons from '~components/summon/ExtraSummons' import api from '~utils/api' import { appState } from '~utils/appState' diff --git a/components/SummonSearchFilterBar/index.scss b/components/summon/SummonHovercard/index.scss similarity index 100% rename from components/SummonSearchFilterBar/index.scss rename to components/summon/SummonHovercard/index.scss diff --git a/components/SummonHovercard/index.tsx b/components/summon/SummonHovercard/index.tsx similarity index 93% rename from components/SummonHovercard/index.tsx rename to components/summon/SummonHovercard/index.tsx index 1921b903..e225d3c1 100644 --- a/components/SummonHovercard/index.tsx +++ b/components/summon/SummonHovercard/index.tsx @@ -6,10 +6,10 @@ import { Hovercard, HovercardContent, HovercardTrigger, -} from '~components/Hovercard' -import Button from '~components/Button' -import WeaponLabelIcon from '~components/WeaponLabelIcon' -import UncapIndicator from '~components/UncapIndicator' +} from '~components/common/Hovercard' +import Button from '~components/common/Button' +import WeaponLabelIcon from '~components/weapon/WeaponLabelIcon' +import UncapIndicator from '~components/uncap/UncapIndicator' import './index.scss' diff --git a/components/SummonResult/index.scss b/components/summon/SummonResult/index.scss similarity index 100% rename from components/SummonResult/index.scss rename to components/summon/SummonResult/index.scss diff --git a/components/SummonResult/index.tsx b/components/summon/SummonResult/index.tsx similarity index 89% rename from components/SummonResult/index.tsx rename to components/summon/SummonResult/index.tsx index ac810251..ecaccb25 100644 --- a/components/SummonResult/index.tsx +++ b/components/summon/SummonResult/index.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useRouter } from 'next/router' -import UncapIndicator from '~components/UncapIndicator' -import WeaponLabelIcon from '~components/WeaponLabelIcon' +import UncapIndicator from '~components/uncap/UncapIndicator' +import WeaponLabelIcon from '~components/weapon/WeaponLabelIcon' import './index.scss' diff --git a/components/SwitchTableField/index.scss b/components/summon/SummonSearchFilterBar/index.scss similarity index 100% rename from components/SwitchTableField/index.scss rename to components/summon/SummonSearchFilterBar/index.scss diff --git a/components/SummonSearchFilterBar/index.tsx b/components/summon/SummonSearchFilterBar/index.tsx similarity index 96% rename from components/SummonSearchFilterBar/index.tsx rename to components/summon/SummonSearchFilterBar/index.tsx index c679da89..4edf4ccb 100644 --- a/components/SummonSearchFilterBar/index.tsx +++ b/components/summon/SummonSearchFilterBar/index.tsx @@ -5,8 +5,8 @@ import cloneDeep from 'lodash.clonedeep' import * as DropdownMenu from '@radix-ui/react-dropdown-menu' -import SearchFilter from '~components/SearchFilter' -import SearchFilterCheckboxItem from '~components/SearchFilterCheckboxItem' +import SearchFilter from '~components/search/SearchFilter' +import SearchFilterCheckboxItem from '~components/search/SearchFilterCheckboxItem' import './index.scss' import { emptyElementState, emptyRarityState } from '~utils/emptyStates' diff --git a/components/SummonUnit/index.scss b/components/summon/SummonUnit/index.scss similarity index 100% rename from components/SummonUnit/index.scss rename to components/summon/SummonUnit/index.scss diff --git a/components/SummonUnit/index.tsx b/components/summon/SummonUnit/index.tsx similarity index 95% rename from components/SummonUnit/index.tsx rename to components/summon/SummonUnit/index.tsx index 42e98651..2359cce3 100644 --- a/components/SummonUnit/index.tsx +++ b/components/summon/SummonUnit/index.tsx @@ -3,17 +3,17 @@ import { useRouter } from 'next/router' import { Trans, useTranslation } from 'next-i18next' import classNames from 'classnames' -import Alert from '~components/Alert' -import Button from '~components/Button' +import Alert from '~components/common/Alert' +import Button from '~components/common/Button' import { ContextMenu, ContextMenuTrigger, ContextMenuContent, -} from '~components/ContextMenu' -import ContextMenuItem from '~components/ContextMenuItem' -import SearchModal from '~components/SearchModal' -import SummonHovercard from '~components/SummonHovercard' -import UncapIndicator from '~components/UncapIndicator' +} from '~components/common/ContextMenu' +import ContextMenuItem from '~components/common/ContextMenuItem' +import SearchModal from '~components/search/SearchModal' +import SummonHovercard from '~components/summon/SummonHovercard' +import UncapIndicator from '~components/uncap/UncapIndicator' import type { SearchableObject } from '~types' diff --git a/components/TranscendenceFragment/index.scss b/components/uncap/TranscendenceFragment/index.scss similarity index 100% rename from components/TranscendenceFragment/index.scss rename to components/uncap/TranscendenceFragment/index.scss diff --git a/components/TranscendenceFragment/index.tsx b/components/uncap/TranscendenceFragment/index.tsx similarity index 100% rename from components/TranscendenceFragment/index.tsx rename to components/uncap/TranscendenceFragment/index.tsx diff --git a/components/TranscendencePopover/index.scss b/components/uncap/TranscendencePopover/index.scss similarity index 100% rename from components/TranscendencePopover/index.scss rename to components/uncap/TranscendencePopover/index.scss diff --git a/components/TranscendencePopover/index.tsx b/components/uncap/TranscendencePopover/index.tsx similarity index 94% rename from components/TranscendencePopover/index.tsx rename to components/uncap/TranscendencePopover/index.tsx index ed1f41ad..a5149ce0 100644 --- a/components/TranscendencePopover/index.tsx +++ b/components/uncap/TranscendencePopover/index.tsx @@ -6,8 +6,8 @@ import { Popover, PopoverAnchor, PopoverContent, -} from '~components/PopoverContent' -import TranscendenceStar from '~components/TranscendenceStar' +} from '~components/common/PopoverContent' +import TranscendenceStar from '~components/uncap/TranscendenceStar' import './index.scss' diff --git a/components/TranscendenceStar/index.scss b/components/uncap/TranscendenceStar/index.scss similarity index 100% rename from components/TranscendenceStar/index.scss rename to components/uncap/TranscendenceStar/index.scss diff --git a/components/TranscendenceStar/index.tsx b/components/uncap/TranscendenceStar/index.tsx similarity index 97% rename from components/TranscendenceStar/index.tsx rename to components/uncap/TranscendenceStar/index.tsx index 161be68b..624abf4b 100644 --- a/components/TranscendenceStar/index.tsx +++ b/components/uncap/TranscendenceStar/index.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react' import classnames from 'classnames' -import TranscendenceFragment from '~components/TranscendenceFragment' +import TranscendenceFragment from '~components/uncap/TranscendenceFragment' import './index.scss' interface Props diff --git a/components/UncapIndicator/index.scss b/components/uncap/UncapIndicator/index.scss similarity index 100% rename from components/UncapIndicator/index.scss rename to components/uncap/UncapIndicator/index.scss diff --git a/components/UncapIndicator/index.tsx b/components/uncap/UncapIndicator/index.tsx similarity index 95% rename from components/UncapIndicator/index.tsx rename to components/uncap/UncapIndicator/index.tsx index 5e8aa8e8..6dcc04e4 100644 --- a/components/UncapIndicator/index.tsx +++ b/components/uncap/UncapIndicator/index.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react' -import UncapStar from '~components/UncapStar' -import TranscendencePopover from '~components/TranscendencePopover' -import TranscendenceStar from '~components/TranscendenceStar' +import UncapStar from '~components/uncap/UncapStar' +import TranscendencePopover from '~components/uncap/TranscendencePopover' +import TranscendenceStar from '~components/uncap/TranscendenceStar' import './index.scss' diff --git a/components/UncapStar/index.scss b/components/uncap/UncapStar/index.scss similarity index 100% rename from components/UncapStar/index.scss rename to components/uncap/UncapStar/index.scss diff --git a/components/UncapStar/index.tsx b/components/uncap/UncapStar/index.tsx similarity index 100% rename from components/UncapStar/index.tsx rename to components/uncap/UncapStar/index.tsx diff --git a/components/ExtraWeapons/index.scss b/components/weapon/ExtraWeapons/index.scss similarity index 100% rename from components/ExtraWeapons/index.scss rename to components/weapon/ExtraWeapons/index.scss diff --git a/components/ExtraWeapons/index.tsx b/components/weapon/ExtraWeapons/index.tsx similarity index 95% rename from components/ExtraWeapons/index.tsx rename to components/weapon/ExtraWeapons/index.tsx index 705e1418..6c1ec552 100644 --- a/components/ExtraWeapons/index.tsx +++ b/components/weapon/ExtraWeapons/index.tsx @@ -1,6 +1,6 @@ import React from 'react' import { useTranslation } from 'next-i18next' -import WeaponUnit from '~components/WeaponUnit' +import WeaponUnit from '~components/weapon/WeaponUnit' import type { SearchableObject } from '~types' diff --git a/components/WeaponConflictModal/index.scss b/components/weapon/WeaponConflictModal/index.scss similarity index 100% rename from components/WeaponConflictModal/index.scss rename to components/weapon/WeaponConflictModal/index.scss diff --git a/components/WeaponConflictModal/index.tsx b/components/weapon/WeaponConflictModal/index.tsx similarity index 94% rename from components/WeaponConflictModal/index.tsx rename to components/weapon/WeaponConflictModal/index.tsx index a93f4345..f257a880 100644 --- a/components/WeaponConflictModal/index.tsx +++ b/components/weapon/WeaponConflictModal/index.tsx @@ -2,10 +2,10 @@ import React, { useEffect, useState } from 'react' import { useRouter } from 'next/router' import { Trans, useTranslation } from 'react-i18next' -import { Dialog } from '~components/Dialog' -import DialogContent from '~components/DialogContent' -import Button from '~components/Button' -import Overlay from '~components/Overlay' +import { Dialog } from '~components/common/Dialog' +import DialogContent from '~components/common/DialogContent' +import Button from '~components/common/Button' +import Overlay from '~components/common/Overlay' import mapWeaponSeries from '~utils/mapWeaponSeries' diff --git a/components/WeaponGrid/index.scss b/components/weapon/WeaponGrid/index.scss similarity index 100% rename from components/WeaponGrid/index.scss rename to components/weapon/WeaponGrid/index.scss diff --git a/components/WeaponGrid/index.tsx b/components/weapon/WeaponGrid/index.tsx similarity index 98% rename from components/WeaponGrid/index.tsx rename to components/weapon/WeaponGrid/index.tsx index 1c9f72c1..36ba8843 100644 --- a/components/WeaponGrid/index.tsx +++ b/components/weapon/WeaponGrid/index.tsx @@ -7,10 +7,10 @@ import { useTranslation } from 'next-i18next' import { AxiosError, AxiosResponse } from 'axios' import debounce from 'lodash.debounce' -import Alert from '~components/Alert' -import WeaponUnit from '~components/WeaponUnit' -import ExtraWeapons from '~components/ExtraWeapons' -import WeaponConflictModal from '~components/WeaponConflictModal' +import Alert from '~components/common/Alert' +import WeaponUnit from '~components/weapon/WeaponUnit' +import ExtraWeapons from '~components/weapon/ExtraWeapons' +import WeaponConflictModal from '~components/weapon/WeaponConflictModal' import api from '~utils/api' import { appState } from '~utils/appState' diff --git a/components/WeaponHovercard/index.scss b/components/weapon/WeaponHovercard/index.scss similarity index 100% rename from components/WeaponHovercard/index.scss rename to components/weapon/WeaponHovercard/index.scss diff --git a/components/WeaponHovercard/index.tsx b/components/weapon/WeaponHovercard/index.tsx similarity index 97% rename from components/WeaponHovercard/index.tsx rename to components/weapon/WeaponHovercard/index.tsx index bd025b07..c0e3f48b 100644 --- a/components/WeaponHovercard/index.tsx +++ b/components/weapon/WeaponHovercard/index.tsx @@ -6,10 +6,10 @@ import { Hovercard, HovercardContent, HovercardTrigger, -} from '~components/Hovercard' -import Button from '~components/Button' -import WeaponLabelIcon from '~components/WeaponLabelIcon' -import UncapIndicator from '~components/UncapIndicator' +} from '~components/common/Hovercard' +import Button from '~components/common/Button' +import WeaponLabelIcon from '~components/weapon/WeaponLabelIcon' +import UncapIndicator from '~components/uncap/UncapIndicator' import ax from '~data/ax' import { weaponAwakening } from '~data/awakening' diff --git a/components/WeaponKeySelect/index.scss b/components/weapon/WeaponKeySelect/index.scss similarity index 100% rename from components/WeaponKeySelect/index.scss rename to components/weapon/WeaponKeySelect/index.scss diff --git a/components/WeaponKeySelect/index.tsx b/components/weapon/WeaponKeySelect/index.tsx similarity index 96% rename from components/WeaponKeySelect/index.tsx rename to components/weapon/WeaponKeySelect/index.tsx index d1b735d5..1880921e 100644 --- a/components/WeaponKeySelect/index.tsx +++ b/components/weapon/WeaponKeySelect/index.tsx @@ -1,8 +1,8 @@ import React, { useEffect, useState } from 'react' -import Select from '~components/Select' -import SelectGroup from '~components/SelectGroup' -import SelectItem from '~components/SelectItem' +import Select from '~components/common/Select' +import SelectGroup from '~components/common/SelectGroup' +import SelectItem from '~components/common/SelectItem' import api from '~utils/api' import './index.scss' diff --git a/components/WeaponLabelIcon/index.scss b/components/weapon/WeaponLabelIcon/index.scss similarity index 100% rename from components/WeaponLabelIcon/index.scss rename to components/weapon/WeaponLabelIcon/index.scss diff --git a/components/WeaponLabelIcon/index.tsx b/components/weapon/WeaponLabelIcon/index.tsx similarity index 100% rename from components/WeaponLabelIcon/index.tsx rename to components/weapon/WeaponLabelIcon/index.tsx diff --git a/components/WeaponModal/index.scss b/components/weapon/WeaponModal/index.scss similarity index 100% rename from components/WeaponModal/index.scss rename to components/weapon/WeaponModal/index.scss diff --git a/components/WeaponModal/index.tsx b/components/weapon/WeaponModal/index.tsx similarity index 97% rename from components/WeaponModal/index.tsx rename to components/weapon/WeaponModal/index.tsx index d7fcdec0..157529be 100644 --- a/components/WeaponModal/index.tsx +++ b/components/weapon/WeaponModal/index.tsx @@ -9,13 +9,13 @@ import { DialogClose, DialogTitle, DialogTrigger, -} from '~components/Dialog' -import DialogContent from '~components/DialogContent' -import AXSelect from '~components/AxSelect' -import AwakeningSelect from '~components/AwakeningSelect' +} from '~components/common/Dialog' +import DialogContent from '~components/common/DialogContent' +import AXSelect from '~components/mastery/AxSelect' +import AwakeningSelect from '~components/mastery/AwakeningSelect' import ElementToggle from '~components/ElementToggle' -import WeaponKeySelect from '~components/WeaponKeySelect' -import Button from '~components/Button' +import WeaponKeySelect from '~components/weapon/WeaponKeySelect' +import Button from '~components/common/Button' import api from '~utils/api' import { appState } from '~utils/appState' diff --git a/components/WeaponResult/index.scss b/components/weapon/WeaponResult/index.scss similarity index 100% rename from components/WeaponResult/index.scss rename to components/weapon/WeaponResult/index.scss diff --git a/components/WeaponResult/index.tsx b/components/weapon/WeaponResult/index.tsx similarity index 90% rename from components/WeaponResult/index.tsx rename to components/weapon/WeaponResult/index.tsx index 28fc780b..5fe233c9 100644 --- a/components/WeaponResult/index.tsx +++ b/components/weapon/WeaponResult/index.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useRouter } from 'next/router' -import UncapIndicator from '~components/UncapIndicator' -import WeaponLabelIcon from '~components/WeaponLabelIcon' +import UncapIndicator from '~components/uncap/UncapIndicator' +import WeaponLabelIcon from '~components/weapon/WeaponLabelIcon' import './index.scss' diff --git a/components/WeaponSearchFilterBar/index.scss b/components/weapon/WeaponSearchFilterBar/index.scss similarity index 100% rename from components/WeaponSearchFilterBar/index.scss rename to components/weapon/WeaponSearchFilterBar/index.scss diff --git a/components/WeaponSearchFilterBar/index.tsx b/components/weapon/WeaponSearchFilterBar/index.tsx similarity index 98% rename from components/WeaponSearchFilterBar/index.tsx rename to components/weapon/WeaponSearchFilterBar/index.tsx index 3839d7e1..d19a67aa 100644 --- a/components/WeaponSearchFilterBar/index.tsx +++ b/components/weapon/WeaponSearchFilterBar/index.tsx @@ -5,8 +5,8 @@ import cloneDeep from 'lodash.clonedeep' import * as DropdownMenu from '@radix-ui/react-dropdown-menu' -import SearchFilter from '~components/SearchFilter' -import SearchFilterCheckboxItem from '~components/SearchFilterCheckboxItem' +import SearchFilter from '~components/search/SearchFilter' +import SearchFilterCheckboxItem from '~components/search/SearchFilterCheckboxItem' import './index.scss' import { diff --git a/components/WeaponUnit/index.scss b/components/weapon/WeaponUnit/index.scss similarity index 100% rename from components/WeaponUnit/index.scss rename to components/weapon/WeaponUnit/index.scss diff --git a/components/WeaponUnit/index.tsx b/components/weapon/WeaponUnit/index.tsx similarity index 97% rename from components/WeaponUnit/index.tsx rename to components/weapon/WeaponUnit/index.tsx index 3f018207..806cf8b6 100644 --- a/components/WeaponUnit/index.tsx +++ b/components/weapon/WeaponUnit/index.tsx @@ -3,18 +3,18 @@ import { useRouter } from 'next/router' import { Trans, useTranslation } from 'next-i18next' import classNames from 'classnames' -import Alert from '~components/Alert' -import SearchModal from '~components/SearchModal' -import WeaponModal from '~components/WeaponModal' +import Alert from '~components/common/Alert' +import SearchModal from '~components/search/SearchModal' +import WeaponModal from '~components/weapon/WeaponModal' import { ContextMenu, ContextMenuTrigger, ContextMenuContent, -} from '~components/ContextMenu' -import ContextMenuItem from '~components/ContextMenuItem' -import WeaponHovercard from '~components/WeaponHovercard' -import UncapIndicator from '~components/UncapIndicator' -import Button from '~components/Button' +} from '~components/common/ContextMenu' +import ContextMenuItem from '~components/common/ContextMenuItem' +import WeaponHovercard from '~components/weapon/WeaponHovercard' +import UncapIndicator from '~components/uncap/UncapIndicator' +import Button from '~components/common/Button' import type { SearchableObject } from '~types' diff --git a/pages/about.tsx b/pages/about.tsx index e708e89c..3ddbe9d7 100644 --- a/pages/about.tsx +++ b/pages/about.tsx @@ -8,12 +8,12 @@ import { serverSideTranslations } from 'next-i18next/serverSideTranslations' import { AboutTabs } from '~utils/enums' import { setHeaders } from '~utils/userToken' -import AboutHead from '~components/AboutHead' -import AboutPage from '~components/AboutPage' -import UpdatesPage from '~components/UpdatesPage' -import RoadmapPage from '~components/RoadmapPage' -import SegmentedControl from '~components/SegmentedControl' -import Segment from '~components/Segment' +import AboutHead from '~components/about/AboutHead' +import AboutPage from '~components/about/AboutPage' +import UpdatesPage from '~components/about/UpdatesPage' +import RoadmapPage from '~components/about/RoadmapPage' +import SegmentedControl from '~components/common/SegmentedControl' +import Segment from '~components/common/Segment' import type { NextApiRequest, NextApiResponse } from 'next' diff --git a/pages/new/index.tsx b/pages/new/index.tsx index a89e554a..951f5b27 100644 --- a/pages/new/index.tsx +++ b/pages/new/index.tsx @@ -7,7 +7,7 @@ import { v4 as uuidv4 } from 'uuid' import clonedeep from 'lodash.clonedeep' import ErrorSection from '~components/ErrorSection' -import Party from '~components/Party' +import Party from '~components/party/Party' import NewHead from '~components/NewHead' import api from '~utils/api' diff --git a/pages/p/[party].tsx b/pages/p/[party].tsx index 7b98fd1a..145e4e0f 100644 --- a/pages/p/[party].tsx +++ b/pages/p/[party].tsx @@ -2,9 +2,9 @@ import React, { useEffect, useState } from 'react' import { useRouter } from 'next/router' import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import Party from '~components/Party' +import Party from '~components/party/Party' import ErrorSection from '~components/ErrorSection' -import PartyHead from '~components/PartyHead' +import PartyHead from '~components/party/PartyHead' import api from '~utils/api' import elementEmoji from '~utils/elementEmoji'