serve content from temporary path

Serve content at temporary path
entur · Oct 2, 2023 · fec1a30 · fec1a30
1 parent da6916a
commit fec1a30
Show file tree

Hide file tree

Showing 21 changed files with 18 additions and 10 deletions.
diff --git a/client-next/public/img/mode/air.png b/client-next/public/img/mode/air.png
diff --git a/client-next/public/img/mode/bicycle.png b/client-next/public/img/mode/bicycle.png
diff --git a/client-next/public/img/mode/bus.png b/client-next/public/img/mode/bus.png
diff --git a/client-next/public/img/mode/cableway.png b/client-next/public/img/mode/cableway.png
diff --git a/client-next/public/img/mode/car.png b/client-next/public/img/mode/car.png
diff --git a/client-next/public/img/mode/coach.png b/client-next/public/img/mode/coach.png
diff --git a/client-next/public/img/mode/foot.png b/client-next/public/img/mode/foot.png
diff --git a/client-next/public/img/mode/funicular.png b/client-next/public/img/mode/funicular.png
diff --git a/client-next/public/img/mode/metro.png b/client-next/public/img/mode/metro.png
diff --git a/client-next/public/img/mode/monorail.png b/client-next/public/img/mode/monorail.png
diff --git a/client-next/public/img/mode/rail.png b/client-next/public/img/mode/rail.png
diff --git a/client-next/public/img/mode/taxi.png b/client-next/public/img/mode/taxi.png
diff --git a/client-next/public/img/mode/tram.png b/client-next/public/img/mode/tram.png
diff --git a/client-next/public/img/mode/trolleybus.png b/client-next/public/img/mode/trolleybus.png
diff --git a/client-next/public/img/mode/water.png b/client-next/public/img/mode/water.png
diff --git a/client-next/src/components/ItineraryList/ItineraryHeaderContent.tsx b/client-next/src/components/ItineraryList/ItineraryHeaderContent.tsx
@@ -55,8 +55,9 @@ export function ItineraryHeaderContent({
         })}
       </div>
 
-      {tripPattern.legs.map((leg) => (
+      {tripPattern.legs.map((leg, i) => (
         <ItineraryHeaderLegContent
+          key={leg.id || `leg_${i}`}
           leg={leg}
           earliestStartTime={earliestStartTime}
           startPx={startPx}

diff --git a/client-next/src/components/ItineraryList/ItineraryHeaderLegContent.tsx b/client-next/src/components/ItineraryList/ItineraryHeaderLegContent.tsx
@@ -56,9 +56,9 @@ export function ItineraryHeaderLegContent({
       <div
         style={{
           background: legTextColor,
-          maskImage: `url(/img/mode/${leg.mode.toLowerCase()}.png)`,
+          maskImage: `url(/debug-client-preview/img/mode/${leg.mode.toLowerCase()}.png)`,
           maskRepeat: 'no-repeat',
-          WebkitMaskImage: `url(/img/mode/${leg.mode.toLowerCase()}.png)`,
+          WebkitMaskImage: `url(/debug-client-preview/img/mode/${leg.mode.toLowerCase()}.png)`,
           WebkitMaskRepeat: 'no-repeat',
           width: '17px',
           height: '17px',

diff --git a/client-next/src/components/MapView/NavigationMarkers.tsx b/client-next/src/components/MapView/NavigationMarkers.tsx
@@ -23,7 +23,7 @@ export function NavigationMarkers({
           }}
           anchor="bottom-right"
         >
-          <img alt="" src="/img/marker-flag-start-shadowed.png" height={48} width={49} />
+          <img alt="" src="/debug-client-preview/img/marker-flag-start-shadowed.png" height={48} width={49} />
         </Marker>
       )}
       {tripQueryVariables.to.coordinates && (
@@ -39,7 +39,7 @@ export function NavigationMarkers({
           }}
           anchor="bottom-right"
         >
-          <img alt="" src="/img/marker-flag-end-shadowed.png" height={48} width={49} />
+          <img alt="" src="/debug-client-preview/img/marker-flag-end-shadowed.png" height={48} width={49} />
         </Marker>
       )}
     </>

diff --git a/client-next/src/components/NavBarContainer.tsx b/client-next/src/components/NavBarContainer.tsx
@@ -4,8 +4,14 @@ export function NavBarContainer() {
     <Navbar expand="lg" data-bs-theme="light">
       <div className="navbar-container">
         <Navbar.Brand>
-          <img alt="" src="/img/otp-logo.svg" width="30" height="30" className="d-inline-block align-top" /> OTP Debug
-          Client
+          <img
+            alt=""
+            src="/debug-client-preview/img/otp-logo.svg"
+            width="30"
+            height="30"
+            className="d-inline-block align-top"
+          />{' '}
+          OTP Debug Client
         </Navbar.Brand>
       </div>
     </Navbar>

diff --git a/client-next/src/util/generateTextColor.ts b/client-next/src/util/generateTextColor.ts
@@ -32,9 +32,9 @@ function hex2rgb(hex: string) {
 }
 
 function fullHex(hex: string) {
-  let r = hex.slice(1, 2);
-  let g = hex.slice(2, 3);
-  let b = hex.slice(3, 4);
+  const r = hex.slice(1, 2);
+  const g = hex.slice(2, 3);
+  const b = hex.slice(3, 4);
 
   return [parseInt(r + r, 16), parseInt(g + g, 16), parseInt(b + b, 16)];
 }
diff --git a/client-next/vite.config.ts b/client-next/vite.config.ts
@@ -4,4 +4,5 @@ import react from '@vitejs/plugin-react';
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [react()],
+  base: '/debug-client-preview/',
 });