Merge branch 'uat'

bahnzumberg · Sep 19, 2023 · 0096a8a · 0096a8a
2 parents 85c92b2 + 17b1eeb
commit 0096a8a
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 44 deletions.
diff --git a/package.json b/package.json
@@ -7,6 +7,7 @@
   "version": "2.0.0",
   "private": true,
   "dependencies": {
+    "@alwaysmeticulous/recorder-loader": "^2.76.0",
     "@babel/polyfill": "^7.12.1",
     "@emotion/react": "^11.8.1",
     "@emotion/styled": "^11.8.1",

diff --git a/public/index-de.html b/public/index-de.html
@@ -15,27 +15,27 @@
         font-style: normal;
         font-weight: 0.300,0.400,0.500,0.600,0.700,0.800,1.300,1.400,1.500,1.600,1.700,1.800;
         font-display: swap;
-        src: url('https://www.zuugle.de/app_static/fonts/open-sans-v29-latin-regular.eot'); /* IE9 Compat Modes */
+        src: url('./app_static/fonts/open-sans-v29-latin-regular.eot'); /* IE9 Compat Modes */
         src: local(''),
-            url('https://www.zuugle.de/app_static/fonts/open-sans-v29-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-            url('https://www.zuugle.de/app_static/fonts/open-sans-v29-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
-            url('https://www.zuugle.de/app_static/fonts/open-sans-v29-latin-regular.woff') format('woff'), /* Modern Browsers */
-            url('https://www.zuugle.de/app_static/fonts/open-sans-v29-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
-            url('https://www.zuugle.de/app_static/fonts/open-sans-v29-latin-regular.svg#OpenSans') format('svg'); /* Legacy iOS */
+            url('./app_static/fonts/open-sans-v29-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+            url('./app_static/fonts/open-sans-v29-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+            url('./app_static/fonts/open-sans-v29-latin-regular.woff') format('woff'), /* Modern Browsers */
+            url('./app_static/fonts/open-sans-v29-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+            url('./app_static/fonts/open-sans-v29-latin-regular.svg#OpenSans') format('svg'); /* Legacy iOS */
       }
       /* open-sans-italic - latin */
       @font-face {
         font-family: 'Open Sans';
         font-style: italic;
         font-weight: 0.300,0.400,0.500,0.600,0.700,0.800,1.300,1.400,1.500,1.600,1.700,1.800;
         font-display: swap;
-        src: url('https://www.zuugle.de/app_static/fonts/open-sans-v29-latin-italic.eot'); /* IE9 Compat Modes */
+        src: url('./app_static/fonts/open-sans-v29-latin-italic.eot'); /* IE9 Compat Modes */
         src: local(''),
-            url('https://www.zuugle.de/app_static/fonts/open-sans-v29-latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-            url('https://www.zuugle.de/app_static/fonts/open-sans-v29-latin-italic.woff2') format('woff2'), /* Super Modern Browsers */
-            url('https://www.zuugle.de/app_static/fonts/open-sans-v29-latin-italic.woff') format('woff'), /* Modern Browsers */
-            url('https://www.zuugle.de/app_static/fonts/open-sans-v29-latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */
-            url('https://www.zuugle.de/app_static/fonts/open-sans-v29-latin-italic.svg#OpenSans') format('svg'); /* Legacy iOS */
+            url('./app_static/fonts/open-sans-v29-latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+            url('./app_static/fonts/open-sans-v29-latin-italic.woff2') format('woff2'), /* Super Modern Browsers */
+            url('./app_static/fonts/open-sans-v29-latin-italic.woff') format('woff'), /* Modern Browsers */
+            url('./app_static/fonts/open-sans-v29-latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */
+            url('./app_static/fonts/open-sans-v29-latin-italic.svg#OpenSans') format('svg'); /* Legacy iOS */
       }
       </style>
 

diff --git a/public/index-fr.html b/public/index-fr.html
@@ -15,27 +15,27 @@
         font-style: normal;
         font-weight: 0.300,0.400,0.500,0.600,0.700,0.800,1.300,1.400,1.500,1.600,1.700,1.800;
         font-display: swap;
-        src: url('https://www.zuugle.fr/app_static/fonts/open-sans-v29-latin-regular.eot'); /* IE9 Compat Modes */
+        src: url('./app_static/fonts/open-sans-v29-latin-regular.eot'); /* IE9 Compat Modes */
         src: local(''),
-            url('https://www.zuugle.fr/app_static/fonts/open-sans-v29-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-            url('https://www.zuugle.fr/app_static/fonts/open-sans-v29-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
-            url('https://www.zuugle.fr/app_static/fonts/open-sans-v29-latin-regular.woff') format('woff'), /* Modern Browsers */
-            url('https://www.zuugle.fr/app_static/fonts/open-sans-v29-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
-            url('https://www.zuugle.fr/app_static/fonts/open-sans-v29-latin-regular.svg#OpenSans') format('svg'); /* Legacy iOS */
+            url('./app_static/fonts/open-sans-v29-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+            url('./app_static/fonts/open-sans-v29-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+            url('./app_static/fonts/open-sans-v29-latin-regular.woff') format('woff'), /* Modern Browsers */
+            url('./app_static/fonts/open-sans-v29-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+            url('./app_static/fonts/open-sans-v29-latin-regular.svg#OpenSans') format('svg'); /* Legacy iOS */
       }
       /* open-sans-italic - latin */
       @font-face {
         font-family: 'Open Sans';
         font-style: italic;
         font-weight: 0.300,0.400,0.500,0.600,0.700,0.800,1.300,1.400,1.500,1.600,1.700,1.800;
         font-display: swap;
-        src: url('https://www.zuugle.fr/app_static/fonts/open-sans-v29-latin-italic.eot'); /* IE9 Compat Modes */
+        src: url('./app_static/fonts/open-sans-v29-latin-italic.eot'); /* IE9 Compat Modes */
         src: local(''),
-            url('https://www.zuugle.fr/app_static/fonts/open-sans-v29-latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-            url('https://www.zuugle.fr/app_static/fonts/open-sans-v29-latin-italic.woff2') format('woff2'), /* Super Modern Browsers */
-            url('https://www.zuugle.fr/app_static/fonts/open-sans-v29-latin-italic.woff') format('woff'), /* Modern Browsers */
-            url('https://www.zuugle.fr/app_static/fonts/open-sans-v29-latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */
-            url('https://www.zuugle.fr/app_static/fonts/open-sans-v29-latin-italic.svg#OpenSans') format('svg'); /* Legacy iOS */
+            url('./app_static/fonts/open-sans-v29-latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+            url('./app_static/fonts/open-sans-v29-latin-italic.woff2') format('woff2'), /* Super Modern Browsers */
+            url('./app_static/fonts/open-sans-v29-latin-italic.woff') format('woff'), /* Modern Browsers */
+            url('./app_static/fonts/open-sans-v29-latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */
+            url('./app_static/fonts/open-sans-v29-latin-italic.svg#OpenSans') format('svg'); /* Legacy iOS */
       }
     </style>
 

diff --git a/public/index-it.html b/public/index-it.html
@@ -15,27 +15,27 @@
         font-style: normal;
         font-weight: 0.300,0.400,0.500,0.600,0.700,0.800,1.300,1.400,1.500,1.600,1.700,1.800;
         font-display: swap;
-        src: url('https://www.zuugle.it/app_static/fonts/open-sans-v29-latin-regular.eot'); /* IE9 Compat Modes */
+        src: url('./app_static/fonts/open-sans-v29-latin-regular.eot'); /* IE9 Compat Modes */
         src: local(''),
-            url('https://www.zuugle.it/app_static/fonts/open-sans-v29-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-            url('https://www.zuugle.it/app_static/fonts/open-sans-v29-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
-            url('https://www.zuugle.it/app_static/fonts/open-sans-v29-latin-regular.woff') format('woff'), /* Modern Browsers */
-            url('https://www.zuugle.it/app_static/fonts/open-sans-v29-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
-            url('https://www.zuugle.it/app_static/fonts/open-sans-v29-latin-regular.svg#OpenSans') format('svg'); /* Legacy iOS */
+            url('./app_static/fonts/open-sans-v29-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+            url('./app_static/fonts/open-sans-v29-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+            url('./app_static/fonts/open-sans-v29-latin-regular.woff') format('woff'), /* Modern Browsers */
+            url('./app_static/fonts/open-sans-v29-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+            url('./app_static/fonts/open-sans-v29-latin-regular.svg#OpenSans') format('svg'); /* Legacy iOS */
       }
       /* open-sans-italic - latin */
       @font-face {
         font-family: 'Open Sans';
         font-style: italic;
         font-weight: 0.300,0.400,0.500,0.600,0.700,0.800,1.300,1.400,1.500,1.600,1.700,1.800;
         font-display: swap;
-        src: url('https://www.zuugle.it/app_static/fonts/open-sans-v29-latin-italic.eot'); /* IE9 Compat Modes */
+        src: url('./app_static/fonts/open-sans-v29-latin-italic.eot'); /* IE9 Compat Modes */
         src: local(''),
-            url('https://www.zuugle.it/app_static/fonts/open-sans-v29-latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-            url('https://www.zuugle.it/app_static/fonts/open-sans-v29-latin-italic.woff2') format('woff2'), /* Super Modern Browsers */
-            url('https://www.zuugle.it/app_static/fonts/open-sans-v29-latin-italic.woff') format('woff'), /* Modern Browsers */
-            url('https://www.zuugle.it/app_static/fonts/open-sans-v29-latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */
-            url('https://www.zuugle.it/app_static/fonts/open-sans-v29-latin-italic.svg#OpenSans') format('svg'); /* Legacy iOS */
+            url('./app_static/fonts/open-sans-v29-latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+            url('./app_static/fonts/open-sans-v29-latin-italic.woff2') format('woff2'), /* Super Modern Browsers */
+            url('./app_static/fonts/open-sans-v29-latin-italic.woff') format('woff'), /* Modern Browsers */
+            url('./app_static/fonts/open-sans-v29-latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */
+            url('./app_static/fonts/open-sans-v29-latin-italic.svg#OpenSans') format('svg'); /* Legacy iOS */
       }
       </style>
 

diff --git a/src/App.css b/src/App.css
@@ -397,6 +397,7 @@ body ::-webkit-scrollbar-thumb:hover {
 @media only screen and (max-width: 600px) {
   .header-text {
     padding-top: 10px;
+    padding-bottom: 40px;
     padding-left: 10px;
     font-size: 36px;
     letter-spacing: 0px;

diff --git a/src/App.js b/src/App.js
@@ -8,22 +8,46 @@ import { Route, Routes, Navigate } from "react-router-dom";
 import { lazy, Suspense } from "react";
 import CircularProgress from "@mui/material/CircularProgress";
 import DetailReworked from "./views/Main/DetailReworked";
-// import { useMatomo } from "./hooks/useMatomo";
 import Search from "./components/Search/Search";
 const Main = lazy(() => import("./views/Main/Main"));
 const About = lazy(() => import("./views/Pages/About"));
 const Impressum = lazy(() => import("./views/Pages/Impressum"));
 const Privacy = lazy(() => import("./views/Pages/Privacy"));
-// import { tryLoadAndStartRecorder } from '@alwaysmeticulous/recorder-loader'
+import { tryLoadAndStartRecorder } from '@alwaysmeticulous/recorder-loader';
 import i18next from "i18next";
+import { getTopLevelDomain } from "./utils/globals";
+
+
+
 
 function App() {
+
+  //check if first visit and change code to domain language
+if(!localStorage.getItem('visited')) {
+  // get the domain 
+  // let domain = 'fr';
+  let domain = getTopLevelDomain();
+  //switch to domain language
+  switch (domain) {
+    case 'si':
+      i18next.changeLanguage('sl');
+      break;
+    case 'fr':
+      i18next.changeLanguage('fr');
+      break;
+    case 'it':
+      i18next.changeLanguage('it');
+      break;
+    default:
+      i18next.changeLanguage('de');
+      break;
+  }
+
+  localStorage.setItem('visited',true);
+}
   // UAT and local development should use matomo test instance
-  if (
-    location.hostname.indexOf("localhost") !== -1 ||
-    location.hostname.indexOf("www2.") !== -1
-  ) {
-    // tryLoadAndStartRecorder({ projectId: '0HjVPphxK3XDsQ4ka8QMwfxlMW204RtKu2bL92KO', });
+  if (location.hostname.indexOf("localhost") !== -1 || location.hostname.indexOf("www2.") !== -1) {
+      tryLoadAndStartRecorder({ projectId: '0HjVPphxK3XDsQ4ka8QMwfxlMW204RtKu2bL92KO', isProduction: false, });
   }
 
   // Matomo tracking
@@ -37,6 +61,7 @@ function App() {
   }, []);
 
 
+
   return (
     <ThemeProvider theme={theme}>
       <div className="App">
@@ -57,7 +82,6 @@ function App() {
             <Route path="/privacy" element={<Privacy />} />
             <Route path="/:city" element={<Main />} />
             <Route path="/searchPhrases" element={<Search />} />
-            {/* <Route path="/cache" element={<TestComp/>}/> */}
 
             <Route path="*" element={<Navigate to="/" replace />} />
           </Routes>