From fabb6b5b7c0bcfbbb4e06ee6bf84582f739669df Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Wed, 23 Oct 2019 18:12:18 -0500 Subject: [PATCH] Refactoring --- src/containers/Configuration/Configuration.js | 2 +- .../ConfigurationItem/ConfigurationItem.css | 0 .../ConfigurationItem/ConfigurationItem.js | 8 ++++---- .../MountItems}/MountItem/MountItem.css | 0 .../MountItems}/MountItem/MountItem.js | 16 ++++++++-------- src/containers/MountItems/MountItems.js | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) rename src/{components => containers/Configuration}/ConfigurationItem/ConfigurationItem.css (100%) rename src/{components => containers/Configuration}/ConfigurationItem/ConfigurationItem.js (94%) rename src/{components => containers/MountItems}/MountItem/MountItem.css (100%) rename src/{components => containers/MountItems}/MountItem/MountItem.js (92%) diff --git a/src/containers/Configuration/Configuration.js b/src/containers/Configuration/Configuration.js index 16c2c9d..3e89a96 100644 --- a/src/containers/Configuration/Configuration.js +++ b/src/containers/Configuration/Configuration.js @@ -3,7 +3,7 @@ import './Configuration.css'; import {connect} from 'react-redux'; import Box from '../../components/UI/Box/Box'; import Button from '../../components/UI/Button/Button'; -import ConfigurationItem from '../../components/ConfigurationItem/ConfigurationItem'; +import ConfigurationItem from './ConfigurationItem/ConfigurationItem'; import Modal from '../../components/UI/Modal/Modal'; import IPCContainer from '../IPCContainer/IPCContainer'; import {displayConfiguration} from '../../redux/actions/mount_actions'; diff --git a/src/components/ConfigurationItem/ConfigurationItem.css b/src/containers/Configuration/ConfigurationItem/ConfigurationItem.css similarity index 100% rename from src/components/ConfigurationItem/ConfigurationItem.css rename to src/containers/Configuration/ConfigurationItem/ConfigurationItem.css diff --git a/src/components/ConfigurationItem/ConfigurationItem.js b/src/containers/Configuration/ConfigurationItem/ConfigurationItem.js similarity index 94% rename from src/components/ConfigurationItem/ConfigurationItem.js rename to src/containers/Configuration/ConfigurationItem/ConfigurationItem.js index a3a6715..5a4d08a 100644 --- a/src/components/ConfigurationItem/ConfigurationItem.js +++ b/src/containers/Configuration/ConfigurationItem/ConfigurationItem.js @@ -1,12 +1,12 @@ import React from 'react'; import './ConfigurationItem.css'; -import CheckBox from '../UI/CheckBox/CheckBox'; +import CheckBox from '../../../components/UI/CheckBox/CheckBox'; import {connect} from 'react-redux'; import {faInfoCircle} from '@fortawesome/free-solid-svg-icons'; import {FontAwesomeIcon} from '@fortawesome/react-fontawesome'; -import {notifyInfo} from '../../redux/actions/error_actions'; -import settings from '../../assets/settings'; -import DropDown from '../UI/DropDown/DropDown'; +import {notifyInfo} from '../../../redux/actions/error_actions'; +import settings from '../../../assets/settings'; +import DropDown from '../../../components/UI/DropDown/DropDown'; const mapDispatchToProps = dispatch => { return { diff --git a/src/components/MountItem/MountItem.css b/src/containers/MountItems/MountItem/MountItem.css similarity index 100% rename from src/components/MountItem/MountItem.css rename to src/containers/MountItems/MountItem/MountItem.css diff --git a/src/components/MountItem/MountItem.js b/src/containers/MountItems/MountItem/MountItem.js similarity index 92% rename from src/components/MountItem/MountItem.js rename to src/containers/MountItems/MountItem/MountItem.js index 8e41394..b56ae7e 100644 --- a/src/components/MountItem/MountItem.js +++ b/src/containers/MountItems/MountItem/MountItem.js @@ -1,17 +1,17 @@ import React from 'react'; import './MountItem.css'; import {connect} from 'react-redux'; -import DropDown from '../UI/DropDown/DropDown'; -import Button from '../UI/Button/Button'; +import DropDown from '../../../components/UI/DropDown/DropDown'; +import Button from '../../../components/UI/Button/Button'; import Loader from 'react-loader-spinner'; -import Text from '../UI/Text/Text'; -import Grid from '../UI/Grid/Grid'; -import configureImage from '../../assets/images/configure.png'; -import RootElem from '../UI/RootElem/RootElem'; -import {displayConfiguration, removeRemoteMount, setProviderState} from '../../redux/actions/mount_actions'; +import Text from '../../../components/UI/Text/Text'; +import Grid from '../../../components/UI/Grid/Grid'; +import configureImage from '../../../assets/images/configure.png'; +import RootElem from '../../../components/UI/RootElem/RootElem'; +import {displayConfiguration, removeRemoteMount, setProviderState} from '../../../redux/actions/mount_actions'; import {FontAwesomeIcon} from '@fortawesome/react-fontawesome'; import { faTrashAlt} from '@fortawesome/free-solid-svg-icons'; -import CheckBox from '../UI/CheckBox/CheckBox'; +import CheckBox from '../../../components/UI/CheckBox/CheckBox'; const mapStateToProps = (state, ownProps) => { return { diff --git a/src/containers/MountItems/MountItems.js b/src/containers/MountItems/MountItems.js index 9700b3f..2f94fa4 100644 --- a/src/containers/MountItems/MountItems.js +++ b/src/containers/MountItems/MountItems.js @@ -5,7 +5,7 @@ import Button from '../../components/UI/Button/Button'; import {connect} from 'react-redux'; import './MountItems.css'; import Modal from '../../components/UI/Modal/Modal'; -import MountItem from '../../components/MountItem/MountItem'; +import MountItem from './MountItem/MountItem'; import IPCContainer from '../IPCContainer/IPCContainer'; import { resetMountsState,