-
{time.title}
-
-
this.changeType(value)}>
-
-
-
-
-
- {timeSettings}
-
-
{time.date.title}
-
+ let dateSettings;
+
+ const longSettings = (
+
-
+
+ );
+
+ const shortSettings = (
+
+
-
-
+
-
+
+
+ );
+
+ switch (this.state.dateType) {
+ case 'short': dateSettings = shortSettings; break;
+ case 'long': dateSettings = longSettings; break;
+ }
+
+ return (
+
+
{time.title}
+
+ this.setState({ timeType: value })}>
+
+
+
+
+ {timeSettings}
+
+ {time.date.title}
+
+ this.setState({ dateType: value })}>
+
+
+
+
+ {dateSettings}
);
}
diff --git a/src/components/widgets/time/Date.jsx b/src/components/widgets/time/Date.jsx
index 29e217f6..ef2e5bf7 100644
--- a/src/components/widgets/time/Date.jsx
+++ b/src/components/widgets/time/Date.jsx
@@ -12,9 +12,9 @@ export default class DateWidget extends React.PureComponent {
getDate() {
const date = new Date();
- const short = localStorage.getItem('short');
+ const type = localStorage.getItem('type');
- if (short === 'true') {
+ if (type === 'short') {
const dateDay = date.getDate();
const dateMonth = date.getMonth() + 1;
const dateYear = date.getFullYear();
@@ -56,7 +56,7 @@ export default class DateWidget extends React.PureComponent {
date: format
});
} else {
- // Full date
+ // Long date
const lang = localStorage.getItem('language');
const nth = (localStorage.getItem('datenth') === 'true') ? dtf.nth(date.getDate()) : date.getDate();
diff --git a/src/modules/default_settings.json b/src/modules/default_settings.json
index e850791c..50a8475f 100644
--- a/src/modules/default_settings.json
+++ b/src/modules/default_settings.json
@@ -130,5 +130,9 @@
{
"name": "order",
"value": "[\"greeting\", \"time\", \"quote\", \"date\"]"
+ },
+ {
+ "name": "theme",
+ "value": "auto"
}
]
diff --git a/src/modules/helpers/settings.js b/src/modules/helpers/settings.js
index 2d34ad5e..c77e1950 100644
--- a/src/modules/helpers/settings.js
+++ b/src/modules/helpers/settings.js
@@ -24,6 +24,7 @@ export default class SettingsFunctions {
for (const key of Object.keys(localStorage)) {
settings[key] = localStorage.getItem(key);
}
+
saveFile(settings, 'mue-settings.json');
}
@@ -48,13 +49,6 @@ export default class SettingsFunctions {
localStorage.clear();
defaultSettings.forEach((element) => localStorage.setItem(element.name, element.value));
- // Set theme depending on user preferred
- if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
- localStorage.setItem('theme', 'dark');
- } else {
- localStorage.setItem('theme', 'light');
- }
-
// Languages
const languageCodes = languages.map(({ code }) => code);
const browserLanguage = (navigator.languages && navigator.languages[0]) || navigator.language;
@@ -126,6 +120,11 @@ export default class SettingsFunctions {
const theme = localStorage.getItem('theme');
if (theme === 'dark') {
document.body.classList.add('dark');
+ } else if (theme === 'auto') {
+ // Set theme depending on user preferred
+ if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
+ document.body.classList.add('dark');
+ }
}
const tabName = localStorage.getItem('tabName');
@@ -147,7 +146,7 @@ export default class SettingsFunctions {
██ Copyright 2018-2021 Mue ██
██ GitHub: https://github.com/mue/mue ██
██ ██
- ██ Thank you for using! ██
+ ██ Thank you for using Mue! ██
██ Feedback: hello@muetab.com ██
█████████████████████████████████████████████████████████████
`);