From ec9429adcbe17bdfb6072201c08c8304e9ed18ac Mon Sep 17 00:00:00 2001 From: David Ralph Date: Fri, 11 Sep 2020 20:46:00 +0100 Subject: [PATCH] some improvements --- src/components/modals/Addons.jsx | 2 +- src/components/widgets/Background.jsx | 6 +++--- src/components/widgets/Quote.jsx | 2 +- src/modules/marketplaceFunctions.js | 5 ++++- src/modules/settingsFunctions.js | 3 +++ src/scss/index.scss | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/components/modals/Addons.jsx b/src/components/modals/Addons.jsx index 367ac219..13f87956 100644 --- a/src/components/modals/Addons.jsx +++ b/src/components/modals/Addons.jsx @@ -85,7 +85,7 @@ export default class Addons extends React.PureComponent { - + ; } return
diff --git a/src/components/widgets/Background.jsx b/src/components/widgets/Background.jsx index 523a615d..574ff56d 100644 --- a/src/components/widgets/Background.jsx +++ b/src/components/widgets/Background.jsx @@ -4,7 +4,7 @@ import * as Constants from '../../modules/constants'; export default class Background extends React.PureComponent { setBackground(url, colour, credit) { // Sets the attributes of the background image - const background = colour ? `background-color: ${colour};` : `background-image: url(${url});` + const background = colour ? `background-color: ${colour};` : `background-image: url(${url});`; document.querySelector('#backgroundImage').setAttribute( 'style', @@ -12,7 +12,7 @@ export default class Background extends React.PureComponent { -webkit-filter: blur(${localStorage.getItem('blur')}px); -webkit-filter: brightness(${localStorage.getItem('brightness')}%);` ); - + if (credit === 'false') document.querySelector('#credits').style.display = 'none'; // Hide the credit } @@ -26,7 +26,7 @@ export default class Background extends React.PureComponent { const photographer = photographers[Math.floor(Math.random() * photographers.length)]; // Select a random photographer from the keys const randomImage = offlineImages[photographer].photo[ Math.floor(Math.random() * offlineImages[photographer].photo.length) - ] // Select a random image + ]; // Select a random image const url = `../offline-images/${randomImage}.jpeg`; this.setBackground(url); diff --git a/src/components/widgets/Quote.jsx b/src/components/widgets/Quote.jsx index 086d8227..551e57ca 100644 --- a/src/components/widgets/Quote.jsx +++ b/src/components/widgets/Quote.jsx @@ -57,7 +57,7 @@ export default class Quote extends React.PureComponent { } render() { - let copy = this.copyQuote() }>; + let copy = this.copyQuote()}>; if (localStorage.getItem('copyButton') === 'false') copy = ''; return ( diff --git a/src/modules/marketplaceFunctions.js b/src/modules/marketplaceFunctions.js index b87872b4..5d9904b0 100644 --- a/src/modules/marketplaceFunctions.js +++ b/src/modules/marketplaceFunctions.js @@ -1,3 +1,5 @@ +import { toast } from 'react-toastify'; + export default class MarketplaceFunctions { static urlParser (input) { // based on https://stackoverflow.com/questions/37684/how-to-replace-plain-urls-with-links let urlPattern = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()!@:%_+.~#?&//=]*)/; @@ -29,7 +31,8 @@ export default class MarketplaceFunctions { localStorage.removeItem(type); uninstallStuff(); } catch (e) { - console.log('invalid'); + toast('Failed to uninstall addon, check the console'); + console.error(e); } } } diff --git a/src/modules/settingsFunctions.js b/src/modules/settingsFunctions.js index c0595734..62bfcbf0 100644 --- a/src/modules/settingsFunctions.js +++ b/src/modules/settingsFunctions.js @@ -76,12 +76,15 @@ export default class SettingsFunctions { switch(detectBrowserLanguage()) { case 'nl': localStorage.setItem('language', 'nl'); + document.documentElement.lang = 'nl'; break; case 'no': localStorage.setItem('language', 'no'); + document.documentElement.lang = 'no'; break; case 'fr': localStorage.setItem('language', 'fr'); + document.documentElement.lang = 'fr'; break; default: localStorage.setItem('language', 'en'); diff --git a/src/scss/index.scss b/src/scss/index.scss index ffdc4d67..91f2c550 100644 --- a/src/scss/index.scss +++ b/src/scss/index.scss @@ -80,7 +80,7 @@ body { } .backgroundEffects { - opacity: .7; + opacity: 0.7; transition: ease 0.6s; }