diff --git a/src/components/AppBreadcrumb.js b/src/components/AppBreadcrumb.js
index 874e243..8d87f56 100644
--- a/src/components/AppBreadcrumb.js
+++ b/src/components/AppBreadcrumb.js
@@ -3,7 +3,7 @@ import { useLocation } from 'react-router-dom'
import routes from '../routes'
-import { CBreadcrumb, CBreadcrumbItem } from '@coreui/react-ts'
+import { CBreadcrumb, CBreadcrumbItem } from '@coreui/react'
const AppBreadcrumb = () => {
const currentLocation = useLocation().pathname
diff --git a/src/components/AppFooter.js b/src/components/AppFooter.js
index e6fffd8..b512c1e 100644
--- a/src/components/AppFooter.js
+++ b/src/components/AppFooter.js
@@ -1,5 +1,5 @@
import React from 'react'
-import { CFooter } from '@coreui/react-ts'
+import { CFooter } from '@coreui/react'
const AppFooter = () => {
return (
@@ -8,7 +8,7 @@ const AppFooter = () => {
CoreUI
- © 2020 creativeLabs.
+ © 2021 creativeLabs.
Powered by
diff --git a/src/components/AppHeader.js b/src/components/AppHeader.js
index a5d3540..13a466e 100644
--- a/src/components/AppHeader.js
+++ b/src/components/AppHeader.js
@@ -10,7 +10,7 @@ import {
CHeaderToggler,
CNavLink,
CNavItem,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import CIcon from '@coreui/icons-react'
import {
diff --git a/src/components/AppSidebar.js b/src/components/AppSidebar.js
index 1b4f121..b86dde9 100644
--- a/src/components/AppSidebar.js
+++ b/src/components/AppSidebar.js
@@ -7,7 +7,7 @@ import {
CSidebarNav,
CSidebarToggler,
CCreateNavItem,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import CIcon from '@coreui/icons-react'
@@ -27,10 +27,8 @@ const AppSidebar = () => {
show={sidebarShow}
onShow={() => console.log('show')}
onHide={() => {
- console.log('hide')
dispatch({ type: 'set', sidebarShow: false })
}}
- // onShowChange={(val) => dispatch({type: 'set', sidebarShow: val })}
>
diff --git a/src/components/header/AppHeaderDropdown.js b/src/components/header/AppHeaderDropdown.js
index f8cdeb5..22836dc 100644
--- a/src/components/header/AppHeaderDropdown.js
+++ b/src/components/header/AppHeaderDropdown.js
@@ -8,7 +8,7 @@ import {
CDropdownItem,
CDropdownMenu,
CDropdownToggle,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import CIcon from '@coreui/icons-react'
const AppHeaderDropdown = () => {
diff --git a/src/components/header/AppHeaderDropdownMssg.js b/src/components/header/AppHeaderDropdownMssg.js
index 9a281f5..342cbba 100644
--- a/src/components/header/AppHeaderDropdownMssg.js
+++ b/src/components/header/AppHeaderDropdownMssg.js
@@ -6,8 +6,7 @@ import {
CDropdownItem,
CDropdownMenu,
CDropdownToggle,
- CImage,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import CIcon from '@coreui/icons-react'
const AppHeaderDropdownMssg = () => {
diff --git a/src/components/header/AppHeaderDropdownNotif.js b/src/components/header/AppHeaderDropdownNotif.js
index b07d0c4..0ee4b96 100644
--- a/src/components/header/AppHeaderDropdownNotif.js
+++ b/src/components/header/AppHeaderDropdownNotif.js
@@ -6,7 +6,7 @@ import {
CDropdownMenu,
CDropdownToggle,
CProgress,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import CIcon from '@coreui/icons-react'
const AppHeaderDropdownNotif = () => {
diff --git a/src/components/header/AppHeaderDropdownTasks.js b/src/components/header/AppHeaderDropdownTasks.js
index 8e59e4a..273951a 100644
--- a/src/components/header/AppHeaderDropdownTasks.js
+++ b/src/components/header/AppHeaderDropdownTasks.js
@@ -6,7 +6,7 @@ import {
CDropdownMenu,
CDropdownToggle,
CProgress,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import CIcon from '@coreui/icons-react'
const AppHeaderDropdownTasks = () => {
diff --git a/src/containers/TheContent.js b/src/containers/TheContent.js
index 5652660..5bad74b 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-ts'
+import { CContainer, CFade } from '@coreui/react'
// routes config
import routes from '../routes'
@@ -14,7 +14,7 @@ const loading = (
const TheContent = () => {
return (
-
+
{routes.map((route, idx) => {
diff --git a/src/reusable/DocsLink.js b/src/reusable/DocsLink.js
index 7251933..ac90b46 100644
--- a/src/reusable/DocsLink.js
+++ b/src/reusable/DocsLink.js
@@ -1,5 +1,5 @@
import React from 'react'
-import { CLink } from '@coreui/react-ts'
+import { CLink } from '@coreui/react'
const DocsLink = (props) => {
const { name, text, ...rest } = props
diff --git a/src/views/base/breadcrumbs/Breadcrumbs.js b/src/views/base/breadcrumbs/Breadcrumbs.js
index 1b9854c..ea754b6 100644
--- a/src/views/base/breadcrumbs/Breadcrumbs.js
+++ b/src/views/base/breadcrumbs/Breadcrumbs.js
@@ -8,7 +8,7 @@ import {
CCol,
CRow,
CLink,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import { DocsLink } from 'src/reusable'
const Breadcrumbs = () => {
diff --git a/src/views/base/cards/Cards.js b/src/views/base/cards/Cards.js
index e876924..e56a83b 100644
--- a/src/views/base/cards/Cards.js
+++ b/src/views/base/cards/Cards.js
@@ -8,7 +8,7 @@ import {
CCol,
CFormCheck,
CRow,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import CIcon from '@coreui/icons-react'
import { DocsLink } from 'src/reusable'
diff --git a/src/views/base/carousels/Carousels.js b/src/views/base/carousels/Carousels.js
index d1c92fd..3aa76cd 100644
--- a/src/views/base/carousels/Carousels.js
+++ b/src/views/base/carousels/Carousels.js
@@ -11,7 +11,7 @@ import {
CCarouselItem,
CCol,
CRow,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import { DocsLink } from 'src/reusable'
const slides = [
diff --git a/src/views/base/collapses/Collapses.js b/src/views/base/collapses/Collapses.js
index ce9fc7b..d9e6472 100644
--- a/src/views/base/collapses/Collapses.js
+++ b/src/views/base/collapses/Collapses.js
@@ -1,15 +1,5 @@
import React, { useState } from 'react'
-import {
- CButton,
- CCard,
- CCardBody,
- CCardFooter,
- CCardHeader,
- CCol,
- CCollapse,
- CFade,
- CRow,
-} from '@coreui/react-ts'
+import { CButton, CCard, CCardBody, CCardHeader, CCol, CCollapse, CRow } from '@coreui/react'
import { DocsLink } from 'src/reusable'
const Collapses = () => {
diff --git a/src/views/base/forms/BasicForms.js b/src/views/base/forms/BasicForms.js
index 9a3520e..2dbf278 100644
--- a/src/views/base/forms/BasicForms.js
+++ b/src/views/base/forms/BasicForms.js
@@ -22,7 +22,7 @@ import {
CInputGroup,
CInputGroupText,
CRow,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import CIcon from '@coreui/icons-react'
import { DocsLink } from 'src/reusable'
diff --git a/src/views/base/jumbotrons/Jumbotrons.js b/src/views/base/jumbotrons/Jumbotrons.js
index a2c7895..7281455 100644
--- a/src/views/base/jumbotrons/Jumbotrons.js
+++ b/src/views/base/jumbotrons/Jumbotrons.js
@@ -1,5 +1,5 @@
import React from 'react'
-import { CButton, CCard, CCardBody, CCardHeader, CCol, CContainer, CRow } from '@coreui/react-ts'
+import { CButton, CCard, CCardBody, CCardHeader, CCol, CContainer, CRow } from '@coreui/react'
import { DocsLink } from 'src/reusable'
const Jumbotrons = () => {
diff --git a/src/views/base/list-groups/ListGroups.js b/src/views/base/list-groups/ListGroups.js
index 4c189fb..9bfd7b1 100644
--- a/src/views/base/list-groups/ListGroups.js
+++ b/src/views/base/list-groups/ListGroups.js
@@ -10,7 +10,7 @@ import {
CRow,
CTabContent,
CTabPane,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import { DocsLink } from 'src/reusable'
const ListGroups = () => {
diff --git a/src/views/base/navbars/Navbars.js b/src/views/base/navbars/Navbars.js
index 27b23a4..e4c0e37 100644
--- a/src/views/base/navbars/Navbars.js
+++ b/src/views/base/navbars/Navbars.js
@@ -18,7 +18,7 @@ import {
CNavLink,
CDropdown,
CButton,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import { DocsLink } from 'src/reusable'
const CNavbars = () => {
diff --git a/src/views/base/navs/Navs.js b/src/views/base/navs/Navs.js
index 777eb63..9bd5321 100644
--- a/src/views/base/navs/Navs.js
+++ b/src/views/base/navs/Navs.js
@@ -12,7 +12,7 @@ import {
CNav,
CNavItem,
CNavLink,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import { DocsLink } from 'src/reusable'
const Navs = () => {
diff --git a/src/views/base/paginations/Pagnations.js b/src/views/base/paginations/Pagnations.js
index 2849d12..7cfdaac 100644
--- a/src/views/base/paginations/Pagnations.js
+++ b/src/views/base/paginations/Pagnations.js
@@ -1,10 +1,8 @@
-import React, { useState } from 'react'
-import { CCard, CCardBody, CCardHeader, CPagination, CPaginationItem } from '@coreui/react-ts'
+import React from 'react'
+import { CCard, CCardBody, CCardHeader, CPagination, CPaginationItem } from '@coreui/react'
import { DocsLink } from 'src/reusable'
const Paginations = () => {
- const [currentPage, setCurrentPage] = useState(2)
-
return (
<>
diff --git a/src/views/base/popovers/Popovers.js b/src/views/base/popovers/Popovers.js
index 807e6ed..82f8f23 100644
--- a/src/views/base/popovers/Popovers.js
+++ b/src/views/base/popovers/Popovers.js
@@ -1,14 +1,5 @@
import React from 'react'
-import {
- CButton,
- CCard,
- CCardBody,
- CCardHeader,
- CLink,
- CPopover,
- CRow,
- CCol,
-} from '@coreui/react-ts'
+import { CButton, CCard, CCardBody, CCardHeader, CLink, CPopover, CRow, CCol } from '@coreui/react'
import { DocsLink } from 'src/reusable'
const Popovers = () => {
diff --git a/src/views/base/progress-bar/ProgressBar.js b/src/views/base/progress-bar/ProgressBar.js
index 6e561ec..650c379 100644
--- a/src/views/base/progress-bar/ProgressBar.js
+++ b/src/views/base/progress-bar/ProgressBar.js
@@ -1,5 +1,5 @@
import React from 'react'
-import { CCard, CCardBody, CCardHeader, CProgress, CProgressBar } from '@coreui/react-ts'
+import { CCard, CCardBody, CCardHeader, CProgress, CProgressBar } from '@coreui/react'
import { DocsLink } from 'src/reusable'
const ProgressBar = () => {
diff --git a/src/views/base/tables/Tables.js b/src/views/base/tables/Tables.js
index 9f97f43..0994673 100644
--- a/src/views/base/tables/Tables.js
+++ b/src/views/base/tables/Tables.js
@@ -12,7 +12,7 @@ import {
CTableHead,
CTableHeaderCell,
CTableRow,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import { DocsLink } from 'src/reusable'
const Tables = () => {
diff --git a/src/views/base/tabs/Tabs.js b/src/views/base/tabs/Tabs.js
index afb949b..6bc6edf 100644
--- a/src/views/base/tabs/Tabs.js
+++ b/src/views/base/tabs/Tabs.js
@@ -10,7 +10,7 @@ import {
CCard,
CCardBody,
CCardHeader,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import { DocsLink } from 'src/reusable'
const Tabs = () => {
diff --git a/src/views/base/tooltips/Tooltips.js b/src/views/base/tooltips/Tooltips.js
index 400f0fe..ba6c8c7 100644
--- a/src/views/base/tooltips/Tooltips.js
+++ b/src/views/base/tooltips/Tooltips.js
@@ -1,14 +1,5 @@
import React from 'react'
-import {
- CButton,
- CCard,
- CCardBody,
- CCardHeader,
- CLink,
- CTooltip,
- CRow,
- CCol,
-} from '@coreui/react-ts'
+import { CButton, CCard, CCardBody, CCardHeader, CLink, CTooltip, CRow, CCol } from '@coreui/react'
import { DocsLink } from 'src/reusable'
const Tooltips = () => {
diff --git a/src/views/buttons/button-dropdowns/ButtonDropdowns.js b/src/views/buttons/button-dropdowns/ButtonDropdowns.js
index 25e3f92..49f58c2 100644
--- a/src/views/buttons/button-dropdowns/ButtonDropdowns.js
+++ b/src/views/buttons/button-dropdowns/ButtonDropdowns.js
@@ -16,7 +16,7 @@ import {
CFormLabel,
CFormControl,
CFormCheck,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import { DocsLink } from 'src/reusable'
const ButtonDropdowns = () => {
diff --git a/src/views/buttons/button-groups/ButtonGroups.js b/src/views/buttons/button-groups/ButtonGroups.js
index b462540..161fd10 100644
--- a/src/views/buttons/button-groups/ButtonGroups.js
+++ b/src/views/buttons/button-groups/ButtonGroups.js
@@ -16,7 +16,7 @@ import {
CInputGroup,
CInputGroupText,
CRow,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import { DocsLink } from 'src/reusable'
const ButtonGroups = () => {
diff --git a/src/views/buttons/buttons/Buttons.js b/src/views/buttons/buttons/Buttons.js
index 242a17b..757f477 100644
--- a/src/views/buttons/buttons/Buttons.js
+++ b/src/views/buttons/buttons/Buttons.js
@@ -1,5 +1,5 @@
import React from 'react'
-import { CButton, CCard, CCardBody, CCardHeader, CCol, CRow } from '@coreui/react-ts'
+import { CButton, CCard, CCardBody, CCardHeader, CCol, CRow } from '@coreui/react'
import CIcon from '@coreui/icons-react'
import { DocsLink } from 'src/reusable'
diff --git a/src/views/charts/Charts.js b/src/views/charts/Charts.js
index 4f95873..5f9b3ac 100644
--- a/src/views/charts/Charts.js
+++ b/src/views/charts/Charts.js
@@ -1,5 +1,5 @@
import React from 'react'
-import { CCard, CCardBody, CCol, CCardHeader, CRow } from '@coreui/react-ts'
+import { CCard, CCardBody, CCol, CCardHeader, CRow } from '@coreui/react'
import {
CChartBar,
CChartLine,
diff --git a/src/views/icons/brands/Brands.js b/src/views/icons/brands/Brands.js
index 82a3904..9532c8f 100644
--- a/src/views/icons/brands/Brands.js
+++ b/src/views/icons/brands/Brands.js
@@ -1,5 +1,5 @@
import React from 'react'
-import { CCard, CCardBody, CCardHeader, CCol, CRow } from '@coreui/react-ts'
+import { CCard, CCardBody, CCardHeader, CCol, CRow } from '@coreui/react'
import CIcon from '@coreui/icons-react'
import { brandSet } from '@coreui/icons'
import { DocsLink } from 'src/reusable'
diff --git a/src/views/icons/coreui-icons/CoreUIIcons.js b/src/views/icons/coreui-icons/CoreUIIcons.js
index e3ac32c..2145cec 100644
--- a/src/views/icons/coreui-icons/CoreUIIcons.js
+++ b/src/views/icons/coreui-icons/CoreUIIcons.js
@@ -1,5 +1,5 @@
import React from 'react'
-import { CCard, CCardBody, CCardHeader, CRow } from '@coreui/react-ts'
+import { CCard, CCardBody, CCardHeader, CRow } from '@coreui/react'
import { freeSet } from '@coreui/icons'
import { getIconsView } from '../brands/Brands.js'
import { DocsLink } from 'src/reusable'
diff --git a/src/views/icons/flags/Flags.js b/src/views/icons/flags/Flags.js
index a438222..146930b 100644
--- a/src/views/icons/flags/Flags.js
+++ b/src/views/icons/flags/Flags.js
@@ -1,5 +1,5 @@
import React from 'react'
-import { CCard, CCardBody, CCardHeader, CRow } from '@coreui/react-ts'
+import { CCard, CCardBody, CCardHeader, CRow } from '@coreui/react'
import { getIconsView } from '../brands/Brands.js'
import { flagSet } from '@coreui/icons'
import { DocsLink } from 'src/reusable'
diff --git a/src/views/notifications/alerts/Alerts.js b/src/views/notifications/alerts/Alerts.js
index bf5b81a..f8771c5 100644
--- a/src/views/notifications/alerts/Alerts.js
+++ b/src/views/notifications/alerts/Alerts.js
@@ -10,7 +10,7 @@ import {
CLink,
CProgress,
CRow,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import { DocsLink } from 'src/reusable'
const Alerts = () => {
diff --git a/src/views/notifications/badges/Badges.js b/src/views/notifications/badges/Badges.js
index 8ca57a5..e28ac09 100644
--- a/src/views/notifications/badges/Badges.js
+++ b/src/views/notifications/badges/Badges.js
@@ -8,7 +8,7 @@ import {
CCol,
CBadge,
CRow,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import { DocsLink } from 'src/reusable'
const Badges = () => {
diff --git a/src/views/notifications/modals/Modals.js b/src/views/notifications/modals/Modals.js
index 0fd6e3c..ff0936f 100644
--- a/src/views/notifications/modals/Modals.js
+++ b/src/views/notifications/modals/Modals.js
@@ -11,7 +11,7 @@ import {
CModalHeader,
CModalTitle,
CRow,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import { DocsLink } from 'src/reusable'
const Modals = () => {
diff --git a/src/views/notifications/toaster/Toaster.js b/src/views/notifications/toaster/Toaster.js
index 3c7efa5..9cfa02e 100644
--- a/src/views/notifications/toaster/Toaster.js
+++ b/src/views/notifications/toaster/Toaster.js
@@ -13,10 +13,8 @@ import {
CCol,
CFormLabel,
CToast,
- CToastBody,
- CToastHeader,
CToaster,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import { DocsLink } from 'src/reusable'
const Toaster = () => {
@@ -35,10 +33,10 @@ const Toaster = () => {
const [toasts, setToasts] = useState([
{ placement: 'static' },
{ placement: 'static' },
- { placement: 'top-right', autohide: 3000 },
+ { placement: 'top-end', autohide: 3000 },
])
- const [placement, setPlacement] = useState('top-right')
+ const [placement, setPlacement] = useState('top-end')
const [autohide, setAutohide] = useState(true)
const [autohideValue, setAutohideValue] = useState(5000)
const [closeButton, setCloseButton] = useState(true)
diff --git a/src/views/pages/login/Login.js b/src/views/pages/login/Login.js
index 3c67812..f09620a 100644
--- a/src/views/pages/login/Login.js
+++ b/src/views/pages/login/Login.js
@@ -12,7 +12,7 @@ import {
CInputGroup,
CInputGroupText,
CRow,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import CIcon from '@coreui/icons-react'
const Login = () => {
diff --git a/src/views/pages/page404/Page404.js b/src/views/pages/page404/Page404.js
index 63aa1d6..f334597 100644
--- a/src/views/pages/page404/Page404.js
+++ b/src/views/pages/page404/Page404.js
@@ -7,7 +7,7 @@ import {
CInputGroup,
CInputGroupText,
CRow,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import CIcon from '@coreui/icons-react'
const Page404 = () => {
diff --git a/src/views/pages/page500/Page500.js b/src/views/pages/page500/Page500.js
index 16bf322..a935da1 100644
--- a/src/views/pages/page500/Page500.js
+++ b/src/views/pages/page500/Page500.js
@@ -7,7 +7,7 @@ import {
CInputGroup,
CInputGroupText,
CRow,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import CIcon from '@coreui/icons-react'
const Page500 = () => {
diff --git a/src/views/pages/register/Register.js b/src/views/pages/register/Register.js
index a719516..7018dc6 100644
--- a/src/views/pages/register/Register.js
+++ b/src/views/pages/register/Register.js
@@ -11,7 +11,7 @@ import {
CInputGroup,
CInputGroupText,
CRow,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import CIcon from '@coreui/icons-react'
const Register = () => {
diff --git a/src/views/theme/colors/Colors.js b/src/views/theme/colors/Colors.js
index 24ec102..b99a0f9 100644
--- a/src/views/theme/colors/Colors.js
+++ b/src/views/theme/colors/Colors.js
@@ -1,6 +1,6 @@
import React, { useEffect, useState, createRef } from 'react'
import classNames from 'classnames'
-import { CRow, CCol, CCard, CCardHeader, CCardBody } from '@coreui/react-ts'
+import { CRow, CCol, CCard, CCardHeader, CCardBody } from '@coreui/react'
import { rgbToHex } from '@coreui/utils'
import { DocsLink } from 'src/reusable'
diff --git a/src/views/theme/typography/Typography.js b/src/views/theme/typography/Typography.js
index a7b1863..81bbefb 100644
--- a/src/views/theme/typography/Typography.js
+++ b/src/views/theme/typography/Typography.js
@@ -1,5 +1,5 @@
import React from 'react'
-import { CCard, CCardHeader, CCardBody } from '@coreui/react-ts'
+import { CCard, CCardHeader, CCardBody } from '@coreui/react'
import { DocsLink } from 'src/reusable'
const Typography = () => {
diff --git a/src/views/widgets/Widgets.js b/src/views/widgets/Widgets.js
index 5835696..a4362ef 100644
--- a/src/views/widgets/Widgets.js
+++ b/src/views/widgets/Widgets.js
@@ -8,7 +8,7 @@ import {
CWidgetProgress,
CWidgetProgressIcon,
CWidgetSimple,
-} from '@coreui/react-ts'
+} from '@coreui/react'
import WidgetsBrand from './WidgetsBrand'
import WidgetsDropdown from './WidgetsDropdown'