refactor(modules): second part of moving files around, changing layout etc

This commit is contained in:
David Ralph
2024-02-19 09:42:59 +00:00
parent 618b5fe466
commit 294b3830bf
87 changed files with 760 additions and 728 deletions

View File

@@ -8,7 +8,7 @@ import {
MdDataUsage,
} from 'react-icons/md';
import { exportSettings, importSettings } from 'utils/helpers/settings/modals';
import { exportSettings, importSettings } from 'utils/settings';
import { FileUpload, Text, Switch, Dropdown } from 'components/Form/Settings';
import ResetModal from '../ResetModal';

View File

@@ -7,7 +7,7 @@ import { Header, Section, Row, Content, Action } from 'components/Layout/Setting
import { MdAccessibility } from 'react-icons/md';
import { values } from 'utils/helpers/settings/modals';
import values from 'utils/data/slider_values.json';
function AppearanceSettings() {
const [accessibility, setAccessibility] = useState(false);
@@ -226,7 +226,7 @@ function AppearanceSettings() {
step="100"
min="500"
max="5000"
marks={values('toast')}
marks={values.toast}
display={
' ' +
variables.getMessage(

View File

@@ -4,8 +4,8 @@ import Checkbox from '../../../../../components/Form/Settings/Checkbox/Checkbox'
import Slider from '../../../../../components/Form/Settings/Slider/Slider';
import { TextField } from '@mui/material';
import EventBus from 'utils/helpers/eventbus';
import { values } from 'utils/helpers/settings/modals';
import EventBus from 'utils/eventbus';
import values from 'utils/data/slider_values.json';
import { Row, Content, Action } from '../../../../../components/Layout/Settings/Item/SettingsItem';
@@ -34,7 +34,7 @@ function ExperimentalSettings() {
max="5000"
default="0"
step="100"
marks={values('experimental')}
marks={values.experimental}
element=".other"
/>
<p style={{ textAlign: 'left' }}>Send Event</p>

View File

@@ -5,7 +5,7 @@ import { toast } from 'react-toastify';
import { TextareaAutosize } from '@mui/material';
import { Header, Row, Content, Action, PreferencesWrapper } from 'components/Layout/Settings';
import EventBus from 'utils/helpers/eventbus';
import EventBus from 'utils/eventbus';
export default class Message extends PureComponent {
constructor() {

View File

@@ -13,7 +13,7 @@ import { Button } from 'components/Elements';
import { Row, Content, Action } from '../../../../../components/Layout/Settings/Item/SettingsItem';
import { Header } from 'components/Layout/Settings';
import { getTitleFromUrl, isValidUrl } from 'utils/helpers/settings/modals';
import { getTitleFromUrl, isValidUrl } from 'utils/links';
import QuickLink from './quicklinks/QuickLink';
function Navbar() {

View File

@@ -11,7 +11,7 @@ import QuickLinks from './overview_skeletons/QuickLinks';
import Date from './overview_skeletons/Date';
import Message from './overview_skeletons/Message';
import EventBus from 'utils/helpers/eventbus';
import EventBus from 'utils/eventbus';
const widget_name = {
greeting: variables.getMessage('modals.main.settings.sections.greeting.title'),

View File

@@ -8,9 +8,9 @@ import Modal from 'react-modal';
import AddModal from './quicklinks/AddModal';
import EventBus from 'utils/helpers/eventbus';
import EventBus from 'utils/eventbus';
import QuickLink from './quicklinks/QuickLink';
import { getTitleFromUrl, isValidUrl } from 'utils/helpers/settings/modals';
import { getTitleFromUrl, isValidUrl } from 'utils/links';
export default class QuickLinks extends PureComponent {
constructor() {

View File

@@ -14,7 +14,7 @@ import {
import { Checkbox, Dropdown } from 'components/Form/Settings';
import { toast } from 'react-toastify';
import EventBus from 'utils/helpers/eventbus';
import EventBus from 'utils/eventbus';
export default class QuoteSettings extends PureComponent {
constructor() {

View File

@@ -6,7 +6,7 @@ import { MenuItem, TextField } from '@mui/material';
import { Header, Row, Content, Action, PreferencesWrapper } from 'components/Layout/Settings';
import { Dropdown, Checkbox } from 'components/Form/Settings';
import EventBus from 'utils/helpers/eventbus';
import EventBus from 'utils/eventbus';
import searchEngines from 'features/widgets/search/search_engines.json';

View File

@@ -8,7 +8,7 @@ import { toast } from 'react-toastify';
import { Button } from 'components/Elements';
import { Header, CustomActions } from 'components/Layout/Settings';
import { saveFile } from 'utils/helpers/settings/modals';
import { saveFile } from 'utils/saveFile';
import achievementsData from 'utils/data/achievements.json';
import translations from 'i18n/locales/achievements/index';

View File

@@ -1,6 +1,5 @@
import variables from 'config/variables';
import { PureComponent } from 'react';
import { MenuItem } from '@mui/material';
import { MdSource, MdOutlineKeyboardArrowRight, MdOutlineAutoAwesome } from 'react-icons/md';
import { Header } from 'components/Layout/Settings';
@@ -19,7 +18,7 @@ import Text from '../../../../../../components/Form/Settings/Text/Text';
import ColourSettings from './Colour';
import CustomSettings from './Custom';
import { values } from 'utils/helpers/settings/modals';
import values from 'utils/data/slider_values.json';
export default class BackgroundSettings extends PureComponent {
constructor() {
@@ -542,7 +541,7 @@ export default class BackgroundSettings extends PureComponent {
max="100"
default="0"
display="%"
marks={values('background')}
marks={values.background}
category="background"
element="#backgroundImage"
/>
@@ -555,7 +554,7 @@ export default class BackgroundSettings extends PureComponent {
max="100"
default="90"
display="%"
marks={values('background')}
marks={values.background}
category="background"
element="#backgroundImage"
/>
@@ -616,7 +615,7 @@ export default class BackgroundSettings extends PureComponent {
max="100"
default="0"
display="%"
marks={values('background')}
marks={values.background}
category="background"
element="#backgroundImage"
/>

View File

@@ -8,8 +8,7 @@ import {
Action,
} from '../../../../../../components/Layout/Settings/Item/SettingsItem';
import hexToRgb from 'utils/helpers/background/hexToRgb';
import rgbToHex from 'utils/helpers/background/rgbToHex';
import { hexToRgb, rgbToHex } from 'utils/background/gradient';
//import '@muetab/react-color-gradient-picker/dist/index.css';
import '../../../scss/settings/react-color-picker-gradient-picker-custom-styles.scss';

View File

@@ -9,9 +9,9 @@ import {
MdOutlineFileUpload,
MdFolder,
} from 'react-icons/md';
import EventBus from 'utils/helpers/eventbus';
import EventBus from 'utils/eventbus';
import { compressAccurately, filetoDataURL } from 'image-conversion';
import { videoCheck } from 'utils/helpers/background/widget';
import { videoCheck } from 'utils/background';
import Checkbox from '../../../../../../components/Form/Settings/Checkbox/Checkbox';
import FileUpload from '../../../../../../components/Form/Settings/FileUpload/FileUpload';