refactor: rename containers from 'Default' to 'The', small fixes

This commit is contained in:
woothu 2020-05-22 12:29:10 +02:00
parent f479a5dc72
commit bfc79da403
16 changed files with 76 additions and 82 deletions

View File

@ -9,7 +9,7 @@ const loading = (
) )
// Containers // Containers
const DefaultLayout = React.lazy(() => import('./containers/DefaultLayout')); const TheLayout = React.lazy(() => import('./containers/TheLayout'));
// Pages // Pages
const Login = React.lazy(() => import('./views/Pages/Login/Login')); const Login = React.lazy(() => import('./views/Pages/Login/Login'));
@ -28,7 +28,7 @@ class App extends Component {
<Route exact path="/register" name="Register Page" render={props => <Register {...props}/>} /> <Route exact path="/register" name="Register Page" render={props => <Register {...props}/>} />
<Route exact path="/404" name="Page 404" render={props => <Page404 {...props}/>} /> <Route exact path="/404" name="Page 404" render={props => <Page404 {...props}/>} />
<Route exact path="/500" name="Page 500" render={props => <Page500 {...props}/>} /> <Route exact path="/500" name="Page 500" render={props => <Page500 {...props}/>} />
<Route path="/" name="Home" render={props => <DefaultLayout {...props}/>} /> <Route path="/" name="Home" render={props => <TheLayout {...props}/>} />
</Switch> </Switch>
</React.Suspense> </React.Suspense>
</HashRouter> </HashRouter>

View File

@ -1,27 +0,0 @@
import React from 'react'
import {
DefaultContent,
DefaultSidebar,
DefaultAside,
DefaultFooter,
DefaultHeader
} from './index'
const DefaultLayout = () => {
return (
<div className="c-app c-default-layout">
<DefaultSidebar/>
<DefaultAside/>
<div className="c-wrapper">
<DefaultHeader/>
<div className="c-body">
<DefaultContent/>
</div>
<DefaultFooter/>
</div>
</div>
)
}
export default DefaultLayout

View File

@ -17,7 +17,7 @@ import {
} from '@coreui/react' } from '@coreui/react'
import { CIcon } from '@coreui/icons-react' import { CIcon } from '@coreui/icons-react'
const DefaultAside = () => { const TheAside = () => {
const show = useSelector(state => state.asideShow) const show = useSelector(state => state.asideShow)
const dispatch = useDispatch() const dispatch = useDispatch()
const setState = (state) => dispatch({type: 'set', asideShow: state}) const setState = (state) => dispatch({type: 'set', asideShow: state})
@ -239,4 +239,4 @@ const DefaultAside = () => {
) )
} }
export default React.memo(DefaultAside) export default React.memo(TheAside)

View File

@ -15,7 +15,7 @@ const loading = (
</div> </div>
) )
const DefaultContent = () => { const TheContent = () => {
return ( return (
<main className="c-main"> <main className="c-main">
<CContainer fluid> <CContainer fluid>
@ -43,4 +43,4 @@ const DefaultContent = () => {
) )
} }
export default React.memo(DefaultContent) export default React.memo(TheContent)

View File

@ -1,7 +1,7 @@
import React from 'react' import React from 'react'
import { CFooter } from '@coreui/react' import { CFooter } from '@coreui/react'
const DefaultFooter = () => { const TheFooter = () => {
return ( return (
<CFooter fixed={false}> <CFooter fixed={false}>
<div> <div>
@ -16,4 +16,4 @@ const DefaultFooter = () => {
) )
} }
export default React.memo(DefaultFooter) export default React.memo(TheFooter)

View File

@ -17,14 +17,14 @@ import { CIcon } from '@coreui/icons-react'
import routes from '../routes' import routes from '../routes'
import { import {
DefaultHeaderDropdown, TheHeaderDropdown,
DefaultHeaderDropdownMssg, TheHeaderDropdownMssg,
DefaultHeaderDropdownNotif, TheHeaderDropdownNotif,
DefaultHeaderDropdownTasks TheHeaderDropdownTasks
} from './index' } from './index'
import logo from '../assets/img/brand/coreui-react-neg.svg' import logo from '../assets/img/brand/coreui-react-neg.svg'
const DefaultHeader = () => { const TheHeader = () => {
const dispatch = useDispatch() const dispatch = useDispatch()
const asideShow = useSelector(state => state.asideShow) const asideShow = useSelector(state => state.asideShow)
const sidebarShow = useSelector(state => state.sidebarShow) const sidebarShow = useSelector(state => state.sidebarShow)
@ -68,10 +68,10 @@ const DefaultHeader = () => {
</CHeaderNav> </CHeaderNav>
<CHeaderNav className="px-3"> <CHeaderNav className="px-3">
<DefaultHeaderDropdownNotif/> <TheHeaderDropdownNotif/>
<DefaultHeaderDropdownTasks/> <TheHeaderDropdownTasks/>
<DefaultHeaderDropdownMssg/> <TheHeaderDropdownMssg/>
<DefaultHeaderDropdown/> <TheHeaderDropdown/>
<CToggler <CToggler
inHeader inHeader
className="d-md-down-none" className="d-md-down-none"
@ -103,4 +103,4 @@ const DefaultHeader = () => {
) )
} }
export default DefaultHeader export default TheHeader

View File

@ -9,7 +9,7 @@ import {
} from '@coreui/react' } from '@coreui/react'
import { CIcon } from '@coreui/icons-react' import { CIcon } from '@coreui/icons-react'
const DefaultHeaderDropdown = () => { const TheHeaderDropdown = () => {
return ( return (
<CDropdown <CDropdown
inNav inNav
@ -57,4 +57,4 @@ const DefaultHeaderDropdown = () => {
) )
} }
export default DefaultHeaderDropdown export default TheHeaderDropdown

View File

@ -9,7 +9,7 @@ import {
} from '@coreui/react' } from '@coreui/react'
import { CIcon } from '@coreui/icons-react' import { CIcon } from '@coreui/icons-react'
const DefaultHeaderDropdownMssg = () => { const TheHeaderDropdownMssg = () => {
const itemsCount = 4 const itemsCount = 4
return ( return (
<CDropdown <CDropdown
@ -124,4 +124,4 @@ const DefaultHeaderDropdownMssg = () => {
) )
} }
export default DefaultHeaderDropdownMssg export default TheHeaderDropdownMssg

View File

@ -9,7 +9,7 @@ import {
} from '@coreui/react' } from '@coreui/react'
import { CIcon } from '@coreui/icons-react' import { CIcon } from '@coreui/icons-react'
const DefaultHeaderDropdownNotif = () => { const TheHeaderDropdownNotif = () => {
const itemsCount = 5 const itemsCount = 5
return ( return (
<CDropdown <CDropdown
@ -67,4 +67,4 @@ const DefaultHeaderDropdownNotif = () => {
) )
} }
export default DefaultHeaderDropdownNotif export default TheHeaderDropdownNotif

View File

@ -9,7 +9,7 @@ import {
} from '@coreui/react' } from '@coreui/react'
import { CIcon } from '@coreui/icons-react' import { CIcon } from '@coreui/icons-react'
const DefaultHeaderDropdownTasks = () => { const TheHeaderDropdownTasks = () => {
const itemsCount = 5 const itemsCount = 5
return ( return (
<CDropdown <CDropdown
@ -56,4 +56,4 @@ const DefaultHeaderDropdownTasks = () => {
) )
} }
export default DefaultHeaderDropdownTasks export default TheHeaderDropdownTasks

View File

@ -0,0 +1,27 @@
import React from 'react'
import {
TheContent,
TheSidebar,
TheAside,
TheFooter,
TheHeader
} from './index'
const TheLayout = () => {
return (
<div className="c-app c-default-layout">
<TheSidebar/>
<TheAside/>
<div className="c-wrapper">
<TheHeader/>
<div className="c-body">
<TheContent/>
</div>
<TheFooter/>
</div>
</div>
)
}
export default TheLayout

View File

@ -21,7 +21,7 @@ import sygnet from '../assets/img/brand/coreui-signet-white.svg'
// sidebar nav config // sidebar nav config
import navigation from './_nav' import navigation from './_nav'
const DefaultSidebar = () => { const TheSidebar = () => {
const dispatch = useDispatch() const dispatch = useDispatch()
const show = useSelector(state => state.sidebarShow) const show = useSelector(state => state.sidebarShow)
@ -59,4 +59,4 @@ const DefaultSidebar = () => {
) )
} }
export default React.memo(DefaultSidebar) export default React.memo(TheSidebar)

View File

@ -1,23 +1,23 @@
import DefaultAside from './DefaultAside' import TheAside from './TheAside'
import DefaultContent from './DefaultContent' import TheContent from './TheContent'
import DefaultFooter from './DefaultFooter' import TheFooter from './TheFooter'
import DefaultHeader from './DefaultHeader' import TheHeader from './TheHeader'
import DefaultHeaderDropdown from './DefaultHeaderDropdown' import TheHeaderDropdown from './TheHeaderDropdown'
import DefaultHeaderDropdownMssg from './DefaultHeaderDropdownMssg' import TheHeaderDropdownMssg from './TheHeaderDropdownMssg'
import DefaultHeaderDropdownNotif from './DefaultHeaderDropdownNotif' import TheHeaderDropdownNotif from './TheHeaderDropdownNotif'
import DefaultHeaderDropdownTasks from './DefaultHeaderDropdownTasks' import TheHeaderDropdownTasks from './TheHeaderDropdownTasks'
import DefaultLayout from './DefaultLayout' import TheLayout from './TheLayout'
import DefaultSidebar from './DefaultSidebar' import TheSidebar from './TheSidebar'
export { export {
DefaultAside, TheAside,
DefaultContent, TheContent,
DefaultFooter, TheFooter,
DefaultHeader, TheHeader,
DefaultHeaderDropdown, TheHeaderDropdown,
DefaultHeaderDropdownMssg, TheHeaderDropdownMssg,
DefaultHeaderDropdownNotif, TheHeaderDropdownNotif,
DefaultHeaderDropdownTasks, TheHeaderDropdownTasks,
DefaultLayout, TheLayout,
DefaultSidebar TheSidebar
} }

View File

@ -1 +0,0 @@

View File

@ -3,7 +3,6 @@ import 'react-app-polyfill/stable';
import './polyfill' import './polyfill'
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import './index.css';
import App from './App'; import App from './App';
import * as serviceWorker from './serviceWorker'; import * as serviceWorker from './serviceWorker';

View File

@ -6,7 +6,3 @@
// If you want to add something do it here // If you want to add something do it here
@import "custom"; @import "custom";
// Spinkit
$spinkit-spinner-color: $body-color;
@import '~spinkit/scss/spinkit.scss';