From fcbf9b804d53cfc603ed07cdb22de4b9e7de0bcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Holeczek?= Date: Fri, 13 Aug 2021 19:59:49 +0200 Subject: [PATCH] refactor: update `CIcon`s --- package.json | 2 +- src/_nav.js | 20 ++--- src/components/AppHeader.js | 10 +-- src/components/AppSidebar.js | 4 +- src/components/AppSidebarNav.js | 2 +- src/components/DocsExample.js | 4 +- src/components/header/AppHeaderDropdown.js | 18 ++--- .../components/buttons/buttons/Buttons.js | 4 +- src/views/components/icons/brands/Brands.js | 2 +- src/views/components/widgets/Widgets.js | 74 +++++++++---------- src/views/components/widgets/WidgetsBrand.js | 8 +- .../components/widgets/WidgetsDropdown.js | 16 ++-- src/views/dashboard/Dashboard.js | 40 +++++----- src/views/pages/login/Login.js | 4 +- src/views/pages/page404/Page404.js | 2 +- src/views/pages/page500/Page500.js | 2 +- src/views/pages/register/Register.js | 6 +- yarn.lock | 59 +++++++-------- 18 files changed, 136 insertions(+), 141 deletions(-) diff --git a/package.json b/package.json index 1e0dcff..0ff420e 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@coreui/chartjs": "3.0.0", "@coreui/coreui": "4.0.1", "@coreui/icons": "^2.0.1", - "@coreui/icons-react": "^2.0.0-rc.0", + "@coreui/icons-react": "^2.0.0-rc.5", "@coreui/react": "4.0.0-beta.4", "@coreui/react-chartjs": "2.0.0-rc.0", "@coreui/utils": "^1.3.1", diff --git a/src/_nav.js b/src/_nav.js index 5aec933..5041115 100644 --- a/src/_nav.js +++ b/src/_nav.js @@ -6,7 +6,7 @@ const _nav = [ component: 'CNavItem', name: 'Dashboard', to: '/dashboard', - icon: , + icon: , badge: { color: 'info', text: 'NEW', @@ -20,13 +20,13 @@ const _nav = [ component: 'CNavItem', name: 'Colors', to: '/theme/colors', - icon: , + icon: , }, { component: 'CNavItem', name: 'Typography', to: '/theme/typography', - icon: , + icon: , }, { component: 'CNavTitle', @@ -122,7 +122,7 @@ const _nav = [ component: 'CNavGroup', name: 'Buttons', to: '/buttons', - icon: , + icon: , items: [ { component: 'CNavItem', @@ -147,7 +147,7 @@ const _nav = [ { component: 'CNavGroup', name: 'Forms', - icon: , + icon: , items: [ { component: 'CNavItem', @@ -203,12 +203,12 @@ const _nav = [ component: 'CNavItem', name: 'Charts', to: '/charts', - icon: , + icon: , }, { component: 'CNavGroup', name: 'Icons', - icon: , + icon: , items: [ { component: 'CNavItem', @@ -237,7 +237,7 @@ const _nav = [ { component: 'CNavGroup', name: 'Notifications', - icon: , + icon: , items: [ { component: 'CNavItem', @@ -269,7 +269,7 @@ const _nav = [ component: 'CNavItem', name: 'Widgets', to: '/widgets', - icon: , + icon: , badge: { color: 'info', text: 'NEW', @@ -282,7 +282,7 @@ const _nav = [ { component: 'CNavGroup', name: 'Pages', - icon: , + icon: , items: [ { component: 'CNavItem', diff --git a/src/components/AppHeader.js b/src/components/AppHeader.js index 75c10df..f0b18f4 100644 --- a/src/components/AppHeader.js +++ b/src/components/AppHeader.js @@ -28,10 +28,10 @@ const AppHeader = () => { className="ps-1" onClick={() => dispatch({ type: 'set', sidebarShow: !sidebarShow })} > - + - + @@ -49,17 +49,17 @@ const AppHeader = () => { - + - + - + diff --git a/src/components/AppSidebar.js b/src/components/AppSidebar.js index 7fbe84b..87f9827 100644 --- a/src/components/AppSidebar.js +++ b/src/components/AppSidebar.js @@ -29,8 +29,8 @@ const AppSidebar = () => { }} > - - + + diff --git a/src/components/AppSidebarNav.js b/src/components/AppSidebarNav.js index e545191..5f4d9b4 100644 --- a/src/components/AppSidebarNav.js +++ b/src/components/AppSidebarNav.js @@ -12,7 +12,7 @@ export const AppSidebarNav = ({ items }) => { const navLink = (name, icon, badge) => { return ( <> - {icon && typeof icon === 'string' ? : icon} + {icon && typeof icon === 'string' ? : icon} {name && name} {badge && ( diff --git a/src/components/DocsExample.js b/src/components/DocsExample.js index 66f5972..8aed0f0 100644 --- a/src/components/DocsExample.js +++ b/src/components/DocsExample.js @@ -15,13 +15,13 @@ const DocsExample = (props) => { - + Preview - + Code diff --git a/src/components/header/AppHeaderDropdown.js b/src/components/header/AppHeaderDropdown.js index 023e41f..424a309 100644 --- a/src/components/header/AppHeaderDropdown.js +++ b/src/components/header/AppHeaderDropdown.js @@ -20,28 +20,28 @@ const AppHeaderDropdown = () => { Account - + Updates 42 - + Messages 42 - + Tasks 42 - + Comments 42 @@ -49,22 +49,22 @@ const AppHeaderDropdown = () => { Settings - + Profile - + Settings - + Payments 42 - + Projects 42 @@ -72,7 +72,7 @@ const AppHeaderDropdown = () => { - + Lock Account diff --git a/src/views/components/buttons/buttons/Buttons.js b/src/views/components/buttons/buttons/Buttons.js index 4b73ca5..b19f305 100644 --- a/src/views/components/buttons/buttons/Buttons.js +++ b/src/views/components/buttons/buttons/Buttons.js @@ -87,12 +87,12 @@ const Buttons = () => { active={state === 'active'} disabled={state === 'disabled'} > - + {color.charAt(0).toUpperCase() + color.slice(1)} ))} - + Link diff --git a/src/views/components/icons/brands/Brands.js b/src/views/components/icons/brands/Brands.js index 6c794ff..dbfba92 100644 --- a/src/views/components/icons/brands/Brands.js +++ b/src/views/components/icons/brands/Brands.js @@ -11,7 +11,7 @@ const toKebabCase = (str) => { export const getIconsView = (iconset) => { return Object.entries(iconset).map(([name, value]) => ( - +
{toKebabCase(name)}
)) diff --git a/src/views/components/widgets/Widgets.js b/src/views/components/widgets/Widgets.js index acc0977..6f54bd7 100644 --- a/src/views/components/widgets/Widgets.js +++ b/src/views/components/widgets/Widgets.js @@ -447,7 +447,7 @@ const Widgets = () => { } + icon={} iconPadding={3} title="income" value="$1.999,50" @@ -457,7 +457,7 @@ const Widgets = () => { } + icon={} iconPadding={3} title="income" value="$1.999,50" @@ -467,7 +467,7 @@ const Widgets = () => { } + icon={} iconPadding={3} title="income" value="$1.999,50" @@ -477,7 +477,7 @@ const Widgets = () => { } + icon={} iconPadding={3} title="income" value="$1.999,50" @@ -487,20 +487,20 @@ const Widgets = () => { } + icon={} iconPadding={3} title="income" value="$1.999,50" color="primary" footer={ View more - + } /> @@ -508,20 +508,20 @@ const Widgets = () => { } + icon={} iconPadding={3} title="income" value="$1.999,50" color="info" footer={ View more - + } /> @@ -529,20 +529,20 @@ const Widgets = () => { } + icon={} iconPadding={3} title="income" value="$1.999,50" color="warning" footer={ View more - + } /> @@ -550,20 +550,20 @@ const Widgets = () => { } + icon={} iconPadding={3} title="income" value="$1.999,50" color="danger" footer={ View more - + } /> @@ -572,7 +572,7 @@ const Widgets = () => { } + icon={} iconPadding={4} title="income" value="$1.999,50" @@ -583,7 +583,7 @@ const Widgets = () => { } + icon={} iconPadding={4} title="income" value="$1.999,50" @@ -594,7 +594,7 @@ const Widgets = () => { } + icon={} iconPadding={4} title="income" value="$1.999,50" @@ -605,7 +605,7 @@ const Widgets = () => { } + icon={} iconPadding={4} title="income" value="$1.999,50" @@ -617,34 +617,34 @@ const Widgets = () => { } + icon={} value="87.500" title="Visitors" progressColor="info" progressValue={75} /> } + icon={} value="385" title="New Clients" progressColor="success" progressValue={75} /> } + icon={} value="1238" title="Products sold" progressColor="warning" progressValue={75} /> } + icon={} value="28%" title="Returning Visitors" progressValue={75} /> } + icon={} value="5:34:11" title="Avg. Time" progressColor="danger" @@ -654,7 +654,7 @@ const Widgets = () => { } + icon={} value="87.500" title="Visitors" progressColor="info" @@ -664,7 +664,7 @@ const Widgets = () => { } + icon={} value="385" title="New Clients" progressColor="success" @@ -674,7 +674,7 @@ const Widgets = () => { } + icon={} value="1238" title="Products sold" progressColor="warning" @@ -684,7 +684,7 @@ const Widgets = () => { } + icon={} value="28%" title="Returning Visitors" progressColor="primary" @@ -694,7 +694,7 @@ const Widgets = () => { } + icon={} value="5:34:11" title="Avg. Time" progressColor="danger" @@ -704,7 +704,7 @@ const Widgets = () => { } + icon={} value="972" title="comments" progressColor="info" @@ -717,7 +717,7 @@ const Widgets = () => { } + icon={} value="87.500" title="Visitors" progressValue={75} @@ -728,7 +728,7 @@ const Widgets = () => { } + icon={} value="385" title="New Clients" progressValue={75} @@ -739,7 +739,7 @@ const Widgets = () => { } + icon={} value="1238" title="Products sold" progressValue={75} @@ -750,7 +750,7 @@ const Widgets = () => { } + icon={} value="28%" title="Returning Visitors" progressValue={75} @@ -761,7 +761,7 @@ const Widgets = () => { } + icon={} value="5:34:11" title="Avg. Time" progressValue={75} @@ -772,7 +772,7 @@ const Widgets = () => { } + icon={} value="972" title="comments" progressValue={75} diff --git a/src/views/components/widgets/WidgetsBrand.js b/src/views/components/widgets/WidgetsBrand.js index a84f263..eea5f60 100644 --- a/src/views/components/widgets/WidgetsBrand.js +++ b/src/views/components/widgets/WidgetsBrand.js @@ -40,7 +40,7 @@ const WidgetsBrand = ({ withCharts }) => { className="mb-4" headerChildren={ <> - + {withCharts && ( { className="mb-4" headerChildren={ <> - + {withCharts && ( { className="mb-4" headerChildren={ <> - + {withCharts && ( { color="warning" headerChildren={ <> - + {withCharts && ( { value="26K" change={ <> - (-12.4% ) + (-12.4% ) } title="Users" action={ - + Action @@ -107,14 +107,14 @@ const WidgetsDropdown = () => { value="$6.200" change={ <> - (40.9% ) + (40.9% ) } title="Income" action={ - + Action @@ -191,14 +191,14 @@ const WidgetsDropdown = () => { value="2.49%" change={ <> - (84.7% ) + (84.7% ) } title="Conversion Rate" action={ - + Action @@ -262,14 +262,14 @@ const WidgetsDropdown = () => { value="44K" change={ <> - (-23.6% ) + (-23.6% ) } title="Sessions" action={ - + Action diff --git a/src/views/dashboard/Dashboard.js b/src/views/dashboard/Dashboard.js index aec04fd..1fd49ac 100644 --- a/src/views/dashboard/Dashboard.js +++ b/src/views/dashboard/Dashboard.js @@ -44,7 +44,7 @@ const Dashboard = () => { - + {['Day', 'Month', 'Year'].map((value) => ( @@ -287,7 +287,7 @@ const Dashboard = () => {
- + Male 43%
@@ -297,7 +297,7 @@ const Dashboard = () => {
- + Female 37%
@@ -308,7 +308,7 @@ const Dashboard = () => {
- + Organic Search 191,235 (56%) @@ -320,7 +320,7 @@ const Dashboard = () => {
- + Facebook 51,223 (15%) @@ -332,7 +332,7 @@ const Dashboard = () => {
- + Twitter 37,564 (11%) @@ -344,7 +344,7 @@ const Dashboard = () => {
- + LinkedIn 27,319 (8%) @@ -363,7 +363,7 @@ const Dashboard = () => { - + User Country @@ -384,7 +384,7 @@ const Dashboard = () => {
- +
@@ -400,7 +400,7 @@ const Dashboard = () => { - +
Last login
@@ -418,7 +418,7 @@ const Dashboard = () => {
- +
@@ -434,7 +434,7 @@ const Dashboard = () => { - +
Last login
@@ -452,7 +452,7 @@ const Dashboard = () => {
- +
@@ -468,7 +468,7 @@ const Dashboard = () => { - +
Last login
@@ -486,7 +486,7 @@ const Dashboard = () => {
- +
@@ -502,7 +502,7 @@ const Dashboard = () => { - +
Last login
@@ -520,7 +520,7 @@ const Dashboard = () => {
- +
@@ -536,7 +536,7 @@ const Dashboard = () => { - +
Last login
@@ -554,7 +554,7 @@ const Dashboard = () => {
- +
@@ -570,7 +570,7 @@ const Dashboard = () => { - +
Last login
diff --git a/src/views/pages/login/Login.js b/src/views/pages/login/Login.js index ab0afb5..7e81d37 100644 --- a/src/views/pages/login/Login.js +++ b/src/views/pages/login/Login.js @@ -29,13 +29,13 @@ const Login = () => {

Sign In to your account

- + - + {
- + Search diff --git a/src/views/pages/page500/Page500.js b/src/views/pages/page500/Page500.js index e9c52b6..40bf55e 100644 --- a/src/views/pages/page500/Page500.js +++ b/src/views/pages/page500/Page500.js @@ -25,7 +25,7 @@ const Page500 = () => { - + Search diff --git a/src/views/pages/register/Register.js b/src/views/pages/register/Register.js index 4882b34..7609d84 100644 --- a/src/views/pages/register/Register.js +++ b/src/views/pages/register/Register.js @@ -26,7 +26,7 @@ const Register = () => {

Create your account

- + @@ -36,7 +36,7 @@ const Register = () => {
- + { - +