refactor: imports etc

This commit is contained in:
David Ralph
2021-08-14 20:10:48 +01:00
parent 1a8bb69288
commit 39751736ca
55 changed files with 403 additions and 423 deletions

View File

@@ -1,11 +1,11 @@
import React from 'react';
import { PureComponent } from 'react';
import EventBus from '../../../../modules/helpers/eventbus';
import CheckboxUI from '@material-ui/core/Checkbox';
import FormControlLabel from '@material-ui/core/FormControlLabel';
export default class Checkbox extends React.PureComponent {
export default class Checkbox extends PureComponent {
constructor(props) {
super(props);
this.state = {

View File

@@ -1,8 +1,8 @@
import React from 'react';
import { PureComponent } from 'react';
import EventBus from '../../../../modules/helpers/eventbus';
export default class Dropdown extends React.PureComponent {
export default class Dropdown extends PureComponent {
constructor(props) {
super(props);
this.state = {

View File

@@ -1,8 +1,8 @@
import React from 'react';
import { PureComponent } from 'react';
import { toast } from 'react-toastify';
export default class FileUpload extends React.PureComponent {
export default class FileUpload extends PureComponent {
componentDidMount() {
document.getElementById(this.props.id).onchange = (e) => {
const reader = new FileReader();

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { PureComponent } from 'react';
import EventBus from '../../../../modules/helpers/eventbus';
@@ -8,7 +8,7 @@ import FormControlLabel from '@material-ui/core/FormControlLabel';
import FormControl from '@material-ui/core/FormControl';
import FormLabel from '@material-ui/core/FormLabel';
export default class Radio extends React.PureComponent {
export default class Radio extends PureComponent {
constructor(props) {
super(props);
this.state = {

View File

@@ -1,14 +1,14 @@
import CloseIcon from '@material-ui/icons/Close';
import DeleteIcon from '@material-ui/icons/Delete';
import SettingsFunctions from '../../../../modules/helpers/settings';
import { setDefaultSettings } from '../../../../modules/helpers/settings';
export default function ResetModal(props) {
const language = window.language.modals.main.settings.sections.advanced.reset_modal;
const reset = () => {
window.stats.postEvent('setting', 'Reset');
SettingsFunctions.setDefaultSettings('reset');
setDefaultSettings('reset');
window.location.reload();
};

View File

@@ -1,11 +1,11 @@
// todo: find a better method to do width of number input
import React from 'react';
import { PureComponent } from 'react';
import EventBus from '../../../../modules/helpers/eventbus';
import { toast } from 'react-toastify';
export default class Slider extends React.PureComponent {
export default class Slider extends PureComponent {
constructor(props) {
super(props);
this.state = {

View File

@@ -1,11 +1,11 @@
import React from 'react';
import { PureComponent } from 'react';
import EventBus from '../../../../modules/helpers/eventbus';
import SwitchUI from '@material-ui/core/Switch';
import FormControlLabel from '@material-ui/core/FormControlLabel';
export default class Switch extends React.PureComponent {
export default class Switch extends PureComponent {
constructor(props) {
super(props);
this.state = {

View File

@@ -1,10 +1,10 @@
import React from 'react';
import { PureComponent } from 'react';
import EventBus from '../../../../modules/helpers/eventbus';
import { toast } from 'react-toastify';
export default class Text extends React.PureComponent {
export default class Text extends PureComponent {
constructor(props) {
super(props);
this.state = {

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { PureComponent } from 'react';
import Tooltip from '../../../../helpers/tooltip/Tooltip';
import EmailIcon from '@material-ui/icons/Email';
@@ -9,7 +9,7 @@ import FacebookIcon from '@material-ui/icons/Facebook';
const other_contributors = require('../../../../../modules/other_contributors.json');
export default class About extends React.PureComponent {
export default class About extends PureComponent {
constructor() {
super();
this.state = {

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { PureComponent } from 'react';
import Checkbox from '../Checkbox';
import FileUpload from '../FileUpload';
@@ -7,13 +7,13 @@ import Switch from '../Switch';
import ResetModal from '../ResetModal';
import Dropdown from '../Dropdown';
import SettingsFunctions from '../../../../../modules/helpers/settings/modals';
import { exportSettings, importSettings } from '../../../../../modules/helpers/settings/modals';
import Modal from 'react-modal';
const time_zones = require('../../../../widgets/time/timezones.json');
export default class AdvancedSettings extends React.PureComponent {
export default class AdvancedSettings extends PureComponent {
constructor() {
super();
this.state = {
@@ -38,9 +38,9 @@ export default class AdvancedSettings extends React.PureComponent {
<h3>{advanced.data}</h3>
<button className='reset' onClick={() => this.setState({ resetModal: true })}>{this.language.buttons.reset}</button>
<button className='export' onClick={() => SettingsFunctions.exportSettings()}>{this.language.buttons.export}</button>
<button className='export' onClick={() => exportSettings()}>{this.language.buttons.export}</button>
<button className='import' onClick={() => document.getElementById('file-input').click()}>{this.language.buttons.import}</button>
<FileUpload id='file-input' accept='application/json' type='settings' loadFunction={(e) => SettingsFunctions.importSettings(e)}/>
<FileUpload id='file-input' accept='application/json' type='settings' loadFunction={(e) => importSettings(e)}/>
<h3>{advanced.customisation}</h3>
<Text title={advanced.tab_name} name='tabName' default={window.language.tabname} category='other'/>

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { PureComponent } from 'react';
import Modal from 'react-modal';
@@ -6,7 +6,7 @@ import Lightbox from '../../marketplace/Lightbox';
import WifiOffIcon from '@material-ui/icons/WifiOff';
export default class Changelog extends React.PureComponent {
export default class Changelog extends PureComponent {
constructor() {
super();
this.state = {

View File

@@ -1,11 +1,11 @@
import React from 'react';
import { PureComponent } from 'react';
import Checkbox from '../Checkbox';
import Switch from '../Switch';
import Text from '../Text';
import Slider from '../Slider';
export default class GreetingSettings extends React.PureComponent {
export default class GreetingSettings extends PureComponent {
constructor() {
super();
this.state = {

View File

@@ -1,10 +1,10 @@
import React from 'react';
import { PureComponent } from 'react';
import Radio from '../Radio';
const languages = require('../../../../../modules/languages.json');
export default class BackgroundSettings extends React.PureComponent {
export default class BackgroundSettings extends PureComponent {
constructor() {
super();
this.state = {

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { PureComponent } from 'react';
import EventBus from '../../../../../modules/helpers/eventbus';
@@ -36,7 +36,7 @@ const SortableContainer = sortableContainer(({ children }) => {
return <ul className='sortablecontainer'>{children}</ul>;
});
export default class OrderSettings extends React.PureComponent {
export default class OrderSettings extends PureComponent {
constructor() {
super();
this.state = {

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { PureComponent } from 'react';
import Checkbox from '../Checkbox';
import Text from '../Text';
@@ -6,7 +6,7 @@ import Switch from '../Switch';
import Slider from '../Slider';
import Dropdown from '../Dropdown';
export default class QuoteSettings extends React.PureComponent {
export default class QuoteSettings extends PureComponent {
constructor() {
super();
this.state = {

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { PureComponent } from 'react';
import Dropdown from '../Dropdown';
import Checkbox from '../Checkbox';
@@ -12,7 +12,7 @@ import { toast } from 'react-toastify';
const searchEngines = require('../../../../widgets/search/search_engines.json');
const autocompleteProviders = require('../../../../widgets/search/autocomplete_providers.json');
export default class SearchSettings extends React.PureComponent {
export default class SearchSettings extends PureComponent {
constructor() {
super();
this.state = {

View File

@@ -1,10 +1,10 @@
import React from 'react';
import { PureComponent } from 'react';
import Switch from '../Switch';
import EventBus from '../../../../../modules/helpers/eventbus';
export default class Stats extends React.PureComponent {
export default class Stats extends PureComponent {
constructor() {
super();
this.state = {

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { PureComponent } from 'react';
import Checkbox from '../Checkbox';
import Dropdown from '../Dropdown';
@@ -6,7 +6,7 @@ import Switch from '../Switch';
import Radio from '../Radio';
import Slider from '../Slider';
export default class TimeSettings extends React.PureComponent {
export default class TimeSettings extends PureComponent {
constructor() {
super();
this.state = {

View File

@@ -1,11 +1,11 @@
import React from 'react';
import { PureComponent } from 'react';
import Switch from '../Switch';
import Radio from '../Radio';
import Checkbox from '../Checkbox';
import Slider from '../Slider';
export default class TimeSettings extends React.PureComponent {
export default class TimeSettings extends PureComponent {
constructor() {
super();
this.state = {

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { PureComponent } from 'react';
import EventBus from '../../../../../../modules/helpers/eventbus';
@@ -13,7 +13,7 @@ import ColourSettings from './Colour';
import { toast } from 'react-toastify';
export default class BackgroundSettings extends React.PureComponent {
export default class BackgroundSettings extends PureComponent {
constructor() {
super();
this.state = {

View File

@@ -1,4 +1,4 @@
import React from 'react';
import { PureComponent, Fragment } from 'react';
import { ColorPicker } from 'react-color-gradient-picker';
@@ -10,7 +10,7 @@ import { toast } from 'react-toastify';
import 'react-color-gradient-picker/dist/index.css';
import '../../../scss/settings/react-color-picker-gradient-picker-custom-styles.scss';
export default class ColourSettings extends React.PureComponent {
export default class ColourSettings extends PureComponent {
DefaultGradientSettings = { angle: '180', gradient: [{ colour: '#ffb032', stop: 0 }], type: 'linear' };
GradientPickerInitalState = undefined;
@@ -166,10 +166,10 @@ export default class ColourSettings extends React.PureComponent {
} else {
gradientInputs = this.state.gradientSettings.gradient.map((g, i) => {
return (
<React.Fragment key={i}>
<Fragment key={i}>
<input id={'colour_' + i} type='color' name='colour' className='colour' onChange={(event) => this.onGradientChange(event, i)} value={g.colour}></input>
<label htmlFor={'colour_' + i} className='customBackgroundHex'>{g.colour}</label>
</React.Fragment>
</Fragment>
);
});
}