From 82951548ef7b56634b6823a7bbefc37a2b42405f Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Mon, 15 Nov 2021 18:29:20 +0000 Subject: [PATCH] reorg Form components one level up --- src/@utils/aquarius.ts | 2 +- .../@shared/AssetList/AssetComputeList.module.css | 14 +++++++------- .../@shared/AssetList/AssetComputeList.tsx | 2 +- .../Form/FormFields/URLInput/Input.module.css | 3 --- .../FormFields/AdvancedSettings.module.css | 0 .../{Form => }/FormFields/AdvancedSettings.tsx | 2 +- .../FormFields/AssetSelection.module.css | 4 ++-- .../{Form => }/FormFields/AssetSelection.tsx | 2 +- .../{Form => }/FormFields/BoxSelection.module.css | 0 .../@shared/{Form => }/FormFields/BoxSelection.tsx | 0 .../{Form => }/FormFields/CustomProvider.tsx | 2 +- .../FormFields/Datatoken/RefreshName.module.css | 0 .../FormFields/Datatoken/RefreshName.tsx | 0 .../FormFields/Datatoken/index.module.css | 0 .../{Form => }/FormFields/Datatoken/index.tsx | 2 +- .../FormFields/FilesInput/Info.module.css | 0 .../{Form => }/FormFields/FilesInput/Info.tsx | 0 .../{Form => }/FormFields/FilesInput/index.tsx | 2 +- .../{Form => }/FormFields/FilesInput/utils.ts | 0 .../{Form => }/FormFields/Nft/index.module.css | 0 .../@shared/{Form => }/FormFields/Nft/index.tsx | 2 +- .../@shared/FormFields/URLInput/Input.module.css | 3 +++ .../{Form => }/FormFields/URLInput/Input.tsx | 2 +- .../Input => FormInput}/Disclaimer.module.css | 0 .../{Form/Input => FormInput}/Disclaimer.tsx | 0 .../{Form/Input => FormInput}/Help.module.css | 0 .../@shared/{Form/Input => FormInput}/Help.tsx | 0 .../Input => FormInput}/InputElement.module.css | 0 .../{Form/Input => FormInput}/InputElement.tsx | 0 .../Input => FormInput}/InputGroup.module.css | 0 .../{Form/Input => FormInput}/InputGroup.tsx | 0 .../{Form/Input => FormInput}/Label.module.css | 0 .../@shared/{Form/Input => FormInput}/Label.tsx | 0 .../{Form/Input => FormInput}/Row.module.css | 0 .../@shared/{Form/Input => FormInput}/Row.tsx | 0 .../{Form/Input => FormInput}/index.module.css | 0 .../@shared/{Form/Input => FormInput}/index.tsx | 0 .../@shared/{Form => }/FormikPersist.tsx | 0 .../Compute/AlgorithmDatasetsListForCompute.tsx | 2 +- .../AssetActions/Compute/FormComputeDataset.tsx | 4 ++-- .../Asset/AssetActions/Compute/index.tsx | 2 +- .../AssetActions/Edit/FormEditComputeDataset.tsx | 4 ++-- .../Asset/AssetActions/Edit/FormEditMetadata.tsx | 2 +- .../Asset/AssetActions/Pool/Add/FormAdd.tsx | 2 +- .../Asset/AssetActions/Pool/Add/Output.tsx | 2 +- .../Asset/AssetActions/Pool/CoinSelect.module.css | 2 +- src/components/Asset/AssetActions/Pool/Remove.tsx | 4 ++-- .../Asset/AssetActions/Trade/Slippage.tsx | 2 +- .../Asset/AssetActions/Trade/TradeInput.tsx | 2 +- src/components/Header/SearchBar.tsx | 2 +- .../Header/UserPreferences/Appearance.tsx | 6 +++--- src/components/Header/UserPreferences/Currency.tsx | 2 +- src/components/Header/UserPreferences/Debug.tsx | 2 +- .../Networks/NetworkItem.module.css | 6 +++--- .../Header/UserPreferences/Networks/index.tsx | 4 ++-- .../Header/UserPreferences/TokenApproval.tsx | 2 +- src/components/Privacy/CookieModule.tsx | 2 +- .../Profile/History/ComputeJobs/Results.tsx | 2 +- src/components/Publish/Metadata/index.tsx | 4 ++-- src/components/Publish/Pricing/Coin.tsx | 2 +- src/components/Publish/Pricing/Dynamic.tsx | 2 +- src/components/Publish/Pricing/Error.tsx | 2 +- src/components/Publish/Pricing/Fees.tsx | 2 +- src/components/Publish/Pricing/Fixed.tsx | 2 +- src/components/Publish/Pricing/Free.tsx | 2 +- src/components/Publish/Pricing/Price.tsx | 2 +- src/components/Publish/Services/index.tsx | 2 +- src/components/Search/sort.module.css | 2 +- 68 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 src/components/@shared/Form/FormFields/URLInput/Input.module.css rename src/components/@shared/{Form => }/FormFields/AdvancedSettings.module.css (100%) rename src/components/@shared/{Form => }/FormFields/AdvancedSettings.tsx (97%) rename src/components/@shared/{Form => }/FormFields/AssetSelection.module.css (94%) rename src/components/@shared/{Form => }/FormFields/AssetSelection.tsx (98%) rename src/components/@shared/{Form => }/FormFields/BoxSelection.module.css (100%) rename src/components/@shared/{Form => }/FormFields/BoxSelection.tsx (100%) rename src/components/@shared/{Form => }/FormFields/CustomProvider.tsx (97%) rename src/components/@shared/{Form => }/FormFields/Datatoken/RefreshName.module.css (100%) rename src/components/@shared/{Form => }/FormFields/Datatoken/RefreshName.tsx (100%) rename src/components/@shared/{Form => }/FormFields/Datatoken/index.module.css (100%) rename src/components/@shared/{Form => }/FormFields/Datatoken/index.tsx (95%) rename src/components/@shared/{Form => }/FormFields/FilesInput/Info.module.css (100%) rename src/components/@shared/{Form => }/FormFields/FilesInput/Info.tsx (100%) rename src/components/@shared/{Form => }/FormFields/FilesInput/index.tsx (97%) rename src/components/@shared/{Form => }/FormFields/FilesInput/utils.ts (100%) rename src/components/@shared/{Form => }/FormFields/Nft/index.module.css (100%) rename src/components/@shared/{Form => }/FormFields/Nft/index.tsx (94%) create mode 100644 src/components/@shared/FormFields/URLInput/Input.module.css rename src/components/@shared/{Form => }/FormFields/URLInput/Input.tsx (95%) rename src/components/@shared/{Form/Input => FormInput}/Disclaimer.module.css (100%) rename src/components/@shared/{Form/Input => FormInput}/Disclaimer.tsx (100%) rename src/components/@shared/{Form/Input => FormInput}/Help.module.css (100%) rename src/components/@shared/{Form/Input => FormInput}/Help.tsx (100%) rename src/components/@shared/{Form/Input => FormInput}/InputElement.module.css (100%) rename src/components/@shared/{Form/Input => FormInput}/InputElement.tsx (100%) rename src/components/@shared/{Form/Input => FormInput}/InputGroup.module.css (100%) rename src/components/@shared/{Form/Input => FormInput}/InputGroup.tsx (100%) rename src/components/@shared/{Form/Input => FormInput}/Label.module.css (100%) rename src/components/@shared/{Form/Input => FormInput}/Label.tsx (100%) rename src/components/@shared/{Form/Input => FormInput}/Row.module.css (100%) rename src/components/@shared/{Form/Input => FormInput}/Row.tsx (100%) rename src/components/@shared/{Form/Input => FormInput}/index.module.css (100%) rename src/components/@shared/{Form/Input => FormInput}/index.tsx (100%) rename src/components/@shared/{Form => }/FormikPersist.tsx (100%) diff --git a/src/@utils/aquarius.ts b/src/@utils/aquarius.ts index e115f0426..229a9e2fd 100644 --- a/src/@utils/aquarius.ts +++ b/src/@utils/aquarius.ts @@ -1,5 +1,5 @@ import { Logger } from '@oceanprotocol/lib' -import { AssetSelectionAsset } from '@shared/Form/FormFields/AssetSelection' +import { AssetSelectionAsset } from '@shared/FormFields/AssetSelection' import { PriceList, getAssetsPriceList } from './subgraph' import axios, { CancelToken, AxiosResponse } from 'axios' import { OrdersData_tokenOrders as OrdersData } from '../@types/apollo/OrdersData' diff --git a/src/components/@shared/AssetList/AssetComputeList.module.css b/src/components/@shared/AssetList/AssetComputeList.module.css index ed4ccd271..3cb3c406b 100644 --- a/src/components/@shared/AssetList/AssetComputeList.module.css +++ b/src/components/@shared/AssetList/AssetComputeList.module.css @@ -1,5 +1,5 @@ .display { - composes: selection from '@shared/Form/FormFields/AssetSelection.module.css'; + composes: selection from '@shared/FormFields/AssetSelection.module.css'; } .display [class*='loaderWrap'] { @@ -7,14 +7,14 @@ } .scroll { - composes: scroll from '@shared/Form/FormFields/AssetSelection.module.css'; + composes: scroll from '@shared/FormFields/AssetSelection.module.css'; margin-top: 0; border-top: none; width: 100%; } .row { - composes: row from '@shared/Form/FormFields/AssetSelection.module.css'; + composes: row from '@shared/FormFields/AssetSelection.module.css'; } .row:last-child { @@ -35,7 +35,7 @@ } .title { - composes: title from '@shared/Form/FormFields/AssetSelection.module.css'; + composes: title from '@shared/FormFields/AssetSelection.module.css'; } .hover:hover { @@ -43,7 +43,7 @@ } .price { - composes: price from '@shared/Form/FormFields/AssetSelection.module.css'; + composes: price from '@shared/FormFields/AssetSelection.module.css'; } .price [class*='symbol'] { @@ -51,9 +51,9 @@ } .did { - composes: did from '@shared/Form/FormFields/AssetSelection.module.css'; + composes: did from '@shared/FormFields/AssetSelection.module.css'; } .empty { - composes: empty from '@shared/Form/FormFields/AssetSelection.module.css'; + composes: empty from '@shared/FormFields/AssetSelection.module.css'; } diff --git a/src/components/@shared/AssetList/AssetComputeList.tsx b/src/components/@shared/AssetList/AssetComputeList.tsx index 13ff2ec1d..b713a6102 100644 --- a/src/components/@shared/AssetList/AssetComputeList.tsx +++ b/src/components/@shared/AssetList/AssetComputeList.tsx @@ -4,7 +4,7 @@ import Link from 'next/link' import PriceUnit from '@shared/Price/PriceUnit' import Loader from '@shared/atoms/Loader' import styles from './AssetComputeList.module.css' -import { AssetSelectionAsset } from '@shared/Form/FormFields/AssetSelection' +import { AssetSelectionAsset } from '@shared/FormFields/AssetSelection' function Empty() { return
No assets found.
diff --git a/src/components/@shared/Form/FormFields/URLInput/Input.module.css b/src/components/@shared/Form/FormFields/URLInput/Input.module.css deleted file mode 100644 index 9caeaf849..000000000 --- a/src/components/@shared/Form/FormFields/URLInput/Input.module.css +++ /dev/null @@ -1,3 +0,0 @@ -.input { - composes: input from '@shared/Form/Input/InputElement.module.css'; -} diff --git a/src/components/@shared/Form/FormFields/AdvancedSettings.module.css b/src/components/@shared/FormFields/AdvancedSettings.module.css similarity index 100% rename from src/components/@shared/Form/FormFields/AdvancedSettings.module.css rename to src/components/@shared/FormFields/AdvancedSettings.module.css diff --git a/src/components/@shared/Form/FormFields/AdvancedSettings.tsx b/src/components/@shared/FormFields/AdvancedSettings.tsx similarity index 97% rename from src/components/@shared/Form/FormFields/AdvancedSettings.tsx rename to src/components/@shared/FormFields/AdvancedSettings.tsx index 20eab111d..5b83c4b57 100644 --- a/src/components/@shared/Form/FormFields/AdvancedSettings.tsx +++ b/src/components/@shared/FormFields/AdvancedSettings.tsx @@ -1,5 +1,5 @@ import React, { ReactElement, useState, FormEvent, ChangeEvent } from 'react' -import Input from '@shared/Form/Input' +import Input from '@shared/FormInput' import Button from '@shared/atoms/Button' import { Field } from 'formik' import styles from './AdvancedSettings.module.css' diff --git a/src/components/@shared/Form/FormFields/AssetSelection.module.css b/src/components/@shared/FormFields/AssetSelection.module.css similarity index 94% rename from src/components/@shared/Form/FormFields/AssetSelection.module.css rename to src/components/@shared/FormFields/AssetSelection.module.css index 4466a4868..cb0a09c19 100644 --- a/src/components/@shared/Form/FormFields/AssetSelection.module.css +++ b/src/components/@shared/FormFields/AssetSelection.module.css @@ -58,11 +58,11 @@ } .radio { - composes: radio from '@shared/Form/Input/InputElement.module.css'; + composes: radio from '@shared/FormInput/InputElement.module.css'; } .checkbox { - composes: checkbox from '@shared/Form/Input/InputElement.module.css'; + composes: checkbox from '@shared/FormInput/InputElement.module.css'; } .title { diff --git a/src/components/@shared/Form/FormFields/AssetSelection.tsx b/src/components/@shared/FormFields/AssetSelection.tsx similarity index 98% rename from src/components/@shared/Form/FormFields/AssetSelection.tsx rename to src/components/@shared/FormFields/AssetSelection.tsx index 5517f7abd..19950c2ed 100644 --- a/src/components/@shared/Form/FormFields/AssetSelection.tsx +++ b/src/components/@shared/FormFields/AssetSelection.tsx @@ -4,7 +4,7 @@ import slugify from 'slugify' import classNames from 'classnames/bind' import PriceUnit from '@shared/Price/PriceUnit' import External from '@images/external.svg' -import InputElement from '@shared/Form/Input/InputElement' +import InputElement from '@shared/FormInput/InputElement' import Loader from '@shared/atoms/Loader' import styles from './AssetSelection.module.css' diff --git a/src/components/@shared/Form/FormFields/BoxSelection.module.css b/src/components/@shared/FormFields/BoxSelection.module.css similarity index 100% rename from src/components/@shared/Form/FormFields/BoxSelection.module.css rename to src/components/@shared/FormFields/BoxSelection.module.css diff --git a/src/components/@shared/Form/FormFields/BoxSelection.tsx b/src/components/@shared/FormFields/BoxSelection.tsx similarity index 100% rename from src/components/@shared/Form/FormFields/BoxSelection.tsx rename to src/components/@shared/FormFields/BoxSelection.tsx diff --git a/src/components/@shared/Form/FormFields/CustomProvider.tsx b/src/components/@shared/FormFields/CustomProvider.tsx similarity index 97% rename from src/components/@shared/Form/FormFields/CustomProvider.tsx rename to src/components/@shared/FormFields/CustomProvider.tsx index 5347b85e7..77c107024 100644 --- a/src/components/@shared/Form/FormFields/CustomProvider.tsx +++ b/src/components/@shared/FormFields/CustomProvider.tsx @@ -3,7 +3,7 @@ import { useField } from 'formik' import { toast } from 'react-toastify' import CustomInput from './URLInput/Input' import { useOcean } from '@context/Ocean' -import { InputProps } from '@shared/Form/Input' +import { InputProps } from '@shared/FormInput' export default function CustomProvider(props: InputProps): ReactElement { const [field, meta, helpers] = useField(props.name) diff --git a/src/components/@shared/Form/FormFields/Datatoken/RefreshName.module.css b/src/components/@shared/FormFields/Datatoken/RefreshName.module.css similarity index 100% rename from src/components/@shared/Form/FormFields/Datatoken/RefreshName.module.css rename to src/components/@shared/FormFields/Datatoken/RefreshName.module.css diff --git a/src/components/@shared/Form/FormFields/Datatoken/RefreshName.tsx b/src/components/@shared/FormFields/Datatoken/RefreshName.tsx similarity index 100% rename from src/components/@shared/Form/FormFields/Datatoken/RefreshName.tsx rename to src/components/@shared/FormFields/Datatoken/RefreshName.tsx diff --git a/src/components/@shared/Form/FormFields/Datatoken/index.module.css b/src/components/@shared/FormFields/Datatoken/index.module.css similarity index 100% rename from src/components/@shared/Form/FormFields/Datatoken/index.module.css rename to src/components/@shared/FormFields/Datatoken/index.module.css diff --git a/src/components/@shared/Form/FormFields/Datatoken/index.tsx b/src/components/@shared/FormFields/Datatoken/index.tsx similarity index 95% rename from src/components/@shared/Form/FormFields/Datatoken/index.tsx rename to src/components/@shared/FormFields/Datatoken/index.tsx index 955ce2a5a..a8728b24f 100644 --- a/src/components/@shared/Form/FormFields/Datatoken/index.tsx +++ b/src/components/@shared/FormFields/Datatoken/index.tsx @@ -1,6 +1,6 @@ import { useField } from 'formik' import React, { ReactElement, useEffect } from 'react' -import { InputProps } from '@shared/Form/Input' +import { InputProps } from '@shared/FormInput' import Logo from '@images/logo.svg' import RefreshName from './RefreshName' import styles from './index.module.css' diff --git a/src/components/@shared/Form/FormFields/FilesInput/Info.module.css b/src/components/@shared/FormFields/FilesInput/Info.module.css similarity index 100% rename from src/components/@shared/Form/FormFields/FilesInput/Info.module.css rename to src/components/@shared/FormFields/FilesInput/Info.module.css diff --git a/src/components/@shared/Form/FormFields/FilesInput/Info.tsx b/src/components/@shared/FormFields/FilesInput/Info.tsx similarity index 100% rename from src/components/@shared/Form/FormFields/FilesInput/Info.tsx rename to src/components/@shared/FormFields/FilesInput/Info.tsx diff --git a/src/components/@shared/Form/FormFields/FilesInput/index.tsx b/src/components/@shared/FormFields/FilesInput/index.tsx similarity index 97% rename from src/components/@shared/Form/FormFields/FilesInput/index.tsx rename to src/components/@shared/FormFields/FilesInput/index.tsx index 2d0a05a0e..89f587f49 100644 --- a/src/components/@shared/Form/FormFields/FilesInput/index.tsx +++ b/src/components/@shared/FormFields/FilesInput/index.tsx @@ -3,7 +3,7 @@ import { useField } from 'formik' import { toast } from 'react-toastify' import FileInfo from './Info' import CustomInput from '../URLInput/Input' -import { InputProps } from '@shared/Form/Input' +import { InputProps } from '@shared/FormInput' import { getFileInfo } from '@utils/provider' import { useWeb3 } from '@context/Web3' import { getOceanConfig } from '@utils/ocean' diff --git a/src/components/@shared/Form/FormFields/FilesInput/utils.ts b/src/components/@shared/FormFields/FilesInput/utils.ts similarity index 100% rename from src/components/@shared/Form/FormFields/FilesInput/utils.ts rename to src/components/@shared/FormFields/FilesInput/utils.ts diff --git a/src/components/@shared/Form/FormFields/Nft/index.module.css b/src/components/@shared/FormFields/Nft/index.module.css similarity index 100% rename from src/components/@shared/Form/FormFields/Nft/index.module.css rename to src/components/@shared/FormFields/Nft/index.module.css diff --git a/src/components/@shared/Form/FormFields/Nft/index.tsx b/src/components/@shared/FormFields/Nft/index.tsx similarity index 94% rename from src/components/@shared/Form/FormFields/Nft/index.tsx rename to src/components/@shared/FormFields/Nft/index.tsx index 6db50fb62..66a527d5b 100644 --- a/src/components/@shared/Form/FormFields/Nft/index.tsx +++ b/src/components/@shared/FormFields/Nft/index.tsx @@ -1,4 +1,4 @@ -import { InputProps } from '@shared/Form/Input' +import { InputProps } from '@shared/FormInput' import { generateNftOptions } from '@utils/nft' import { useField } from 'formik' import React, { ReactElement, useEffect } from 'react' diff --git a/src/components/@shared/FormFields/URLInput/Input.module.css b/src/components/@shared/FormFields/URLInput/Input.module.css new file mode 100644 index 000000000..ac1350d31 --- /dev/null +++ b/src/components/@shared/FormFields/URLInput/Input.module.css @@ -0,0 +1,3 @@ +.input { + composes: input from '@shared/FormInput/InputElement.module.css'; +} diff --git a/src/components/@shared/Form/FormFields/URLInput/Input.tsx b/src/components/@shared/FormFields/URLInput/Input.tsx similarity index 95% rename from src/components/@shared/Form/FormFields/URLInput/Input.tsx rename to src/components/@shared/FormFields/URLInput/Input.tsx index 9e7361406..3be11a425 100644 --- a/src/components/@shared/Form/FormFields/URLInput/Input.tsx +++ b/src/components/@shared/FormFields/URLInput/Input.tsx @@ -3,7 +3,7 @@ import Button from '@shared/atoms/Button' import { FieldInputProps, useField } from 'formik' import Loader from '@shared/atoms/Loader' import styles from './Input.module.css' -import InputGroup from '@shared/Form/Input/InputGroup' +import InputGroup from '@shared/FormInput/InputGroup' export default function URLInput({ submitText, diff --git a/src/components/@shared/Form/Input/Disclaimer.module.css b/src/components/@shared/FormInput/Disclaimer.module.css similarity index 100% rename from src/components/@shared/Form/Input/Disclaimer.module.css rename to src/components/@shared/FormInput/Disclaimer.module.css diff --git a/src/components/@shared/Form/Input/Disclaimer.tsx b/src/components/@shared/FormInput/Disclaimer.tsx similarity index 100% rename from src/components/@shared/Form/Input/Disclaimer.tsx rename to src/components/@shared/FormInput/Disclaimer.tsx diff --git a/src/components/@shared/Form/Input/Help.module.css b/src/components/@shared/FormInput/Help.module.css similarity index 100% rename from src/components/@shared/Form/Input/Help.module.css rename to src/components/@shared/FormInput/Help.module.css diff --git a/src/components/@shared/Form/Input/Help.tsx b/src/components/@shared/FormInput/Help.tsx similarity index 100% rename from src/components/@shared/Form/Input/Help.tsx rename to src/components/@shared/FormInput/Help.tsx diff --git a/src/components/@shared/Form/Input/InputElement.module.css b/src/components/@shared/FormInput/InputElement.module.css similarity index 100% rename from src/components/@shared/Form/Input/InputElement.module.css rename to src/components/@shared/FormInput/InputElement.module.css diff --git a/src/components/@shared/Form/Input/InputElement.tsx b/src/components/@shared/FormInput/InputElement.tsx similarity index 100% rename from src/components/@shared/Form/Input/InputElement.tsx rename to src/components/@shared/FormInput/InputElement.tsx diff --git a/src/components/@shared/Form/Input/InputGroup.module.css b/src/components/@shared/FormInput/InputGroup.module.css similarity index 100% rename from src/components/@shared/Form/Input/InputGroup.module.css rename to src/components/@shared/FormInput/InputGroup.module.css diff --git a/src/components/@shared/Form/Input/InputGroup.tsx b/src/components/@shared/FormInput/InputGroup.tsx similarity index 100% rename from src/components/@shared/Form/Input/InputGroup.tsx rename to src/components/@shared/FormInput/InputGroup.tsx diff --git a/src/components/@shared/Form/Input/Label.module.css b/src/components/@shared/FormInput/Label.module.css similarity index 100% rename from src/components/@shared/Form/Input/Label.module.css rename to src/components/@shared/FormInput/Label.module.css diff --git a/src/components/@shared/Form/Input/Label.tsx b/src/components/@shared/FormInput/Label.tsx similarity index 100% rename from src/components/@shared/Form/Input/Label.tsx rename to src/components/@shared/FormInput/Label.tsx diff --git a/src/components/@shared/Form/Input/Row.module.css b/src/components/@shared/FormInput/Row.module.css similarity index 100% rename from src/components/@shared/Form/Input/Row.module.css rename to src/components/@shared/FormInput/Row.module.css diff --git a/src/components/@shared/Form/Input/Row.tsx b/src/components/@shared/FormInput/Row.tsx similarity index 100% rename from src/components/@shared/Form/Input/Row.tsx rename to src/components/@shared/FormInput/Row.tsx diff --git a/src/components/@shared/Form/Input/index.module.css b/src/components/@shared/FormInput/index.module.css similarity index 100% rename from src/components/@shared/Form/Input/index.module.css rename to src/components/@shared/FormInput/index.module.css diff --git a/src/components/@shared/Form/Input/index.tsx b/src/components/@shared/FormInput/index.tsx similarity index 100% rename from src/components/@shared/Form/Input/index.tsx rename to src/components/@shared/FormInput/index.tsx diff --git a/src/components/@shared/Form/FormikPersist.tsx b/src/components/@shared/FormikPersist.tsx similarity index 100% rename from src/components/@shared/Form/FormikPersist.tsx rename to src/components/@shared/FormikPersist.tsx diff --git a/src/components/Asset/AssetActions/Compute/AlgorithmDatasetsListForCompute.tsx b/src/components/Asset/AssetActions/Compute/AlgorithmDatasetsListForCompute.tsx index 33c9a0b8d..666114543 100644 --- a/src/components/Asset/AssetActions/Compute/AlgorithmDatasetsListForCompute.tsx +++ b/src/components/Asset/AssetActions/Compute/AlgorithmDatasetsListForCompute.tsx @@ -1,7 +1,7 @@ import React, { ReactElement, useEffect, useState } from 'react' import styles from './AlgorithmDatasetsListForCompute.module.css' import { getAlgorithmDatasetsForCompute } from '@utils/aquarius' -import { AssetSelectionAsset } from '@shared/Form/FormFields/AssetSelection' +import { AssetSelectionAsset } from '@shared/FormFields/AssetSelection' import AssetComputeList from '@shared/AssetList/AssetComputeList' import { useAsset } from '@context/Asset' import { useCancelToken } from '@hooks/useCancelToken' diff --git a/src/components/Asset/AssetActions/Compute/FormComputeDataset.tsx b/src/components/Asset/AssetActions/Compute/FormComputeDataset.tsx index 4267e93f8..219f18a24 100644 --- a/src/components/Asset/AssetActions/Compute/FormComputeDataset.tsx +++ b/src/components/Asset/AssetActions/Compute/FormComputeDataset.tsx @@ -1,8 +1,8 @@ import React, { ReactElement, useEffect, useState } from 'react' import styles from './FormComputeDataset.module.css' import { Field, Form, FormikContextType, useFormikContext } from 'formik' -import Input from '@shared/Form/Input' -import { AssetSelectionAsset } from '@shared/Form/FormFields/AssetSelection' +import Input from '@shared/FormInput' +import { AssetSelectionAsset } from '@shared/FormFields/AssetSelection' import { compareAsBN } from '@utils/numbers' import ButtonBuy from '@shared/ButtonBuy' import PriceOutput from './PriceOutput' diff --git a/src/components/Asset/AssetActions/Compute/index.tsx b/src/components/Asset/AssetActions/Compute/index.tsx index 8aa849719..bc4b89b75 100644 --- a/src/components/Asset/AssetActions/Compute/index.tsx +++ b/src/components/Asset/AssetActions/Compute/index.tsx @@ -26,7 +26,7 @@ import FormStartComputeDataset from './FormComputeDataset' import styles from './index.module.css' import SuccessConfetti from '@shared/SuccessConfetti' import { getServiceByName, secondsToString } from '@utils/ddo' -import { AssetSelectionAsset } from '@shared/Form/FormFields/AssetSelection' +import { AssetSelectionAsset } from '@shared/FormFields/AssetSelection' import AlgorithmDatasetsListForCompute from './AlgorithmDatasetsListForCompute' import { getPreviousOrders, getPrice } from '@utils/subgraph' import AssetActionHistoryTable from '../AssetActionHistoryTable' diff --git a/src/components/Asset/AssetActions/Edit/FormEditComputeDataset.tsx b/src/components/Asset/AssetActions/Edit/FormEditComputeDataset.tsx index d1b67080a..91432c201 100644 --- a/src/components/Asset/AssetActions/Edit/FormEditComputeDataset.tsx +++ b/src/components/Asset/AssetActions/Edit/FormEditComputeDataset.tsx @@ -1,7 +1,7 @@ import React, { ReactElement, useEffect, useState } from 'react' import { Field, Form, FormikContextType, useFormikContext } from 'formik' -import Input, { InputProps } from '@shared/Form/Input' -import { AssetSelectionAsset } from '@shared/Form/FormFields/AssetSelection' +import Input, { InputProps } from '@shared/FormInput' +import { AssetSelectionAsset } from '@shared/FormFields/AssetSelection' import stylesIndex from './index.module.css' import styles from './FormEditMetadata.module.css' import { diff --git a/src/components/Asset/AssetActions/Edit/FormEditMetadata.tsx b/src/components/Asset/AssetActions/Edit/FormEditMetadata.tsx index dda38a942..33d477dec 100644 --- a/src/components/Asset/AssetActions/Edit/FormEditMetadata.tsx +++ b/src/components/Asset/AssetActions/Edit/FormEditMetadata.tsx @@ -1,7 +1,7 @@ import React, { ChangeEvent, ReactElement } from 'react' import { Field, Form, FormikContextType, useFormikContext } from 'formik' import { useOcean } from '@context/Ocean' -import Input, { InputProps } from '@shared/Form/Input' +import Input, { InputProps } from '@shared/FormInput' import FormActions from './FormActions' import styles from './FormEditMetadata.module.css' import { FormPublishData } from '../../../Publish/_types' diff --git a/src/components/Asset/AssetActions/Pool/Add/FormAdd.tsx b/src/components/Asset/AssetActions/Pool/Add/FormAdd.tsx index 6c9556b60..550b628d2 100644 --- a/src/components/Asset/AssetActions/Pool/Add/FormAdd.tsx +++ b/src/components/Asset/AssetActions/Pool/Add/FormAdd.tsx @@ -1,6 +1,6 @@ import React, { ChangeEvent, ReactElement, useEffect } from 'react' import styles from './FormAdd.module.css' -import Input from '@shared/Form/Input' +import Input from '@shared/FormInput' import { Field, FieldInputProps, diff --git a/src/components/Asset/AssetActions/Pool/Add/Output.tsx b/src/components/Asset/AssetActions/Pool/Add/Output.tsx index 02adb8631..354c006ba 100644 --- a/src/components/Asset/AssetActions/Pool/Add/Output.tsx +++ b/src/components/Asset/AssetActions/Pool/Add/Output.tsx @@ -1,7 +1,7 @@ import { FormikContextType, useFormikContext } from 'formik' import React, { ReactElement, useEffect, useState } from 'react' import { FormAddLiquidity } from '.' -import FormHelp from '@shared/Form/Input/Help' +import FormHelp from '@shared/FormInput/Help' import Token from '../Token' import styles from './Output.module.css' import Decimal from 'decimal.js' diff --git a/src/components/Asset/AssetActions/Pool/CoinSelect.module.css b/src/components/Asset/AssetActions/Pool/CoinSelect.module.css index 85001b728..72923e43e 100644 --- a/src/components/Asset/AssetActions/Pool/CoinSelect.module.css +++ b/src/components/Asset/AssetActions/Pool/CoinSelect.module.css @@ -1,5 +1,5 @@ .coinSelect { - composes: select from '@shared/Form/Input/InputElement.module.css'; + composes: select from '@shared/FormInput/InputElement.module.css'; font-size: var(--font-size-small); font-weight: var(--font-weight-base); border: none; diff --git a/src/components/Asset/AssetActions/Pool/Remove.tsx b/src/components/Asset/AssetActions/Pool/Remove.tsx index 5f8402bd4..5c58730e2 100644 --- a/src/components/Asset/AssetActions/Pool/Remove.tsx +++ b/src/components/Asset/AssetActions/Pool/Remove.tsx @@ -12,12 +12,12 @@ import { toast } from 'react-toastify' import Actions from './Actions' import { Logger } from '@oceanprotocol/lib' import Token from './Token' -import FormHelp from '@shared/Form/Input/Help' +import FormHelp from '@shared/FormInput/Help' import Button from '@shared/atoms/Button' import { getMaxPercentRemove } from './utils' import debounce from 'lodash.debounce' import UserLiquidity from '../UserLiquidity' -import InputElement from '@shared/Form/Input/InputElement' +import InputElement from '@shared/FormInput/InputElement' import { useOcean } from '@context/Ocean' import { useWeb3 } from '@context/Web3' import Decimal from 'decimal.js' diff --git a/src/components/Asset/AssetActions/Trade/Slippage.tsx b/src/components/Asset/AssetActions/Trade/Slippage.tsx index 8930091ff..f8b2b9373 100644 --- a/src/components/Asset/AssetActions/Trade/Slippage.tsx +++ b/src/components/Asset/AssetActions/Trade/Slippage.tsx @@ -1,6 +1,6 @@ import { FormikContextType, useFormikContext } from 'formik' import React, { ChangeEvent, ReactElement } from 'react' -import InputElement from '@shared/Form/Input/InputElement' +import InputElement from '@shared/FormInput/InputElement' import Tooltip from '@shared/atoms/Tooltip' import styles from './Slippage.module.css' import { FormTradeData } from './_types' diff --git a/src/components/Asset/AssetActions/Trade/TradeInput.tsx b/src/components/Asset/AssetActions/Trade/TradeInput.tsx index 8b07d9cb9..81cad1dfd 100644 --- a/src/components/Asset/AssetActions/Trade/TradeInput.tsx +++ b/src/components/Asset/AssetActions/Trade/TradeInput.tsx @@ -6,7 +6,7 @@ import { FormikContextType, useFormikContext } from 'formik' -import Input from '@shared/Form/Input' +import Input from '@shared/FormInput' import Button from '@shared/atoms/Button' import { useOcean } from '@context/Ocean' import { FormTradeData, TradeItem } from './_types' diff --git a/src/components/Header/SearchBar.tsx b/src/components/Header/SearchBar.tsx index 1a48dbb08..ad5bdb5d5 100644 --- a/src/components/Header/SearchBar.tsx +++ b/src/components/Header/SearchBar.tsx @@ -7,7 +7,7 @@ import React, { ReactElement } from 'react' import SearchIcon from '@images/search.svg' -import InputElement from '@shared/Form/Input/InputElement' +import InputElement from '@shared/FormInput/InputElement' import styles from './SearchBar.module.css' import { addExistingParamsToUrl } from '../Search/utils' import { useRouter } from 'next/router' diff --git a/src/components/Header/UserPreferences/Appearance.tsx b/src/components/Header/UserPreferences/Appearance.tsx index f77d97b4e..af373817a 100644 --- a/src/components/Header/UserPreferences/Appearance.tsx +++ b/src/components/Header/UserPreferences/Appearance.tsx @@ -1,12 +1,12 @@ import React, { ReactElement, ChangeEvent } from 'react' import { DarkMode } from 'use-dark-mode' -import FormHelp from '@shared/Form/Input/Help' -import Label from '@shared/Form/Input/Label' +import FormHelp from '@shared/FormInput/Help' +import Label from '@shared/FormInput/Label' import Moon from '@images/moon.svg' import Sun from '@images/sun.svg' import BoxSelection, { BoxSelectionOption -} from '@shared/Form/FormFields/BoxSelection' +} from '@shared/FormFields/BoxSelection' import styles from './Appearance.module.css' export default function Appearance({ diff --git a/src/components/Header/UserPreferences/Currency.tsx b/src/components/Header/UserPreferences/Currency.tsx index 42d2b3849..804aece65 100644 --- a/src/components/Header/UserPreferences/Currency.tsx +++ b/src/components/Header/UserPreferences/Currency.tsx @@ -1,7 +1,7 @@ import React, { ReactElement, ChangeEvent } from 'react' import { useSiteMetadata } from '@hooks/useSiteMetadata' import { useUserPreferences } from '@context/UserPreferences' -import Input from '@shared/Form/Input' +import Input from '@shared/FormInput' export default function Currency(): ReactElement { const { currency, setCurrency } = useUserPreferences() diff --git a/src/components/Header/UserPreferences/Debug.tsx b/src/components/Header/UserPreferences/Debug.tsx index 7d6e64a2b..2eda197b5 100644 --- a/src/components/Header/UserPreferences/Debug.tsx +++ b/src/components/Header/UserPreferences/Debug.tsx @@ -1,6 +1,6 @@ import React, { ReactElement } from 'react' import { useUserPreferences } from '@context/UserPreferences' -import Input from '@shared/Form/Input' +import Input from '@shared/FormInput' export default function Debug(): ReactElement { const { debug, setDebug } = useUserPreferences() diff --git a/src/components/Header/UserPreferences/Networks/NetworkItem.module.css b/src/components/Header/UserPreferences/Networks/NetworkItem.module.css index f125afc3d..fe7cfb7b7 100644 --- a/src/components/Header/UserPreferences/Networks/NetworkItem.module.css +++ b/src/components/Header/UserPreferences/Networks/NetworkItem.module.css @@ -1,5 +1,5 @@ .radioWrap { - composes: radioWrap from '@shared/Form/Input/InputElement.module.css'; + composes: radioWrap from '@shared/FormInput/InputElement.module.css'; padding: calc(var(--spacer) / 6) calc(var(--spacer) / 3); border-bottom: 1px solid var(--border-color); } @@ -9,14 +9,14 @@ } .input { - composes: checkbox from '@shared/Form/Input/InputElement.module.css'; + composes: checkbox from '@shared/FormInput/InputElement.module.css'; vertical-align: baseline; margin-right: calc(var(--spacer) / 3); margin-top: 0; } .radioLabel { - composes: radioLabel from '@shared/Form/Input/InputElement.module.css'; + composes: radioLabel from '@shared/FormInput/InputElement.module.css'; font-weight: var(--font-weight-base); display: flex; align-items: center; diff --git a/src/components/Header/UserPreferences/Networks/index.tsx b/src/components/Header/UserPreferences/Networks/index.tsx index be4d90afc..fec500a32 100644 --- a/src/components/Header/UserPreferences/Networks/index.tsx +++ b/src/components/Header/UserPreferences/Networks/index.tsx @@ -1,7 +1,7 @@ import React, { ReactElement } from 'react' -import Label from '@shared/Form/Input/Label' +import Label from '@shared/FormInput/Label' import { useSiteMetadata } from '@hooks/useSiteMetadata' -import FormHelp from '@shared/Form/Input/Help' +import FormHelp from '@shared/FormInput/Help' import Tooltip from '@shared/atoms/Tooltip' import Caret from '@images/caret.svg' import Network from '@images/network.svg' diff --git a/src/components/Header/UserPreferences/TokenApproval.tsx b/src/components/Header/UserPreferences/TokenApproval.tsx index 086edcabc..ad35904e0 100644 --- a/src/components/Header/UserPreferences/TokenApproval.tsx +++ b/src/components/Header/UserPreferences/TokenApproval.tsx @@ -1,6 +1,6 @@ import React, { ReactElement } from 'react' import { useUserPreferences } from '@context/UserPreferences' -import Input from '@shared/Form/Input' +import Input from '@shared/FormInput' export default function TokenApproval(): ReactElement { const { infiniteApproval, setInfiniteApproval } = useUserPreferences() diff --git a/src/components/Privacy/CookieModule.tsx b/src/components/Privacy/CookieModule.tsx index 8775c35ae..4b9d3af1f 100644 --- a/src/components/Privacy/CookieModule.tsx +++ b/src/components/Privacy/CookieModule.tsx @@ -1,6 +1,6 @@ import React, { ChangeEvent, ReactElement, useEffect, useState } from 'react' import { CookieConsentStatus, useConsent } from '@context/CookieConsent' -import InputElement from '@shared/Form/Input/InputElement' +import InputElement from '@shared/FormInput/InputElement' import Markdown from '@shared/Markdown' import styles from './CookieModule.module.css' diff --git a/src/components/Profile/History/ComputeJobs/Results.tsx b/src/components/Profile/History/ComputeJobs/Results.tsx index 2660a7b9c..db5bbae49 100644 --- a/src/components/Profile/History/ComputeJobs/Results.tsx +++ b/src/components/Profile/History/ComputeJobs/Results.tsx @@ -5,7 +5,7 @@ import { ListItem } from '@shared/atoms/Lists' import Button from '@shared/atoms/Button' import { useOcean } from '@context/Ocean' import styles from './Results.module.css' -import FormHelp from '@shared/Form/Input/Help' +import FormHelp from '@shared/FormInput/Help' import content from '../../../../../content/pages/history.json' export default function Results({ diff --git a/src/components/Publish/Metadata/index.tsx b/src/components/Publish/Metadata/index.tsx index 36aaa1940..acd35d57e 100644 --- a/src/components/Publish/Metadata/index.tsx +++ b/src/components/Publish/Metadata/index.tsx @@ -1,5 +1,5 @@ -import { BoxSelectionOption } from '@shared/Form/FormFields/BoxSelection' -import Input from '@shared/Form/Input' +import { BoxSelectionOption } from '@shared/FormFields/BoxSelection' +import Input from '@shared/FormInput' import { Field, useFormikContext } from 'formik' import React, { ReactElement } from 'react' import content from '../../../../content/publish/form.json' diff --git a/src/components/Publish/Pricing/Coin.tsx b/src/components/Publish/Pricing/Coin.tsx index 2999c8c28..741fbafe4 100644 --- a/src/components/Publish/Pricing/Coin.tsx +++ b/src/components/Publish/Pricing/Coin.tsx @@ -1,6 +1,6 @@ import React, { ReactElement } from 'react' import styles from './Coin.module.css' -import InputElement from '@shared/Form/Input/InputElement' +import InputElement from '@shared/FormInput/InputElement' import Logo from '@images/logo.svg' import Conversion from '@shared/Price/Conversion' import { DataTokenOptions } from '@utils/datatokens' diff --git a/src/components/Publish/Pricing/Dynamic.tsx b/src/components/Publish/Pricing/Dynamic.tsx index 8a51fd06c..7779f161a 100644 --- a/src/components/Publish/Pricing/Dynamic.tsx +++ b/src/components/Publish/Pricing/Dynamic.tsx @@ -1,6 +1,6 @@ import React, { ReactElement, useEffect, useState } from 'react' import Alert from '@shared/atoms/Alert' -import FormHelp from '@shared/Form/Input/Help' +import FormHelp from '@shared/FormInput/Help' import Tooltip from '@shared/atoms/Tooltip' import Coin from './Coin' import styles from './Dynamic.module.css' diff --git a/src/components/Publish/Pricing/Error.tsx b/src/components/Publish/Pricing/Error.tsx index 89401916d..42523ce81 100644 --- a/src/components/Publish/Pricing/Error.tsx +++ b/src/components/Publish/Pricing/Error.tsx @@ -1,6 +1,6 @@ import { FieldMetaProps } from 'formik' import React, { ReactElement } from 'react' -import stylesInput from '@shared/Form/Input/index.module.css' +import stylesInput from '@shared/FormInput/index.module.css' export default function Error({ meta diff --git a/src/components/Publish/Pricing/Fees.tsx b/src/components/Publish/Pricing/Fees.tsx index 2c94b327a..88a7bc06c 100644 --- a/src/components/Publish/Pricing/Fees.tsx +++ b/src/components/Publish/Pricing/Fees.tsx @@ -2,7 +2,7 @@ import React, { ReactElement } from 'react' import Tooltip from '@shared/atoms/Tooltip' import styles from './Fees.module.css' import { useField } from 'formik' -import Input from '@shared/Form/Input' +import Input from '@shared/FormInput' import Error from './Error' const Default = ({ diff --git a/src/components/Publish/Pricing/Fixed.tsx b/src/components/Publish/Pricing/Fixed.tsx index 20698ea29..9df86d3c1 100644 --- a/src/components/Publish/Pricing/Fixed.tsx +++ b/src/components/Publish/Pricing/Fixed.tsx @@ -1,5 +1,5 @@ import React, { ReactElement } from 'react' -import FormHelp from '@shared/Form/Input/Help' +import FormHelp from '@shared/FormInput/Help' import Price from './Price' import Fees from './Fees' diff --git a/src/components/Publish/Pricing/Free.tsx b/src/components/Publish/Pricing/Free.tsx index 75ebbd116..2d2c4d186 100644 --- a/src/components/Publish/Pricing/Free.tsx +++ b/src/components/Publish/Pricing/Free.tsx @@ -1,5 +1,5 @@ import React, { ReactElement } from 'react' -import FormHelp from '@shared/Form/Input/Help' +import FormHelp from '@shared/FormInput/Help' import Price from './Price' export default function Free({ content }: { content: any }): ReactElement { diff --git a/src/components/Publish/Pricing/Price.tsx b/src/components/Publish/Pricing/Price.tsx index 5a05ebec5..3439cc0f9 100644 --- a/src/components/Publish/Pricing/Price.tsx +++ b/src/components/Publish/Pricing/Price.tsx @@ -1,7 +1,7 @@ import Conversion from '@shared/Price/Conversion' import { useField, useFormikContext } from 'formik' import React, { ReactElement } from 'react' -import Input from '@shared/Form/Input' +import Input from '@shared/FormInput' import Error from './Error' import PriceUnit from '@shared/Price/PriceUnit' import styles from './Price.module.css' diff --git a/src/components/Publish/Services/index.tsx b/src/components/Publish/Services/index.tsx index 66696ab8b..3b5503bc9 100644 --- a/src/components/Publish/Services/index.tsx +++ b/src/components/Publish/Services/index.tsx @@ -1,4 +1,4 @@ -import Input from '@shared/Form/Input' +import Input from '@shared/FormInput' import { Field, useFormikContext } from 'formik' import React, { ReactElement, useEffect } from 'react' import IconDownload from '@images/download.svg' diff --git a/src/components/Search/sort.module.css b/src/components/Search/sort.module.css index 8f6585ec1..0ecf9f23a 100644 --- a/src/components/Search/sort.module.css +++ b/src/components/Search/sort.module.css @@ -16,7 +16,7 @@ } .sortLabel { - composes: label from '@shared/Form/Input/Label.module.css'; + composes: label from '@shared/FormInput/Label.module.css'; margin-bottom: 0; margin-left: calc(var(--spacer) / 2); margin-right: calc(var(--spacer) / 1.5);