Skip to content

Commit

Permalink
refactor: rename containers from 'Default' to 'The', small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
woothu committed May 22, 2020
1 parent f479a5d commit bfc79da
Show file tree
Hide file tree
Showing 16 changed files with 76 additions and 82 deletions.
4 changes: 2 additions & 2 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const loading = (
)

// Containers
const DefaultLayout = React.lazy(() => import('./containers/DefaultLayout'));
const TheLayout = React.lazy(() => import('./containers/TheLayout'));

// Pages
const Login = React.lazy(() => import('./views/Pages/Login/Login'));
Expand All @@ -28,7 +28,7 @@ class App extends Component {
<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="/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>
</React.Suspense>
</HashRouter>
Expand Down
27 changes: 0 additions & 27 deletions src/containers/DefaultLayout.js

This file was deleted.

4 changes: 2 additions & 2 deletions src/containers/DefaultAside.js → src/containers/TheAside.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
} from '@coreui/react'
import { CIcon } from '@coreui/icons-react'

const DefaultAside = () => {
const TheAside = () => {
const show = useSelector(state => state.asideShow)
const dispatch = useDispatch()
const setState = (state) => dispatch({type: 'set', asideShow: state})
Expand Down Expand Up @@ -239,4 +239,4 @@ const DefaultAside = () => {
)
}

export default React.memo(DefaultAside)
export default React.memo(TheAside)
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const loading = (
</div>
)

const DefaultContent = () => {
const TheContent = () => {
return (
<main className="c-main">
<CContainer fluid>
Expand Down Expand Up @@ -43,4 +43,4 @@ const DefaultContent = () => {
)
}

export default React.memo(DefaultContent)
export default React.memo(TheContent)
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import { CFooter } from '@coreui/react'

const DefaultFooter = () => {
const TheFooter = () => {
return (
<CFooter fixed={false}>
<div>
Expand All @@ -16,4 +16,4 @@ const DefaultFooter = () => {
)
}

export default React.memo(DefaultFooter)
export default React.memo(TheFooter)
20 changes: 10 additions & 10 deletions src/containers/DefaultHeader.js → src/containers/TheHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ import { CIcon } from '@coreui/icons-react'
import routes from '../routes'

import {
DefaultHeaderDropdown,
DefaultHeaderDropdownMssg,
DefaultHeaderDropdownNotif,
DefaultHeaderDropdownTasks
TheHeaderDropdown,
TheHeaderDropdownMssg,
TheHeaderDropdownNotif,
TheHeaderDropdownTasks
} from './index'
import logo from '../assets/img/brand/coreui-react-neg.svg'

const DefaultHeader = () => {
const TheHeader = () => {
const dispatch = useDispatch()
const asideShow = useSelector(state => state.asideShow)
const sidebarShow = useSelector(state => state.sidebarShow)
Expand Down Expand Up @@ -68,10 +68,10 @@ const DefaultHeader = () => {
</CHeaderNav>

<CHeaderNav className="px-3">
<DefaultHeaderDropdownNotif/>
<DefaultHeaderDropdownTasks/>
<DefaultHeaderDropdownMssg/>
<DefaultHeaderDropdown/>
<TheHeaderDropdownNotif/>
<TheHeaderDropdownTasks/>
<TheHeaderDropdownMssg/>
<TheHeaderDropdown/>
<CToggler
inHeader
className="d-md-down-none"
Expand Down Expand Up @@ -103,4 +103,4 @@ const DefaultHeader = () => {
)
}

export default DefaultHeader
export default TheHeader
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from '@coreui/react'
import { CIcon } from '@coreui/icons-react'

const DefaultHeaderDropdown = () => {
const TheHeaderDropdown = () => {
return (
<CDropdown
inNav
Expand Down Expand Up @@ -57,4 +57,4 @@ const DefaultHeaderDropdown = () => {
)
}

export default DefaultHeaderDropdown
export default TheHeaderDropdown
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from '@coreui/react'
import { CIcon } from '@coreui/icons-react'

const DefaultHeaderDropdownMssg = () => {
const TheHeaderDropdownMssg = () => {
const itemsCount = 4
return (
<CDropdown
Expand Down Expand Up @@ -124,4 +124,4 @@ const DefaultHeaderDropdownMssg = () => {
)
}

export default DefaultHeaderDropdownMssg
export default TheHeaderDropdownMssg
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from '@coreui/react'
import { CIcon } from '@coreui/icons-react'

const DefaultHeaderDropdownNotif = () => {
const TheHeaderDropdownNotif = () => {
const itemsCount = 5
return (
<CDropdown
Expand Down Expand Up @@ -67,4 +67,4 @@ const DefaultHeaderDropdownNotif = () => {
)
}

export default DefaultHeaderDropdownNotif
export default TheHeaderDropdownNotif
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from '@coreui/react'
import { CIcon } from '@coreui/icons-react'

const DefaultHeaderDropdownTasks = () => {
const TheHeaderDropdownTasks = () => {
const itemsCount = 5
return (
<CDropdown
Expand Down Expand Up @@ -56,4 +56,4 @@ const DefaultHeaderDropdownTasks = () => {
)
}

export default DefaultHeaderDropdownTasks
export default TheHeaderDropdownTasks
27 changes: 27 additions & 0 deletions src/containers/TheLayout.js
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import sygnet from '../assets/img/brand/coreui-signet-white.svg'
// sidebar nav config
import navigation from './_nav'

const DefaultSidebar = () => {
const TheSidebar = () => {
const dispatch = useDispatch()
const show = useSelector(state => state.sidebarShow)

Expand Down Expand Up @@ -59,4 +59,4 @@ const DefaultSidebar = () => {
)
}

export default React.memo(DefaultSidebar)
export default React.memo(TheSidebar)
40 changes: 20 additions & 20 deletions src/containers/index.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
import DefaultAside from './DefaultAside'
import DefaultContent from './DefaultContent'
import DefaultFooter from './DefaultFooter'
import DefaultHeader from './DefaultHeader'
import DefaultHeaderDropdown from './DefaultHeaderDropdown'
import DefaultHeaderDropdownMssg from './DefaultHeaderDropdownMssg'
import DefaultHeaderDropdownNotif from './DefaultHeaderDropdownNotif'
import DefaultHeaderDropdownTasks from './DefaultHeaderDropdownTasks'
import DefaultLayout from './DefaultLayout'
import DefaultSidebar from './DefaultSidebar'
import TheAside from './TheAside'
import TheContent from './TheContent'
import TheFooter from './TheFooter'
import TheHeader from './TheHeader'
import TheHeaderDropdown from './TheHeaderDropdown'
import TheHeaderDropdownMssg from './TheHeaderDropdownMssg'
import TheHeaderDropdownNotif from './TheHeaderDropdownNotif'
import TheHeaderDropdownTasks from './TheHeaderDropdownTasks'
import TheLayout from './TheLayout'
import TheSidebar from './TheSidebar'

export {
DefaultAside,
DefaultContent,
DefaultFooter,
DefaultHeader,
DefaultHeaderDropdown,
DefaultHeaderDropdownMssg,
DefaultHeaderDropdownNotif,
DefaultHeaderDropdownTasks,
DefaultLayout,
DefaultSidebar
TheAside,
TheContent,
TheFooter,
TheHeader,
TheHeaderDropdown,
TheHeaderDropdownMssg,
TheHeaderDropdownNotif,
TheHeaderDropdownTasks,
TheLayout,
TheSidebar
}
1 change: 0 additions & 1 deletion src/index.css

This file was deleted.

3 changes: 1 addition & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ import 'react-app-polyfill/stable';
import './polyfill'
import React from 'react';
import ReactDOM from 'react-dom';
import './index.css';
import App from './App';
import * as serviceWorker from './serviceWorker';

import {freeSet, flagSet, brandSet} from '@coreui/icons';
import { freeSet, flagSet, brandSet } from '@coreui/icons';
import { logo } from './assets/icons/logo'

import { Provider } from 'react-redux'
Expand Down
4 changes: 0 additions & 4 deletions src/scss/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,3 @@

// If you want to add something do it here
@import "custom";

// Spinkit
$spinkit-spinner-color: $body-color;
@import '~spinkit/scss/spinkit.scss';

0 comments on commit bfc79da

Please sign in to comment.