Commit 0bef0503 authored by Iker Hurtado's avatar Iker Hurtado
Browse files

BUG FIXING: Stop referencing the domain inside the project (II)

parent f6756de5
Pipeline #8926 passed with stage
in 3 seconds
...@@ -683,14 +683,14 @@ ...@@ -683,14 +683,14 @@
let UserInfo = __webpack_require__(3); let UserInfo = __webpack_require__(3);
const IMAGE_DIR= 'img/'; const IMAGE_DIR= 'img/';
const HOST= '';//'http://enc-testing-nomad.esc.rzg.mpg.de/'; // const HOST= '/';//'http://enc-testing-nomad.esc.rzg.mpg.de/'; //
const URL_BASE= HOST+'v1.0/'; const API_BASE_URL= HOST+'v1.0/';
// Mockup URLs // Mockup URLs
const FERMI_SURFACE_URL= HOST+'files/fermi/'+ const FERMI_SURFACE_URL= HOST+'files/fermi/'+
'fed3fa9fbc68aa6c5e51845396889666ca37bb2e626e1da53.x3d'; 'fed3fa9fbc68aa6c5e51845396889666ca37bb2e626e1da53.x3d';
const BAND_STRUCT_EXAMPLE_URL= URL_BASE+'materials/108541/calculations/290737'; const BAND_STRUCT_EXAMPLE_URL= API_BASE_URL+'materials/108541/calculations/290737';
const MAT_VIEW = {'structure' : 'structure', 'electronicstruct': 'electronicstruct', 'methodology': 'methodology'}; const MAT_VIEW = {'structure' : 'structure', 'electronicstruct': 'electronicstruct', 'methodology': 'methodology'};
...@@ -731,7 +731,7 @@ ...@@ -731,7 +731,7 @@
function getSearchURL(formula, searchItems, exclusive, page, results_per_page){ function getSearchURL(formula, searchItems, exclusive, page, results_per_page){
//return 'http://46.101.100.99/materials/search?page='+page+ //return 'http://46.101.100.99/materials/search?page='+page+
let url= URL_BASE+'materials?'; let url= API_BASE_URL+'materials?';
if (formula){ if (formula){
url += 'formula='+searchItems; url += 'formula='+searchItems;
}else{ }else{
...@@ -748,22 +748,22 @@ ...@@ -748,22 +748,22 @@
function getMaterialURL(matId){ function getMaterialURL(matId){
//return 'http://46.101.139.126/v1.0/materials/'+matId; //return 'http://46.101.139.126/v1.0/materials/'+matId;
return URL_BASE+'materials/'+matId;//'/materials/matid'; // return API_BASE_URL+'materials/'+matId;//'/materials/matid'; //
} }
function getMaterialCalcURL(matId, calcId){ function getMaterialCalcURL(matId, calcId){
//return 'http://46.101.139.126/v1.0/materials/'+matId; //return 'http://46.101.139.126/v1.0/materials/'+matId;
return URL_BASE+'materials/'+matId+'/calculations/'+calcId; return API_BASE_URL+'materials/'+matId+'/calculations/'+calcId;
} }
function getMaterialXsURL(what, matId){ function getMaterialXsURL(what, matId){
//console.log(URL_BASE+'materials/'+matId+'/'+what+'?page=1&per_page=5000'); //console.log(API_BASE_URL+'materials/'+matId+'/'+what+'?page=1&per_page=5000');
return URL_BASE+'materials/'+matId+'/'+what+'?page=1&per_page=5000';//'/materials/calculations';// return API_BASE_URL+'materials/'+matId+'/'+what+'?page=1&per_page=5000';//'/materials/calculations';//
} }
function getCalcEnergiesURL(matId,calcId){ function getCalcEnergiesURL(matId,calcId){
//return 'http://46.101.139.126/v1.0/materials/'+matId; //return 'http://46.101.139.126/v1.0/materials/'+matId;
return URL_BASE+'materials/'+matId+'/calculations/'+calcId+'/energies';//'/materials/calculations';// return API_BASE_URL+'materials/'+matId+'/calculations/'+calcId+'/energies';//'/materials/calculations';//
} }
...@@ -967,7 +967,7 @@ ...@@ -967,7 +967,7 @@
getNumberArray: getNumberArray, getNumberArray: getNumberArray,
getCellDataForViewer: getCellDataForViewer, getCellDataForViewer: getCellDataForViewer,
//HOST: HOST, //HOST: HOST,
URL_BASE: URL_BASE, //API_BASE_URL: API_BASE_URL,
FERMI_SURFACE_URL: FERMI_SURFACE_URL, FERMI_SURFACE_URL: FERMI_SURFACE_URL,
BAND_STRUCT_EXAMPLE_URL: BAND_STRUCT_EXAMPLE_URL, BAND_STRUCT_EXAMPLE_URL: BAND_STRUCT_EXAMPLE_URL,
J2eV: J2eV, J2eV: J2eV,
......
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
let UserInfo = require('./UserInfo.js'); let UserInfo = require('./UserInfo.js');
const IMAGE_DIR= 'img/'; const IMAGE_DIR= 'img/';
const HOST= '';//'http://enc-testing-nomad.esc.rzg.mpg.de/'; // const HOST= '/';//'http://enc-testing-nomad.esc.rzg.mpg.de/'; //
const URL_BASE= HOST+'v1.0/'; const API_BASE_URL= HOST+'v1.0/';
// Mockup URLs // Mockup URLs
const FERMI_SURFACE_URL= HOST+'files/fermi/'+ const FERMI_SURFACE_URL= HOST+'files/fermi/'+
'fed3fa9fbc68aa6c5e51845396889666ca37bb2e626e1da53.x3d'; 'fed3fa9fbc68aa6c5e51845396889666ca37bb2e626e1da53.x3d';
const BAND_STRUCT_EXAMPLE_URL= URL_BASE+'materials/108541/calculations/290737'; const BAND_STRUCT_EXAMPLE_URL= API_BASE_URL+'materials/108541/calculations/290737';
const MAT_VIEW = {'structure' : 'structure', 'electronicstruct': 'electronicstruct', 'methodology': 'methodology'}; const MAT_VIEW = {'structure' : 'structure', 'electronicstruct': 'electronicstruct', 'methodology': 'methodology'};
...@@ -52,7 +52,7 @@ function getSubscriptedFormula(formula){ ...@@ -52,7 +52,7 @@ function getSubscriptedFormula(formula){
function getSearchURL(formula, searchItems, exclusive, page, results_per_page){ function getSearchURL(formula, searchItems, exclusive, page, results_per_page){
//return 'http://46.101.100.99/materials/search?page='+page+ //return 'http://46.101.100.99/materials/search?page='+page+
let url= URL_BASE+'materials?'; let url= API_BASE_URL+'materials?';
if (formula){ if (formula){
url += 'formula='+searchItems; url += 'formula='+searchItems;
}else{ }else{
...@@ -69,22 +69,22 @@ function getSearchURL(formula, searchItems, exclusive, page, results_per_page){ ...@@ -69,22 +69,22 @@ function getSearchURL(formula, searchItems, exclusive, page, results_per_page){
function getMaterialURL(matId){ function getMaterialURL(matId){
//return 'http://46.101.139.126/v1.0/materials/'+matId; //return 'http://46.101.139.126/v1.0/materials/'+matId;
return URL_BASE+'materials/'+matId;//'/materials/matid'; // return API_BASE_URL+'materials/'+matId;//'/materials/matid'; //
} }
function getMaterialCalcURL(matId, calcId){ function getMaterialCalcURL(matId, calcId){
//return 'http://46.101.139.126/v1.0/materials/'+matId; //return 'http://46.101.139.126/v1.0/materials/'+matId;
return URL_BASE+'materials/'+matId+'/calculations/'+calcId; return API_BASE_URL+'materials/'+matId+'/calculations/'+calcId;
} }
function getMaterialXsURL(what, matId){ function getMaterialXsURL(what, matId){
//console.log(URL_BASE+'materials/'+matId+'/'+what+'?page=1&per_page=5000'); //console.log(API_BASE_URL+'materials/'+matId+'/'+what+'?page=1&per_page=5000');
return URL_BASE+'materials/'+matId+'/'+what+'?page=1&per_page=5000';//'/materials/calculations';// return API_BASE_URL+'materials/'+matId+'/'+what+'?page=1&per_page=5000';//'/materials/calculations';//
} }
function getCalcEnergiesURL(matId,calcId){ function getCalcEnergiesURL(matId,calcId){
//return 'http://46.101.139.126/v1.0/materials/'+matId; //return 'http://46.101.139.126/v1.0/materials/'+matId;
return URL_BASE+'materials/'+matId+'/calculations/'+calcId+'/energies';//'/materials/calculations';// return API_BASE_URL+'materials/'+matId+'/calculations/'+calcId+'/energies';//'/materials/calculations';//
} }
...@@ -288,7 +288,7 @@ module.exports = { ...@@ -288,7 +288,7 @@ module.exports = {
getNumberArray: getNumberArray, getNumberArray: getNumberArray,
getCellDataForViewer: getCellDataForViewer, getCellDataForViewer: getCellDataForViewer,
//HOST: HOST, //HOST: HOST,
URL_BASE: URL_BASE, //API_BASE_URL: API_BASE_URL,
FERMI_SURFACE_URL: FERMI_SURFACE_URL, FERMI_SURFACE_URL: FERMI_SURFACE_URL,
BAND_STRUCT_EXAMPLE_URL: BAND_STRUCT_EXAMPLE_URL, BAND_STRUCT_EXAMPLE_URL: BAND_STRUCT_EXAMPLE_URL,
J2eV: J2eV, J2eV: J2eV,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment