3pp-mirror/rallly
1
0
Fork 0
mirror of https://github.com/lukevella/rallly.git synced 2025-04-29 10:16:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

More fixes

Browse source
This commit is contained in:
Luke Vella 2024-10-13 11:48:25 +01:00
parent c9f6b67cbf
commit a13df41bae
No known key found for this signature in database
GPG key ID: 469CAD687F0D784C
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx
View file

@ -34,8 +34,7 @@ import {
} from "../../../../utils/date-time-utils";
import DateCard from "../../../date-card";
import { useHeadlessDatePicker } from "../../../headless-date-picker";
import type { DateTimeOption } from "..";
import type { DateTimePickerProps } from "../types";
import type { DateTimeOption, DateTimePickerProps } from "../types";
import { formatDateWithoutTime, formatDateWithoutTz } from "../utils";
import TimePicker from "./time-picker";
@ -127,7 +126,7 @@ const MonthCalendar: React.FunctionComponent<DateTimePickerProps> = ({
{datepicker.days.map((day, i) => {
return (
<div
key={i}
key={day.date.toISOString()}
className={cn("h-11", {
"border-r": (i + 1) % 7 !== 0,
"border-b": i < datepicker.days.length - 7,
@ -411,22 +410,21 @@ const MonthCalendar: React.FunctionComponent<DateTimePickerProps> = ({
},
);
const newOptions: DateTimeOption[] = [];
Object.keys(optionsByDay).forEach(
(dateString) => {
times.forEach((time) => {
const start =
dateString + time.startTime;
newOptions.push({
type: "timeSlot",
start: start,
duration,
end: dayjs(start)
.add(duration, "minutes")
.format("YYYY-MM-DDTHH:mm"),
});
for (const dateString of Object.keys(
optionsByDay,
)) {
for (const time of times) {
const start = dateString + time.startTime;
newOptions.push({
type: "timeSlot",
start: start,
duration,
end: dayjs(start)
.add(duration, "minutes")
.format("YYYY-MM-DDTHH:mm"),
});
},
);
}
}
onChange(newOptions);
}}
>
@ -462,10 +460,10 @@ const MonthCalendar: React.FunctionComponent<DateTimePickerProps> = ({
<div className="flex flex-wrap gap-3 p-3 sm:gap-4 sm:p-4">
{datepicker.selection
.sort((a, b) => a.getTime() - b.getTime())
.map((selectedDate, i) => {
.map((selectedDate) => {
return (
<DateCard
key={i}
key={selectedDate.toISOString()}
{...getDateProps(selectedDate)}
// annotation={
// <CompactButton

6
apps/web/src/components/participant-avatar-bar.tsx
View file

@ -17,7 +17,7 @@ export const ParticipantAvatarBar = ({
return (
<ul className="flex items-center -space-x-1">
{participants.slice(0, visibleCount).map((participant, index) => (
<Tooltip key={index}>
<Tooltip key={`${participant.name}-${index}`}>
<TooltipTrigger asChild>
<li className="z-10 inline-flex items-center justify-center rounded-full ring-2 ring-white">
<OptimizedAvatarImage name={participant.name} size="xs" />
@ -45,7 +45,9 @@ export const ParticipantAvatarBar = ({
{participants
.slice(visibleCount, 10)
.map((participant, index) => (
<li key={index}>{participant.name}</li>
<li key={`${participant.name}-${index}`}>
{participant.name}
</li>
))}
</ul>
</TooltipContent>