Bug fixes

This commit is contained in:
David Ralph
2020-10-16 13:15:10 +01:00
parent 52cc9cb579
commit a865cb87ef
9 changed files with 18 additions and 13 deletions

View File

@@ -29,7 +29,7 @@ export default class MainModal extends React.PureComponent {
switch (input) {
case 'addons':
this.setState({
tab: <Addons language={this.props.language.addons} marketplaceLanguage={this.props.language.marketplace} toastLanguage={this.props.toastLanguage}/>,
tab: <Addons language={this.props.language.addons} marketplaceLanguage={this.props.language.marketplace} toastLanguage={this.props.toastLanguage} openMarketplace={() => this.changeEnabled('marketplace')}/>,
addonsActive: 'active',
settingsActive: '',
marketplaceActive: ''

View File

@@ -2,6 +2,8 @@ import React from 'react';
export default class Items extends React.PureComponent {
render() {
if (this.props.items.length === 0) return null;
let seeMoreHTML;
if (this.props.seeMoreFunction) seeMoreHTML = <button className='addToMue seemore' onClick={this.props.seeMoreFunction}>{this.props.seeMoreTitle}</button>;

View File

@@ -4,7 +4,7 @@ export default class LanguageSettings extends React.PureComponent {
render() {
return (
<div className='section'>
<h4 htmlFor='language'>{this.props.language.language}</h4>
<h4 htmlFor='language' className='nodropdown'>{this.props.language.language}</h4>
<select className='select-css' name='language' id='language' onChange={() => localStorage.setItem('language', document.getElementById('language').value)}>
<option className='choices' value='en'>English</option>
<option className='choices' value='nl'>Nederlands</option>

View File

@@ -171,9 +171,9 @@ export default class Marketplace extends React.PureComponent {
<div>
<div id='marketplace'>
<div className='featured' style={{backgroundColor: this.state.featured.colour}}>
<p>{this.state.featured.title}</p>
<h1>{this.state.featured.name}</h1>
<button className='addToMue' onClick={() => window.location.href = this.state.featured.buttonLink}>{this.state.featured.buttonText}</button>
<p>{this.state.featured.title}</p>
<h1>{this.state.featured.name}</h1>
<button className='addToMue' onClick={() => window.location.href = this.state.featured.buttonLink}>{this.state.featured.buttonText}</button>
</div>
<Items
title={this.props.language.photo_packs}
@@ -193,12 +193,12 @@ export default class Marketplace extends React.PureComponent {
items={this.state.quote_packs.slice(0, 3)}
toggleFunction={(input) => this.toggle('item', 'quote_packs', input)}
seeMoreFunction={() => this.toggle('seemore', 'quote_packs')} />
<Items
{/* <Items
title={this.props.language.themes}
seeMoreTitle={this.props.language.see_more}
items={this.state.themes.slice(0, 3)}
toggleFunction={(input) => this.toggle('item', 'theme', input)}
seeMoreFunction={() => this.toggle('seemore', 'themes')} />
seeMoreFunction={() => this.toggle('seemore', 'themes')} /> */ }
</div>
<Item
button={this.state.button}

View File

@@ -65,8 +65,11 @@ export default class Clock extends React.PureComponent {
}
render() {
if (localStorage.getItem('time') === 'false') return null;
let clockHTML = <h1 className='clock'>{this.state.time}<span className='ampm'>{this.state.ampm}</span> </h1>;
if (localStorage.getItem('analog') === 'true') clockHTML = <Analog className='analogclock' value={this.state.time} renderHourMarks={false} renderMinuteMarks={false} />;
return clockHTML;
}
}

View File

@@ -28,7 +28,7 @@ export default class Favourite extends React.PureComponent {
}
render() {
if (localStorage.getItem('favouriteEnabled') === 'false') return null;
if (localStorage.getItem('favouriteEnabled') === 'false' || localStorage.getItem('background') === 'false') return null;
return <div className='favourite'>
{this.state.favourited}
</div>

View File

@@ -12,9 +12,7 @@ export default class View extends React.PureComponent {
setAttribute(blur, brightness) {
document.querySelector('#backgroundImage').setAttribute(
'style',
`background-image: url(${document.getElementById('backgroundImage').style.backgroundImage.replace('url("', '').replace('")', '')});
-webkit-filter: blur(${blur});
-webkit-filter: brightness(${brightness}%);`
`background-image: url(${document.getElementById('backgroundImage').style.backgroundImage.replace('url("', '').replace('")', '')}); -webkit-filter: blur(${blur}); -webkit-filter: brightness(${brightness}%);`
);
}
@@ -38,7 +36,7 @@ export default class View extends React.PureComponent {
}
render() {
if (localStorage.getItem('view') === 'false') return null;
if (localStorage.getItem('view') === 'false' || localStorage.getItem('background') === 'false') return null;
return <div className='view'>
<FullscreenIcon id='viewButton' onClick={() => this.viewStuff()} />
</div>

View File

@@ -97,6 +97,8 @@ export default class Quote extends React.PureComponent {
}
render() {
if (localStorage.getItem('quote') === 'false') return null;
let copy = <FileCopy className='copyButton' onClick={() => this.copyQuote()}></FileCopy>;
if (localStorage.getItem('copyButton') === 'false') copy = null;