diff --git a/README.md b/README.md index b182b7dc..6786a78e 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,7 @@ Please see the [documentation](https://docs.muetab.com/translations). [Vicente](https://github.com/Vicente015) - Spanish
[Austin Huang](https://github.com/austinhuang0131) - Chinese (Simplified)
[FreeFun](https://github.com/xXFreeFunXx) - German
+[Aksal](https://github.com/aksalsf) - Indonesian
### Contributors Many thanks to the photographers [here](https://api.muetab.com/images/photographers) for letting us use their wonderful photographs. diff --git a/package.json b/package.json index cb67dddc..7f35cfeb 100644 --- a/package.json +++ b/package.json @@ -11,25 +11,24 @@ "license": "BSD-3-Clause", "version": "6.0.4", "dependencies": { - "@eartharoid/i18n": "^1.0.2", - "@emotion/react": "^11.8.1", + "@eartharoid/i18n": "1.0.2", + "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@fontsource/lexend-deca": "4.4.5", "@fontsource/montserrat": "4.4.5", - "@mui/icons-material": "5.6.0", "@mui/material": "5.6.0", "react": "17.0.2", "react-clock": "3.1.0", "react-color-gradient-picker": "0.1.2", "react-dom": "17.0.2", "react-hot-keys": "2.7.1", + "react-icons": "^4.3.1", "react-modal": "3.14.4", "react-sortable-hoc": "2.0.0", - "react-toastify": "8.2.0", - "weather-icons-react": "1.2.0" + "react-toastify": "8.2.0" }, "devDependencies": { - "@babel/core": "^7.16.0", + "@babel/core": "^7.17.9", "@babel/eslint-parser": "^7.16.3", "@babel/plugin-proposal-class-properties": "^7.16.0", "@babel/plugin-transform-react-constant-elements": "^7.16.0", diff --git a/src/components/modals/ErrorBoundary.jsx b/src/components/modals/ErrorBoundary.jsx index 0060c614..e757a881 100644 --- a/src/components/modals/ErrorBoundary.jsx +++ b/src/components/modals/ErrorBoundary.jsx @@ -1,6 +1,6 @@ import variables from 'modules/variables'; import { PureComponent } from 'react'; -import { ErrorOutline } from '@mui/icons-material'; +import { MdErrorOutline } from 'react-icons/md'; export default class ErrorBoundary extends PureComponent { constructor(props) { @@ -23,7 +23,7 @@ export default class ErrorBoundary extends PureComponent { return (
- +

{variables.language.getMessage(variables.languagecode, 'modals.main.error_boundary.title')}

{variables.language.getMessage(variables.languagecode, 'modals.main.error_boundary.message')}

diff --git a/src/components/modals/main/marketplace/Item.jsx b/src/components/modals/main/marketplace/Item.jsx index c3b81db6..85c252e0 100644 --- a/src/components/modals/main/marketplace/Item.jsx +++ b/src/components/modals/main/marketplace/Item.jsx @@ -1,7 +1,7 @@ import variables from 'modules/variables'; import { PureComponent, Fragment } from 'react'; import { toast } from 'react-toastify'; -import { ArrowBack } from '@mui/icons-material'; +import { MdArrowBack } from 'react-icons/md'; import Modal from 'react-modal'; import { install, uninstall } from 'modules/helpers/marketplace'; @@ -66,7 +66,7 @@ export default class Item extends PureComponent { return (

- +

{this.props.data.display_name}

{this.props.button} diff --git a/src/components/modals/main/marketplace/SideloadFailedModal.jsx b/src/components/modals/main/marketplace/SideloadFailedModal.jsx index 38400929..514f89a0 100644 --- a/src/components/modals/main/marketplace/SideloadFailedModal.jsx +++ b/src/components/modals/main/marketplace/SideloadFailedModal.jsx @@ -1,5 +1,5 @@ import variables from 'modules/variables'; -import { Close } from '@mui/icons-material'; +import { MdClose } from 'react-icons/md'; export default function SideloadFailedModal({ modalClose, reason }) { const getMessage = (text) => variables.language.getMessage(variables.languagecode, text); @@ -12,7 +12,7 @@ export default function SideloadFailedModal({ modalClose, reason }) { {reason}
diff --git a/src/components/modals/main/marketplace/sections/Added.jsx b/src/components/modals/main/marketplace/sections/Added.jsx index ced67a74..0408b6ae 100644 --- a/src/components/modals/main/marketplace/sections/Added.jsx +++ b/src/components/modals/main/marketplace/sections/Added.jsx @@ -1,6 +1,6 @@ import variables from 'modules/variables'; import { PureComponent } from 'react'; -import { LocalMall } from '@mui/icons-material'; +import { MdLocalMall } from 'react-icons/md'; import { toast } from 'react-toastify'; import Item from '../Item'; @@ -119,7 +119,7 @@ export default class Added extends PureComponent { return (
- +

{this.getMessage('modals.main.addons.empty.title')}

{this.getMessage('modals.main.addons.empty.description')}

diff --git a/src/components/modals/main/marketplace/sections/Create.jsx b/src/components/modals/main/marketplace/sections/Create.jsx index 8001f2b0..0b1e6c2f 100644 --- a/src/components/modals/main/marketplace/sections/Create.jsx +++ b/src/components/modals/main/marketplace/sections/Create.jsx @@ -1,12 +1,12 @@ import variables from 'modules/variables'; import { PureComponent } from 'react'; -import { - SettingsRounded as Settings, - PhotoOutlined as Photos, - FormatQuoteOutlined as Quotes, - Upload as ImportIcon, - Download as ExportIcon, -} from '@mui/icons-material'; +import { + MdSettings as Settings, + MdOutlineInsertPhoto as Photos, + MdOutlineFormatQuote as Quotes, + MdUpload as ImportIcon, + MdDownload as ExportIcon +} from 'react-icons/md'; import { TextField } from '@mui/material'; import { toast } from 'react-toastify'; @@ -221,7 +221,7 @@ export default class Create extends PureComponent { setMetadata(e.target.value, 'author')}/> setMetadata(e.target.value, 'icon_url')}/> setMetadata(e.target.value, 'screenshot_url')}/> - setMetadata(e.target.value, 'description')}/> + setMetadata(e.target.value, 'description')}/>
diff --git a/src/components/modals/main/marketplace/sections/Marketplace.jsx b/src/components/modals/main/marketplace/sections/Marketplace.jsx index 7317f3ec..9d6ef109 100644 --- a/src/components/modals/main/marketplace/sections/Marketplace.jsx +++ b/src/components/modals/main/marketplace/sections/Marketplace.jsx @@ -1,7 +1,7 @@ import variables from 'modules/variables'; import { PureComponent } from 'react'; import { toast } from 'react-toastify'; -import { WifiOff, LocalMall } from '@mui/icons-material'; +import { MdWifiOff, MdLocalMall } from 'react-icons/md'; import Item from '../Item'; import Items from '../Items'; @@ -174,7 +174,7 @@ export default class Marketplace extends PureComponent { if (navigator.onLine === false || localStorage.getItem('offlineMode') === 'true') { return errorMessage(<> - +

{this.getMessage('modals.main.marketplace.offline.title')}

{this.getMessage('modals.main.marketplace.offline.description')}

); @@ -204,7 +204,7 @@ export default class Marketplace extends PureComponent { <> {featured()} {errorMessage(<> - +

{this.getMessage('modals.main.addons.empty.title')}

{this.getMessage('modals.main.marketplace.no_items')}

)} diff --git a/src/components/modals/main/marketplace/sections/Sideload.jsx b/src/components/modals/main/marketplace/sections/Sideload.jsx index 6a293304..e7affd72 100644 --- a/src/components/modals/main/marketplace/sections/Sideload.jsx +++ b/src/components/modals/main/marketplace/sections/Sideload.jsx @@ -1,6 +1,6 @@ import variables from 'modules/variables'; import { PureComponent } from 'react'; -import { LocalMall } from '@mui/icons-material'; +import { MdIntegrationInstructions } from 'react-icons/md'; import { toast } from 'react-toastify'; import Modal from 'react-modal'; @@ -54,7 +54,7 @@ export default class Sideload extends PureComponent {
this.installAddon(JSON.parse(e.target.result))} /> - +

{this.getMessage('modals.main.addons.sideload.title')}

diff --git a/src/components/modals/main/settings/KeybindInput.jsx b/src/components/modals/main/settings/KeybindInput.jsx index 5412a16d..f7068937 100644 --- a/src/components/modals/main/settings/KeybindInput.jsx +++ b/src/components/modals/main/settings/KeybindInput.jsx @@ -1,5 +1,5 @@ import variables from 'modules/variables'; -import { Cancel } from '@mui/icons-material'; +import { MdCancel } from 'react-icons/md'; import { TextField } from '@mui/material'; export default function KeybindInput(props) { @@ -9,9 +9,9 @@ export default function KeybindInput(props) { if (!value) { return ;; } else if (value === variables.language.getMessage(variables.languagecode, 'modals.main.settings.sections.keybinds.recording')) { - return ; + return ; } else { - return ; + return ; } } diff --git a/src/components/modals/main/settings/ResetModal.jsx b/src/components/modals/main/settings/ResetModal.jsx index 94e667c5..54679f1c 100644 --- a/src/components/modals/main/settings/ResetModal.jsx +++ b/src/components/modals/main/settings/ResetModal.jsx @@ -1,5 +1,5 @@ import variables from 'modules/variables'; -import { Close, Delete } from '@mui/icons-material'; +import { MdClose, MdRestartAlt } from 'react-icons/md'; import { setDefaultSettings } from 'modules/helpers/settings'; export default function ResetModal({ modalClose }) { @@ -17,10 +17,10 @@ export default function ResetModal({ modalClose }) { {variables.language.getMessage(variables.languagecode, 'modals.main.settings.sections.advanced.reset_modal.information')}
diff --git a/src/components/modals/main/settings/sections/About.jsx b/src/components/modals/main/settings/sections/About.jsx index c823932c..2c7bab6e 100644 --- a/src/components/modals/main/settings/sections/About.jsx +++ b/src/components/modals/main/settings/sections/About.jsx @@ -1,6 +1,7 @@ import variables from 'modules/variables'; import { PureComponent } from 'react'; -import { Email, Twitter, Chat, Instagram, Facebook } from '@mui/icons-material'; +import { MdEmail } from 'react-icons/md'; +import { FaDiscord, FaTwitter } from 'react-icons/fa'; import Tooltip from 'components/helpers/tooltip/Tooltip'; @@ -94,11 +95,9 @@ export default class About extends PureComponent { {this.getMessage('modals.welcome.sections.privacy.links.privacy_policy')}

{this.getMessage('modals.main.settings.sections.about.contact_us')}

- - - - - + + +

{this.getMessage('modals.main.settings.sections.about.support_mue')}

diff --git a/src/components/modals/main/settings/sections/Advanced.jsx b/src/components/modals/main/settings/sections/Advanced.jsx index 6c2e2b28..dc993176 100644 --- a/src/components/modals/main/settings/sections/Advanced.jsx +++ b/src/components/modals/main/settings/sections/Advanced.jsx @@ -2,7 +2,7 @@ import variables from 'modules/variables'; import { PureComponent } from 'react'; import Modal from 'react-modal'; import { MenuItem } from '@mui/material'; -import { Upload as ImportIcon, Download as ExportIcon, RestartAlt as ResetIcon } from '@mui/icons-material'; +import { MdUpload as ImportIcon, MdDownload as ExportIcon, MdRestartAlt as ResetIcon } from 'react-icons/md'; import { exportSettings, importSettings } from 'modules/helpers/settings/modals'; diff --git a/src/components/modals/main/settings/sections/Changelog.jsx b/src/components/modals/main/settings/sections/Changelog.jsx index 0c35fd3a..44ff5033 100644 --- a/src/components/modals/main/settings/sections/Changelog.jsx +++ b/src/components/modals/main/settings/sections/Changelog.jsx @@ -1,6 +1,6 @@ import variables from 'modules/variables'; import { PureComponent, createRef } from 'react'; -import { WifiOff } from '@mui/icons-material'; +import { MdOutlineWifiOff } from 'react-icons/md'; import Modal from 'react-modal'; import Lightbox from '../../marketplace/Lightbox'; @@ -91,7 +91,7 @@ export default class Changelog extends PureComponent { if (navigator.onLine === false || this.offlineMode) { return errorMessage(<> - +

{getMessage('modals.main.marketplace.offline.title')}

{getMessage('modals.main.marketplace.offline.description')}

); diff --git a/src/components/modals/main/settings/sections/Message.jsx b/src/components/modals/main/settings/sections/Message.jsx index 2833a8d1..1e02078f 100644 --- a/src/components/modals/main/settings/sections/Message.jsx +++ b/src/components/modals/main/settings/sections/Message.jsx @@ -1,6 +1,6 @@ import variables from 'modules/variables'; import { PureComponent } from 'react'; -import { Cancel, Add } from '@mui/icons-material'; +import { MdCancel, MdAdd } from 'react-icons/md'; import { toast } from 'react-toastify'; import { TextField } from '@mui/material'; @@ -64,13 +64,13 @@ export default class Message extends PureComponent {

{this.getMessage('modals.main.settings.sections.message.text')}

- +
{this.state.messages.map((_url, index) => (
this.message(e, true, index)} varient='outlined' /> {this.state.messages.length > 1 ? : null}
))} diff --git a/src/components/modals/main/settings/sections/Order.jsx b/src/components/modals/main/settings/sections/Order.jsx index e52dd8fc..0daf9087 100644 --- a/src/components/modals/main/settings/sections/Order.jsx +++ b/src/components/modals/main/settings/sections/Order.jsx @@ -1,6 +1,6 @@ import variables from 'modules/variables'; import { PureComponent } from 'react'; -import { DragIndicator } from '@mui/icons-material'; +import { MdOutlineDragIndicator } from 'react-icons/md'; import { sortableContainer, sortableElement } from 'react-sortable-hoc'; import { toast } from 'react-toastify'; @@ -18,7 +18,7 @@ const widget_name = { const SortableItem = sortableElement(({ value }) => (
  • - + {widget_name[value]}
    • )); diff --git a/src/components/modals/main/settings/sections/Quote.jsx b/src/components/modals/main/settings/sections/Quote.jsx index 0a2ce5a9..8907c90e 100644 --- a/src/components/modals/main/settings/sections/Quote.jsx +++ b/src/components/modals/main/settings/sections/Quote.jsx @@ -1,6 +1,6 @@ import variables from 'modules/variables'; import { PureComponent } from 'react'; -import { Cancel, Add } from '@mui/icons-material'; +import { MdCancel, MdAdd } from 'react-icons/md'; import { TextField } from '@mui/material'; import Header from '../Header'; @@ -91,14 +91,14 @@ export default class QuoteSettings extends PureComponent { <>

    {this.getMessage('modals.main.settings.sections.quote.custom')} {this.getMessage('modals.main.settings.buttons.reset')}

    - +
    {this.state.customQuote.map((_url, index) => (
    this.customQuote(e, true, index, 'quote')} varient='outlined' style={{ marginRight: '10px' }} /> this.customQuote(e, true, index, 'author')} varient='outlined' /> {this.state.customQuote.length > 1 ? : null}
    ))} diff --git a/src/components/modals/main/settings/sections/background/Custom.jsx b/src/components/modals/main/settings/sections/background/Custom.jsx index 62b368e3..7e6bbb39 100644 --- a/src/components/modals/main/settings/sections/background/Custom.jsx +++ b/src/components/modals/main/settings/sections/background/Custom.jsx @@ -1,7 +1,7 @@ import variables from 'modules/variables'; import { PureComponent } from 'react'; import { toast } from 'react-toastify'; -import { Cancel, AddLink, AddPhotoAlternate, PersonalVideo } from '@mui/icons-material'; +import { MdCancel, MdAddLink, MdAddPhotoAlternate, MdPersonalVideo } from 'react-icons/md'; import EventBus from 'modules/helpers/eventbus'; import Checkbox from '../../Checkbox'; @@ -116,15 +116,15 @@ export default class CustomSettings extends PureComponent {

      {this.getMessage('modals.main.settings.sections.background.source.custom_background')} {this.getMessage('modals.main.settings.buttons.reset')}

      - - + +
      {this.state.customBackground.map((url, index) => (
      - {this.videoCheck(url) ? : null} + {this.videoCheck(url) ? : null} {this.state.customBackground.length > 0 ? : null}
      ))} diff --git a/src/components/modals/main/settings/sections/background/CustomURLModal.jsx b/src/components/modals/main/settings/sections/background/CustomURLModal.jsx index f042177b..b2f809a4 100644 --- a/src/components/modals/main/settings/sections/background/CustomURLModal.jsx +++ b/src/components/modals/main/settings/sections/background/CustomURLModal.jsx @@ -1,6 +1,6 @@ import variables from 'modules/variables'; import { useState } from 'react'; -import { Add } from '@mui/icons-material'; +import { MdAdd } from 'react-icons/md'; import { TextField } from '@mui/material'; export default function CustomURLModal({ modalClose, modalCloseOnly }) { @@ -13,7 +13,7 @@ export default function CustomURLModal({ modalClose, modalCloseOnly }) { setURL(e.target.value)} varient='outlined'/>
      diff --git a/src/components/modals/main/tabs/backend/Tab.jsx b/src/components/modals/main/tabs/backend/Tab.jsx index 3279c0bd..c33f70fc 100644 --- a/src/components/modals/main/tabs/backend/Tab.jsx +++ b/src/components/modals/main/tabs/backend/Tab.jsx @@ -1,34 +1,34 @@ import variables from 'modules/variables'; import { memo } from 'react'; import { - SettingsRounded as Settings, - Widgets as Addons, - ShoppingBasket as Marketplace, - - MenuOutlined as Navbar, - EmojiPeopleOutlined as Greeting, - AccessAlarm as Time, - FormatQuoteOutlined as Quote, - Link as QuickLinks, - DateRangeOutlined as Date, - SmsOutlined as Message, - PhotoOutlined as Background, - Search, - CloudOutlined as Weather, - List as Order, - FormatPaintOutlined as Appearance, - Translate as Language, - SettingsOutlined as Advanced, - BugReportOutlined as Experimental, + MdSettings as Settings, + MdWidgets as Addons, + MdShoppingBasket as Marketplace, + MdMenu as Navbar, + MdEmojiPeople as Greeting, + MdAccessAlarm as Time, + MdOutlineFormatQuote as Quote, + MdLink as QuickLinks, + MdDateRange as Date, + MdOutlineTextsms as Message, + MdOutlinePhoto as Background, + MdSearch, + MdCloudQueue as Weather, + MdList as Order, + MdFormatPaint as Appearance, + MdTranslate as Language, + MdOutlineSettings as Advanced, + MdBugReport as Experimental, //KeyboardAltOutlined as Keybinds, - AssessmentOutlined as Stats, - NewReleasesOutlined as Changelog, - InfoOutlined as About, + MdOutlineAssessment as Stats, + MdOutlineNewReleases as Changelog, + MdInfoOutline as About, + MdEvent as Reminder, + MdCode as Sideload, + MdAddCircleOutline as Added, + MdAddCircleOutline as Create +} from 'react-icons/md'; - Code as Sideload, - AddCircleOutline as Added, - CreateNewFolderOutlined as Create -} from '@mui/icons-material'; function Tab({ label, currentTab, onClick, navbarTab }) { const getMessage = (text) => variables.language.getMessage(variables.languagecode, text); @@ -59,7 +59,7 @@ function Tab({ label, currentTab, onClick, navbarTab }) { case getMessage('modals.main.settings.sections.date.title'): icon = ; break; case getMessage('modals.main.settings.sections.message.title'): icon = ; break; case getMessage('modals.main.settings.sections.background.title'): icon = ; break; - case getMessage('modals.main.settings.sections.search.title'): icon = ; break; + case getMessage('modals.main.settings.sections.search.title'): icon = ; break; case getMessage('modals.main.settings.sections.weather.title'): icon = ; divider = true; break; case getMessage('modals.main.settings.sections.order.title'): icon = ; break; diff --git a/src/components/modals/welcome/WelcomeSections.jsx b/src/components/modals/welcome/WelcomeSections.jsx index 843c8047..b0d3ca28 100644 --- a/src/components/modals/welcome/WelcomeSections.jsx +++ b/src/components/modals/welcome/WelcomeSections.jsx @@ -1,6 +1,6 @@ import variables from 'modules/variables'; import { PureComponent } from 'react'; -import { CloudUpload, AutoAwesome, LightMode, DarkMode } from '@mui/icons-material'; +import { MdCloudUpload, MdAutoAwesome, MdLightMode, MdDarkMode } from 'react-icons/md'; import Radio from '../main/settings/Radio'; import Checkbox from '../main/settings/Checkbox'; @@ -141,16 +141,16 @@ export default class WelcomeSections extends PureComponent {

      {this.getMessage('modals.welcome.sections.theme.description')}

      this.changeTheme('auto')}> - + {this.getMessage('modals.main.settings.sections.appearance.theme.auto')}
      this.changeTheme('light')}> - + {this.getMessage('modals.main.settings.sections.appearance.theme.light')}
      this.changeTheme('dark')}> - + {this.getMessage('modals.main.settings.sections.appearance.theme.dark')}
      @@ -165,7 +165,7 @@ export default class WelcomeSections extends PureComponent {

      {this.getMessage('modals.welcome.sections.settings.title')}

      {this.getMessage('modals.welcome.sections.settings.description')}

      diff --git a/src/components/widgets/background/Favourite.jsx b/src/components/widgets/background/Favourite.jsx index 03eb7eb5..d1a9a034 100644 --- a/src/components/widgets/background/Favourite.jsx +++ b/src/components/widgets/background/Favourite.jsx @@ -1,14 +1,14 @@ import variables from 'modules/variables'; import { PureComponent } from 'react'; -import { Star, StarBorder } from '@mui/icons-material'; +import { MdStar, MdStarBorder } from 'react-icons/md'; //import Hotkeys from 'react-hot-keys'; import Tooltip from 'components/helpers/tooltip/Tooltip'; export default class Favourite extends PureComponent { buttons = { - favourited: this.favourite()} className='topicons' />, - unfavourited: this.favourite()} className='topicons' /> + favourited: this.favourite()} className='topicons' />, + unfavourited: this.favourite()} className='topicons' /> } constructor() { diff --git a/src/components/widgets/background/Maximise.jsx b/src/components/widgets/background/Maximise.jsx index b8459103..5ea2bdae 100644 --- a/src/components/widgets/background/Maximise.jsx +++ b/src/components/widgets/background/Maximise.jsx @@ -1,6 +1,6 @@ import variables from 'modules/variables'; import { PureComponent } from 'react'; -import { Fullscreen } from '@mui/icons-material'; +import { MdCropFree } from 'react-icons/md'; //import Hotkeys from 'react-hot-keys'; import Tooltip from 'components/helpers/tooltip/Tooltip'; @@ -58,7 +58,7 @@ export default class Maximise extends PureComponent { render() { return ( - + {/*variables.keybinds.maximiseBackground && variables.keybinds.maximiseBackground !== '' ? : null*/} ); diff --git a/src/components/widgets/background/PhotoInformation.jsx b/src/components/widgets/background/PhotoInformation.jsx index f4669a19..8e402cd5 100644 --- a/src/components/widgets/background/PhotoInformation.jsx +++ b/src/components/widgets/background/PhotoInformation.jsx @@ -1,6 +1,13 @@ import variables from 'modules/variables'; import { useState, Fragment } from 'react'; -import { Info, LocationOn, PhotoCamera, Crop as Resolution, Person as Photographer, GetApp as Download } from '@mui/icons-material'; +import { + MdInfo, + MdLocationOn, + MdPhotoCamera, + MdCrop as Resolution, + MdPerson as Photographer, + MdGetApp as Download +} from 'react-icons/md'; //import Hotkeys from 'react-hot-keys'; const toDataURL = async (url) => { @@ -124,19 +131,19 @@ export default function PhotoInformation({ info, url, api }) { return (

      {photo} {credit}

      - +
      - +

      {variables.language.getMessage(variables.languagecode, 'widgets.background.information')}

      {photoMap()} {/* fix console error by using fragment and key */} {info.location && info.location !== 'N/A' ? - + {info.location} : null} {info.camera && info.camera !== 'N/A' ? - + {info.camera} : null} diff --git a/src/components/widgets/message/Message.jsx b/src/components/widgets/message/Message.jsx index 77531915..bd1c0d52 100644 --- a/src/components/widgets/message/Message.jsx +++ b/src/components/widgets/message/Message.jsx @@ -35,7 +35,12 @@ export default class Message extends PureComponent { render() { return (

      - {this.state.messageText} + {this.state.messageText.split('\\n').map((item, i) => ( + + {item} +
      +       + ))}

      ); } diff --git a/src/components/widgets/navbar/Navbar.jsx b/src/components/widgets/navbar/Navbar.jsx index 6ccc6dd8..38b20aa1 100644 --- a/src/components/widgets/navbar/Navbar.jsx +++ b/src/components/widgets/navbar/Navbar.jsx @@ -1,6 +1,6 @@ import variables from 'modules/variables'; import { PureComponent, createRef } from 'react'; -import { RefreshRounded, SettingsRounded, AssignmentRounded as NotesRounded } from '@mui/icons-material'; +import { MdRefresh, MdSettings, MdAssignment } from 'react-icons/md'; import Notes from './Notes'; import Maximise from '../background/Maximise'; @@ -62,19 +62,19 @@ export default class Navbar extends PureComponent { {(localStorage.getItem('notesEnabled') === 'true') ?
      - +
      : null} {(this.refreshValue !== 'false') ? - this.refresh()}/> + this.refresh()}/> : null} - this.props.openModal('mainModal')}/> + this.props.openModal('mainModal')}/>
      ); diff --git a/src/components/widgets/navbar/Notes.jsx b/src/components/widgets/navbar/Notes.jsx index 0bf2be06..35f193e6 100644 --- a/src/components/widgets/navbar/Notes.jsx +++ b/src/components/widgets/navbar/Notes.jsx @@ -1,6 +1,6 @@ import variables from 'modules/variables'; import { PureComponent } from 'react'; -import { FileCopyRounded, AssignmentRounded as NotesRounded, PushPin } from '@mui/icons-material'; +import { MdContentCopy, MdAssignment, MdPushPin } from 'react-icons/md'; import TextareaAutosize from '@mui/material/TextareaAutosize'; import { toast } from 'react-toastify'; //import Hotkeys from 'react-hot-keys'; @@ -48,12 +48,12 @@ export default class Notes extends PureComponent { return (
      - +

      {variables.language.getMessage(variables.languagecode, 'widgets.navbar.notes.title')}

      - - + + {/*variables.keybinds.pinNotes && variables.keybinds.pinNotes !== '' ? this.pin()}/> : null*/} {/*variables.keybinds.copyNotes && variables.keybinds.copyNotes !== '' ? this.copy()}/> : null*/}       diff --git a/src/components/widgets/quote/Quote.jsx b/src/components/widgets/quote/Quote.jsx index e7f29aa2..11451b3f 100644 --- a/src/components/widgets/quote/Quote.jsx +++ b/src/components/widgets/quote/Quote.jsx @@ -1,6 +1,7 @@ import variables from 'modules/variables'; import { PureComponent, createRef } from 'react'; -import { FilterNone as FileCopy, Twitter, Star, StarBorder } from '@mui/icons-material'; +import { MdContentCopy, MdStarBorder, MdStar } from 'react-icons/md'; +import { FaTwitter } from 'react-icons/fa'; import { toast } from 'react-toastify'; //import Hotkeys from 'react-hot-keys'; @@ -11,10 +12,10 @@ import './quote.scss'; export default class Quote extends PureComponent { buttons = { - tweet: this.tweetQuote()} />, - copy: this.copyQuote()} />, - unfavourited: this.favourite()} />, - favourited: this.favourite()} /> + tweet: this.tweetQuote()} />, + copy: this.copyQuote()} />, + unfavourited: this.favourite()} />, + favourited: this.favourite()} /> } constructor() { diff --git a/src/components/widgets/search/Search.jsx b/src/components/widgets/search/Search.jsx index 756b9275..12854d23 100644 --- a/src/components/widgets/search/Search.jsx +++ b/src/components/widgets/search/Search.jsx @@ -1,6 +1,6 @@ import variables from 'modules/variables'; -import { PureComponent, Fragment } from 'react'; -import { Search as SearchIcon, Mic } from '@mui/icons-material'; +import { PureComponent } from 'react'; +import { MdSearch, MdMic } from 'react-icons/md'; //import Hotkeys from 'react-hot-keys'; import AutocompleteInput from 'components/helpers/autocomplete/Autocomplete'; @@ -95,7 +95,7 @@ export default class Search extends PureComponent { } if (localStorage.getItem('voiceSearch') === 'true') { - microphone = ; + microphone = ; } let autocompleteURL, autocompleteQuery, autocompleteCallback; @@ -191,7 +191,7 @@ export default class Search extends PureComponent {
      {localStorage.getItem('searchDropdown') === 'true' ? this.toggleDropdown()}>{this.state.currentSearch} : ''} {this.state.microphone} - + this.getSuggestions(e)} onClick={this.searchButton}/> {/*variables.keybinds.focusSearch && variables.keybinds.focusSearch !== '' ? document.getElementById('searchtext').focus()}/> : null*/} diff --git a/src/components/widgets/weather/Weather.jsx b/src/components/widgets/weather/Weather.jsx index 0b256bf3..37d53f84 100644 --- a/src/components/widgets/weather/Weather.jsx +++ b/src/components/widgets/weather/Weather.jsx @@ -1,6 +1,6 @@ import variables from 'modules/variables'; import { PureComponent } from 'react'; -import { WiHumidity, WiWindy, WiBarometer, WiCloud } from 'weather-icons-react'; +import { WiHumidity, WiWindy, WiBarometer, WiCloud } from 'react-icons/wi'; import WeatherIcon from './WeatherIcon'; import WindDirectionIcon from './WindDirectionIcon'; diff --git a/src/components/widgets/weather/WeatherIcon.jsx b/src/components/widgets/weather/WeatherIcon.jsx index 1c675f8e..8aa6eea2 100644 --- a/src/components/widgets/weather/WeatherIcon.jsx +++ b/src/components/widgets/weather/WeatherIcon.jsx @@ -1,4 +1,17 @@ -import { WiDaySunny, WiNightClear, WiDayCloudy, WiNightCloudy, WiCloud, WiCloudy, WiDayShowers, WiNightShowers, WiRain, WiThunderstorm, WiSnow, WiFog } from 'weather-icons-react'; +import { + WiDaySunny, + WiNightClear, + WiDayCloudy, + WiNightCloudy, + WiCloud, + WiCloudy, + WiDayShowers, + WiNightShowers, + WiRain, + WiThunderstorm, + WiSnow, + WiFog, +} from 'react-icons/wi'; export default function WeatherIcon({ name }) { let icon; diff --git a/src/components/widgets/weather/WindDirectionIcon.jsx b/src/components/widgets/weather/WindDirectionIcon.jsx index 426d2673..99653cee 100644 --- a/src/components/widgets/weather/WindDirectionIcon.jsx +++ b/src/components/widgets/weather/WindDirectionIcon.jsx @@ -1,4 +1,13 @@ -import { WiDirectionDownLeft, WiDirectionDownRight, WiDirectionDown, WiDirectionLeft, WiDirectionRight, WiDirectionUpLeft, WiDirectionUpRight, WiDirectionUp } from 'weather-icons-react'; +import { + WiDirectionDownLeft, + WiDirectionDownRight, + WiDirectionDown, + WiDirectionLeft, + WiDirectionRight, + WiDirectionUpLeft, + WiDirectionUpRight, + WiDirectionUp, +} from 'react-icons/wi'; // degrees is imported because of a potential bug, idk what causes it but now it is fixed export default function WindDirectionIcon({ degrees }) { diff --git a/src/modules/constants.js b/src/modules/constants.js index 73fbc5da..ffb46e78 100644 --- a/src/modules/constants.js +++ b/src/modules/constants.js @@ -19,8 +19,6 @@ 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'; -export const FACEBOOK_HANDLE = 'muetab'; export const DISCORD_SERVER = 'zv8C9F8'; export const COPYRIGHT_NAME = 'The Mue Authors'; export const COPYRIGHT_YEAR = '2018';