Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ACS
Public
VILLASframework
VILLASweb
Commits
6323d7cb
Commit
6323d7cb
authored
Nov 21, 2018
by
Steffen Vogel
🎅🏼
Browse files
upgrade to React v16
parent
a62a8a56
Changes
2
Hide whitespace changes
Inline
Side-by-side
package.json
View file @
6323d7cb
...
...
@@ -3,47 +3,47 @@
"version"
:
"0.1.0"
,
"private"
:
true
,
"dependencies"
:
{
"
@fortawesome/fontawesome
"
:
"
^1.
1
.8
"
,
"
@fortawesome/f
ontawesome-free-solid
"
:
"
^5.
0.13
"
,
"
@fortawesome/react-fontawesome
"
:
"
0.
0.20
"
,
"
@fortawesome/fontawesome
-svg-core
"
:
"
^1.
2
.8
"
,
"
@fortawesome/f
ree-solid-svg-icons
"
:
"
^5.
5.0
"
,
"
@fortawesome/react-fontawesome
"
:
"
^
0.
1.3
"
,
"
babel-runtime
"
:
"
^6.26.0
"
,
"
bootstrap
"
:
"
^3.3.7
"
,
"
classnames
"
:
"
^2.2.
5
"
,
"
d3-array
"
:
"
^1.2.
0
"
,
"
d3-axis
"
:
"
^1.0.
8
"
,
"
classnames
"
:
"
^2.2.
6
"
,
"
d3-array
"
:
"
^1.2.
4
"
,
"
d3-axis
"
:
"
^1.0.
12
"
,
"
d3-scale
"
:
"
^1.0.6
"
,
"
d3-selection
"
:
"
^1.
1.0
"
,
"
d3-shape
"
:
"
^1.2.
0
"
,
"
d3-time-format
"
:
"
^2.
0.5
"
,
"
es6-promise
"
:
"
^4.
0
.5
"
,
"
file-saver
"
:
"
^1.3.
3
"
,
"
d3-selection
"
:
"
^1.
3.2
"
,
"
d3-shape
"
:
"
^1.2.
2
"
,
"
d3-time-format
"
:
"
^2.
1.3
"
,
"
es6-promise
"
:
"
^4.
2
.5
"
,
"
file-saver
"
:
"
^1.3.
8
"
,
"
flux
"
:
"
^3.1.2
"
,
"
gaugeJS
"
:
"
^1.3.2
"
,
"
immutable
"
:
"
^3.8.1
"
,
"
lodash
"
:
"
^4.17.
5
"
,
"
prop-types
"
:
"
^15.6.
1
"
,
"
rc-slider
"
:
"
^8.
3.0
"
,
"
react
"
:
"
^1
5.4.2
"
,
"
lodash
"
:
"
^4.17.
11
"
,
"
prop-types
"
:
"
^15.6.
2
"
,
"
rc-slider
"
:
"
^8.
6.3
"
,
"
react
"
:
"
^1
6.6.3
"
,
"
react-bootstrap
"
:
"
^0.31.1
"
,
"
react-contexify
"
:
"
^3.0.
0
"
,
"
react-contexify
"
:
"
^3.0.
3
"
,
"
react-d3
"
:
"
^0.4.0
"
,
"
react-dnd
"
:
"
^2.
2.4
"
,
"
react-dnd-html5-backend
"
:
"
^2.
2.4
"
,
"
react-dom
"
:
"
^1
5.4.2
"
,
"
react-fullscreenable
"
:
"
^2.
4.3
"
,
"
react-json-view
"
:
"
^1.1
7.0
"
,
"
react-notification-system
"
:
"
^0.2.1
3
"
,
"
react-rnd
"
:
"
^7.4.
0
"
,
"
react-router
"
:
"
^4.
1.2
"
,
"
react-router-dom
"
:
"
^4.
1.2
"
,
"
react-scripts
"
:
"
^1.1.
4
"
,
"
react-dnd
"
:
"
^2.
6.0
"
,
"
react-dnd-html5-backend
"
:
"
^2.
6.0
"
,
"
react-dom
"
:
"
^1
6.6.3
"
,
"
react-fullscreenable
"
:
"
^2.
5.0
"
,
"
react-json-view
"
:
"
^1.1
9.1
"
,
"
react-notification-system
"
:
"
^0.2.1
7
"
,
"
react-rnd
"
:
"
^7.4.
3
"
,
"
react-router
"
:
"
^4.
3.1
"
,
"
react-router-dom
"
:
"
^4.
3.1
"
,
"
react-scripts
"
:
"
^1.1.
5
"
,
"
react-sortable-tree
"
:
"
^0.1.19
"
,
"
react-svg-pan-zoom
"
:
"
^2.1
4.1
"
,
"
superagent
"
:
"
^3.
5.0
"
,
"
validator
"
:
"
^10.
2
.0
"
"
react-svg-pan-zoom
"
:
"
^2.1
8.0
"
,
"
superagent
"
:
"
^3.
8.3
"
,
"
validator
"
:
"
^10.
9
.0
"
},
"devDependencies"
:
{
"
chai
"
:
"
^4.
1
.0
"
"
chai
"
:
"
^4.
2
.0
"
},
"scripts"
:
{
"start"
:
"react-scripts start"
,
...
...
src/components/icon.js
View file @
6323d7cb
...
...
@@ -21,9 +21,13 @@
import
React
from
'
react
'
;
import
FontAwesomeIcon
from
'
@fortawesome/react-fontawesome
'
import
{
FontAwesomeIcon
}
from
'
@fortawesome/react-fontawesome
'
import
'
@fortawesome/fontawesome-free-solid
'
;
import
{
library
}
from
'
@fortawesome/fontawesome-svg-core
'
;
import
{
fas
}
from
'
@fortawesome/free-solid-svg-icons
'
;
//import '@fortawesome/free-regular-svg-icons';
library
.
add
(
fas
);
class
Icon
extends
React
.
Component
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment