Merge branch 'dev' into uat

bahnzumberg · Aug 24, 2024 · b34af28 · b34af28
2 parents a8eeb1d + b4a3eea
commit b34af28
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 259 deletions.
diff --git a/public/i18n/de.json b/public/i18n/de.json
diff --git a/public/i18n/en.json b/public/i18n/en.json
diff --git a/public/i18n/fr.json b/public/i18n/fr.json
diff --git a/public/i18n/it.json b/public/i18n/it.json
diff --git a/public/i18n/sl.json b/public/i18n/sl.json
diff --git a/src/components/AutosuggestInput.js b/src/components/AutosuggestInput.js
diff --git a/src/components/CustomStarRating.js b/src/components/CustomStarRating.js
diff --git a/src/components/EndOfList.js b/src/components/EndOfList.js
diff --git a/src/components/NoData.js b/src/components/NoData.js
diff --git a/src/components/Search/Search.js b/src/components/Search/Search.js
@@ -382,7 +382,6 @@ export function Search({
       onSelect: async (city) => {
 
         if (!!city) {
-          console.log("L413 Search / else if inside onSelect :", city)
           setCityInput(city.label);
           setCity(city);
           pageKey === "start" && updateCapCity(city.label);
@@ -683,7 +682,7 @@ export function Search({
               }}
             >
               <span className="search-bar--searchPhase" style={{}}>
-                {t("start.heimatbahnhof")}
+              {t("start.heimatbahnhof")}
               </span>
             </div>
             <Box

diff --git a/src/components/SearchBarInput.js b/src/components/SearchBarInput.js
diff --git a/src/components/TourCardContainer.js b/src/components/TourCardContainer.js
@@ -6,7 +6,6 @@ import Box from "@mui/material/Box";
 import InfiniteScroll from "react-infinite-scroll-component";
 import { useSearchParams } from "react-router-dom";
 import CircularProgress from "@mui/material/CircularProgress";
-import EndOfList from "./EndOfList";
 
 export default function TourCardContainer({
   tours,
@@ -109,7 +108,7 @@ export default function TourCardContainer({
         next={_loadTours}
         hasMore={true}
         loader={!!loading && <CircularProgress />}
-        endMessage={<EndOfList />}
+        endMessage={<p> </p>}
       >
         <Grid container spacing={2} style={{  marginLeft: `${!isMobile ? '35px' : null}` }}>
           {tours.map((tour, index) => (

diff --git a/src/components/TourConnectionCard.js b/src/components/TourConnectionCard.js
diff --git a/src/components/TourProperty.js b/src/components/TourProperty.js
diff --git a/src/utils/backListener.js b/src/utils/backListener.js