Merge pull request #26 from Naetffy/Juanes

Juanes

Author: MateoSebF

src/pages/Calendar/Calendar.css

@@ -25,32 +25,27 @@
 }
 
 .highlight {
-    background-color: #E1E6F0 !important;
-    border-radius: 50%;
+    background-color: #E1E6F0 !important; 
+    border-radius: 50%; 
 }
 
 .react-calendar__tile--active {
     background-color: #007bff;
-    color: #fff;
+    color: #fff; 
 }
 
 .react-calendar__tile--active:enabled:focus,
 .react-calendar__tile--active:enabled:hover,
 .react-calendar__tile--active:enabled:active {
-    background-color: #86654b;
+    background-color: #86654b; 
 }
 
 .react-calendar__tile--now {
     background-color: #A4826D;
-    color: #333;
+    color: #333; 
 }
 
 .highlight-today {
     background-color: #FFE4B5 !important;
     border-radius: 50%;
 }
-
-
-
-
-

src/pages/Calendar/Calendar.js

@@ -10,16 +10,18 @@ import apiClient from '../../services/apiClient';
 const CalendarPage = () => {
     const [date, setDate] = useState(new Date());
     const [outfitDates, setOutfitDates] = useState([]);
-
-    const onChange = (date) => {
-        setDate(date);
-    };
+    const [todayHasOutfit, setTodayHasOutfit] = useState(false);
 
     useEffect(() => {
         const fetchOutfitDates = async () => {
             try {
-                const response = await apiClient.get('/outfit/dates'); // Cambia la ruta según tu API
-                setOutfitDates(response.data);
+                const response = await apiClient.get('/day/all');
+                const datesWithOutfit = response.data.filter(day => day.outfitId !== null).map(day => new Date(day.date));
+                setOutfitDates(datesWithOutfit);
+
+                const todayDateString = new Date().toISOString().split('T')[0];
+                const todayHasOutfit = datesWithOutfit.some(date => date.toISOString().split('T')[0] === todayDateString);
+                setTodayHasOutfit(todayHasOutfit);
             } catch (error) {
                 console.error('Error fetching outfit dates:', error);
             }
@@ -28,15 +30,24 @@ const CalendarPage = () => {
         fetchOutfitDates();
     }, []);
 
+    const onChange = (date) => {
+        setDate(date);
+    };
+
     const tileClassName = ({ date, view }) => {
+        if (view === 'month' && date.toDateString() === new Date().toDateString()) {
+            return todayHasOutfit ? 'highlight-today' : null;
+        }
         if (view === 'month') {
             const dateString = date.toISOString().split('T')[0];
-            if (outfitDates.includes(dateString)) {
+            if (outfitDates.some(outfitDate => outfitDate.toISOString().split('T')[0] === dateString)) {
                 return 'highlight';
             }
         }
         return null;
     };
+    
+    
 
     return (
         <div className='col-12'>
@@ -68,3 +79,5 @@ const CalendarPage = () => {
 
 export default CalendarPage;
 
+
+