From 3a47089a00c2552e5721a6c0ebefa6073a4453fa Mon Sep 17 00:00:00 2001 From: David Ralph Date: Thu, 15 Jul 2021 17:39:38 +0100 Subject: [PATCH] fix: welcome start, marketplace item page is now responsive, update text etc --- .../modals/main/marketplace/Item.jsx | 4 ++- .../modals/main/scss/marketplace/_main.scss | 10 +++++++ .../modals/main/settings/sections/About.jsx | 28 ++++++++++--------- .../modals/welcome/WelcomeSections.jsx | 7 +++-- src/modules/constants.js | 13 +++++++++ src/translations/de_DE.json | 6 ++-- src/translations/en_GB.json | 6 ++-- src/translations/en_US.json | 6 ++-- src/translations/es.json | 6 ++-- src/translations/fr.json | 6 ++-- src/translations/nl.json | 6 ++-- src/translations/no.json | 6 ++-- src/translations/ru.json | 6 ++-- src/translations/zh_CN.json | 6 ++-- 14 files changed, 81 insertions(+), 35 deletions(-) diff --git a/src/components/modals/main/marketplace/Item.jsx b/src/components/modals/main/marketplace/Item.jsx index fea79615..119c5b02 100644 --- a/src/components/modals/main/marketplace/Item.jsx +++ b/src/components/modals/main/marketplace/Item.jsx @@ -61,7 +61,9 @@ export default class Item extends React.PureComponent {
{warningHTML} -

+
+

+

{language.overview}

diff --git a/src/components/modals/main/scss/marketplace/_main.scss b/src/components/modals/main/scss/marketplace/_main.scss index 5be925ab..ea7cd20e 100644 --- a/src/components/modals/main/scss/marketplace/_main.scss +++ b/src/components/modals/main/scss/marketplace/_main.scss @@ -89,6 +89,16 @@ } } +@media only screen and (max-width: 1680px) { + .side { + float: none !important; + } + + .sidebr { + display: none; + } +} + p.author { margin-top: -5px; } diff --git a/src/components/modals/main/settings/sections/About.jsx b/src/components/modals/main/settings/sections/About.jsx index 74d61783..820c3296 100644 --- a/src/components/modals/main/settings/sections/About.jsx +++ b/src/components/modals/main/settings/sections/About.jsx @@ -28,9 +28,9 @@ export default class About extends React.PureComponent { let contributors, sponsors, photographers, versionData; try { - versionData = await (await fetch(window.constants.GITHUB_URL + '/repos/mue/mue/releases', { signal: this.controller.signal })).json(); + versionData = await (await fetch(window.constants.GITHUB_URL + '/repos/' + window.constants.REPO_NAME + '/releases', { signal: this.controller.signal })).json(); - contributors = await (await fetch(window.constants.GITHUB_URL + '/repos/mue/mue/contributors', { signal: this.controller.signal })).json(); + contributors = await (await fetch(window.constants.GITHUB_URL + '/repos/' + window.constants.REPO_NAME + '/contributors', { signal: this.controller.signal })).json(); sponsors = (await (await fetch(window.constants.SPONSORS_URL + '/list', { signal: this.controller.signal })).json()).sponsors; photographers = await (await fetch(window.constants.API_URL + '/images/photographers', { signal: this.controller.signal })).json(); @@ -57,6 +57,7 @@ export default class About extends React.PureComponent { } this.setState({ + // exclude bots contributors: contributors.filter((contributor) => !contributor.login.includes('bot')), sponsors: sponsors, update: updateMsg, @@ -87,22 +88,23 @@ export default class About extends React.PureComponent { return ( <>

{this.language.title}

- Mue logo -

{this.language.copyright} 2018-{new Date().getFullYear()} The Mue Authors (BSD-3 License)

+ Logo +

{this.language.copyright} {window.constants.COPYRIGHT_YEAR}-{new Date().getFullYear()} {window.constants.COPYRIGHT_NAME} ({window.constants.COPYRIGHT_LICENSE})

{this.language.version.title} {window.constants.VERSION} ({this.state.update})

+ {window.language.modals.welcome.sections.privacy.links.privacy_policy}

{this.language.contact_us}

- - - - - + + + + +

{this.language.support_mue}

- GitHub Sponsors -   •  Ko-Fi -   •  Patreon + GitHub Sponsors +   •  Ko-Fi +   •  Patreon

{this.language.resources_used.title}

@@ -131,7 +133,7 @@ export default class About extends React.PureComponent {

{this.state.loading}

{this.state.sponsors.map((item) => ( - {item.handle} + {item.handle} ))} diff --git a/src/components/modals/welcome/WelcomeSections.jsx b/src/components/modals/welcome/WelcomeSections.jsx index 1281b0ed..7f091630 100644 --- a/src/components/modals/welcome/WelcomeSections.jsx +++ b/src/components/modals/welcome/WelcomeSections.jsx @@ -97,6 +97,7 @@ export default class WelcomeSections extends React.PureComponent { if (this.props.currentTab !== 0) { if (this.timeout) { clearTimeout(this.timeout); + this.timeout = null; } } else { if (!this.timeout) { @@ -115,7 +116,7 @@ export default class WelcomeSections extends React.PureComponent {

{language.sections.intro.description}

#shareyourmue

- example mue setup + Example Mue setup
); @@ -178,7 +179,7 @@ export default class WelcomeSections extends React.PureComponent {

{language.sections.privacy.offline_mode_description}

{language.sections.privacy.links.title}

- {language.sections.privacy.links.privacy_policy} + {language.sections.privacy.links.privacy_policy} ); @@ -191,7 +192,7 @@ export default class WelcomeSections extends React.PureComponent {
this.props.switchTab(1)}>{languageSettings.title}: {languages.find((i) => i.value === localStorage.getItem('language')).name}
this.props.switchTab(3)}>{appearance.theme.title}: {this.getSetting('theme')}
- {(this.state.importedSettings.length !== 0) ?
this.props.switchTab(2)}>Imported {this.state.importedSettings.length} settings
: null} + {(this.state.importedSettings.length !== 0) ?
this.props.switchTab(2)}>{language.sections.final.imported} {this.state.importedSettings.length} {language.sections.final.settings}
: null}
); diff --git a/src/modules/constants.js b/src/modules/constants.js index e9b1804d..f2a42777 100644 --- a/src/modules/constants.js +++ b/src/modules/constants.js @@ -10,9 +10,22 @@ export const DDG_IMAGE_PROXY = 'https://external-content.duckduckgo.com/iu/?u='; // Mue URLs export const WEBSITE_URL = 'https://muetab.com'; +export const PRIVACY_URL = 'https://muetab.com/privacy'; export const BLOG_POST = 'https://blog.muetab.com/posts/version-5-1'; export const FEEDBACK_FORM = 'https://api.formcake.com/api/form/349b56cb-7e2b-4004-b32b-e8964d217dd1/submission'; +// Mue Info +export const REPO_NAME = 'mue/mue'; +export const EMAIL = 'hello@muetab.com'; +export const TWITTER_HANDLE = 'getmue'; +export const INSTAGRAM_HANDLE = 'mue.tab'; +export const FACEBOOK_HANDLE = 'muetab'; +export const DISCORD_SERVER = 'https://discord.gg/zv8C9F8'; +export const COPYRIGHT_NAME = 'The Mue Authors'; +export const COPYRIGHT_YEAR = '2018'; +export const COPYRIGHT_LICENSE = 'BSD-3 License'; +export const DONATE_USERNAME = 'davidjcralph'; + // umami export const UMAMI_DOMAIN = 'https://umami.muetab.com'; export const UMAMI_ID = '1b97e723-199c-48d8-8992-17c4e22d4f3c'; diff --git a/src/translations/de_DE.json b/src/translations/de_DE.json index 7d1a9d8a..1dad90c7 100644 --- a/src/translations/de_DE.json +++ b/src/translations/de_DE.json @@ -384,7 +384,7 @@ }, "language": { "title": "Choose your language", - "description": "to be added" + "description": "Mue can be displayed the languages listed below. You can also add new translations on our GitHub!" }, "theme": { "title": "Select a theme", @@ -409,7 +409,9 @@ "title": "Final step", "description": "Your Mue Tab experience is about to begin.", "changes": "Changes", - "changes_description": "To change settings later click on the settings icon in the top right corner of your tab." + "changes_description": "To change settings later click on the settings icon in the top right corner of your tab.", + "imported": "Imported", + "settings": "settings" } }, "buttons": { diff --git a/src/translations/en_GB.json b/src/translations/en_GB.json index bd44398a..3e221e38 100644 --- a/src/translations/en_GB.json +++ b/src/translations/en_GB.json @@ -384,7 +384,7 @@ }, "language": { "title": "Choose your language", - "description": "to be added" + "description": "Mue can be displayed the languages listed below. You can also add new translations on our GitHub!" }, "theme": { "title": "Select a theme", @@ -409,7 +409,9 @@ "title": "Final step", "description": "Your Mue Tab experience is about to begin.", "changes": "Changes", - "changes_description": "To change settings later click on the settings icon in the top right corner of your tab." + "changes_description": "To change settings later click on the settings icon in the top right corner of your tab.", + "imported": "Imported", + "settings": "settings" } }, "buttons": { diff --git a/src/translations/en_US.json b/src/translations/en_US.json index f13cf31c..a3654c8d 100644 --- a/src/translations/en_US.json +++ b/src/translations/en_US.json @@ -384,7 +384,7 @@ }, "language": { "title": "Choose your language", - "description": "to be added" + "description": "Mue can be displayed the languages listed below. You can also add new translations on our GitHub!" }, "theme": { "title": "Select a theme", @@ -409,7 +409,9 @@ "title": "Final step", "description": "Your Mue Tab experience is about to begin.", "changes": "Changes", - "changes_description": "To change settings later click on the settings icon in the top right corner of your tab." + "changes_description": "To change settings later click on the settings icon in the top right corner of your tab.", + "imported": "Imported", + "settings": "settings" } }, "buttons": { diff --git a/src/translations/es.json b/src/translations/es.json index f49febdb..97a6cfdd 100644 --- a/src/translations/es.json +++ b/src/translations/es.json @@ -384,7 +384,7 @@ }, "language": { "title": "Choose your language", - "description": "to be added" + "description": "Mue can be displayed the languages listed below. You can also add new translations on our GitHub!" }, "theme": { "title": "Select a theme", @@ -409,7 +409,9 @@ "title": "Final step", "description": "Your Mue Tab experience is about to begin.", "changes": "Changes", - "changes_description": "To change settings later click on the settings icon in the top right corner of your tab." + "changes_description": "To change settings later click on the settings icon in the top right corner of your tab.", + "imported": "Imported", + "settings": "settings" } }, "buttons": { diff --git a/src/translations/fr.json b/src/translations/fr.json index cfeef7c5..ca9ca533 100644 --- a/src/translations/fr.json +++ b/src/translations/fr.json @@ -384,7 +384,7 @@ }, "language": { "title": "Choose your language", - "description": "to be added" + "description": "Mue can be displayed the languages listed below. You can also add new translations on our GitHub!" }, "theme": { "title": "Select a theme", @@ -409,7 +409,9 @@ "title": "Final step", "description": "Your Mue Tab experience is about to begin.", "changes": "Changes", - "changes_description": "To change settings later click on the settings icon in the top right corner of your tab." + "changes_description": "To change settings later click on the settings icon in the top right corner of your tab.", + "imported": "Imported", + "settings": "settings" } }, "buttons": { diff --git a/src/translations/nl.json b/src/translations/nl.json index d03118c8..156bb47c 100644 --- a/src/translations/nl.json +++ b/src/translations/nl.json @@ -384,7 +384,7 @@ }, "language": { "title": "Choose your language", - "description": "to be added" + "description": "Mue can be displayed the languages listed below. You can also add new translations on our GitHub!" }, "theme": { "title": "Select a theme", @@ -409,7 +409,9 @@ "title": "Final step", "description": "Your Mue Tab experience is about to begin.", "changes": "Changes", - "changes_description": "To change settings later click on the settings icon in the top right corner of your tab." + "changes_description": "To change settings later click on the settings icon in the top right corner of your tab.", + "imported": "Imported", + "settings": "settings" } }, "buttons": { diff --git a/src/translations/no.json b/src/translations/no.json index d957c493..4f4fd090 100644 --- a/src/translations/no.json +++ b/src/translations/no.json @@ -384,7 +384,7 @@ }, "language": { "title": "Choose your language", - "description": "to be added" + "description": "Mue can be displayed the languages listed below. You can also add new translations on our GitHub!" }, "theme": { "title": "Select a theme", @@ -409,7 +409,9 @@ "title": "Final step", "description": "Your Mue Tab experience is about to begin.", "changes": "Changes", - "changes_description": "To change settings later click on the settings icon in the top right corner of your tab." + "changes_description": "To change settings later click on the settings icon in the top right corner of your tab.", + "imported": "Imported", + "settings": "settings" } }, "buttons": { diff --git a/src/translations/ru.json b/src/translations/ru.json index c68108d7..a73495ce 100644 --- a/src/translations/ru.json +++ b/src/translations/ru.json @@ -384,7 +384,7 @@ }, "language": { "title": "Choose your language", - "description": "to be added" + "description": "Mue can be displayed the languages listed below. You can also add new translations on our GitHub!" }, "theme": { "title": "Select a theme", @@ -409,7 +409,9 @@ "title": "Final step", "description": "Your Mue Tab experience is about to begin.", "changes": "Changes", - "changes_description": "To change settings later click on the settings icon in the top right corner of your tab." + "changes_description": "To change settings later click on the settings icon in the top right corner of your tab.", + "imported": "Imported", + "settings": "settings" } }, "buttons": { diff --git a/src/translations/zh_CN.json b/src/translations/zh_CN.json index 7f782fc0..4fb30859 100644 --- a/src/translations/zh_CN.json +++ b/src/translations/zh_CN.json @@ -384,7 +384,7 @@ }, "language": { "title": "Choose your language", - "description": "to be added" + "description": "Mue can be displayed the languages listed below. You can also add new translations on our GitHub!" }, "theme": { "title": "Select a theme", @@ -409,7 +409,9 @@ "title": "Final step", "description": "Your Mue Tab experience is about to begin.", "changes": "Changes", - "changes_description": "To change settings later click on the settings icon in the top right corner of your tab." + "changes_description": "To change settings later click on the settings icon in the top right corner of your tab.", + "imported": "Imported", + "settings": "settings" } }, "buttons": {