mirror of
https://github.com/mue/mue.git
synced 2026-07-10 22:14:39 +02:00
fix: author loading before quote
- Make author div not load if quote is empty - photoinformation taking too much of the screen - more transitions and consistent transitions - running prettier across all files Co-authored-by: David Ralph <me@davidcralph.co.uk>
This commit is contained in:
@@ -1,67 +1,64 @@
|
||||
import { PureComponent, Fragment, Suspense, lazy } from "react";
|
||||
import { PureComponent, Fragment, Suspense, lazy } from 'react';
|
||||
|
||||
import Clock from "./time/Clock";
|
||||
import Greeting from "./greeting/Greeting";
|
||||
import Quote from "./quote/Quote";
|
||||
import Search from "./search/Search";
|
||||
import QuickLinks from "./quicklinks/QuickLinks";
|
||||
import Date from "./time/Date";
|
||||
import Message from "./message/Message";
|
||||
import Reminder from "./reminder/Reminder";
|
||||
import Clock from './time/Clock';
|
||||
import Greeting from './greeting/Greeting';
|
||||
import Quote from './quote/Quote';
|
||||
import Search from './search/Search';
|
||||
import QuickLinks from './quicklinks/QuickLinks';
|
||||
import Date from './time/Date';
|
||||
import Message from './message/Message';
|
||||
import Reminder from './reminder/Reminder';
|
||||
|
||||
import EventBus from "modules/helpers/eventbus";
|
||||
import EventBus from 'modules/helpers/eventbus';
|
||||
|
||||
const Weather = lazy(() => import("./weather/Weather"));
|
||||
const Weather = lazy(() => import('./weather/Weather'));
|
||||
const renderLoader = () => <></>;
|
||||
|
||||
export default class Widgets extends PureComponent {
|
||||
online = localStorage.getItem("offlineMode") === "false";
|
||||
online = localStorage.getItem('offlineMode') === 'false';
|
||||
constructor() {
|
||||
super();
|
||||
this.state = {
|
||||
order: JSON.parse(localStorage.getItem("order")),
|
||||
welcome: localStorage.getItem("showWelcome"),
|
||||
order: JSON.parse(localStorage.getItem('order')),
|
||||
welcome: localStorage.getItem('showWelcome'),
|
||||
};
|
||||
// widgets we can re-order
|
||||
this.widgets = {
|
||||
time: this.enabled("time") ? <Clock /> : null,
|
||||
greeting: this.enabled("greeting") ? <Greeting /> : null,
|
||||
quote: this.enabled("quote") ? <Quote /> : null,
|
||||
date: this.enabled("date") ? <Date /> : null,
|
||||
quicklinks:
|
||||
this.enabled("quicklinksenabled") && this.online ? (
|
||||
<QuickLinks />
|
||||
) : null,
|
||||
message: this.enabled("message") ? <Message /> : null,
|
||||
reminder: this.enabled("reminder") ? <Reminder /> : null,
|
||||
time: this.enabled('time') ? <Clock /> : null,
|
||||
greeting: this.enabled('greeting') ? <Greeting /> : null,
|
||||
quote: this.enabled('quote') ? <Quote /> : null,
|
||||
date: this.enabled('date') ? <Date /> : null,
|
||||
quicklinks: this.enabled('quicklinksenabled') && this.online ? <QuickLinks /> : null,
|
||||
message: this.enabled('message') ? <Message /> : null,
|
||||
reminder: this.enabled('reminder') ? <Reminder /> : null,
|
||||
};
|
||||
}
|
||||
|
||||
enabled(key) {
|
||||
return localStorage.getItem(key) === "true";
|
||||
return localStorage.getItem(key) === 'true';
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
EventBus.on("refresh", (data) => {
|
||||
if (data === "widgets") {
|
||||
EventBus.on('refresh', (data) => {
|
||||
if (data === 'widgets') {
|
||||
this.setState({
|
||||
order: JSON.parse(localStorage.getItem("order")),
|
||||
order: JSON.parse(localStorage.getItem('order')),
|
||||
});
|
||||
}
|
||||
|
||||
if (data === "widgetsWelcome") {
|
||||
if (data === 'widgetsWelcome') {
|
||||
this.setState({
|
||||
welcome: localStorage.getItem("showWelcome"),
|
||||
welcome: localStorage.getItem('showWelcome'),
|
||||
});
|
||||
localStorage.setItem("showWelcome", true);
|
||||
localStorage.setItem('showWelcome', true);
|
||||
window.onbeforeunload = () => {
|
||||
localStorage.clear();
|
||||
};
|
||||
}
|
||||
|
||||
if (data === "widgetsWelcomeDone") {
|
||||
if (data === 'widgetsWelcomeDone') {
|
||||
this.setState({
|
||||
welcome: localStorage.getItem("showWelcome"),
|
||||
welcome: localStorage.getItem('showWelcome'),
|
||||
});
|
||||
window.onbeforeunload = null;
|
||||
}
|
||||
@@ -70,7 +67,7 @@ export default class Widgets extends PureComponent {
|
||||
|
||||
render() {
|
||||
// don't show when welcome is there
|
||||
if (this.state.welcome !== "false") {
|
||||
if (this.state.welcome !== 'false') {
|
||||
return <div id="widgets"></div>;
|
||||
}
|
||||
|
||||
@@ -79,9 +76,7 @@ export default class Widgets extends PureComponent {
|
||||
|
||||
if (this.state.order) {
|
||||
this.state.order.forEach((element) => {
|
||||
elements.push(
|
||||
<Fragment key={element}>{this.widgets[element]}</Fragment>
|
||||
);
|
||||
elements.push(<Fragment key={element}>{this.widgets[element]}</Fragment>);
|
||||
});
|
||||
} else {
|
||||
// prevent error
|
||||
@@ -99,9 +94,9 @@ export default class Widgets extends PureComponent {
|
||||
return (
|
||||
<div id="widgets">
|
||||
<Suspense fallback={renderLoader()}>
|
||||
{this.enabled("searchBar") ? <Search /> : null}
|
||||
{this.enabled('searchBar') ? <Search /> : null}
|
||||
{elements}
|
||||
{this.enabled("weatherEnabled") && this.online ? <Weather /> : null}
|
||||
{this.enabled('weatherEnabled') && this.online ? <Weather /> : null}
|
||||
</Suspense>
|
||||
</div>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user