diff --git a/.commitlintrc.json b/.commitlintrc.json index 6c46f071..c30e5a97 100644 --- a/.commitlintrc.json +++ b/.commitlintrc.json @@ -1,3 +1,3 @@ { - "extends": ["@commitlint/config-conventional"] -} \ No newline at end of file + "extends": ["@commitlint/config-conventional"] +} diff --git a/manifest/chrome.json b/manifest/chrome.json index bfbe1bff..12815b26 100644 --- a/manifest/chrome.json +++ b/manifest/chrome.json @@ -20,4 +20,4 @@ "background": { "service_worker": "background-chrome.js" } -} \ No newline at end of file +} diff --git a/src/components/helpers/carousel/Carousel.jsx b/src/components/helpers/carousel/Carousel.jsx index 66b9b84a..2ff9d8f3 100644 --- a/src/components/helpers/carousel/Carousel.jsx +++ b/src/components/helpers/carousel/Carousel.jsx @@ -53,10 +53,7 @@ function EmblaCarousel({ data }) { {data.map((photo, index) => (
- Marketplace example screenshot + Marketplace example screenshot
))} @@ -80,4 +77,4 @@ function EmblaCarousel({ data }) { ); } -export default memo(EmblaCarousel); \ No newline at end of file +export default memo(EmblaCarousel); diff --git a/src/components/helpers/carousel/carousel.scss b/src/components/helpers/carousel/carousel.scss index a2ae65c1..21d25f45 100644 --- a/src/components/helpers/carousel/carousel.scss +++ b/src/components/helpers/carousel/carousel.scss @@ -48,7 +48,6 @@ height: 190px; } - .carousel_button { outline: 0; cursor: pointer; @@ -75,4 +74,4 @@ &.next { right: 27px; } -} \ No newline at end of file +} diff --git a/src/components/helpers/notification/notification.jsx b/src/components/helpers/notification/notification.jsx index 1dd40ac3..a94fb5d4 100644 --- a/src/components/helpers/notification/notification.jsx +++ b/src/components/helpers/notification/notification.jsx @@ -15,4 +15,4 @@ function Notification(props) { ); } -export default memo(Notification); \ No newline at end of file +export default memo(Notification); diff --git a/src/components/helpers/preview/Preview.jsx b/src/components/helpers/preview/Preview.jsx index 64780bc0..e5789d8a 100644 --- a/src/components/helpers/preview/Preview.jsx +++ b/src/components/helpers/preview/Preview.jsx @@ -14,4 +14,4 @@ function Preview(props) { ); } -export default memo(Preview); \ No newline at end of file +export default memo(Preview); diff --git a/src/components/helpers/sharemodal/ShareModal.jsx b/src/components/helpers/sharemodal/ShareModal.jsx index 82ccbfed..d199eab4 100644 --- a/src/components/helpers/sharemodal/ShareModal.jsx +++ b/src/components/helpers/sharemodal/ShareModal.jsx @@ -113,4 +113,4 @@ function ShareModal({ modalClose, data }) { ); } -export default memo(ShareModal); \ No newline at end of file +export default memo(ShareModal); diff --git a/src/components/helpers/tooltip/Tooltip.jsx b/src/components/helpers/tooltip/Tooltip.jsx index 8434e5fa..2a4f6283 100644 --- a/src/components/helpers/tooltip/Tooltip.jsx +++ b/src/components/helpers/tooltip/Tooltip.jsx @@ -33,11 +33,11 @@ function Tooltip({ children, title, style, placement, subtitle }) { className="tooltipTitle" > {title} - {subtitle} + {subtitle} )} ); } -export default memo(Tooltip); \ No newline at end of file +export default memo(Tooltip); diff --git a/src/components/helpers/tooltip/infoTooltip.jsx b/src/components/helpers/tooltip/infoTooltip.jsx index e741be64..02dad8f7 100644 --- a/src/components/helpers/tooltip/infoTooltip.jsx +++ b/src/components/helpers/tooltip/infoTooltip.jsx @@ -44,4 +44,4 @@ function InfoTooltip({ title, style, placement, subtitle }) { ); } -export default memo(InfoTooltip); \ No newline at end of file +export default memo(InfoTooltip); diff --git a/src/components/modals/main/Main.jsx b/src/components/modals/main/Main.jsx index bad02eef..151e8ea6 100644 --- a/src/components/modals/main/Main.jsx +++ b/src/components/modals/main/Main.jsx @@ -69,4 +69,4 @@ function MainModal({ modalClose }) { ); } -export default memo(MainModal); \ No newline at end of file +export default memo(MainModal); diff --git a/src/components/modals/main/marketplace/Item.jsx b/src/components/modals/main/marketplace/Item.jsx index 53e779bd..9255e7fe 100644 --- a/src/components/modals/main/marketplace/Item.jsx +++ b/src/components/modals/main/marketplace/Item.jsx @@ -142,11 +142,13 @@ export default class Item extends PureComponent { this.incrementCount()}> {this.state.count !== this.props.data.data.quotes.length ? ( <> - {variables.getMessage('modals.main.marketplace.product.show_all')} + {' '} + {variables.getMessage('modals.main.marketplace.product.show_all')} ) : ( <> - {variables.getMessage('modals.main.marketplace.product.show_less')} + {' '} + {variables.getMessage('modals.main.marketplace.product.show_less')} )} @@ -253,7 +255,10 @@ export default class Item extends PureComponent { - + {this.state.showNotes && ( (?.+)<\/a>/i)?.groups.name || 'Unknown'; + const photographer = + metadata.Attribution.value || + metadata.Artist?.value.match(/(?.+)<\/a>/i)?.groups.name || + 'Unknown'; authorimglicense = `© ${photographer}. ${license.value}`; - authorimglicense = authorimglicense.replace(/copyright\s/i, '').replace(/©\s©\s/, '© '); + authorimglicense = authorimglicense.replace(/copyright\s/i, '').replace(/©\s©\s/, '© '); if (license.value === 'Public domain') { authorimglicense = null; @@ -196,7 +201,6 @@ export default class Quote extends PureComponent { customQuote = customQuote ? customQuote[Math.floor(Math.random() * customQuote.length)] : null; - if (customQuote !== undefined) { return this.setState({ @@ -204,11 +208,11 @@ export default class Quote extends PureComponent { author: customQuote.author, authorlink: this.getAuthorLink(customQuote.author), authorimg: await this.getAuthorImg(customQuote.author), - noQuote: false + noQuote: false, }); } else { this.setState({ - noQuote: true + noQuote: true, }); } break; @@ -335,29 +339,29 @@ export default class Quote extends PureComponent { } componentDidMount() { - const test = localStorage.getItem('quotechange') + const test = localStorage.getItem('quotechange'); this.interval = setInterval(() => { - if (test !== null ) { - const targetTime = Number( - Number(localStorage.getItem('quoteStartTime')) + - Number(localStorage.getItem('quotechange')), - ); - const currentTime = Number(Date.now()); - if (currentTime >= targetTime) { - this.setZoom(); - this.getQuote(); - localStorage.setItem('quoteStartTime', Date.now()); - } else { - console.log(localStorage.getItem('quotechange')); - try { - this.setState(JSON.parse(localStorage.getItem('currentQuote'))); - } catch (e) { + if (test !== null) { + const targetTime = Number( + Number(localStorage.getItem('quoteStartTime')) + + Number(localStorage.getItem('quotechange')), + ); + const currentTime = Number(Date.now()); + if (currentTime >= targetTime) { this.setZoom(); this.getQuote(); + localStorage.setItem('quoteStartTime', Date.now()); + } else { + console.log(localStorage.getItem('quotechange')); + try { + this.setState(JSON.parse(localStorage.getItem('currentQuote'))); + } catch (e) { + this.setZoom(); + this.getQuote(); + } } } - } }); EventBus.on('refresh', (data) => { @@ -387,7 +391,10 @@ export default class Quote extends PureComponent { } }); - if (localStorage.getItem('quotechange') === 'refresh' || (localStorage.getItem('quotechange')) === null ) { + if ( + localStorage.getItem('quotechange') === 'refresh' || + localStorage.getItem('quotechange') === null + ) { this.setZoom(); this.getQuote(); localStorage.setItem('quoteStartTime', Date.now()); @@ -421,7 +428,7 @@ export default class Quote extends PureComponent { {this.state.quote} - + {localStorage.getItem('widgetStyle') === 'legacy' ? ( <>
diff --git a/src/components/widgets/search/Search.jsx b/src/components/widgets/search/Search.jsx index 1595e0ba..10775066 100644 --- a/src/components/widgets/search/Search.jsx +++ b/src/components/widgets/search/Search.jsx @@ -110,7 +110,7 @@ export default class Search extends PureComponent { toggleDropdown() { this.setState({ - searchDropdown: (this.state.searchDropdown === 'hidden') ? 'visible' : 'hidden', + searchDropdown: this.state.searchDropdown === 'hidden' ? 'visible' : 'hidden', }); } @@ -171,7 +171,9 @@ export default class Search extends PureComponent { {localStorage.getItem('searchDropdown') === 'true' ? ( ) : ( @@ -199,7 +201,8 @@ export default class Search extends PureComponent {
- {localStorage.getItem('searchDropdown') === 'true' && this.state.searchDropdown === true ? ( + {localStorage.getItem('searchDropdown') === 'true' && + this.state.searchDropdown === true ? (
{searchEngines.map(({ name }) => { if (name === this.state.currentSearch) { diff --git a/src/components/widgets/time/Clock.jsx b/src/components/widgets/time/Clock.jsx index 80d9ec66..23942455 100644 --- a/src/components/widgets/time/Clock.jsx +++ b/src/components/widgets/time/Clock.jsx @@ -164,7 +164,7 @@ export default class Clock extends PureComponent { m/s{' '} {enabled('windDirection') ? ( - + ) : null} @@ -110,4 +107,4 @@ function Expanded({ state, weatherType, variables }) { ); } -export default memo(Expanded); \ No newline at end of file +export default memo(Expanded); diff --git a/src/components/widgets/weather/Weather.jsx b/src/components/widgets/weather/Weather.jsx index 6ebd860e..914f8d76 100644 --- a/src/components/widgets/weather/Weather.jsx +++ b/src/components/widgets/weather/Weather.jsx @@ -72,9 +72,9 @@ export default class Weather extends PureComponent { wind_degrees: data.wind.deg, cloudiness: data.clouds.all, visibility: data.visibility, - pressure: data.main.pressure + pressure: data.main.pressure, }, - done: true + done: true, }); document.querySelector('.tweather svg').style.fontSize = zoomWeather; @@ -108,7 +108,7 @@ export default class Weather extends PureComponent {
); } - + return (
@@ -135,7 +135,9 @@ export default class Weather extends PureComponent { {this.state.location}
)} - {weatherType >= 3 ? : null} + {weatherType >= 3 ? ( + + ) : null}
); } diff --git a/src/components/widgets/weather/WeatherIcon.jsx b/src/components/widgets/weather/WeatherIcon.jsx index dca9db05..51bcf303 100644 --- a/src/components/widgets/weather/WeatherIcon.jsx +++ b/src/components/widgets/weather/WeatherIcon.jsx @@ -19,21 +19,21 @@ function WeatherIcon({ name }) { // name is the openweathermap icon name, see https://openweathermap.org/weather-conditions switch (name) { case '01d': - return ; + return ; case '01n': - return ; + return ; case '02d': return ; case '02n': - return ; + return ; case '03d': case '03n': - return ; + return ; case '04d': case '04n': - return ; + return ; case '09d': - return ; + return ; case '09n': return ; case '10d': @@ -53,4 +53,4 @@ function WeatherIcon({ name }) { } } -export default memo(WeatherIcon); \ No newline at end of file +export default memo(WeatherIcon); diff --git a/src/components/widgets/weather/WindDirectionIcon.jsx b/src/components/widgets/weather/WindDirectionIcon.jsx index 2a91dbc5..6758f643 100644 --- a/src/components/widgets/weather/WindDirectionIcon.jsx +++ b/src/components/widgets/weather/WindDirectionIcon.jsx @@ -1,4 +1,3 @@ - import { memo } from 'react'; import { @@ -50,4 +49,4 @@ function WindDirectionIcon({ degrees }) { } } -export default memo(WindDirectionIcon); \ No newline at end of file +export default memo(WindDirectionIcon); diff --git a/src/index.jsx b/src/index.jsx index 5f6db8f4..b1b11994 100644 --- a/src/index.jsx +++ b/src/index.jsx @@ -40,7 +40,8 @@ variables.language = new I18n(variables.languagecode, { tr_TR: translations.tr_TR, }); -variables.getMessage = (text, optional) => variables.language.getMessage(variables.languagecode, text, optional || {}); +variables.getMessage = (text, optional) => + variables.language.getMessage(variables.languagecode, text, optional || {}); // set html language tag if (variables.languagecode !== 'en_GB' || variables.languagecode !== 'en_US') { @@ -57,7 +58,4 @@ Sentry.init({ autoSessionTracking: false, }); -render( - , - document.getElementById('root') -); +render(, document.getElementById('root')); diff --git a/src/translations/en_GB.json b/src/translations/en_GB.json index 48bed083..786c8a7e 100644 --- a/src/translations/en_GB.json +++ b/src/translations/en_GB.json @@ -693,4 +693,4 @@ "no_storage": "Not enough storage", "link_copied": "Link copied" } -} \ No newline at end of file +}