diff --git a/.gitignore b/.gitignore index 88927bbd..0cea6301 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ build/ # Files package-lock.json yarn-error.log +.eslintcache yarn.lock \ No newline at end of file diff --git a/package.json b/package.json index 27d42c94..ac338caf 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,8 @@ "supports-webp": "2.0.1" }, "devDependencies": { - "react-scripts": "4.0.1", - "node-sass": "^5.0.0" + "node-sass": "4.14.1", + "react-scripts": "4.0.1" }, "scripts": { "start": "react-scripts start", diff --git a/src/App.jsx b/src/App.jsx index 1f027034..e47a5451 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -12,7 +12,7 @@ import Date from './components/widgets/Date'; import Navbar from './components/Navbar'; -import SettingsFunctions from './modules/helpers/Settings'; +import SettingsFunctions from './modules/helpers/settings'; import { ToastContainer } from 'react-toastify'; import Modal from 'react-modal'; import merge from 'lodash.merge'; diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx index 35a44e27..f7aff52c 100644 --- a/src/components/Navbar.jsx +++ b/src/components/Navbar.jsx @@ -5,7 +5,7 @@ import NewReleases from '@material-ui/icons/NewReleasesRounded'; import NotesIcon from '@material-ui/icons/AssignmentRounded'; import Tooltip from '@material-ui/core/Tooltip'; import Report from '@material-ui/icons/SmsFailed'; -import * as Constants from '../modules/Constants'; +import * as Constants from '../modules/constants'; const Notes = React.lazy(() => import('./widgets/Notes')); // the user probably won't use the notes feature every time so we lazy load const renderLoader = () =>
; diff --git a/src/components/modals/Update.jsx b/src/components/modals/Update.jsx index 0bac3dfe..0d09aa33 100644 --- a/src/components/modals/Update.jsx +++ b/src/components/modals/Update.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import * as Constants from '../../modules/Constants'; +import * as Constants from '../../modules/constants'; export default class Update extends React.PureComponent { constructor(...args) { diff --git a/src/components/modals/settings/Checkbox.jsx b/src/components/modals/settings/Checkbox.jsx index 41c4efd9..25a1d11c 100644 --- a/src/components/modals/settings/Checkbox.jsx +++ b/src/components/modals/settings/Checkbox.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import SettingsFunctions from '../../../modules/helpers/Settings'; +import SettingsFunctions from '../../../modules/helpers/settings'; import CheckboxUI from '@material-ui/core/Checkbox'; import FormControlLabel from '@material-ui/core/FormControlLabel'; diff --git a/src/components/modals/settings/Slider.jsx b/src/components/modals/settings/Slider.jsx index 8ca4bf3b..2826d475 100644 --- a/src/components/modals/settings/Slider.jsx +++ b/src/components/modals/settings/Slider.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import SettingsFunctions from '../../../modules/helpers/Settings'; +import SettingsFunctions from '../../../modules/helpers/settings'; export default class Slider extends React.PureComponent { constructor(...args) { diff --git a/src/components/modals/settings/sections/SearchSettings.jsx b/src/components/modals/settings/sections/SearchSettings.jsx index 69f4cbb2..c336c750 100644 --- a/src/components/modals/settings/sections/SearchSettings.jsx +++ b/src/components/modals/settings/sections/SearchSettings.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import SettingsFunctions from '../../../../modules/helpers/Settings'; +import SettingsFunctions from '../../../../modules/helpers/settings'; import { toast } from 'react-toastify'; import Section from '../Section'; import Dropdown from '../Dropdown'; diff --git a/src/components/modals/tabs/Addons.jsx b/src/components/modals/tabs/Addons.jsx index 6cdf5a0c..aad2680e 100644 --- a/src/components/modals/tabs/Addons.jsx +++ b/src/components/modals/tabs/Addons.jsx @@ -3,7 +3,7 @@ import LocalMallIcon from '@material-ui/icons/LocalMall'; import { toast } from 'react-toastify'; import Item from '../marketplace/Item'; import Items from '../marketplace/Items'; -import MarketplaceFunctions from '../../../modules/helpers/Marketplace'; +import MarketplaceFunctions from '../../../modules/helpers/marketplace'; export default class Addons extends React.PureComponent { constructor(...args) { diff --git a/src/components/modals/tabs/Marketplace.jsx b/src/components/modals/tabs/Marketplace.jsx index 7d69e028..27830d19 100644 --- a/src/components/modals/tabs/Marketplace.jsx +++ b/src/components/modals/tabs/Marketplace.jsx @@ -3,8 +3,8 @@ import WifiOffIcon from '@material-ui/icons/WifiOff'; import ArrowBackIcon from '@material-ui/icons/ArrowBack'; import { toast } from 'react-toastify'; import Item from '../marketplace/Item'; -import MarketplaceFunctions from '../../../modules/helpers/Marketplace'; -import * as Constants from '../../../modules/Constants'; +import MarketplaceFunctions from '../../../modules/helpers/marketplace'; +import * as Constants from '../../../modules/constants'; import Items from '../marketplace/Items'; export default class Marketplace extends React.PureComponent { diff --git a/src/components/modals/tabs/Settings.jsx b/src/components/modals/tabs/Settings.jsx index 029fcef4..79c084bb 100644 --- a/src/components/modals/tabs/Settings.jsx +++ b/src/components/modals/tabs/Settings.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import SettingsFunctions from '../../../modules/helpers/Settings'; +import SettingsFunctions from '../../../modules/helpers/settings'; import Checkbox from '../settings/Checkbox'; import Section from '../settings/Section'; import { toast } from 'react-toastify'; diff --git a/src/components/widgets/Background.jsx b/src/components/widgets/Background.jsx index fa99f57b..dce35c26 100644 --- a/src/components/widgets/Background.jsx +++ b/src/components/widgets/Background.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import * as Constants from '../../modules/Constants'; +import * as Constants from '../../modules/constants'; export default class Background extends React.PureComponent { gradientStyleBuilder(gradientSettings) { diff --git a/src/components/widgets/Clock.jsx b/src/components/widgets/Clock.jsx index 6ba3d149..e56e2c37 100644 --- a/src/components/widgets/Clock.jsx +++ b/src/components/widgets/Clock.jsx @@ -16,6 +16,11 @@ export default class Clock extends React.PureComponent { this.timer = setTimeout(() => { const now = new Date(); + // Percentage + if (localStorage.getItem('percentageComplete') === 'true') { + return this.setState({ time: (now.getHours() / 24).toFixed(2) + '%'}) + } + // Analog clock if (localStorage.getItem('analog') === 'true') this.setState({ time: now }); else { diff --git a/src/components/widgets/Quote.jsx b/src/components/widgets/Quote.jsx index b42ded62..1cbfedc4 100644 --- a/src/components/widgets/Quote.jsx +++ b/src/components/widgets/Quote.jsx @@ -2,7 +2,7 @@ import React from 'react'; import Quotes from '@muetab/quotes'; import FileCopy from '@material-ui/icons/FilterNone'; import { toast } from 'react-toastify'; -import * as Constants from '../../modules/Constants'; +import * as Constants from '../../modules/constants'; import TwitterIcon from '@material-ui/icons/Twitter'; import StarIcon from '@material-ui/icons/Star'; import StarIcon2 from '@material-ui/icons/StarBorder';