Skip to content

fix: redesign next meeting button to one-line #16686

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
Antreesy merged 2 commits into from
Jan 9, 2026
+36 −24
Merged

fix: redesign next meeting button to one-line #16686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
756fb99
fix: redesign next meeting button to one-line
Antreesy Jan 8, 2026
646ba49
fix(TopBar): shuffle buttons
Antreesy Jan 8, 2026
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
49 changes: 30 additions & 19 deletions src/components/CalendarEventsDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import TransitionWrapper from './UIShared/TransitionWrapper.vue'
import { ATTENDEE, CONVERSATION } from '../constants.ts'
import { hasTalkFeature } from '../services/CapabilitiesManager.ts'
import { useGroupwareStore } from '../stores/groupware.ts'
import { convertToUnix, ONE_HOUR_IN_MS } from '../utils/formattedTime.ts'
import { convertToUnix, formatDateTime, getDiffInDays, ONE_HOUR_IN_MS } from '../utils/formattedTime.ts'
import { getDisplayNameWithFallback } from '../utils/getDisplayName.ts'

const props = defineProps<{
Expand Down Expand Up @@ -77,6 +77,28 @@ const upcomingEvents = computed(() => {
})
})

const upcomingEventTime = computed(() => {
const eventStart = upcomingEvents.value[0]!.start

if (typeof eventStart === 'string') {
// Now
return eventStart
}

const diffInDays = getDiffInDays(eventStart)

if (diffInDays === 0) {
// Today
return formatDateTime(eventStart, 'shortTime')
} else if (diffInDays < 7) {
// Within a week
return formatDateTime(eventStart, 'shortWeekdayWithTime')
}

const isSameYear = new Date(eventStart).getFullYear() === new Date().getFullYear()
return formatDateTime(eventStart, isSameYear ? 'shortDateSameYear' : 'shortDate')
})

type CalendarOption = { value: string, label: string, color: string }
const calendarOptions = computed<CalendarOption[]>(() => groupwareStore.writeableCalendars.map((calendar) => ({
value: calendar.uri,
Expand Down Expand Up @@ -349,14 +371,14 @@ async function submitNewMeeting() {
class="upcoming-meeting"
:title="t('spreed', 'Upcoming meetings')"
:aria-label="t('spreed', 'Upcoming meetings')">
<template #icon>
<IconCalendarBlankOutline :size="20" />
</template>
<template v-if="upcomingEvents[0] && !isMobile" #default>
<span class="upcoming-meeting__header">
{{ t('spreed', 'Next meeting') }}
{{ t('spreed', 'Meeting') }}
<span class="upcoming-meeting__time">
{{ upcomingEventTime }}
</span>
<StaticDateTime :time="upcomingEvents[0].start" calendar />
</template>
<template v-else #icon>
<IconCalendarBlankOutline :size="20" />
</template>
</NcButton>
</template>
Expand Down Expand Up @@ -651,20 +673,9 @@ async function submitNewMeeting() {
}

.upcoming-meeting {
// Overwrite default NcButton styles
:deep(.button-vue__text) {
padding-block: 0;
margin: 0;
display: flex;
flex-direction: column;
align-items: flex-start;
line-height: 20px;
&__time {
font-weight: 400;
}

&__header {
font-weight: 500;
}
}

.calendar-badge {
Expand Down
10 changes: 5 additions & 5 deletions src/components/TopBar/TopBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,6 @@

<TasksCounter v-if="conversation.type === CONVERSATION.TYPE.NOTE_TO_SELF" />

<!-- Upcoming meetings -->
<CalendarEventsDialog v-if="showCalendarEvents" :token="token" />

<!-- Call time -->
<CallTime
v-if="isInCall"
Expand All @@ -127,15 +124,18 @@
v-else-if="!isSidebar && canExtendOneToOneConversation"
:token="token" />

<!-- Upcoming meetings -->
<CalendarEventsDialog v-if="showCalendarEvents" :token="token" />

<CallButton v-if="!isInCall" shrink-on-mobile />

<!-- TopBar menu -->
<TopBarMenu
:token="token"
:show-actions="!isSidebar"
:is-sidebar="isSidebar"
@open-breakout-rooms-editor="showBreakoutRoomsEditor = true" />

<CallButton v-if="!isInCall" shrink-on-mobile />

<!-- Breakout rooms editor -->
<BreakoutRoomsEditor
v-if="showBreakoutRoomsEditor"
Expand Down
1 change: 1 addition & 0 deletions src/utils/formattedTime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const absoluteTimeFormat = {
longDate: new Intl.DateTimeFormat(locale, { year: 'numeric', month: 'long', day: 'numeric' }), // 'February 15, 2025'
longDateWithTime: new Intl.DateTimeFormat(locale, { year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' }), // 'February 15, 2025 at 8:30 PM'
shortDate: new Intl.DateTimeFormat(locale, { year: 'numeric', month: 'short', day: 'numeric' }), // 'Feb 15, 2025'
shortDateSameYear: new Intl.DateTimeFormat(locale, { month: 'short', day: 'numeric' }), // 'Feb 15'
shortDateNumeric: new Intl.DateTimeFormat(locale, { year: 'numeric', month: '2-digit', day: '2-digit' }), // '02/15/2025'
shortDateWithTime: new Intl.DateTimeFormat(locale, { year: 'numeric', month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric' }), // 'Feb 15, 2025, 8:30 PM'
shortDateWithTimeSeconds: new Intl.DateTimeFormat(locale, { year: 'numeric', month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric', second: 'numeric' }), // 'Feb 15, 2025, 8:30:00 PM'
Expand Down