refactor: cleanup

This commit is contained in:
David Ralph
2021-08-15 22:28:37 +01:00
parent 5e4a14ba2c
commit 4f5233fab9
44 changed files with 133 additions and 234 deletions

View File

@@ -1,11 +1,11 @@
// todo: rewrite this mess
import { PureComponent } from 'react';
import PhotoInformation from './PhotoInformation';
import EventBus from '../../../modules/helpers/eventbus';
import Interval from '../../../modules/helpers/interval';
import PhotoInformation from './PhotoInformation';
import './scss/index.scss';
export default class Background extends PureComponent {

View File

@@ -1,14 +1,12 @@
import { PureComponent } from 'react';
import { Star, StarBorder } from '@material-ui/icons';
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 PureComponent {
buttons = {
favourited: <StarIcon onClick={() => this.favourite()} className='topicons' />,
unfavourited: <StarIcon2 onClick={() => this.favourite()} className='topicons' />
favourited: <Star onClick={() => this.favourite()} className='topicons' />,
unfavourited: <StarBorder onClick={() => this.favourite()} className='topicons' />
}
constructor() {

View File

@@ -1,9 +1,8 @@
import { PureComponent } from 'react';
import { Fullscreen } from '@material-ui/icons';
import Tooltip from '../../helpers/tooltip/Tooltip';
import FullscreenIcon from '@material-ui/icons/Fullscreen';
export default class Maximise extends PureComponent {
constructor() {
super();
@@ -57,7 +56,7 @@ export default class Maximise extends PureComponent {
render() {
return (
<Tooltip title={window.language.modals.main.settings.sections.background.buttons.view}>
<FullscreenIcon onClick={this.maximise} className='topicons' />
<Fullscreen onClick={this.maximise} className='topicons' />
</Tooltip>
);
}

View File

@@ -1,11 +1,5 @@
import { useState } from 'react';
import Info from '@material-ui/icons/Info';
import Location from '@material-ui/icons/LocationOn';
import Camera from '@material-ui/icons/PhotoCamera';
import Resolution from '@material-ui/icons/Crop';
import Photographer from '@material-ui/icons/Person';
import Download from '@material-ui/icons/GetApp';
import { Info, LocationOn, PhotoCamera, Crop as Resolution, Person as Photographer, GetApp as Download } from '@material-ui/icons';
const toDataURL = async (url) => {
const res = await fetch(url);
@@ -68,9 +62,9 @@ export default function PhotoInformation(props) {
<Info className='infoIcon'/>
<h1>{language.information}</h1>
<hr/>
<Location/>
<LocationOn/>
<span id='infoLocation'>{props.info.location || 'N/A'}</span>
<Camera/>
<PhotoCamera/>
<span id='infoCamera'>{props.info.camera || 'N/A'}</span>
<Resolution/>
<span id='infoResolution'>{width}x{height}</span>