Skip to content

Commit c585cbe

Browse files
mraiblemraible
authored
Update for Create React App 2.1.0, Spring Boot 2.1.0, and Spring Security 5.1.1 (#8)
1 parent 39c61c8 commit c585cbe

21 files changed

Lines changed: 5624 additions & 5206 deletions

‎.mvn/wrapper/maven-wrapper.jar‎

727 Bytes
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip
1+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip

‎app/.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
1+
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
22

33
# dependencies
44
/node
55
/node_modules
6+
/.pnp
7+
.pnp.js
68

79
# testing
810
/coverage

‎app/README.md‎

Lines changed: 6 additions & 2406 deletions
Large diffs are not rendered by default.

‎app/package.json‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,28 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"bootstrap": "4.1.2",
7-
"react": "^16.4.1",
8-
"react-cookie": "2.2.0",
9-
"react-dom": "^16.4.1",
6+
"bootstrap": "4.1.3",
7+
"react": "^16.6.0",
8+
"react-cookie": "3.0.4",
9+
"react-dom": "^16.6.0",
1010
"react-router-dom": "4.3.1",
11-
"react-scripts": "1.1.4",
12-
"reactstrap": "6.3.0"
11+
"react-scripts": "2.1.0",
12+
"reactstrap": "6.5.0"
1313
},
1414
"scripts": {
1515
"start": "react-scripts start",
1616
"build": "react-scripts build",
17-
"test": "react-scripts test --env=jsdom",
17+
"test": "react-scripts test",
1818
"eject": "react-scripts eject"
1919
},
20-
"proxy": "http://localhost:8080"
21-
}
20+
"proxy": "http://localhost:8080",
21+
"eslintConfig": {
22+
"extends": "react-app"
23+
},
24+
"browserslist": [
25+
">0.2%",
26+
"not dead",
27+
"not ie <= 11",
28+
"not op_mini all"
29+
]
30+
}

‎app/public/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8">
5+
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
56
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
67
<meta name="theme-color" content="#000000">
78
<!--
89
manifest.json provides metadata used when your web app is added to the
9-
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
10+
homescreen on Android. See https://developers.google.com/web/fundamentals/web-app-manifest/
1011
-->
1112
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
12-
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
1313
<!--
1414
Notice the use of %PUBLIC_URL% in the tags above.
1515
It will be replaced with the URL of the `public` folder during the build.

‎app/public/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"type": "image/x-icon"
99
}
1010
],
11-
"start_url": "./index.html",
11+
"start_url": ".",
1212
"display": "standalone",
1313
"theme_color": "#000000",
1414
"background_color": "#ffffff"

‎app/src/App.css‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,31 @@
44

55
.App-logo {
66
animation: App-logo-spin infinite 20s linear;
7-
height: 80px;
7+
height: 40vmin;
88
}
99

1010
.App-header {
11-
background-color: #222;
12-
height: 150px;
13-
padding: 20px;
11+
background-color: #282c34;
12+
min-height: 100vh;
13+
display: flex;
14+
flex-direction: column;
15+
align-items: center;
16+
justify-content: center;
17+
font-size: calc(10px + 2vmin);
1418
color: white;
1519
}
1620

17-
.App-title {
18-
font-size: 1.5em;
19-
}
20-
21-
.App-intro {
22-
font-size: large;
21+
.App-link {
22+
color: #61dafb;
2323
}
2424

2525
@keyframes App-logo-spin {
26-
from { transform: rotate(0deg); }
27-
to { transform: rotate(360deg); }
26+
from {
27+
transform: rotate(0deg);
28+
}
29+
to {
30+
transform: rotate(360deg);
31+
}
2832
}
2933

3034
.container, .container-fluid {

‎app/src/GroupList.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Button, ButtonGroup, Container, Table } from 'reactstrap';
33
import AppNavbar from './AppNavbar';
44
import { Link, withRouter } from 'react-router-dom';
55
import { instanceOf } from 'prop-types';
6-
import { Cookies, withCookies } from 'react-cookie';
6+
import { withCookies, Cookies } from 'react-cookie';
77

88
class GroupList extends Component {
99
static propTypes = {
@@ -23,7 +23,7 @@ class GroupList extends Component {
2323
fetch('api/groups', {credentials: 'include'})
2424
.then(response => response.json())
2525
.then(data => this.setState({groups: data, isLoading: false}))
26-
.catch(() => this.props.history.push('/'))
26+
.catch(() => this.props.history.push('/'));
2727
}
2828

2929
async remove(id) {
@@ -62,7 +62,7 @@ class GroupList extends Component {
6262
})}</td>
6363
<td>
6464
<ButtonGroup>
65-
<Button size="sm" color="primary" tag={Link} to={'/groups/' + group.id}>Edit</Button>
65+
<Button size="sm" color="primary" tag={Link} to={"/groups/" + group.id}>Edit</Button>
6666
<Button size="sm" color="danger" onClick={() => this.remove(group.id)}>Delete</Button>
6767
</ButtonGroup>
6868
</td>

‎app/src/Home.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ class Home extends Component {
3939
}
4040

4141
logout() {
42-
console.log('logging out...');
4342
fetch('/api/logout', {method: 'POST', credentials: 'include',
4443
headers: {'X-XSRF-TOKEN': this.state.csrfToken}}).then(res => res.json())
4544
.then(response => {

0 commit comments

Comments
 (0)