diff --git a/src/App.js b/src/App.js index 7cfbfeb..486b218 100644 --- a/src/App.js +++ b/src/App.js @@ -13,7 +13,7 @@ import './scss/style.css' // import '../node_modules/@coreui/styles/scss/_dropdown-menu-right.scss'; // Containers -import { Full } from './containers'; +import { DefaultLayout } from './containers'; // Pages import { Login, Page404, Page500, Register } from './views/Pages'; @@ -28,7 +28,7 @@ class App extends Component { - + ); diff --git a/src/containers/Full/FullAside.js b/src/containers/DefaultLayout/DefaultAside.js similarity index 99% rename from src/containers/Full/FullAside.js rename to src/containers/DefaultLayout/DefaultAside.js index f87ec6a..55c790d 100644 --- a/src/containers/Full/FullAside.js +++ b/src/containers/DefaultLayout/DefaultAside.js @@ -10,7 +10,7 @@ const propTypes = { const defaultProps = {}; -class FullAside extends Component { +class DefaultAside extends Component { constructor(props) { super(props); @@ -311,7 +311,7 @@ class FullAside extends Component { } } -FullAside.propTypes = propTypes; -FullAside.defaultProps = defaultProps; +DefaultAside.propTypes = propTypes; +DefaultAside.defaultProps = defaultProps; -export default FullAside; +export default DefaultAside; diff --git a/src/containers/Full/FullFooter.js b/src/containers/DefaultLayout/DefaultFooter.js similarity index 77% rename from src/containers/Full/FullFooter.js rename to src/containers/DefaultLayout/DefaultFooter.js index d46e693..0e0fe03 100644 --- a/src/containers/Full/FullFooter.js +++ b/src/containers/DefaultLayout/DefaultFooter.js @@ -7,7 +7,7 @@ const propTypes = { const defaultProps = {}; -class FullFooter extends Component { +class DefaultFooter extends Component { render() { // eslint-disable-next-line @@ -22,7 +22,7 @@ class FullFooter extends Component { } } -FullFooter.propTypes = propTypes; -FullFooter.defaultProps = defaultProps; +DefaultFooter.propTypes = propTypes; +DefaultFooter.defaultProps = defaultProps; -export default FullFooter; +export default DefaultFooter; diff --git a/src/containers/Full/FullHeader.js b/src/containers/DefaultLayout/DefaultHeader.js similarity index 96% rename from src/containers/Full/FullHeader.js rename to src/containers/DefaultLayout/DefaultHeader.js index 51ac17d..3475ea4 100644 --- a/src/containers/Full/FullHeader.js +++ b/src/containers/DefaultLayout/DefaultHeader.js @@ -10,7 +10,7 @@ const propTypes = { const defaultProps = {}; -class FullHeader extends Component { +class DefaultHeader extends Component { render() { // eslint-disable-next-line @@ -74,7 +74,7 @@ class FullHeader extends Component { } } -FullHeader.propTypes = propTypes; -FullHeader.defaultProps = defaultProps; +DefaultHeader.propTypes = propTypes; +DefaultHeader.defaultProps = defaultProps; -export default FullHeader; +export default DefaultHeader; diff --git a/src/containers/Full/Full.js b/src/containers/DefaultLayout/DefaultLayout.js similarity index 84% rename from src/containers/Full/Full.js rename to src/containers/DefaultLayout/DefaultLayout.js index 6f7e49b..ccc2013 100644 --- a/src/containers/Full/Full.js +++ b/src/containers/DefaultLayout/DefaultLayout.js @@ -18,16 +18,16 @@ import { import navigation from '../../_nav'; // routes config import routes from '../../routes'; -import FullAside from './FullAside'; -import FullFooter from './FullFooter'; -import FullHeader from './FullHeader'; +import DefaultAside from './DefaultAside'; +import DefaultFooter from './DefaultFooter'; +import DefaultHeader from './DefaultHeader'; -class Full extends Component { +class DefaultLayout extends Component { render() { return (
- +
@@ -53,15 +53,15 @@ class Full extends Component {
- +
); } } -export default Full; +export default DefaultLayout; diff --git a/src/containers/Full/__tests__/FullAside.test.js b/src/containers/DefaultLayout/__tests__/DefaultAside.test.js similarity index 68% rename from src/containers/Full/__tests__/FullAside.test.js rename to src/containers/DefaultLayout/__tests__/DefaultAside.test.js index 300f61c..940c145 100644 --- a/src/containers/Full/__tests__/FullAside.test.js +++ b/src/containers/DefaultLayout/__tests__/DefaultAside.test.js @@ -1,9 +1,9 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import FullAside from '../FullAside'; +import DefaultAside from '../DefaultAside'; it('renders without crashing', () => { const div = document.createElement('div'); - ReactDOM.render(, div); + ReactDOM.render(, div); ReactDOM.unmountComponentAtNode(div); }); diff --git a/src/containers/Full/__tests__/FullFooter.test.js b/src/containers/DefaultLayout/__tests__/DefaultFooter.test.js similarity index 68% rename from src/containers/Full/__tests__/FullFooter.test.js rename to src/containers/DefaultLayout/__tests__/DefaultFooter.test.js index d9740be..d1ba9cf 100644 --- a/src/containers/Full/__tests__/FullFooter.test.js +++ b/src/containers/DefaultLayout/__tests__/DefaultFooter.test.js @@ -1,9 +1,9 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import FullFooter from '../FullFooter'; +import DefaultFooter from '../DefaultFooter'; it('renders without crashing', () => { const div = document.createElement('div'); - ReactDOM.render(, div); + ReactDOM.render(, div); ReactDOM.unmountComponentAtNode(div); }); diff --git a/src/containers/Full/__tests__/FullHeader.test.js b/src/containers/DefaultLayout/__tests__/DefaultHeader.test.js similarity index 68% rename from src/containers/Full/__tests__/FullHeader.test.js rename to src/containers/DefaultLayout/__tests__/DefaultHeader.test.js index bf17fa6..4bd014b 100644 --- a/src/containers/Full/__tests__/FullHeader.test.js +++ b/src/containers/DefaultLayout/__tests__/DefaultHeader.test.js @@ -1,9 +1,9 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import FullHeader from '../FullHeader'; +import DefaultHeader from '../DefaultHeader'; it('renders without crashing', () => { const div = document.createElement('div'); - ReactDOM.render(, div); + ReactDOM.render(, div); ReactDOM.unmountComponentAtNode(div); }); diff --git a/src/containers/DefaultLayout/index.js b/src/containers/DefaultLayout/index.js new file mode 100644 index 0000000..d7dcb4c --- /dev/null +++ b/src/containers/DefaultLayout/index.js @@ -0,0 +1,3 @@ +import DefaultLayout from './DefaultLayout'; + +export default DefaultLayout; diff --git a/src/containers/Full/package.json b/src/containers/DefaultLayout/package.json similarity index 100% rename from src/containers/Full/package.json rename to src/containers/DefaultLayout/package.json diff --git a/src/containers/index.js b/src/containers/index.js index 74f12b3..c63af38 100644 --- a/src/containers/index.js +++ b/src/containers/index.js @@ -1,3 +1,3 @@ -import Full from './Full'; +import DefaultLayout from './DefaultLayout'; -export { Full }; \ No newline at end of file +export { DefaultLayout }; diff --git a/src/routes.js b/src/routes.js index 967bac3..baf7233 100644 --- a/src/routes.js +++ b/src/routes.js @@ -32,11 +32,11 @@ import { Typography, Widgets, } from './views'; -import Full from './containers/Full'; +import DefaultLayout from './containers/DefaultLayout'; // https://github.com/ReactTraining/react-router/tree/master/packages/react-router-config const routes = [ - { path: '/', exact: true, name: 'Home', component: Full }, + { path: '/', exact: true, name: 'Home', component: DefaultLayout }, { path: '/dashboard', name: 'Dashboard', component: Dashboard }, { path: '/theme', exact: true, name: 'Theme', component: Colors }, { path: '/theme/colors', name: 'Colors', component: Colors },