attempt at fixing the calendar day switch

bahnzumberg · Aug 16, 2024 · 12bbd7d · 12bbd7d
1 parent 01ca980
commit 12bbd7d
Show file tree

Hide file tree

Showing 8 changed files with 283 additions and 11,727 deletions.
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "redux": "^4.1.2",
     "redux-thunk": "^2.4.1",
     "uuid": "^9.0.0",
-    "watch": "^1.0.2",
+    "watch": "^0.13.0",
     "web-vitals": "^3.3.0",
     "webpack-cli": "^5.1.4"
   },
@@ -76,6 +76,8 @@
     "clean-webpack-plugin": "^4.0.0",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.7.3",
+    "eslint": "^8.57.0",
+    "eslint-plugin-react": "^7.35.0",
     "file-loader": "^6.2.0",
     "html-loader": "^4.2.0",
     "html-webpack-plugin": "^5.5.0",

diff --git a/src/components/Itinerary/Itinerary.js b/src/components/Itinerary/Itinerary.js
@@ -5,13 +5,18 @@ import ItineraryTourTimeLineContainer from "../TimeLine/ItineraryTourTimeLineCon
 import { useTranslation } from "react-i18next";
 import { Divider, Typography } from "@mui/material";
 
-const Itinerary = ({ connectionData, dateIndex, onDateIndexUpdate, tour, validTour, city }) => {
+const Itinerary = ({ connectionData, dateIndex, onDateIndexUpdate, tour, validTour, city, setDateIndex, setActiveConnection, setActiveReturnConnection }) => {
 
   const { t } = useTranslation();
 
   const tourDuration = !!tour && !!tour.duration ? tour.duration : undefined;
   // const validTour = !!tour && tour?.active ;
 
+  // const updateActiveConnectionIndex = (index) => {
+  //   setDateIndex(index);
+  //   setActiveConnection(connections[index]);
+  //   setActiveReturnConnection(connections[index].returns[0]);
+  // };
 
   return (
     <div className="tour-detail-itinerary-container">
@@ -25,7 +30,10 @@ const Itinerary = ({ connectionData, dateIndex, onDateIndexUpdate, tour, validTo
               <ItineraryCalendar
               connectionData={connectionData}
               dateIndex={dateIndex}
-              onDateIndexUpdate={onDateIndexUpdate}
+              setDateIndex={setDateIndex}
+              setActiveConnection={setActiveConnection}
+              setActiveReturnConnection={setActiveReturnConnection}
+
               ></ItineraryCalendar>
               <Divider sx={{ my: "24px" }} />
               {!!connectionData && (

diff --git a/src/components/Itinerary/ItineraryCalendar.js b/src/components/Itinerary/ItineraryCalendar.js
@@ -36,7 +36,11 @@ const isSelectedDay = (date, selectedDay) => {
 const ItineraryCalendar = ({
   connectionData,
   dateIndex,
-  onDateIndexUpdate,
+  // onDateIndexUpdate,
+  setDateIndex,
+  setActiveConnection,
+  setActiveReturnConnection
+
 }) => {
   const { t, i18n } = useTranslation();
   let selectedDay = dateIndex;
@@ -48,8 +52,10 @@ const ItineraryCalendar = ({
     days = _.map(connectionData, (con) => moment(con.date));
   }
 
-  const setSelectedDay = (index) => {
-    onDateIndexUpdate(index);
+  const updateActiveConnectionIndex = (index) => {
+    setDateIndex(index);
+    setActiveConnection(connectionData[index]);
+    setActiveReturnConnection(connectionData[index].returns[0]);
   };
 
   return (
@@ -78,7 +84,7 @@ const ItineraryCalendar = ({
                 ? "tour-detail-itinerary-calendar-grid-selected"
                 : "tour-detail-itinerary-calendar-date"
             }`}
-            onClick={() => setSelectedDay(index)}
+            onClick={() => updateActiveConnectionIndex(index)}
           >
             {dd.date()}
           </div>