refactor: removed extra folder from modules

src/modals/modals.ts

@@ -2,12 +2,12 @@ import DealsBoardFiltersModal from "@/app/deals/modals/DealsBoardFiltersModal/De
 import DealsScheduleFiltersModal from "@/app/deals/modals/DealsScheduleFiltersModal/DealsScheduleFiltersModal";
 import DealsTableFiltersModal from "@/app/deals/modals/DealsTableFiltersModal/DealsTableFiltersModal";
 import EnterNameModal from "@/modals/EnterNameModal/EnterNameModal";
-import DealProductEditorModal from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/modals/DealProductEditorModal/DealProductEditorModal";
-import DealServiceEditorModal from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/modals/DealServiceEditorModal/DealServiceEditorModal";
-import DuplicateServicesModal from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/modals/DuplicateServicesModal/DuplicateServicesModal";
-import ProductEditorModal from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/modals/ProductEditorModal/ProductEditorModal";
-import ProductServiceEditorModal from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/modals/ProductServiceEditorModal/ProductServiceEditorModal";
-import ServicesKitSelectModal from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/modals/ServicesKitSelectModal/ServicesKitSelectModal";
+import DealProductEditorModal from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/modals/DealProductEditorModal/DealProductEditorModal";
+import DealServiceEditorModal from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/modals/DealServiceEditorModal/DealServiceEditorModal";
+import DuplicateServicesModal from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/modals/DuplicateServicesModal/DuplicateServicesModal";
+import ProductEditorModal from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/modals/ProductEditorModal/ProductEditorModal";
+import ProductServiceEditorModal from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/modals/ProductServiceEditorModal/ProductServiceEditorModal";
+import ServicesKitSelectModal from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/modals/ServicesKitSelectModal/ServicesKitSelectModal";
 
 export const modals = {
     enterNameModal: EnterNameModal,

src/modules/connectModules.tsx

@@ -1,4 +1,4 @@
-import FulfillmentBaseTab from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/FulfillmentBaseTab";
+import FulfillmentBaseTab from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/FulfillmentBaseTab";
 import { ModuleNames } from "./modules";
 import ModulesType from "./types";
 

src/modules/dealModularEditorTabs/FulfillmentBaseTab/FulfillmentBaseTab.tsx

@@ -1,7 +1,7 @@
 import { FC } from "react";
 import { DealSchema } from "@/lib/client";
-import FulfillmentBaseTabBody from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/FulfillmentBaseTabBody/FulfillmentBaseTabBody";
-import { FulfillmentBaseContextProvider } from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext";
+import FulfillmentBaseTabBody from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/components/FulfillmentBaseTabBody/FulfillmentBaseTabBody";
+import { FulfillmentBaseContextProvider } from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext";
 
 type Props = {
     value: DealSchema;

src/modules/dealModularEditorTabs/FulfillmentBaseTab/components/DealInfoView/DealInfoView.tsx

@@ -0,0 +1,22 @@
+import { Flex, Stack } from "@mantine/core";
+import DealServicesTable from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/components/DealInfoView/components/DealServicesTable/DealServicesTable";
+import ProductsActions from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/components/DealInfoView/components/ProductsActions/ProductsActions";
+import TotalPriceLabel from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/components/DealInfoView/components/TotalPriceLabel/TotalPriceLabel";
+import styles from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/FulfillmentBaseTab.module.css";
+
+const DealInfoView = () => (
+    <Stack
+        flex={2}
+        gap={"sm"}>
+        <Flex
+            gap={"sm"}
+            direction={"column"}
+            className={styles.container}>
+            <DealServicesTable />
+            <ProductsActions />
+        </Flex>
+        <TotalPriceLabel />
+    </Stack>
+);
+
+export default DealInfoView;

src/modules/dealModularEditorTabs/FulfillmentBaseTab/components/DealInfoView/components/DealServicesTable/DealServicesTable.tsx

@@ -1,9 +1,9 @@
 import { FC } from "react";
 import { Flex, ScrollArea } from "@mantine/core";
-import DealServicesTitle from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealInfoView/components/DealServicesTable/components/DealServicesTitle";
-import DealServicesTotalLabel from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealInfoView/components/DealServicesTable/components/DealServicesTotalLabel";
-import ServicesActions from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealInfoView/components/DealServicesTable/components/ServicesActions";
-import { useFulfillmentBaseContext } from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext";
+import DealServicesTitle from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/components/DealInfoView/components/DealServicesTable/components/DealServicesTitle";
+import DealServicesTotalLabel from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/components/DealInfoView/components/DealServicesTable/components/DealServicesTotalLabel";
+import ServicesActions from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/components/DealInfoView/components/DealServicesTable/components/ServicesActions";
+import { useFulfillmentBaseContext } from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext";
 import DealServiceRow from "./components/DealServiceRow";
 
 const DealServicesTable: FC = () => {

src/modules/dealModularEditorTabs/FulfillmentBaseTab/components/DealInfoView/components/DealServicesTable/components/DealServiceRow.tsx

@@ -5,7 +5,7 @@ import { Divider, Group, NumberInput, Stack, Text } from "@mantine/core";
 import { useDebouncedCallback } from "@mantine/hooks";
 import ActionIconWithTip from "@/components/ui/ActionIconWithTip/ActionIconWithTip";
 import { DealServiceSchema } from "@/lib/client";
-import LockCheckbox from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/LockCheckbox/LockCheckbox";
+import LockCheckbox from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/components/LockCheckbox/LockCheckbox";
 
 type Props = {
     value: DealServiceSchema;

src/modules/dealModularEditorTabs/FulfillmentBaseTab/components/DealInfoView/components/DealServicesTable/components/DealServicesTotalLabel.tsx

@@ -1,6 +1,6 @@
 import { useMemo } from "react";
 import { Title } from "@mantine/core";
-import { useFulfillmentBaseContext } from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext";
+import { useFulfillmentBaseContext } from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext";
 
 const DealServicesTotalLabel = () => {
     const { dealServicesList } = useFulfillmentBaseContext();

src/modules/dealModularEditorTabs/FulfillmentBaseTab/components/DealInfoView/components/DealServicesTable/components/ServicesActions.tsx

@@ -1,8 +1,8 @@
 import { Button, Flex } from "@mantine/core";
 import { modals } from "@mantine/modals";
 import { addKitToDeal, ServicesKitSchema } from "@/lib/client";
-import { useFulfillmentBaseContext } from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext";
-import { ServiceType } from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/types/service";
+import { useFulfillmentBaseContext } from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext";
+import { ServiceType } from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/types/service";
 
 const ServicesActions = () => {
     const { dealServicesList, dealServicesCrud, deal } =

src/modules/dealModularEditorTabs/FulfillmentBaseTab/components/DealInfoView/components/ProductsActions/ProductsActions.tsx

@@ -1,7 +1,7 @@
 import { FC } from "react";
 import { Button, Flex } from "@mantine/core";
 import { modals } from "@mantine/modals";
-import { useFulfillmentBaseContext } from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext";
+import { useFulfillmentBaseContext } from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext";
 
 const ProductsActions: FC = () => {
     const { deal, dealProductsList, productsCrud, dealProductsCrud } =

src/modules/dealModularEditorTabs/FulfillmentBaseTab/components/DealInfoView/components/TotalPriceLabel/TotalPriceLabel.tsx

@@ -1,6 +1,6 @@
 import { useMemo } from "react";
 import { Flex, Title } from "@mantine/core";
-import { useFulfillmentBaseContext } from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext";
+import { useFulfillmentBaseContext } from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext";
 import styles from "../../../../FulfillmentBaseTab.module.css";
 
 const TotalPriceLabel = () => {

src/modules/dealModularEditorTabs/FulfillmentBaseTab/components/FulfillmentBaseTabBody/FulfillmentBaseTabBody.tsx

@@ -1,6 +1,6 @@
 import { Flex, ScrollArea, Stack } from "@mantine/core";
-import DealInfoView from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealInfoView/DealInfoView";
-import ProductView from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/ProductView/ProductView";
+import DealInfoView from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/components/DealInfoView/DealInfoView";
+import ProductView from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/components/ProductView/ProductView";
 import { useFulfillmentBaseContext } from "../../contexts/FulfillmentBaseContext";
 
 const FulfillmentBaseTabBody = () => {

src/modules/dealModularEditorTabs/FulfillmentBaseTab/components/ProductSelect/ProductSelect.tsx

@@ -6,7 +6,7 @@ import ObjectSelect, {
     ObjectSelectProps,
 } from "@/components/selects/ObjectSelect/ObjectSelect";
 import { ProductSchema } from "@/lib/client";
-import useProductsList from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/hooks/lists/useProductsList";
+import useProductsList from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/hooks/lists/useProductsList";
 import renderProductOption from "./utils/renderProductOption";
 
 type RestProps = {

src/modules/dealModularEditorTabs/FulfillmentBaseTab/components/ProductSelect/utils/renderProductOption.tsx

@@ -5,7 +5,7 @@ import {
     Tooltip,
 } from "@mantine/core";
 import { ProductSchema } from "@/lib/client";
-import ProductFieldsList from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/ProductView/components/ProductFieldsList";
+import ProductFieldsList from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/components/ProductView/components/ProductFieldsList";
 
 const renderProductOption = (
     products: ProductSchema[]

src/modules/dealModularEditorTabs/FulfillmentBaseTab/components/ProductView/ProductView.tsx

@@ -16,10 +16,10 @@ import {
     duplicateProductServices,
     ServicesKitSchema,
 } from "@/lib/client";
-import ProductFieldsList from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/ProductView/components/ProductFieldsList";
-import ProductViewActions from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/ProductView/components/ProductViewActions";
-import { useFulfillmentBaseContext } from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext";
-import { ServiceType } from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/types/service";
+import ProductFieldsList from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/components/ProductView/components/ProductFieldsList";
+import ProductViewActions from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/components/ProductView/components/ProductViewActions";
+import { useFulfillmentBaseContext } from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext";
+import { ServiceType } from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/types/service";
 import ProductServicesTable from "./components/ProductServicesTable";
 import styles from "../../FulfillmentBaseTab.module.css";
 

src/modules/dealModularEditorTabs/FulfillmentBaseTab/components/ProductView/components/ProductServicesTable.tsx

@@ -5,8 +5,8 @@ import { modals } from "@mantine/modals";
 import ActionIconWithTip from "@/components/ui/ActionIconWithTip/ActionIconWithTip";
 import BaseTable from "@/components/ui/BaseTable/BaseTable";
 import { DealProductSchema, ProductServiceSchema } from "@/lib/client";
-import useProductServicesTableColumns from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/ProductView/hooks/useProductServicesTableColumns";
-import { useFulfillmentBaseContext } from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext";
+import useProductServicesTableColumns from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/components/ProductView/hooks/useProductServicesTableColumns";
+import { useFulfillmentBaseContext } from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext";
 
 type Props = {
     dealProduct: DealProductSchema;

src/modules/dealModularEditorTabs/FulfillmentBaseTab/components/ProductView/components/ProductViewActions.tsx

@@ -4,7 +4,7 @@ import { Flex } from "@mantine/core";
 import { modals } from "@mantine/modals";
 import ActionIconWithTip from "@/components/ui/ActionIconWithTip/ActionIconWithTip";
 import { DealProductSchema } from "@/lib/client";
-import { useFulfillmentBaseContext } from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext";
+import { useFulfillmentBaseContext } from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext";
 
 type Props = {
     dealProduct: DealProductSchema;

src/modules/dealModularEditorTabs/FulfillmentBaseTab/components/ServiceSelect/ServiceSelect.tsx

@@ -9,8 +9,8 @@ import ObjectSelect, {
     ObjectSelectProps,
 } from "@/components/selects/ObjectSelect/ObjectSelect";
 import { ServiceSchema } from "@/lib/client";
-import useServicesList from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/hooks/lists/useServicesList";
-import { ServiceType } from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/types/service";
+import useServicesList from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/hooks/lists/useServicesList";
+import { ServiceType } from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/types/service";
 
 type RestProps = {
     filterType?: ServiceType;

src/modules/dealModularEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext.tsx

@@ -5,13 +5,13 @@ import { getProductsQueryKey } from "@/lib/client/@tanstack/react-query.gen";
 import makeContext from "@/lib/contextFactory/contextFactory";
 import useDealServicesCrud, {
     DealServicesCrud,
-} from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/hooks/cruds/useDealServiceCrud";
+} from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/hooks/cruds/useDealServiceCrud";
 import useProductServiceCrud, {
     DealProductServicesCrud,
-} from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/hooks/cruds/useProductServiceCrud";
+} from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/hooks/cruds/useProductServiceCrud";
 import useDealServicesList, {
     DealServicesList,
-} from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/hooks/lists/useDealServicesList";
+} from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/hooks/lists/useDealServicesList";
 import useDealProductCrud, {
     DealProductsCrud,
 } from "../hooks/cruds/useDealProductCrud";

src/modules/dealModularEditorTabs/FulfillmentBaseTab/modals/DealServiceEditorModal/DealServiceEditorModal.tsx

@@ -11,7 +11,7 @@ import {
 import BaseFormModal, {
     CreateEditFormProps,
 } from "@/modals/base/BaseFormModal/BaseFormModal";
-import { ServiceType } from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/types/service";
+import { ServiceType } from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/types/service";
 import ServiceWithPriceInput from "./components/ServiceWithPriceInput";
 
 type RestProps = {

src/modules/dealModularEditorTabs/FulfillmentBaseTab/modals/DealServiceEditorModal/components/ServiceWithPriceInput.tsx

@@ -9,8 +9,8 @@ import {
 } from "@mantine/core";
 import { ObjectSelectProps } from "@/components/selects/ObjectSelect/ObjectSelect";
 import { ServiceSchema } from "@/lib/client";
-import ServiceSelect from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/ServiceSelect/ServiceSelect";
-import { ServiceType } from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/types/service";
+import ServiceSelect from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/components/ServiceSelect/ServiceSelect";
+import { ServiceType } from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/types/service";
 
 type ServiceProps = Omit<ObjectSelectProps<ServiceSchema>, "data">;
 type PriceProps = NumberInputProps;

src/modules/dealModularEditorTabs/FulfillmentBaseTab/modals/ProductEditorModal/ProductEditorModal.tsx

@@ -11,7 +11,7 @@ import {
 import BaseFormModal, {
     CreateEditFormProps,
 } from "@/modals/base/BaseFormModal/BaseFormModal";
-import ProductImageDropzone from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/ProductImageDropzone/ProductImageDropzone";
+import ProductImageDropzone from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/components/ProductImageDropzone/ProductImageDropzone";
 import BaseFormInputProps from "@/utils/baseFormInputProps";
 
 type Props = CreateEditFormProps<

src/modules/dealModularEditorTabs/FulfillmentBaseTab/modals/ProductServiceEditorModal/ProductServiceEditorModal.tsx

@@ -12,8 +12,8 @@ import {
 import BaseFormModal, {
     CreateEditFormProps,
 } from "@/modals/base/BaseFormModal/BaseFormModal";
-import ServiceWithPriceInput from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/modals/DealServiceEditorModal/components/ServiceWithPriceInput";
-import { ServiceType } from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/types/service";
+import ServiceWithPriceInput from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/modals/DealServiceEditorModal/components/ServiceWithPriceInput";
+import { ServiceType } from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/types/service";
 
 type RestProps = {
     quantity: number;

src/modules/dealModularEditorTabs/FulfillmentBaseTab/modals/ServicesKitSelectModal/ServicesKitSelectModal.tsx

@@ -5,7 +5,7 @@ import { useForm } from "@mantine/form";
 import { ContextModalProps } from "@mantine/modals";
 import { ServicesKitSchema } from "@/lib/client";
 import BaseFormModalActions from "@/modals/base/BaseFormModal/BaseFormModalActions";
-import ServicesKitSelect from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/modals/ServicesKitSelectModal/components/ServicesKitSelect";
+import ServicesKitSelect from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/modals/ServicesKitSelectModal/components/ServicesKitSelect";
 
 type Props = {
     onSelect: (kit: ServicesKitSchema) => void;

src/modules/dealModularEditorTabs/FulfillmentBaseTab/modals/ServicesKitSelectModal/components/ServicesKitSelect.tsx

@@ -3,7 +3,7 @@ import ObjectSelect, {
     ObjectSelectProps,
 } from "@/components/selects/ObjectSelect/ObjectSelect";
 import { ServicesKitSchema } from "@/lib/client";
-import useServicesKitsList from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/hooks/lists/useServicesKitsList";
+import useServicesKitsList from "@/modules/dealModularEditorTabs/FulfillmentBaseTab/hooks/lists/useServicesKitsList";
 
 type Props = Omit<ObjectSelectProps<ServicesKitSchema>, "data">;
 

src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealInfoView/DealInfoView.tsx

@@ -1,22 +0,0 @@
-import { Flex, Stack } from "@mantine/core";
-import DealServicesTable from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealInfoView/components/DealServicesTable/DealServicesTable";
-import ProductsActions from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealInfoView/components/ProductsActions/ProductsActions";
-import TotalPriceLabel from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealInfoView/components/TotalPriceLabel/TotalPriceLabel";
-import styles from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/FulfillmentBaseTab.module.css";
-
-const DealInfoView = () => (
-    <Stack
-        flex={2}
-        gap={"sm"}>
-        <Flex
-            gap={"sm"}
-            direction={"column"}
-            className={styles.container}>
-            <DealServicesTable />
-            <ProductsActions />
-        </Flex>
-        <TotalPriceLabel />
-    </Stack>
-);
-
-export default DealInfoView;