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

fix: favourite button, optimise widgets and remove dependency

Browse Source
This commit is contained in:
David Ralph
2021-08-16 12:21:37 +01:00
parent 23251d248b
commit 4d3c7cbbe6
10 changed files with 56 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
import { PureComponent, Suspense, lazy } from 'react';
import { utcToZonedTime } from 'date-fns-tz';
import { convertTimezone } from '../../../modules/helpers/date';
import EventBus from '../../../modules/helpers/eventbus';
import './clock.scss';
@@ -23,8 +23,8 @@ export default class Clock extends PureComponent {
this.timer = setTimeout(() => {
let now = new Date();
const timezone = localStorage.getItem('timezone');
if (timezone) {
now = utcToZonedTime(now, timezone);
if (timezone && timezone !== 'auto') {
now = convertTimezone(now, timezone);
}
switch (localStorage.getItem('timeType')) {

11
src/components/widgets/time/Date.jsx
View File

@@ -1,7 +1,6 @@
import { PureComponent } from 'react';
import { utcToZonedTime } from 'date-fns-tz';
import dtf from '../../../modules/helpers/date';
import { nth, convertTimezone } from '../../../modules/helpers/date';
import EventBus from '../../../modules/helpers/eventbus';
import './date.scss';
@@ -35,8 +34,8 @@ export default class DateWidget extends PureComponent {
getDate() {
let date = new Date();
const timezone = localStorage.getItem('timezone');
if (timezone) {
date = utcToZonedTime(date, timezone);
if (timezone && timezone !== 'auto') {
date = convertTimezone(date, timezone);
}
if (localStorage.getItem('weeknumber') === 'true') {
@@ -97,13 +96,13 @@ export default class DateWidget extends PureComponent {
// Long date
const lang = window.languagecode.split('_')[0];
const nth = (localStorage.getItem('datenth') === 'true') ? dtf.nth(date.getDate()) : date.getDate();
const datenth = (localStorage.getItem('datenth') === 'true') ? nth(date.getDate()) : date.getDate();
const day = (localStorage.getItem('dayofweek') === 'true') ? date.toLocaleDateString(lang, { weekday: 'long' }) : '';
const month = date.toLocaleDateString(lang, { month: 'long' });
this.setState({
date: `${day} ${nth} ${month} ${date.getFullYear()}`
date: `${day} ${datenth} ${month} ${date.getFullYear()}`
});
}
}