diff --git a/src/_nav.js b/src/_nav.js index 0800566..45c9198 100644 --- a/src/_nav.js +++ b/src/_nav.js @@ -8,7 +8,7 @@ const _nav = [ as: NavLink, anchor: 'Dashboard', to: '/dashboard', - icon: , + icon: , badge: { color: 'info', text: 'NEW', @@ -23,14 +23,14 @@ const _nav = [ as: NavLink, anchor: 'Colors', to: '/theme/colors', - icon: , + icon: , }, { _component: 'CNavItem', as: NavLink, anchor: 'Typography', to: '/theme/typography', - icon: , + icon: , }, { _component: 'CNavTitle', @@ -41,7 +41,7 @@ const _nav = [ as: NavLink, anchor: 'Base', to: '/to', - icon: , + icon: , items: [ { _component: 'CNavItem', @@ -126,7 +126,7 @@ const _nav = [ { _component: 'CNavGroup', anchor: 'Buttons', - icon: , + icon: , items: [ { _component: 'CNavItem', @@ -151,7 +151,7 @@ const _nav = [ { _component: 'CNavGroup', anchor: 'Forms', - icon: , + icon: , items: [ { _component: 'CNavItem', @@ -208,12 +208,12 @@ const _nav = [ as: NavLink, anchor: 'Charts', to: '/charts', - icon: , + icon: , }, { _component: 'CNavGroup', anchor: 'Icons', - icon: , + icon: , items: [ { _component: 'CNavItem', @@ -242,7 +242,7 @@ const _nav = [ { _component: 'CNavGroup', anchor: 'Notifications', - icon: , + icon: , items: [ { _component: 'CNavItem', @@ -275,7 +275,7 @@ const _nav = [ as: NavLink, anchor: 'Widgets', to: '/widgets', - icon: , + icon: , badge: { color: 'info', text: 'NEW', @@ -288,7 +288,7 @@ const _nav = [ { _component: 'CNavGroup', anchor: 'Pages', - icon: , + icon: , items: [ { _component: 'CNavItem', diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js index 7f3892f..1c4d664 100644 --- a/src/assets/icons/index.js +++ b/src/assets/icons/index.js @@ -35,6 +35,7 @@ import { cilAlignLeft, cilAlignRight, cilApplicationsSettings, + cilArrowBottom, cilArrowRight, cilArrowTop, cilAsterisk, @@ -138,6 +139,7 @@ export const icons = Object.assign( cilAlignLeft, cilAlignRight, cilApplicationsSettings, + cilArrowBottom, cilArrowRight, cilArrowTop, cilAsterisk, diff --git a/src/components/header/AppHeaderDropdown.js b/src/components/header/AppHeaderDropdown.js index 25ffe50..023e41f 100644 --- a/src/components/header/AppHeaderDropdown.js +++ b/src/components/header/AppHeaderDropdown.js @@ -15,7 +15,7 @@ const AppHeaderDropdown = () => { return ( - + Account diff --git a/src/views/components/widgets/Widgets.js b/src/views/components/widgets/Widgets.js index 9aeeedd..71f677c 100644 --- a/src/views/components/widgets/Widgets.js +++ b/src/views/components/widgets/Widgets.js @@ -117,7 +117,7 @@ const Widgets = () => { } + icon={} iconPadding={3} title="income" value="$1.999,50" @@ -127,7 +127,7 @@ const Widgets = () => { } + icon={} iconPadding={3} title="income" value="$1.999,50" @@ -137,7 +137,7 @@ const Widgets = () => { } + icon={} iconPadding={3} title="income" value="$1.999,50" @@ -147,7 +147,7 @@ const Widgets = () => { } + icon={} iconPadding={3} title="income" value="$1.999,50" @@ -157,7 +157,7 @@ const Widgets = () => { } + icon={} iconPadding={3} title="income" value="$1.999,50" @@ -178,7 +178,7 @@ const Widgets = () => { } + icon={} iconPadding={3} title="income" value="$1.999,50" @@ -199,7 +199,7 @@ const Widgets = () => { } + icon={} iconPadding={3} title="income" value="$1.999,50" @@ -220,7 +220,7 @@ const Widgets = () => { } + icon={} iconPadding={3} title="income" value="$1.999,50" @@ -242,7 +242,7 @@ const Widgets = () => { } + icon={} iconPadding={4} title="income" value="$1.999,50" @@ -253,7 +253,7 @@ const Widgets = () => { } + icon={} iconPadding={4} title="income" value="$1.999,50" @@ -264,7 +264,7 @@ const Widgets = () => { } + icon={} iconPadding={4} title="income" value="$1.999,50" @@ -275,7 +275,7 @@ const Widgets = () => { } + icon={} iconPadding={4} title="income" value="$1.999,50" @@ -287,34 +287,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" diff --git a/src/views/components/widgets/WidgetsDropdown.js b/src/views/components/widgets/WidgetsDropdown.js index 3dd9bd6..c95a827 100644 --- a/src/views/components/widgets/WidgetsDropdown.js +++ b/src/views/components/widgets/WidgetsDropdown.js @@ -19,8 +19,13 @@ const WidgetsDropdown = () => { + (-12.4% ) + + } + title="Users" action={ @@ -99,8 +104,13 @@ const WidgetsDropdown = () => { + (40.9% ) + + } + title="Income" action={ @@ -130,6 +140,21 @@ const WidgetsDropdown = () => { }, ], }} + getDatasetAtEvent={(dataset, event) => { + console.log('init1') + console.log(dataset) + console.log(event) + }} + getElementAtEvent={(element, event) => { + console.log('init2') + console.log(element) + console.log(event) + }} + getElementsAtEvent={(element, event) => { + console.log('init3') + console.log(element) + console.log(event) + }} options={{ plugins: { legend: { @@ -178,8 +203,13 @@ const WidgetsDropdown = () => { + (84.7% ) + + } + title="Conversion Rate" action={ @@ -244,8 +274,13 @@ const WidgetsDropdown = () => { + (-23.6% ) + + } + title="Sessions" action={ diff --git a/src/views/dashboard/Dashboard.js b/src/views/dashboard/Dashboard.js index ba6733c..431ed52 100644 --- a/src/views/dashboard/Dashboard.js +++ b/src/views/dashboard/Dashboard.js @@ -146,28 +146,28 @@ const Dashboard = () => { /> - - + +
Visits
29.703 Users (40%)
- +
Unique
24.093 Users (20%)
- +
Pageviews
78.706 Views (60%)
- +
New Users
22.123 Users (80%)
- +
Bounce Rate
Average Rate (40.15%) @@ -375,7 +375,7 @@ const Dashboard = () => { - +
Yiorgos Avraamu
@@ -409,7 +409,7 @@ const Dashboard = () => {
- +
Avram Tarasios
@@ -443,7 +443,7 @@ const Dashboard = () => {
- +
Quintin Ed
@@ -477,7 +477,7 @@ const Dashboard = () => {
- +
Enéas Kwadwo
@@ -511,7 +511,7 @@ const Dashboard = () => {
- +
Agapetus Tadeáš
@@ -545,7 +545,7 @@ const Dashboard = () => {
- +
Friderik Dávid
diff --git a/src/views/theme/colors/Colors.js b/src/views/theme/colors/Colors.js index bcb3c44..b29d8a3 100644 --- a/src/views/theme/colors/Colors.js +++ b/src/views/theme/colors/Colors.js @@ -84,40 +84,6 @@ const Colors = () => {
- - Grays - - - -
Gray 100 Color
-
- -
Gray 200 Color
-
- -
Gray 300 Color
-
- -
Gray 400 Color
-
- -
Gray 500 Color
-
- -
Gray 600 Color
-
- -
Gray 700 Color
-
- -
Gray 800 Color
-
- -
Gray 900 Color
-
-
-
-
) }