From bfc79da4039dd534ee49b4526978f7b949cea90b Mon Sep 17 00:00:00 2001
From: woothu <32914662+woothu@users.noreply.github.com>
Date: Fri, 22 May 2020 12:29:10 +0200
Subject: [PATCH] refactor: rename containers from 'Default' to 'The', small
fixes
---
src/App.js | 4 +-
src/containers/DefaultLayout.js | 27 -------------
.../{DefaultAside.js => TheAside.js} | 4 +-
.../{DefaultContent.js => TheContent.js} | 4 +-
.../{DefaultFooter.js => TheFooter.js} | 4 +-
.../{DefaultHeader.js => TheHeader.js} | 20 +++++-----
...HeaderDropdown.js => TheHeaderDropdown.js} | 4 +-
...opdownMssg.js => TheHeaderDropdownMssg.js} | 4 +-
...downNotif.js => TheHeaderDropdownNotif.js} | 4 +-
...downTasks.js => TheHeaderDropdownTasks.js} | 4 +-
src/containers/TheLayout.js | 27 +++++++++++++
.../{DefaultSidebar.js => TheSidebar.js} | 4 +-
src/containers/index.js | 40 +++++++++----------
src/index.css | 1 -
src/index.js | 3 +-
src/scss/style.scss | 4 --
16 files changed, 76 insertions(+), 82 deletions(-)
delete mode 100644 src/containers/DefaultLayout.js
rename src/containers/{DefaultAside.js => TheAside.js} (99%)
rename src/containers/{DefaultContent.js => TheContent.js} (93%)
rename src/containers/{DefaultFooter.js => TheFooter.js} (87%)
rename src/containers/{DefaultHeader.js => TheHeader.js} (90%)
rename src/containers/{DefaultHeaderDropdown.js => TheHeaderDropdown.js} (96%)
rename src/containers/{DefaultHeaderDropdownMssg.js => TheHeaderDropdownMssg.js} (98%)
rename src/containers/{DefaultHeaderDropdownNotif.js => TheHeaderDropdownNotif.js} (96%)
rename src/containers/{DefaultHeaderDropdownTasks.js => TheHeaderDropdownTasks.js} (96%)
create mode 100644 src/containers/TheLayout.js
rename src/containers/{DefaultSidebar.js => TheSidebar.js} (94%)
delete mode 100644 src/index.css
diff --git a/src/App.js b/src/App.js
index 0ee53b55c..08a27f6f2 100644
--- 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
deleted file mode 100644
index 39e8f016e..000000000
--- a/src/containers/DefaultLayout.js
+++ /dev/null
@@ -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
diff --git a/src/containers/DefaultAside.js b/src/containers/TheAside.js
similarity index 99%
rename from src/containers/DefaultAside.js
rename to src/containers/TheAside.js
index 2c86add89..f8b7099d3 100644
--- a/src/containers/DefaultAside.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/DefaultContent.js b/src/containers/TheContent.js
similarity index 93%
rename from src/containers/DefaultContent.js
rename to src/containers/TheContent.js
index 6fe586204..20ba9b1e5 100644
--- a/src/containers/DefaultContent.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/DefaultFooter.js b/src/containers/TheFooter.js
similarity index 87%
rename from src/containers/DefaultFooter.js
rename to src/containers/TheFooter.js
index 80c933914..0ea2e2111 100644
--- a/src/containers/DefaultFooter.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/DefaultHeader.js b/src/containers/TheHeader.js
similarity index 90%
rename from src/containers/DefaultHeader.js
rename to src/containers/TheHeader.js
index 797af1705..ca21694d5 100644
--- a/src/containers/DefaultHeader.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/DefaultHeaderDropdown.js b/src/containers/TheHeaderDropdown.js
similarity index 96%
rename from src/containers/DefaultHeaderDropdown.js
rename to src/containers/TheHeaderDropdown.js
index 24b7671c4..bfdef64bb 100644
--- a/src/containers/DefaultHeaderDropdown.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/DefaultHeaderDropdownMssg.js b/src/containers/TheHeaderDropdownMssg.js
similarity index 98%
rename from src/containers/DefaultHeaderDropdownMssg.js
rename to src/containers/TheHeaderDropdownMssg.js
index 77875a1d7..0888cc022 100644
--- a/src/containers/DefaultHeaderDropdownMssg.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
\ No newline at end of file
+export default TheHeaderDropdownMssg
\ No newline at end of file
diff --git a/src/containers/DefaultHeaderDropdownNotif.js b/src/containers/TheHeaderDropdownNotif.js
similarity index 96%
rename from src/containers/DefaultHeaderDropdownNotif.js
rename to src/containers/TheHeaderDropdownNotif.js
index ce88505fb..7ab45d0c8 100644
--- a/src/containers/DefaultHeaderDropdownNotif.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
\ No newline at end of file
+export default TheHeaderDropdownNotif
\ No newline at end of file
diff --git a/src/containers/DefaultHeaderDropdownTasks.js b/src/containers/TheHeaderDropdownTasks.js
similarity index 96%
rename from src/containers/DefaultHeaderDropdownTasks.js
rename to src/containers/TheHeaderDropdownTasks.js
index 70337872f..7b24a64ee 100644
--- a/src/containers/DefaultHeaderDropdownTasks.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
\ No newline at end of file
+export default TheHeaderDropdownTasks
\ No newline at end of file
diff --git a/src/containers/TheLayout.js b/src/containers/TheLayout.js
new file mode 100644
index 000000000..056eff36b
--- /dev/null
+++ 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/DefaultSidebar.js b/src/containers/TheSidebar.js
similarity index 94%
rename from src/containers/DefaultSidebar.js
rename to src/containers/TheSidebar.js
index 36e0164f2..3df27b849 100644
--- a/src/containers/DefaultSidebar.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
index ea3be3156..95e7a0f16 100644
--- 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
deleted file mode 100644
index 8b1378917..000000000
--- a/src/index.css
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/index.js b/src/index.js
index 0176c3f24..c0fb604d3 100644
--- 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
index 0ae4b589c..6347a09e7 100644
--- 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';