cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-13 11:23:50 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Feature/#276/qrcodes (#289)

Browse Source 
* bugfix: wrong format when on 12h format

* update: website link in placeholder

---------

Co-authored-by: Fabian Posenau <fabian@fphome.de>
Co-authored-by: cv <34649812+cpvalente@users.noreply.github.com>
This commit is contained in:
Fabian Posenau
2023-02-19 20:52:42 +01:00
committed by GitHub
parent df351b8cba
commit 63d763cbaf
13 changed files with 81 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/client/src/features/viewers/backstage/Backstage.tsx
+5 -19
View File
@@ -83,12 +83,7 @@ export default function Backstage(props) {
</div>
</div>
<ProgressBar
className='progress-container'
now={time.current}
complete={time.duration}
hidden={!showProgress}
/>
<ProgressBar className='progress-container' now={time.current} complete={time.duration} hidden={!showProgress} />
<div className='now-container'>
<AnimatePresence>
@@ -146,30 +141,21 @@ export default function Backstage(props) {
</AnimatePresence>
</div>
<ScheduleProvider
events={filteredEvents}
selectedEventId={selectedId}
isBackstage
>
<ScheduleProvider events={filteredEvents} selectedEventId={selectedId} isBackstage>
<ScheduleNav className='schedule-nav-container' />
<Schedule className='schedule-container' />
</ScheduleProvider>
<div
className={showPublicMessage ? 'public-container' : 'public-container public-container--hidden'}>
<div className={showPublicMessage ? 'public-container' : 'public-container public-container--hidden'}>
<div className='label'>Public message</div>
<div className='message'>{publ.text}</div>
</div>
<div className='info'>
<div className='qr'>
{general.url != null && general.url !== '' && (
<QRCode value={general.url} size={qrSize} level='L' />
)}
{general.backstageUrl && <QRCode value={general.backstageUrl} size={qrSize} level='L' />}
</div>
{general.backstageInfo && (
<div className='info__message'>{general.backstageInfo}</div>
)}
{general.backstageInfo && <div className='info__message'>{general.backstageInfo}</div>}
</div>
</div>
);
apps/client/src/features/viewers/public/Public.tsx
+4 -15
View File
@@ -64,7 +64,6 @@ export default function Public(props) {
</div>
<div className='now-container'>
<AnimatePresence>
{publicTitle.showNow && (
<motion.div
@@ -106,29 +105,19 @@ export default function Public(props) {
</AnimatePresence>
</div>
<ScheduleProvider
events={events}
selectedEventId={publicSelectedId}
>
<ScheduleProvider events={events} selectedEventId={publicSelectedId}>
<ScheduleNav className='schedule-nav-container' />
<Schedule className='schedule-container' />
</ScheduleProvider>
<div
className={showPublicMessage ? 'public-container' : 'public-container public-container--hidden'}>
<div className={showPublicMessage ? 'public-container' : 'public-container public-container--hidden'}>
<div className='label'>Public message</div>
<div className='message'>{publ.text}</div>
</div>
<div className='info'>
<div className='qr'>
{general.url != null && general.url !== '' && (
<QRCode value={general.url} size={qrSize} level='L' />
)}
</div>
{general.backstageInfo && (
<div className='info__message'>{general.backstageInfo}</div>
)}
<div className='qr'>{general.publicUrl && <QRCode value={general.publicUrl} size={qrSize} level='L' />}</div>
{general.publicInfo && <div className='info__message'>{general.publicInfo}</div>}
</div>
</div>
);
apps/client/src/features/viewers/studio/StudioClock.jsx
+1 -1
View File
@@ -46,7 +46,7 @@ export default function StudioClock(props) {
const [searchParams] = useSearchParams();
const showSeconds = searchParams.get('seconds');
formatOptions.showSeconds = Boolean(showSeconds);
formatOptions.format = `hh:mm${formatOptions.showSeconds ? 'mm' : ''}`;
formatOptions.format = `hh:mm${formatOptions.showSeconds ? ':ss' : ''}`;
useEffect(() => {
document.title = 'ontime - Studio Clock';