diff --git a/package.json b/package.json index dae6945..a469b1e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bloodhound", - "version": "1.4.0", + "version": "1.4.1", "description": "Graph Theory for Active Directory", "keywords": [ "Graph", @@ -13,7 +13,7 @@ }, "bugs": "https://github.com/BloodHoundAD/Bloodhound/issues", "license": "GPL-3.0", - "author": "Rohan Vazarkar (https://www.twitter.com/cptjesus)", + "author": "Rohan Vazarkar (https://blog.cptjesus.com)", "contributors": [ "Andy Robbins (https://www.wald0.com)", "Will Schroeder (https://www.harmj0y.net)" @@ -34,38 +34,38 @@ ] }, "devDependencies": { - "babel-cli": "^6.22.2", - "babel-core": "^6.22.1", - "babel-loader": "^7.0.0", - "babel-polyfill": "^6.22.0", - "babel-preset-env": "^1.6.0", - "babel-preset-react": "^6.22.0", - "babel-preset-stage-0": "^6.22.0", - "concurrently": "^3.1.0", - "cross-env": "^5.0.0", - "electron": "^1.4.15", - "express": "^4.14.0", - "webpack": "^2.5.1", - "webpack-dev-middleware": "^1.6.1", - "webpack-hot-middleware": "^2.12.1" + "babel-cli": "^6.26.0", + "babel-core": "^6.26.0", + "babel-loader": "^7.1.2", + "babel-polyfill": "^6.26.0", + "babel-preset-env": "^1.6.1", + "babel-preset-react": "^6.24.1", + "babel-preset-stage-0": "^6.24.1", + "concurrently": "^3.5.1", + "cross-env": "^5.1.3", + "electron": "^1.7.10", + "express": "^4.16.2", + "webpack": "^3.10.0", + "webpack-dev-middleware": "^2.0.4", + "webpack-hot-middleware": "^2.21.0" }, "dependencies": { - "async": "^2.1.4", - "bootstrap": "^3.3.6", - "bootstrap-3-typeahead": "^4.0.1", - "configstore": "^3.1.0", + "async": "^2.6.0", + "bootstrap": "^3.3.7", + "bootstrap-3-typeahead": "^4.0.2", "dagre": "^0.7.4", + "electron-store": "^1.3.0", "eventemitter2": "^4.1.0", "fast-csv": "^2.4.1", "jquery": "^3.2.1", "linkurious": "^1.5.1", - "mustache": "^2.2.1", - "neo4j-driver": "^1.4.1", - "react": "^15.4.2", - "react-bootstrap": "^0.31.0", - "react-dom": "^15.4.2", + "mustache": "^2.3.0", + "neo4j-driver": "^1.5.2", + "react": "^16.2.0", + "react-bootstrap": "^0.32.0", + "react-dom": "^16.2.0", "react-if": "^2.1.0", - "react-transition-group": "^1.1.3", + "react-transition-group": "^2.2.1", "unzipper": "^0.8.9" } } diff --git a/src/AppContainer.jsx b/src/AppContainer.jsx index 35bcd06..b2add3f 100644 --- a/src/AppContainer.jsx +++ b/src/AppContainer.jsx @@ -16,38 +16,38 @@ import Settings from './components/Float/Settings' import ZoomContainer from './components/Zoom/ZoomContainer' import QueryNodeSelect from './components/Float/QueryNodeSelect' import SessionClearModal from './components/Modals/SessionClearModal' -import CSSTransitionGroup from 'react-transition-group/CSSTransitionGroup' import About from './components/Modals/About.jsx' +import { CSSTransition, TransitionGroup } from 'react-transition-group'; export default class AppContainer extends Component { render() { return ( - -
- - - - - - - - - - - - - - - - - - -
-
+ + +
+ + + + + + + + + + + + + + + + + + +
+
+
); }; } \ No newline at end of file diff --git a/src/components/GlyphiconSpan.jsx b/src/components/GlyphiconSpan.jsx index 2a8ca75..dc5563b 100644 --- a/src/components/GlyphiconSpan.jsx +++ b/src/components/GlyphiconSpan.jsx @@ -26,9 +26,9 @@ export default class GlyphiconSpan extends Component { } GlyphiconSpan.propTypes = { - classes : React.PropTypes.string, - tooltipDir : React.PropTypes.string, - tooltipTitle : React.PropTypes.string, - tooltip : React.PropTypes.bool.isRequired, - click: React.PropTypes.func + classes : PropTypes.string, + tooltipDir : PropTypes.string, + tooltipTitle : PropTypes.string, + tooltip : PropTypes.bool.isRequired, + click: PropTypes.func } diff --git a/src/components/Icon.jsx b/src/components/Icon.jsx index df00bf6..519f6de 100644 --- a/src/components/Icon.jsx +++ b/src/components/Icon.jsx @@ -14,6 +14,6 @@ export default class Icon extends Component { } Icon.propTypes = { - glyph : React.PropTypes.string.isRequired, - extraClass : React.PropTypes.string + glyph : PropTypes.string.isRequired, + extraClass : PropTypes.string } \ No newline at end of file diff --git a/src/components/Menu/MenuButton.jsx b/src/components/Menu/MenuButton.jsx index 01863a0..697e4f0 100644 --- a/src/components/Menu/MenuButton.jsx +++ b/src/components/Menu/MenuButton.jsx @@ -41,7 +41,7 @@ export default class MenuButton extends Component { } MenuButton.propTypes = { - hoverVal : React.PropTypes.string.isRequired, - glyphicon : React.PropTypes.string.isRequired, - click : React.PropTypes.func.isRequired + hoverVal : PropTypes.string.isRequired, + glyphicon : PropTypes.string.isRequired, + click : PropTypes.func.isRequired } \ No newline at end of file diff --git a/src/components/Menu/ProgressBarMenuButton.jsx b/src/components/Menu/ProgressBarMenuButton.jsx index 5ca0553..517d3b8 100644 --- a/src/components/Menu/ProgressBarMenuButton.jsx +++ b/src/components/Menu/ProgressBarMenuButton.jsx @@ -75,6 +75,6 @@ export default class ProgressBarMenuButton extends Component { } ProgressBarMenuButton.propTypes = { - progress : React.PropTypes.number.isRequired, - click : React.PropTypes.func.isRequired + progress : PropTypes.number.isRequired, + click : PropTypes.func.isRequired }; \ No newline at end of file diff --git a/src/components/SearchContainer/Tabs/ComputerNodeData.jsx b/src/components/SearchContainer/Tabs/ComputerNodeData.jsx index f9c4e76..14b1477 100644 --- a/src/components/SearchContainer/Tabs/ComputerNodeData.jsx +++ b/src/components/SearchContainer/Tabs/ComputerNodeData.jsx @@ -382,5 +382,5 @@ export default class ComputerNodeData extends Component { } ComputerNodeData.propTypes= { - visible : React.PropTypes.bool.isRequired + visible : PropTypes.bool.isRequired }; diff --git a/src/components/SearchContainer/Tabs/DomainNodeData.jsx b/src/components/SearchContainer/Tabs/DomainNodeData.jsx index 4a9c386..4fedeb2 100644 --- a/src/components/SearchContainer/Tabs/DomainNodeData.jsx +++ b/src/components/SearchContainer/Tabs/DomainNodeData.jsx @@ -239,5 +239,5 @@ export default class DomainNodeData extends Component { } DomainNodeData.propTypes = { - visible : React.PropTypes.bool.isRequired + visible : PropTypes.bool.isRequired }; \ No newline at end of file diff --git a/src/components/SearchContainer/Tabs/GroupNodeData.jsx b/src/components/SearchContainer/Tabs/GroupNodeData.jsx index 7aef054..6e061fc 100644 --- a/src/components/SearchContainer/Tabs/GroupNodeData.jsx +++ b/src/components/SearchContainer/Tabs/GroupNodeData.jsx @@ -401,5 +401,5 @@ export default class GroupNodeData extends Component { } GroupNodeData.propTypes = { - visible : React.PropTypes.bool.isRequired + visible : PropTypes.bool.isRequired }; \ No newline at end of file diff --git a/src/components/SearchContainer/Tabs/LoadLabel.jsx b/src/components/SearchContainer/Tabs/LoadLabel.jsx index 690bdd9..78b8368 100644 --- a/src/components/SearchContainer/Tabs/LoadLabel.jsx +++ b/src/components/SearchContainer/Tabs/LoadLabel.jsx @@ -23,6 +23,6 @@ export default class LoadLabel extends Component { } LoadLabel.propTypes = { - ready : React.PropTypes.bool.isRequired, - value : React.PropTypes.number + ready : PropTypes.bool.isRequired, + value : PropTypes.number } \ No newline at end of file diff --git a/src/components/SearchContainer/Tabs/NoNodeData.jsx b/src/components/SearchContainer/Tabs/NoNodeData.jsx index ced5f06..f8a42be 100644 --- a/src/components/SearchContainer/Tabs/NoNodeData.jsx +++ b/src/components/SearchContainer/Tabs/NoNodeData.jsx @@ -18,5 +18,5 @@ export default class NoNodeData extends Component { NoNodeData.propTypes = { - visible : React.PropTypes.bool.isRequired + visible : PropTypes.bool.isRequired } \ No newline at end of file diff --git a/src/components/SearchContainer/Tabs/NodeALink.jsx b/src/components/SearchContainer/Tabs/NodeALink.jsx index ad63c79..9d06bf3 100644 --- a/src/components/SearchContainer/Tabs/NodeALink.jsx +++ b/src/components/SearchContainer/Tabs/NodeALink.jsx @@ -23,7 +23,7 @@ export default class NodeALink extends Component { } NodeALink.propTypes = { - ready : React.PropTypes.bool.isRequired, - click : React.PropTypes.func, - value : React.PropTypes.number + ready : PropTypes.bool.isRequired, + click : PropTypes.func, + value : PropTypes.number } \ No newline at end of file diff --git a/src/components/Spotlight/SpotlightRow.jsx b/src/components/Spotlight/SpotlightRow.jsx index 49387d9..9b0fa4b 100644 --- a/src/components/Spotlight/SpotlightRow.jsx +++ b/src/components/Spotlight/SpotlightRow.jsx @@ -54,10 +54,10 @@ export default class SpotlightRow extends Component { } SpotlightRow.propTypes = { - nodeId : React.PropTypes.number.isRequired, - parentNodeId : React.PropTypes.number.isRequired, - nodeLabel : React.PropTypes.string.isRequired, - parentNodeLabel : React.PropTypes.string.isRequired, - nodeType: React.PropTypes.string.isRequired, - parentNodeType: React.PropTypes.string.isRequired + nodeId : PropTypes.number.isRequired, + parentNodeId : PropTypes.number.isRequired, + nodeLabel : PropTypes.string.isRequired, + parentNodeLabel : PropTypes.string.isRequired, + nodeType: PropTypes.string.isRequired, + parentNodeType: PropTypes.string.isRequired } \ No newline at end of file diff --git a/src/index.js b/src/index.js index 5d72570..aad51f5 100644 --- a/src/index.js +++ b/src/index.js @@ -10,9 +10,9 @@ const { app } = require('electron').remote var fs = require('fs') const path = require('path'); -const ConfigStore = require('configstore'); +const ConfigStore = require('electron-store'); -global.conf = new ConfigStore('bloodhound') +global.conf = new ConfigStore() var e = require('eventemitter2').EventEmitter2 global.emitter = new e({}) global.renderEmit = new e({})