Final fix for all pages and both mobile and desktop

bahnzumberg · Aug 10, 2024 · 5042598 · 5042598
1 parent 0c24992
commit 5042598
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/components/Search/CityResultList.js b/src/components/Search/CityResultList.js
@@ -80,6 +80,7 @@ export function CityResultList({
               console.log("L76 ListItem, cityOne :", cityOne)
 
               if(!!cityOne && !!idOne ){
+                console.log("L83 ==> idOne :", idOne)
                 setCityInput(_city.label);
                 setCity(_city.value)
                 navigate(`tour/${idOne}/${_city.value}`);

diff --git a/src/components/Search/Search.js b/src/components/Search/Search.js
@@ -8,7 +8,7 @@ import { compose } from "redux";
 import { connect, useSelector } from "react-redux";
 import { loadCities } from "../../actions/cityActions";
 import { Fragment, useEffect, useState } from "react";
-import { useSearchParams } from "react-router-dom";
+import { useSearchParams, useParams } from "react-router-dom";
 import {
   parseIfNeccessary,
   setOrRemoveSearchParam,
@@ -48,8 +48,8 @@ export function Search({
   setFilterValues,
   filterValues,
   mapBounds,
-  idOne,
-  cityOne
+  // idOne,
+  // cityOne
 }) {
   //navigation
   const navigate = useNavigate();
@@ -72,7 +72,7 @@ export function Search({
   let suggestion; //variable that stores the text of the selected option
   const urlSearchParams = new URLSearchParams(window.location.search);
   const cityParam = urlSearchParams.get("city");
-  // const { cityOne, idOne } = useParams();
+  const { cityOne, idOne } = useParams();
   const [city, setCity] = useState({
     label: capitalize(cityParam) || capitalize(cityOne),
     value: cityParam,
@@ -85,7 +85,7 @@ export function Search({
     console.log("L75 Search/ cityParam", cityParam);
     console.log("L75 Search/ city", city);
 
-  }, []);
+  }, [city, cityParam]);
 
   const [region, setRegion] = useState(null);
   // const initialIsMapView = (searchParams.has('map') && (searchParams.get('map') === 'true')) || false;
@@ -449,7 +449,7 @@ export function Search({
           console.log("YOU ARE AT L438 !")
           setCityInput(city.label);
           setCity(city.value);
-          navigate(`tour/${idOne.idOne}/${city.value}`);
+          navigate(`tour/${idOne}/${city.value}`);
         } else if (!!city) {
           setCityInput(city.label);
           setCity(city);
@@ -459,8 +459,8 @@ export function Search({
         }
         hideModal();
       },
-      cityOne: { cityOne },
-      idOne: { idOne },
+      cityOne:  cityOne ,
+      idOne:  idOne ,
       setSearchParams,
       title: "",
       sourceCall: "city",