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

woothu · woothu · commit bfc79da4039d · 2020-05-22T12:29:10.000+02:00
diff --git a/src/App.js b/src/App.js
@@ -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'));
@@ -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>
diff --git a/src/containers/DefaultLayout.js b/src/containers/DefaultLayout.js
diff --git a/src/containers/TheAside.js b/src/containers/TheAside.js
@@ -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})
@@ -239,4 +239,4 @@ const DefaultAside = () => {
   )
 }
 
-export default React.memo(DefaultAside)
+export default React.memo(TheAside)
diff --git a/src/containers/TheContent.js b/src/containers/TheContent.js
@@ -15,7 +15,7 @@ const loading = (
   </div>
 )
 
-const DefaultContent = () => {
+const TheContent = () => {
   return (
     <main className="c-main">
       <CContainer fluid>
@@ -43,4 +43,4 @@ const DefaultContent = () => {
   )
 }
 
-export default React.memo(DefaultContent)
+export default React.memo(TheContent)
diff --git a/src/containers/TheFooter.js b/src/containers/TheFooter.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import { CFooter } from '@coreui/react'
 
-const DefaultFooter = () => {
+const TheFooter = () => {
   return (
     <CFooter fixed={false}>
       <div>
@@ -16,4 +16,4 @@ const DefaultFooter = () => {
   )
 }
 
-export default React.memo(DefaultFooter)
+export default React.memo(TheFooter)
diff --git a/src/containers/TheHeader.js b/src/containers/TheHeader.js
@@ -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)
@@ -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"
@@ -103,4 +103,4 @@ const DefaultHeader = () => {
   )
 }
 
-export default DefaultHeader
+export default TheHeader
diff --git a/src/containers/TheHeaderDropdown.js b/src/containers/TheHeaderDropdown.js
@@ -9,7 +9,7 @@ import {
 } from '@coreui/react'
 import { CIcon } from '@coreui/icons-react'
 
-const DefaultHeaderDropdown = () => {
+const TheHeaderDropdown = () => {
   return (
     <CDropdown
       inNav
@@ -57,4 +57,4 @@ const DefaultHeaderDropdown = () => {
   )
 }
 
-export default DefaultHeaderDropdown
+export default TheHeaderDropdown
diff --git a/src/containers/TheHeaderDropdownMssg.js b/src/containers/TheHeaderDropdownMssg.js
@@ -9,7 +9,7 @@ import {
 } from '@coreui/react'
 import { CIcon } from '@coreui/icons-react'
 
-const DefaultHeaderDropdownMssg = () => {
+const TheHeaderDropdownMssg = () => {
   const itemsCount = 4
   return (
     <CDropdown
@@ -124,4 +124,4 @@ const DefaultHeaderDropdownMssg = () => {
   )
 }
 
-export default DefaultHeaderDropdownMssg
+export default TheHeaderDropdownMssg
diff --git a/src/containers/TheHeaderDropdownNotif.js b/src/containers/TheHeaderDropdownNotif.js
@@ -9,7 +9,7 @@ import {
 } from '@coreui/react'
 import { CIcon } from '@coreui/icons-react'
 
-const DefaultHeaderDropdownNotif = () => {
+const TheHeaderDropdownNotif = () => {
   const itemsCount = 5
   return (
     <CDropdown
@@ -67,4 +67,4 @@ const DefaultHeaderDropdownNotif = () => {
   )
 }
 
-export default DefaultHeaderDropdownNotif
+export default TheHeaderDropdownNotif
diff --git a/src/containers/TheHeaderDropdownTasks.js b/src/containers/TheHeaderDropdownTasks.js
@@ -9,7 +9,7 @@ import {
 } from '@coreui/react'
 import { CIcon } from '@coreui/icons-react'
 
-const DefaultHeaderDropdownTasks = () => {
+const TheHeaderDropdownTasks = () => {
   const itemsCount = 5
   return (
     <CDropdown
@@ -56,4 +56,4 @@ const DefaultHeaderDropdownTasks = () => {
   )
 }
 
-export default DefaultHeaderDropdownTasks
+export default TheHeaderDropdownTasks
diff --git a/src/containers/TheLayout.js b/src/containers/TheLayout.js
@@ -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
diff --git a/src/containers/TheSidebar.js b/src/containers/TheSidebar.js
@@ -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)
 
@@ -59,4 +59,4 @@ const DefaultSidebar = () => {
   )
 }
 
-export default React.memo(DefaultSidebar)
+export default React.memo(TheSidebar)
diff --git a/src/containers/index.js b/src/containers/index.js
@@ -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
 }
diff --git a/src/index.css b/src/index.css
diff --git a/src/index.js b/src/index.js
@@ -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'
diff --git a/src/scss/style.scss b/src/scss/style.scss
@@ -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';

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import {`
`17`	`17`	`} from '@coreui/react'`
`18`	`18`	`import { CIcon } from '@coreui/icons-react'`
`19`	`19`
`20`		`-const DefaultAside = () => {`
	`20`	`+const TheAside = () => {`
`21`	`21`	`const show = useSelector(state => state.asideShow)`
`22`	`22`	`const dispatch = useDispatch()`
`23`	`23`	`const setState = (state) => dispatch({type: 'set', asideShow: state})`
`@@ -239,4 +239,4 @@ const DefaultAside = () => {`
`239`	`239`	`)`
`240`	`240`	`}`
`241`	`241`
`242`		`-export default React.memo(DefaultAside)`
	`242`	`+export default React.memo(TheAside)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ const loading = (`
`15`	`15`	`</div>`
`16`	`16`	`)`
`17`	`17`
`18`		`-const DefaultContent = () => {`
	`18`	`+const TheContent = () => {`
`19`	`19`	`return (`
`20`	`20`	`<main className="c-main">`
`21`	`21`	`<CContainer fluid>`
`@@ -43,4 +43,4 @@ const DefaultContent = () => {`
`43`	`43`	`)`
`44`	`44`	`}`
`45`	`45`
`46`		`-export default React.memo(DefaultContent)`
	`46`	`+export default React.memo(TheContent)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import React from 'react'`
`2`	`2`	`import { CFooter } from '@coreui/react'`
`3`	`3`
`4`		`-const DefaultFooter = () => {`
	`4`	`+const TheFooter = () => {`
`5`	`5`	`return (`
`6`	`6`	`<CFooter fixed={false}>`
`7`	`7`	`<div>`
`@@ -16,4 +16,4 @@ const DefaultFooter = () => {`
`16`	`16`	`)`
`17`	`17`	`}`
`18`	`18`
`19`		`-export default React.memo(DefaultFooter)`
	`19`	`+export default React.memo(TheFooter)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import {`
`9`	`9`	`} from '@coreui/react'`
`10`	`10`	`import { CIcon } from '@coreui/icons-react'`
`11`	`11`
`12`		`-const DefaultHeaderDropdown = () => {`
	`12`	`+const TheHeaderDropdown = () => {`
`13`	`13`	`return (`
`14`	`14`	`<CDropdown`
`15`	`15`	`inNav`
`@@ -57,4 +57,4 @@ const DefaultHeaderDropdown = () => {`
`57`	`57`	`)`
`58`	`58`	`}`
`59`	`59`
`60`		`-export default DefaultHeaderDropdown`
	`60`	`+export default TheHeaderDropdown`