fix: background interval

Co-authored-by: David Ralph <me@davidcralph.co.uk>
This commit is contained in:
alexsparkes
2022-10-07 19:36:58 +01:00
parent 3cc40fd15f
commit 8450d15be6
14 changed files with 55 additions and 18 deletions

View File

@@ -69,7 +69,7 @@ export default class Message extends PureComponent {
switch={true}
/>
<SettingsItem
title={variables.getMessage('modals.main.settings.sections.message.text')}
title={variables.getMessage('modals.main.settings.sections.message.messages')}
subtitle=""
final={true}
>
@@ -91,10 +91,11 @@ export default class Message extends PureComponent {
<TextareaAutosize
value={this.state.messages[index]}
placeholder={variables.getMessage(
'modals.main.settings.sections.message.title',
'modals.main.settings.sections.message.content',
)}
onChange={(e) => this.message(e, true, index)}
varient="outlined"
style={{ padding: "0"}}
/>
</div>
</div>

View File

@@ -1,3 +1,29 @@
import { Suspense, lazy } from 'react';
const Analog = lazy(() => import('react-clock'));
export default function ClockSkeleton() {
return <span className="new-clock clock-container clockSkeleton">10:20</span>;
if (localStorage.getItem('timeType') === 'analogue') {
return (
<Suspense fallback={<></>}>
<div className="clockBackground">
<Analog
className="analogclock clock-container"
value={'2022-10-07T17:00:00+00:00'}
size={50}
/>
</div>
</Suspense>
);
} else if (localStorage.getItem('timeType') === 'percentageComplete') {
return <span className="new-clock clock-container clockSkeleton">68%</span>;
} else if (localStorage.getItem('timeType') === 'verticalClock') {
return (
<span className="new-clock clock-container" style={{ fontSize: '30px' }}>
<div className="hour">10</div>
<div className="minute">23</div>
</span>
);
} else {
return <span className="new-clock clock-container clockSkeleton">10:24</span>;
}
}

View File

@@ -401,14 +401,14 @@ export default class Background extends PureComponent {
this.interval = setInterval(() => {
const targetTime = Number(
Number(localStorage.getItem('backgroundStartTime')) +
Number(localStorage.getItem('backgroundchange')),
Number(test),
);
const currentTime = Number(Date.now());
const type = localStorage.getItem('backgroundType');
if (test !== null) {
if (test !== null && test !== 'refresh') {
if (currentTime >= targetTime) {
console.log('Is this true?');
element.classList.remove('fade-in');
this.getBackground();
localStorage.setItem('backgroundStartTime', Date.now());
} else {
@@ -419,7 +419,6 @@ export default class Background extends PureComponent {
}
const offline = localStorage.getItem('offlineMode');
if (current.url.startsWith('http') && offline === 'false') {
console.log('current.url one?');
if (this.state.firstTime !== true) {
this.setState(current);
}

View File

@@ -313,7 +313,8 @@
"messages": "Messages",
"text": "Text",
"no_messages": "No messages",
"add_some": "Go ahead and add some."
"add_some": "Go ahead and add some.",
"content": "Message Content"
},
"appearance": {
"title": "Erscheinungsbild",

View File

@@ -307,7 +307,8 @@
"messages": "Messages",
"text": "Text",
"no_messages": "No messages",
"add_some": "Go ahead and add some."
"add_some": "Go ahead and add some.",
"content": "Message Content"
},
"appearance": {
"title": "Appearance",

View File

@@ -313,7 +313,8 @@
"messages": "Messages",
"text": "Text",
"no_messages": "No messages",
"add_some": "Go ahead and add some."
"add_some": "Go ahead and add some.",
"content": "Message Content"
},
"appearance": {
"title": "Appearance",

View File

@@ -313,7 +313,8 @@
"messages": "Messages",
"text": "Texto",
"no_messages": "No messages",
"add_some": "Go ahead and add some."
"add_some": "Go ahead and add some.",
"content": "Message Content"
},
"appearance": {
"title": "Apariencia",

View File

@@ -313,7 +313,8 @@
"messages": "Messages",
"text": "Text",
"no_messages": "No messages",
"add_some": "Go ahead and add some."
"add_some": "Go ahead and add some.",
"content": "Message Content"
},
"appearance": {
"title": "Apparence",

View File

@@ -313,7 +313,8 @@
"messages": "Messages",
"text": "Teks",
"no_messages": "No messages",
"add_some": "Go ahead and add some."
"add_some": "Go ahead and add some.",
"content": "Message Content"
},
"appearance": {
"title": "Antarmuka",

View File

@@ -313,7 +313,8 @@
"messages": "Messages",
"text": "Text",
"no_messages": "No messages",
"add_some": "Go ahead and add some."
"add_some": "Go ahead and add some.",
"content": "Message Content"
},
"appearance": {
"title": "Appearance",

View File

@@ -313,7 +313,8 @@
"messages": "Messages",
"text": "Text",
"no_messages": "No messages",
"add_some": "Go ahead and add some."
"add_some": "Go ahead and add some.",
"content": "Message Content"
},
"appearance": {
"title": "Appearance",

View File

@@ -313,7 +313,8 @@
"messages": "Messages",
"text": "Text",
"no_messages": "No messages",
"add_some": "Go ahead and add some."
"add_some": "Go ahead and add some.",
"content": "Message Content"
},
"appearance": {
"title": "Appearance",

View File

@@ -313,7 +313,8 @@
"messages": "Mesajlar",
"text": "Metin",
"no_messages": "No messages",
"add_some": "Go ahead and add some."
"add_some": "Go ahead and add some.",
"content": "Message Content"
},
"appearance": {
"title": "Görünüm",

View File

@@ -313,7 +313,8 @@
"messages": "Messages",
"text": "文本",
"no_messages": "No messages",
"add_some": "Go ahead and add some."
"add_some": "Go ahead and add some.",
"content": "Message Content"
},
"appearance": {
"title": "外观",