diff --git a/package.json b/package.json index f9767e5c..d87d4f1d 100644 --- a/package.json +++ b/package.json @@ -28,26 +28,25 @@ "weather-icons-react": "1.2.0" }, "devDependencies": { - "@babel/core": "^7.14.2", - "@babel/eslint-parser": "^7.14.2", + "@babel/core": "^7.14.3", + "@babel/eslint-parser": "^7.14.3", "@babel/plugin-proposal-class-properties": "^7.13.0", "@babel/plugin-transform-react-constant-elements": "^7.13.13", - "@babel/plugin-transform-runtime": "^7.14.2", + "@babel/plugin-transform-runtime": "^7.14.3", "@babel/preset-env": "^7.14.2", "@babel/preset-react": "^7.13.13", "babel-loader": "^8.2.2", "babel-plugin-transform-react-class-to-function": "^1.2.2", - "copy-webpack-plugin": "^8.1.1", - "css-loader": "^5.2.4", - "eslint": "^7.26.0", + "copy-webpack-plugin": "^9.0.0", + "css-loader": "^5.2.5", + "eslint": "^7.27.0", "eslint-config-react-app": "^6.0.0", - "eslint-webpack-plugin": "^2.5.4", "html-webpack-plugin": "^5.3.1", "mini-css-extract-plugin": "^1.6.0", - "sass": "^1.32.13", + "sass": "^1.34.0", "sass-loader": "^11.1.1", - "source-map-loader": "^2.0.1", - "webpack": "^5.37.0", + "source-map-loader": "^3.0.0", + "webpack": "^5.37.1", "webpack-cli": "^4.7.0", "webpack-dev-server": "^3.11.2" }, diff --git a/src/components/modals/main/settings/ResetModal.jsx b/src/components/modals/main/settings/ResetModal.jsx index 46ad50db..4552344b 100644 --- a/src/components/modals/main/settings/ResetModal.jsx +++ b/src/components/modals/main/settings/ResetModal.jsx @@ -12,7 +12,7 @@ export default function ResetModal(props) { return ( <> -

{language.title}

+

{language.title}

{language.question}

{language.information}

diff --git a/src/components/modals/main/settings/sections/About.jsx b/src/components/modals/main/settings/sections/About.jsx index f5c691cb..7dd09560 100644 --- a/src/components/modals/main/settings/sections/About.jsx +++ b/src/components/modals/main/settings/sections/About.jsx @@ -86,7 +86,7 @@ export default class About extends React.PureComponent { <>

{this.language.title}

Mue logo -

{this.language.copyright} 2018-{new Date().getFullYear()} Mue Tab (BSD-3 License)

+

{this.language.copyright} 2018-{new Date().getFullYear()} The Mue Authors (BSD-3 License)

{this.language.version.title} {window.constants.VERSION} ({this.state.update})

{this.language.contact_us}

@@ -97,10 +97,17 @@ export default class About extends React.PureComponent {

{this.language.support_mue}

-

GitHub SponsorsKo-FiPatreon

+

+ GitHub Sponsors +   •  Ko-Fi +   •  Patreon +

{this.language.resources_used.title}

-

Pexels, Unsplash ({this.language.resources_used.bg_images})

+

+ Pexels + , Unsplash ({this.language.resources_used.bg_images}) +

Google Fonts ({this.language.resources_used.pin_icon})

Undraw ({this.language.resources_used.welcome_img})

diff --git a/src/components/modals/main/settings/sections/Experimental.jsx b/src/components/modals/main/settings/sections/Experimental.jsx index 87bb8fc1..817b90c9 100644 --- a/src/components/modals/main/settings/sections/Experimental.jsx +++ b/src/components/modals/main/settings/sections/Experimental.jsx @@ -2,7 +2,6 @@ import React from 'react'; import Checkbox from '../Checkbox'; import Slider from '../Slider'; -//import Text from '../Text'; export default function ExperimentalSettings() { const { experimental } = window.language.modals.main.settings.sections; @@ -15,15 +14,6 @@ export default function ExperimentalSettings() {

{experimental.developer}

- {/* - - - - - - -

- */}

diff --git a/src/components/modals/main/settings/sections/background/Background.jsx b/src/components/modals/main/settings/sections/background/Background.jsx index 1b982517..6dfda66d 100644 --- a/src/components/modals/main/settings/sections/background/Background.jsx +++ b/src/components/modals/main/settings/sections/background/Background.jsx @@ -139,7 +139,6 @@ export default class BackgroundSettings extends React.PureComponent { switch (this.state.backgroundType) { case 'custom': backgroundSettings = customSettings; break; case 'colour': backgroundSettings = ; break; - // API default: backgroundSettings = APISettings; break; } diff --git a/src/components/modals/main/settings/sections/background/Colour.jsx b/src/components/modals/main/settings/sections/background/Colour.jsx index c61d3b8d..0cd029a2 100644 --- a/src/components/modals/main/settings/sections/background/Colour.jsx +++ b/src/components/modals/main/settings/sections/background/Colour.jsx @@ -176,4 +176,4 @@ export default class ColourSettings extends React.PureComponent { ); } -} \ No newline at end of file +} diff --git a/src/components/widgets/navbar/Navbar.jsx b/src/components/widgets/navbar/Navbar.jsx index 06033e36..2795b831 100644 --- a/src/components/widgets/navbar/Navbar.jsx +++ b/src/components/widgets/navbar/Navbar.jsx @@ -19,10 +19,10 @@ export default function Navbar(props) { return ( <> - {(localStorage.getItem('navbarHover') === 'true') ?
:null} + {(localStorage.getItem('navbarHover') === 'true') ?
: null}
- {(localStorage.getItem('view') === 'true' && backgroundEnabled) ? :null} - {(localStorage.getItem('favouriteEnabled') === 'true' && backgroundEnabled) ? :null} + {(localStorage.getItem('view') === 'true' && backgroundEnabled) ? : null} + {(localStorage.getItem('favouriteEnabled') === 'true' && backgroundEnabled) ? : null} {(localStorage.getItem('notesEnabled') === 'true') ?
@@ -35,13 +35,13 @@ export default function Navbar(props) { props.openModal('feedbackModal')}/> - :null} + : null} {(localStorage.getItem('refresh') === 'true') ? window.location.reload()}/> - :null} + : null} props.openModal('mainModal')}/> diff --git a/src/components/widgets/navbar/Notes.jsx b/src/components/widgets/navbar/Notes.jsx index cced379c..d325f031 100644 --- a/src/components/widgets/navbar/Notes.jsx +++ b/src/components/widgets/navbar/Notes.jsx @@ -1,6 +1,7 @@ import React from 'react'; import TextareaAutosize from '@material-ui/core/TextareaAutosize'; + import CopyIcon from '@material-ui/icons/FileCopyRounded'; import NotesIcon from '@material-ui/icons/AssignmentRounded'; import Pin from './Pin'; diff --git a/src/components/widgets/navbar/scss/_notes.scss b/src/components/widgets/navbar/scss/_notes.scss index d1aba468..48869f4f 100644 --- a/src/components/widgets/navbar/scss/_notes.scss +++ b/src/components/widgets/navbar/scss/_notes.scss @@ -7,6 +7,10 @@ cursor: initial; user-select: none; } + + &:hover .notescontainer { + visibility: visible; + } } .notescontainer { @@ -30,10 +34,6 @@ } } -.notes:hover .notescontainer { - visibility: visible; -} - textarea { border: none; resize: none; diff --git a/src/components/widgets/navbar/scss/index.scss b/src/components/widgets/navbar/scss/index.scss index be17a7e1..9eb1b929 100644 --- a/src/components/widgets/navbar/scss/index.scss +++ b/src/components/widgets/navbar/scss/index.scss @@ -37,10 +37,6 @@ visibility: visible !important; } -.navbar-hidden + .navbar-container { - display: none; -} - .navbar-hidden { position: absolute; width: 50vw; @@ -48,12 +44,16 @@ top: 0; background: none; height: 75px; -} -.navbar-hidden:hover + .navbar-container { - display: block !important; -} + +.navbar-container { + display: none; + } -.navbar-container:hover { - display: block; -} \ No newline at end of file + &:hover { + display: block; + + +.navbar-container { + display: block !important; + } + } +} diff --git a/src/components/widgets/weather/Weather.jsx b/src/components/widgets/weather/Weather.jsx index d39e3260..14c35d96 100644 --- a/src/components/widgets/weather/Weather.jsx +++ b/src/components/widgets/weather/Weather.jsx @@ -169,8 +169,8 @@ export default class Weather extends React.PureComponent { {minmax()} {enabled('humidity') ?
{this.state.weather.humidity}%
: null} {enabled('windspeed') ?
{this.state.weather.wind_speed} m/s {enabled('windDirection') ? : null}
: null} - {enabled('cloudiness') ?
{this.state.weather.cloudiness}%
: null} - {enabled('visibility') ?
{this.state.weather.visibility} meters
: null} + {enabled('cloudiness') ?
{this.state.weather.cloudiness}%
: null} + {enabled('visibility') ?
{this.state.weather.visibility} meters
: null} {enabled('atmosphericpressure') ?
{this.state.weather.pressure} hPa
: null}
{enabled('showlocation') ? {this.state.location} : null} diff --git a/src/index.js b/src/index.js index 0aaa7872..cf976a73 100644 --- a/src/index.js +++ b/src/index.js @@ -15,7 +15,7 @@ import merge from '@material-ui/utils/esm/deepmerge'; const languagecode = localStorage.getItem('language') || 'en_GB'; -// we set things to window. so they're global and we avoid passing the translation strings as props to each component +// we set things to window. so we avoid passing the translation strings as props to each component window.languagecode = languagecode.replace('-', '_'); if (languagecode === 'en') { @@ -35,7 +35,6 @@ if (window.languagecode !== 'en_GB' || window.languagecode !== 'en_US') { document.documentElement.lang = window.languagecode.split('_')[0]; } -// window.constants window.constants = Constants; ReactDOM.render( diff --git a/webpack.config.js b/webpack.config.js index 1140138a..9cb23d32 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -2,7 +2,6 @@ const path = require('path'); const HtmlWebpackPlugin = require('html-webpack-plugin'); const CopyPlugin = require('copy-webpack-plugin'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); -//const ESLintPlugin = require('eslint-webpack-plugin'); module.exports = { entry: path.resolve(__dirname, './src/index.js'), @@ -72,6 +71,5 @@ module.exports = { filename: '[name].[chunkhash].css', chunkFilename: '[id].[chunkhash].chunk.css' }), - //new ESLintPlugin() ] };