Skip to content

Commit 7756e1e

Browse files
xidedixxidedix
authored
Merge pull request #76 from coreui/dev-v2-coreui-icons
feat: new CoreUI Icons set
2 parents 0a030ec + 97f6ab6 commit 7756e1e

File tree

9 files changed

+222
-13
lines changed

9 files changed

+222
-13
lines changed

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/coreui-free-react-admin-template",
3-
"version": "2.0.0-rc.0",
3+
"version": "2.0.0-rc.1",
44
"description": "CoreUI React Open Source Bootstrap 4 Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "https://coreui.io",
@@ -14,7 +14,8 @@
1414
"dependencies": {
1515
"@coreui/coreui": "^2.0.0",
1616
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
17-
"@coreui/react": "^2.0.0-rc.0",
17+
"@coreui/icons": "^0.1.1",
18+
"@coreui/react": "^2.0.0-rc.1",
1819
"bootstrap": "^4.1.1",
1920
"chart.js": "^2.7.2",
2021
"classnames": "^2.2.5",

‎src/App.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import React, { Component } from 'react';
22
import { HashRouter, Route, Switch } from 'react-router-dom';
33
import './App.css';
44
// Styles
5+
// CoreUI Icons Set
6+
import '@coreui/icons/css/coreui-icons.min.css';
57
// Import Flag Icons Set
68
import 'flag-icon-css/css/flag-icon.min.css';
79
// Import Font Awesome Icons Set
@@ -10,7 +12,6 @@ import 'font-awesome/css/font-awesome.min.css';
1012
import 'simple-line-icons/css/simple-line-icons.css';
1113
// Import Main styles for this application
1214
import './scss/style.css'
13-
// import '../node_modules/@coreui/styles/scss/_dropdown-menu-right.scss';
1415

1516
// Containers
1617
import { DefaultLayout } from './containers';

‎src/_nav.js‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,19 @@ export default {
161161
icon: 'icon-star',
162162
children: [
163163
{
164-
name: 'Flags',
165-
url: '/icons/flags',
164+
name: 'CoreUI Icons',
165+
url: '/icons/coreui-icons',
166166
icon: 'icon-star',
167167
badge: {
168-
variant: 'success',
168+
variant: 'info',
169169
text: 'NEW',
170170
},
171171
},
172+
{
173+
name: 'Flags',
174+
url: '/icons/flags',
175+
icon: 'icon-star',
176+
},
172177
{
173178
name: 'Font Awesome',
174179
url: '/icons/font-awesome',

‎src/routes.js‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
Charts,
1111
Collapses,
1212
Colors,
13+
CoreUIIcons,
1314
Dashboard,
1415
Dropdowns,
1516
Flags,
@@ -48,11 +49,11 @@ const routes = [
4849
{ path: '/base/tables', name: 'Tables', component: Tables },
4950
{ path: '/base/tabs', name: 'Tabs', component: Tabs },
5051
{ path: '/base/breadcrumbs', name: 'Breadcrumbs', component: Breadcrumbs },
51-
{ path: '/base/carousels', name: 'Carousels', component: Carousels },
52-
{ path: '/base/collapses', name: 'Collapses', component: Collapses },
52+
{ path: '/base/carousels', name: 'Carousel', component: Carousels },
53+
{ path: '/base/collapses', name: 'Collapse', component: Collapses },
5354
{ path: '/base/dropdowns', name: 'Dropdowns', component: Dropdowns },
5455
{ path: '/base/jumbotrons', name: 'Jumbotrons', component: Jumbotrons },
55-
{ path: '/base/list-groups', name: 'ListGroups', component: ListGroups },
56+
{ path: '/base/list-groups', name: 'List Groups', component: ListGroups },
5657
{ path: '/base/navbars', name: 'Navbars', component: Navbars },
5758
{ path: '/base/navs', name: 'Navs', component: Navs },
5859
{ path: '/base/paginations', name: 'Paginations', component: Paginations },
@@ -61,10 +62,11 @@ const routes = [
6162
{ path: '/base/tooltips', name: 'Tooltips', component: Tooltips },
6263
{ path: '/buttons', exact: true, name: 'Buttons', component: Buttons },
6364
{ path: '/buttons/buttons', name: 'Buttons', component: Buttons },
64-
{ path: '/buttons/button-dropdowns', name: 'ButtonDropdowns', component: ButtonDropdowns },
65-
{ path: '/buttons/button-groups', name: 'ButtonGroups', component: ButtonGroups },
65+
{ path: '/buttons/button-dropdowns', name: 'Button Dropdowns', component: ButtonDropdowns },
66+
{ path: '/buttons/button-groups', name: 'Button Groups', component: ButtonGroups },
6667
{ path: '/buttons/brand-buttons', name: 'Brand Buttons', component: BrandButtons },
6768
{ path: '/icons', exact: true, name: 'Icons', component: Flags },
69+
{ path: '/icons/coreui-icons', name: 'CoreUI Icons', component: CoreUIIcons },
6870
{ path: '/icons/flags', name: 'Flags', component: Flags },
6971
{ path: '/icons/font-awesome', name: 'Font Awesome', component: FontAwesome },
7072
{ path: '/icons/simple-line-icons', name: 'Simple Line Icons', component: SimpleLineIcons },

‎src/views/Icons/CoreUIIcons/CoreUIIcons.js‎

Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
import React, { Component } from 'react';
2+
import { Badge, Card, CardBody, CardHeader, Col, Row } from 'reactstrap';
3+
4+
class CoreUIIcons extends Component {
5+
render() {
6+
return (
7+
<div className="animated fadeIn">
8+
<Card>
9+
<CardHeader>
10+
<i className="fa fa-picture-o"></i>CoreUI Icons{' '} <Badge color={'info'}>New</Badge>
11+
<div className="card-header-actions">
12+
<a href="https://github.com/coreui/coreui-icons" rel="noreferrer noopener" target="_blank" className="card-header-action">
13+
<small className="text-muted">Github</small>
14+
</a>
15+
</div>
16+
</CardHeader>
17+
<CardBody>
18+
<Row className="text-center">
19+
<Col xs="6" sm="4" md="3">
20+
<i className="cui-basket-loaded icons font-2xl d-block mt-4"></i>
21+
<div>basket-loaded</div>
22+
</Col>
23+
<Col xs="6" sm="4" md="3">
24+
<i className="cui-bell icons font-2xl d-block mt-4"></i>
25+
<div>bell</div>
26+
</Col>
27+
<Col xs="6" sm="4" md="3">
28+
<i className="cui-calculator icons font-2xl d-block mt-4"></i>
29+
<div>calculator</div>
30+
</Col>
31+
<Col xs="6" sm="4" md="3">
32+
<i className="cui-calendar icons font-2xl d-block mt-4"></i>
33+
<div>calendar</div>
34+
</Col>
35+
<Col xs="6" sm="4" md="3">
36+
<i className="cui-camera icons font-2xl d-block mt-4"></i>
37+
<div>camera</div>
38+
</Col>
39+
<Col xs="6" sm="4" md="3">
40+
<i className="cui-chart icons font-2xl d-block mt-4"></i>
41+
<div>chart</div>
42+
</Col>
43+
<Col xs="6" sm="4" md="3">
44+
<i className="cui-cloud-download icons font-2xl d-block mt-4"></i>
45+
<div>cloud-download</div>
46+
</Col>
47+
<Col xs="6" sm="4" md="3">
48+
<i className="cui-cursor icons font-2xl d-block mt-4"></i>
49+
<div>cursor</div>
50+
</Col>
51+
<Col xs="6" sm="4" md="3">
52+
<i className="cui-cursor-move icons font-2xl d-block mt-4"></i>
53+
<div>cursor-move</div>
54+
</Col>
55+
<Col xs="6" sm="4" md="3">
56+
<i className="cui-drop icons font-2xl d-block mt-4"></i>
57+
<div>drop</div>
58+
</Col>
59+
<Col xs="6" sm="4" md="3">
60+
<i className="cui-energy icons font-2xl d-block mt-4"></i>
61+
<div>energy</div>
62+
</Col>
63+
<Col xs="6" sm="4" md="3">
64+
<i className="cui-envelope-letter icons font-2xl d-block mt-4"></i>
65+
<div>envelope-letter</div>
66+
</Col>
67+
<Col xs="6" sm="4" md="3">
68+
<i className="cui-equalizer icons font-2xl d-block mt-4"></i>
69+
<div>equalizer</div>
70+
</Col>
71+
<Col xs="6" sm="4" md="3">
72+
<i className="cui-globe icons font-2xl d-block mt-4"></i>
73+
<div>globe</div>
74+
</Col>
75+
<Col xs="6" sm="4" md="3">
76+
<i className="cui-graph icons font-2xl d-block mt-4"></i>
77+
<div>graph</div>
78+
</Col>
79+
<Col xs="6" sm="4" md="3">
80+
<i className="cui-home icons font-2xl d-block mt-4"></i>
81+
<div>home</div>
82+
</Col>
83+
<Col xs="6" sm="4" md="3">
84+
<i className="cui-layers icons font-2xl d-block mt-4"></i>
85+
<div>layers</div>
86+
</Col>
87+
<Col xs="6" sm="4" md="3">
88+
<i className="cui-list icons font-2xl d-block mt-4"></i>
89+
<div>list</div>
90+
</Col>
91+
<Col xs="6" sm="4" md="3">
92+
<i className="cui-location-pin icons font-2xl d-block mt-4"></i>
93+
<div>location-pin</div>
94+
</Col>
95+
<Col xs="6" sm="4" md="3">
96+
<i className="cui-map icons font-2xl d-block mt-4"></i>
97+
<div>map</div>
98+
</Col>
99+
<Col xs="6" sm="4" md="3">
100+
<i className="cui-note icons font-2xl d-block mt-4"></i>
101+
<div>note</div>
102+
</Col>
103+
<Col xs="6" sm="4" md="3">
104+
<i className="cui-options icons font-2xl d-block mt-4"></i>
105+
<div>options</div>
106+
</Col>
107+
<Col xs="6" sm="4" md="3">
108+
<i className="cui-pencil icons font-2xl d-block mt-4"></i>
109+
<div>pencil</div>
110+
</Col>
111+
<Col xs="6" sm="4" md="3">
112+
<i className="cui-people icons font-2xl d-block mt-4"></i>
113+
<div>people</div>
114+
</Col>
115+
<Col xs="6" sm="4" md="3">
116+
<i className="cui-pie-chart icons font-2xl d-block mt-4"></i>
117+
<div>pie-chart</div>
118+
</Col>
119+
<Col xs="6" sm="4" md="3">
120+
<i className="cui-puzzle icons font-2xl d-block mt-4"></i>
121+
<div>puzzle</div>
122+
</Col>
123+
<Col xs="6" sm="4" md="3">
124+
<i className="cui-screen-desktop icons font-2xl d-block mt-4"></i>
125+
<div>screen-desktop</div>
126+
</Col>
127+
<Col xs="6" sm="4" md="3">
128+
<i className="cui-screen-smartphone icons font-2xl d-block mt-4"></i>
129+
<div>screen-smartphone</div>
130+
</Col>
131+
<Col xs="6" sm="4" md="3">
132+
<i className="cui-settings icons font-2xl d-block mt-4"></i>
133+
<div>settings</div>
134+
</Col>
135+
<Col xs="6" sm="4" md="3">
136+
<i className="cui-social-facebook icons font-2xl d-block mt-4"></i>
137+
<div>social-facebook</div>
138+
</Col>
139+
<Col xs="6" sm="4" md="3">
140+
<i className="cui-social-skype icons font-2xl d-block mt-4"></i>
141+
<div>social-skype</div>
142+
</Col>
143+
<Col xs="6" sm="4" md="3">
144+
<i className="cui-social-twitter icons font-2xl d-block mt-4"></i>
145+
<div>social-twitter</div>
146+
</Col>
147+
<Col xs="6" sm="4" md="3">
148+
<i className="cui-speech icons font-2xl d-block mt-4"></i>
149+
<div>speech</div>
150+
</Col>
151+
<Col xs="6" sm="4" md="3">
152+
<i className="cui-speedometer icons font-2xl d-block mt-4"></i>
153+
<div>speedometer</div>
154+
</Col>
155+
<Col xs="6" sm="4" md="3">
156+
<i className="cui-star icons font-2xl d-block mt-4"></i>
157+
<div>star</div>
158+
</Col>
159+
<Col xs="6" sm="4" md="3">
160+
<i className="cui-user icons font-2xl d-block mt-4"></i>
161+
<div>user</div>
162+
</Col>
163+
<Col xs="6" sm="4" md="3">
164+
<i className="cui-user-female icons font-2xl d-block mt-4"></i>
165+
<div>user-female</div>
166+
</Col>
167+
<Col xs="6" sm="4" md="3">
168+
<i className="cui-user-follow icons font-2xl d-block mt-4"></i>
169+
<div>user-follow</div>
170+
</Col>
171+
<Col xs="6" sm="4" md="3">
172+
<i className="cui-user-unfollow icons font-2xl d-block mt-4"></i>
173+
<div>user-unfollow</div>
174+
</Col>
175+
</Row>
176+
</CardBody>
177+
</Card>
178+
</div>
179+
);
180+
}
181+
}
182+
183+
export default CoreUIIcons;

‎src/views/Icons/CoreUIIcons/CoreUIIcons.test.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import React from 'react';
2+
import ReactDOM from 'react-dom';
3+
import CoreUIIcons from './CoreUIIcons';
4+
5+
it('renders without crashing', () => {
6+
const div = document.createElement('div');
7+
ReactDOM.render(<CoreUIIcons />, div);
8+
ReactDOM.unmountComponentAtNode(div);
9+
});

‎src/views/Icons/CoreUIIcons/package.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "CoreUIIcons",
3+
"version": "0.0.0",
4+
"private": true,
5+
"main": "./CoreUIIcons.js"
6+
}

‎src/views/Icons/index.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
import CoreUIIcons from './CoreUIIcons';
12
import Flags from './Flags';
23
import FontAwesome from './FontAwesome';
34
import SimpleLineIcons from './SimpleLineIcons';
45

56
export {
6-
Flags, FontAwesome, SimpleLineIcons
7+
CoreUIIcons, Flags, FontAwesome, SimpleLineIcons
78
};

‎src/views/index.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
import { ButtonDropdowns, ButtonGroups, Buttons, BrandButtons } from './Buttons';
2222
import Charts from './Charts';
2323
import Dashboard from './Dashboard';
24-
import { Flags, FontAwesome, SimpleLineIcons } from './Icons';
24+
import { CoreUIIcons, Flags, FontAwesome, SimpleLineIcons } from './Icons';
2525
import { Alerts, Badges, Modals } from './Notifications';
2626
import { Login, Page404, Page500, Register } from './Pages';
2727
import { Colors, Typography } from './Theme';
@@ -31,6 +31,7 @@ export {
3131
Badges,
3232
Typography,
3333
Colors,
34+
CoreUIIcons,
3435
Page404,
3536
Page500,
3637
Register,

0 commit comments

Comments
 (0)