refactor: rename Full container to DefaultLayout

This commit is contained in:
xidedix 2018-05-01 17:38:56 +02:00
parent ae6ebc7e4d
commit cc70b1c351
12 changed files with 35 additions and 32 deletions

View File

@ -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 {
<Route exact path="/register" name="Register Page" component={Register} />
<Route exact path="/404" name="Page 404" component={Page404} />
<Route exact path="/500" name="Page 500" component={Page500} />
<Route path="/" name="Home" component={Full} />
<Route path="/" name="Home" component={DefaultLayout} />
</Switch>
</HashRouter>
);

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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 (
<div className="app">
<AppHeader fixed>
<FullHeader />
<DefaultHeader />
</AppHeader>
<div className="app-body">
<AppSidebar fixed display="lg">
@ -53,15 +53,15 @@ class Full extends Component {
</Container>
</main>
<AppAside fixed hidden>
<FullAside />
<DefaultAside />
</AppAside>
</div>
<AppFooter>
<FullFooter />
<DefaultFooter />
</AppFooter>
</div>
);
}
}
export default Full;
export default DefaultLayout;

View File

@ -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(<FullAside />, div);
ReactDOM.render(<DefaultAside />, div);
ReactDOM.unmountComponentAtNode(div);
});

View File

@ -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(<FullFooter />, div);
ReactDOM.render(<DefaultFooter />, div);
ReactDOM.unmountComponentAtNode(div);
});

View File

@ -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(<FullHeader />, div);
ReactDOM.render(<DefaultHeader />, div);
ReactDOM.unmountComponentAtNode(div);
});

View File

@ -0,0 +1,3 @@
import DefaultLayout from './DefaultLayout';
export default DefaultLayout;

View File

@ -1,3 +1,3 @@
import Full from './Full';
import DefaultLayout from './DefaultLayout';
export { Full };
export { DefaultLayout };

View File

@ -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 },