Merge branch 'uat' into dev

# Conflicts: # src/views/Main/DetailReworked.js
bahnzumberg · Sep 9, 2024 · bddd1bc · bddd1bc
2 parents 7e7e768 + 438fc6b
commit bddd1bc
Show file tree

Hide file tree

Showing 19 changed files with 1,313 additions and 1,137 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,18 +15,14 @@
     "@mui/material": "^5.16.7",
     "@mui/x-date-pickers": "^6.17.0",
     "@react-leaflet/core": "^2.1.0",
-    "@testing-library/jest-dom": "^5.16.2",
-    "@testing-library/react": "^14.1.2",
-    "@testing-library/user-event": "^14.5.2",
     "axios": "^1.6.2",
+    "dayjs": "^1.11.13",
     "gpxparser": "^3.0.0",
     "i18next": "^23.14.0",
     "i18next-browser-languagedetector": "^8.0.0",
     "i18next-http-backend": "^2.2.0",
     "js-file-download": "^0.4.12",
     "leaflet": "^1.9.3",
-    "lodash": "^4.17.21",
-    "moment": "^2.29.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-helmet": "^6.1.0",
@@ -45,7 +41,6 @@
     "redux-thunk": "^2.4.1",
     "uuid": "^9.0.0",
     "watch": "^0.13.0",
-    "web-vitals": "^3.3.0",
     "webpack-cli": "^5.1.4"
   },
   "overrides": {
@@ -77,6 +72,9 @@
     "@babel/preset-env": "^7.13.10",
     "@babel/preset-react": "^7.23.3",
     "@svgr/webpack": "^8.1.0",
+    "@testing-library/jest-dom": "^5.16.2",
+    "@testing-library/react": "^14.1.2",
+    "@testing-library/user-event": "^14.5.2",
     "@types/react-helmet": "^6.1.11",
     "babel-loader": "^9.1.2",
     "clean-webpack-plugin": "^4.0.0",

diff --git a/server/server.js b/server/server.js
@@ -49,28 +49,5 @@ app.use((req, res, next) => {
 });
 
 app.get([ '/*' ], function(req, res) {
-	var host = req.get('host');
-
-	if(host.indexOf('zuugle.si') >= 0) {
-		res.sendFile(path.join(__dirname, '../app/index-si.html'));
-	}
-	else if(host.indexOf('zuugle.it') >= 0) {
-		res.sendFile(path.join(__dirname, '../app/index-it.html'));
-	}
-	else if(host.indexOf('zuugle.fr') >= 0) {
-		res.sendFile(path.join(__dirname, '../app/index-fr.html'));
-	}
-	else if(host.indexOf('zuugle.de') >= 0) {
-		res.sendFile(path.join(__dirname, '../app/index-de.html'));
-	}
-	else if(host.indexOf('zuugle.ch') >= 0) {
-		res.sendFile(path.join(__dirname, '../app/index-ch.html'));
-	}
-	else if(host.indexOf('zuugle.li') >= 0) {
-		res.sendFile(path.join(__dirname, '../app/index-li.html'));
-	}
-	else {
-	  res.sendFile(path.join(__dirname, '../app/index.html'));
-	}
-
+  res.sendFile(path.join(__dirname, '../app/index.html'));
 });
diff --git a/src/App.css b/src/App.css
@@ -1,15 +1,11 @@
-/* @import '~material-design-icons/iconfont/material-icons.css' */
-* {
-  margin: 0;
-  padding: 0;
-
-}
-
-body, #root, .App {
+body,
+#root,
+.App {
   height: 100%;
 }
 
-html, body {
+html,
+body {
   overflow-x: hidden;
 }
 
@@ -18,24 +14,11 @@ body * {
   text-rendering: optimizeLegibility !important;
 }
 
-
-
 .App {
   text-align: center;
   background-color: #f1f1f1;
 }
 
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
 /* width */
 body ::-webkit-scrollbar {
   width: 12px;
@@ -74,30 +57,6 @@ body ::-webkit-scrollbar-thumb:hover {
   /* Firefox */
 }
 
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
-}
-
-.App-link {
-  color: #61dafb;
-}
-
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
-
 /* Ensuring the card fits within a 350px width and 300px height, scales down typography sizes */
 .tour-card-map {
   text-align: left;
@@ -714,7 +673,7 @@ body ::-webkit-scrollbar-thumb:hover {
   .map-container {
     z-index: 100;
     /* margin-top: 20px; Adjust this value based on your layout and header height */
-    margin-top: 110px
+    margin-top: 110px;
   }
 }
 
@@ -1007,8 +966,6 @@ body ::-webkit-scrollbar-thumb:hover {
     height: 85px;
     padding: 10px 10px;
   }
-
-
 }
 
 .tour-detail-action-btns-container {
@@ -1112,7 +1069,6 @@ body ::-webkit-scrollbar-thumb:hover {
     align-items: flex-start;
   }
 
-
   .tour-detail-properties {
     display: grid;
     grid-template-columns: 1fr 1fr 1fr;
@@ -1797,7 +1753,6 @@ top:250px; */
   line-height: 1.334;
 }
 
-
 /* For desktop and mobile detail property section of detail page */
 /* styles for both Desktop and mobile */
 
@@ -1809,7 +1764,7 @@ top:250px; */
   display: grid;
   grid-template-columns: 1fr 1px 1fr 1px 1fr; /* Columns for elements and dividers */
   max-width: 706px; /* Max width */
-  margin: 0; 
+  margin: 0;
   gap: 0; /* No gap between grid items */
   height: 100%;
 }
@@ -1842,28 +1797,25 @@ top:250px; */
   .tour-detail-properties-el {
     padding-left: 1rem;
   }
-
 }
 
 /* Styles for small screens (max-width: 678px) */
 @media (max-width: 678px) {
   .tour-detail-properties {
     grid-template-columns: 1fr 1px 1fr; /* 2 columns with a vertical divider */
-    grid-template-rows: auto auto auto ; /* 3 rows */
+    grid-template-rows: auto auto auto; /* 3 rows */
   }
 
   .tour-detail-properties-el {
     padding-left: 0.5rem;
     padding-right: 0.5rem;
   }
-
-
 }
 
 .disabled-button {
-  background-color: #e0e0e0 !important; 
+  background-color: #e0e0e0 !important;
   color: #9e9e9e !important;
-  cursor: not-allowed; 
-  pointer-events: none; 
-  box-shadow: none; 
+  cursor: not-allowed;
+  pointer-events: none;
+  box-shadow: none;
 }
diff --git a/src/App.js b/src/App.js
@@ -1,96 +1,102 @@
-import * as React from "react";
-import "./App.css";
+import React, { lazy, Suspense, useEffect } from "react";
 import ThemeProvider from "@mui/material/styles/ThemeProvider";
-import { theme } from "./theme";
-import ModalRoot from "./components/ModalRoot";
-import { Route, Routes, Navigate } from "react-router-dom";
-import { lazy, Suspense, useCallback } from "react";
-import CircularProgress from "@mui/material/CircularProgress";
-// import Start from "./views/Start/Start";
-// import DetailReworked from "./views/Main/DetailReworked";
-// import Search from "./components/Search/Search";
 import i18next from "i18next";
+import { Navigate, Route, Routes } from "react-router-dom";
+import CircularProgress from "@mui/material/CircularProgress";
+import "./App.css";
+import ModalRoot from "./components/ModalRoot";
+import { theme } from "./theme";
 import { getTopLevelDomain } from "./utils/globals";
-import '/src/config.js';
+import Start from "./views/Start/Start";
+import "/src/config.js";
 
 const Main = lazy(() => import("./views/Main/Main"));
 const Impressum = lazy(() => import("./views/Pages/Impressum"));
 const Privacy = lazy(() => import("./views/Pages/Privacy"));
-const DetailReworked  = lazy(() => import("./views/Main/DetailReworked"));
-const Search  = lazy(() => import("./components/Search/Search"));
-const Start  = lazy(() => import("./views/Start/Start"));
-
-
-
+const DetailReworked = lazy(() => import("./views/Main/DetailReworked"));
+const Search = lazy(() => import("./components/Search/Search"));
 
 function App() {
   //check if first visit and change code to domain language
-  if(!localStorage.getItem('visited')) {
-
+  if (!localStorage.getItem("visited")) {
     let domain = getTopLevelDomain();
-
     //switch to domain language
     switch (domain) {
-      case 'si':
-        i18next.changeLanguage('sl');
+      case "si":
+        i18next.changeLanguage("sl");
         break;
-      case 'fr':
-        i18next.changeLanguage('fr');
+      case "fr":
+        i18next.changeLanguage("fr");
         break;
-      case 'it':
-        i18next.changeLanguage('it');
+      case "it":
+        i18next.changeLanguage("it");
         break;
       default:
-        i18next.changeLanguage('de');
+        i18next.changeLanguage("de");
         break;
     }
-
-    localStorage.setItem('visited',true);
+    localStorage.setItem("visited", true);
   }
 
   // Matomo tracking
-  var _mtm = window._mtm = window._mtm || [];
-  React.useEffect(() => {
-    _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src='https://stats.bahnzumberg.at/js/container_ANAXmMKf.js'; s.parentNode.insertBefore(g,s);
-    let language = i18next.resolvedLanguage;
-    _mtm.push({'language': language});
-  });
-
-
+  const _mtm = (window._mtm = window._mtm || []);
+  useEffect(() => {
+    _mtm.push({
+      "mtm.startTime": new Date().getTime(),
+      event: "mtm.Start",
+    });
+    const d = document,
+      g = d.createElement("script"),
+      s = d.getElementsByTagName("script")[0];
+    g.async = true;
+    g.src = "https://stats.bahnzumberg.at/js/container_ANAXmMKf.js";
+    s.parentNode.insertBefore(g, s);
+    _mtm.push({ language: i18next.resolvedLanguage });
+  }, []);
 
   return (
-    <>
-      <ThemeProvider theme={theme}>
-        <div className="App" style={{ minHeight: '100vh', display: 'flex', flexDirection: 'column' }}>
-          <Suspense
-            fallback={
-              <div style={{ height: "100%", width: "100%", padding: "20px" }}>
-                <CircularProgress />
-              </div>
-            }
-          >
-            <Routes>
-              <Route path="/" element={<Start />} />
-              <Route path="/total" element={<Start />} />
-              <Route path="/search" element={<Main />} />
-              <Route path="/tour/:idOne/:cityOne" element={<DetailReworked />} />
-              <Route path="/tour" element={<DetailReworked />} />
-              <Route path="/provider/:provider" element={<DetailReworked />} />
-              <Route path="/imprint" element={<Impressum />} />
-              <Route path="/privacy" element={<Privacy />} />
-              <Route path="/:city" element={<Main />} />
-              <Route path="/searchPhrases" element={<Search />} />
-
-              <Route path="*" element={<Navigate to="/" replace />} />
-            </Routes>
-          </Suspense>
-        </div>
-        <ModalRoot />
-      </ThemeProvider>
-    </>
+    <ThemeProvider theme={theme}>
+      <div
+        className="App"
+        style={{
+          minHeight: "100vh",
+          display: "flex",
+          flexDirection: "column",
+        }}
+      >
+        <Routes>
+          <Route path="/" element={<Start />} />
+          <Route path="/total" element={<Start />} />
+        </Routes>
+        <Suspense
+          fallback={
+            <div
+              style={{
+                height: "100%",
+                width: "100%",
+                padding: "20px",
+              }}
+            >
+              <CircularProgress />
+            </div>
+          }
+        >
+          <Routes>
+            <Route path="/search" element={<Main />} />
+            <Route path="/tour/:idOne/:cityOne" element={<DetailReworked />} />
+            <Route path="/tour" element={<DetailReworked />} />
+            <Route path="/provider/:provider" element={<DetailReworked />} />
+            <Route path="/imprint" element={<Impressum />} />
+            <Route path="/privacy" element={<Privacy />} />
+            <Route path="/:city" element={<Main />} />
+            <Route path="/searchPhrases" element={<Search />} />
 
+            <Route path="*" element={<Navigate to="/" replace />} />
+          </Routes>
+        </Suspense>
+      </div>
+      <ModalRoot />
+    </ThemeProvider>
   );
 }