Skip to content
/ coreui-free-react-admin-template Public
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 8af3ee6

Browse files
xidedixxidedix
authoredJul 30, 2018
Merge pull request #102 from coreui/dev-vnext
v2.0.8
2 parents 26be744 + 3b7c4c7 commit 8af3ee6

File tree

7 files changed

+187
-151
lines changed

7 files changed

+187
-151
lines changed
 

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
## [CoreUI](https://coreui.io/) for [react](./REACT.md) changelog
22

3+
##### `v2.0.8`
4+
- fix(User): add missing unique key prop
5+
- fix(Login): add missing form and autoComplete
6+
- fix(Register): add missing form and autoComplete
7+
- chore: update `@coreui/react` to `2.0.5`
8+
- chore: update `bootstrap` to `4.1.3`
9+
- chore: update `reactstrap` to `6.3.1`
10+
- chore: update `babel-jest` to `23.4.2`
11+
312
##### `v2.0.5`
413
- feat(router): Users/User Breadcrumb example with `/users/:id`
514
- chore: update `@coreui/react` to `2.0.4`,

‎package.json

Lines changed: 5 additions & 5 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.6",
3+
"version": "2.0.8",
44
"description": "CoreUI React Open Source Bootstrap 4 Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "https://coreui.io",
@@ -15,8 +15,8 @@
1515
"@coreui/coreui": "^2.0.4",
1616
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
1717
"@coreui/icons": "0.2.0",
18-
"@coreui/react": "^2.0.4",
19-
"bootstrap": "^4.1.1",
18+
"@coreui/react": "^2.0.5",
19+
"bootstrap": "^4.1.3",
2020
"chart.js": "^2.7.2",
2121
"classnames": "^2.2.6",
2222
"core-js": "^2.5.7",
@@ -32,11 +32,11 @@
3232
"react-router-config": "^1.0.0-beta.4",
3333
"react-router-dom": "^4.3.1",
3434
"react-test-renderer": "^16.4.1",
35-
"reactstrap": "^6.1.0",
35+
"reactstrap": "^6.3.1",
3636
"simple-line-icons": "^2.4.1"
3737
},
3838
"devDependencies": {
39-
"babel-jest": "^23.0.1",
39+
"babel-jest": "^23.4.2",
4040
"node-sass-chokidar": "^1.3.0",
4141
"npm-run-all": "^4.1.3",
4242
"react-scripts": "^1.1.4"

‎src/scss/style.css

Lines changed: 87 additions & 84 deletions
Large diffs are not rendered by default.

‎src/views/Base/Switches/Switches.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ class Switches extends Component {
4848
<Card>
4949
<CardHeader>
5050
3d Switch
51+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
5152
</CardHeader>
5253
<CardBody>
5354
<AppSwitch className={'mx-1'} variant={'3d'} color={'primary'} defaultChecked />
@@ -66,6 +67,7 @@ class Switches extends Component {
6667
<Card>
6768
<CardHeader>
6869
3d Switch <small><code>disabled</code></small>
70+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
6971
</CardHeader>
7072
<CardBody>
7173
<AppSwitch className={'mx-1'} variant={'3d'} color={'primary'} checked disabled />
@@ -85,6 +87,7 @@ class Switches extends Component {
8587
<Card>
8688
<CardHeader>
8789
3d Switch <small><code>outline="alt"</code></small>
90+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
8891
</CardHeader>
8992
<CardBody>
9093
<AppSwitch className={'mx-1'} variant={'3d'} color={'primary'} checked outline={'alt'} />
@@ -103,6 +106,7 @@ class Switches extends Component {
103106
<Card>
104107
<CardHeader>
105108
3d Switch <small><code>label</code></small>
109+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
106110
</CardHeader>
107111
<CardBody>
108112
<AppSwitch className={'mx-1'} variant={'3d'} color={'primary'} defaultChecked label dataOn={'\u2713'} dataOff={'\u2715'} />
@@ -121,6 +125,7 @@ class Switches extends Component {
121125
<Card>
122126
<CardHeader>
123127
3d Switch <small><code>outline="alt" label</code></small>
128+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
124129
</CardHeader>
125130
<CardBody>
126131
<AppSwitch className={'mx-1'} variant={'3d'} outline={'alt'} color={'primary'} defaultChecked label dataOn={'\u2713'} dataOff={'\u2715'} />
@@ -139,6 +144,7 @@ class Switches extends Component {
139144
<Card>
140145
<CardHeader>
141146
3d Switch <small><code>outline="alt" label</code></small>
147+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
142148
</CardHeader>
143149
<CardBody>
144150
<AppSwitch className={'mx-1'} variant={'3d'} outline={'alt'} color={'primary'} defaultChecked label />
@@ -157,6 +163,7 @@ class Switches extends Component {
157163
<Card>
158164
<CardHeader>
159165
Switch outline
166+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
160167
</CardHeader>
161168
<CardBody>
162169
<AppSwitch className={'mx-1'} color={'primary'} outline checked />
@@ -175,6 +182,7 @@ class Switches extends Component {
175182
<Card>
176183
<CardHeader>
177184
Switch outline pills
185+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
178186
</CardHeader>
179187
<CardBody>
180188
<AppSwitch className={'mx-1'} variant={'pill'} color={'primary'} outline checked />
@@ -193,6 +201,7 @@ class Switches extends Component {
193201
<Card>
194202
<CardHeader>
195203
Switch outline alternative
204+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
196205
</CardHeader>
197206
<CardBody>
198207
<AppSwitch className={'mx-1'} color={'primary'} outline={'alt'} checked />
@@ -212,6 +221,7 @@ class Switches extends Component {
212221
<Card>
213222
<CardHeader>
214223
Switch outline alternative - pills
224+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
215225
</CardHeader>
216226
<CardBody>
217227
<AppSwitch className={'mx-1'} variant={'pill'} color={'primary'} outline={'alt'} checked />
@@ -231,6 +241,7 @@ class Switches extends Component {
231241
<Card>
232242
<CardHeader>
233243
Switch with text
244+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
234245
</CardHeader>
235246
<CardBody>
236247
<AppSwitch className={'mx-1'} color={'primary'} label checked />
@@ -249,6 +260,7 @@ class Switches extends Component {
249260
<Card>
250261
<CardHeader>
251262
Switch with text pills
263+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
252264
</CardHeader>
253265
<CardBody>
254266
<AppSwitch className={'mx-1'} variant={'pill'} color={'primary'} label checked />
@@ -267,6 +279,7 @@ class Switches extends Component {
267279
<Card>
268280
<CardHeader>
269281
Switch with text outline
282+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
270283
</CardHeader>
271284
<CardBody>
272285
<AppSwitch className={'mx-1'} color={'primary'} outline label checked />
@@ -285,6 +298,7 @@ class Switches extends Component {
285298
<Card>
286299
<CardHeader>
287300
Switch with text outline pills
301+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
288302
</CardHeader>
289303
<CardBody>
290304
<AppSwitch className={'mx-1'} variant={'pill'} color={'primary'} outline label checked />
@@ -303,6 +317,7 @@ class Switches extends Component {
303317
<Card>
304318
<CardHeader>
305319
Switch with text outline alternative pills
320+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
306321
</CardHeader>
307322
<CardBody>
308323
<AppSwitch className={'mx-1'} color={'primary'} outline={'alt'} label checked />
@@ -321,6 +336,7 @@ class Switches extends Component {
321336
<Card>
322337
<CardHeader>
323338
Switch with text outline alternative pills
339+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
324340
</CardHeader>
325341
<CardBody>
326342
<AppSwitch className={'mx-1'} variant={'pill'} color={'primary'} outline={'alt'} label checked />
@@ -340,6 +356,7 @@ class Switches extends Component {
340356
<Card>
341357
<CardHeader>
342358
Switch with text outline alternative
359+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
343360
</CardHeader>
344361
<CardBody>
345362
<AppSwitch className={'mx-1'} color={'primary'} outline checked label dataOn={'\u2713'} dataOff={'\u2715'}/>
@@ -358,6 +375,7 @@ class Switches extends Component {
358375
<Card>
359376
<CardHeader>
360377
Switch with text outline alternative pills
378+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
361379
</CardHeader>
362380
<CardBody>
363381
<AppSwitch className={'mx-1'} variant={'pill'} color={'primary'} outline checked label dataOn={'\u2713'} dataOff={'\u2715'} />
@@ -377,6 +395,7 @@ class Switches extends Component {
377395
<Card>
378396
<CardHeader>
379397
Switch with text outline alternative
398+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
380399
</CardHeader>
381400
<CardBody>
382401
<AppSwitch className={'mx-1'} color={'primary'} outline={'alt'} checked label dataOn={'\u2713'} dataOff={'\u2715'}/>
@@ -395,6 +414,7 @@ class Switches extends Component {
395414
<Card>
396415
<CardHeader>
397416
Switch with text outline alternative pills
417+
{' '}<a href="https://coreui.io/pro/react/" className="badge badge-danger">CoreUI Pro</a>
398418
</CardHeader>
399419
<CardBody>
400420
<AppSwitch className={'mx-1'} variant={'pill'} color={'primary'} outline={'alt'} checked label dataOn={'\u2713'} dataOff={'\u2715'} />

‎src/views/Pages/Login/Login.js

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { Component } from 'react';
2-
import { Button, Card, CardBody, CardGroup, Col, Container, Input, InputGroup, InputGroupAddon, InputGroupText, Row } from 'reactstrap';
2+
import { Button, Card, CardBody, CardGroup, Col, Container, Form, Input, InputGroup, InputGroupAddon, InputGroupText, Row } from 'reactstrap';
33

44
class Login extends Component {
55
render() {
@@ -11,32 +11,34 @@ class Login extends Component {
1111
<CardGroup>
1212
<Card className="p-4">
1313
<CardBody>
14-
<h1>Login</h1>
15-
<p className="text-muted">Sign In to your account</p>
16-
<InputGroup className="mb-3">
17-
<InputGroupAddon addonType="prepend">
18-
<InputGroupText>
19-
<i className="icon-user"></i>
20-
</InputGroupText>
21-
</InputGroupAddon>
22-
<Input type="text" placeholder="Username" />
23-
</InputGroup>
24-
<InputGroup className="mb-4">
25-
<InputGroupAddon addonType="prepend">
26-
<InputGroupText>
27-
<i className="icon-lock"></i>
28-
</InputGroupText>
29-
</InputGroupAddon>
30-
<Input type="password" placeholder="Password" />
31-
</InputGroup>
32-
<Row>
33-
<Col xs="6">
34-
<Button color="primary" className="px-4">Login</Button>
35-
</Col>
36-
<Col xs="6" className="text-right">
37-
<Button color="link" className="px-0">Forgot password?</Button>
38-
</Col>
39-
</Row>
14+
<Form>
15+
<h1>Login</h1>
16+
<p className="text-muted">Sign In to your account</p>
17+
<InputGroup className="mb-3">
18+
<InputGroupAddon addonType="prepend">
19+
<InputGroupText>
20+
<i className="icon-user"></i>
21+
</InputGroupText>
22+
</InputGroupAddon>
23+
<Input type="text" placeholder="Username" autoComplete="username" />
24+
</InputGroup>
25+
<InputGroup className="mb-4">
26+
<InputGroupAddon addonType="prepend">
27+
<InputGroupText>
28+
<i className="icon-lock"></i>
29+
</InputGroupText>
30+
</InputGroupAddon>
31+
<Input type="password" placeholder="Password" autoComplete="current-password" />
32+
</InputGroup>
33+
<Row>
34+
<Col xs="6">
35+
<Button color="primary" className="px-4">Login</Button>
36+
</Col>
37+
<Col xs="6" className="text-right">
38+
<Button color="link" className="px-0">Forgot password?</Button>
39+
</Col>
40+
</Row>
41+
</Form>
4042
</CardBody>
4143
</Card>
4244
<Card className="text-white bg-primary py-5 d-md-down-none" style={{ width: 44 + '%' }}>

‎src/views/Pages/Register/Register.js

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { Component } from 'react';
2-
import { Button, Card, CardBody, CardFooter, Col, Container, Input, InputGroup, InputGroupAddon, InputGroupText, Row } from 'reactstrap';
2+
import { Button, Card, CardBody, CardFooter, Col, Container, Form, Input, InputGroup, InputGroupAddon, InputGroupText, Row } from 'reactstrap';
33

44
class Register extends Component {
55
render() {
@@ -10,39 +10,41 @@ class Register extends Component {
1010
<Col md="6">
1111
<Card className="mx-4">
1212
<CardBody className="p-4">
13-
<h1>Register</h1>
14-
<p className="text-muted">Create your account</p>
15-
<InputGroup className="mb-3">
16-
<InputGroupAddon addonType="prepend">
17-
<InputGroupText>
18-
<i className="icon-user"></i>
19-
</InputGroupText>
20-
</InputGroupAddon>
21-
<Input type="text" placeholder="Username" />
22-
</InputGroup>
23-
<InputGroup className="mb-3">
24-
<InputGroupAddon addonType="prepend">
25-
<InputGroupText>@</InputGroupText>
26-
</InputGroupAddon>
27-
<Input type="text" placeholder="Email" />
28-
</InputGroup>
29-
<InputGroup className="mb-3">
30-
<InputGroupAddon addonType="prepend">
31-
<InputGroupText>
32-
<i className="icon-lock"></i>
33-
</InputGroupText>
34-
</InputGroupAddon>
35-
<Input type="password" placeholder="Password" />
36-
</InputGroup>
37-
<InputGroup className="mb-4">
38-
<InputGroupAddon addonType="prepend">
39-
<InputGroupText>
40-
<i className="icon-lock"></i>
41-
</InputGroupText>
42-
</InputGroupAddon>
43-
<Input type="password" placeholder="Repeat password" />
44-
</InputGroup>
45-
<Button color="success" block>Create Account</Button>
13+
<Form>
14+
<h1>Register</h1>
15+
<p className="text-muted">Create your account</p>
16+
<InputGroup className="mb-3">
17+
<InputGroupAddon addonType="prepend">
18+
<InputGroupText>
19+
<i className="icon-user"></i>
20+
</InputGroupText>
21+
</InputGroupAddon>
22+
<Input type="text" placeholder="Username" autoComplete="username" />
23+
</InputGroup>
24+
<InputGroup className="mb-3">
25+
<InputGroupAddon addonType="prepend">
26+
<InputGroupText>@</InputGroupText>
27+
</InputGroupAddon>
28+
<Input type="text" placeholder="Email" autoComplete="email" />
29+
</InputGroup>
30+
<InputGroup className="mb-3">
31+
<InputGroupAddon addonType="prepend">
32+
<InputGroupText>
33+
<i className="icon-lock"></i>
34+
</InputGroupText>
35+
</InputGroupAddon>
36+
<Input type="password" placeholder="Password" autoComplete="new-password" />
37+
</InputGroup>
38+
<InputGroup className="mb-4">
39+
<InputGroupAddon addonType="prepend">
40+
<InputGroupText>
41+
<i className="icon-lock"></i>
42+
</InputGroupText>
43+
</InputGroupAddon>
44+
<Input type="password" placeholder="Repeat password" autoComplete="new-password" />
45+
</InputGroup>
46+
<Button color="success" block>Create Account</Button>
47+
</Form>
4648
</CardBody>
4749
<CardFooter className="p-4">
4850
<Row>

‎src/views/Users/User.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class User extends Component {
2525
{
2626
userDetails.map(([key, value]) => {
2727
return (
28-
<tr>
28+
<tr key={key}>
2929
<td>{`${key}:`}</td>
3030
<td><strong>{value}</strong></td>
3131
</tr>

0 commit comments

Comments
 (0)
Please sign in to comment.