[#149] fixed regressions (#150)

Co-authored-by: Camille Moussu <cmoussu@linagora.com>
This commit is contained in:
Camille Moussu
2025-09-25 16:53:11 +02:00
committed by GitHub
parent 58324cd8e0
commit 77df90be27
4 changed files with 18 additions and 15 deletions
+1 -1
View File
@@ -30,7 +30,7 @@
href="https://fonts.googleapis.com/css2?family=Inter:ital,wght@0,100..900;1,100..900&family=Cal+Sans&family=Roboto:ital,wght@0,100..900;1,100..900&display=swap" href="https://fonts.googleapis.com/css2?family=Inter:ital,wght@0,100..900;1,100..900&family=Cal+Sans&family=Roboto:ital,wght@0,100..900;1,100..900&display=swap"
rel="stylesheet" rel="stylesheet"
/> />
<title>React App</title> <title>Twake Calendar</title>
<script src="<%= assetPrefix %>/.env.js"></script> <script src="<%= assetPrefix %>/.env.js"></script>
<script src="<%= assetPrefix %>/appList.js"></script> <script src="<%= assetPrefix %>/appList.js"></script>
</head> </head>
+2 -2
View File
@@ -8,12 +8,12 @@
"type": "image/x-icon" "type": "image/x-icon"
}, },
{ {
"src": "calendar-192.png", "src": "calendar.svg",
"sizes": "192x192", "sizes": "192x192",
"type": "image/svg+xml" "type": "image/svg+xml"
}, },
{ {
"src": "calendar-512.png", "src": "calendar.svg",
"sizes": "512x512", "sizes": "512x512",
"type": "image/svg+xml" "type": "image/svg+xml"
} }
+10 -12
View File
@@ -26,22 +26,20 @@ export default function CalendarLayout() {
// Get current calendar range // Get current calendar range
if (calendarRef.current) { if (calendarRef.current) {
const view = calendarRef.current.getApi().view; const view = calendarRef.current.view;
const calendarRange = getCalendarRange(view.activeStart); const calendarRange = getCalendarRange(view.activeStart);
// Refresh events for selected calendars // Refresh events for selected calendars
Object.keys(selectedCalendars).forEach((id) => { Object.keys(selectedCalendars).forEach((id) => {
if (id.split("/")[0] === userId) { dispatch(
dispatch( getCalendarDetailAsync({
getCalendarDetailAsync({ calId: id,
calId: id, match: {
match: { start: formatDateToYYYYMMDDTHHMMSS(calendarRange.start),
start: formatDateToYYYYMMDDTHHMMSS(calendarRange.start), end: formatDateToYYYYMMDDTHHMMSS(calendarRange.end),
end: formatDateToYYYYMMDDTHHMMSS(calendarRange.end), },
}, })
}) );
);
}
}); });
} }
}; };
+5
View File
@@ -135,6 +135,11 @@ export function Menubar({
</div> </div>
</div> </div>
<div className="right-menu"> <div className="right-menu">
<div className="menu-items">
<IconButton onClick={onRefresh}>
<RefreshIcon />
</IconButton>
</div>
<div className="menu-items"> <div className="menu-items">
<FormControl size="small" sx={{ minWidth: 120, mr: 2 }}> <FormControl size="small" sx={{ minWidth: 120, mr: 2 }}>
<Select <Select