From 7327382497bf14eed68a9fc78e3a89e717ede251 Mon Sep 17 00:00:00 2001 From: David Ralph Date: Fri, 7 May 2021 13:27:28 +0100 Subject: [PATCH] feat: widget zoom for weather and fixes --- src/components/modals/main/settings/sections/About.jsx | 6 ++---- src/components/modals/main/settings/sections/Quote.jsx | 1 + src/components/modals/main/settings/sections/Weather.jsx | 3 +++ src/components/widgets/quote/Quote.jsx | 4 +--- src/components/widgets/weather/Weather.jsx | 5 +++++ src/modules/default_settings.json | 4 ++++ 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/components/modals/main/settings/sections/About.jsx b/src/components/modals/main/settings/sections/About.jsx index f9889ba9..f5c691cb 100644 --- a/src/components/modals/main/settings/sections/About.jsx +++ b/src/components/modals/main/settings/sections/About.jsx @@ -16,7 +16,7 @@ export default class About extends React.PureComponent { contributors: [], sponsors: [], other_contributors: [], - photographers: [], + photographers: window.language.modals.main.loading, update: window.language.modals.main.settings.sections.about.version.checking_update, loading: window.language.modals.main.loading }; @@ -54,7 +54,6 @@ export default class About extends React.PureComponent { updateMsg = `${this.language.version.update_available}: ${newVersion}`; } - this.setState({ contributors: contributors.filter((contributor) => !contributor.login.includes('bot')), sponsors: sponsors, @@ -103,7 +102,7 @@ export default class About extends React.PureComponent {

{this.language.resources_used.title}

Pexels, Unsplash ({this.language.resources_used.bg_images})

Google Fonts ({this.language.resources_used.pin_icon})

-

Undraw ({this.language.resources_used.welcome_img})

+

Undraw ({this.language.resources_used.welcome_img})

{this.language.contributors}

{this.state.loading}

@@ -128,7 +127,6 @@ export default class About extends React.PureComponent { ))}

{this.language.photographers}

-

{this.state.loading}

{this.state.photographers}

); diff --git a/src/components/modals/main/settings/sections/Quote.jsx b/src/components/modals/main/settings/sections/Quote.jsx index 2b3b48f4..434143dc 100644 --- a/src/components/modals/main/settings/sections/Quote.jsx +++ b/src/components/modals/main/settings/sections/Quote.jsx @@ -34,6 +34,7 @@ export default class QuoteSettings extends React.PureComponent { switch (this.state.quoteType) { case 'custom': quoteSettings = customSettings; break; + default: break; } return ( diff --git a/src/components/modals/main/settings/sections/Weather.jsx b/src/components/modals/main/settings/sections/Weather.jsx index 43d3aa2a..f6c303bc 100644 --- a/src/components/modals/main/settings/sections/Weather.jsx +++ b/src/components/modals/main/settings/sections/Weather.jsx @@ -3,6 +3,7 @@ import React from 'react'; import Switch from '../Switch'; import Radio from '../Radio'; import Checkbox from '../Checkbox'; +import Slider from '../Slider'; export default class TimeSettings extends React.PureComponent { constructor() { @@ -71,6 +72,8 @@ export default class TimeSettings extends React.PureComponent {
+ +

{language.extra_info.title}

diff --git a/src/components/widgets/quote/Quote.jsx b/src/components/widgets/quote/Quote.jsx index 4f5704bd..346a87c2 100644 --- a/src/components/widgets/quote/Quote.jsx +++ b/src/components/widgets/quote/Quote.jsx @@ -59,7 +59,7 @@ export default class Quote extends React.PureComponent { return this.setState({ quote: favouriteQuote.split(' - ')[0], author: favouriteQuote.split(' - ')[1], - authorlink: this.getAuthorLink(data.author) + authorlink: this.getAuthorLink(favouriteQuote.split(' - ')[1]) }); } @@ -132,8 +132,6 @@ export default class Quote extends React.PureComponent { return this.doOffline(); } - console.log(this.getAuthorLink(data.author)) - this.setState({ quote: '"' + data.quote + '"', author: data.author, diff --git a/src/components/widgets/weather/Weather.jsx b/src/components/widgets/weather/Weather.jsx index a1d1e536..d39e3260 100644 --- a/src/components/widgets/weather/Weather.jsx +++ b/src/components/widgets/weather/Weather.jsx @@ -110,15 +110,20 @@ export default class Weather extends React.PureComponent { original_temp_max: data.main.temp_max } }); + + document.querySelector('.weather svg').style.fontSize = `${0.95 * Number((localStorage.getItem('zoomWeather') || 100) / 100)}em`; } componentDidMount() { EventBus.on('refresh', (data) => { if (data === 'weather') { this.getWeather(); + document.querySelector('.weather').style.fontSize = `${Number((localStorage.getItem('zoomWeather') || 100) / 100)}em`; + document.querySelector('.weather svg').style.fontSize = `${0.95 * Number((localStorage.getItem('zoomWeather') || 100) / 100)}em`; } }); + document.querySelector('.weather').style.fontSize = `${Number((localStorage.getItem('zoomWeather') || 100) / 100)}em`; this.getWeather(); } diff --git a/src/modules/default_settings.json b/src/modules/default_settings.json index 82b3afc3..a27748a6 100644 --- a/src/modules/default_settings.json +++ b/src/modules/default_settings.json @@ -210,5 +210,9 @@ { "name": "quoteType", "value": "api" + }, + { + "name": "backgroundFilter", + "value": "grayscale" } ]