Merge branch 'dev' into feat/api-delete-sensor-data

Author: scheidtdav

.github/workflows/deploy.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⬇️ Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: ⎔ Setup node
         uses: actions/setup-node@v6
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⬇️ Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: ⎔ Setup node
         uses: actions/setup-node@v6
@@ -61,7 +61,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⬇️ Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: 🏄 Copy test env vars
         run: cp .env.example .env
@@ -109,7 +109,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⬇️ Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: 🐳 Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -118,7 +118,7 @@ jobs:
 
       # Setup cache
       - name: ⚡️ Cache Docker layers
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

app/components/header/index.tsx

@@ -1,3 +1,4 @@
+import LanguageSelector from "../landing/header/language-selector";
 import Download from "./download";
 import Home from "./home";
 import Menu from "./menu";
@@ -17,6 +18,9 @@ export default function Header(props: HeaderProps) {
       <Home />
       <NavBar devices={props.devices} />
       <div className="flex gap-2">
+        <div className="flex pointer-events-auto items-center h-10 w-16 rounded-full bg-white justify-center shadow-md">
+          <LanguageSelector/>
+        </div>
         <Download devices={props.devices} />
         {/* {data?.user?.email ? <Notification /> : null} */}
         <Menu />

app/components/landing/header/language-selector.tsx

@@ -1,32 +1,40 @@
-import i18next from "i18next";
-import { useState } from "react";
-import { useFetcher, useLoaderData } from "react-router";
-import { Button } from "~/components/ui/button";
-import  { type loader } from "~/root";
+import i18next from 'i18next'
+import { Globe } from 'lucide-react'
+import { useEffect, useState } from 'react'
+import { useFetcher, useLoaderData } from 'react-router'
+import { Button } from '~/components/ui/button'
 
 export default function LanguageSelector() {
-  const data = useLoaderData<typeof loader>();
-  const fetcher = useFetcher();
-  const [locale, setLocale] = useState(data.locale || "en");
+	const data = useLoaderData()
+	const fetcher = useFetcher()
+	const [locale, setLocale] = useState(data.locale || 'en')
+	// When loader locale changes (e.g. after login), sync state
+	useEffect(() => {
+		if (!data?.locale) return
+		setLocale(data.locale)
+		void (async () => {
+			await i18next.changeLanguage(data.locale)
+		})()
+	}, [data.locale])
+	const toggleLanguage = () => {
+		const newLocale = locale === 'en' ? 'de' : 'en' // Toggle between "en" and "de"
+		setLocale(newLocale)
+		void i18next.changeLanguage(newLocale) // Change the language in the app
+		void fetcher.submit(
+			{ language: newLocale },
+			{ method: 'post', action: '/action/set-language' }, // Persist the new language
+		)
+	}
 
-  const toggleLanguage = () => {
-    const newLocale = locale === "en" ? "de" : "en"; // Toggle between "en" and "de"
-    setLocale(newLocale);
-    void i18next.changeLanguage(newLocale); // Change the language in the app
-    void fetcher.submit(
-      { language: newLocale },
-      { method: "post", action: "/action/set-language" }, // Persist the new language
-    );
-  };
-
-  return (
-    <Button
-      variant="ghost"
-      size="icon"
-      onClick={toggleLanguage}
-      className="hover:bg-transparent dark:hover:text-white hover:text-black"
-    >
-      {locale === "de" ? <p>DE</p> : <p>EN</p>}
-    </Button>
-  );
+	return (
+		<Button
+			variant="ghost"
+			size="icon"
+			onClick={toggleLanguage}
+			className="hover:bg-transparent hover:text-black dark:hover:text-white"
+		>
+			<Globe />
+			{locale === 'de' ? <p>DE</p> : <p>EN</p>}
+		</Button>
+	)
 }

app/components/map/layers/cluster/box-marker.tsx

@@ -4,6 +4,7 @@ import { useState } from 'react'
 import { type MarkerProps, Marker, useMap } from 'react-map-gl'
 import { useMatches, useNavigate, useSearchParams } from 'react-router'
 import { useGlobalCompareMode } from '~/components/device-detail/useGlobalCompareMode'
+import { validLngLat } from '~/lib/location'
 import { cn } from '~/lib/utils'
 import { type Device } from '~/schema'
 
@@ -51,6 +52,8 @@ export default function BoxMarker({ device, ...props }: BoxMarkerProps) {
 		return 0
 	}
 
+	if (!validLngLat(props.longitude, props.latitude)) return null
+
 	return (
 		<Marker
 			{...props}