diff --git a/.babelrc.js b/.babelrc.js index afe37b06..d4cf2315 100644 --- a/.babelrc.js +++ b/.babelrc.js @@ -1,7 +1,7 @@ /** - * React Starter Kit (https://www.reactstarterkit.com/) + * Flatlogic Dashboards (https://flatlogic.com/admin-dashboards) * - * Copyright © 2014-present Kriasoft, LLC. All rights reserved. + * Copyright © 2015-present Flatlogic, LLC. All rights reserved. * * This source code is licensed under the MIT license found in the * LICENSE.txt file in the root directory of this source tree. diff --git a/.eslintrc.js b/.eslintrc.js index 0fb10a61..467357c2 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,7 +1,7 @@ /** - * React Starter Kit (https://www.reactstarterkit.com/) + * Flatlogic Dashboards (https://flatlogic.com/admin-dashboards) * - * Copyright © 2014-present Kriasoft, LLC. All rights reserved. + * Copyright © 2015-present Flatlogic, LLC. All rights reserved. * * This source code is licensed under the MIT license found in the * LICENSE.txt file in the root directory of this source tree. diff --git a/.stylelintrc.js b/.stylelintrc.js index 0fc21df2..2ef00c4a 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -1,7 +1,7 @@ /** - * React Starter Kit (https://www.reactstarterkit.com/) + * Flatlogic Dashboards (https://flatlogic.com/admin-dashboards) * - * Copyright © 2014-present Kriasoft, LLC. All rights reserved. + * Copyright © 2015-present Flatlogic, LLC. All rights reserved. * * This source code is licensed under the MIT license found in the * LICENSE.txt file in the root directory of this source tree. diff --git a/package.json b/package.json index 78af95a4..bc5b1c28 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,7 @@ "version": "0.0.0", "private": true, "engines": { - "node": ">=6.5", - "npm": ">=3.10" + "node": "8.10.0" }, "browserslist": [">1%", "last 4 versions", "Firefox ESR", "not ie < 9"], "dependencies": { @@ -12,7 +11,7 @@ "awesome-bootstrap-checkbox": "^1.0.1", "bluebird": "^3.5.1", "body-parser": "^1.18.2", - "bootstrap": "^4.1.1", + "bootstrap": "4.2.1", "bundle-loader": "^0.5.5", "classnames": "^2.2.5", "cookie-parser": "^1.4.3", @@ -39,15 +38,15 @@ "pretty-error": "^2.1.1", "prop-types": "^15.6.1", "query-string": "^5.0.1", - "react": "^16.1.1", + "react": "16.7.0", "react-cookie": "^1.0.5", - "react-dom": "^16.1.1", + "react-dom": "16.7.0", "react-google-maps": "^9.4.5", "react-redux": "^5.0.4", - "react-router": "^4.0.0", - "react-router-dom": "^4.0.0", + "react-router": "4.3.1", + "react-router-dom": "4.3.1", "react-sparklines": "^1.7.0", - "reactstrap": "^6.0.1", + "reactstrap": "7.1.0", "recharts": "^1.0.0-beta.10", "redux": "^3.6.0", "redux-logger": "^3.0.1", diff --git a/src/DOMUtils.js b/src/DOMUtils.js index 11c132f0..aee7238b 100644 --- a/src/DOMUtils.js +++ b/src/DOMUtils.js @@ -1,7 +1,7 @@ /** - * React Starter Kit (https://www.reactstarterkit.com/) + * Flatlogic Dashboards (https://flatlogic.com/admin-dashboards) * - * Copyright © 2014-present Kriasoft, LLC. All rights reserved. + * Copyright © 2015-present Flatlogic, LLC. All rights reserved. * * This source code is licensed under the MIT license found in the * LICENSE.txt file in the root directory of this source tree. diff --git a/src/client.js b/src/client.js index 8fc629e4..937a6b50 100644 --- a/src/client.js +++ b/src/client.js @@ -1,7 +1,7 @@ /** - * React Starter Kit (https://www.reactstarterkit.com/) + * Flatlogic Dashboards (https://flatlogic.com/admin-dashboards) * - * Copyright © 2014-present Kriasoft, LLC. All rights reserved. + * Copyright © 2015-present Flatlogic, LLC. All rights reserved. * * This source code is licensed under the MIT license found in the * LICENSE.txt file in the root directory of this source tree. diff --git a/src/components/App.js b/src/components/App.js index dc17dfcf..7dbdffd5 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -1,7 +1,7 @@ /** - * React Starter Kit (https://www.reactstarterkit.com/) + * Flatlogic Dashboards (https://flatlogic.com/admin-dashboards) * - * Copyright © 2014-present Kriasoft, LLC. All rights reserved. + * Copyright © 2015-present Flatlogic, LLC. All rights reserved. * * This source code is licensed under the MIT license found in the * LICENSE.txt file in the root directory of this source tree. diff --git a/src/components/Footer/Footer.js b/src/components/Footer/Footer.js index 05fb81b7..172076d4 100644 --- a/src/components/Footer/Footer.js +++ b/src/components/Footer/Footer.js @@ -1,7 +1,7 @@ /** - * React Starter Kit (https://www.reactstarterkit.com/) + * Flatlogic Dashboards (https://flatlogic.com/admin-dashboards) * - * Copyright © 2014-present Kriasoft, LLC. All rights reserved. + * Copyright © 2015-present Flatlogic, LLC. All rights reserved. * * This source code is licensed under the MIT license found in the * LICENSE.txt file in the root directory of this source tree. @@ -28,7 +28,7 @@ class Footer extends React.Component { return ( -- ; -+ -+); - - function mapStateToProps(store) { - return { -Index: src/components/Widget/Widget.js -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== ---- src/components/Widget/Widget.js (revision 6f9b5b1a9b7a8177c6142bb17e4652032a82cde7) -+++ src/components/Widget/Widget.js (date 1512480813000) -@@ -32,16 +32,12 @@ - return ( -
- {this.props.title && -- (typeof this.props.title === 'string' -- ?
-- {this.props.title} --
-- :
-- {this.props.title} --
)} --
-- {this.props.children} --
-+ (typeof this.props.title === 'string' ? ( -+
{this.props.title}
-+ ) : ( -+
{this.props.title}
-+ ))} -+
{this.props.children}
-
- ); - } -Index: src/components/Widget/Widget.scss -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== ---- src/components/Widget/Widget.scss (revision 6f9b5b1a9b7a8177c6142bb17e4652032a82cde7) -+++ src/components/Widget/Widget.scss (date 1512481843000) -@@ -1,12 +1,3 @@ --/** -- * React Starter Kit (https://www.reactstarterkit.com/) -- * -- * Copyright © 2014-present Kriasoft, LLC. All rights reserved. -- * -- * This source code is licensed under the MIT license found in the -- * LICENSE.txt file in the root directory of this source tree. -- */ -- - @import '../../styles/app'; - - .widget { -Index: src/components/Html.js -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== ---- src/components/Html.js (revision 6f9b5b1a9b7a8177c6142bb17e4652032a82cde7) -+++ src/components/Html.js (date 1512480813000) -@@ -41,19 +41,17 @@ - - - -- -- {title} -- -+ {title} - - - -- {styles.map(style => -+ {styles.map(style => ( -