refactor: imports etc

This commit is contained in:
David Ralph
2021-08-14 20:10:48 +01:00
parent 1a8bb69288
commit 39751736ca
55 changed files with 403 additions and 423 deletions

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { PureComponent, Fragment, Suspense, lazy } from 'react';
import EventBus from '../../modules/helpers/eventbus';
@@ -9,10 +9,10 @@ import Search from './search/Search';
import QuickLinks from './quicklinks/QuickLinks';
import Date from './time/Date';
const Weather = React.lazy(() => import('./weather/Weather'));
const Weather = lazy(() => import('./weather/Weather'));
const renderLoader = () => <></>;
export default class Widgets extends React.PureComponent {
export default class Widgets extends PureComponent {
constructor() {
super();
this.state = {
@@ -53,7 +53,7 @@ export default class Widgets extends React.PureComponent {
if (this.state.order) {
this.state.order.forEach((element) => {
elements.push(<React.Fragment key={element}>{this.widgets[element]}</React.Fragment>);
elements.push(<Fragment key={element}>{this.widgets[element]}</Fragment>);
});
} else {
// prevent error
@@ -62,11 +62,11 @@ export default class Widgets extends React.PureComponent {
return (
<div id='widgets'>
<React.Suspense fallback={renderLoader()}>
<Suspense fallback={renderLoader()}>
{this.enabled('searchBar') ? <Search/> : null}
{elements}
{this.enabled('weatherEnabled') && (localStorage.getItem('offlineMode') === 'false') ? <Weather/> : null}
</React.Suspense>
</Suspense>
</div>
);
}

View File

@@ -1,11 +1,11 @@
import React from 'react';
import { PureComponent } from 'react';
import Tooltip from '../../helpers/tooltip/Tooltip';
import StarIcon from '@material-ui/icons/Star';
import StarIcon2 from '@material-ui/icons/StarBorder';
export default class Favourite extends React.PureComponent {
export default class Favourite extends PureComponent {
buttons = {
favourited: <StarIcon onClick={() => this.favourite()} className='topicons' />,
unfavourited: <StarIcon2 onClick={() => this.favourite()} className='topicons' />

View File

@@ -1,10 +1,10 @@
import React from 'react';
import { PureComponent } from 'react';
import Tooltip from '../../helpers/tooltip/Tooltip';
import FullscreenIcon from '@material-ui/icons/Fullscreen';
export default class Maximise extends React.PureComponent {
export default class Maximise extends PureComponent {
constructor() {
super();
this.state = {

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { useState } from 'react';
import Info from '@material-ui/icons/Info';
import Location from '@material-ui/icons/LocationOn';
@@ -24,8 +24,8 @@ const downloadImage = async (info) => {
};
export default function PhotoInformation(props) {
const [width, setWidth] = React.useState(0);
const [height, setHeight] = React.useState(0);
const [width, setWidth] = useState(0);
const [height, setHeight] = useState(0);
const language = window.language.widgets.background;

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { PureComponent } from 'react';
import { utcToZonedTime } from 'date-fns-tz';
import EventBus from '../../../modules/helpers/eventbus';
@@ -7,7 +7,7 @@ import dtf from '../../../modules/helpers/date';
import './greeting.scss';
export default class Greeting extends React.PureComponent {
export default class Greeting extends PureComponent {
constructor() {
super();
this.state = {

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { PureComponent } from 'react';
import RefreshIcon from '@material-ui/icons/RefreshRounded';
import Gear from '@material-ui/icons/SettingsRounded';
@@ -14,7 +14,7 @@ import EventBus from '../../../modules/helpers/eventbus';
import './scss/index.scss';
export default class Navbar extends React.PureComponent {
export default class Navbar extends PureComponent {
componentDidMount() {
EventBus.on('refresh', (data) => {
if (data === 'navbar') {

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { PureComponent } from 'react';
import TextareaAutosize from '@material-ui/core/TextareaAutosize';
@@ -8,7 +8,7 @@ import Pin from '@material-ui/icons/PushPin';
import { toast } from 'react-toastify';
export default class Notes extends React.PureComponent {
export default class Notes extends PureComponent {
constructor() {
super();
this.state = {

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { PureComponent } from 'react';
import EventBus from '../../../modules/helpers/eventbus';
@@ -7,7 +7,7 @@ import TextareaAutosize from '@material-ui/core/TextareaAutosize';
import './quicklinks.scss';
export default class QuickLinks extends React.PureComponent {
export default class QuickLinks extends PureComponent {
constructor() {
super();
this.state = {

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { PureComponent } from 'react';
import EventBus from '../../../modules/helpers/eventbus';
import Interval from '../../../modules/helpers/interval';
@@ -12,7 +12,7 @@ import { toast } from 'react-toastify';
import './quote.scss';
export default class Quote extends React.PureComponent {
export default class Quote extends PureComponent {
buttons = {
tweet: <TwitterIcon className='copyButton' onClick={() => this.tweetQuote()} />,
copy: <FileCopy className='copyButton' onClick={() => this.copyQuote()} />,

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { PureComponent } from 'react';
import EventBus from '../../../modules/helpers/eventbus';
@@ -12,7 +12,7 @@ import './search.scss';
const searchEngines = require('./search_engines.json');
const autocompleteProviders = require('./autocomplete_providers.json');
export default class Search extends React.PureComponent {
export default class Search extends PureComponent {
constructor() {
super();
this.state = {

View File

@@ -1,14 +1,14 @@
import React from 'react';
import { PureComponent, Suspense, lazy } from 'react';
import { utcToZonedTime } from 'date-fns-tz';
import EventBus from '../../../modules/helpers/eventbus';
import './clock.scss';
const Analog = React.lazy(() => import('react-clock'));
const Analog = lazy(() => import('react-clock'));
const renderLoader = () => <></>;
export default class Clock extends React.PureComponent {
export default class Clock extends PureComponent {
constructor() {
super();
@@ -123,7 +123,7 @@ export default class Clock extends React.PureComponent {
if (localStorage.getItem('timeType') === 'analogue') {
clockHTML = (
<React.Suspense fallback={renderLoader()}>
<Suspense fallback={renderLoader()}>
<Analog
className='analogclock clock-container'
value={this.state.time}
@@ -133,7 +133,7 @@ export default class Clock extends React.PureComponent {
renderMinuteHand={enabled('minuteHand')}
renderHourHand={enabled('hourHand')}
/>
</React.Suspense>
</Suspense>
);
}

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { PureComponent } from 'react';
import { utcToZonedTime } from 'date-fns-tz';
import EventBus from '../../../modules/helpers/eventbus';
@@ -7,7 +7,7 @@ import dtf from '../../../modules/helpers/date';
import './date.scss';
export default class DateWidget extends React.PureComponent {
export default class DateWidget extends PureComponent {
constructor() {
super();
this.state = {

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { PureComponent } from 'react';
import EventBus from '../../../modules/helpers/eventbus';
@@ -8,7 +8,7 @@ import { WiHumidity, WiWindy, WiBarometer, WiCloud } from 'weather-icons-react';
import './weather.scss';
export default class Weather extends React.PureComponent {
export default class Weather extends PureComponent {
constructor() {
super();
this.state = {