Merge "Update dependencies and move from patternfly-next to patternfly"

This commit is contained in:
Zuul 2019-04-17 18:31:10 +00:00 committed by Gerrit Code Review
commit 009394c82e
3 changed files with 675 additions and 308 deletions

961
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -4,20 +4,20 @@
"private": true,
"homepage": "http://localhost:3000/",
"dependencies": {
"@patternfly/patternfly-next": "^1.0.175",
"@patternfly/react-icons": "^3.5.0",
"@patternfly/react-tokens": "^2.0.4",
"@patternfly/react-core": "^2.3.6",
"@patternfly/patternfly": "^2.0.0",
"@patternfly/react-core": "^3.1.3",
"@patternfly/react-icons": "^3.7.1",
"@patternfly/react-tokens": "^2.2.2",
"axios": "^0.18.0",
"braces": "^2.3.2",
"react": "^16.8.4",
"react-dom": "^16.8.4",
"react-redux": "^6.0.1",
"braces": "^3.0.1",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-redux": "^7.0.1",
"react-router-dom": "^5.0.0",
"react-scripts": "^2.1.8",
"redux": "^4.0.0",
"redux-thunk": "^2.3.0",
"styled-components": "^4.1.3"
"styled-components": "^4.2.0"
},
"scripts": {
"start": "react-scripts start",

View File

@ -2,8 +2,8 @@ import React, { Component } from "react";
import { BrowserRouter, Route, Switch, Redirect } from "react-router-dom";
import { Provider } from "react-redux";
import "@patternfly/patternfly-next/patternfly.css";
import "@patternfly/patternfly-next/patternfly-addons.css";
import "@patternfly/patternfly/patternfly.css";
import "@patternfly/patternfly/patternfly-addons.css";
import store from "./store";
import { getConfig } from "./config/configActions";
import * as Containers from "./containers";