Merge pull request #143 from R0m1k3/1.1

1.1
This commit is contained in:
LogiFlow authored and GitHub committed 2025-08-15 10:57:50 +02:00
commit 6f19a48b27
6 files changed
+82 -7

No files matched your search

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

+34
View File
@@ -0,0 +1,34 @@
import { Card, CardContent } from "@/components/ui/card";
import { Calendar } from "lucide-react";
const formatDate = (date: Date): string => {
return date.toLocaleDateString('fr-FR', {
weekday: 'long',
year: 'numeric',
month: 'long',
day: 'numeric'
});
};
export default function DateWidget() {
const now = new Date();
return (
<Card className="bg-gradient-to-r from-white to-slate-50 dark:from-slate-800 dark:to-slate-900 border-slate-200 dark:border-slate-700 shadow-lg hover:shadow-xl transition-all duration-300">
<CardContent className="p-4">
<div className="flex items-center gap-3">
<div className="p-2 bg-slate-100 dark:bg-slate-700 rounded-full">
<Calendar className="h-5 w-5 text-slate-600 dark:text-slate-300" />
</div>
<div className="flex flex-col">
<span className="text-slate-700 dark:text-slate-200 font-semibold text-sm capitalize">
{formatDate(now)}
</span>
</div>
</div>
</CardContent>
</Card>
);
}
+6 -2
View File
@@ -7,6 +7,7 @@ import { useAuthUnified } from "@/hooks/useAuthUnified";
import { useIsMobile } from "@/hooks/use-mobile";
import Sidebar from "./Sidebar";
import WeatherWidget from "./WeatherWidget";
import DateWidget from "./DateWidget";
import type { Group } from "@shared/schema";
interface StoreContextType {
@@ -92,8 +93,11 @@ export default function Layout({ children }: LayoutProps) {
</Button>
)}
{/* Weather widget */}
<WeatherWidget />
{/* Weather and Date widgets */}
<div className="flex items-center gap-3">
<WeatherWidget />
<DateWidget />
</div>
</div>
{/* Store selector for admin - responsive */}
+5 -2
View File
@@ -140,8 +140,11 @@ export default function WeatherWidget() {
<>
<div className="h-8 w-px bg-slate-300 dark:bg-slate-600"></div>
<div className="text-center">
<div className="text-lg font-semibold text-slate-600 dark:text-slate-300">
{Math.round(previousTemp)}°
<div className="flex items-center justify-center gap-1 mb-1">
<WeatherIcon condition={weather.previousYear?.condition || ''} size={16} />
<div className="text-lg font-semibold text-slate-600 dark:text-slate-300">
{Math.round(previousTemp)}°
</div>
</div>
<div className="text-xs text-slate-500 dark:text-slate-400">
Année dernière
+1 -1
View File
@@ -2,4 +2,4 @@
# https://curl.se/docs/http-cookies.html
# This file was generated by libcurl! Edit at your own risk.
#HttpOnly_localhost FALSE / FALSE 1755333603 connect.sid s%3AQqa7VC9Kmev2sSuyP6rb67zs4VszjTJP.RwnrDHc4pdPJyIwe93Hg9PTGpAF73AsiSmjdDq4MC4c
#HttpOnly_localhost FALSE / FALSE 1755333988 connect.sid s%3AISLqM3nMPwDqTr6rJYeqzJe6pp6ETpGJ.UEpHxk3T4DOjAZ6VGJsJ%2FHoasP2kzqayut1IaOzPG9E
+36 -2
View File
@@ -70,7 +70,41 @@ export class WeatherService {
}
/**
* Convertit les données de l'API en format WeatherData
* Traduit les conditions météo en français
*/
private translateConditionToFrench(condition: string): string {
const conditionLower = condition.toLowerCase();
// Traductions anglais -> français
if (conditionLower.includes('clear')) return 'Dégagé';
if (conditionLower.includes('sunny')) return 'Ensoleillé';
if (conditionLower.includes('fair')) return 'Beau temps';
if (conditionLower.includes('partly cloudy')) return 'Partiellement nuageux';
if (conditionLower.includes('cloudy')) return 'Nuageux';
if (conditionLower.includes('overcast')) return 'Couvert';
if (conditionLower.includes('rain')) {
if (conditionLower.includes('heavy')) return 'Pluie forte';
if (conditionLower.includes('light')) return 'Pluie légère';
return 'Pluie';
}
if (conditionLower.includes('shower')) return 'Averses';
if (conditionLower.includes('drizzle')) return 'Bruine';
if (conditionLower.includes('thunderstorm') || conditionLower.includes('thunder')) return 'Orage';
if (conditionLower.includes('snow')) {
if (conditionLower.includes('heavy')) return 'Neige forte';
if (conditionLower.includes('light')) return 'Neige légère';
return 'Neige';
}
if (conditionLower.includes('fog')) return 'Brouillard';
if (conditionLower.includes('mist')) return 'Brume';
if (conditionLower.includes('wind')) return 'Venteux';
// Si déjà en français, retourner tel quel
return condition;
}
/**
* Convertit les données de l'API en format WeatherData avec traduction française forcée
*/
convertApiDataToWeatherData(apiData: WeatherApiResponse, location: string, isCurrentYear: boolean): InsertWeatherData | null {
if (!apiData.days || apiData.days.length === 0) {
@@ -86,7 +120,7 @@ export class WeatherService {
tempMax: todayData.tempmax.toString(),
tempMin: todayData.tempmin.toString(),
icon: todayData.icon,
conditions: todayData.conditions,
conditions: this.translateConditionToFrench(todayData.conditions), // Traduction forcée
isCurrentYear
// Pas de createdAt/updatedAt - gérés par la base de données
};