fix: search dropdown, missing translations, overview date

2022-11-06 12:40:33 +00:00 · 2022-11-06 12:40:33 +00:00 · 4da82dd820
parent 333aabde1b
commit 4da82dd820
15 changed files with 63 additions and 28 deletions
--- a/src/components/modals/main/settings/sections/Overview.jsx
+++ b/src/components/modals/main/settings/sections/Overview.jsx
@ -106,6 +106,12 @@ export default class OrderSettings extends PureComponent {

  async getNews() {
    const data = await (await fetch('https://api.muetab.com/news')).json();
+    data.news.date = new window.Date(data.news.date).toLocaleDateString(variables.languagecode.replace('_', '-'), {
+      year: 'numeric',
+      month: 'long',
+      day: 'numeric',
+    });
+    
    this.setState({
      news: data.news,
      newsDone: true,
--- a/src/components/modals/main/settings/sections/QuickLinks.jsx
+++ b/src/components/modals/main/settings/sections/QuickLinks.jsx
@ -213,7 +213,12 @@ export default class QuickLinks extends PureComponent {
            category="quicklinks"
          />
        </SettingsItem>
-        <SettingsItem title="Quick Links Styling" description="Customise Quick Links Appearance.">
+        <SettingsItem
+          title={variables.getMessage('modals.main.settings.sections.quicklinks.styling')}
+          description={variables.getMessage(
+            'modals.main.settings.sections.quicklinks.styling_description',
+          )}
+        >
          <Dropdown label="Style" name="quickLinksStyle" category="other">
            <option value="icon">
              {variables.getMessage('modals.main.settings.sections.quicklinks.options.icon')}
@ -227,7 +232,11 @@ export default class QuickLinks extends PureComponent {
          </Dropdown>
        </SettingsItem>

-        <SettingsItem title="Quick Links" subtitle="" final={true}>
+        <SettingsItem
+          title={variables.getMessage('modals.main.settings.sections.quicklinks.title')}
+          subtitle=""
+          final={true}
+        >
          <button onClick={() => this.setState({ showAddModal: true })}>
            {variables.getMessage('modals.main.settings.sections.quicklinks.add_link')}{' '}
            <MdAddLink />
--- a/src/components/widgets/search/Search.jsx
+++ b/src/components/widgets/search/Search.jsx
@ -19,7 +19,7 @@ export default class Search extends PureComponent {
      query: '',
      microphone: null,
      suggestions: [],
-      searchDropdown: true,
+      searchDropdown: false,
      classList:
        localStorage.getItem('widgetStyle') === 'legacy' ? 'searchIcons old' : 'searchIcons',
    };
@ -108,12 +108,6 @@ export default class Search extends PureComponent {
    });
  }

-  toggleDropdown() {
-    this.setState({
-      searchDropdown: this.state.searchDropdown === 'hidden' ? 'visible' : 'hidden',
-    });
-  }
-
  setSearch(name, custom) {
    let url;
    let query = 'q';
@ -134,7 +128,7 @@ export default class Search extends PureComponent {
      url,
      query,
      currentSearch: name,
-      searchDropdown: 'hidden',
+      searchDropdown: false,
    });
  }

@ -170,10 +164,10 @@ export default class Search extends PureComponent {
          <div className={this.state.classList}>
            {localStorage.getItem('searchDropdown') === 'true' ? (
              <Tooltip title={variables.getMessage('widgets.search')}>
-                <button>
-                  <MdScreenSearchDesktop
-                    onClick={() => this.setState({ searchDropdown: !this.state.searchDropdown })}
-                  />
+                <button
+                  onClick={() => this.setState({ searchDropdown: !this.state.searchDropdown })}
+                >
+                  <MdScreenSearchDesktop />
                </button>
              </Tooltip>
            ) : (
@ -204,13 +198,17 @@ export default class Search extends PureComponent {
          {localStorage.getItem('searchDropdown') === 'true' &&
          this.state.searchDropdown === true ? (
            <div className="searchDropdown">
-              {searchEngines.map(({ name }) => {
+              {searchEngines.map(({ name }, key) => {
                if (name === this.state.currentSearch) {
                  return null;
                }

                return (
-                  <span className="searchDropdownList" onClick={() => this.setSearch(name)}>
+                  <span
+                    className="searchDropdownList"
+                    onClick={() => this.setSearch(name)}
+                    key={key}
+                  >
                    {name}
                  </span>
                );
--- a/src/components/widgets/weather/Weather.jsx
+++ b/src/components/widgets/weather/Weather.jsx
@ -77,7 +77,7 @@ export default class Weather extends PureComponent {
      done: true,
    });

-    document.querySelector('.tweather svg').style.fontSize = zoomWeather;
+    document.querySelector('.top-weather svg').style.fontSize = zoomWeather;
  }

  componentDidMount() {
--- a/src/translations/de_DE.json
+++ b/src/translations/de_DE.json
@ -313,7 +313,9 @@
              "icon": "Icon",
              "text_only": "Text Only",
              "metro": "Metro"
-            }
+            },
+            "styling": "Quick Links Styling",
+            "styling_description": "Customise Quick Links appearance"
          },
          "message": {
            "title": "Message",
--- a/src/translations/en_GB.json
+++ b/src/translations/en_GB.json
@ -307,7 +307,9 @@
              "icon": "Icon",
              "text_only": "Text Only",
              "metro": "Metro"
-            }
+            },
+            "styling": "Quick Links Styling",
+            "styling_description": "Customise Quick Links appearance"
          },
          "message": {
            "title": "Message",
--- a/src/translations/en_US.json
+++ b/src/translations/en_US.json
@ -313,7 +313,9 @@
              "icon": "Icon",
              "text_only": "Text Only",
              "metro": "Metro"
-            }
+            },
+            "styling": "Quick Links Styling",
+            "styling_description": "Customise Quick Links appearance"
          },
          "message": {
            "title": "Message",
--- a/src/translations/es.json
+++ b/src/translations/es.json
@ -313,7 +313,9 @@
              "icon": "Icon",
              "text_only": "Text Only",
              "metro": "Metro"
-            }
+            },
+            "styling": "Quick Links Styling",
+            "styling_description": "Customise Quick Links appearance"
          },
          "message": {
            "title": "Mensaje",
--- a/src/translations/fr.json
+++ b/src/translations/fr.json
@ -313,7 +313,9 @@
              "icon": "Icon",
              "text_only": "Text Only",
              "metro": "Metro"
-            }
+            },
+            "styling": "Quick Links Styling",
+            "styling_description": "Customise Quick Links appearance"
          },
          "message": {
            "title": "Message",
--- a/src/translations/id_ID.json
+++ b/src/translations/id_ID.json
@ -313,7 +313,9 @@
              "icon": "Icon",
              "text_only": "Text Only",
              "metro": "Metro"
-            }
+            },
+            "styling": "Quick Links Styling",
+            "styling_description": "Customise Quick Links appearance"
          },
          "message": {
            "title": "Pesan",
--- a/src/translations/nl.json
+++ b/src/translations/nl.json
@ -313,7 +313,9 @@
              "icon": "Icon",
              "text_only": "Text Only",
              "metro": "Metro"
-            }
+            },
+            "styling": "Quick Links Styling",
+            "styling_description": "Customise Quick Links appearance"
          },
          "message": {
            "title": "Message",
--- a/src/translations/no.json
+++ b/src/translations/no.json
@ -313,7 +313,9 @@
              "icon": "Icon",
              "text_only": "Text Only",
              "metro": "Metro"
-            }
+            },
+            "styling": "Quick Links Styling",
+            "styling_description": "Customise Quick Links appearance"
          },
          "message": {
            "title": "Message",
--- a/src/translations/ru.json
+++ b/src/translations/ru.json
@ -313,7 +313,9 @@
              "icon": "Icon",
              "text_only": "Text Only",
              "metro": "Metro"
-            }
+            },
+            "styling": "Quick Links Styling",
+            "styling_description": "Customise Quick Links appearance"
          },
          "message": {
            "title": "Message",
--- a/src/translations/tr_TR.json
+++ b/src/translations/tr_TR.json
@ -313,7 +313,9 @@
              "icon": "Icon",
              "text_only": "Text Only",
              "metro": "Metro"
-            }
+            },
+            "styling": "Quick Links Styling",
+            "styling_description": "Customise Quick Links appearance"
          },
          "message": {
            "title": "Mesaj",
--- a/src/translations/zh_CN.json
+++ b/src/translations/zh_CN.json
@ -313,7 +313,9 @@
              "icon": "Icon",
              "text_only": "Text Only",
              "metro": "Metro"
-            }
+            },
+            "styling": "Quick Links Styling",
+            "styling_description": "Customise Quick Links appearance"
          },
          "message": {
            "title": "消息",