From aa16b7cffa3b412f35c5d10d98d060fba2787e9b Mon Sep 17 00:00:00 2001 From: David Ralph Date: Thu, 15 Oct 2020 15:50:03 +0100 Subject: [PATCH] cleanup --- README.md | 4 +- public/offline-images/{1.jpeg => 1.jpg} | Bin public/offline-images/{10.jpeg => 10.jpg} | Bin public/offline-images/{11.jpeg => 11.jpg} | Bin public/offline-images/{12.jpeg => 12.jpg} | Bin public/offline-images/{13.jpeg => 13.jpg} | Bin public/offline-images/{14.jpeg => 14.jpg} | Bin public/offline-images/{15.jpeg => 15.jpg} | Bin public/offline-images/{16.jpeg => 16.jpg} | Bin public/offline-images/{17.jpeg => 17.jpg} | Bin public/offline-images/{18.jpeg => 18.jpg} | Bin public/offline-images/{19.jpeg => 19.jpg} | Bin public/offline-images/{2.jpeg => 2.jpg} | Bin public/offline-images/{20.jpeg => 20.jpg} | Bin public/offline-images/{3.jpeg => 3.jpg} | Bin public/offline-images/{4.jpeg => 4.jpg} | Bin public/offline-images/{5.jpeg => 5.jpg} | Bin public/offline-images/{6.jpeg => 6.jpg} | Bin public/offline-images/{7.jpeg => 7.jpg} | Bin public/offline-images/{8.jpeg => 8.jpg} | Bin public/offline-images/{9.jpeg => 9.jpg} | Bin src/App.jsx | 2 +- src/components/modals/settings/Section.jsx | 5 +- .../settings/sections/BackgroundSettings.jsx | 79 +++++++++--------- .../settings/sections/SearchSettings.jsx | 33 ++++---- src/components/modals/tabs/Settings.jsx | 28 +++---- src/components/widgets/Background.jsx | 7 +- src/components/widgets/Maximise.jsx | 1 + src/translations/en.json | 5 +- src/translations/fr.json | 2 +- src/translations/nl.json | 2 +- src/translations/no.json | 2 +- src/translations/ru.json | 2 +- 33 files changed, 88 insertions(+), 84 deletions(-) rename public/offline-images/{1.jpeg => 1.jpg} (100%) rename public/offline-images/{10.jpeg => 10.jpg} (100%) rename public/offline-images/{11.jpeg => 11.jpg} (100%) rename public/offline-images/{12.jpeg => 12.jpg} (100%) rename public/offline-images/{13.jpeg => 13.jpg} (100%) rename public/offline-images/{14.jpeg => 14.jpg} (100%) rename public/offline-images/{15.jpeg => 15.jpg} (100%) rename public/offline-images/{16.jpeg => 16.jpg} (100%) rename public/offline-images/{17.jpeg => 17.jpg} (100%) rename public/offline-images/{18.jpeg => 18.jpg} (100%) rename public/offline-images/{19.jpeg => 19.jpg} (100%) rename public/offline-images/{2.jpeg => 2.jpg} (100%) rename public/offline-images/{20.jpeg => 20.jpg} (100%) rename public/offline-images/{3.jpeg => 3.jpg} (100%) rename public/offline-images/{4.jpeg => 4.jpg} (100%) rename public/offline-images/{5.jpeg => 5.jpg} (100%) rename public/offline-images/{6.jpeg => 6.jpg} (100%) rename public/offline-images/{7.jpeg => 7.jpg} (100%) rename public/offline-images/{8.jpeg => 8.jpg} (100%) rename public/offline-images/{9.jpeg => 9.jpg} (100%) diff --git a/README.md b/README.md index f406b526..537a0c0f 100644 --- a/README.md +++ b/README.md @@ -132,11 +132,11 @@ Please see our [roadmap](https://github.com/mue/mue/projects/2) ### Translators [Wessel Tip](https://github.com/Wessel) - Dutch -[Alex Sparkes](https://github.com/alexsparkes) - French +[Alex Sparkes](https://github.com/alexsparkes), [Maxime](https://github.com/exiam) - French [Anders](https://github.com/FuryingFox) - Norwegian -[MrZillaGold](https://github.com/MrZillaGold) - Russian +[Pronin Egor](https://github.com/MrZillaGold) - Russian ### Other [Pexels](https://pexels.com) - Stock photos used for offline mode diff --git a/public/offline-images/1.jpeg b/public/offline-images/1.jpg similarity index 100% rename from public/offline-images/1.jpeg rename to public/offline-images/1.jpg diff --git a/public/offline-images/10.jpeg b/public/offline-images/10.jpg similarity index 100% rename from public/offline-images/10.jpeg rename to public/offline-images/10.jpg diff --git a/public/offline-images/11.jpeg b/public/offline-images/11.jpg similarity index 100% rename from public/offline-images/11.jpeg rename to public/offline-images/11.jpg diff --git a/public/offline-images/12.jpeg b/public/offline-images/12.jpg similarity index 100% rename from public/offline-images/12.jpeg rename to public/offline-images/12.jpg diff --git a/public/offline-images/13.jpeg b/public/offline-images/13.jpg similarity index 100% rename from public/offline-images/13.jpeg rename to public/offline-images/13.jpg diff --git a/public/offline-images/14.jpeg b/public/offline-images/14.jpg similarity index 100% rename from public/offline-images/14.jpeg rename to public/offline-images/14.jpg diff --git a/public/offline-images/15.jpeg b/public/offline-images/15.jpg similarity index 100% rename from public/offline-images/15.jpeg rename to public/offline-images/15.jpg diff --git a/public/offline-images/16.jpeg b/public/offline-images/16.jpg similarity index 100% rename from public/offline-images/16.jpeg rename to public/offline-images/16.jpg diff --git a/public/offline-images/17.jpeg b/public/offline-images/17.jpg similarity index 100% rename from public/offline-images/17.jpeg rename to public/offline-images/17.jpg diff --git a/public/offline-images/18.jpeg b/public/offline-images/18.jpg similarity index 100% rename from public/offline-images/18.jpeg rename to public/offline-images/18.jpg diff --git a/public/offline-images/19.jpeg b/public/offline-images/19.jpg similarity index 100% rename from public/offline-images/19.jpeg rename to public/offline-images/19.jpg diff --git a/public/offline-images/2.jpeg b/public/offline-images/2.jpg similarity index 100% rename from public/offline-images/2.jpeg rename to public/offline-images/2.jpg diff --git a/public/offline-images/20.jpeg b/public/offline-images/20.jpg similarity index 100% rename from public/offline-images/20.jpeg rename to public/offline-images/20.jpg diff --git a/public/offline-images/3.jpeg b/public/offline-images/3.jpg similarity index 100% rename from public/offline-images/3.jpeg rename to public/offline-images/3.jpg diff --git a/public/offline-images/4.jpeg b/public/offline-images/4.jpg similarity index 100% rename from public/offline-images/4.jpeg rename to public/offline-images/4.jpg diff --git a/public/offline-images/5.jpeg b/public/offline-images/5.jpg similarity index 100% rename from public/offline-images/5.jpeg rename to public/offline-images/5.jpg diff --git a/public/offline-images/6.jpeg b/public/offline-images/6.jpg similarity index 100% rename from public/offline-images/6.jpeg rename to public/offline-images/6.jpg diff --git a/public/offline-images/7.jpeg b/public/offline-images/7.jpg similarity index 100% rename from public/offline-images/7.jpeg rename to public/offline-images/7.jpg diff --git a/public/offline-images/8.jpeg b/public/offline-images/8.jpg similarity index 100% rename from public/offline-images/8.jpeg rename to public/offline-images/8.jpg diff --git a/public/offline-images/9.jpeg b/public/offline-images/9.jpg similarity index 100% rename from public/offline-images/9.jpeg rename to public/offline-images/9.jpg diff --git a/src/App.jsx b/src/App.jsx index 16a05ae6..7e144853 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -16,7 +16,7 @@ import Modal from 'react-modal'; import merge from 'lodash.merge'; import RoomIcon from '@material-ui/icons/Room'; -// Modals are lazy loaded as a user won't use them every time they open a tab +// Modals are lazy loaded as the user won't use them every time they open a tab const MainModal = React.lazy(() => import('./components/modals/MainModal')); const Update = React.lazy(() => import('./components/modals/Update')); //const Welcome = React.lazy(() => import('./components/modals/Welcome')); diff --git a/src/components/modals/settings/Section.jsx b/src/components/modals/settings/Section.jsx index bf127e24..7b71cab5 100644 --- a/src/components/modals/settings/Section.jsx +++ b/src/components/modals/settings/Section.jsx @@ -22,7 +22,7 @@ export default class Section extends React.PureComponent { } render() { - let extraHTML, expandMore, slider; + let extraHTML, expandMore, slider, noDropdown; if (this.props.children) { extraHTML =
  • {this.props.children}
    • expandMore = ; + if (this.props.noDropdown) noDropdown = 'nodropdown'; return (
    -

    this.toggleSection()}>{this.props.title}

    +

    this.toggleSection()}>{this.props.title}

    {expandMore} {slider}
    diff --git a/src/components/modals/settings/sections/BackgroundSettings.jsx b/src/components/modals/settings/sections/BackgroundSettings.jsx index 6f3c575a..dae31f65 100644 --- a/src/components/modals/settings/sections/BackgroundSettings.jsx +++ b/src/components/modals/settings/sections/BackgroundSettings.jsx @@ -1,6 +1,7 @@ import React from 'react'; import { toast } from 'react-toastify'; import Checkbox from '../Checkbox'; +import Section from '../Section'; export default class BackgroundSettings extends React.PureComponent { DefaultGradientSettings = { "angle": "180", "gradient": [{ "colour": this.props.language.background.disabled, "stop": 0 }], "type": "linear" }; @@ -151,44 +152,46 @@ export default class BackgroundSettings extends React.PureComponent { } return ( -
    -
      - - - -
    -
      - - -
    -
      -

      {this.props.language.background.blur} ({this.state.blur}%) this.resetItem('blur')}>{this.props.language.reset}

      - this.setState({ blur: event.target.value })} /> -
    -
      -

      {this.props.language.background.brightness} ({this.state.brightness}%) this.resetItem('brightness')}>{this.props.language.reset}

      - this.setState({ brightness: event.target.value })} /> -
    -
      -

      {this.props.language.background.customURL} this.resetItem('customBackground')}>{this.props.language.reset}

      - -
    -
      -

      {this.props.language.background.custombackground} this.resetItem('customBackground')}>{this.props.language.reset}

      - - -
    -
      -

      {this.props.language.background.customcolour} this.resetItem('customBackgroundColour')}>{this.props.language.reset}

      - - {colourSettings} -
    -
    + +
    +
      + + + +
    +
      + + +
    +
      +

      {this.props.language.background.blur} ({this.state.blur}%) this.resetItem('blur')}>{this.props.language.reset}

      + this.setState({ blur: event.target.value })} /> +
    +
      +

      {this.props.language.background.brightness} ({this.state.brightness}%) this.resetItem('brightness')}>{this.props.language.reset}

      + this.setState({ brightness: event.target.value })} /> +
    +
      +

      {this.props.language.background.customURL} this.resetItem('customBackground')}>{this.props.language.reset}

      + +
    +
      +

      {this.props.language.background.custombackground} this.resetItem('customBackground')}>{this.props.language.reset}

      + + +
    +
      +

      {this.props.language.background.customcolour} this.resetItem('customBackgroundColour')}>{this.props.language.reset}

      + + {colourSettings} +
    +
    +     ); } } \ No newline at end of file diff --git a/src/components/modals/settings/sections/SearchSettings.jsx b/src/components/modals/settings/sections/SearchSettings.jsx index c95dde2b..0003754b 100644 --- a/src/components/modals/settings/sections/SearchSettings.jsx +++ b/src/components/modals/settings/sections/SearchSettings.jsx @@ -1,6 +1,7 @@ import React from 'react'; import SettingsFunctions from '../../../../modules/settingsFunctions'; import { toast } from 'react-toastify'; +import Section from '../Section'; const searchEngines = require('../../../../modules/searchEngines.json'); @@ -24,21 +25,23 @@ export default class SearchSettings extends React.PureComponent { render() { return ( -
    -
      - - -
    -
      -

      {this.props.language.searchbar.custom} this.resetSearch()}>{this.props.language.reset}

      - -
    -
    + +
    +
      + + +
    +
      +

      {this.props.language.searchbar.custom} this.resetSearch()}>{this.props.language.reset}

      + +
    +
    +     ); } } \ No newline at end of file diff --git a/src/components/modals/tabs/Settings.jsx b/src/components/modals/tabs/Settings.jsx index 6860b1e8..3919eb00 100644 --- a/src/components/modals/tabs/Settings.jsx +++ b/src/components/modals/tabs/Settings.jsx @@ -1,7 +1,6 @@ import React from 'react'; import SettingsFunctions from '../../../modules/settingsFunctions'; import Checkbox from '../settings/Checkbox'; -import Slider from '../settings/Slider'; import Section from '../settings/Section'; import { toast } from 'react-toastify'; @@ -50,6 +49,7 @@ export default class Settings extends React.PureComponent { +
    @@ -58,31 +58,27 @@ export default class Settings extends React.PureComponent {
    +
    -
    - -
    -
    - -
    -
    -

    {this.props.language.offline}

    - -
    -
    -

    {this.props.language.experimental.dark}

    - -
    + + + + + +
    +
    +
    - +
    + diff --git a/src/components/widgets/Background.jsx b/src/components/widgets/Background.jsx index 2c6c8ace..48841117 100644 --- a/src/components/widgets/Background.jsx +++ b/src/components/widgets/Background.jsx @@ -25,14 +25,13 @@ export default class Background extends React.PureComponent { localStorage.setItem('customBackgroundColour', JSON.stringify(gradientSettings)); } } - const background = typeof gradientSettings === 'object' && gradientSettings !== null ? this.gradientStyleBuilder(gradientSettings) : `background-image: url(${url});`; + const background = typeof gradientSettings === 'object' && gradientSettings !== null ? this.gradientStyleBuilder(gradientSettings) : `background-image: url(${url})`; let brightness = localStorage.getItem('brightness'); if (localStorage.getItem('brightnessTime') && new Date().getHours() > 18) brightness = 75; document.querySelector('#backgroundImage').setAttribute( 'style', - `${background}; - -webkit-filter: blur(${localStorage.getItem('blur')}px) brightness(${brightness}%);` + `${background}; -webkit-filter: blur(${localStorage.getItem('blur')}px) brightness(${brightness}%);` ); if (credit === 'false') document.querySelector('#credits').style.display = 'none'; // Hide the credit @@ -52,7 +51,7 @@ export default class Background extends React.PureComponent { const randomImage = offlineImages[photographer].photo[ Math.floor(Math.random() * offlineImages[photographer].photo.length) ]; // Select a random image - const url = `../offline-images/${randomImage}.jpeg`; + const url = `../offline-images/${randomImage}.jpg`; this.setBackground(url); this.setCredit(photographer); diff --git a/src/components/widgets/Maximise.jsx b/src/components/widgets/Maximise.jsx index f940f526..30d7ceda 100644 --- a/src/components/widgets/Maximise.jsx +++ b/src/components/widgets/Maximise.jsx @@ -27,6 +27,7 @@ export default class View extends React.PureComponent { return; } }); + if (this.state.hidden === false) { this.setState({ hidden: true }); this.setAttribute(0, 100); diff --git a/src/translations/en.json b/src/translations/en.json index 498bfc51..750adb2f 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -57,12 +57,13 @@ "custom": "Custom Search URL" }, "offline": "Offline Mode", + "dark": "Dark Theme", "experimental": { "title": "Experimental", "webp": "Enable WebP", - "dark": "Dark Theme", "animations": "Animations", - "voicesearch": "Voice Search" + "voicesearch": "Voice Search", + "nightmode": "Automatic Night Mode" }, "language": "Language", "apply": "Apply", diff --git a/src/translations/fr.json b/src/translations/fr.json index 3b1aacd7..63bc382a 100644 --- a/src/translations/fr.json +++ b/src/translations/fr.json @@ -56,10 +56,10 @@ "custom": "URL de recherche personnalisée" }, "offline": "Mode Hors-Ligne", + "dark": "Thème sombre", "experimental": { "title": "Expérimental", "webp": "Activer WebP", - "dark": "Thème sombre", "animations": "Animations", "favourite": "Bouton Ajouter aux favoris", "voicesearch": "Recherche vocale" diff --git a/src/translations/nl.json b/src/translations/nl.json index 29c48028..e0f522c5 100644 --- a/src/translations/nl.json +++ b/src/translations/nl.json @@ -49,10 +49,10 @@ "searchengine": "Zoekmachine" }, "offline": "Offline Modus", + "dark": "Donker Thema", "experimental": { "title": "Experimenteel", "webp": "WebP Gebruiken", - "dark": "Donker Thema", "animations": "Animaties" }, "language": "Taal", diff --git a/src/translations/no.json b/src/translations/no.json index ea92c346..2134ac11 100644 --- a/src/translations/no.json +++ b/src/translations/no.json @@ -48,10 +48,10 @@ "searchengine": "Søkemotor" }, "offline": "Frakoblet Modus", + "dark": "Mørkt tema", "experimental": { "title": "Eksperimental", "webp": "Skru på WebP", - "dark": "Mørkt tema", "animations": "Animasjoner" }, "language": "Språk", diff --git a/src/translations/ru.json b/src/translations/ru.json index 087ad5b3..5e8297fc 100644 --- a/src/translations/ru.json +++ b/src/translations/ru.json @@ -50,10 +50,10 @@ "searchengine": "Поисковый движок" }, "offline": "Офлайн режим", + "dark": "Тёмная тема", "experimental": { "title": "Экспериментальные настройки", "webp": "Включить WebP", - "dark": "Тёмная тема", "animations": "Анимации" }, "language": "Язык",