From 379cf4b63e7a850afa21bb701dd2ca96ae0fe62a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Holeczek?= Date: Fri, 21 May 2021 12:32:45 +0200 Subject: [PATCH] refactor: update layout --- .../header => __old}/AppHeaderDropdownMssg.js | 0 .../header => __old}/AppHeaderDropdownNotif.js | 0 .../header => __old}/AppHeaderDropdownTasks.js | 0 src/components/AppHeader.js | 18 +----------------- src/containers/TheContent.js | 6 +++--- src/containers/index.js | 6 ------ src/reusable/DocsLink.js | 2 +- 7 files changed, 5 insertions(+), 27 deletions(-) rename {src/components/header => __old}/AppHeaderDropdownMssg.js (100%) rename {src/components/header => __old}/AppHeaderDropdownNotif.js (100%) rename {src/components/header => __old}/AppHeaderDropdownTasks.js (100%) diff --git a/src/components/header/AppHeaderDropdownMssg.js b/__old/AppHeaderDropdownMssg.js similarity index 100% rename from src/components/header/AppHeaderDropdownMssg.js rename to __old/AppHeaderDropdownMssg.js diff --git a/src/components/header/AppHeaderDropdownNotif.js b/__old/AppHeaderDropdownNotif.js similarity index 100% rename from src/components/header/AppHeaderDropdownNotif.js rename to __old/AppHeaderDropdownNotif.js diff --git a/src/components/header/AppHeaderDropdownTasks.js b/__old/AppHeaderDropdownTasks.js similarity index 100% rename from src/components/header/AppHeaderDropdownTasks.js rename to __old/AppHeaderDropdownTasks.js diff --git a/src/components/AppHeader.js b/src/components/AppHeader.js index 281e548..b589d0b 100644 --- a/src/components/AppHeader.js +++ b/src/components/AppHeader.js @@ -13,28 +13,12 @@ import { } from '@coreui/react' import CIcon from '@coreui/icons-react' -import { - AppBreadcrumb, - AppHeaderDropdown, - AppHeaderDropdownMssg, - AppHeaderDropdownNotif, - AppHeaderDropdownTasks, -} from '../containers/index' +import { AppBreadcrumb, AppHeaderDropdown } from '../containers/index' const AppHeader = () => { const dispatch = useDispatch() const sidebarShow = useSelector((state) => state.sidebarShow) - // const toggleSidebar = () => { - // const val = [true, 'responsive'].includes(sidebarShow) ? false : 'responsive' - // dispatch({ type: 'set', sidebarShow: val }) - // } - - // const toggleSidebarMobile = () => { - // const val = [false, 'responsive'].includes(sidebarShow) ? true : 'responsive' - // dispatch({ type: 'set', sidebarShow: val }) - // } - return ( diff --git a/src/containers/TheContent.js b/src/containers/TheContent.js index 5bad74b..0ef1844 100644 --- a/src/containers/TheContent.js +++ b/src/containers/TheContent.js @@ -1,6 +1,6 @@ import React, { Suspense } from 'react' import { Redirect, Route, Switch } from 'react-router-dom' -import { CContainer, CFade } from '@coreui/react' +import { CContainer } from '@coreui/react' // routes config import routes from '../routes' @@ -26,9 +26,9 @@ const TheContent = () => { exact={route.exact} name={route.name} render={(props) => ( - + <> - + )} /> ) diff --git a/src/containers/index.js b/src/containers/index.js index 045c65e..1c00f39 100644 --- a/src/containers/index.js +++ b/src/containers/index.js @@ -3,9 +3,6 @@ import TheContent from './TheContent' import AppFooter from '../components/AppFooter' import AppHeader from '../components/AppHeader' import AppHeaderDropdown from '../components/header/AppHeaderDropdown' -import AppHeaderDropdownMssg from '../components/header/AppHeaderDropdownMssg' -import AppHeaderDropdownNotif from '../components/header/AppHeaderDropdownNotif' -import AppHeaderDropdownTasks from '../components/header/AppHeaderDropdownTasks' import DefaultLayout from '../layout/DefaultLayout' import AppSidebar from '../components/AppSidebar' @@ -15,9 +12,6 @@ export { AppFooter, AppHeader, AppHeaderDropdown, - AppHeaderDropdownMssg, - AppHeaderDropdownNotif, - AppHeaderDropdownTasks, DefaultLayout, AppSidebar, } diff --git a/src/reusable/DocsLink.js b/src/reusable/DocsLink.js index ac90b46..4ffa963 100644 --- a/src/reusable/DocsLink.js +++ b/src/reusable/DocsLink.js @@ -15,7 +15,7 @@ const DocsLink = (props) => { target="_blank" className="card-header-action" > - {text || 'docs'} + {text || 'docs'} )