From a26865508a21a12c58d4bf94b547644a3867a11f Mon Sep 17 00:00:00 2001
From: VITALY-VORON <142410419+VITALY-VORON@users.noreply.github.com>
Date: Sat, 26 Aug 2023 07:31:19 +0300
Subject: [PATCH] main props

---
 src/App.js                      |  9 ++-------
 src/components/City/City.js     |  3 ++-
 src/components/Main/Main.js     | 11 ++++-------
 src/components/Tinder/Tinder.js |  4 +++-
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/App.js b/src/App.js
index ca7553e..5014984 100644
--- a/src/App.js
+++ b/src/App.js
@@ -13,9 +13,6 @@ function App() {
   const [cardInfo, setCardInfo] = useState([]);
   const [userData, setUserData] = useState({});
 
-  const selectedCity = userData.selectedCity;
-  const identification = userData.unique;
-
   const handleButtonValue = (value) => {
     setIsHidden(true);
     setTimeout(() => {
@@ -29,7 +26,6 @@ function App() {
       axios.get('https://easytravel.zetcraft.ru/v1/GetAllCards')
         .then(response => {
           setCardInfo(response.data);
-          console.log(cardInfo.length);
         })
         .catch(error => {
           console.error('Error fetching data:', error);
@@ -39,7 +35,6 @@ function App() {
   }, []);
 
   useEffect(() => {
-    console.log(userData);
     // Загрузка userData из localStorage при монтировании компонента
     const savedUserData = JSON.parse(localStorage.getItem('userData'));
     if (savedUserData) {
@@ -62,7 +57,7 @@ function App() {
       content = <Tinder getValue={handleButtonValue} cardInfo={cardInfo} userData={userData} setUserData={setUserData} />
       break;
     case '/main':
-      content = <Main userData={userData} selectedCity={selectedCity} identification={identification} />
+      content = <Main />
       break;
     case '/city':
       content = <City getValue={handleButtonValue} setUserData={setUserData} />
@@ -75,7 +70,7 @@ function App() {
 
   return (
     <div className={`App ${isHidden ? 'hidden' : ''}`}>
-      {arrayLength !== 0 ? <Main /> : content }
+      {arrayLength !== 0 ? <Main userData={userData}/> : content}
     </div>
   );
 }
diff --git a/src/components/City/City.js b/src/components/City/City.js
index f0143bb..d3d90e4 100644
--- a/src/components/City/City.js
+++ b/src/components/City/City.js
@@ -109,7 +109,8 @@ const City = (props) => {
     <button
       onClick={() => {
         route('/second')
-        setUserData(prevUserData => ({ ...prevUserData, selectedCity: selectedCity}));
+        setUserData({selectedCity: selectedCity});
+        console.log(selectedCity);
     }}
       className="animated-button"
       style={{
diff --git a/src/components/Main/Main.js b/src/components/Main/Main.js
index 4d5b349..4d5c0f5 100644
--- a/src/components/Main/Main.js
+++ b/src/components/Main/Main.js
@@ -1,13 +1,10 @@
-import React, {useState, useEffect} from "react";
+import React, { useEffect } from "react";
 
-
-const Main = (props) => {
-
-    const city = props.selectedCity;
-    const id = props.identification;
+const Main = ({userData}) => {
 
     useEffect(() => {
-        console.log(city && id);
+        console.log(userData.selectedCity);
+        console.log(userData.unique);
     })
 
     return ( 
diff --git a/src/components/Tinder/Tinder.js b/src/components/Tinder/Tinder.js
index efaeec4..80744cf 100644
--- a/src/components/Tinder/Tinder.js
+++ b/src/components/Tinder/Tinder.js
@@ -44,7 +44,9 @@ const Tinder = (props) => {
                             var uniqueIds = [...new Set(allIds)];
                             if(uniqueIds.length === cardInfo.length) {
                                 route('/main');
-                                setUserData(prevUserData => ({ ...prevUserData, unique }));
+                                setUserData(prevUserData => ({ ...prevUserData, unique: unique }));
+                                console.log(unique);
+                                console.log(props.userData);
                             }
                         }}
                     >