Merge branch 'paramterize_energy_toolbox_url' into 'master'

parmaterized energy toolbox url

See merge request !10

.env-default

@@ -3,5 +3,6 @@ REACT_APP_FORECASTING_TOOL_SERVER_IP="http://160.40.52.130:5000"
 REACT_APP_ATD_TOOL_SERVER_IP="http://astracker.web.rug.nl"
 REACT_APP_USER_MANAGEMENT_SERVER_IP="https://gitlab.seis.iti.gr:2443/keycloak/auth"
 REACT_APP_PROJECT_MANAGEMENT_SERVER_IP="http://160.40.52.130:3001/SDK4ED/"
+REACT_APP_ENERGY_TOOLBOX_ENDPOINT="http://147.102.37.20:3002"
 REACT_APP_DASHBOARD_IP="http://160.40.52.130:3000/"
-REACT_APP_DECSUPP_IP="http://147.102.37.20:8062"
+REACT_APP_DECSUPP_IP="http://147.102.37.20:8062"
\ No newline at end of file

src/components/pages/EnergyDashPage.js

@@ -9,7 +9,7 @@ import React from 'react';
     import Highcharts from 'highcharts';
     import HighchartsReact from 'highcharts-react-official';
     //import Array.prototype.map();
-
+	const ENERGY_TOOLBOX_ENDPOINT = process.env.REACT_APP_ENERGY_TOOL_ENDPOINT
     //const arrayColumn = (arr, n) => arr.map(x => x[n]);
 
     // The Project Panel
@@ -795,7 +795,7 @@ import React from 'react';
     	    iteraurl = iteraurl.concat('-');
     	    iteraurl = iteraurl.concat(data.get('iternumber'))
     	    //const fetch_link = `http://147.102.37.20:3002/analysis?new=${new_analysis}&user=${user_name}&token=${github_token}&url=${github_url}&commit=${commit}&type=${this.state.run_type}`;
-            const fetch_link = `http://147.102.37.20:3002/analysis?new=${new_analysis}&user=cappadokes&token=de368e0c5b26ad400114a0f850c36e336030e991&url=https://github.com/cappadokes/neurasmus&commit=${commit}&type=${this.state.run_type}`;
+            const fetch_link = ENERGY_TOOLBOX_ENDPOINT+`/analysis?new=${new_analysis}&user=cappadokes&token=de368e0c5b26ad400114a0f850c36e336030e991&url=https://github.com/cappadokes/neurasmus&commit=${commit}&type=${this.state.run_type}`;
     	    if(this.state.run_type == 'hotspots'){
     	    console.log(fetch_link);
     	    fetch(fetch_link)
@@ -933,7 +933,7 @@ import React from 'react';
     	    this.setState({
     	    		Granularities: '',
     	    	});
-    	    const fetch_link = `http://147.102.37.20:3002/analysis?new=${new_analysis}&user=${user_name}&token=${github_token}&url=${github_url}&commit=${commit}&type=${this.state.run_type}`;	
+    	    const fetch_link = ENERGY_TOOLBOX_ENDPOINT+`/analysis?new=${new_analysis}&user=${user_name}&token=${github_token}&url=${github_url}&commit=${commit}&type=${this.state.run_type}`;	
             //const fetch_link = `http://147.102.37.20:3002/analysis?new=${new_analysis}&user=cappadokes&token=de368e0c5b26ad400114a0f850c36e336030e991&url=https://github.com/cappadokes/neurasmus&commit=${commit}&type=${this.state.run_type}`; 
 
     	    if (this.state.run_type == 'static'){
@@ -1040,7 +1040,7 @@ import React from 'react';
     	    this.setState({
     	    		Granularities: '',
     	    	});
-    	    const fetch_link = `http://147.102.37.20:3002/analysis?new=${new_analysis}&user=${user_name}&token=${github_token}&url=${github_url}&type=${this.state.run_type}&speciter=${iteraurl}`;
+    	    const fetch_link = ENERGY_TOOLBOX_ENDPOINT+`/analysis?new=${new_analysis}&user=${user_name}&token=${github_token}&url=${github_url}&type=${this.state.run_type}&speciter=${iteraurl}`;
           //const fetch_link = `http://147.102.37.20:3002/analysis?new=${new_analysis}&user=cappadokes&token=de368e0c5b26ad400114a0f850c36e336030e991&url=https://github.com/cappadokes/neurasmus&type=${this.state.run_type}&speciter=${iteraurl}`; 	     	
     	  if (checking <= this.state.boxforiterations.anotherbox && checking>=1) {
     	    if (this.state.run_type == 'static'){