Merge branch 'uat'

# Conflicts: # src/components/TimeLine/utils.js
bahnzumberg · Aug 19, 2024 · 600ddc3 · 600ddc3
2 parents 1b4248e + d6eb2b5
commit 600ddc3
Show file tree

Hide file tree

Showing 30 changed files with 438 additions and 11,935 deletions.
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-helmet": "^6.1.0",
-    "react-helmet-async": "^1.3.0",
+    "react-helmet-async": "^2.0.5",
     "react-horizontal-scrolling-menu": "^2.8.2",
     "react-i18next": "^12.2.2",
     "react-infinite-scroll-component": "^6.1.0",
@@ -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"
   },
@@ -62,6 +62,13 @@
     "eject": "react-scripts eject"
   },
   "eslintConfig": {
+    "plugins":[
+      "react-hooks"
+    ],
+    "rules": {
+      "react-hooks/rules-of-hooks": "error", 
+      "react-hooks/exhaustive-deps": "warn" 
+    },
     "extends": [
       "react-app",
       "react-app/jest"
@@ -76,6 +83,9 @@
     "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",
+    "eslint-plugin-react-hooks": "^4.6.2",
     "file-loader": "^6.2.0",
     "html-loader": "^4.2.0",
     "html-webpack-plugin": "^5.5.0",

diff --git a/public/img/startpunkt.png b/public/img/startpunkt.png
diff --git a/public/img/zielpunkt.png b/public/img/zielpunkt.png
diff --git a/public/index-ch.html b/public/index-ch.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang id="html-tag">
+<html lang="de" id="html-tag">
   <head>
     <link rel="alternate" href="https://www.zuugle.si" hreflang="sl-si" />
     <link rel="canonical" href="https://www.zuugle.at" hreflang="de-at" />

diff --git a/public/index-de.html b/public/index-de.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang id="html-tag">
+<html lang="de" id="html-tag">
   <head>
     <link rel="alternate" href="https://www.zuugle.si" hreflang="sl-si" />
     <link rel="canonical" href="https://www.zuugle.at" hreflang="de-at" />

diff --git a/public/index-fr.html b/public/index-fr.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang id="html-tag">
+<html lang="fr" id="html-tag">
   <head>
     <link rel="alternate" href="https://www.zuugle.si" hreflang="sl-si" />
     <link rel="alternate" href="https://www.zuugle.at" hreflang="de-at" />

diff --git a/public/index-it.html b/public/index-it.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang id="html-tag">
+<html lang="it" id="html-tag">
   <head>
     <link rel="alternate" href="https://www.zuugle.si" hreflang="sl-si" />
     <link rel="alternate" href="https://www.zuugle.at" hreflang="de-at" />

diff --git a/public/index-li.html b/public/index-li.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang id="html-tag">
+<html lang="de" id="html-tag">
   <head>
     <link rel="alternate" href="https://www.zuugle.si" hreflang="sl-si" />
     <link rel="canonical" href="https://www.zuugle.at" hreflang="de-at" />

diff --git a/public/index-si.html b/public/index-si.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang id="html-tag">
+<html lang="sl" id="html-tag">
   <head>
     <link rel="canonical" href="https://www.zuugle.si" hreflang="sl-si" />
     <link rel="alternate" href="https://www.zuugle.at" hreflang="de-at" />

diff --git a/public/index.html b/public/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang id="html-tag">
+<html lang="de" id="html-tag">
   <head>
     <link rel="alternate" href="https://www.zuugle.si" hreflang="sl-si" />
     <link rel="canonical" href="https://www.zuugle.at" hreflang="de-at" />

diff --git a/public/robots.txt b/public/robots.txt
@@ -0,0 +1,3 @@
+User-agent: *
+Disallow: 
+Crawl-delay: 5
diff --git a/src/actions/tourActions.js b/src/actions/tourActions.js
@@ -38,19 +38,20 @@ export function loadFilter(data = {}) {
 
   const language = i18next.resolvedLanguage;
     return (dispatch, getState) => {
-    return loadList(
-      dispatch,
-      getState,
-      LOAD_TOUR_FILTER,
-      LOAD_TOUR_FILTER_DONE,
-      "tours",
-      data,
-      "tours/filter",
-      "filter",
-      false,
-      undefined,
-      language
-    );
+      data.domain = window.location.host;
+      return loadList(
+        dispatch,
+        getState,
+        LOAD_TOUR_FILTER,
+        LOAD_TOUR_FILTER_DONE,
+        "tours",
+        data,
+        "tours/filter",
+        "filter",
+        false,
+        undefined,
+        language
+      );
   };
 }
 

diff --git a/src/components/DomainMenu/index.js b/src/components/DomainMenu/index.js
@@ -477,7 +477,7 @@ const secondMenu = [
 					src={`/app_static/img/logo-white.png`}
 					height={"19px"}
 					width={"34px"}
-					alt="logo white"
+					alt="Logo Zuugle"
 				/>
 				<Typography
 					style={{
@@ -512,7 +512,7 @@ const secondMenu = [
 										src={`/app_static/img/logo30.png`}
 										height={"19px"}
 										width={"34px"}
-										alt="logo30"
+										alt="Logo Zuugle"
 										onClick={() => {
 											setShowDomainMenu(false);
 											window.location.replace(item.url);

diff --git a/src/components/Footer/Footer.js b/src/components/Footer/Footer.js
@@ -27,6 +27,7 @@ export default function Footer({}) {
               src="/app_static/img/Logo_BMK_gefoerdert_EN_RGB.png"
               height="122px"
               width="206px"
+              alt="Funded by www.bmk.gv.at"
             />
           </a>
         </Grid>
@@ -42,6 +43,7 @@ export default function Footer({}) {
               src="/app_static/img/Alpenkonvention_logo_gruen.png"
               height="75px"
               width="317px"
+              alt="Logo Alpenkonvention"
             />
           </a>
         </Grid>
@@ -70,6 +72,7 @@ export default function Footer({}) {
                 src={`/app_static/img/logo140.png`}
                 height={"20px"}
                 width={"36px"}
+                alt="Logo Zuugle"
               />
             </Grid>
             <Grid item xs md={3} >
@@ -123,6 +126,7 @@ export default function Footer({}) {
                 window.open("https://www.facebook.com/bahnzumberg/")
               }
               loading="lazy"
+              alt="Facebook"
             />{" "}
             &nbsp;{" "}
             <img
@@ -135,6 +139,7 @@ export default function Footer({}) {
                 window.open("https://www.instagram.com/bahnzumberg/")
               }
               loading="lazy"
+              alt="Instagram"
             />{" "}
             &nbsp;{" "}
             <img
@@ -145,6 +150,7 @@ export default function Footer({}) {
               style={{ marginLeft: "5px" }}
               onClick={() => window.open("https://github.com/bahnzumberg/")}
               loading="lazy"
+              alt="GitHub"
             />
           </Box>
         </Grid>

diff --git a/src/components/InteractiveMap.js b/src/components/InteractiveMap.js
@@ -10,13 +10,13 @@ export default function InteractiveMap({ tourTitle, gpxPositions, anreiseGpxPosi
 
   const startIcon = L.icon({
     iconUrl: '/app_static/img/startpunkt.png',
-    iconSize: [30, 40],
-    iconAnchor: [15, 41],
+    iconSize: [33, 45],
+    iconAnchor: [16, 46],
   });
   const endIcon = L.icon({
     iconUrl: '/app_static/img/zielpunkt.png',
-    iconSize: [30, 40],
-    iconAnchor: [15, 41],
+    iconSize: [33, 45],
+    iconAnchor: [16, 46],
   });
 
   const StartMarker = ({ position }) => {

diff --git a/src/components/Itinerary/Itinerary.js b/src/components/Itinerary/Itinerary.js
@@ -5,13 +5,15 @@ 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, updateConnIndex, tour, validTour, city, idOne }) => {
 
   const { t } = useTranslation();
 
   const tourDuration = !!tour && !!tour.duration ? tour.duration : undefined;
-  // const validTour = !!tour && tour?.active ;
 
+  // console.log("L13 dateIndex :",dateIndex)
+  // console.log("L14 tourDuration :",tourDuration)
+  // console.log("L15 validTour :",validTour)
 
   return (
     <div className="tour-detail-itinerary-container">
@@ -25,16 +27,19 @@ const Itinerary = ({ connectionData, dateIndex, onDateIndexUpdate, tour, validTo
               <ItineraryCalendar
               connectionData={connectionData}
               dateIndex={dateIndex}
-              onDateIndexUpdate={onDateIndexUpdate}
-              ></ItineraryCalendar>
+              updateConnIndex={updateConnIndex}
+              />
               <Divider sx={{ my: "24px" }} />
               {!!connectionData && (
                 <ItineraryTourTimeLineContainer
-                  connections={connectionData[dateIndex]}
+                  // connections={connectionData[dateIndex]}
+                  connections={connectionData}
+                  dateIndex={dateIndex}
                   loading={false}
                   duration={tourDuration}
                   tour={tour}
                   city={city}
+                  idOne={idOne}
                 />
               )}
             </>

diff --git a/src/components/Itinerary/ItineraryCalendar.js b/src/components/Itinerary/ItineraryCalendar.js
@@ -36,7 +36,7 @@ const isSelectedDay = (date, selectedDay) => {
 const ItineraryCalendar = ({
   connectionData,
   dateIndex,
-  onDateIndexUpdate,
+  updateConnIndex
 }) => {
   const { t, i18n } = useTranslation();
   let selectedDay = dateIndex;
@@ -48,10 +48,6 @@ const ItineraryCalendar = ({
     days = _.map(connectionData, (con) => moment(con.date));
   }
 
-  const setSelectedDay = (index) => {
-    onDateIndexUpdate(index);
-  };
-
   return (
     <div className="tour-detail-itinerary-calendar">
       <div className="tour-detail-itinerary-calendar-selected-day">
@@ -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()}
           </div>

diff --git 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"
 				/>
 			</span>
 			{showLanguageMenu && (

diff --git a/src/components/Map/MountinImage.jsx b/src/components/Map/MountinImage.jsx
diff --git 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
@@ -893,7 +893,9 @@ export function Search({
                 className="filter-icon-container"
               >
                 {!!isMain ? (
-                  <IconButton onClick={() => openFilter()}>
+                  <IconButton 
+                    onClick={() => openFilter()}
+                    aria-label="Filter">
                     <FilterIcon
                       sx={{
                         transition: "stroke 0.3s",
@@ -905,6 +907,7 @@ export function Search({
                 ) : (
                   <IconButton
                     onClick={handleGoButton}
+                    aria-label="Go"
                     sx={{
                       "&:hover": {
                         background: "#7aa8ff",