Merge remote-tracking branch 'upstream/master' into dashboard

src/app/api/weather/route.ts

@@ -1,7 +1,10 @@
 export const POST = async (req: Request) => {
   try {
-    const body: { lat: number; lng: number; temperatureUnit: 'C' | 'F' } =
+    const body: {
-      await req.json();
+      lat: number;
+      lng: number;
+      measureUnit: 'Imperial' | 'Metric';
+    } = await req.json();
 
     if (!body.lat || !body.lng) {
       return Response.json(
@@ -13,7 +16,9 @@ export const POST = async (req: Request) => {
     }
 
     const res = await fetch(
-      `https://api.open-meteo.com/v1/forecast?latitude=${body.lat}&longitude=${body.lng}&current=weather_code,temperature_2m,is_day,relative_humidity_2m,wind_speed_10m&timezone=auto${body.temperatureUnit === 'C' ? '' : '&temperature_unit=fahrenheit'}`,
+      `https://api.open-meteo.com/v1/forecast?latitude=${body.lat}&longitude=${body.lng}&current=weather_code,temperature_2m,is_day,relative_humidity_2m,wind_speed_10m&timezone=auto${
+        body.measureUnit === 'Metric' ? '' : '&temperature_unit=fahrenheit'
+      }${body.measureUnit === 'Metric' ? '' : '&wind_speed_unit=mph'}`,
     );
 
     const data = await res.json();
@@ -35,13 +40,15 @@ export const POST = async (req: Request) => {
       windSpeed: number;
       icon: string;
       temperatureUnit: 'C' | 'F';
+      windSpeedUnit: 'm/s' | 'mph';
     } = {
       temperature: data.current.temperature_2m,
       condition: '',
       humidity: data.current.relative_humidity_2m,
       windSpeed: data.current.wind_speed_10m,
       icon: '',
-      temperatureUnit: body.temperatureUnit,
+      temperatureUnit: body.measureUnit === 'Metric' ? 'C' : 'F',
+      windSpeedUnit: body.measureUnit === 'Metric' ? 'm/s' : 'mph',
     };
 
     const code = data.current.weather_code;

src/app/settings/page.tsx

@@ -232,7 +232,9 @@ export default function SettingsPage() {
   >(null);
   const [isLoading, setIsLoading] = useState(true);
   const [automaticSuggestions, setAutomaticSuggestions] = useState(true);
-  const [temperatureUnit, setTemperatureUnit] = useState<'C' | 'F'>('C');
+  const [measureUnit, setMeasureUnit] = useState<'Imperial' | 'Metric'>(
+    'Metric',
+  );
   const [savingStates, setSavingStates] = useState<Record<string, boolean>>({});
   const [contextWindowSize, setContextWindowSize] = useState(2048);
   const [isCustomContextWindow, setIsCustomContextWindow] = useState(false);
@@ -334,7 +336,9 @@ export default function SettingsPage() {
         !predefinedContextSizes.includes(storedContextWindow),
       );
 
-      setTemperatureUnit(localStorage.getItem('temperatureUnit')! as 'C' | 'F');
+      setMeasureUnit(
+        localStorage.getItem('measureUnit')! as 'Imperial' | 'Metric',
+      );
 
       setIsLoading(false);
     };
@@ -556,8 +560,8 @@ export default function SettingsPage() {
         localStorage.setItem('embeddingModel', value);
       } else if (key === 'ollamaContextWindow') {
         localStorage.setItem('ollamaContextWindow', value.toString());
-      } else if (key === 'temperatureUnit') {
+      } else if (key === 'measureUnit') {
-        localStorage.setItem('temperatureUnit', value.toString());
+        localStorage.setItem('measureUnit', value.toString());
       }
     } catch (err) {
       console.error('Failed to save:', err);
@@ -735,22 +739,22 @@ export default function SettingsPage() {
               </div>
               <div className="flex flex-col space-y-1">
                 <p className="text-black/70 dark:text-white/70 text-sm">
-                  Temperature Unit
+                  Measurement Units
                 </p>
                 <Select
-                  value={temperatureUnit ?? undefined}
+                  value={measureUnit ?? undefined}
                   onChange={(e) => {
-                    setTemperatureUnit(e.target.value as 'C' | 'F');
+                    setMeasureUnit(e.target.value as 'Imperial' | 'Metric');
-                    saveConfig('temperatureUnit', e.target.value);
+                    saveConfig('measureUnit', e.target.value);
                   }}
                   options={[
                     {
-                      label: 'Celsius',
+                      label: 'Metric',
-                      value: 'C',
+                      value: 'Metric',
                     },
                     {
-                      label: 'Fahrenheit',
+                      label: 'Imperial',
-                      value: 'F',
+                      value: 'Imperial',
                     },
                   ]}
                 />

src/components/WeatherWidget.tsx

@@ -10,6 +10,7 @@ const WeatherWidget = () => {
     windSpeed: 0,
     icon: '',
     temperatureUnit: 'C',
+    windSpeedUnit: 'm/s',
   });
 
   const [loading, setLoading] = useState(true);
@@ -75,7 +76,7 @@ const WeatherWidget = () => {
         body: JSON.stringify({
           lat: location.latitude,
           lng: location.longitude,
-          temperatureUnit: localStorage.getItem('temperatureUnit') ?? 'C',
+          measureUnit: localStorage.getItem('measureUnit') ?? 'Metric',
         }),
       });
 
@@ -95,6 +96,7 @@ const WeatherWidget = () => {
         windSpeed: data.windSpeed,
         icon: data.icon,
         temperatureUnit: data.temperatureUnit,
+        windSpeedUnit: data.windSpeedUnit,
       });
       setLoading(false);
     });
@@ -139,7 +141,7 @@ const WeatherWidget = () => {
               </span>
               <span className="flex items-center text-xs text-black/60 dark:text-white/60">
                 <Wind className="w-3 h-3 mr-1" />
-                {data.windSpeed} km/h
+                {data.windSpeed} {data.windSpeedUnit}
               </span>
             </div>
             <span className="text-xs text-black/60 dark:text-white/60 mt-1">