mirrors/mue
1
0
Fork 0
mirror of https://github.com/mue/mue.git synced 2026-07-07 22:23:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: better digital clock settings and greeting now changes properly

Browse Source
This commit is contained in:
David Ralph
2021-03-23 11:45:09 +00:00
parent 33a002003e
commit f3eb2c4cdb
8 changed files with 127 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
src/components/widgets/greeting/Greeting.jsx
View File

@@ -10,6 +10,7 @@ export default class Greeting extends React.PureComponent {
this.state = {
greeting: ''
};
this.timer = undefined;
this.language = window.language.widgets.greeting;
}
@@ -42,61 +43,65 @@ export default class Greeting extends React.PureComponent {
return Math.abs(birthday.getUTCFullYear() - 1970);
}
getGreeting() {
const now = new Date();
const hour = now.getHours();
getGreeting(time = (60000 - Date.now() % 60000)) {
this.timer = setTimeout(() => {
const now = new Date();
const hour = now.getHours();
// Set the default greeting string to "Good evening"
let message = this.language.evening;
// If it's before 12am, set the greeting string to "Good morning"
if (hour < 12) {
message = this.language.morning;
// If it's before 6pm, set the greeting string to "Good afternoon"
} else if (hour < 18) {
message = this.language.afternoon;
}
// Events
message = this.doEvents(now, message);
const custom = localStorage.getItem('defaultGreetingMessage');
if (custom === 'false') {
message = '';
}
// Name
let name = '';
const data = localStorage.getItem('greetingName');
if (typeof data === 'string') {
if (data.replace(/\s/g, '').length > 0) {
name = `, ${data.trim()}`;
// Set the default greeting string to "Good evening"
let message = this.language.evening;
// If it's before 12am, set the greeting string to "Good morning"
if (hour < 12) {
message = this.language.morning;
// If it's before 6pm, set the greeting string to "Good afternoon"
} else if (hour < 18) {
message = this.language.afternoon;
}
}
if (custom === 'false') {
name = name.replace(',', '');
}
// Events
message = this.doEvents(now, message);
// Birthday
const birth = new Date(localStorage.getItem('birthday'));
if (localStorage.getItem('birthdayenabled') === 'true' && birth.getDate() === now.getDate() && birth.getMonth() === now.getMonth()) {
if (localStorage.getItem('birthdayage')) {
const text = this.language.birthday.split(' ');
message = `${text[0]} ${dtf.nth(this.calculateAge(birth))} ${text[1]}`;
} else {
message = this.language.birthday;
const custom = localStorage.getItem('defaultGreetingMessage');
if (custom === 'false') {
message = '';
}
}
// Set the state to the greeting string
this.setState({
greeting: `${message}${name}`
});
// Name
let name = '';
const data = localStorage.getItem('greetingName');
if (typeof data === 'string') {
if (data.replace(/\s/g, '').length > 0) {
name = `, ${data.trim()}`;
}
}
if (custom === 'false') {
name = name.replace(',', '');
}
// Birthday
const birth = new Date(localStorage.getItem('birthday'));
if (localStorage.getItem('birthdayenabled') === 'true' && birth.getDate() === now.getDate() && birth.getMonth() === now.getMonth()) {
if (localStorage.getItem('birthdayage')) {
const text = this.language.birthday.split(' ');
message = `${text[0]} ${dtf.nth(this.calculateAge(birth))} ${text[1]}`;
} else {
message = this.language.birthday;
}
}
// Set the state to the greeting string
this.setState({
greeting: `${message}${name}`
});
this.getGreeting();
}, time);
}
componentDidMount() {
this.getGreeting();
this.getGreeting(0);
}
render() {

102
src/components/widgets/time/Clock.jsx
View File

@@ -21,69 +21,63 @@ export default class Clock extends React.PureComponent {
const timeType = localStorage.getItem('timeType');
// Percentage
if (timeType === 'percentageComplete') {
return this.setState({
time: (now.getHours() / 24).toFixed(2).replace('0.', '') + '%'
});
}
// Analog clock
if (timeType === 'analogue') {
// load analog clock css
require('react-clock/dist/Clock.css');
this.setState({
time: now
});
} else {
// Default clock
let time, sec = '';
const zero = localStorage.getItem('zero');
if (localStorage.getItem('seconds') === 'true') {
if (zero === 'false') {
sec = ':' + now.getSeconds();
} else {
sec = `:${('00' + now.getSeconds()).slice(-2)}`;
}
}
if (localStorage.getItem('24hour') === 'true') {
if (zero === 'false') {
time = `${now.getHours()}:${now.getMinutes()}${sec}`;
} else {
time = `${('00' + now.getHours()).slice(-2)}:${('00' + now.getMinutes()).slice(-2)}${sec}`;
}
switch (timeType) {
case 'percentageComplete':
this.setState({
time: (now.getHours() / 24).toFixed(2).replace('0.', '') + '%'
});
break;
case 'analogue':
// load analog clock css
require('react-clock/dist/Clock.css');
this.setState({
time: time
time: now
});
} else {
// 12 hour support
let hours = now.getHours();
break;
default:
// Default clock
let time, sec = '';
const zero = localStorage.getItem('zero');
if (hours > 12) {
hours -= 12;
if (localStorage.getItem('seconds') === 'true') {
if (zero === 'false') {
sec = ':' + now.getSeconds();
} else {
sec = `:${('00' + now.getSeconds()).slice(-2)}`;
}
}
// Toggle AM/PM
let ampm = now.getHours() > 11 ? 'PM' : 'AM';
if (localStorage.getItem('ampm') === 'false') {
ampm = '';
}
if (localStorage.getItem('timeformat') === 'twentyfourhour') {
if (zero === 'false') {
time = `${now.getHours()}:${('00' + now.getMinutes()).slice(-2)}${sec}`;
} else {
time = `${('00' + now.getHours()).slice(-2)}:${('00' + now.getMinutes()).slice(-2)}${sec}`;
}
if (zero === 'false') {
time = `${hours}:${now.getMinutes()}${sec}`;
this.setState({
time: time
});
} else {
time = `${('00' + hours).slice(-2)}:${('00' + now.getMinutes()).slice(-2)}${sec}`;
}
// 12 hour
let hours = now.getHours();
this.setState({
time: time,
ampm: ampm
});
}
if (hours > 12) {
hours -= 12;
}
if (zero === 'false') {
time = `${hours}:${now.getMinutes()}${sec}`;
} else {
time = `${('00' + hours).slice(-2)}:${('00' + now.getMinutes()).slice(-2)}${sec}`;
}
this.setState({
time: time,
ampm: now.getHours() > 11 ? 'PM' : 'AM'
});
}
break;
}
this.startTime();