Compare commits
No commits in common. "fcfbc0f04be0a6311b559d22753a3c163ababb47" and "71fcf29a6be434218684ed1f21569ab35a9307fa" have entirely different histories.
fcfbc0f04b
...
71fcf29a6b
@ -457,11 +457,10 @@ export default function AppointmentDetailPage() {
|
|||||||
}
|
}
|
||||||
setRescheduleDialogOpen(true);
|
setRescheduleDialogOpen(true);
|
||||||
}}
|
}}
|
||||||
className={`flex items-center gap-2 px-3 py-2 rounded-lg transition-colors ${isDark ? "hover:bg-gray-700 text-gray-300 hover:text-white" : "hover:bg-gray-100 text-gray-600 hover:text-gray-900"}`}
|
className={`p-2 rounded-lg transition-colors ${isDark ? "hover:bg-gray-700 text-gray-300 hover:text-white" : "hover:bg-gray-100 text-gray-600 hover:text-gray-900"}`}
|
||||||
title="Reschedule Appointment"
|
title="Reschedule Appointment"
|
||||||
>
|
>
|
||||||
<Pencil className="w-4 h-4 shrink-0" />
|
<Pencil className="w-4 h-4" />
|
||||||
<span className="hidden sm:inline text-sm font-medium">Reschedule</span>
|
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
@ -683,7 +682,9 @@ export default function AppointmentDetailPage() {
|
|||||||
<p className={`text-sm font-medium ${appointment.can_join_as_moderator ? (isDark ? "text-green-300" : "text-green-700") : (isDark ? "text-gray-400" : "text-gray-500")}`}>
|
<p className={`text-sm font-medium ${appointment.can_join_as_moderator ? (isDark ? "text-green-300" : "text-green-700") : (isDark ? "text-gray-400" : "text-gray-500")}`}>
|
||||||
{appointment.can_join_as_moderator
|
{appointment.can_join_as_moderator
|
||||||
? "Meeting is active - You can join as moderator"
|
? "Meeting is active - You can join as moderator"
|
||||||
: "Click here to join"}
|
: appointment.scheduled_datetime
|
||||||
|
? `Meeting would be available to join starting at ${formatTime(appointment.scheduled_datetime)}`
|
||||||
|
: "Meeting would be available shortly"}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
@ -836,13 +837,20 @@ export default function AppointmentDetailPage() {
|
|||||||
|
|
||||||
// If can_join_as_moderator != true, display "Meeting would be available shortly"
|
// If can_join_as_moderator != true, display "Meeting would be available shortly"
|
||||||
if (!canJoinAsModerator) {
|
if (!canJoinAsModerator) {
|
||||||
|
const meetingTime = appointment.scheduled_datetime
|
||||||
|
? formatTime(appointment.scheduled_datetime)
|
||||||
|
: "the scheduled time";
|
||||||
return (
|
return (
|
||||||
<button
|
<button
|
||||||
disabled
|
disabled
|
||||||
className={`flex items-center justify-center gap-2 w-full cursor-not-allowed h-12 rounded-lg text-sm sm:text-base font-medium transition-colors ${isDark ? "bg-gray-700 text-gray-500" : "bg-gray-300 text-gray-500"}`}
|
className={`flex items-center justify-center gap-2 w-full cursor-not-allowed h-12 rounded-lg text-sm sm:text-base font-medium transition-colors ${isDark ? "bg-gray-700 text-gray-500" : "bg-gray-300 text-gray-500"}`}
|
||||||
>
|
>
|
||||||
<Video className="w-4 h-4 sm:w-5 sm:h-5 shrink-0" />
|
<Video className="w-4 h-4 sm:w-5 sm:h-5 shrink-0" />
|
||||||
<span className="text-center">Click here to join</span>
|
<span className="text-center px-1">
|
||||||
|
<span className="hidden sm:inline">Meeting would be available to join starting at </span>
|
||||||
|
<span className="sm:hidden">Available at </span>
|
||||||
|
<span className="font-semibold">{meetingTime}</span>
|
||||||
|
</span>
|
||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -469,7 +469,7 @@ export default function UserAppointmentDetailPage() {
|
|||||||
<div className={`flex items-center gap-2 px-4 py-3 rounded-lg ${appointment.can_join_as_participant ? (isDark ? "bg-green-500/20 border border-green-500/30" : "bg-green-50 border border-green-200") : (isDark ? "bg-gray-800 border border-gray-700" : "bg-gray-50 border border-gray-200")}`}>
|
<div className={`flex items-center gap-2 px-4 py-3 rounded-lg ${appointment.can_join_as_participant ? (isDark ? "bg-green-500/20 border border-green-500/30" : "bg-green-50 border border-green-200") : (isDark ? "bg-gray-800 border border-gray-700" : "bg-gray-50 border border-gray-200")}`}>
|
||||||
<div className={`h-2 w-2 rounded-full ${appointment.can_join_as_participant ? (isDark ? "bg-green-400" : "bg-green-600") : (isDark ? "bg-gray-500" : "bg-gray-400")}`} />
|
<div className={`h-2 w-2 rounded-full ${appointment.can_join_as_participant ? (isDark ? "bg-green-400" : "bg-green-600") : (isDark ? "bg-gray-500" : "bg-gray-400")}`} />
|
||||||
<p className={`text-sm font-medium ${appointment.can_join_as_participant ? (isDark ? "text-green-300" : "text-green-700") : (isDark ? "text-gray-400" : "text-gray-500")}`}>
|
<p className={`text-sm font-medium ${appointment.can_join_as_participant ? (isDark ? "text-green-300" : "text-green-700") : (isDark ? "text-gray-400" : "text-gray-500")}`}>
|
||||||
{appointment.can_join_as_participant ? "Meeting is active - You can join now" : "Click here to join"}
|
{appointment.can_join_as_participant ? "Meeting is active - You can join now" : "Meeting would be available shortly"}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
@ -568,15 +568,15 @@ export default function UserAppointmentDetailPage() {
|
|||||||
const startedAt = appointment.started_at || appointment.meeting_started_at;
|
const startedAt = appointment.started_at || appointment.meeting_started_at;
|
||||||
const hasStarted = startedAt != null && startedAt !== "";
|
const hasStarted = startedAt != null && startedAt !== "";
|
||||||
|
|
||||||
// If can_join_as_participant != true, display "Click here to join"
|
// If can_join_as_participant != true, display "Meeting would be available shortly"
|
||||||
if (!canJoinAsParticipant) {
|
if (!canJoinAsParticipant) {
|
||||||
return (
|
return (
|
||||||
<button
|
<button
|
||||||
disabled
|
disabled
|
||||||
className={`flex items-center justify-center gap-2 w-full cursor-not-allowed h-12 rounded-lg text-sm sm:text-base font-medium transition-colors ${isDark ? "bg-gray-700 text-gray-500" : "bg-gray-300 text-gray-500"}`}
|
className={`flex items-center justify-center gap-2 w-full cursor-not-allowed h-12 rounded-lg text-base font-medium transition-colors ${isDark ? "bg-gray-700 text-gray-500" : "bg-gray-300 text-gray-500"}`}
|
||||||
>
|
>
|
||||||
<Video className="w-4 h-4 sm:w-5 sm:h-5 shrink-0" />
|
<Video className="w-5 h-5" />
|
||||||
<span className="text-center">Click here to join</span>
|
Meeting would be available shortly
|
||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -596,14 +596,14 @@ export default function UserAppointmentDetailPage() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// If can_join_as_participant == true && started_at == null, show "Click here to join"
|
// If can_join_as_participant == true && started_at == null, show "Meeting would be available shortly"
|
||||||
return (
|
return (
|
||||||
<button
|
<button
|
||||||
disabled
|
disabled
|
||||||
className={`flex items-center justify-center gap-2 w-full cursor-not-allowed h-12 rounded-lg text-sm sm:text-base font-medium transition-colors ${isDark ? "bg-gray-700 text-gray-500" : "bg-gray-300 text-gray-500"}`}
|
className={`flex items-center justify-center gap-2 w-full cursor-not-allowed h-12 rounded-lg text-base font-medium transition-colors ${isDark ? "bg-gray-700 text-gray-500" : "bg-gray-300 text-gray-500"}`}
|
||||||
>
|
>
|
||||||
<Video className="w-4 h-4 sm:w-5 sm:h-5 shrink-0" />
|
<Video className="w-5 h-5" />
|
||||||
<span className="text-center">Click here to join</span>
|
Meeting would be available shortly
|
||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
})()}
|
})()}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user