Skip to content

Commit

Permalink
refacotor: template updates
Browse files Browse the repository at this point in the history
  • Loading branch information
woothu committed Jun 1, 2020
1 parent 1777a09 commit 1df8c15
Show file tree
Hide file tree
Showing 32 changed files with 103 additions and 114 deletions.
29 changes: 18 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
"@coreui/chartjs": "^2.0.0",
"@coreui/coreui": "^3.2.0",
"@coreui/icons": "^1.0.1",
"@coreui/icons-react": "^1.0.0-beta.1",
"@coreui/react": "^3.0.0-beta.6",
"@coreui/react-chartjs": "^1.0.0-alpha.1",
"@coreui/icons-react": "^1.0.0",
"@coreui/react": "^3.0.0",
"@coreui/react-chartjs": "^1.0.0",
"@coreui/utils": "^1.3.1",
"classnames": "^2.2.6",
"core-js": "^3.6.5",
Expand Down
10 changes: 9 additions & 1 deletion src/assets/icons/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ import {
cilAlignRight,
cilApplicationsSettings,
cilArrowRight,
cilArrowTop,
cilAsterisk,
cilBan,
cilBasket,
cilBell,
Expand Down Expand Up @@ -104,6 +106,7 @@ import {
cilPrint,
cilPuzzle,
cilSave,
cilScrubber,
cilSettings,
cilShare,
cilShareAll,
Expand All @@ -122,6 +125,7 @@ import {
cilUserFemale,
cilUserFollow,
cilUserUnfollow,
cilX,
cilXCircle,
cilWarning
} from '@coreui/icons'
Expand All @@ -136,6 +140,8 @@ export const icons = Object.assign({}, {
cilAlignRight,
cilApplicationsSettings,
cilArrowRight,
cilArrowTop,
cilAsterisk,
cilBan,
cilBasket,
cilBell,
Expand Down Expand Up @@ -163,12 +169,12 @@ export const icons = Object.assign({}, {
cilEnvelopeLetter,
cilEnvelopeOpen,
cilEuro,
cilGraph,
cilGlobeAlt,
cilGrid,
cilFile,
cilFullscreen,
cilFullscreenExit,
cilGraph,
cilHome,
cilInbox,
cilIndentDecrease,
Expand Down Expand Up @@ -198,6 +204,7 @@ export const icons = Object.assign({}, {
cilPrint,
cilPuzzle,
cilSave,
cilScrubber,
cilSettings,
cilShare,
cilShareAll,
Expand All @@ -216,6 +223,7 @@ export const icons = Object.assign({}, {
cilUserFemale,
cilUserFollow,
cilUserUnfollow,
cilX,
cilXCircle,
cilWarning
}, {
Expand Down
2 changes: 1 addition & 1 deletion src/containers/TheHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
CBreadcrumbRouter,
CLink
} from '@coreui/react'
import { CIcon } from '@coreui/icons-react'
import CIcon from '@coreui/icons-react'

// routes config
import routes from '../routes'
Expand Down
2 changes: 1 addition & 1 deletion src/containers/TheHeaderDropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
CDropdownToggle,
CImg
} from '@coreui/react'
import { CIcon } from '@coreui/icons-react'
import CIcon from '@coreui/icons-react'

const TheHeaderDropdown = () => {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/containers/TheHeaderDropdownMssg.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
CDropdownToggle,
CImg
} from '@coreui/react'
import { CIcon } from '@coreui/icons-react'
import CIcon from '@coreui/icons-react'

const TheHeaderDropdownMssg = () => {
const itemsCount = 4
Expand Down
4 changes: 2 additions & 2 deletions src/containers/TheHeaderDropdownNotif.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
CDropdownToggle,
CProgress
} from '@coreui/react'
import { CIcon } from '@coreui/icons-react'
import CIcon from '@coreui/icons-react'

const TheHeaderDropdownNotif = () => {
const itemsCount = 5
Expand All @@ -31,7 +31,7 @@ const TheHeaderDropdownNotif = () => {
</CDropdownItem>
<CDropdownItem><CIcon name="cil-user-follow" className="mr-2 text-success" /> New user registered</CDropdownItem>
<CDropdownItem><CIcon name="cil-user-unfollow" className="mr-2 text-danger" /> User deleted</CDropdownItem>
<CDropdownItem><CIcon name="cil-chart" className="mr-2 text-info" /> Sales report is ready</CDropdownItem>
<CDropdownItem><CIcon name="cil-chart-pie" className="mr-2 text-info" /> Sales report is ready</CDropdownItem>
<CDropdownItem><CIcon name="cil-basket" className="mr-2 text-primary" /> New client</CDropdownItem>
<CDropdownItem><CIcon name="cil-speedometer" className="mr-2 text-warning" /> Server overloaded</CDropdownItem>
<CDropdownItem
Expand Down
2 changes: 1 addition & 1 deletion src/containers/TheHeaderDropdownTasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
CDropdownToggle,
CProgress
} from '@coreui/react'
import { CIcon } from '@coreui/icons-react'
import CIcon from '@coreui/icons-react'

const TheHeaderDropdownTasks = () => {
const itemsCount = 5
Expand Down
2 changes: 1 addition & 1 deletion src/containers/TheSidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
CSidebarNavItem,
} from '@coreui/react'

import { CIcon } from '@coreui/icons-react'
import CIcon from '@coreui/icons-react'

// sidebar nav config
import navigation from './_nav'
Expand Down
2 changes: 1 addition & 1 deletion src/views/base/cards/Cards.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
CSwitch,
CLink
} from '@coreui/react'
import { CIcon } from '@coreui/icons-react'
import CIcon from '@coreui/icons-react'

const Cards = () => {
const [collapsed, setCollapsed] = React.useState(true)
Expand Down
2 changes: 1 addition & 1 deletion src/views/base/forms/BasicForms.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {
CSelect,
CRow
} from '@coreui/react'
import { CIcon } from '@coreui/icons-react'
import CIcon from '@coreui/icons-react'

const BasicForms = () => {
const [collapsed, setCollapsed] = React.useState(true)
Expand Down
22 changes: 10 additions & 12 deletions src/views/base/list-groups/ListGroups.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import {
CCol,
CListGroup,
CListGroupItem,
CListGroupItemHeading,
CListGroupItemText,
CRow,
CTabContent,
CTabPane
Expand Down Expand Up @@ -189,27 +187,27 @@ const ListGroups = () => {

<CListGroup>
<CListGroupItem action active>
<CListGroupItemHeading className="d-flex w-100 justify-content-between">
<h5 className="d-flex w-100 justify-content-between">
List group item heading
<small>3 days ago</small>
</CListGroupItemHeading>
<CListGroupItemText className="mb-1">
</h5>
<div className="mb-1">
Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.
<small>Donec id elit non mi porta.</small>
</CListGroupItemText>
</div>
</CListGroupItem>
<CListGroupItem action>
<CListGroupItemHeading>List group item heading</CListGroupItemHeading>
<CListGroupItemText>
<h5>List group item heading</h5>
<div>
Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.
</CListGroupItemText>
</div>
<small>Small.</small>
</CListGroupItem>
<CListGroupItem action>
<CListGroupItemHeading>List group item heading</CListGroupItemHeading>
<CListGroupItemText>
<h5>List group item heading</h5>
<div>
Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.
</CListGroupItemText>
</div>
<small>Small.</small>
</CListGroupItem>
</CListGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/views/base/navbars/Navbars.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
CButton,
CImg
} from '@coreui/react'
// import { CIcon } from '@coreui/icons-react'
// import CIcon from '@coreui/icons-react'

const CNavbars = () => {
const [isOpen, setIsOpen] = useState(false)
Expand Down
4 changes: 1 addition & 3 deletions src/views/base/tabs/Tabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ import {
CTabs,
CCardHeader
} from '@coreui/react'
import {
CIcon
} from '@coreui/icons-react'
import CIcon from '@coreui/icons-react'

const Tabs = () => {
const [active, setActive] = useState(1)
Expand Down
2 changes: 1 addition & 1 deletion src/views/buttons/brand-buttons/BrandButtons.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
CCol,
CRow
} from '@coreui/react'
import { CIcon } from '@coreui/icons-react'
import CIcon from '@coreui/icons-react'

const BrandButtons = () => {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/views/buttons/buttons/Buttons.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
CCol,
CRow
} from '@coreui/react'
import { CIcon } from '@coreui/icons-react'
import CIcon from '@coreui/icons-react'

const Buttons = () => {
return (
Expand Down
4 changes: 2 additions & 2 deletions src/views/charts/ChartBarSimple.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import PropTypes from 'prop-types'
import { getColor } from '@coreui/utils/src'
import { CCharts } from '@coreui/react-chartjs'
import { CChartBar } from '@coreui/react-chartjs'

const ChartBarSimple = props => {

Expand Down Expand Up @@ -46,7 +46,7 @@ const ChartBarSimple = props => {

// render
return (
<CCharts
<CChartBar
{...attributes}
type="bar"
datasets={defaultDatasets}
Expand Down
4 changes: 2 additions & 2 deletions src/views/charts/ChartLineSimple.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import PropTypes from 'prop-types'
import { getColor, deepObjectsMerge } from '@coreui/utils/src'
import { CCharts } from '@coreui/react-chartjs'
import { CChartLine } from '@coreui/react-chartjs'

const ChartLineSimple = props => {

Expand Down Expand Up @@ -121,7 +121,7 @@ const ChartLineSimple = props => {
// render

return (
<CCharts
<CChartLine
{...attributes}
type="line"
datasets={computedDatasets}
Expand Down
Loading

0 comments on commit 1df8c15

Please sign in to comment.