merge with xchem

js/actions/selectionActions.js

@@ -26,7 +26,6 @@ import {
     RELOAD_SELECTION_STATE
 } from "./actonTypes";
 
-
 export const setToBuyList = function (to_buy_list){
     console.log("ACTIONS: "+ to_buy_list)
     return {

js/components/SummaryCmpd.js

@@ -2,11 +2,10 @@
  * Created by abradley on 28/03/2018.
  */
 
-import React from 'react';
-import { connect } from 'react-redux'
-import { GenericView } from './generalComponents'
-import * as selectionActions from '../actions/selectionActions'
-import SVGInline from "react-svg-inline"
+import React from "react";
+import {connect} from "react-redux";
+import {GenericView} from "./generalComponents";
+import SVGInline from "react-svg-inline";
 
 class SummaryCmpd extends GenericView {
 

js/components/compoundList.js

@@ -3,8 +3,8 @@
  */
 import { Row, Well, Button} from 'react-bootstrap';
 import React from 'react';
-import { connect } from 'react-redux'
-import CompoundView from './compoundView';
+import {connect} from "react-redux";
+import CompoundView from "./compoundView";
 import * as selectionActions from "../actions/selectionActions";
 import keydown from 'react-keydown';
 

js/components/compoundView.js

@@ -1,14 +1,14 @@
 /**
  * Created by abradley on 15/03/2018.
  */
-import React from 'react';
-import { connect } from 'react-redux'
-import { GenericView } from './generalComponents'
-import * as selectionActions from '../actions/selectionActions'
-import SVGInline from "react-svg-inline"
-import fetch from 'cross-fetch';
-import * as nglLoadActions from '../actions/nglLoadActions'
-import * as nglObjectTypes from '../components/nglObjectTypes'
+import React from "react";
+import {connect} from "react-redux";
+import {GenericView} from "./generalComponents";
+import * as selectionActions from "../actions/selectionActions";
+import SVGInline from "react-svg-inline";
+import fetch from "cross-fetch";
+import * as nglLoadActions from "../actions/nglLoadActions";
+import * as nglObjectTypes from "../components/nglObjectTypes";
 
 class CompoundView extends GenericView {
 

js/components/eventList.js

@@ -1,11 +1,12 @@
 /**
  * Created by abradley on 19/04/2018.
  */
-import { GenericList } from './generalComponents';
-import React from 'react';
-import { connect } from 'react-redux'
-import * as apiActions from '../actions/apiActions'
-import * as listType from './listTypes'
+
+import {GenericList} from "./generalComponents";
+import React from "react";
+import {connect} from "react-redux";
+import * as apiActions from "../actions/apiActions";
+import * as listType from "./listTypes";
 
 class EventList extends GenericList {
 

js/components/generalComponents.js

@@ -1,12 +1,12 @@
 /**
  * Created by abradley on 01/03/2018.
  */
-import SVGInline from "react-svg-inline"
-import React from 'react';
-import { ListGroup, Pager, ProgressBar, Well } from 'react-bootstrap';
-import fetch from 'cross-fetch'
-import * as listTypes from './listTypes';
 
+import SVGInline from "react-svg-inline";
+import React from "react";
+import {ListGroup, Pager, ProgressBar, Well} from "react-bootstrap";
+import fetch from "cross-fetch";
+import * as listTypes from "./listTypes";
 export function FillMe(props) {
     return <h1>FILL ME UP PLEASE</h1>;
 }

js/components/header.js

@@ -1,14 +1,15 @@
 /**
  * Created by abradley on 14/03/2018.
  */
-import React from 'react';
-import { Navbar } from 'react-bootstrap'
-import { Typeahead } from 'react-typeahead';
-import * as apiActions from '../actions/apiActions'
-import * as nglActions from '../actions/nglLoadActions'
-import { connect } from 'react-redux'
-import * as nglObjectTypes from '../components/nglObjectTypes'
-import { withRouter } from 'react-router-dom'
+
+import React from "react";
+import {Navbar} from "react-bootstrap";
+import {Typeahead} from "react-typeahead";
+import * as apiActions from "../actions/apiActions";
+import * as nglActions from "../actions/nglLoadActions";
+import {connect} from "react-redux";
+import * as nglObjectTypes from "../components/nglObjectTypes";
+import {withRouter, Link} from "react-router-dom";
 
 class Header extends React.Component {
 

js/components/hotspotList.js

@@ -1,13 +1,13 @@
 /**
  * Created by ricgillams on 04/07/2018.
  */
-import { Row, Well} from 'react-bootstrap';
-import { GenericList } from './generalComponents';
-import React from 'react';
-import { connect } from 'react-redux'
-import * as apiActions from '../actions/apiActions'
-import * as listType from './listTypes'
-import HotspotView from './hotspotView'
+import {Row, Well} from "react-bootstrap";
+import {GenericList} from "./generalComponents";
+import React from "react";
+import {connect} from "react-redux";
+import * as apiActions from "../actions/apiActions";
+import * as listType from "./listTypes";
+import HotspotView from "./hotspotView";
 
 const molStyle = {height: "250px",
     overflow:"scroll"}

js/components/hotspotView.js

@@ -2,15 +2,15 @@
  * Created by ricgillams on 05/07/2018.
  */
 
-import { Col, Row, Image, Panel, Grid} from 'react-bootstrap';
-import React from 'react';
-import { connect } from 'react-redux'
-import * as nglLoadActions from '../actions/nglLoadActions'
-import * as nglObjectTypes from './nglObjectTypes'
-import '../../css/toggle.css';
-import Toggle from 'react-bootstrap-toggle';
-import fetch from 'cross-fetch';
-import $ from 'jquery';
+import {Col, Row, Image, Panel, Grid} from "react-bootstrap";
+import React from "react";
+import {connect} from "react-redux";
+import * as nglLoadActions from "../actions/nglLoadActions";
+import * as nglObjectTypes from "./nglObjectTypes";
+import "../../css/toggle.css";
+import Toggle from "react-bootstrap-toggle";
+import fetch from "cross-fetch";
+import $ from "jquery";
 
 class HotspotView extends React.Component {
 

js/components/landing.js

@@ -1,9 +1,9 @@
 /**
  * Created by ricgillams on 21/06/2018.
  */
-import { Col, Row} from 'react-bootstrap';
-import React from 'react';
-import { connect } from 'react-redux'
+import {Col, Row} from "react-bootstrap";
+import React from "react";
+import {connect} from "react-redux";
 import TargetList from "./targetList";
 
 export class Welcome extends React.Component {

js/components/modalLoadingScreen.js

@@ -2,9 +2,10 @@
  * Created by ricgillams on 14/06/2018.
  */
 
-import React from 'react';
-import {connect} from 'react-redux';
-import ReactModal from 'react-modal';
+import React from "react";
+import {connect} from "react-redux";
+import ReactModal from "react-modal";
+import {Button, Well, Col, Row} from "react-bootstrap";
 
 const customStyles = {
     overlay : {

js/components/molGroupList.js

@@ -2,13 +2,13 @@
  * Created by abradley on 13/03/2018.
  */
 
-import { GenericList } from './generalComponents';
-import React from 'react';
-import { connect } from 'react-redux'
-import * as apiActions from '../actions/apiActions'
-import * as listType from './listTypes'
-import * as nglLoadActions from '../actions/nglLoadActions'
-import * as nglObjectTypes from '../components/nglObjectTypes'
+import {GenericList} from "./generalComponents";
+import React from "react";
+import {connect} from "react-redux";
+import * as apiActions from "../actions/apiActions";
+import * as listType from "./listTypes";
+import * as nglLoadActions from "../actions/nglLoadActions";
+import * as nglObjectTypes from "../components/nglObjectTypes";
 
 class MolGroupList extends GenericList {
 

js/components/moleculeList.js

@@ -2,14 +2,14 @@
  * Created by abradley on 14/03/2018.
  */
 
-import { Row, Well} from 'react-bootstrap';
-import { GenericList } from './generalComponents';
-import React from 'react';
-import { connect } from 'react-redux'
-import * as apiActions from '../actions/apiActions'
-import * as listType from './listTypes'
-import * as nglLoadActions from '../actions/nglLoadActions'
-import MoleculeView from './moleculeView'
+import {Row, Well} from "react-bootstrap";
+import {GenericList} from "./generalComponents";
+import React from "react";
+import {connect} from "react-redux";
+import * as apiActions from "../actions/apiActions";
+import * as listType from "./listTypes";
+import * as nglLoadActions from "../actions/nglLoadActions";
+import MoleculeView from "./moleculeView";
 
 const molStyle = {height: "250px",
     overflow:"scroll"}

js/components/moleculeView.js

@@ -2,16 +2,15 @@
  * Created by abradley on 14/03/2018.
  */
 
-import React from 'react';
-import { connect } from 'react-redux'
-import * as nglLoadActions from '../actions/nglLoadActions'
-import * as apiActions from '../actions/apiActions'
-import { GenericView } from './generalComponents'
-import * as nglObjectTypes from './nglObjectTypes'
-import * as selectionActions from '../actions/selectionActions'
-import * as listTypes from './listTypes'
-import '../../css/toggle.css';
-import Toggle from 'react-bootstrap-toggle';
+import React from "react";
+import {connect} from "react-redux";
+import * as nglLoadActions from "../actions/nglLoadActions";
+import {GenericView} from "./generalComponents";
+import * as nglObjectTypes from "./nglObjectTypes";
+import * as selectionActions from "../actions/selectionActions";
+import * as listTypes from "./listTypes";
+import "../../css/toggle.css";
+import Toggle from "react-bootstrap-toggle";
 import SVGInline from "react-svg-inline";
 import fetch from "cross-fetch";
 

js/components/nglComponents.js

@@ -2,16 +2,16 @@
  * Created by abradley on 01/03/2018.
  */
 
-import { Stage, Shape, concatStructures, Selection } from 'ngl';
-import React from 'react';
-import { connect } from 'react-redux'
-import * as apiActions from '../actions/apiActions'
-import * as nglLoadActions from '../actions/nglLoadActions'
-import * as nglRenderActions from '../actions/nglRenderActions'
-import * as nglObjectTypes from '../components/nglObjectTypes'
-import * as listTypes from './listTypes'
-import { showLoading, hideLoading } from 'react-redux-loading-bar'
-import * as selectionActions from '../actions/selectionActions'
+import {Stage, Shape, concatStructures, Selection} from "ngl";
+import React from "react";
+import {connect} from "react-redux";
+import * as apiActions from "../actions/apiActions";
+import * as nglLoadActions from "../actions/nglLoadActions";
+import * as nglRenderActions from "../actions/nglRenderActions";
+import * as nglObjectTypes from "../components/nglObjectTypes";
+import * as listTypes from "./listTypes";
+import {showLoading, hideLoading} from "react-redux-loading-bar";
+import * as selectionActions from "../actions/selectionActions";
 
 export class NGLView extends React.Component {
     constructor(props) {

js/components/panddaSiteList.js

@@ -2,13 +2,13 @@
  * Created by abradley on 17/04/2018.
  */
 
-import { GenericList } from './generalComponents';
-import React from 'react';
-import { connect } from 'react-redux'
-import * as apiActions from '../actions/apiActions'
-import * as listType from './listTypes'
-import * as nglLoadActions from '../actions/nglLoadActions'
-import * as nglObjectTypes from '../components/nglObjectTypes'
+import {GenericList} from "./generalComponents";
+import React from "react";
+import {connect} from "react-redux";
+import * as apiActions from "../actions/apiActions";
+import * as listType from "./listTypes";
+import * as nglLoadActions from "../actions/nglLoadActions";
+import * as nglObjectTypes from "../components/nglObjectTypes";
 
 class PanddaSiteList extends GenericList {
 

js/components/targetList.js

@@ -2,14 +2,14 @@
  * Created by abradley on 13/03/2018.
  */
 
-import { ListGroupItem, ListGroup } from 'react-bootstrap';
-import { GenericList } from './generalComponents';
-import React from 'react';
-import { connect } from 'react-redux';
-import * as apiActions from '../actions/apiActions';
-import * as listType from './listTypes';
-import * as nglLoadActions from '../actions/nglLoadActions';
-import * as nglObjectTypes from '../components/nglObjectTypes';
+import {ListGroupItem, ListGroup} from "react-bootstrap";
+import {GenericList} from "./generalComponents";
+import React from "react";
+import {connect} from "react-redux";
+import * as apiActions from "../actions/apiActions";
+import * as listType from "./listTypes";
+import * as nglLoadActions from "../actions/nglLoadActions";
+import * as nglObjectTypes from "../components/nglObjectTypes";
 import {withRouter, Link} from "react-router-dom";
 
 class TargetList extends GenericList {

js/components/updateOrientation.js

@@ -2,13 +2,13 @@
  * Created by ricgillams on 13/06/2018.
  */
 
-import React from 'react';
-import { connect } from 'react-redux'
-import * as nglLoadActions from '../actions/nglLoadActions'
-import * as apiActions from '../actions/apiActions'
-import * as selectionActions from '../actions/selectionActions'
-import { Button } from 'react-bootstrap'
-import { getStore } from '../containers/globalStore';
+import React from "react";
+import {connect} from "react-redux";
+import * as nglLoadActions from "../actions/nglLoadActions";
+import * as apiActions from "../actions/apiActions";
+import * as selectionActions from "../actions/selectionActions";
+import {Button} from "react-bootstrap";
+import {getStore} from "../containers/globalStore";
 
 export class UpdateOrientation extends React.Component {
     constructor(props) {

js/containers/app.js

@@ -1,5 +1,6 @@
-import React from 'react'
-import { Grid } from 'react-bootstrap';
+import React, {Component} from "react";
+import {connect} from "react-redux";
+import {Grid} from "react-bootstrap";
 import Header from "../components/header";
 import {MyMenu} from "../components/menuView";
 import LoadingBar from "react-redux-loading-bar";