Merge branch 'feature/integration-graph-2d-3d' of...

Merge branch 'feature/integration-graph-2d-3d' of gitlab.fing.edu.uy:matefun/Frontend into feature/integration-graph-2d-3d

# Conflicts:
#	Frontend Angular 4/package-lock.json
#	Frontend Angular 4/package.json

Frontend Angular 4/package.json

@@ -24,7 +24,7 @@
     "core-js": "^2.4.1",
     "d3": "^4.12.2",
     "font-awesome": "^4.7.0",
-    "function-plot": "git+https://github.com/diego-rey/function-plot.git#feature/integration-domain-shape",
+    "function-plot": "git://github.com/diego-rey/function-plot.git#feature/integration-domain-shape",
     "graph3D": "git://github.com/ifagian/graph3D#master",
     "ionicons": "^3.0.0",
     "jq-console": "^2.13.2",

Frontend Angular 4/src/app/shared/config.ts

@@ -4,8 +4,8 @@
 //export const SERVER = 'http://localhost:9090';
 //export const GHCI_URL = 'ws://localhost:9090/endpoint';
 
-//export const SERVER = 'http://localhost:8080';
-//export const GHCI_URL = 'ws://localhost:8080/endpoint';
+// export const SERVER = 'http://localhost:9090';
+// export const GHCI_URL = 'ws://localhost:9090/endpoint';
 
 //Configuracion dinamica pensando en servidor con ip dinamica
 
@@ -13,6 +13,7 @@
 // export const GHCI_URL = window.location.protocol == 'http:'?  'ws://'+window.location.host+'/endpoint': 'wss://'+window.location.host+'/endpoint';
 
 // Google cloud platform
+
 export const SERVER = 'http://35.199.110.129:9090';
 export const GHCI_URL = 'ws://35.199.110.129:9090/endpoint';