Skip to content

improve: UI/UX of upcoming events calendar widget #2842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arkid15r merged 4 commits into from
Dec 10, 2025
Merged

improve: UI/UX of upcoming events calendar widget #2842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91f0c10
improve: UI/UX of upcoming events calendar button
ShashaankS Dec 9, 2025
ec6e7ec
fix: passing showLabel as boolean
ShashaankS Dec 9, 2025
71fa231
Update code
arkid15r Dec 9, 2025
ff1a04b
Merge branch 'main' into Improve-UI/UX-of-upcoming-events-calendar
arkid15r Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions frontend/src/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,23 +176,23 @@ export default function Home() {
>
<TruncatedText text={event.name} />
</button>
<CalendarButton
event={{
title: event.name,
description: event.summary || '',
location: event.suggestedLocation || '',
startDate: event.startDate,
endDate: event.endDate,
url: event.url,
}}
className="text-gray-600 hover:text-gray-800 dark:text-gray-400 dark:hover:text-gray-200"
iconClassName="h-4 w-4"
/>
</div>
<div className="flex flex-wrap items-center text-sm text-gray-600 dark:text-gray-400">
<div className="mr-2 flex items-center">
<FontAwesomeIcon icon={faCalendar} className="mr-2 h-4 w-4" />
<span>{formatDateRange(event.startDate, event.endDate)}</span>
<CalendarButton
className="text-gray-600 hover:text-gray-800 dark:text-gray-400 dark:hover:text-gray-200"
event={{
title: event.name,
description: event.summary || '',
location: event.suggestedLocation || '',
startDate: event.startDate,
endDate: event.endDate,
url: event.url,
}}
iconClassName="h-4 w-4 mr-1"
label={formatDateRange(event.startDate, event.endDate)}
showLabel
/>
</div>
{event.suggestedLocation && (
<div className="flex flex-1 items-center overflow-hidden">
Expand Down
10 changes: 8 additions & 2 deletions frontend/src/components/CalendarButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { faCalendarPlus } from '@fortawesome/free-solid-svg-icons'
import { faCalendar, faCalendarPlus } from '@fortawesome/free-solid-svg-icons'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { useState } from 'react'
import type { CalendarButtonProps } from 'types/calendar'
import getGoogleCalendarUrl from 'utils/getGoogleCalendarUrl'

export default function CalendarButton(props: Readonly<CalendarButtonProps>) {
const [isHovered, setIsHovered] = useState(false)
const {
event,
className = '',
Expand All @@ -24,8 +26,12 @@ export default function CalendarButton(props: Readonly<CalendarButtonProps>) {
aria-label={ariaLabel}
title={ariaLabel}
className={className}
onMouseEnter={() => setIsHovered(true)}
onMouseLeave={() => setIsHovered(false)}
>
{icon || <FontAwesomeIcon icon={faCalendarPlus} className={iconClassName} />}
{icon || (
<FontAwesomeIcon icon={isHovered ? faCalendarPlus : faCalendar} className={iconClassName} />
)}
{showLabel && <span>{label}</span>}
</a>
)
Expand Down