diff --git a/package.json b/package.json index 7dcdb2c..b68c814 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@coreui/coreui-free-react-admin-template", - "version": "2.0.0-rc.0", + "version": "2.0.0-rc.1", "description": "CoreUI React Open Source Bootstrap 4 Admin Template", "author": "Ɓukasz Holeczek", "homepage": "https://coreui.io", @@ -14,7 +14,8 @@ "dependencies": { "@coreui/coreui": "^2.0.0", "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0", - "@coreui/react": "^2.0.0-rc.0", + "@coreui/icons": "^0.1.1", + "@coreui/react": "^2.0.0-rc.1", "bootstrap": "^4.1.1", "chart.js": "^2.7.2", "classnames": "^2.2.5", diff --git a/src/App.js b/src/App.js index 486b218..ee94260 100644 --- a/src/App.js +++ b/src/App.js @@ -2,6 +2,8 @@ import React, { Component } from 'react'; import { HashRouter, Route, Switch } from 'react-router-dom'; import './App.css'; // Styles +// CoreUI Icons Set +import '@coreui/icons/css/coreui-icons.min.css'; // Import Flag Icons Set import 'flag-icon-css/css/flag-icon.min.css'; // Import Font Awesome Icons Set @@ -10,7 +12,6 @@ import 'font-awesome/css/font-awesome.min.css'; import 'simple-line-icons/css/simple-line-icons.css'; // Import Main styles for this application import './scss/style.css' -// import '../node_modules/@coreui/styles/scss/_dropdown-menu-right.scss'; // Containers import { DefaultLayout } from './containers'; diff --git a/src/_nav.js b/src/_nav.js index 472c6c0..1d56d46 100644 --- a/src/_nav.js +++ b/src/_nav.js @@ -160,14 +160,19 @@ export default { url: '/icons', icon: 'icon-star', children: [ + { + name: 'CoreUI Icons', + url: '/icons/coreui-icons', + icon: 'icon-star', + badge: { + variant: 'info', + text: 'NEW', + }, + }, { name: 'Flags', url: '/icons/flags', icon: 'icon-star', - badge: { - variant: 'success', - text: 'NEW', - }, }, { name: 'Font Awesome', diff --git a/src/routes.js b/src/routes.js index baf7233..7c5fed3 100644 --- a/src/routes.js +++ b/src/routes.js @@ -10,6 +10,7 @@ import { Charts, Collapses, Colors, + CoreUIIcons, Dashboard, Dropdowns, Flags, @@ -48,11 +49,11 @@ const routes = [ { path: '/base/tables', name: 'Tables', component: Tables }, { path: '/base/tabs', name: 'Tabs', component: Tabs }, { path: '/base/breadcrumbs', name: 'Breadcrumbs', component: Breadcrumbs }, - { path: '/base/carousels', name: 'Carousels', component: Carousels }, - { path: '/base/collapses', name: 'Collapses', component: Collapses }, + { path: '/base/carousels', name: 'Carousel', component: Carousels }, + { path: '/base/collapses', name: 'Collapse', component: Collapses }, { path: '/base/dropdowns', name: 'Dropdowns', component: Dropdowns }, { path: '/base/jumbotrons', name: 'Jumbotrons', component: Jumbotrons }, - { path: '/base/list-groups', name: 'ListGroups', component: ListGroups }, + { path: '/base/list-groups', name: 'List Groups', component: ListGroups }, { path: '/base/navbars', name: 'Navbars', component: Navbars }, { path: '/base/navs', name: 'Navs', component: Navs }, { path: '/base/paginations', name: 'Paginations', component: Paginations }, @@ -61,10 +62,11 @@ const routes = [ { path: '/base/tooltips', name: 'Tooltips', component: Tooltips }, { path: '/buttons', exact: true, name: 'Buttons', component: Buttons }, { path: '/buttons/buttons', name: 'Buttons', component: Buttons }, - { path: '/buttons/button-dropdowns', name: 'ButtonDropdowns', component: ButtonDropdowns }, - { path: '/buttons/button-groups', name: 'ButtonGroups', component: ButtonGroups }, + { path: '/buttons/button-dropdowns', name: 'Button Dropdowns', component: ButtonDropdowns }, + { path: '/buttons/button-groups', name: 'Button Groups', component: ButtonGroups }, { path: '/buttons/brand-buttons', name: 'Brand Buttons', component: BrandButtons }, { path: '/icons', exact: true, name: 'Icons', component: Flags }, + { path: '/icons/coreui-icons', name: 'CoreUI Icons', component: CoreUIIcons }, { path: '/icons/flags', name: 'Flags', component: Flags }, { path: '/icons/font-awesome', name: 'Font Awesome', component: FontAwesome }, { path: '/icons/simple-line-icons', name: 'Simple Line Icons', component: SimpleLineIcons }, diff --git a/src/views/Icons/CoreUIIcons/CoreUIIcons.js b/src/views/Icons/CoreUIIcons/CoreUIIcons.js new file mode 100644 index 0000000..556f2f3 --- /dev/null +++ b/src/views/Icons/CoreUIIcons/CoreUIIcons.js @@ -0,0 +1,183 @@ +import React, { Component } from 'react'; +import { Badge, Card, CardBody, CardHeader, Col, Row } from 'reactstrap'; + +class CoreUIIcons extends Component { + render() { + return ( +
+ + + CoreUI Icons{' '} New +
+ + Github + +
+
+ + + + +
basket-loaded
+ + + +
bell
+ + + +
calculator
+ + + +
calendar
+ + + +
camera
+ + + +
chart
+ + + +
cloud-download
+ + + +
cursor
+ + + +
cursor-move
+ + + +
drop
+ + + +
energy
+ + + +
envelope-letter
+ + + +
equalizer
+ + + +
globe
+ + + +
graph
+ + + +
home
+ + + +
layers
+ + + +
list
+ + + +
location-pin
+ + + +
map
+ + + +
note
+ + + +
options
+ + + +
pencil
+ + + +
people
+ + + +
pie-chart
+ + + +
puzzle
+ + + +
screen-desktop
+ + + +
screen-smartphone
+ + + +
settings
+ + + +
social-facebook
+ + + +
social-skype
+ + + +
social-twitter
+ + + +
speech
+ + + +
speedometer
+ + + +
star
+ + + +
user
+ + + +
user-female
+ + + +
user-follow
+ + + +
user-unfollow
+ +
+
+
+
+ ); + } +} + +export default CoreUIIcons; diff --git a/src/views/Icons/CoreUIIcons/CoreUIIcons.test.js b/src/views/Icons/CoreUIIcons/CoreUIIcons.test.js new file mode 100644 index 0000000..e2ec7f9 --- /dev/null +++ b/src/views/Icons/CoreUIIcons/CoreUIIcons.test.js @@ -0,0 +1,9 @@ +import React from 'react'; +import ReactDOM from 'react-dom'; +import CoreUIIcons from './CoreUIIcons'; + +it('renders without crashing', () => { + const div = document.createElement('div'); + ReactDOM.render(, div); + ReactDOM.unmountComponentAtNode(div); +}); diff --git a/src/views/Icons/CoreUIIcons/package.json b/src/views/Icons/CoreUIIcons/package.json new file mode 100644 index 0000000..a3813bf --- /dev/null +++ b/src/views/Icons/CoreUIIcons/package.json @@ -0,0 +1,6 @@ +{ + "name": "CoreUIIcons", + "version": "0.0.0", + "private": true, + "main": "./CoreUIIcons.js" +} diff --git a/src/views/Icons/index.js b/src/views/Icons/index.js index f7581a8..5a80a2a 100644 --- a/src/views/Icons/index.js +++ b/src/views/Icons/index.js @@ -1,7 +1,8 @@ +import CoreUIIcons from './CoreUIIcons'; import Flags from './Flags'; import FontAwesome from './FontAwesome'; import SimpleLineIcons from './SimpleLineIcons'; export { - Flags, FontAwesome, SimpleLineIcons + CoreUIIcons, Flags, FontAwesome, SimpleLineIcons }; diff --git a/src/views/index.js b/src/views/index.js index 2849d74..1a87c6f 100644 --- a/src/views/index.js +++ b/src/views/index.js @@ -21,7 +21,7 @@ import { import { ButtonDropdowns, ButtonGroups, Buttons, BrandButtons } from './Buttons'; import Charts from './Charts'; import Dashboard from './Dashboard'; -import { Flags, FontAwesome, SimpleLineIcons } from './Icons'; +import { CoreUIIcons, Flags, FontAwesome, SimpleLineIcons } from './Icons'; import { Alerts, Badges, Modals } from './Notifications'; import { Login, Page404, Page500, Register } from './Pages'; import { Colors, Typography } from './Theme'; @@ -31,6 +31,7 @@ export { Badges, Typography, Colors, + CoreUIIcons, Page404, Page500, Register,