From 15193827a1de85f2f30404f778d1a9dfddee7201 Mon Sep 17 00:00:00 2001
From: DmitriyB <dimasik_burdin@inbox.ru>
Date: Fri, 10 Feb 2023 18:08:18 +0500
Subject: [PATCH] refactor file structure

---
 .../CalculatorComponent.js                    | 53 +++++++++++++++++++
 .../AveragePriceApartment.js                  |  0
 .../AverageSquareApartment.js                 |  0
 .../ConsultationOffice/ConsultationOffice.js  |  0
 .../ConsultationReserv/ConsultationReserv.js  |  0
 .../components}/FederalCIty/FederalCity.js    |  0
 .../InputComponent/InputComponent.css         |  0
 .../InputComponent/InputComponent.js          |  2 +-
 .../components}/InputComponent/edit.svg       |  0
 .../components}/InputNumber/InputNumber.css   |  0
 .../components}/InputNumber/InputNumber.js    |  0
 .../components}/InputSelect/Chevron.svg       |  0
 .../components}/InputSelect/InputSelect.css   |  0
 .../components}/InputSelect/InputSelect.js    |  0
 .../components}/MapComponent/MapComponent.css |  0
 .../components}/MapComponent/MapComponent.js  |  0
 .../components}/Region/Region.css             |  0
 .../components}/Region/Region.js              |  0
 .../components}/ResultBlock/ResultBlock.css   |  0
 .../components}/ResultBlock/ResultBlock.js    |  0
 .../components}/Sales/Sales.js                |  0
 .../DraggableGallery/DraggableGallery.js      |  5 ++
 src/components/Main/Main.js                   | 48 ++---------------
 23 files changed, 62 insertions(+), 46 deletions(-)
 create mode 100644 src/components/CalculatorComponent/CalculatorComponent.js
 rename src/components/{ => CalculatorComponent/components}/AveragePriceApartment/AveragePriceApartment.js (100%)
 rename src/components/{ => CalculatorComponent/components}/AverageSquareApartment/AverageSquareApartment.js (100%)
 rename src/components/{ => CalculatorComponent/components}/ConsultationOffice/ConsultationOffice.js (100%)
 rename src/components/{ => CalculatorComponent/components}/ConsultationReserv/ConsultationReserv.js (100%)
 rename src/components/{ => CalculatorComponent/components}/FederalCIty/FederalCity.js (100%)
 rename src/components/{ => CalculatorComponent/components}/InputComponent/InputComponent.css (100%)
 rename src/components/{ => CalculatorComponent/components}/InputComponent/InputComponent.js (98%)
 rename src/components/{ => CalculatorComponent/components}/InputComponent/edit.svg (100%)
 rename src/components/{ => CalculatorComponent/components}/InputNumber/InputNumber.css (100%)
 rename src/components/{ => CalculatorComponent/components}/InputNumber/InputNumber.js (100%)
 rename src/components/{ => CalculatorComponent/components}/InputSelect/Chevron.svg (100%)
 rename src/components/{ => CalculatorComponent/components}/InputSelect/InputSelect.css (100%)
 rename src/components/{ => CalculatorComponent/components}/InputSelect/InputSelect.js (100%)
 rename src/components/{ => CalculatorComponent/components}/MapComponent/MapComponent.css (100%)
 rename src/components/{ => CalculatorComponent/components}/MapComponent/MapComponent.js (100%)
 rename src/components/{ => CalculatorComponent/components}/Region/Region.css (100%)
 rename src/components/{ => CalculatorComponent/components}/Region/Region.js (100%)
 rename src/components/{ => CalculatorComponent/components}/ResultBlock/ResultBlock.css (100%)
 rename src/components/{ => CalculatorComponent/components}/ResultBlock/ResultBlock.js (100%)
 rename src/components/{ => CalculatorComponent/components}/Sales/Sales.js (100%)
 create mode 100644 src/components/DraggableGallery/DraggableGallery.js

diff --git a/src/components/CalculatorComponent/CalculatorComponent.js b/src/components/CalculatorComponent/CalculatorComponent.js
new file mode 100644
index 0000000..7d79883
--- /dev/null
+++ b/src/components/CalculatorComponent/CalculatorComponent.js
@@ -0,0 +1,53 @@
+import { useEffect } from "react";
+import { calcSlice } from "../../store/reducers/calcSlice";
+import { useSelector, useDispatch } from "react-redux";
+
+import { InputSelect } from "../InputSelect/InputSelect";
+import { InputNumber } from "../InputNumber/InputNumber";
+import { AveragePriceApartment } from "./components/AveragePriceApartment/AveragePriceApartment";
+import { AverageSquareApartment } from "./components/AverageSquareApartment/AverageSquareApartment";
+import { ConsultationOffice } from "./components/ConsultationOffice/ConsultationOffice";
+import { ConsultationReserv } from "./components/ConsultationReserv/ConsultationReserv";
+import { Sales } from "./components/Sales/Sales";
+import { ResultBlock } from "../ResultBlock/ResultBlock";
+
+const INITIAL_REGION = "e5b7edfb-17ec-475f-8631-bc796ad19909";
+
+export const CalculatorComponent = ({ }) => {
+    const dispatch = useDispatch();
+    const { handleSelectRegion, handleOptions, handleValue } = calcSlice.actions;
+    const { selectedRegion, filteredList, squareRC } = useSelector(
+        (state) => state.calcReducer
+    );
+
+    useEffect(() => {
+        dispatch(handleSelectRegion(INITIAL_REGION));
+        dispatch(handleOptions());
+    }, []);
+
+    const handleSelect = (element) => {
+        dispatch(handleSelectRegion(element.id));
+    };
+
+    return (
+        <>
+            <div className="input-container-main">
+                <InputSelect
+                    option={filteredList}
+                    handleSelect={handleSelect}
+                    selectedValue={selectedRegion}
+                ></InputSelect>
+                <InputNumber handleState={handleValue} number={squareRC}></InputNumber>
+                <AverageSquareApartment></AverageSquareApartment>
+                <AveragePriceApartment></AveragePriceApartment>
+            </div>
+            <div className="input-container-second">
+                <ConsultationOffice></ConsultationOffice>
+                <ConsultationReserv></ConsultationReserv>
+                <Sales></Sales>
+                <ResultBlock></ResultBlock>
+            </div>
+
+        </>
+    );
+};
diff --git a/src/components/AveragePriceApartment/AveragePriceApartment.js b/src/components/CalculatorComponent/components/AveragePriceApartment/AveragePriceApartment.js
similarity index 100%
rename from src/components/AveragePriceApartment/AveragePriceApartment.js
rename to src/components/CalculatorComponent/components/AveragePriceApartment/AveragePriceApartment.js
diff --git a/src/components/AverageSquareApartment/AverageSquareApartment.js b/src/components/CalculatorComponent/components/AverageSquareApartment/AverageSquareApartment.js
similarity index 100%
rename from src/components/AverageSquareApartment/AverageSquareApartment.js
rename to src/components/CalculatorComponent/components/AverageSquareApartment/AverageSquareApartment.js
diff --git a/src/components/ConsultationOffice/ConsultationOffice.js b/src/components/CalculatorComponent/components/ConsultationOffice/ConsultationOffice.js
similarity index 100%
rename from src/components/ConsultationOffice/ConsultationOffice.js
rename to src/components/CalculatorComponent/components/ConsultationOffice/ConsultationOffice.js
diff --git a/src/components/ConsultationReserv/ConsultationReserv.js b/src/components/CalculatorComponent/components/ConsultationReserv/ConsultationReserv.js
similarity index 100%
rename from src/components/ConsultationReserv/ConsultationReserv.js
rename to src/components/CalculatorComponent/components/ConsultationReserv/ConsultationReserv.js
diff --git a/src/components/FederalCIty/FederalCity.js b/src/components/CalculatorComponent/components/FederalCIty/FederalCity.js
similarity index 100%
rename from src/components/FederalCIty/FederalCity.js
rename to src/components/CalculatorComponent/components/FederalCIty/FederalCity.js
diff --git a/src/components/InputComponent/InputComponent.css b/src/components/CalculatorComponent/components/InputComponent/InputComponent.css
similarity index 100%
rename from src/components/InputComponent/InputComponent.css
rename to src/components/CalculatorComponent/components/InputComponent/InputComponent.css
diff --git a/src/components/InputComponent/InputComponent.js b/src/components/CalculatorComponent/components/InputComponent/InputComponent.js
similarity index 98%
rename from src/components/InputComponent/InputComponent.js
rename to src/components/CalculatorComponent/components/InputComponent/InputComponent.js
index 76fa40e..d83751c 100644
--- a/src/components/InputComponent/InputComponent.js
+++ b/src/components/CalculatorComponent/components/InputComponent/InputComponent.js
@@ -3,7 +3,7 @@ import edit from "./edit.svg";
 import { useEffect, useState, useRef } from "react";
 import CurrencyInput from "react-currency-input-field";
 import { useDispatch } from "react-redux";
-import { calcSlice } from "../../store/reducers/calcSlice";
+import { calcSlice } from "../../../../store/reducers/calcSlice";
 
 export const InputComponent = ({
   value,
diff --git a/src/components/InputComponent/edit.svg b/src/components/CalculatorComponent/components/InputComponent/edit.svg
similarity index 100%
rename from src/components/InputComponent/edit.svg
rename to src/components/CalculatorComponent/components/InputComponent/edit.svg
diff --git a/src/components/InputNumber/InputNumber.css b/src/components/CalculatorComponent/components/InputNumber/InputNumber.css
similarity index 100%
rename from src/components/InputNumber/InputNumber.css
rename to src/components/CalculatorComponent/components/InputNumber/InputNumber.css
diff --git a/src/components/InputNumber/InputNumber.js b/src/components/CalculatorComponent/components/InputNumber/InputNumber.js
similarity index 100%
rename from src/components/InputNumber/InputNumber.js
rename to src/components/CalculatorComponent/components/InputNumber/InputNumber.js
diff --git a/src/components/InputSelect/Chevron.svg b/src/components/CalculatorComponent/components/InputSelect/Chevron.svg
similarity index 100%
rename from src/components/InputSelect/Chevron.svg
rename to src/components/CalculatorComponent/components/InputSelect/Chevron.svg
diff --git a/src/components/InputSelect/InputSelect.css b/src/components/CalculatorComponent/components/InputSelect/InputSelect.css
similarity index 100%
rename from src/components/InputSelect/InputSelect.css
rename to src/components/CalculatorComponent/components/InputSelect/InputSelect.css
diff --git a/src/components/InputSelect/InputSelect.js b/src/components/CalculatorComponent/components/InputSelect/InputSelect.js
similarity index 100%
rename from src/components/InputSelect/InputSelect.js
rename to src/components/CalculatorComponent/components/InputSelect/InputSelect.js
diff --git a/src/components/MapComponent/MapComponent.css b/src/components/CalculatorComponent/components/MapComponent/MapComponent.css
similarity index 100%
rename from src/components/MapComponent/MapComponent.css
rename to src/components/CalculatorComponent/components/MapComponent/MapComponent.css
diff --git a/src/components/MapComponent/MapComponent.js b/src/components/CalculatorComponent/components/MapComponent/MapComponent.js
similarity index 100%
rename from src/components/MapComponent/MapComponent.js
rename to src/components/CalculatorComponent/components/MapComponent/MapComponent.js
diff --git a/src/components/Region/Region.css b/src/components/CalculatorComponent/components/Region/Region.css
similarity index 100%
rename from src/components/Region/Region.css
rename to src/components/CalculatorComponent/components/Region/Region.css
diff --git a/src/components/Region/Region.js b/src/components/CalculatorComponent/components/Region/Region.js
similarity index 100%
rename from src/components/Region/Region.js
rename to src/components/CalculatorComponent/components/Region/Region.js
diff --git a/src/components/ResultBlock/ResultBlock.css b/src/components/CalculatorComponent/components/ResultBlock/ResultBlock.css
similarity index 100%
rename from src/components/ResultBlock/ResultBlock.css
rename to src/components/CalculatorComponent/components/ResultBlock/ResultBlock.css
diff --git a/src/components/ResultBlock/ResultBlock.js b/src/components/CalculatorComponent/components/ResultBlock/ResultBlock.js
similarity index 100%
rename from src/components/ResultBlock/ResultBlock.js
rename to src/components/CalculatorComponent/components/ResultBlock/ResultBlock.js
diff --git a/src/components/Sales/Sales.js b/src/components/CalculatorComponent/components/Sales/Sales.js
similarity index 100%
rename from src/components/Sales/Sales.js
rename to src/components/CalculatorComponent/components/Sales/Sales.js
diff --git a/src/components/DraggableGallery/DraggableGallery.js b/src/components/DraggableGallery/DraggableGallery.js
new file mode 100644
index 0000000..312e9c7
--- /dev/null
+++ b/src/components/DraggableGallery/DraggableGallery.js
@@ -0,0 +1,5 @@
+export const DraggableGallery = () => {
+    return (<div className="">
+        
+    </div>)
+}
\ No newline at end of file
diff --git a/src/components/Main/Main.js b/src/components/Main/Main.js
index 08254d6..643254b 100644
--- a/src/components/Main/Main.js
+++ b/src/components/Main/Main.js
@@ -1,53 +1,11 @@
 import "./Main.css";
-import { useEffect } from "react";
-import { calcSlice } from "../../store/reducers/calcSlice";
-import { useSelector, useDispatch } from "react-redux";
+import { CalculatorComponent } from '../CalculatorComponent/CalculatorComponent'
+export const Main = ({ }) => {
 
-import { InputSelect } from "../InputSelect/InputSelect";
-import { InputNumber } from "../InputNumber/InputNumber";
-import { AveragePriceApartment } from "../AveragePriceApartment/AveragePriceApartment";
-import { AverageSquareApartment } from "../AverageSquareApartment/AverageSquareApartment";
-import { ConsultationOffice } from "../ConsultationOffice/ConsultationOffice";
-import { ConsultationReserv } from "../ConsultationReserv/ConsultationReserv";
-import { Sales } from "../Sales/Sales";
-import { ResultBlock } from "../ResultBlock/ResultBlock";
-
-const INITIAL_REGION = "e5b7edfb-17ec-475f-8631-bc796ad19909";
-
-export const Main = ({}) => {
-  const dispatch = useDispatch();
-  const { handleSelectRegion, handleOptions, handleValue } = calcSlice.actions;
-  const { selectedRegion, filteredList, squareRC } = useSelector(
-    (state) => state.calcReducer
-  );
-
-  useEffect(() => {
-    dispatch(handleSelectRegion(INITIAL_REGION));
-    dispatch(handleOptions());
-  }, []);
-
-  const handleSelect = (element) => {
-    dispatch(handleSelectRegion(element.id));
-  };
 
   return (
     <div className="main">
-      <div className="input-container-main">
-        <InputSelect
-          option={filteredList}
-          handleSelect={handleSelect}
-          selectedValue={selectedRegion}
-        ></InputSelect>
-        <InputNumber handleState={handleValue} number={squareRC}></InputNumber>
-        <AverageSquareApartment></AverageSquareApartment>
-        <AveragePriceApartment></AveragePriceApartment>
-      </div>
-      <div className="input-container-second">
-        <ConsultationOffice></ConsultationOffice>
-        <ConsultationReserv></ConsultationReserv>
-        <Sales></Sales>
-        <ResultBlock></ResultBlock>
-      </div>
+      <CalculatorComponent></CalculatorComponent>
     </div>
   );
 };