Merge pull request #191 from Fmazin/f_dev

Adding new pages titles #181, preview for candidate ERC #151 and disable synchronized scrolling #183

ui/src/components/app/App.js

@@ -1,8 +1,8 @@
 import React, { Component } from 'react'
-import {Button, AppBar, Toolbar, Typography, ThemeProvider } from '@material-ui/core';
+import {Button, AppBar, Toolbar, Typography, MuiThemeProvider } from '@material-ui/core';
 import { Route, NavLink, HashRouter } from "react-router-dom";
 
-import theme from '../../helpers/theme';
+import o2rTheme from '../../helpers/theme';
 import './App.css';
 import logo from '../../assets/img/o2r-logo-only-white.svg';
 import orcidLogo from '../../assets/img/orcid.png';
@@ -18,7 +18,7 @@ import Discovery from '../discovery/Discovery';
 import ERC from '../erc/ERC';
 
 const Header = ( props ) => {
-  return (        
+  return (
     <AppBar id="header">
       <Toolbar>
       <a href="/"><img src={logo} alt="o2r" id="headerLogo"/></a>
@@ -35,22 +35,22 @@ const Header = ( props ) => {
             </Button>
           </NavLink>*/}
           <NavLink id="link" to={"/author/" + props.userOrcid}>
-            {props.loggedIn ? 
+            {props.loggedIn ?
               <Button color="inherit">
-                {props.userName} | 
+                {props.userName} |
                   <img src={orcidLogo} className="orcidImage" alt="orcid"></img>
                   {props.userOrcid}
               </Button> : ''}
           </NavLink>
         </HashRouter>
         <Button color="inherit"
-          href={props.loggedIn ? "api/v1/auth/logout" : "api/v1/auth/login"} 
+          href={props.loggedIn ? "api/v1/auth/logout" : "api/v1/auth/login"}
           onClick={() => props.login()}>{props.loggedIn ? 'Logout' : 'Login'}
         </Button>
         {/*<Button color="inherit">
           Help
             </Button>*/}
-      </Toolbar> 
+      </Toolbar>
     </AppBar>
   );
 };
@@ -106,20 +106,20 @@ class App extends Component {
       )
       .catch(response => {
         console.log(response);
-      });  
+      });
   }
 
   render() {
     return (
-      <ThemeProvider theme={theme}>
+      <MuiThemeProvider theme={o2rTheme}>
       <div id="pageContainer">
-      <Header 
-        loggedIn={this.state.loggedIn} 
+      <Header
+        loggedIn={this.state.loggedIn}
         login={() => this.user()}
         userName={this.state.userName}
-        userOrcid={this.state.userOrcid}>  
+        userOrcid={this.state.userOrcid}>
       </Header>
-      
+
       <HashRouter>
       <div>
         <div className="content" id="mainView">
@@ -135,10 +135,9 @@ class App extends Component {
       </HashRouter>
       <Footer></Footer>
       </div>
-      </ThemeProvider>
+      </MuiThemeProvider>
     )
   }
 }
 
 export default App
-

ui/src/components/app/footerLinks/Impressum.js

@@ -1,13 +1,20 @@
 import React, { Component } from "react";
+import config from '../../../helpers/config';
 
 class Impressum extends Component {
+
+    componentDidMount(){
+      document.title = "Impressum" + config.title;
+
+    }
+
     render() {
         return (
             <div>
                 <h1>Impressum</h1>
                 <h2>Contact</h2>
                 <div>
-                    Westfälische Wilhelms-Universität Münster<br/> 
+                    Westfälische Wilhelms-Universität Münster<br/>
                     Institut für Geoinformatik - o2r Project Team<br/>
                     Heisenbergstraße 2<br/>
                     D-48149 Münster<br/><br/>
@@ -16,12 +23,12 @@ class Impressum extends Component {
                 </div>
                 <h2>Notice of Liability</h2>
                 <div flex="50">
-                    Although we check the content carefully, we cannot accept responsibility for the content of external links. 
+                    Although we check the content carefully, we cannot accept responsibility for the content of external links.
                     The linked sites’ carriers are responsible for their sites’ content.
                 </div>
             </div>
         );
     }
 }
 
-export default Impressum;
+export default Impressum;

ui/src/components/app/footerLinks/Privacy.js

@@ -1,8 +1,15 @@
 import React, { Component } from "react";
+import config from '../../../helpers/config';
 
 class Privacy extends Component {
+
+    componentDidMount(){
+      document.title = "Privacy" + config.title;
+
+    }
+
     render() {
-        return ( 
+        return (
         <div>
             <h3>Privacy Policy</h3>
             <h4 id="userdata">User Data</h4>
@@ -40,4 +47,4 @@ class Privacy extends Component {
     }
 }
 
-export default Privacy;
+export default Privacy;

ui/src/components/authorView/Author.js

@@ -3,6 +3,7 @@ import React, { Component } from "react";
 import httpRequests from '../../helpers/httpRequests';
 import ResultList from './resultList'
 import { Grid, Paper } from "@material-ui/core";
+import config from '../../helpers/config';
 
 class Author extends Component {
 
@@ -16,6 +17,7 @@ class Author extends Component {
     }
     componentDidMount() {
         this.getCompendia();
+        document.title = "Author View" + config.title;
     }
 
     goToErc = (erc) => {
@@ -88,4 +90,4 @@ class Author extends Component {
     }
 }
 
-export default Author;
+export default Author;

ui/src/components/createERC/CreateERC.js

@@ -7,7 +7,7 @@ import RequiredMetadata from './requiredMetadata/RequiredMetadata';
 import SpatioTemporalMetadata from './spatioTemporalMetadata/SpatioTemporalMetadata';
 import Bindings from './bindings/Bindings';
 import httpRequests from '../../helpers/httpRequests';
-
+import config from '../../helpers/config';
 
 
 function TabContainer(props) {
@@ -35,7 +35,7 @@ class CreateERC extends Component {
             spatioTemporalChanged: false,
             authorsValid: false,
             candidate: true,
-            showProgress: false,
+            showProgress: false
         }
     }
 
@@ -146,17 +146,21 @@ class CreateERC extends Component {
         this.setState({ authorsValid: valid });
     };
 
-
-    componentDidMount = () => this.getMetadata();
+    componentDidMount = () => {
+      this.getMetadata();
+      document.title = "Create ERC" + config.title;
+    }
 
     handleClose = () => {
         this.setState({ open: false })
+
+
     }
 
     render() {
         const { value } = this.state;
         return (
-            <div>
+              <div>
                 <AppBar position="fixed" color="default" id="appBar">
                     <Tabs scrollButtons="on" variant="standard" indicatorColor="primary" centered textColor="primary"
                         value={value}
@@ -243,4 +247,4 @@ class CreateERC extends Component {
     }
 }
 
-export default CreateERC;
+export default CreateERC;

ui/src/components/createERC/bindings/Bindings.js

@@ -280,9 +280,14 @@ function VerticalLinearStepper(props) {
           <Button onClick={saveErc} disabled = {!valid2} className={classes.button} variant="contained" color="primary">
             Publish
           </Button>
-          <Button onClick={goToErc} disabled = {props.candidate} className={classes.button} variant="contained" color="primary">
-            Go to ERC
-          </Button>
+          {props.candidate
+            ? <Button onClick={goToErc} className={classes.button} variant="contained">
+                Preview
+              </Button>
+            : <Button onClick={goToErc} disabled = {props.candidate} className={classes.button} variant="contained" color="primary">
+                Go to ERC
+              </Button>
+          }
         </Paper>
       )}
     </div>
@@ -472,7 +477,7 @@ class Bindings extends Component {
   }
 
   analyzeIfConditions = (analyzedCode, codelines) => {
-  
+
     for (var codeItem of analyzedCode) {
       if (codeItem.type === "if"  || codeItem.type === "while" ) {
         if(codeItem.code[0].func && codeItem.code[0].func.id ==="install.packages"){
@@ -530,8 +535,8 @@ class Bindings extends Component {
   /*handleMouseUp ( e ) {
     if (this.state.creationStep === 1) {
       try {
-        this.setCode(window.getSelection().getRangeAt(0).toString()); 
-      } catch (error) {     
+        this.setCode(window.getSelection().getRangeAt(0).toString());
+      } catch (error) {
       }
     } else if (this.state.creationStep === 2) {
       this.setState({
@@ -627,13 +632,13 @@ class Bindings extends Component {
   saveErc = () =>  {
     this.props.setChangedFalse("all")
     this.props.updateMetadata(this.props.metadata, true)
-    
+
   }
 
   goToErc= () => {
     this.props.goToErc();
   }
-  
+
   clearBinding() {
     let state = this.state;
     //state.codeview=true;
@@ -808,4 +813,4 @@ export default Bindings;
             }
         }
     }
-*/
+*/

ui/src/components/createERC/requiredMetadata/Form.js

@@ -333,12 +333,20 @@ export const Form = props => {
                         >
                             Publish
                          </Button>
-                        <Button
-                            type="button"
-                            onClick={goToErc}
-                            disabled={props.candidate}>
-                            Go To ERC
+                        {props.candidate
+                          ? <Button
+                              type="button"
+                              onClick={goToErc}>
+                              Preview
+                            </Button>
+                          : <Button
+                              type="button"
+                              color="primary"
+                              onClick={goToErc}
+                              disabled={props.candidate}>
+                              Go To ERC
                             </Button>
+                       }
                     </Paper>
                     <div id={"errorMessage"}>
                         {errors.title ? errors.title : ""}
@@ -366,4 +374,4 @@ export const Form = props => {
 
         </form>
     )
-}
+}

ui/src/components/createERC/requiredMetadata/RequiredMetadata.js

@@ -102,7 +102,7 @@ class RequiredMetadata extends Component {
         codeLicense: this.props.originalMetadata.license.code,
 
     }
-    
+
     componentDidMount() {
         prepareLicense();
         refs2 = refs.splice(refs.length - this.props.authors.length, refs.length)
@@ -190,7 +190,7 @@ class RequiredMetadata extends Component {
                             dataLicenses={dataLicenses}
                             mostRestrictiveData={mostRestrictiveData}
                             leastRestrictiveData={leastRestrictiveData}
-                            candidate={this.props.candidate} 
+                            candidate={this.props.candidate}
                             showProgress={this.props.showProgress} />}
                         initialValues={this.formValues}
                         validationSchema={validationSchema}

ui/src/components/createERC/spatioTemporalMetadata/SpatioTemporalMetadata.js

@@ -49,6 +49,10 @@ class SpatioTemporalMetadata extends React.Component {
     this.props.goToErc()
   }
 
+  handlePreview = (e) => {
+    this.props.goToErc()
+  }
+
   handleSave = () => {
     this.props.setChangedFalse("all")
     this.props.setMetadata(this.props.metadata, true)
@@ -309,12 +313,19 @@ class SpatioTemporalMetadata extends React.Component {
               >
                 Publish
             </Button>
-              <Button
-                type="button"
-                onClick={this.handleClick.bind(null)}
-                disabled={this.props.candidate}>
-                Go To ERC
-             </Button>
+              {this.props.candidate
+                ?<Button
+                    type="button"
+                    onClick={this.handlePreview.bind(null)}>
+                    Preview
+                  </Button>
+                : <Button
+                    type="button"
+                    onClick={this.handleClick.bind(null)}
+                    disabled={this.props.candidate}
+                    color="primary">
+                    Go To ERC
+                  </Button>}
             </Card>
             <div id={"errorMessage"}>
               {!valid2 ? "Required Metadata is not valid" : ""} <br />

ui/src/components/discovery/Discovery.js

@@ -6,6 +6,7 @@ import L from 'leaflet'
 import prepareQuery from './/queryBuilder'
 import OwnMap, { ref, ref2 } from "./Map"
 import ResultList from './resultList'
+import config from '../../helpers/config';
 
 import './discovery.css'
 
@@ -27,7 +28,11 @@ class Discovery extends Component {
         }
     }
 
-    componentDidMount() { this.searchCompendia(); this.calculateDateRange() }
+    componentDidMount() {
+      this.searchCompendia();
+      this.calculateDateRange();
+      document.title = "Discover" + config.title;
+     }
 
     calculateDateRange = () => {
         const result = []
@@ -312,4 +317,4 @@ class Discovery extends Component {
     }
 }
 
-export default Discovery;
+export default Discovery;