@@ -25,16 +27,19 @@ const Itinerary = ({ connectionData, dateIndex, onDateIndexUpdate, tour, validTo
openFilter()}>
+ openFilter()}
+ aria-label="Filter">
{
- const loadData = async () => {
- try {
- const res = await loadCities({ limit: 5 }, requestConfig);
- citiesList.current = res;
- // console.log("L75 ======= res:")
- // console.log(res)
-
- } catch (error) {
- console.error("Error loading data", error);
- } finally {
- setIsLoading(false);
- }
- };
-
- loadData();
-
- // console.log("L83 ======= citiesList.current :")
- // console.log(citiesList.current)
-
- // Cleanup on component unmount
- return () => abortController.abort();
- }, []);
-
-
-
+ connectionsRef.current = connections[dateIndex]
+
+ }, [dateIndex, connections])
+
// after the useEffect we have state "entries" being a strings array representing the connection details
useEffect(() => {
- let settingEnt = jsonToStringArray(getSingleConnection(), "to", t);
- setEntries(settingEnt);
- setReturnEntries(connections.returns);
- extractReturns();
+ if(!emptyConnArray){
+ let settingEnt = jsonToStringArray(getSingleConnection(), "to", t);
+ setEntries(settingEnt);
+ setReturnEntries(connections.returns);
+ extractReturns();
+ }
}, [connections]);
- const formatDuration = (duration) => {
- let _time = " ";
- _time = !!duration && convertNumToTime(duration, true);
- _time = _time.replace(/\s*h\s*$/, '');
- return _time;
- }
useEffect(() => {
if (city ==='no-city'){
@@ -136,13 +107,20 @@ function ItineraryTourTimeLineContainer({
}
}, [duration]);
+ const formatDuration = (duration) => {
+ let _time = " ";
+ _time = !!duration && convertNumToTime(duration, true);
+ _time = _time.replace(/\s*h\s*$/, '');
+ return _time;
+ }
+
+
//checks if there is a connections (object) and returns one extracted connection (object)
const getSingleConnection = () => {
- return !!connections &&
- !!connections.connections &&
- connections.connections.length > 0
- ? connections.connections[0]
- : null;
+ if(!emptyConnArray)
+ {
+ return connections.connections[0]
+ }else return null;
};
//check if there are return connections and fill twoReturns / remainingReturns
@@ -175,118 +153,9 @@ function ItineraryTourTimeLineContainer({
}
return null;
};
- extractReturns();
-
-
- //when connections/connections.connections/or connections.connections[0] do not exist
- if (!!!getSingleConnection()) {
- return (
- <>
-
- {
- !city_selected ? (
- <>
-
-
-
-
- )
- :
-
- {" "}
- {t("details.keine_verbindungen")}{" "}
-
- }
-
- {
- !city_selected && (
-
-
- )
- }
-
-
-
+ extractReturns();
- );
- }
const _getDepartureText = () => {
let connection = getSingleConnection();
@@ -301,12 +170,11 @@ function ItineraryTourTimeLineContainer({
};
const _getReturnText = (index, retObj) => {
- // let connection =
- // !!connections && !!connections.returns && connections.returns.length > 0;
- if (!!!retObj) {
+ if(!!retObj.return_duration_minutes ){
+ return `${t("Details.rückreise")} ${index + 1} (${simpleConvertNumToTime(retObj.return_duration_minutes / 60, true)})`;
+ }else if (!!!retObj) {
return
+ {!city_selected ? (
+ <>
+
+
+
+ ) : (
+
+ {" "}
+ {t("details.keine_verbindungen")}{" "}
+
+ )}
+
+ {!city_selected && (
+
+
+ )}
+
+ )
+} else {
return (
- {!loading ? (
+ {!loading && getSingleConnection() && (
{/* ... first accordion ... */}
-
+
@@ -363,7 +325,7 @@ function ItineraryTourTimeLineContainer({
alignItems: "center",
}}
>
-
-
-
+
+
{_getDepartureText()}
- {GetDepartureText(getSingleConnection(), t)}
+ {GetDepartureText(getSingleConnection(), t)}
@@ -398,14 +367,15 @@ function ItineraryTourTimeLineContainer({
lineHeight: !isMobile ? "16px" : "14px",
}}
>
- {getNumberOfTransfers(getSingleConnection())} {t('details.umstiege')}
+ {getNumberOfTransfers(getSingleConnection())}{" "}
+ {t("details.umstiege")}
-
- {createEntries(entries, getSingleConnection(), t )}
+
+ {createEntries(entries, getSingleConnection(), t)}
@@ -417,6 +387,7 @@ function ItineraryTourTimeLineContainer({
backgroundColor: "transparent",
boxShadow: "none",
}}
+ key={randomKey(7)}
>
- {/* TODO : padding value is appropriate? */}
-
- {t('details.circa')} {" "}
- {(tour?.number_of_days > 1) ? (tour?.number_of_days + " " + t('details.tage')) :
- `${formattedDuration} ${t('details.stunden_tour')}`}
+
+ {" "}
+ {/* TODO : padding value is appropriate? */}
+
+ {t("details.circa")}{" "}
+ {tour?.number_of_days > 1
+ ? tour?.number_of_days + " " + t("details.tage")
+ : `${formattedDuration} ${t("details.stunden_tour")}`}
-
- {t('details.lt_tourbeschreibung')}
+
+ {t("details.lt_tourbeschreibung")}
-
{/* TODO padding value is appropriate? */}
-
+
+ {" "}
+ {/* TODO padding value is appropriate? */}
+
{_getReturnText(index, retObj)}
-
- {getReturnText(retObj, t)}
-
+
+ {getReturnText(retObj, t)}
+
- {createReturnEntries(twoReturns[index], retObj,t)}
+ {createReturnEntries(twoReturns[index], retObj, t)}
@@ -578,7 +575,7 @@ function ItineraryTourTimeLineContainer({
{getMore &&
returnEntries.slice(2).map((retObj, index) => (
{/* ... AccordionSummary and AccordionDetails ... */}
@@ -594,11 +591,12 @@ function ItineraryTourTimeLineContainer({
display: "flex",
flexDirection: "row",
position: "relative",
- width: !isMobile ? '100%' : 'calc(100% - 10px)',
- boxSizing: 'border-box',
- margin: !isMobile ? "0 auto" : "0 40px", // Center horizontally if mobile
+ width: !isMobile ? "100%" : "calc(100% - 10px)",
+ boxSizing: "border-box",
+ margin: !isMobile ? "0 auto" : "0 40px", // Center horizontally if mobile
maxWidth: isMobile ? "260px" : null,
}}
+ key={randomKey(7)}
>
{/* TODO padding value is appropriate? */}
-
- {_getReturnText(index+2, retObj)}
+
+
+ {_getReturnText(index + 2, retObj)}
-
- {getReturnText(retObj, t )}
+
+ {getReturnText(retObj, t)}
@@ -643,7 +655,7 @@ function ItineraryTourTimeLineContainer({
stroke: "#4992FF",
fill: "#4992FF",
width: !isMobile ? "18px" : "16px",
- height: !isMobile ? "18px" : "16px",
+ height: !isMobile ? "18px" : "16px",
}}
/>
@@ -661,24 +673,28 @@ function ItineraryTourTimeLineContainer({
retObj,
"return_no_of_transfers"
)}{" "}
- {t('details.umstiege')}
+ {t("details.umstiege")}
- {createReturnEntries(remainingReturns[index+2], retObj, t )}
+ {createReturnEntries(
+ remainingReturns[index + 2],
+ retObj,
+ t
+ )}
))}
{/* Button for more connections */}
- {!getMore && (returnEntries.length > 2) &&
- (
+ {!getMore && returnEntries.length > 2 && (
{/* ... Box with text and onClick ... */}
- {returnEntries.length - 2} {" "}
+ {returnEntries.length - 2}{" "}
{t("Details.rückreise_moeglichkeiten")}
)}
- ) : (
- {
export const getDetailEntry = (entry, index, length) => {
return (
-
+
{
export const getStationEntry = (entry , isLast = false, index) => {
return (
-
+
{
export const getDepartureEntry = (entry) => {
return (
-
+
{
export const getArrivalEntry = (entry) => {
return (
-
+
{
return (
-
+
+
,
-
+
+
,
-
+
@@ -729,36 +726,6 @@ useEffect(() => {
style={{ stroke: "#fff", width: "34px", height: "34px" }}
/>
- {/*
-
-
- Unable to close tab
-
-
- Please close this tab manually.
-
-
-
-
-
- */}
@@ -899,11 +866,12 @@ useEffect(() => {
updateActiveConnectionIndex(di)}
+ updateConnIndex={updateConnIndex}
tour={tour}
validTour={validTour}
city={cityI}
- >
+ idOne={idOne}
+ />
{renderImage && !!validTour && (
@@ -914,7 +882,7 @@ useEffect(() => {
onError={() => {
setRenderImage(false);
}}
- alt="tour"
+ alt={tour?.title}
/>
diff --git a/src/views/Main/Main.js b/src/views/Main/Main.js
index a51fcfe4..95faf97f 100644
--- a/src/views/Main/Main.js
+++ b/src/views/Main/Main.js
@@ -307,26 +307,35 @@ const handleShowCardContainer = useCallback((value) => {
},
}}
>
-
@@ -78,7 +74,7 @@ const ItineraryCalendar = ({
? "tour-detail-itinerary-calendar-grid-selected"
: "tour-detail-itinerary-calendar-date"
}`}
- onClick={() => setSelectedDay(index)}
+ onClick={() => updateConnIndex(index)}
>
{dd.date()}
diff --git a/src/components/LanguageMenu/index.js b/src/components/LanguageMenu/index.js
index 07087af4..47a1a64c 100644
--- a/src/components/LanguageMenu/index.js
+++ b/src/components/LanguageMenu/index.js
@@ -50,7 +50,7 @@ function LanguageMenu() {
src={`/app_static/img/langIcon.png`}
height={"23px"}
width={"23px"}
- alt="language icon"
+ alt="Change Language here"
/>
{showLanguageMenu && (
diff --git a/src/components/Map/MountinImage.jsx b/src/components/Map/MountinImage.jsx
deleted file mode 100644
index fcd4c2d7..00000000
--- a/src/components/Map/MountinImage.jsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from "react";
-
-function MountinImage({ imageUrl, style }) {
- return (
-
- 
-
- );
-}
-
-export default MountinImage;
diff --git a/src/components/Map/TourMapContainer.js b/src/components/Map/TourMapContainer.js
index ba3e1fca..729b4e4c 100644
--- a/src/components/Map/TourMapContainer.js
+++ b/src/components/Map/TourMapContainer.js
@@ -64,8 +64,8 @@ function TourMapContainer({
return L.icon({
iconUrl: "app_static/img/startpunkt.png", //the acutal picture
// shadowUrl: "app_static/img/pin-shadow.png", //the shadow of the icon
- iconSize: [30, 40], //size of the icon
- iconAnchor: [15, 41],
+ iconSize: [33, 45], //size of the icon
+ iconAnchor: [16, 46],
});
};
diff --git a/src/components/Search/Search.js b/src/components/Search/Search.js
index 988330da..38652c58 100644
--- a/src/components/Search/Search.js
+++ b/src/components/Search/Search.js
@@ -893,7 +893,9 @@ export function Search({
className="filter-icon-container"
>
{!!isMain ? (
- {t("details.bitte_stadt_waehlen")}
--
- {!!isLoading && (
-
{t("details.bitte_stadt_waehlen")}
+-
+ {!!cities && cities.map((_city, index) => {
+ return (
+
+