Skip to content

Commit 1721ddb

Browse files
committed
minor packages update
1 parent 080a377 commit 1721ddb

File tree

3 files changed

+10204
-62
lines changed

3 files changed

+10204
-62
lines changed

package.json

Lines changed: 55 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,32 @@
1515
],
1616
"dependencies": {
1717
"animate.css": "3.5.2",
18-
"awesome-bootstrap-checkbox": "1.0.0",
18+
"awesome-bootstrap-checkbox": "1.0.1",
1919
"babel-polyfill": "6.23.0",
20-
"bluebird": "3.5.0",
21-
"body-parser": "1.17.1",
20+
"bluebird": "3.5.2",
21+
"body-parser": "1.17.2",
2222
"bootstrap": "4.0.0-beta",
23-
"bundle-loader": "0.5.5",
24-
"classnames": "2.2.5",
23+
"bundle-loader": "0.5.6",
24+
"classnames": "2.2.6",
2525
"cookie-parser": "1.4.3",
2626
"core-js": "2.4.1",
2727
"d3": "3.5.17",
2828
"draft-js": "0.10.x",
2929
"easy-pie-chart": "2.1.7",
30-
"express": "4.15.2",
31-
"express-graphql": "0.6.4",
32-
"express-jwt": "5.3.0",
30+
"express": "4.15.5",
31+
"express-graphql": "0.6.12",
32+
"express-jwt": "5.3.1",
3333
"fastclick": "1.0.6",
3434
"flot": "0.8.0-alpha",
3535
"font-awesome": "4.7.0",
3636
"formsy-react": "0.19.5",
3737
"fullcalendar": "3.4.0",
3838
"glyphicons-halflings": "https://github.com/inway/glyphicons-halflings.git#df545d9e4bdae9b5ffa112fcb70b3f8350929875",
3939
"govpredict-morris": "0.5.1",
40-
"graphql": "0.9.3",
41-
"graphql-relay": "0.5.1",
42-
"graphql-sequelize": "5.3.2",
43-
"history": "4.6.1",
40+
"graphql": "0.9.6",
41+
"graphql-relay": "0.5.5",
42+
"graphql-sequelize": "5.3.3",
43+
"history": "4.6.3",
4444
"immutable": "3.7.x",
4545
"imports-loader": "0.7.1",
4646
"isomorphic-style-loader": "2.0.0",
@@ -55,44 +55,44 @@
5555
"nvd3": "1.8.6",
5656
"passport": "0.3.2",
5757
"passport-facebook": "2.1.1",
58-
"pretty-error": "2.1.0",
59-
"prop-types": "15.5.8",
58+
"pretty-error": "2.1.1",
59+
"prop-types": "15.5.10",
6060
"query-string": "4.3.4",
6161
"rc-color-picker": "1.1.7",
62-
"rc-hammerjs": "0.6.8",
62+
"rc-hammerjs": "0.6.9",
6363
"react": "15.5.4",
6464
"react-addons-css-transition-group": "15.5.2",
65-
"react-autosize-textarea": "0.4.8",
65+
"react-autosize-textarea": "0.4.9",
6666
"react-bootstrap-slider": "2.0.1",
67-
"react-bootstrap-table": "4.1.1",
67+
"react-bootstrap-table": "4.1.5",
6868
"react-cookie": "1.0.5",
6969
"react-custom-scrollbars": "4.2.1",
70-
"react-datetime": "2.10.1",
70+
"react-datetime": "2.10.3",
7171
"react-dom": "15.5.4",
72-
"react-draft-wysiwyg": "1.10.8",
73-
"react-dropzone": "4.2.3",
74-
"react-google-maps": "8.3.1",
75-
"react-images": "0.5.6",
76-
"react-maskedinput": "4.0.0",
77-
"react-redux": "5.0.4",
72+
"react-draft-wysiwyg": "1.10.12",
73+
"react-dropzone": "4.2.13",
74+
"react-google-maps": "8.3.5",
75+
"react-images": "0.5.19",
76+
"react-maskedinput": "4.0.1",
77+
"react-redux": "5.0.7",
7878
"react-router": "4.0.0",
7979
"react-router-dom": "4.0.0",
80-
"react-select2-wrapper": "1.0.4-beta5",
80+
"react-select2-wrapper": "1.0.4-beta6",
8181
"react-sparklines": "1.7.0",
82-
"react-table": "6.7.4",
83-
"react-transition-group": "1.2.0",
84-
"reactstrap": "5.0.0-alpha.3",
82+
"react-table": "6.7.6",
83+
"react-transition-group": "1.2.1",
84+
"reactstrap": "5.0.0",
8585
"recompose": "0.25.1",
8686
"redux": "3.6.0",
87-
"redux-logger": "3.0.1",
87+
"redux-logger": "3.0.6",
8888
"redux-thunk": "2.2.0",
89-
"rickshaw": "1.6.0",
89+
"rickshaw": "1.6.6",
9090
"sequelize": "3.30.4",
9191
"serialize-javascript": "1.3.0",
92-
"source-map-support": "0.4.14",
93-
"sqlite3": "3.1.8",
92+
"source-map-support": "0.4.18",
93+
"sqlite3": "3.1.13",
9494
"webpack-raphael": "2.1.4",
95-
"whatwg-fetch": "2.0.3"
95+
"whatwg-fetch": "2.0.4"
9696
},
9797
"devDependencies": {
9898
"assets-webpack-plugin": "3.5.1",
@@ -109,41 +109,41 @@
109109
"babel-register": "6.24.1",
110110
"babel-template": "6.24.1",
111111
"babel-types": "6.24.1",
112-
"browser-sync": "2.18.8",
112+
"browser-sync": "2.18.13",
113113
"chai": "3.5.0",
114114
"chokidar": "1.6.1",
115-
"css-loader": "0.28.0",
115+
"css-loader": "0.28.11",
116116
"editorconfig-tools": "0.1.1",
117117
"enzyme": "2.8.2",
118118
"eslint": "3.19.0",
119119
"eslint-config-airbnb": "14.1.0",
120120
"eslint-loader": "1.7.1",
121-
"eslint-plugin-css-modules": "2.7.1",
121+
"eslint-plugin-css-modules": "2.7.5",
122122
"eslint-plugin-import": "2.2.0",
123123
"eslint-plugin-jsx-a11y": "4.0.0",
124124
"eslint-plugin-react": "6.10.3",
125-
"file-loader": "0.11.1",
125+
"file-loader": "0.11.2",
126126
"front-matter": "2.1.2",
127-
"glob": "7.1.1",
128-
"jquery": "3.2.1",
129-
"json-loader": "0.5.4",
130-
"lint-staged": "3.4.0",
131-
"markdown-it": "8.3.1",
127+
"glob": "7.1.3",
128+
"jquery": "3.3.1",
129+
"json-loader": "0.5.7",
130+
"lint-staged": "3.4.2",
131+
"markdown-it": "8.3.2",
132132
"mkdirp": "0.5.1",
133133
"mocha": "3.3.0",
134134
"moment": "2.18.1",
135135
"napa": "2.3.0",
136-
"node-sass": "4.5.0",
136+
"node-sass": "4.5.3",
137137
"pixrem": "3.0.2",
138138
"pleeease-filters": "3.0.1",
139-
"postcss": "5.2.17",
139+
"postcss": "5.2.18",
140140
"postcss-calc": "5.3.1",
141141
"postcss-color-function": "3.0.0",
142142
"postcss-custom-media": "5.0.1",
143143
"postcss-custom-properties": "5.0.2",
144144
"postcss-custom-selectors": "3.0.0",
145145
"postcss-flexbugs-fixes": "2.1.1",
146-
"postcss-global-import": "1.0.0",
146+
"postcss-global-import": "1.0.6",
147147
"postcss-import": "9.1.0",
148148
"postcss-loader": "1.3.3",
149149
"postcss-media-minmax": "2.1.2",
@@ -156,26 +156,29 @@
156156
"raw-loader": "0.5.1",
157157
"react-addons-test-utils": "15.5.1",
158158
"react-deep-force-update": "2.0.1",
159-
"react-hot-loader": "3.0.0-beta.6",
160-
"redbox-react": "1.3.6",
159+
"react-hot-loader": "3.0.0",
160+
"redbox-react": "1.3.7",
161161
"redux-mock-store": "1.2.3",
162-
"rimraf": "2.6.1",
163-
"sass-loader": "6.0.3",
162+
"rimraf": "2.6.2",
163+
"sass-loader": "6.0.7",
164164
"sinon": "2.1.0",
165165
"stylefmt": "5.3.2",
166166
"stylelint": "7.10.1",
167167
"stylelint-config-standard": "16.0.0",
168-
"url-loader": "0.5.8",
168+
"url-loader": "0.5.9",
169169
"webpack": "2.4.1",
170-
"webpack-bundle-analyzer": "2.4.0",
170+
"webpack-bundle-analyzer": "2.4.1",
171171
"webpack-dev-middleware": "1.10.2",
172-
"webpack-hot-middleware": "2.18.0",
172+
"webpack-hot-middleware": "2.18.2",
173173
"widgster": "1.0.0",
174174
"write-file-webpack-plugin": "4.0.2"
175175
},
176176
"napa": {
177177
"jquery.flot.animator": "https://github.com/Codicode/flotanimator.git#3c256c0183d713fd3bf41d04417873928eb1a751"
178178
},
179+
"resolutions": {
180+
"jquery": "3.3.1"
181+
},
179182
"babel": {
180183
"presets": [
181184
[

src/components/Header/Header.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
InputGroup,
1313
Input,
1414
UncontrolledAlert,
15-
NavDropdown,
15+
Dropdown,
1616
NavbarBrand,
1717
Collapse,
1818
DropdownToggle,
@@ -125,7 +125,7 @@ class Header extends React.Component {
125125
</UncontrolledAlert>
126126
<Collapse className={`${s.searchCollapse} ml-auto ml-lg-0 mr-md-3`} isOpen={this.state.searchOpen}>
127127
<InputGroup className={`${s.navbarForm} ${this.state.searchFocused ? s.navbarFormFocused : ''}`}>
128-
<InputGroupAddon className={s.inputAddon}><i className="fa fa-search" /></InputGroupAddon>
128+
<InputGroupAddon addonType="prepend" className={s.inputAddon}><i className="fa fa-search" /></InputGroupAddon>
129129
<Input
130130
id="search-input" placeholder="Search..." className="input-transparent"
131131
onFocus={() => this.setState({ searchFocused: true })}
@@ -139,7 +139,7 @@ class Header extends React.Component {
139139
<i className="glyphicon glyphicon-search" />
140140
</NavLink>
141141
</NavItem>
142-
<NavDropdown isOpen={this.state.messagesOpen} toggle={this.toggleMessagesDropdown}>
142+
<Dropdown nav isOpen={this.state.messagesOpen} toggle={this.toggleMessagesDropdown}>
143143
<DropdownToggle nav className={s.navItem}>
144144
<i className="glyphicon glyphicon-comments" />
145145
</DropdownToggle>
@@ -177,8 +177,8 @@ class Header extends React.Component {
177177
</a>
178178
</DropdownItem>
179179
</DropdownMenu>
180-
</NavDropdown>
181-
<NavDropdown isOpen={this.state.supportOpen} toggle={this.toggleSupportDropdown}>
180+
</Dropdown>
181+
<Dropdown nav isOpen={this.state.supportOpen} toggle={this.toggleSupportDropdown}>
182182
<DropdownToggle nav className={s.navItem}>
183183
<i className="glyphicon glyphicon-globe" />
184184
<span className={s.count}>8</span>
@@ -220,9 +220,9 @@ class Header extends React.Component {
220220
</a>
221221
</DropdownItem>
222222
</DropdownMenu>
223-
</NavDropdown>
223+
</Dropdown>
224224
<NavItem className={s.divider} />
225-
<NavDropdown isOpen={this.state.settingsOpen} toggle={this.toggleSettingsDropdown} className="d-sm-none-down">
225+
<Dropdown nav isOpen={this.state.settingsOpen} toggle={this.toggleSettingsDropdown} className="d-sm-none-down">
226226
<DropdownToggle nav className={s.navItem}>
227227
<i className="glyphicon glyphicon-cog" />
228228
</DropdownToggle>
@@ -238,8 +238,8 @@ class Header extends React.Component {
238238
<Button onClick={() => this.toggleVisibilitySidebar('hide')} className={this.props.sidebarState === 'hide' ? 'active' : ''}>Hide</Button>
239239
</ButtonGroup>
240240
</DropdownMenu>
241-
</NavDropdown>
242-
<NavDropdown isOpen={this.state.accountOpen} toggle={this.toggleAccountDropdown} className="d-sm-none-down">
241+
</Dropdown>
242+
<Dropdown nav isOpen={this.state.accountOpen} toggle={this.toggleAccountDropdown} className="d-sm-none-down">
243243
<DropdownToggle nav className={s.navItem}>
244244
<i className="glyphicon glyphicon-user" />
245245
</DropdownToggle>
@@ -267,7 +267,7 @@ class Header extends React.Component {
267267
</NavLink>
268268
</DropdownItem>
269269
</DropdownMenu>
270-
</NavDropdown>
270+
</Dropdown>
271271
<NavItem className="d-sm-none-down">
272272
<NavLink onClick={this.doLogout} className={s.navItem} href="#">
273273
<i className="glyphicon glyphicon-off" />

0 commit comments

Comments
 (0)