Merge Xchem changes

.travis.yml

@@ -2,7 +2,7 @@ language: node_js
 node_js:
   - "8"
 script:
-  - npm test
+  - npm run build && npm test
 after_success:
   - if [ "$TRAVIS_BRANCH" == "master" ]; then
     npm run-script build;

js/components/header.js

@@ -3,13 +3,15 @@
  */
 
 import React from "react";
-import {Navbar} from "react-bootstrap";
+import {Navbar, Nav, NavItem, Button} 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 {withRouter, Link} from "react-router-dom";
+import TargetList from "./targetList";
+import UpdateOrientation from "./updateOrientation";
 
 class Header extends React.Component {
 
@@ -54,13 +56,45 @@ class Header extends React.Component {
     }
 
   render() {
+      var landing = "/viewer/react/landing";
+      var login = "/accounts/login"
+      var logout = "/accounts/logout"
+      var new_ele;
+      var username = DJANGO_CONTEXT["username"];
+      if (username=="NOT_LOGGED_IN"){
+          new_ele = <Button href={login} bsSize="medium" bsStyle="info">
+                  Login</Button>
+      }
+      else{
+          new_ele = <a>
+              <b>Hello {username}!</b>
+              <Button href={logout} bsSize="medium" bsStyle="info">
+                  Logout
+              </Button>
+          </a>
+      }
+
     return <Navbar>
+        <Navbar.Header>
+            <Navbar.Brand>
+                <Link to={landing}>
+                <Button bsSize="large" bsStyle="info">
+                    Home
+                </Button>
+                </Link>
+            </Navbar.Brand>
+        </Navbar.Header>
+        {new_ele}
         <Typeahead
             labelKey="name"
             onOptionSelected={this.selectTarget}
             options={this.getTargetList()}
             placeholder="Choose a target..."
         />
+        <Nav pullRight>
+            <UpdateOrientation />
+        </Nav>
+        <TargetList key="TARGLIST" render={false}/>
       </Navbar>
   }
 }

js/components/nglComponents.js

@@ -10,7 +10,6 @@ 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 {
@@ -418,7 +417,6 @@ export class NGLView extends React.Component {
             if (this.div_id==nglObject.display_div) {
                 this.function_dict[nglObject.OBJECT_TYPE](this.stage,nglObject,nglKey)
                 this.props.objectLoading(nglObject);
-                this.props.showLoading();
             }
         }
         for(var nglKey in this.props.objectsToDelete){
@@ -476,7 +474,6 @@ export class NGLView extends React.Component {
                 if (this.stage.getComponentsByName(nglKey).list.length > 0) {
                     var nglObject = this.props.objectsLoading[nglKey];
                     this.props.loadObjectSuccess(nglObject);
-                    this.props.hideLoading()
                 }
             }
         }
@@ -511,11 +508,9 @@ const mapDispatchToProps = {
     setMolGroupOn: apiActions.setMolGroupOn,
     selectVector: selectionActions.selectVector,
     setDuckYankData: apiActions.setDuckYankData,
-    hideLoading: hideLoading,
     setNGLOrientation: nglLoadActions.setNGLOrientation,
     setPanddaSiteOn: apiActions.setPanddaSiteOn,
     setOrientation: nglLoadActions.setOrientation,
-    showLoading: showLoading,
     objectLoading: nglLoadActions.objectLoading,
     loadObjectSuccess: nglLoadActions.loadObjectSuccess,
     loadObjectFailure: nglLoadActions.loadObjectFailure,

js/components/nglViewerControls.js

@@ -5,7 +5,6 @@
 import React from "react";
 import {connect} from "react-redux";
 import * as nglLoadActions from "../actions/nglLoadActions";
-import UpdateOrientation from "./updateOrientation";
 import {Button} from "react-bootstrap";
 
 class NglViewerControls extends React.Component {
@@ -36,8 +35,6 @@ class NglViewerControls extends React.Component {
         return <div>
             <h3>Viewer controls</h3>
             <Button bsSize="large" bsStyle="success" onClick={this.handleStageColor}>Change background colour</Button>
-            {/*<Button bsSize="large" bsStyle="success" onClick={this.handleNglProtStyle}>Change protein representation</Button>*/}
-            <UpdateOrientation />
         </div>
     }
 }

js/components/targetList.js

@@ -78,7 +78,10 @@ class TargetList extends GenericList {
 
     }
     render() {
-        if (this.props != undefined && this.props.object_list) {
+        if (this.props.render==false){
+            return null;
+        }
+        else if (this.props != undefined && this.props.object_list) {
             return <ListGroup>
                 {
                 this.props.object_list.map((data) => (this.render_method(data)))

js/components/updateOrientation.js

@@ -121,7 +121,7 @@ export class UpdateOrientation extends React.Component {
 
     render() {
         return <div>
-            <Button bsSize="large" bsStyle="success" onClick={this.postToServer}>Save NGL Orientation</Button>
+            <Button bsSize="large" bsStyle="success" onClick={this.postToServer}>Save Page</Button>
            </div>
     }
 }

js/containers/app.js

@@ -1,8 +1,6 @@
 import React from "react";
 import {Grid} from "react-bootstrap";
 import Header from "../components/header";
-import {MyMenu} from "../components/menuView";
-import LoadingBar from "react-redux-loading-bar";
 import Tindspect from "./tindspectHolder";
 import Preview from "./previewHolder";
 import FraggleBox from "./fraggleBoxHolder";
@@ -11,8 +9,6 @@ import {Route, Switch} from "react-router-dom";
 
 const routes = (
       <div id="outer-container">
-          <MyMenu right pageWrapId={ "page-wrap" } outerContainerId={ "outer-container" } />
-          <LoadingBar />
           <Grid fluid id="page-wrap">
               <Header></Header>
                   <Switch>

js/reducers/reducers.js

@@ -6,15 +6,11 @@ import apiRed from "./apiReducers";
 import nglRed from "./nglReducers";
 import selectionRed from "./selectionReducers";
 import renderReducers from "./renderReducers";
-import {loadingBarReducer} from "react-redux-loading-bar";
-import {reducer as burgerMenu} from "redux-burger-menu";
 import undoable from "redux-undo";
 
 const rootReducer = combineReducers({
     renderReducers,
     apiReducers: undoable(apiRed, {limit: 10}),
-    burgerMenu,
-    loadingBar: loadingBarReducer,
     nglReducers: undoable(nglRed, {limit: 10}),
     selectionReducers: undoable(selectionRed, {limit: 10})
 })

package.json

@@ -30,7 +30,7 @@
     "clipboard": "1.7.1",
     "connected-react-router": "^4.3.0",
     "cross-fetch": "^1.1.1",
-    "css-loader": "^0.28.10",
+    "css-loader": "^1.0.0",
     "file-loader": "^1.1.11",
     "file-saver": "^1.3.8",
     "jquery": "^3.3.1",
@@ -40,28 +40,18 @@
     "nprogress": "^0.2.0",
     "react": "^16.2.0",
     "react-bootstrap": "^0.32.1",
-    "react-bootstrap-switch": "^15.5.3",
-    "react-bootstrap-table-next": "^0.1.4",
-    "react-bootstrap-table2-editor": "^0.1.2",
-    "react-bootstrap-table2-filter": "^0.1.3",
-    "react-bootstrap-table2-overlay": "^0.1.1",
-    "react-bootstrap-table2-paginator": "^0.1.1",
-    "react-bootstrap-toggle": "^2.2.6",
-    "react-burger-menu": "^2.3.0",
     "react-chartjs": "^1.2.0",
     "react-dom": "^16.2.0",
-    "react-draggable": "^3.0.5",
     "react-inlinesvg": "^0.7.5",
     "react-keydown": "^1.9.7",
     "react-modal": "^3.4.5",
     "react-redux": "^5.0.7",
-    "react-redux-loading-bar": "^3.1.2",
+    "react-bootstrap-toggle": "^2.3.1",
     "react-router-dom": "^4.3.1",
     "react-router-redux": "^4.0.8",
     "react-svg-inline": "^2.1.0",
     "react-typeahead": "^2.0.0-alpha.8",
     "redux": "^3.7.2",
-    "redux-burger-menu": "^0.2.4",
     "redux-logger": "^3.0.6",
     "redux-thunk": "^2.2.0",
     "redux-undo": "^1.0.0-beta9-9-7",
@@ -76,11 +66,10 @@
     "babel-preset-env": "^1.6.1",
     "babel-preset-react": "^6.24.1",
     "compression-webpack-plugin": "^1.1.11",
-    "enzyme": "^3.3.0",
-    "enzyme-adapter-react-16": "^1.1.1",
-    "fixmyjs": "^2.0.0",
+    "enzyme": "^3.6.0",
+    "enzyme-adapter-react-16": "^1.5.0",
     "install": "^0.10.4",
-    "jest": "^22.4.2",
+    "jest": "^23.6.0",
     "jsdom": "^11.11.0",
     "jshint": "^2.9.5",
     "webpack": "^4.12.0",