Skip to content

Commit 67d22e5

Browse files
authored
Merge pull request #545 from Phlank/develop
Merge develop into main for v1.6.7
2 parents 7377cff + 8428292 commit 67d22e5

3 files changed

Lines changed: 28 additions & 6 deletions

File tree

src/client/src/components/controls/PlayButton.vue

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@
1313
</div>
1414
<div class="play-button__content__text-area">
1515
<div class="play-button__content__text-area__status">
16-
{{ statusText }}
16+
<span>{{ liveText }}</span>
17+
<span>|</span>
18+
<span class="play-button__content__text-area__status__listeners">
19+
<span class="pi pi-wave-pulse" />
20+
<span>{{ listenersText }}</span>
21+
</span>
1722
</div>
1823
<div class="play-button__content__text-area__now-playing">
1924
<div class="play-button__content__text-area__now-playing__text">
@@ -201,12 +206,19 @@ const handleError = () => {
201206
})
202207
waitAndTryReconnect()
203208
}
204-
205-
const statusText = computed(() => {
209+
computed(() => {
206210
const liveText = streamStore.status.isLive ? 'Live' : 'Offline'
207211
return `${liveText} | Listeners: ${streamStore.status.listenerCount}`
208212
})
209213
214+
const liveText = computed(() => {
215+
return streamStore.status.isLive ? 'Live' : 'Offline'
216+
})
217+
218+
const listenersText = computed(() => {
219+
return streamStore.status.listenerCount ?? 0
220+
})
221+
210222
const elapsedText = ref('')
211223
let elapsedTextInterval: ReturnType<typeof setInterval> | undefined
212224
@@ -372,6 +384,14 @@ $text-translate-amount: v-bind(nameTranslateWidthPx);
372384
font-size: small;
373385
text-align: left;
374386
white-space: nowrap;
387+
display: flex;
388+
flex-direction: row;
389+
gap: variables.$space-m;
390+
391+
&__listeners {
392+
display: flex;
393+
gap: variables.$space-s;
394+
}
375395
}
376396
377397
&__elapsed {

src/client/src/components/views/dashboard/schedules/SchedulesGrid.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
field="start"
2929
header="Date">
3030
<template #body="{ data }: { data: ScheduleResponse }">
31-
{{ parseDate(data.startsAt).toLocaleDateString() }}
31+
{{ parseDate(data.startsAt).toLocaleDateString(undefined, dateStringOptions) }}
3232
</template>
3333
</Column>
3434
<Column
@@ -44,7 +44,7 @@
4444
<template #body="{ data }: { data: ScheduleResponse }">
4545
<TwoLineData
4646
:above="data.name"
47-
:below="parseDate(data.startsAt).toLocaleDateString()" />
47+
:below="parseDate(data.startsAt).toLocaleDateString(undefined, dateStringOptions)" />
4848
</template>
4949
</Column>
5050
<!-- Only show the action col for grids with schedules in the future -->
@@ -115,6 +115,8 @@ const toast = useToast()
115115
const expandedRows = ref({})
116116
const isMobile: Ref<boolean> | undefined = inject('isMobile')
117117
118+
const dateStringOptions: Intl.DateTimeFormatOptions = { weekday: 'long', day: '2-digit', month: '2-digit', year: 'numeric' }
119+
118120
const props = withDefaults(
119121
defineProps<{
120122
hideActions?: boolean

src/server/LowPressureZone.Api/LowPressureZone.Api.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<UserSecretsId>9d2c548d-3c62-4409-9c65-fe1fa2b047b1</UserSecretsId>
88
<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
99
<AnalysisLevel>latest-recommended</AnalysisLevel>
10-
<Version>1.6.4</Version>
10+
<Version>1.6.7</Version>
1111
</PropertyGroup>
1212

1313
<ItemGroup>

0 commit comments

Comments
 (0)