diff --git a/src/components/modals/main/settings/sections/About.jsx b/src/components/modals/main/settings/sections/About.jsx
index 820c3296..8caea496 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/' + window.constants.REPO_NAME + '/releases', { signal: this.controller.signal })).json();
+ versionData = await (await fetch(window.constants.GITHUB_URL + '/repos/' + window.constants.ORG_NAME + '/' + window.constants.REPO_NAME + '/releases', { signal: this.controller.signal })).json();
- contributors = await (await fetch(window.constants.GITHUB_URL + '/repos/' + window.constants.REPO_NAME + '/contributors', { signal: this.controller.signal })).json();
+ contributors = await (await fetch(window.constants.GITHUB_URL + '/repos/'+ window.constants.ORG_NAME + '/' + 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();
@@ -89,7 +89,7 @@ export default class About extends React.PureComponent {
<>
{this.language.title}
- {this.language.copyright} {window.constants.COPYRIGHT_YEAR}-{new Date().getFullYear()} {window.constants.COPYRIGHT_NAME} ({window.constants.COPYRIGHT_LICENSE})
+ {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}
diff --git a/src/components/modals/welcome/WelcomeSections.jsx b/src/components/modals/welcome/WelcomeSections.jsx
index 28f4e2c4..06a851dc 100644
--- a/src/components/modals/welcome/WelcomeSections.jsx
+++ b/src/components/modals/welcome/WelcomeSections.jsx
@@ -129,7 +129,7 @@ export default class WelcomeSections extends React.PureComponent {
>
);
- const { appearance, advanced } = window.language.modals.main.settings.sections;
+ const { appearance, advanced, background, quicklinks } = window.language.modals.main.settings.sections;
const languageSettings = window.language.modals.main.settings.sections.language;
const theme = (
@@ -178,8 +178,13 @@ export default class WelcomeSections extends React.PureComponent {
{language.sections.privacy.description}
{language.sections.privacy.offline_mode_description}
+
+
+ {language.sections.privacy.ddg_proxy_description}
{language.sections.privacy.links.title}
{language.sections.privacy.links.privacy_policy}
+
+ {language.sections.privacy.links.source_code}
>
);
diff --git a/src/components/widgets/background/Background.jsx b/src/components/widgets/background/Background.jsx
index 7a845242..e19fc81e 100644
--- a/src/components/widgets/background/Background.jsx
+++ b/src/components/widgets/background/Background.jsx
@@ -1,4 +1,4 @@
-// warning: the code here is fairly messy and probably needs a rewrite
+// todo: rewrite this mess
import React from 'react';
import EventBus from '../../../modules/helpers/eventbus';
@@ -283,11 +283,6 @@ export default class Background extends React.PureComponent {
this.getBackground();
};
- const welcomeTab = localStorage.getItem('welcomeTab');
- if (welcomeTab) {
- return this.setState(JSON.parse(localStorage.getItem('welcomeImage')));
- }
-
EventBus.on('refresh', (data) => {
if (data === 'welcomeLanguage') {
localStorage.setItem('welcomeImage', JSON.stringify(this.state));
@@ -349,6 +344,10 @@ export default class Background extends React.PureComponent {
}
});
+ if (localStorage.getItem('welcomeTab')) {
+ return this.setState(JSON.parse(localStorage.getItem('welcomeImage')));
+ }
+
const interval = localStorage.getItem('backgroundchange');
if (interval && interval !== 'refresh') {
Interval(() => {
@@ -363,7 +362,9 @@ export default class Background extends React.PureComponent {
try {
this.setState(JSON.parse(localStorage.getItem('currentBackground')));
- } catch (e) { this.setBackground(); }
+ } catch (e) {
+ this.setBackground();
+ }
} else {
this.getBackground();
}
diff --git a/src/modules/constants.js b/src/modules/constants.js
index f3b5ddd2..c7eef005 100644
--- a/src/modules/constants.js
+++ b/src/modules/constants.js
@@ -15,7 +15,8 @@ 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 ORG_NAME = 'mue';
+export const REPO_NAME = 'mue';
export const EMAIL = 'hello@muetab.com';
export const TWITTER_HANDLE = 'getmue';
export const INSTAGRAM_HANDLE = 'mue.tab';
@@ -24,7 +25,7 @@ export const DISCORD_SERVER = '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';
+export const DONATE_USERNAME = 'davidjcralph'; // this only works if you use the same username for Patreon, GitHub and Ko-Fi
// umami
export const UMAMI_DOMAIN = 'https://umami.muetab.com';
diff --git a/src/translations/de_DE.json b/src/translations/de_DE.json
index 4b79479a..3f4574c8 100644
--- a/src/translations/de_DE.json
+++ b/src/translations/de_DE.json
@@ -412,9 +412,11 @@
"title": "Privacy Options",
"description": "Enable settings to further protect your privacy with Mue.",
"offline_mode_description": "Enabling offline mode will disable all requests to any service. This will result in online backgrounds, online quotes, marketplace, weather, quick links, change log and some about tab information to be disabled.",
+ "ddg_proxy_description": "You can make image requests go through DuckDuckGo if you wish. By default, API requests go through our open source servers and image requests go through the original server. Turning this off for quick links will get the icons from Google instead of DuckDuckGo. DuckDuckGo proxy is always enabled for the Marketplace.",
"links": {
"title": "Links",
- "privacy_policy": "Privacy Policy"
+ "privacy_policy": "Privacy Policy",
+ "source_code": "Source Code"
}
},
"final": {
diff --git a/src/translations/en_GB.json b/src/translations/en_GB.json
index 2f6ad4d0..0b2fe7ee 100644
--- a/src/translations/en_GB.json
+++ b/src/translations/en_GB.json
@@ -412,9 +412,11 @@
"title": "Privacy Options",
"description": "Enable settings to further protect your privacy with Mue.",
"offline_mode_description": "Enabling offline mode will disable all requests to any service. This will result in online backgrounds, online quotes, marketplace, weather, quick links, change log and some about tab information to be disabled.",
+ "ddg_proxy_description": "You can make image requests go through DuckDuckGo if you wish. By default, API requests go through our open source servers and image requests go through the original server. Turning this off for quick links will get the icons from Google instead of DuckDuckGo. DuckDuckGo proxy is always enabled for the Marketplace.",
"links": {
"title": "Links",
- "privacy_policy": "Privacy Policy"
+ "privacy_policy": "Privacy Policy",
+ "source_code": "Source Code"
}
},
"final": {
diff --git a/src/translations/en_US.json b/src/translations/en_US.json
index 5738d025..9254a80b 100644
--- a/src/translations/en_US.json
+++ b/src/translations/en_US.json
@@ -412,9 +412,11 @@
"title": "Privacy Options",
"description": "Enable settings to further protect your privacy with Mue.",
"offline_mode_description": "Enabling offline mode will disable all requests to any service. This will result in online backgrounds, online quotes, marketplace, weather, quick links, change log and some about tab information to be disabled.",
+ "ddg_proxy_description": "You can make image requests go through DuckDuckGo if you wish. By default, API requests go through our open source servers and image requests go through the original server. Turning this off for quick links will get the icons from Google instead of DuckDuckGo. DuckDuckGo proxy is always enabled for the Marketplace.",
"links": {
"title": "Links",
- "privacy_policy": "Privacy Policy"
+ "privacy_policy": "Privacy Policy",
+ "source_code": "Source Code"
}
},
"final": {
diff --git a/src/translations/es.json b/src/translations/es.json
index 599c276f..6547b874 100644
--- a/src/translations/es.json
+++ b/src/translations/es.json
@@ -412,9 +412,11 @@
"title": "Privacy Options",
"description": "Enable settings to further protect your privacy with Mue.",
"offline_mode_description": "Enabling offline mode will disable all requests to any service. This will result in online backgrounds, online quotes, marketplace, weather, quick links, change log and some about tab information to be disabled.",
+ "ddg_proxy_description": "You can make image requests go through DuckDuckGo if you wish. By default, API requests go through our open source servers and image requests go through the original server. Turning this off for quick links will get the icons from Google instead of DuckDuckGo. DuckDuckGo proxy is always enabled for the Marketplace.",
"links": {
"title": "Links",
- "privacy_policy": "Privacy Policy"
+ "privacy_policy": "Privacy Policy",
+ "source_code": "Source Code"
}
},
"final": {
diff --git a/src/translations/fr.json b/src/translations/fr.json
index fc8de8de..e33cb9ff 100644
--- a/src/translations/fr.json
+++ b/src/translations/fr.json
@@ -412,9 +412,11 @@
"title": "Privacy Options",
"description": "Enable settings to further protect your privacy with Mue.",
"offline_mode_description": "Enabling offline mode will disable all requests to any service. This will result in online backgrounds, online quotes, marketplace, weather, quick links, change log and some about tab information to be disabled.",
+ "ddg_proxy_description": "You can make image requests go through DuckDuckGo if you wish. By default, API requests go through our open source servers and image requests go through the original server. Turning this off for quick links will get the icons from Google instead of DuckDuckGo. DuckDuckGo proxy is always enabled for the Marketplace.",
"links": {
"title": "Links",
- "privacy_policy": "Privacy Policy"
+ "privacy_policy": "Privacy Policy",
+ "source_code": "Source Code"
}
},
"final": {
diff --git a/src/translations/nl.json b/src/translations/nl.json
index 3a959f3b..f3add711 100644
--- a/src/translations/nl.json
+++ b/src/translations/nl.json
@@ -412,9 +412,11 @@
"title": "Privacy Options",
"description": "Enable settings to further protect your privacy with Mue.",
"offline_mode_description": "Enabling offline mode will disable all requests to any service. This will result in online backgrounds, online quotes, marketplace, weather, quick links, change log and some about tab information to be disabled.",
+ "ddg_proxy_description": "You can make image requests go through DuckDuckGo if you wish. By default, API requests go through our open source servers and image requests go through the original server. Turning this off for quick links will get the icons from Google instead of DuckDuckGo. DuckDuckGo proxy is always enabled for the Marketplace.",
"links": {
"title": "Links",
- "privacy_policy": "Privacy Policy"
+ "privacy_policy": "Privacy Policy",
+ "source_code": "Source Code"
}
},
"final": {
diff --git a/src/translations/no.json b/src/translations/no.json
index 51c4e5c6..2cc989e8 100644
--- a/src/translations/no.json
+++ b/src/translations/no.json
@@ -412,9 +412,11 @@
"title": "Privacy Options",
"description": "Enable settings to further protect your privacy with Mue.",
"offline_mode_description": "Enabling offline mode will disable all requests to any service. This will result in online backgrounds, online quotes, marketplace, weather, quick links, change log and some about tab information to be disabled.",
+ "ddg_proxy_description": "You can make image requests go through DuckDuckGo if you wish. By default, API requests go through our open source servers and image requests go through the original server. Turning this off for quick links will get the icons from Google instead of DuckDuckGo. DuckDuckGo proxy is always enabled for the Marketplace.",
"links": {
"title": "Links",
- "privacy_policy": "Privacy Policy"
+ "privacy_policy": "Privacy Policy",
+ "source_code": "Source Code"
}
},
"final": {
diff --git a/src/translations/ru.json b/src/translations/ru.json
index 564ce660..e3d0003c 100644
--- a/src/translations/ru.json
+++ b/src/translations/ru.json
@@ -413,9 +413,11 @@
"title": "Privacy Options",
"description": "Enable settings to further protect your privacy with Mue.",
"offline_mode_description": "Enabling offline mode will disable all requests to any service. This will result in online backgrounds, online quotes, marketplace, weather, quick links, change log and some about tab information to be disabled.",
+ "ddg_proxy_description": "You can make image requests go through DuckDuckGo if you wish. By default, API requests go through our open source servers and image requests go through the original server. Turning this off for quick links will get the icons from Google instead of DuckDuckGo. DuckDuckGo proxy is always enabled for the Marketplace.",
"links": {
"title": "Links",
- "privacy_policy": "Privacy Policy"
+ "privacy_policy": "Privacy Policy",
+ "source_code": "Source Code"
}
},
"final": {
diff --git a/src/translations/zh_CN.json b/src/translations/zh_CN.json
index 743b8d16..d0008151 100644
--- a/src/translations/zh_CN.json
+++ b/src/translations/zh_CN.json
@@ -412,9 +412,11 @@
"title": "Privacy Options",
"description": "Enable settings to further protect your privacy with Mue.",
"offline_mode_description": "Enabling offline mode will disable all requests to any service. This will result in online backgrounds, online quotes, marketplace, weather, quick links, change log and some about tab information to be disabled.",
+ "ddg_proxy_description": "You can make image requests go through DuckDuckGo if you wish. By default, API requests go through our open source servers and image requests go through the original server. Turning this off for quick links will get the icons from Google instead of DuckDuckGo. DuckDuckGo proxy is always enabled for the Marketplace.",
"links": {
"title": "Links",
- "privacy_policy": "Privacy Policy"
+ "privacy_policy": "Privacy Policy",
+ "source_code": "Source Code"
}
},
"final": {