From be7fa1e3d7561608c3618180946a7bb8d799e0c1 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Mon, 13 May 2024 20:16:56 +0200 Subject: [PATCH] refactor: split up the src folder in components/hooks/providers (#121) The listing got large, and the overview was hard to get. --- .eslintignore | 4 ++-- .eslintrc.js | 1 - .prettierignore | 4 ++-- .../CalculationDetail.module.css | 0 .../CalculationDetail.stories.tsx | 10 ++++---- .../CalculationDetail/CalculationDetail.tsx | 4 ++-- .../CalculationDetail/index.ts | 0 .../DroneBay/DroneBay.module.css | 0 .../DroneBay/DroneBay.stories.tsx | 10 ++++---- src/{ => components}/DroneBay/DroneBay.tsx | 4 ++-- src/{ => components}/DroneBay/index.ts | 0 .../EsiCharacterSelection.module.css | 0 .../EsiCharacterSelection.stories.tsx | 4 ++-- .../EsiCharacterSelection.tsx | 2 +- .../EsiCharacterSelection/index.ts | 0 .../FitButtonBar/ClipboardButton.tsx | 8 +++---- .../FitButtonBar/FitButtonBar.module.css | 0 .../FitButtonBar/FitButtonBar.stories.tsx | 10 ++++---- .../FitButtonBar/FitButtonBar.tsx | 0 .../FitButtonBar/RenameButton.tsx | 2 +- .../FitButtonBar/SaveButton.tsx | 4 ++-- .../FitButtonBar/ShareButton.tsx | 4 ++-- src/{ => components}/FitButtonBar/index.ts | 0 .../HardwareListing.module.css | 0 .../HardwareListing.stories.tsx | 10 ++++---- .../HardwareListing/HardwareListing.tsx | 6 ++--- src/{ => components}/HardwareListing/index.ts | 0 .../HullListing/HullListing.module.css | 0 .../HullListing/HullListing.stories.tsx | 12 +++++----- .../HullListing/HullListing.tsx | 8 +++---- src/{ => components}/HullListing/index.ts | 0 src/{ => components}/Icon/Icon.stories.tsx | 0 src/{ => components}/Icon/Icon.tsx | 2 +- src/{ => components}/Icon/index.ts | 0 .../ModalDialog/ModalDialog.module.css | 0 .../ModalDialog/ModalDialog.stories.tsx | 0 .../ModalDialog/ModalDialog.tsx | 0 src/{ => components}/ModalDialog/index.ts | 0 .../ShipAttribute/ShipAttribute.stories.tsx | 8 +++---- .../ShipAttribute/ShipAttribute.tsx | 4 ++-- src/{ => components}/ShipAttribute/index.ts | 0 src/{ => components}/ShipFit/FitLink.tsx | 4 ++-- src/{ => components}/ShipFit/Hull.tsx | 2 +- src/{ => components}/ShipFit/RadialMenu.tsx | 0 src/{ => components}/ShipFit/RingInner.tsx | 0 src/{ => components}/ShipFit/RingOuter.tsx | 0 src/{ => components}/ShipFit/RingTop.tsx | 0 .../ShipFit/ShipFit.module.css | 0 .../ShipFit/ShipFit.stories.tsx | 8 +++---- src/{ => components}/ShipFit/ShipFit.tsx | 4 ++-- src/{ => components}/ShipFit/Slot.tsx | 4 ++-- src/{ => components}/ShipFit/Usage.tsx | 4 ++-- src/{ => components}/ShipFit/index.ts | 0 .../ShipFitExtended.module.css | 0 .../ShipFitExtended.stories.tsx | 10 ++++---- .../ShipFitExtended/ShipFitExtended.tsx | 4 ++-- src/{ => components}/ShipFitExtended/index.ts | 0 .../ShipStatistics/Category.tsx | 0 .../ShipStatistics/RechargeRate.tsx | 0 .../ShipStatistics/Resistance.tsx | 0 .../ShipStatistics/ShipStatistics.module.css | 0 .../ShipStatistics/ShipStatistics.stories.tsx | 10 ++++---- .../ShipStatistics/ShipStatistics.tsx | 4 ++-- src/{ => components}/ShipStatistics/index.ts | 0 .../TreeListing/TreeListing.module.css | 0 .../TreeListing/TreeListing.stories.tsx | 2 +- .../TreeListing/TreeListing.tsx | 0 src/{ => components}/TreeListing/index.ts | 0 src/components/index.ts | 12 ++++++++++ src/{Helpers => hooks}/Clipboard.tsx | 0 .../EveShipFitHash/EveShipFitHash.stories.tsx | 4 ++-- .../EveShipFitHash/EveShipFitHash.tsx | 4 ++-- src/{ => hooks}/EveShipFitHash/index.ts | 0 .../EveShipFitLink/EveShipFitLink.stories.tsx | 8 +++---- .../EveShipFitLink/EveShipFitLink.tsx | 2 +- src/{ => hooks}/EveShipFitLink/index.ts | 0 .../FormatAsEft/FormatAsEft.stories.tsx | 8 +++---- src/{ => hooks}/FormatAsEft/FormatAsEft.tsx | 4 ++-- src/{ => hooks}/FormatAsEft/index.ts | 0 .../FormatEftToEsi/FormatEftToEsi.stories.tsx | 4 ++-- .../FormatEftToEsi/FormatEftToEsi.tsx | 4 ++-- src/{ => hooks}/FormatEftToEsi/index.ts | 0 src/{Helpers => hooks}/LocalStorage.tsx | 0 src/hooks/index.ts | 6 +++++ src/index.ts | 24 +++---------------- .../DogmaEngineProvider.stories.tsx | 2 +- .../DogmaEngineProvider.tsx | 0 .../DogmaEngineProvider/index.ts | 0 .../EsiProvider/EsiAccessToken.tsx | 0 .../EsiProvider/EsiFittings.tsx | 0 .../EsiProvider/EsiProvider.stories.tsx | 2 +- .../EsiProvider/EsiProvider.tsx | 2 +- src/{ => providers}/EsiProvider/EsiSkills.tsx | 0 src/{ => providers}/EsiProvider/index.ts | 0 .../EveDataProvider/DataTypes.tsx | 0 .../EveDataProvider.stories.tsx | 0 .../EveDataProvider/EveDataProvider.tsx | 2 +- .../EveDataProvider/esf_pb2.js | 0 src/{ => providers}/EveDataProvider/index.ts | 0 .../EveDataProvider/protobuf.js | 0 .../LocalFitProvider.stories.tsx | 0 .../LocalFitProvider/LocalFitProvider.tsx | 2 +- src/{ => providers}/LocalFitProvider/index.ts | 0 .../ShipSnapshotProvider.stories.tsx | 2 +- .../ShipSnapshotProvider.tsx | 0 .../ShipSnapshotProvider/index.ts | 0 src/providers/index.ts | 5 ++++ 107 files changed, 139 insertions(+), 135 deletions(-) rename src/{ => components}/CalculationDetail/CalculationDetail.module.css (100%) rename src/{ => components}/CalculationDetail/CalculationDetail.stories.tsx (75%) rename src/{ => components}/CalculationDetail/CalculationDetail.tsx (98%) rename src/{ => components}/CalculationDetail/index.ts (100%) rename src/{ => components}/DroneBay/DroneBay.module.css (100%) rename src/{ => components}/DroneBay/DroneBay.stories.tsx (74%) rename src/{ => components}/DroneBay/DroneBay.tsx (96%) rename src/{ => components}/DroneBay/index.ts (100%) rename src/{ => components}/EsiCharacterSelection/EsiCharacterSelection.module.css (100%) rename src/{ => components}/EsiCharacterSelection/EsiCharacterSelection.stories.tsx (83%) rename src/{ => components}/EsiCharacterSelection/EsiCharacterSelection.tsx (95%) rename src/{ => components}/EsiCharacterSelection/index.ts (100%) rename src/{ => components}/FitButtonBar/ClipboardButton.tsx (91%) rename src/{ => components}/FitButtonBar/FitButtonBar.module.css (100%) rename src/{ => components}/FitButtonBar/FitButtonBar.stories.tsx (75%) rename src/{ => components}/FitButtonBar/FitButtonBar.tsx (100%) rename src/{ => components}/FitButtonBar/RenameButton.tsx (94%) rename src/{ => components}/FitButtonBar/SaveButton.tsx (93%) rename src/{ => components}/FitButtonBar/ShareButton.tsx (83%) rename src/{ => components}/FitButtonBar/index.ts (100%) rename src/{ => components}/HardwareListing/HardwareListing.module.css (100%) rename src/{ => components}/HardwareListing/HardwareListing.stories.tsx (74%) rename src/{ => components}/HardwareListing/HardwareListing.tsx (98%) rename src/{ => components}/HardwareListing/index.ts (100%) rename src/{ => components}/HullListing/HullListing.module.css (100%) rename src/{ => components}/HullListing/HullListing.stories.tsx (71%) rename src/{ => components}/HullListing/HullListing.tsx (97%) rename src/{ => components}/HullListing/index.ts (100%) rename src/{ => components}/Icon/Icon.stories.tsx (100%) rename src/{ => components}/Icon/Icon.tsx (98%) rename src/{ => components}/Icon/index.ts (100%) rename src/{ => components}/ModalDialog/ModalDialog.module.css (100%) rename src/{ => components}/ModalDialog/ModalDialog.stories.tsx (100%) rename src/{ => components}/ModalDialog/ModalDialog.tsx (100%) rename src/{ => components}/ModalDialog/index.ts (100%) rename src/{ => components}/ShipAttribute/ShipAttribute.stories.tsx (75%) rename src/{ => components}/ShipAttribute/ShipAttribute.tsx (93%) rename src/{ => components}/ShipAttribute/index.ts (100%) rename src/{ => components}/ShipFit/FitLink.tsx (91%) rename src/{ => components}/ShipFit/Hull.tsx (86%) rename src/{ => components}/ShipFit/RadialMenu.tsx (100%) rename src/{ => components}/ShipFit/RingInner.tsx (100%) rename src/{ => components}/ShipFit/RingOuter.tsx (100%) rename src/{ => components}/ShipFit/RingTop.tsx (100%) rename src/{ => components}/ShipFit/ShipFit.module.css (100%) rename src/{ => components}/ShipFit/ShipFit.stories.tsx (77%) rename src/{ => components}/ShipFit/ShipFit.tsx (98%) rename src/{ => components}/ShipFit/Slot.tsx (98%) rename src/{ => components}/ShipFit/Usage.tsx (96%) rename src/{ => components}/ShipFit/index.ts (100%) rename src/{ => components}/ShipFitExtended/ShipFitExtended.module.css (100%) rename src/{ => components}/ShipFitExtended/ShipFitExtended.stories.tsx (75%) rename src/{ => components}/ShipFitExtended/ShipFitExtended.tsx (95%) rename src/{ => components}/ShipFitExtended/index.ts (100%) rename src/{ => components}/ShipStatistics/Category.tsx (100%) rename src/{ => components}/ShipStatistics/RechargeRate.tsx (100%) rename src/{ => components}/ShipStatistics/Resistance.tsx (100%) rename src/{ => components}/ShipStatistics/ShipStatistics.module.css (100%) rename src/{ => components}/ShipStatistics/ShipStatistics.stories.tsx (72%) rename src/{ => components}/ShipStatistics/ShipStatistics.tsx (98%) rename src/{ => components}/ShipStatistics/index.ts (100%) rename src/{ => components}/TreeListing/TreeListing.module.css (100%) rename src/{ => components}/TreeListing/TreeListing.stories.tsx (91%) rename src/{ => components}/TreeListing/TreeListing.tsx (100%) rename src/{ => components}/TreeListing/index.ts (100%) create mode 100644 src/components/index.ts rename src/{Helpers => hooks}/Clipboard.tsx (100%) rename src/{ => hooks}/EveShipFitHash/EveShipFitHash.stories.tsx (83%) rename src/{ => hooks}/EveShipFitHash/EveShipFitHash.tsx (97%) rename src/{ => hooks}/EveShipFitHash/index.ts (100%) rename src/{ => hooks}/EveShipFitLink/EveShipFitLink.stories.tsx (75%) rename src/{ => hooks}/EveShipFitLink/EveShipFitLink.tsx (96%) rename src/{ => hooks}/EveShipFitLink/index.ts (100%) rename src/{ => hooks}/FormatAsEft/FormatAsEft.stories.tsx (74%) rename src/{ => hooks}/FormatAsEft/FormatAsEft.tsx (94%) rename src/{ => hooks}/FormatAsEft/index.ts (100%) rename src/{ => hooks}/FormatEftToEsi/FormatEftToEsi.stories.tsx (83%) rename src/{ => hooks}/FormatEftToEsi/FormatEftToEsi.tsx (97%) rename src/{ => hooks}/FormatEftToEsi/index.ts (100%) rename src/{Helpers => hooks}/LocalStorage.tsx (100%) create mode 100644 src/hooks/index.ts rename src/{ => providers}/DogmaEngineProvider/DogmaEngineProvider.stories.tsx (96%) rename src/{ => providers}/DogmaEngineProvider/DogmaEngineProvider.tsx (100%) rename src/{ => providers}/DogmaEngineProvider/index.ts (100%) rename src/{ => providers}/EsiProvider/EsiAccessToken.tsx (100%) rename src/{ => providers}/EsiProvider/EsiFittings.tsx (100%) rename src/{ => providers}/EsiProvider/EsiProvider.stories.tsx (94%) rename src/{ => providers}/EsiProvider/EsiProvider.tsx (99%) rename src/{ => providers}/EsiProvider/EsiSkills.tsx (100%) rename src/{ => providers}/EsiProvider/index.ts (100%) rename src/{ => providers}/EveDataProvider/DataTypes.tsx (100%) rename src/{ => providers}/EveDataProvider/EveDataProvider.stories.tsx (100%) rename src/{ => providers}/EveDataProvider/EveDataProvider.tsx (98%) rename src/{ => providers}/EveDataProvider/esf_pb2.js (100%) rename src/{ => providers}/EveDataProvider/index.ts (100%) rename src/{ => providers}/EveDataProvider/protobuf.js (100%) rename src/{ => providers}/LocalFitProvider/LocalFitProvider.stories.tsx (100%) rename src/{ => providers}/LocalFitProvider/LocalFitProvider.tsx (95%) rename src/{ => providers}/LocalFitProvider/index.ts (100%) rename src/{ => providers}/ShipSnapshotProvider/ShipSnapshotProvider.stories.tsx (96%) rename src/{ => providers}/ShipSnapshotProvider/ShipSnapshotProvider.tsx (100%) rename src/{ => providers}/ShipSnapshotProvider/index.ts (100%) create mode 100644 src/providers/index.ts diff --git a/.eslintignore b/.eslintignore index 647e98e..4479f43 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,5 +1,5 @@ !.storybook/ dist/ node_modules/ -src/EveDataProvider/esf_pb2.js -src/EveDataProvider/protobuf.js +src/providers/EveDataProvider/esf_pb2.js +src/providers/EveDataProvider/protobuf.js diff --git a/.eslintrc.js b/.eslintrc.js index 36e9300..c3da23c 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -30,7 +30,6 @@ module.exports = { parserOptions: { project: "./tsconfig.json", }, - ignorePatterns: ["src/EveDataProvider/esf_pb2.js", "src/EveDataProvider/protobuf.js"], overrides: [ { // The files listed below are part of the build process, so they will be using packages that are listed diff --git a/.prettierignore b/.prettierignore index 0dc0dd2..4ceea4c 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,2 +1,2 @@ -src/EveDataProvider/esf_pb2.js -src/EveDataProvider/protobuf.js +src/providers/EveDataProvider/esf_pb2.js +src/providers/EveDataProvider/protobuf.js diff --git a/src/CalculationDetail/CalculationDetail.module.css b/src/components/CalculationDetail/CalculationDetail.module.css similarity index 100% rename from src/CalculationDetail/CalculationDetail.module.css rename to src/components/CalculationDetail/CalculationDetail.module.css diff --git a/src/CalculationDetail/CalculationDetail.stories.tsx b/src/components/CalculationDetail/CalculationDetail.stories.tsx similarity index 75% rename from src/CalculationDetail/CalculationDetail.stories.tsx rename to src/components/CalculationDetail/CalculationDetail.stories.tsx index cd08d56..a1a50b4 100644 --- a/src/CalculationDetail/CalculationDetail.stories.tsx +++ b/src/components/CalculationDetail/CalculationDetail.stories.tsx @@ -1,12 +1,12 @@ import type { Decorator, Meta, StoryObj } from "@storybook/react"; import React from "react"; -import { fullFit } from "../../.storybook/fits"; +import { fullFit } from "../../../.storybook/fits"; -import { DogmaEngineProvider } from "../DogmaEngineProvider"; -import { EsiProvider } from "../EsiProvider"; -import { EveDataProvider } from "../EveDataProvider"; -import { ShipSnapshotProvider } from "../ShipSnapshotProvider"; +import { DogmaEngineProvider } from "../../providers/DogmaEngineProvider"; +import { EsiProvider } from "../../providers/EsiProvider"; +import { EveDataProvider } from "../../providers/EveDataProvider"; +import { ShipSnapshotProvider } from "../../providers/ShipSnapshotProvider"; import { CalculationDetail } from "./"; const meta: Meta = { diff --git a/src/CalculationDetail/CalculationDetail.tsx b/src/components/CalculationDetail/CalculationDetail.tsx similarity index 98% rename from src/CalculationDetail/CalculationDetail.tsx rename to src/components/CalculationDetail/CalculationDetail.tsx index ffc3d18..579907c 100644 --- a/src/CalculationDetail/CalculationDetail.tsx +++ b/src/components/CalculationDetail/CalculationDetail.tsx @@ -1,12 +1,12 @@ import clsx from "clsx"; import React from "react"; -import { EveDataContext } from "../EveDataProvider"; +import { EveDataContext } from "../../providers/EveDataProvider"; import { ShipSnapshotContext, ShipSnapshotItemAttribute, ShipSnapshotItemAttributeEffect, -} from "../ShipSnapshotProvider"; +} from "../../providers/ShipSnapshotProvider"; import styles from "./CalculationDetail.module.css"; import { Icon } from "../Icon"; diff --git a/src/CalculationDetail/index.ts b/src/components/CalculationDetail/index.ts similarity index 100% rename from src/CalculationDetail/index.ts rename to src/components/CalculationDetail/index.ts diff --git a/src/DroneBay/DroneBay.module.css b/src/components/DroneBay/DroneBay.module.css similarity index 100% rename from src/DroneBay/DroneBay.module.css rename to src/components/DroneBay/DroneBay.module.css diff --git a/src/DroneBay/DroneBay.stories.tsx b/src/components/DroneBay/DroneBay.stories.tsx similarity index 74% rename from src/DroneBay/DroneBay.stories.tsx rename to src/components/DroneBay/DroneBay.stories.tsx index cc4529a..4ee5e4d 100644 --- a/src/DroneBay/DroneBay.stories.tsx +++ b/src/components/DroneBay/DroneBay.stories.tsx @@ -1,12 +1,12 @@ import type { Decorator, Meta, StoryObj } from "@storybook/react"; import React from "react"; -import { fullFit } from "../../.storybook/fits"; +import { fullFit } from "../../../.storybook/fits"; -import { DogmaEngineProvider } from "../DogmaEngineProvider"; -import { EsiProvider } from "../EsiProvider"; -import { EveDataProvider } from "../EveDataProvider"; -import { ShipSnapshotProvider } from "../ShipSnapshotProvider"; +import { DogmaEngineProvider } from "../../providers/DogmaEngineProvider"; +import { EsiProvider } from "../../providers/EsiProvider"; +import { EveDataProvider } from "../../providers/EveDataProvider"; +import { ShipSnapshotProvider } from "../../providers/ShipSnapshotProvider"; import { DroneBay } from "./"; const meta: Meta = { diff --git a/src/DroneBay/DroneBay.tsx b/src/components/DroneBay/DroneBay.tsx similarity index 96% rename from src/DroneBay/DroneBay.tsx rename to src/components/DroneBay/DroneBay.tsx index 8f0bd23..dc7917c 100644 --- a/src/DroneBay/DroneBay.tsx +++ b/src/components/DroneBay/DroneBay.tsx @@ -3,8 +3,8 @@ import React from "react"; import styles from "./DroneBay.module.css"; import { CharAttribute, ShipAttribute } from "../ShipAttribute"; -import { ShipSnapshotContext, ShipSnapshotItem } from "../ShipSnapshotProvider"; -import { EveDataContext } from "../EveDataProvider"; +import { ShipSnapshotContext, ShipSnapshotItem } from "../../providers/ShipSnapshotProvider"; +import { EveDataContext } from "../../providers/EveDataProvider"; const DroneBayEntrySelected = ({ drone, diff --git a/src/DroneBay/index.ts b/src/components/DroneBay/index.ts similarity index 100% rename from src/DroneBay/index.ts rename to src/components/DroneBay/index.ts diff --git a/src/EsiCharacterSelection/EsiCharacterSelection.module.css b/src/components/EsiCharacterSelection/EsiCharacterSelection.module.css similarity index 100% rename from src/EsiCharacterSelection/EsiCharacterSelection.module.css rename to src/components/EsiCharacterSelection/EsiCharacterSelection.module.css diff --git a/src/EsiCharacterSelection/EsiCharacterSelection.stories.tsx b/src/components/EsiCharacterSelection/EsiCharacterSelection.stories.tsx similarity index 83% rename from src/EsiCharacterSelection/EsiCharacterSelection.stories.tsx rename to src/components/EsiCharacterSelection/EsiCharacterSelection.stories.tsx index 45df592..19ec471 100644 --- a/src/EsiCharacterSelection/EsiCharacterSelection.stories.tsx +++ b/src/components/EsiCharacterSelection/EsiCharacterSelection.stories.tsx @@ -1,9 +1,9 @@ import type { Decorator, Meta, StoryObj } from "@storybook/react"; import React from "react"; -import { EsiProvider } from "../EsiProvider"; +import { EsiProvider } from "../../providers/EsiProvider"; import { EsiCharacterSelection } from "./"; -import { EveDataProvider } from "../EveDataProvider"; +import { EveDataProvider } from "../../providers/EveDataProvider"; const meta: Meta = { component: EsiCharacterSelection, diff --git a/src/EsiCharacterSelection/EsiCharacterSelection.tsx b/src/components/EsiCharacterSelection/EsiCharacterSelection.tsx similarity index 95% rename from src/EsiCharacterSelection/EsiCharacterSelection.tsx rename to src/components/EsiCharacterSelection/EsiCharacterSelection.tsx index 1e445c1..f8b4414 100644 --- a/src/EsiCharacterSelection/EsiCharacterSelection.tsx +++ b/src/components/EsiCharacterSelection/EsiCharacterSelection.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { EsiContext } from "../EsiProvider"; +import { EsiContext } from "../../providers/EsiProvider"; import styles from "./EsiCharacterSelection.module.css"; diff --git a/src/EsiCharacterSelection/index.ts b/src/components/EsiCharacterSelection/index.ts similarity index 100% rename from src/EsiCharacterSelection/index.ts rename to src/components/EsiCharacterSelection/index.ts diff --git a/src/FitButtonBar/ClipboardButton.tsx b/src/components/FitButtonBar/ClipboardButton.tsx similarity index 91% rename from src/FitButtonBar/ClipboardButton.tsx rename to src/components/FitButtonBar/ClipboardButton.tsx index d8083cb..2f28f3d 100644 --- a/src/FitButtonBar/ClipboardButton.tsx +++ b/src/components/FitButtonBar/ClipboardButton.tsx @@ -1,11 +1,11 @@ import clsx from "clsx"; import React from "react"; -import { EsiFit, ShipSnapshotContext } from "../ShipSnapshotProvider"; +import { EsiFit, ShipSnapshotContext } from "../../providers/ShipSnapshotProvider"; import { ModalDialog } from "../ModalDialog"; -import { useClipboard } from "../Helpers/Clipboard"; -import { useFormatAsEft } from "../FormatAsEft"; -import { useFormatEftToEsi } from "../FormatEftToEsi"; +import { useClipboard } from "../../hooks/Clipboard"; +import { useFormatAsEft } from "../../hooks/FormatAsEft"; +import { useFormatEftToEsi } from "../../hooks/FormatEftToEsi"; import styles from "./FitButtonBar.module.css"; diff --git a/src/FitButtonBar/FitButtonBar.module.css b/src/components/FitButtonBar/FitButtonBar.module.css similarity index 100% rename from src/FitButtonBar/FitButtonBar.module.css rename to src/components/FitButtonBar/FitButtonBar.module.css diff --git a/src/FitButtonBar/FitButtonBar.stories.tsx b/src/components/FitButtonBar/FitButtonBar.stories.tsx similarity index 75% rename from src/FitButtonBar/FitButtonBar.stories.tsx rename to src/components/FitButtonBar/FitButtonBar.stories.tsx index 9a49a80..efc6f87 100644 --- a/src/FitButtonBar/FitButtonBar.stories.tsx +++ b/src/components/FitButtonBar/FitButtonBar.stories.tsx @@ -1,13 +1,13 @@ import type { Decorator, Meta, StoryObj } from "@storybook/react"; import React from "react"; -import { fullFit } from "../../.storybook/fits"; +import { fullFit } from "../../../.storybook/fits"; -import { DogmaEngineProvider } from "../DogmaEngineProvider"; -import { EveDataProvider } from "../EveDataProvider"; -import { LocalFitProvider } from "../LocalFitProvider"; +import { DogmaEngineProvider } from "../../providers/DogmaEngineProvider"; +import { EveDataProvider } from "../../providers/EveDataProvider"; +import { LocalFitProvider } from "../../providers/LocalFitProvider"; import { ModalDialogAnchor } from "../ModalDialog/ModalDialog"; -import { ShipSnapshotProvider } from "../ShipSnapshotProvider"; +import { ShipSnapshotProvider } from "../../providers/ShipSnapshotProvider"; import { FitButtonBar } from "./"; diff --git a/src/FitButtonBar/FitButtonBar.tsx b/src/components/FitButtonBar/FitButtonBar.tsx similarity index 100% rename from src/FitButtonBar/FitButtonBar.tsx rename to src/components/FitButtonBar/FitButtonBar.tsx diff --git a/src/FitButtonBar/RenameButton.tsx b/src/components/FitButtonBar/RenameButton.tsx similarity index 94% rename from src/FitButtonBar/RenameButton.tsx rename to src/components/FitButtonBar/RenameButton.tsx index 4139650..62fa1fb 100644 --- a/src/FitButtonBar/RenameButton.tsx +++ b/src/components/FitButtonBar/RenameButton.tsx @@ -1,7 +1,7 @@ import clsx from "clsx"; import React from "react"; -import { ShipSnapshotContext } from "../ShipSnapshotProvider"; +import { ShipSnapshotContext } from "../../providers/ShipSnapshotProvider"; import { ModalDialog } from "../ModalDialog"; import styles from "./FitButtonBar.module.css"; diff --git a/src/FitButtonBar/SaveButton.tsx b/src/components/FitButtonBar/SaveButton.tsx similarity index 93% rename from src/FitButtonBar/SaveButton.tsx rename to src/components/FitButtonBar/SaveButton.tsx index 4ad28c6..0e00bc2 100644 --- a/src/FitButtonBar/SaveButton.tsx +++ b/src/components/FitButtonBar/SaveButton.tsx @@ -1,8 +1,8 @@ import clsx from "clsx"; import React from "react"; -import { ShipSnapshotContext } from "../ShipSnapshotProvider"; -import { LocalFitContext } from "../LocalFitProvider"; +import { ShipSnapshotContext } from "../../providers/ShipSnapshotProvider"; +import { LocalFitContext } from "../../providers/LocalFitProvider"; import { ModalDialog } from "../ModalDialog"; import styles from "./FitButtonBar.module.css"; diff --git a/src/FitButtonBar/ShareButton.tsx b/src/components/FitButtonBar/ShareButton.tsx similarity index 83% rename from src/FitButtonBar/ShareButton.tsx rename to src/components/FitButtonBar/ShareButton.tsx index 4726476..71e6c07 100644 --- a/src/FitButtonBar/ShareButton.tsx +++ b/src/components/FitButtonBar/ShareButton.tsx @@ -1,7 +1,7 @@ import React from "react"; -import { useClipboard } from "../Helpers/Clipboard"; -import { useEveShipFitLink } from "../EveShipFitLink"; +import { useClipboard } from "../../hooks/Clipboard"; +import { useEveShipFitLink } from "../../hooks/EveShipFitLink"; import styles from "./FitButtonBar.module.css"; diff --git a/src/FitButtonBar/index.ts b/src/components/FitButtonBar/index.ts similarity index 100% rename from src/FitButtonBar/index.ts rename to src/components/FitButtonBar/index.ts diff --git a/src/HardwareListing/HardwareListing.module.css b/src/components/HardwareListing/HardwareListing.module.css similarity index 100% rename from src/HardwareListing/HardwareListing.module.css rename to src/components/HardwareListing/HardwareListing.module.css diff --git a/src/HardwareListing/HardwareListing.stories.tsx b/src/components/HardwareListing/HardwareListing.stories.tsx similarity index 74% rename from src/HardwareListing/HardwareListing.stories.tsx rename to src/components/HardwareListing/HardwareListing.stories.tsx index cd46411..53e50c5 100644 --- a/src/HardwareListing/HardwareListing.stories.tsx +++ b/src/components/HardwareListing/HardwareListing.stories.tsx @@ -1,11 +1,11 @@ import type { Decorator, Meta, StoryObj } from "@storybook/react"; import React from "react"; -import { DogmaEngineProvider } from "../DogmaEngineProvider"; -import { EsiProvider } from "../EsiProvider"; -import { EveDataProvider } from "../EveDataProvider"; -import { fullFit } from "../../.storybook/fits"; -import { ShipSnapshotProvider } from "../ShipSnapshotProvider"; +import { DogmaEngineProvider } from "../../providers/DogmaEngineProvider"; +import { EsiProvider } from "../../providers/EsiProvider"; +import { EveDataProvider } from "../../providers/EveDataProvider"; +import { fullFit } from "../../../.storybook/fits"; +import { ShipSnapshotProvider } from "../../providers/ShipSnapshotProvider"; import { HardwareListing } from "./"; diff --git a/src/HardwareListing/HardwareListing.tsx b/src/components/HardwareListing/HardwareListing.tsx similarity index 98% rename from src/HardwareListing/HardwareListing.tsx rename to src/components/HardwareListing/HardwareListing.tsx index 0c62082..2a6c107 100644 --- a/src/HardwareListing/HardwareListing.tsx +++ b/src/components/HardwareListing/HardwareListing.tsx @@ -1,10 +1,10 @@ import clsx from "clsx"; import React from "react"; -import { defaultDataUrl } from "../settings"; -import { EveDataContext } from "../EveDataProvider"; +import { defaultDataUrl } from "../../settings"; +import { EveDataContext } from "../../providers/EveDataProvider"; import { Icon } from "../Icon"; -import { ShipSnapshotContext, ShipSnapshotSlotsType } from "../ShipSnapshotProvider"; +import { ShipSnapshotContext, ShipSnapshotSlotsType } from "../../providers/ShipSnapshotProvider"; import { TreeListing, TreeHeader, TreeLeaf } from "../TreeListing"; import styles from "./HardwareListing.module.css"; diff --git a/src/HardwareListing/index.ts b/src/components/HardwareListing/index.ts similarity index 100% rename from src/HardwareListing/index.ts rename to src/components/HardwareListing/index.ts diff --git a/src/HullListing/HullListing.module.css b/src/components/HullListing/HullListing.module.css similarity index 100% rename from src/HullListing/HullListing.module.css rename to src/components/HullListing/HullListing.module.css diff --git a/src/HullListing/HullListing.stories.tsx b/src/components/HullListing/HullListing.stories.tsx similarity index 71% rename from src/HullListing/HullListing.stories.tsx rename to src/components/HullListing/HullListing.stories.tsx index 8abde1c..1f587e7 100644 --- a/src/HullListing/HullListing.stories.tsx +++ b/src/components/HullListing/HullListing.stories.tsx @@ -1,14 +1,14 @@ import type { Decorator, Meta, StoryObj } from "@storybook/react"; import React from "react"; -import { fullFit } from "../../.storybook/fits"; +import { fullFit } from "../../../.storybook/fits"; import { HullListing } from "./"; -import { DogmaEngineProvider } from "../DogmaEngineProvider"; -import { EsiProvider } from "../EsiProvider"; -import { EveDataProvider } from "../EveDataProvider"; -import { LocalFitProvider } from "../LocalFitProvider"; -import { ShipSnapshotProvider } from "../ShipSnapshotProvider"; +import { DogmaEngineProvider } from "../../providers/DogmaEngineProvider"; +import { EsiProvider } from "../../providers/EsiProvider"; +import { EveDataProvider } from "../../providers/EveDataProvider"; +import { LocalFitProvider } from "../../providers/LocalFitProvider"; +import { ShipSnapshotProvider } from "../../providers/ShipSnapshotProvider"; const meta: Meta = { component: HullListing, diff --git a/src/HullListing/HullListing.tsx b/src/components/HullListing/HullListing.tsx similarity index 97% rename from src/HullListing/HullListing.tsx rename to src/components/HullListing/HullListing.tsx index 8248d5b..8812fc3 100644 --- a/src/HullListing/HullListing.tsx +++ b/src/components/HullListing/HullListing.tsx @@ -1,12 +1,12 @@ import clsx from "clsx"; import React from "react"; -import { EsiContext } from "../EsiProvider"; -import { EsiFit, ShipSnapshotContext } from "../ShipSnapshotProvider"; -import { EveDataContext } from "../EveDataProvider"; +import { EsiContext } from "../../providers/EsiProvider"; +import { EsiFit, ShipSnapshotContext } from "../../providers/ShipSnapshotProvider"; +import { EveDataContext } from "../../providers/EveDataProvider"; import { Icon, IconName } from "../Icon"; import { TreeListing, TreeHeader, TreeHeaderAction, TreeLeaf } from "../TreeListing"; -import { LocalFitContext } from "../LocalFitProvider"; +import { LocalFitContext } from "../../providers/LocalFitProvider"; import styles from "./HullListing.module.css"; diff --git a/src/HullListing/index.ts b/src/components/HullListing/index.ts similarity index 100% rename from src/HullListing/index.ts rename to src/components/HullListing/index.ts diff --git a/src/Icon/Icon.stories.tsx b/src/components/Icon/Icon.stories.tsx similarity index 100% rename from src/Icon/Icon.stories.tsx rename to src/components/Icon/Icon.stories.tsx diff --git a/src/Icon/Icon.tsx b/src/components/Icon/Icon.tsx similarity index 98% rename from src/Icon/Icon.tsx rename to src/components/Icon/Icon.tsx index 0a05fb1..9476b0b 100644 --- a/src/Icon/Icon.tsx +++ b/src/components/Icon/Icon.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { defaultDataUrl } from "../settings"; +import { defaultDataUrl } from "../../settings"; const iconMapping = { "align-time": "texture/classes/fitting/statsicons/aligntime.png", diff --git a/src/Icon/index.ts b/src/components/Icon/index.ts similarity index 100% rename from src/Icon/index.ts rename to src/components/Icon/index.ts diff --git a/src/ModalDialog/ModalDialog.module.css b/src/components/ModalDialog/ModalDialog.module.css similarity index 100% rename from src/ModalDialog/ModalDialog.module.css rename to src/components/ModalDialog/ModalDialog.module.css diff --git a/src/ModalDialog/ModalDialog.stories.tsx b/src/components/ModalDialog/ModalDialog.stories.tsx similarity index 100% rename from src/ModalDialog/ModalDialog.stories.tsx rename to src/components/ModalDialog/ModalDialog.stories.tsx diff --git a/src/ModalDialog/ModalDialog.tsx b/src/components/ModalDialog/ModalDialog.tsx similarity index 100% rename from src/ModalDialog/ModalDialog.tsx rename to src/components/ModalDialog/ModalDialog.tsx diff --git a/src/ModalDialog/index.ts b/src/components/ModalDialog/index.ts similarity index 100% rename from src/ModalDialog/index.ts rename to src/components/ModalDialog/index.ts diff --git a/src/ShipAttribute/ShipAttribute.stories.tsx b/src/components/ShipAttribute/ShipAttribute.stories.tsx similarity index 75% rename from src/ShipAttribute/ShipAttribute.stories.tsx rename to src/components/ShipAttribute/ShipAttribute.stories.tsx index a23ef94..5ff7528 100644 --- a/src/ShipAttribute/ShipAttribute.stories.tsx +++ b/src/components/ShipAttribute/ShipAttribute.stories.tsx @@ -1,11 +1,11 @@ import type { Decorator, Meta, StoryObj } from "@storybook/react"; import React from "react"; -import { fullFit } from "../../.storybook/fits"; +import { fullFit } from "../../../.storybook/fits"; -import { DogmaEngineProvider } from "../DogmaEngineProvider"; -import { EveDataProvider } from "../EveDataProvider"; -import { ShipSnapshotProvider } from "../ShipSnapshotProvider"; +import { DogmaEngineProvider } from "../../providers/DogmaEngineProvider"; +import { EveDataProvider } from "../../providers/EveDataProvider"; +import { ShipSnapshotProvider } from "../../providers/ShipSnapshotProvider"; import { ShipAttribute } from "./"; const meta: Meta = { diff --git a/src/ShipAttribute/ShipAttribute.tsx b/src/components/ShipAttribute/ShipAttribute.tsx similarity index 93% rename from src/ShipAttribute/ShipAttribute.tsx rename to src/components/ShipAttribute/ShipAttribute.tsx index 814c484..4973b7c 100644 --- a/src/ShipAttribute/ShipAttribute.tsx +++ b/src/components/ShipAttribute/ShipAttribute.tsx @@ -1,7 +1,7 @@ import React from "react"; -import { EveDataContext } from "../EveDataProvider"; -import { ShipSnapshotContext } from "../ShipSnapshotProvider"; +import { EveDataContext } from "../../providers/EveDataProvider"; +import { ShipSnapshotContext } from "../../providers/ShipSnapshotProvider"; export interface AttributeProps { /** Name of the attribute. */ diff --git a/src/ShipAttribute/index.ts b/src/components/ShipAttribute/index.ts similarity index 100% rename from src/ShipAttribute/index.ts rename to src/components/ShipAttribute/index.ts diff --git a/src/ShipFit/FitLink.tsx b/src/components/ShipFit/FitLink.tsx similarity index 91% rename from src/ShipFit/FitLink.tsx rename to src/components/ShipFit/FitLink.tsx index 451af6a..323b5e6 100644 --- a/src/ShipFit/FitLink.tsx +++ b/src/components/ShipFit/FitLink.tsx @@ -1,7 +1,7 @@ import React from "react"; -import { useEveShipFitLink } from "../EveShipFitLink"; -import { useClipboard } from "../Helpers/Clipboard"; +import { useEveShipFitLink } from "../../hooks/EveShipFitLink"; +import { useClipboard } from "../../hooks/Clipboard"; import styles from "./ShipFit.module.css"; diff --git a/src/ShipFit/Hull.tsx b/src/components/ShipFit/Hull.tsx similarity index 86% rename from src/ShipFit/Hull.tsx rename to src/components/ShipFit/Hull.tsx index 294a93f..3bd35f0 100644 --- a/src/ShipFit/Hull.tsx +++ b/src/components/ShipFit/Hull.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { ShipSnapshotContext } from "../ShipSnapshotProvider"; +import { ShipSnapshotContext } from "../../providers/ShipSnapshotProvider"; import styles from "./ShipFit.module.css"; diff --git a/src/ShipFit/RadialMenu.tsx b/src/components/ShipFit/RadialMenu.tsx similarity index 100% rename from src/ShipFit/RadialMenu.tsx rename to src/components/ShipFit/RadialMenu.tsx diff --git a/src/ShipFit/RingInner.tsx b/src/components/ShipFit/RingInner.tsx similarity index 100% rename from src/ShipFit/RingInner.tsx rename to src/components/ShipFit/RingInner.tsx diff --git a/src/ShipFit/RingOuter.tsx b/src/components/ShipFit/RingOuter.tsx similarity index 100% rename from src/ShipFit/RingOuter.tsx rename to src/components/ShipFit/RingOuter.tsx diff --git a/src/ShipFit/RingTop.tsx b/src/components/ShipFit/RingTop.tsx similarity index 100% rename from src/ShipFit/RingTop.tsx rename to src/components/ShipFit/RingTop.tsx diff --git a/src/ShipFit/ShipFit.module.css b/src/components/ShipFit/ShipFit.module.css similarity index 100% rename from src/ShipFit/ShipFit.module.css rename to src/components/ShipFit/ShipFit.module.css diff --git a/src/ShipFit/ShipFit.stories.tsx b/src/components/ShipFit/ShipFit.stories.tsx similarity index 77% rename from src/ShipFit/ShipFit.stories.tsx rename to src/components/ShipFit/ShipFit.stories.tsx index c1a0183..135ec67 100644 --- a/src/ShipFit/ShipFit.stories.tsx +++ b/src/components/ShipFit/ShipFit.stories.tsx @@ -1,11 +1,11 @@ import type { Decorator, Meta, StoryObj } from "@storybook/react"; import React from "react"; -import { fullFit } from "../../.storybook/fits"; +import { fullFit } from "../../../.storybook/fits"; -import { DogmaEngineProvider } from "../DogmaEngineProvider"; -import { EveDataProvider } from "../EveDataProvider"; -import { ShipSnapshotProvider } from "../ShipSnapshotProvider"; +import { DogmaEngineProvider } from "../../providers/DogmaEngineProvider"; +import { EveDataProvider } from "../../providers/EveDataProvider"; +import { ShipSnapshotProvider } from "../../providers/ShipSnapshotProvider"; import { ShipFit } from "./"; const meta: Meta = { diff --git a/src/ShipFit/ShipFit.tsx b/src/components/ShipFit/ShipFit.tsx similarity index 98% rename from src/ShipFit/ShipFit.tsx rename to src/components/ShipFit/ShipFit.tsx index 02a22ed..7a0b4bf 100644 --- a/src/ShipFit/ShipFit.tsx +++ b/src/components/ShipFit/ShipFit.tsx @@ -1,8 +1,8 @@ import React from "react"; import clsx from "clsx"; -import { EveDataContext } from "../EveDataProvider"; -import { ShipSnapshotContext } from "../ShipSnapshotProvider"; +import { EveDataContext } from "../../providers/EveDataProvider"; +import { ShipSnapshotContext } from "../../providers/ShipSnapshotProvider"; import { FitLink } from "./FitLink"; import { Hull } from "./Hull"; diff --git a/src/ShipFit/Slot.tsx b/src/components/ShipFit/Slot.tsx similarity index 98% rename from src/ShipFit/Slot.tsx rename to src/components/ShipFit/Slot.tsx index dbc14f9..352afd0 100644 --- a/src/ShipFit/Slot.tsx +++ b/src/components/ShipFit/Slot.tsx @@ -1,7 +1,7 @@ import React from "react"; -import { EveDataContext } from "../EveDataProvider"; -import { ShipSnapshotContext } from "../ShipSnapshotProvider"; +import { EveDataContext } from "../../providers/EveDataProvider"; +import { ShipSnapshotContext } from "../../providers/ShipSnapshotProvider"; import { Icon, IconName } from "../Icon"; diff --git a/src/ShipFit/Usage.tsx b/src/components/ShipFit/Usage.tsx similarity index 96% rename from src/ShipFit/Usage.tsx rename to src/components/ShipFit/Usage.tsx index 0eb5309..dabf47b 100644 --- a/src/ShipFit/Usage.tsx +++ b/src/components/ShipFit/Usage.tsx @@ -1,7 +1,7 @@ import React from "react"; -import { EveDataContext } from "../EveDataProvider"; -import { ShipSnapshotContext } from "../ShipSnapshotProvider"; +import { EveDataContext } from "../../providers/EveDataProvider"; +import { ShipSnapshotContext } from "../../providers/ShipSnapshotProvider"; import styles from "./ShipFit.module.css"; diff --git a/src/ShipFit/index.ts b/src/components/ShipFit/index.ts similarity index 100% rename from src/ShipFit/index.ts rename to src/components/ShipFit/index.ts diff --git a/src/ShipFitExtended/ShipFitExtended.module.css b/src/components/ShipFitExtended/ShipFitExtended.module.css similarity index 100% rename from src/ShipFitExtended/ShipFitExtended.module.css rename to src/components/ShipFitExtended/ShipFitExtended.module.css diff --git a/src/ShipFitExtended/ShipFitExtended.stories.tsx b/src/components/ShipFitExtended/ShipFitExtended.stories.tsx similarity index 75% rename from src/ShipFitExtended/ShipFitExtended.stories.tsx rename to src/components/ShipFitExtended/ShipFitExtended.stories.tsx index 01e6357..8275cef 100644 --- a/src/ShipFitExtended/ShipFitExtended.stories.tsx +++ b/src/components/ShipFitExtended/ShipFitExtended.stories.tsx @@ -1,12 +1,12 @@ import type { Decorator, Meta, StoryObj } from "@storybook/react"; import React from "react"; -import { fullFit } from "../../.storybook/fits"; +import { fullFit } from "../../../.storybook/fits"; -import { DogmaEngineProvider } from "../DogmaEngineProvider"; -import { EsiProvider } from "../EsiProvider"; -import { EveDataProvider } from "../EveDataProvider"; -import { ShipSnapshotProvider } from "../ShipSnapshotProvider"; +import { DogmaEngineProvider } from "../../providers/DogmaEngineProvider"; +import { EsiProvider } from "../../providers/EsiProvider"; +import { EveDataProvider } from "../../providers/EveDataProvider"; +import { ShipSnapshotProvider } from "../../providers/ShipSnapshotProvider"; import { ShipFitExtended } from "./"; const meta: Meta = { diff --git a/src/ShipFitExtended/ShipFitExtended.tsx b/src/components/ShipFitExtended/ShipFitExtended.tsx similarity index 95% rename from src/ShipFitExtended/ShipFitExtended.tsx rename to src/components/ShipFitExtended/ShipFitExtended.tsx index 9ca6e1a..a7e5fbd 100644 --- a/src/ShipFitExtended/ShipFitExtended.tsx +++ b/src/components/ShipFitExtended/ShipFitExtended.tsx @@ -3,12 +3,12 @@ import React from "react"; import { Icon } from "../Icon"; import { ShipFit } from "../ShipFit"; import { ShipAttribute } from "../ShipAttribute"; -import { ShipSnapshotContext } from "../ShipSnapshotProvider"; +import { ShipSnapshotContext } from "../../providers/ShipSnapshotProvider"; import styles from "./ShipFitExtended.module.css"; import clsx from "clsx"; import { DroneBay } from "../DroneBay"; -import { EveDataContext } from "../EveDataProvider"; +import { EveDataContext } from "../../providers/EveDataProvider"; const ShipCargoHold = () => { return ( diff --git a/src/ShipFitExtended/index.ts b/src/components/ShipFitExtended/index.ts similarity index 100% rename from src/ShipFitExtended/index.ts rename to src/components/ShipFitExtended/index.ts diff --git a/src/ShipStatistics/Category.tsx b/src/components/ShipStatistics/Category.tsx similarity index 100% rename from src/ShipStatistics/Category.tsx rename to src/components/ShipStatistics/Category.tsx diff --git a/src/ShipStatistics/RechargeRate.tsx b/src/components/ShipStatistics/RechargeRate.tsx similarity index 100% rename from src/ShipStatistics/RechargeRate.tsx rename to src/components/ShipStatistics/RechargeRate.tsx diff --git a/src/ShipStatistics/Resistance.tsx b/src/components/ShipStatistics/Resistance.tsx similarity index 100% rename from src/ShipStatistics/Resistance.tsx rename to src/components/ShipStatistics/Resistance.tsx diff --git a/src/ShipStatistics/ShipStatistics.module.css b/src/components/ShipStatistics/ShipStatistics.module.css similarity index 100% rename from src/ShipStatistics/ShipStatistics.module.css rename to src/components/ShipStatistics/ShipStatistics.module.css diff --git a/src/ShipStatistics/ShipStatistics.stories.tsx b/src/components/ShipStatistics/ShipStatistics.stories.tsx similarity index 72% rename from src/ShipStatistics/ShipStatistics.stories.tsx rename to src/components/ShipStatistics/ShipStatistics.stories.tsx index d46974b..e90035a 100644 --- a/src/ShipStatistics/ShipStatistics.stories.tsx +++ b/src/components/ShipStatistics/ShipStatistics.stories.tsx @@ -1,12 +1,12 @@ import type { Decorator, Meta, StoryObj } from "@storybook/react"; import React from "react"; -import { fullFit } from "../../.storybook/fits"; +import { fullFit } from "../../../.storybook/fits"; -import { DogmaEngineProvider } from "../DogmaEngineProvider"; -import { EsiProvider } from "../EsiProvider"; -import { EveDataProvider } from "../EveDataProvider"; -import { ShipSnapshotProvider } from "../ShipSnapshotProvider"; +import { DogmaEngineProvider } from "../../providers/DogmaEngineProvider"; +import { EsiProvider } from "../../providers/EsiProvider"; +import { EveDataProvider } from "../../providers/EveDataProvider"; +import { ShipSnapshotProvider } from "../../providers/ShipSnapshotProvider"; import { ShipStatistics } from "./"; const meta: Meta = { diff --git a/src/ShipStatistics/ShipStatistics.tsx b/src/components/ShipStatistics/ShipStatistics.tsx similarity index 98% rename from src/ShipStatistics/ShipStatistics.tsx rename to src/components/ShipStatistics/ShipStatistics.tsx index 78c9120..2abb663 100644 --- a/src/ShipStatistics/ShipStatistics.tsx +++ b/src/components/ShipStatistics/ShipStatistics.tsx @@ -2,8 +2,8 @@ import clsx from "clsx"; import React from "react"; import { ShipAttribute } from "../ShipAttribute"; -import { EveDataContext } from "../EveDataProvider"; -import { ShipSnapshotContext } from "../ShipSnapshotProvider"; +import { EveDataContext } from "../../providers/EveDataProvider"; +import { ShipSnapshotContext } from "../../providers/ShipSnapshotProvider"; import { Category, CategoryLine } from "./Category"; import { RechargeRate } from "./RechargeRate"; diff --git a/src/ShipStatistics/index.ts b/src/components/ShipStatistics/index.ts similarity index 100% rename from src/ShipStatistics/index.ts rename to src/components/ShipStatistics/index.ts diff --git a/src/TreeListing/TreeListing.module.css b/src/components/TreeListing/TreeListing.module.css similarity index 100% rename from src/TreeListing/TreeListing.module.css rename to src/components/TreeListing/TreeListing.module.css diff --git a/src/TreeListing/TreeListing.stories.tsx b/src/components/TreeListing/TreeListing.stories.tsx similarity index 91% rename from src/TreeListing/TreeListing.stories.tsx rename to src/components/TreeListing/TreeListing.stories.tsx index ab9583a..fdd859d 100644 --- a/src/TreeListing/TreeListing.stories.tsx +++ b/src/components/TreeListing/TreeListing.stories.tsx @@ -1,7 +1,7 @@ import type { Meta, StoryObj } from "@storybook/react"; import React from "react"; -import { fullFit } from "../../.storybook/fits"; +import { fullFit } from "../../../.storybook/fits"; import { TreeHeader, TreeListing } from "./"; diff --git a/src/TreeListing/TreeListing.tsx b/src/components/TreeListing/TreeListing.tsx similarity index 100% rename from src/TreeListing/TreeListing.tsx rename to src/components/TreeListing/TreeListing.tsx diff --git a/src/TreeListing/index.ts b/src/components/TreeListing/index.ts similarity index 100% rename from src/TreeListing/index.ts rename to src/components/TreeListing/index.ts diff --git a/src/components/index.ts b/src/components/index.ts new file mode 100644 index 0000000..c5e5a08 --- /dev/null +++ b/src/components/index.ts @@ -0,0 +1,12 @@ +export * from "./CalculationDetail"; +export * from "./DroneBay"; +export * from "./EsiCharacterSelection"; +export * from "./FitButtonBar"; +export * from "./HardwareListing"; +export * from "./HullListing"; +export * from "./Icon"; +export * from "./ModalDialog"; +export * from "./ShipAttribute"; +export * from "./ShipFit"; +export * from "./ShipFitExtended"; +export * from "./ShipStatistics"; diff --git a/src/Helpers/Clipboard.tsx b/src/hooks/Clipboard.tsx similarity index 100% rename from src/Helpers/Clipboard.tsx rename to src/hooks/Clipboard.tsx diff --git a/src/EveShipFitHash/EveShipFitHash.stories.tsx b/src/hooks/EveShipFitHash/EveShipFitHash.stories.tsx similarity index 83% rename from src/EveShipFitHash/EveShipFitHash.stories.tsx rename to src/hooks/EveShipFitHash/EveShipFitHash.stories.tsx index cb3b9b1..ce00d4a 100644 --- a/src/EveShipFitHash/EveShipFitHash.stories.tsx +++ b/src/hooks/EveShipFitHash/EveShipFitHash.stories.tsx @@ -1,9 +1,9 @@ import type { Decorator, Meta, StoryObj } from "@storybook/react"; import React from "react"; -import { hashFit } from "../../.storybook/fits"; +import { hashFit } from "../../../.storybook/fits"; -import { EveDataProvider } from "../EveDataProvider"; +import { EveDataProvider } from "../../providers/EveDataProvider"; import { EveShipFitHash } from "./EveShipFitHash"; const meta: Meta = { diff --git a/src/EveShipFitHash/EveShipFitHash.tsx b/src/hooks/EveShipFitHash/EveShipFitHash.tsx similarity index 97% rename from src/EveShipFitHash/EveShipFitHash.tsx rename to src/hooks/EveShipFitHash/EveShipFitHash.tsx index 9fd20fc..5344f51 100644 --- a/src/EveShipFitHash/EveShipFitHash.tsx +++ b/src/hooks/EveShipFitHash/EveShipFitHash.tsx @@ -1,7 +1,7 @@ import React from "react"; -import { EsiFit } from "../ShipSnapshotProvider"; -import { EveDataContext } from "../EveDataProvider"; +import { EsiFit } from "../../providers/ShipSnapshotProvider"; +import { EveDataContext } from "../../providers/EveDataProvider"; import { useFormatEftToEsi } from "../FormatEftToEsi"; async function decompress(base64compressedBytes: string): Promise { diff --git a/src/EveShipFitHash/index.ts b/src/hooks/EveShipFitHash/index.ts similarity index 100% rename from src/EveShipFitHash/index.ts rename to src/hooks/EveShipFitHash/index.ts diff --git a/src/EveShipFitLink/EveShipFitLink.stories.tsx b/src/hooks/EveShipFitLink/EveShipFitLink.stories.tsx similarity index 75% rename from src/EveShipFitLink/EveShipFitLink.stories.tsx rename to src/hooks/EveShipFitLink/EveShipFitLink.stories.tsx index d048e3c..ce01f39 100644 --- a/src/EveShipFitLink/EveShipFitLink.stories.tsx +++ b/src/hooks/EveShipFitLink/EveShipFitLink.stories.tsx @@ -1,11 +1,11 @@ import type { Decorator, Meta, StoryObj } from "@storybook/react"; import React from "react"; -import { fullFit } from "../../.storybook/fits"; +import { fullFit } from "../../../.storybook/fits"; -import { EveDataProvider } from "../EveDataProvider"; -import { DogmaEngineProvider } from "../DogmaEngineProvider"; -import { ShipSnapshotProvider } from "../ShipSnapshotProvider"; +import { EveDataProvider } from "../../providers/EveDataProvider"; +import { DogmaEngineProvider } from "../../providers/DogmaEngineProvider"; +import { ShipSnapshotProvider } from "../../providers/ShipSnapshotProvider"; import { EveShipFitLink } from "./EveShipFitLink"; const meta: Meta = { diff --git a/src/EveShipFitLink/EveShipFitLink.tsx b/src/hooks/EveShipFitLink/EveShipFitLink.tsx similarity index 96% rename from src/EveShipFitLink/EveShipFitLink.tsx rename to src/hooks/EveShipFitLink/EveShipFitLink.tsx index d4ca2c1..1c80760 100644 --- a/src/EveShipFitLink/EveShipFitLink.tsx +++ b/src/hooks/EveShipFitLink/EveShipFitLink.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { EsiFit, ShipSnapshotContext } from "../ShipSnapshotProvider"; +import { EsiFit, ShipSnapshotContext } from "../../providers/ShipSnapshotProvider"; async function compress(str: string): Promise { const stream = new Blob([str]).stream(); diff --git a/src/EveShipFitLink/index.ts b/src/hooks/EveShipFitLink/index.ts similarity index 100% rename from src/EveShipFitLink/index.ts rename to src/hooks/EveShipFitLink/index.ts diff --git a/src/FormatAsEft/FormatAsEft.stories.tsx b/src/hooks/FormatAsEft/FormatAsEft.stories.tsx similarity index 74% rename from src/FormatAsEft/FormatAsEft.stories.tsx rename to src/hooks/FormatAsEft/FormatAsEft.stories.tsx index db87143..cacf682 100644 --- a/src/FormatAsEft/FormatAsEft.stories.tsx +++ b/src/hooks/FormatAsEft/FormatAsEft.stories.tsx @@ -1,12 +1,12 @@ import type { Decorator, Meta, StoryObj } from "@storybook/react"; import React from "react"; -import { fullFit } from "../../.storybook/fits"; +import { fullFit } from "../../../.storybook/fits"; -import { EveDataProvider } from "../EveDataProvider"; +import { EveDataProvider } from "../../providers/EveDataProvider"; import { FormatAsEft } from "./FormatAsEft"; -import { ShipSnapshotProvider } from "../ShipSnapshotProvider"; -import { DogmaEngineProvider } from "../DogmaEngineProvider"; +import { ShipSnapshotProvider } from "../../providers/ShipSnapshotProvider"; +import { DogmaEngineProvider } from "../../providers/DogmaEngineProvider"; const meta: Meta = { component: FormatAsEft, diff --git a/src/FormatAsEft/FormatAsEft.tsx b/src/hooks/FormatAsEft/FormatAsEft.tsx similarity index 94% rename from src/FormatAsEft/FormatAsEft.tsx rename to src/hooks/FormatAsEft/FormatAsEft.tsx index 6e4fa49..1c80b61 100644 --- a/src/FormatAsEft/FormatAsEft.tsx +++ b/src/hooks/FormatAsEft/FormatAsEft.tsx @@ -1,7 +1,7 @@ import React from "react"; -import { EveDataContext } from "../EveDataProvider"; -import { ShipSnapshotContext, ShipSnapshotSlotsType } from "../ShipSnapshotProvider"; +import { EveDataContext } from "../../providers/EveDataProvider"; +import { ShipSnapshotContext, ShipSnapshotSlotsType } from "../../providers/ShipSnapshotProvider"; /** Mapping between slot types and ESI flags (for first slot in the type). */ const esiFlagMapping: Record = { diff --git a/src/FormatAsEft/index.ts b/src/hooks/FormatAsEft/index.ts similarity index 100% rename from src/FormatAsEft/index.ts rename to src/hooks/FormatAsEft/index.ts diff --git a/src/FormatEftToEsi/FormatEftToEsi.stories.tsx b/src/hooks/FormatEftToEsi/FormatEftToEsi.stories.tsx similarity index 83% rename from src/FormatEftToEsi/FormatEftToEsi.stories.tsx rename to src/hooks/FormatEftToEsi/FormatEftToEsi.stories.tsx index 0800d1e..7c2dfad 100644 --- a/src/FormatEftToEsi/FormatEftToEsi.stories.tsx +++ b/src/hooks/FormatEftToEsi/FormatEftToEsi.stories.tsx @@ -1,9 +1,9 @@ import type { Decorator, Meta, StoryObj } from "@storybook/react"; import React from "react"; -import { eftFit } from "../../.storybook/fits"; +import { eftFit } from "../../../.storybook/fits"; -import { EveDataProvider } from "../EveDataProvider"; +import { EveDataProvider } from "../../providers/EveDataProvider"; import { FormatEftToEsi } from "./FormatEftToEsi"; const meta: Meta = { diff --git a/src/FormatEftToEsi/FormatEftToEsi.tsx b/src/hooks/FormatEftToEsi/FormatEftToEsi.tsx similarity index 97% rename from src/FormatEftToEsi/FormatEftToEsi.tsx rename to src/hooks/FormatEftToEsi/FormatEftToEsi.tsx index 6e79680..971cae7 100644 --- a/src/FormatEftToEsi/FormatEftToEsi.tsx +++ b/src/hooks/FormatEftToEsi/FormatEftToEsi.tsx @@ -1,7 +1,7 @@ import React from "react"; -import { EveDataContext } from "../EveDataProvider"; -import { EsiFit } from "../ShipSnapshotProvider"; +import { EveDataContext } from "../../providers/EveDataProvider"; +import { EsiFit } from "../../providers/ShipSnapshotProvider"; /** Mapping between slot types and ESI flags (for first slot in the type). */ const esiFlagMapping: Record = { diff --git a/src/FormatEftToEsi/index.ts b/src/hooks/FormatEftToEsi/index.ts similarity index 100% rename from src/FormatEftToEsi/index.ts rename to src/hooks/FormatEftToEsi/index.ts diff --git a/src/Helpers/LocalStorage.tsx b/src/hooks/LocalStorage.tsx similarity index 100% rename from src/Helpers/LocalStorage.tsx rename to src/hooks/LocalStorage.tsx diff --git a/src/hooks/index.ts b/src/hooks/index.ts new file mode 100644 index 0000000..9483ff0 --- /dev/null +++ b/src/hooks/index.ts @@ -0,0 +1,6 @@ +export * from "./Clipboard"; +export * from "./EveShipFitHash"; +export * from "./EveShipFitLink"; +export * from "./FormatEftToEsi"; +export * from "./FormatAsEft"; +export * from "./LocalStorage"; diff --git a/src/index.ts b/src/index.ts index 8a71d34..3be0aa2 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,21 +1,3 @@ -export * from "./CalculationDetail"; -export * from "./DogmaEngineProvider"; -export * from "./DroneBay"; -export * from "./EsiCharacterSelection"; -export * from "./EsiProvider"; -export * from "./EveDataProvider"; -export * from "./EveShipFitHash"; -export * from "./EveShipFitLink"; -export * from "./FitButtonBar"; -export * from "./FormatEftToEsi"; -export * from "./FormatAsEft"; -export * from "./HardwareListing"; -export * from "./HullListing"; -export * from "./Icon"; -export * from "./LocalFitProvider"; -export * from "./ModalDialog"; -export * from "./ShipAttribute"; -export * from "./ShipFit"; -export * from "./ShipFitExtended"; -export * from "./ShipSnapshotProvider"; -export * from "./ShipStatistics"; +export * from "./components"; +export * from "./hooks"; +export * from "./providers"; diff --git a/src/DogmaEngineProvider/DogmaEngineProvider.stories.tsx b/src/providers/DogmaEngineProvider/DogmaEngineProvider.stories.tsx similarity index 96% rename from src/DogmaEngineProvider/DogmaEngineProvider.stories.tsx rename to src/providers/DogmaEngineProvider/DogmaEngineProvider.stories.tsx index fa459a6..d18f104 100644 --- a/src/DogmaEngineProvider/DogmaEngineProvider.stories.tsx +++ b/src/providers/DogmaEngineProvider/DogmaEngineProvider.stories.tsx @@ -1,7 +1,7 @@ import type { Meta, StoryObj } from "@storybook/react"; import React from "react"; -import { fullFit } from "../../.storybook/fits"; +import { fullFit } from "../../../.storybook/fits"; import { EveDataProvider } from "../EveDataProvider"; import { DogmaEngineContext, DogmaEngineProvider } from "./"; diff --git a/src/DogmaEngineProvider/DogmaEngineProvider.tsx b/src/providers/DogmaEngineProvider/DogmaEngineProvider.tsx similarity index 100% rename from src/DogmaEngineProvider/DogmaEngineProvider.tsx rename to src/providers/DogmaEngineProvider/DogmaEngineProvider.tsx diff --git a/src/DogmaEngineProvider/index.ts b/src/providers/DogmaEngineProvider/index.ts similarity index 100% rename from src/DogmaEngineProvider/index.ts rename to src/providers/DogmaEngineProvider/index.ts diff --git a/src/EsiProvider/EsiAccessToken.tsx b/src/providers/EsiProvider/EsiAccessToken.tsx similarity index 100% rename from src/EsiProvider/EsiAccessToken.tsx rename to src/providers/EsiProvider/EsiAccessToken.tsx diff --git a/src/EsiProvider/EsiFittings.tsx b/src/providers/EsiProvider/EsiFittings.tsx similarity index 100% rename from src/EsiProvider/EsiFittings.tsx rename to src/providers/EsiProvider/EsiFittings.tsx diff --git a/src/EsiProvider/EsiProvider.stories.tsx b/src/providers/EsiProvider/EsiProvider.stories.tsx similarity index 94% rename from src/EsiProvider/EsiProvider.stories.tsx rename to src/providers/EsiProvider/EsiProvider.stories.tsx index 8552881..8a8de09 100644 --- a/src/EsiProvider/EsiProvider.stories.tsx +++ b/src/providers/EsiProvider/EsiProvider.stories.tsx @@ -1,7 +1,7 @@ import type { Meta, StoryObj } from "@storybook/react"; import React from "react"; -import { fullFit } from "../../.storybook/fits"; +import { fullFit } from "../../../.storybook/fits"; import { EsiContext, EsiProvider } from "./"; import { EveDataProvider } from "../EveDataProvider"; diff --git a/src/EsiProvider/EsiProvider.tsx b/src/providers/EsiProvider/EsiProvider.tsx similarity index 99% rename from src/EsiProvider/EsiProvider.tsx rename to src/providers/EsiProvider/EsiProvider.tsx index 6cb825b..4fc3b92 100644 --- a/src/EsiProvider/EsiProvider.tsx +++ b/src/providers/EsiProvider/EsiProvider.tsx @@ -8,7 +8,7 @@ import { getSkills } from "./EsiSkills"; import { getCharFittings } from "./EsiFittings"; import { EveDataContext } from "../EveDataProvider"; -import { useLocalStorage } from "../Helpers/LocalStorage"; +import { useLocalStorage } from "../../hooks/LocalStorage"; export interface EsiCharacter { name: string; diff --git a/src/EsiProvider/EsiSkills.tsx b/src/providers/EsiProvider/EsiSkills.tsx similarity index 100% rename from src/EsiProvider/EsiSkills.tsx rename to src/providers/EsiProvider/EsiSkills.tsx diff --git a/src/EsiProvider/index.ts b/src/providers/EsiProvider/index.ts similarity index 100% rename from src/EsiProvider/index.ts rename to src/providers/EsiProvider/index.ts diff --git a/src/EveDataProvider/DataTypes.tsx b/src/providers/EveDataProvider/DataTypes.tsx similarity index 100% rename from src/EveDataProvider/DataTypes.tsx rename to src/providers/EveDataProvider/DataTypes.tsx diff --git a/src/EveDataProvider/EveDataProvider.stories.tsx b/src/providers/EveDataProvider/EveDataProvider.stories.tsx similarity index 100% rename from src/EveDataProvider/EveDataProvider.stories.tsx rename to src/providers/EveDataProvider/EveDataProvider.stories.tsx diff --git a/src/EveDataProvider/EveDataProvider.tsx b/src/providers/EveDataProvider/EveDataProvider.tsx similarity index 98% rename from src/EveDataProvider/EveDataProvider.tsx rename to src/providers/EveDataProvider/EveDataProvider.tsx index 08c7d9d..21da018 100644 --- a/src/EveDataProvider/EveDataProvider.tsx +++ b/src/providers/EveDataProvider/EveDataProvider.tsx @@ -1,7 +1,7 @@ import React from "react"; import { DogmaAttribute, DogmaEffect, GroupID, MarketGroup, TypeDogma, TypeID } from "./DataTypes"; -import { defaultDataUrl } from "../settings"; +import { defaultDataUrl } from "../../settings"; // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore diff --git a/src/EveDataProvider/esf_pb2.js b/src/providers/EveDataProvider/esf_pb2.js similarity index 100% rename from src/EveDataProvider/esf_pb2.js rename to src/providers/EveDataProvider/esf_pb2.js diff --git a/src/EveDataProvider/index.ts b/src/providers/EveDataProvider/index.ts similarity index 100% rename from src/EveDataProvider/index.ts rename to src/providers/EveDataProvider/index.ts diff --git a/src/EveDataProvider/protobuf.js b/src/providers/EveDataProvider/protobuf.js similarity index 100% rename from src/EveDataProvider/protobuf.js rename to src/providers/EveDataProvider/protobuf.js diff --git a/src/LocalFitProvider/LocalFitProvider.stories.tsx b/src/providers/LocalFitProvider/LocalFitProvider.stories.tsx similarity index 100% rename from src/LocalFitProvider/LocalFitProvider.stories.tsx rename to src/providers/LocalFitProvider/LocalFitProvider.stories.tsx diff --git a/src/LocalFitProvider/LocalFitProvider.tsx b/src/providers/LocalFitProvider/LocalFitProvider.tsx similarity index 95% rename from src/LocalFitProvider/LocalFitProvider.tsx rename to src/providers/LocalFitProvider/LocalFitProvider.tsx index 11415ef..d469b6a 100644 --- a/src/LocalFitProvider/LocalFitProvider.tsx +++ b/src/providers/LocalFitProvider/LocalFitProvider.tsx @@ -2,7 +2,7 @@ import React from "react"; import { EsiFit } from "../ShipSnapshotProvider"; -import { useLocalStorage } from "../Helpers/LocalStorage"; +import { useLocalStorage } from "../../hooks/LocalStorage"; export interface LocalFit { loaded?: boolean; diff --git a/src/LocalFitProvider/index.ts b/src/providers/LocalFitProvider/index.ts similarity index 100% rename from src/LocalFitProvider/index.ts rename to src/providers/LocalFitProvider/index.ts diff --git a/src/ShipSnapshotProvider/ShipSnapshotProvider.stories.tsx b/src/providers/ShipSnapshotProvider/ShipSnapshotProvider.stories.tsx similarity index 96% rename from src/ShipSnapshotProvider/ShipSnapshotProvider.stories.tsx rename to src/providers/ShipSnapshotProvider/ShipSnapshotProvider.stories.tsx index 12f68e0..23807a9 100644 --- a/src/ShipSnapshotProvider/ShipSnapshotProvider.stories.tsx +++ b/src/providers/ShipSnapshotProvider/ShipSnapshotProvider.stories.tsx @@ -1,7 +1,7 @@ import type { Meta, StoryObj } from "@storybook/react"; import React from "react"; -import { fullFit } from "../../.storybook/fits"; +import { fullFit } from "../../../.storybook/fits"; import { EveDataContext, EveDataProvider } from "../EveDataProvider"; import { DogmaEngineProvider } from "../DogmaEngineProvider"; diff --git a/src/ShipSnapshotProvider/ShipSnapshotProvider.tsx b/src/providers/ShipSnapshotProvider/ShipSnapshotProvider.tsx similarity index 100% rename from src/ShipSnapshotProvider/ShipSnapshotProvider.tsx rename to src/providers/ShipSnapshotProvider/ShipSnapshotProvider.tsx diff --git a/src/ShipSnapshotProvider/index.ts b/src/providers/ShipSnapshotProvider/index.ts similarity index 100% rename from src/ShipSnapshotProvider/index.ts rename to src/providers/ShipSnapshotProvider/index.ts diff --git a/src/providers/index.ts b/src/providers/index.ts new file mode 100644 index 0000000..d4e03b9 --- /dev/null +++ b/src/providers/index.ts @@ -0,0 +1,5 @@ +export * from "./DogmaEngineProvider"; +export * from "./EsiProvider"; +export * from "./EveDataProvider"; +export * from "./LocalFitProvider"; +export * from "./ShipSnapshotProvider";