Deploy

README.md

@@ -25,7 +25,7 @@ To run the client,
 
 Access the client side from a browser:
 
-    http://localhost:7472/
+    http://localhost:7473//
 
 API Server
 

client/.gitignore

@@ -22,4 +22,6 @@
 
 npm-debug.log*
 yarn-debug.log*
-yarn-error.log*
+yarn-error.log*
+
+.netlify

client/src/DemoPages/DataDashboard/DataDashboard/index.js

@@ -37,7 +37,7 @@ export default class DataDashboard extends Component {
     {
         Axios({
             method: "get",
-            url: `http://localhost:7473/data/nodes/${dataNodeId}/children`,
+            url: `http://165.227.106.53:7473/data/nodes/${dataNodeId}/children`,
             withCredentials: true,
         })
         .then(response => 

client/src/DemoPages/Home/index.js

@@ -68,7 +68,7 @@ class Home extends React.Component {
         this.setState({messagePending: "Create blank database"});
 
         return axios({
-            url: 'http://localhost:7473/app',
+            url: 'http://165.227.106.53:7473/app',
             withCredentials: true,
             method: 'post',
             data: {name: this.state.newProjName, isNewProject: true}
@@ -83,7 +83,7 @@ class Home extends React.Component {
             const {datasets} = data.datasets;
             readData = data;
             return axios({
-                url: 'http://localhost:7473/dataset',
+                url: 'http://165.227.106.53:7473/dataset',
                 withCredentials: true,
                 method: 'post',
                 data: datasets,
@@ -94,7 +94,7 @@ class Home extends React.Component {
             const {datagraph, intgraph, visgraph} = readData;
 
             return axios({
-                url: `http://localhost:7473/app/${this.state.newProjName}`,
+                url: `http://165.227.106.53:7473/app/${this.state.newProjName}`,
                 withCredentials: true,
                 method: 'post',
                 data: {
@@ -124,7 +124,7 @@ class Home extends React.Component {
         });
 
         axios({
-            url: 'http://localhost:7473/app',
+            url: 'http://165.227.106.53:7473/app',
             withCredentials: true,
             method: 'get'
         })
@@ -141,7 +141,7 @@ class Home extends React.Component {
         });
 
         return axios({
-            url: `http://localhost:7473/app/${name}`,
+            url: `http://165.227.106.53:7473/app/${name}`,
             withCredentials: true,
             method: 'get'
         }).then(response => {
@@ -165,7 +165,7 @@ class Home extends React.Component {
         }
 
         return axios({
-            url: 'http://localhost:7473/app',
+            url: 'http://165.227.106.53:7473/app',
             withCredentials: true,
             method: 'post',
             data: {name: this.state.newProjName, isNewProject: true}
@@ -188,7 +188,7 @@ class Home extends React.Component {
     deleteProject(projectName)
     {
         return axios({
-            url: `http://localhost:7473/app/${projectName}`,
+            url: `http://165.227.106.53:7473/app/${projectName}`,
             withCredentials: true,
             method: 'delete'
         }).then(() => {

client/src/DemoPages/VisDashboard/index.js

@@ -157,7 +157,7 @@ class Dashboard extends Component {
           this.setState({ loadRecommendedSequence: true });
           Axios({
             method: 'post',
-            url: `http://localhost:7473/vis/sequenceRecommend`,
+            url: `http://165.227.106.53:7473/vis/sequenceRecommend`,
             data: {
               charts: this.props.visgraph.nodes.map(node => ({
                 ...node.data.spec,

client/src/Layout/AppMain/index.js

@@ -156,7 +156,7 @@ const AppMain = ({
 const downloadProject = () => {
   const name = Cookies.get("project_name");
   return axios({
-    url: `http://localhost:7473/app/${name}`,
+    url: `http://165.227.106.53:7473/app/${name}`,
     withCredentials: true,
     method: 'get'
 }).then(response => {

client/src/redux/DataGraphActionCreators.js

@@ -21,7 +21,7 @@ export const addDataNode = ({
   const newNode = { name, type, source, transform, format};
   return Axios({
     method: 'post',
-    url: 'http://localhost:7473/data/nodes',
+    url: 'http://165.227.106.53:7473/data/nodes',
     data: newNode,
     withCredentials: true
   })
@@ -82,7 +82,7 @@ export const addDataEdge = ({source, target, type, data}) => (dispatch) => {
 
     return Axios({
         method: "post",
-        url: "http://localhost:7473/data/edges",
+        url: "http://165.227.106.53:7473/data/edges",
         data: newEdge,
         withCredentials: true
     }).then(response => {
@@ -114,7 +114,7 @@ export const addDataEdge = ({source, target, type, data}) => (dispatch) => {
 export const removeDataNode = ({ id }) => dispatch => {
   return Axios({
     method: 'delete',
-    url: `http://localhost:7473/data/nodes/${id}`,
+    url: `http://165.227.106.53:7473/data/nodes/${id}`,
     withCredentials: true,
   })
     .then(response => {
@@ -157,7 +157,7 @@ export const setDataPosition = payload => dispatch => {
   const {x, y, id} = payload;
   return Axios({
     method: 'put',
-    url: `http://localhost:7473/data/nodes/${id}`,
+    url: `http://165.227.106.53:7473/data/nodes/${id}`,
     data: {x, y},
     withCredentials: true,
   }).then((response) => {

client/src/redux/DatasetActionCreators.js

@@ -6,7 +6,7 @@ import toastOptions from '../DemoPages/config/toastOptions';
 export const addDataset = ({ name, dataset }) => dispatch => {
   toast.info(`Adding dataset ${name}`, toastOptions);
   return axios({
-    url: 'http://localhost:7473/dataset',
+    url: 'http://165.227.106.53:7473/dataset',
     withCredentials: true,
     method: 'post',
     data: [{name, dataset}]

client/src/redux/IntGraphActionCreators.js

@@ -6,7 +6,7 @@ import toastOptions from '../DemoPages/config/toastOptions';
 export const saveIntNode = ({name, source}) => dispatch => {
     return axios({
       method: 'post',
-      url: `http://localhost:7473/int/nodes`,
+      url: `http://165.227.106.53:7473/int/nodes`,
       data: {source, name},
       withCredentials: true,
     })
@@ -42,7 +42,7 @@ export const saveIntEdge = payload => ({
 export const addIntEdge = ({source, target, signal, binding, label}) => dispatch => {
     return axios({
         method: 'post',
-        url: `http://localhost:7473/int/edges`,
+        url: `http://165.227.106.53:7473/int/edges`,
         data: {source, target, signal, binding, label},
         withCredentials: true,
     }) 
@@ -71,7 +71,7 @@ export const addIntEdge = ({source, target, signal, binding, label}) => dispatch
 export const removeIntNode = ({id}) => dispatch => {
     return axios({
         method: 'delete',
-        url: `http://localhost:7473/int/nodes/${id}`,
+        url: `http://165.227.106.53:7473/int/nodes/${id}`,
         data: {id},
         withCredentials: true,
     }).then(response => {
@@ -97,7 +97,7 @@ export const removeIntEdge = ({id}) => dispatch =>
 {
     return axios({
         method: 'delete',
-        url: `http://localhost:7473/int/edges/${id}`,
+        url: `http://165.227.106.53:7473/int/edges/${id}`,
         data: {id},
         withCredentials: true,
     }).then(response => {
@@ -120,7 +120,7 @@ export const setIntPosition = payload => dispatch => {
     const {x, y, id} = payload;
     return axios({
       method: 'put',
-      url: `http://localhost:7473/int/nodes/${id}`,
+      url: `http://165.227.106.53:7473/int/nodes/${id}`,
       data: {x, y},
       withCredentials: true,
     })
@@ -138,7 +138,7 @@ export const setIntPosition = payload => dispatch => {
     const {id, params} = payload;
     return axios({
       method: 'put',
-      url: `http://localhost:7473/int/nodes/${id}`,
+      url: `http://165.227.106.53:7473/int/nodes/${id}`,
       data: params,
       withCredentials: true,
     })

client/src/redux/VisGraphActionCreators.js

@@ -11,7 +11,7 @@ export const addVisNode = ({ name, dataSource, spec }) => dispatch => {
   const newNode = { name, dataSource, spec};
   return Axios({
     method: 'post',
-    url: 'http://localhost:7473/vis/nodes',
+    url: 'http://165.227.106.53:7473/vis/nodes',
     data: newNode,
     withCredentials: true,
   })
@@ -54,7 +54,7 @@ export const removeAllVisEdgesByType = payload => ({
 export const removeVisNode = payload => dispatch => {
   return Axios({
     method: 'delete',
-    url: `http://localhost:7473/vis/nodes/${payload.id}`,
+    url: `http://165.227.106.53:7473/vis/nodes/${payload.id}`,
     data: payload,
     withCredentials: true,
   })
@@ -90,7 +90,7 @@ export const setVisNode = payload => dispatch => {
   const {id, params} = payload;
   return Axios({
     method: 'put',
-    url: `http://localhost:7473/vis/nodes/${id}`,
+    url: `http://165.227.106.53:7473/vis/nodes/${id}`,
     data: params,
     withCredentials: true,
   })
@@ -110,7 +110,7 @@ export const setVisPosition = payload => dispatch => {
   const {x, y, id} = payload;
   return Axios({
     method: 'put',
-    url: `http://localhost:7473/vis/nodes/${id}`,
+    url: `http://165.227.106.53:7473/vis/nodes/${id}`,
     data: {x, y},
     withCredentials: true,
   })

client/src/utils/dataGeneration.js

@@ -6,7 +6,7 @@ async function calculateDataset(dataNodeId, datasets, params = {})
 {
     return Axios({
         method: "get",
-        url: `http://localhost:7473/data/subgraph/${dataNodeId}`,
+        url: `http://165.227.106.53:7473/data/subgraph/${dataNodeId}`,
         withCredentials: true
     }).then(response => {
         if (response.statusText !== "OK")

docker-compose.yml

@@ -27,6 +27,8 @@ services:
       - ./server/data:/srv/app/server/data
       - ./server/app.js:/srv/app/server/app.js
       - ./server/utils:/srv/app/server/utils
+      - ./server/bin:/srv/app/server/bin
+      - ./server/cert:/srv/app/server/cert
     networks:
       - db-server
       - client-server
@@ -65,25 +67,25 @@ services:
 ############################
 # setup client container
 ############################
-  # client:
-  #   build: ./client
+  client:
+    build: ./client
 
-  #   container_name: gravity-client
-  #   # environment: 
-  #   #   - REACT_APP_PORT=REACT_APP_PORT
-  #   expose:
-  #     - ${REACT_APP_PORT}
+    container_name: gravity-client
+    # environment: 
+    #   - REACT_APP_PORT=REACT_APP_PORT
+    expose:
+      - ${REACT_APP_PORT}
 
-  #   ports:
-  #     - ${REACT_APP_PORT}:${REACT_APP_PORT}
+    ports:
+      - ${REACT_APP_PORT}:${REACT_APP_PORT}
 
-  #   volumes: 
-  #     - ./client/src:/srv/app/client/src
-  #     - ./client/public:/srv/app/client/public
+    volumes: 
+      - ./client/src:/srv/app/client/src
+      - ./client/public:/srv/app/client/public
 
-  #   networks:
-  #     - client-server
-  #   command: npm run start
+    networks:
+      - client-server
+    command: npm run start
 
 networks:
   client-server:

server/app.js

@@ -55,7 +55,7 @@ app.use(bodyParser.json({limit: '50mb'}));
 // })
 
 app.use(function(req, res, next) {
-  res.header('Access-Control-Allow-Origin', 'http://localhost:7472');
+  res.header('Access-Control-Allow-Origin', 'http://165.227.106.53:7472');
   res.header('Access-Control-Allow-Credentials', 'true');
   res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
   next();

server/bin/www

@@ -7,20 +7,29 @@
 var app = require('../app');
 var debug = require('debug')('server1:server');
 var http = require('http');
-
+var https = require('https');
+var fs = require('fs');
+var path = require('path');
 /**
  * Get port from environment and store in Express.
  */
 
+
 var port = normalizePort(process.env.PORT || '7473');
 app.set('port', port);
 
 /**
  * Create HTTP server.
  */
 
+// var server = http.createServer(app);
 var server = http.createServer(app);
 
+// var server = https.createServer({
+//   key: fs.readFileSync(path.join(__dirname, '../cert', 'key.pem')),
+//   cert: fs.readFileSync(path.join(__dirname, '../cert', 'cert.pem')),
+// }, app);
+
 /**
  * Listen on provided port, on all network interfaces.
  */

server/cert/cert.pem

@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqMCFAsyFnl2HAvCaJDb4a1FO0xoK8OkMA0GCSqGSIb3DQEBCwUAMIGZ
+MQswCQYDVQQGEwJBVTERMA8GA1UECAwIVmljdG9yaWExEjAQBgNVBAcMCU1lbGJv
+dXJuZTEaMBgGA1UECgwRTW9uYXNoIFVuaXZlcnNpdHkxGTAXBgNVBAsMEERlcGFy
+dG1lbnQgb2YgSVQxLDAqBgkqhkiG9w0BCQEWHTEwMTkyMTYyM0BzdHVkZW50LnN3
+aW4uZWR1LmF1MB4XDTIxMDIxNzEwNTYyN1oXDTIyMDIxNzEwNTYyN1owgZkxCzAJ
+BgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJTWVsYm91cm5l
+MRowGAYDVQQKDBFNb25hc2ggVW5pdmVyc2l0eTEZMBcGA1UECwwQRGVwYXJ0bWVu
+dCBvZiBJVDEsMCoGCSqGSIb3DQEJARYdMTAxOTIxNjIzQHN0dWRlbnQuc3dpbi5l
+ZHUuYXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDuP4ziSz7dsPa8
+ebsGvctUT+zxvQJNyJc0+z+l2ItwchUtWhYwN13xhlzz65Ht9ff28vAcvt1XxVKW
+RyPaxo53IdUSlG4iq4PPYxKxPInih7KEE4+PuWMbqkLkQ+5aTxtdTc2xRpgqfqXH
+Vu3zDqgox0QwkOJxUaGXYQa+c9tvJre78oLqF9GuSz+Q8eYtgHamnB4cIKDw2o4I
+VmixvzEEFCLGHGkuVRa+LHS9GDvc0coE+m6al6NJSgb4gVU2OErzMVjAbAmi33zr
+IhIa87BMsKXJrT9frbAgNU/Ytg7awG9rKKuL+VnZCC2BVrDKB9rq8iy3H6Hz+UKP
+bWfvkFgHAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAHMgb0P4RoZwDH8DpZ3fTkQh
+TMdGJa7bAG34OwttlDXzS+2SpHquGybmOvwSmETFTeC+F23HKcgSoXIpz9Y3Ayzx
+Jgc/IaV8L5q1fk+VomLQx9TAMvon/fcsu4yP4B6wZXnchQzMf070owWgwSbnp4jm
+epSiAGNJfmzuZX2scK/qMCILfUnGjUOT3PLm9SHvdpFX/FEro9+b+Nxpf3CdQaQQ
+1WX8QfzHBxmBY4DUzRk3SPNwZF2fpUytdSKjC6QnVOjFAh8MQ7B4NnT8IhN4cptc
+dDSz4amsQxZd3k6sr3KDsFfwl7n9+lTC1ZrSIrGLpdTQCvxAFfHESj6XYJda9T0=
+-----END CERTIFICATE-----

server/cert/key.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA7j+M4ks+3bD2vHm7Br3LVE/s8b0CTciXNPs/pdiLcHIVLVoW
+MDdd8YZc8+uR7fX39vLwHL7dV8VSlkcj2saOdyHVEpRuIquDz2MSsTyJ4oeyhBOP
+j7ljG6pC5EPuWk8bXU3NsUaYKn6lx1bt8w6oKMdEMJDicVGhl2EGvnPbbya3u/KC
+6hfRrks/kPHmLYB2ppweHCCg8NqOCFZosb8xBBQixhxpLlUWvix0vRg73NHKBPpu
+mpejSUoG+IFVNjhK8zFYwGwJot986yISGvOwTLClya0/X62wIDVP2LYO2sBvayir
+i/lZ2QgtgVawygfa6vIstx+h8/lCj21n75BYBwIDAQABAoIBAFbIT0ken4ehLj75
+GGccOzQ66NQlRPGQX4OtAUIn3qLW61/ZsLtfb5jKmJFA/abwMaKCW3QdEgMmnS6g
+Oy81pC9A45wg9P0r/JdOP0DQDGm3hA8YEPMJVFB/dF4xYGEE77LM5F/ulv7jov85
+avNeI2K3Mt995v3f/jxl208EZKnXfKEJI/QJ3ywTq76nbBy+V3TIw0VYkUGPtpfL
+L9p4KyzvvqgauiFQ1QjqWOpgtjnm44ubTqFE5QqHzQXZHn5hBc7FeIZy81ClVpnf
+EQIxvC9y290QXM/nI5I/Q5wkTeo2Z28fq0z0ocFXghbaq5dodNINMfIn6Im1T4F6
+3AdMGAECgYEA/BseoW+JKp0Ss6lrYsntm9KmNceD1KhYhSNn3KmyVk3cg6eZHWdf
+NwAsf3klPPH93lKaxbeui+jp0lG0+IOzIuHJPOwVDd/egyX00dCc3zTWL/fwkW30
+51dMIvureGJCT7cjwFeNmzlqXW1LMYxnRx2/8UNjMrtt1IHoRqMn3lECgYEA8e2i
+aWbZQZlBNppzhhbvoq/tEguQM6NvlopRS8yYzfXBysnSivYzD4JLxw8rnHy0CKrW
+HOmQfMmW2/gP6zOOCKu1ld4rIBk3dgD/fmO0LLSEjEwdhGsoyjp3smdAW0p2Yo+R
+VRte48rtY9Pod9cmR62agtZKN8habibNkHXYAtcCgYEAsN3t3WA8oRLVfgoL9qCn
+/DwKs4wnptf8UluGkD7ViMrTO+Im/4P4PsP2c+/v+hPkAUd+odu9rxZWhGEiT39F
+++Dfp8gQ9Uzr9KJ6YYCzrbyJz9logv7bZDnQhnJ919VHpFld0aEbDZ14S9dTe41/
+H1t1v7OBMqRf50jERlpMrCECgYEAyffQ9p1eEl2XC7a1auQK+o5UJBRzNijjJ5Ih
+fF450vev6VPD6S7QQcpM6MnJZsLUqce1KD302biRsOHOqFRJ5wMyfQMUjZ9/pYv/
+v8wMxqWNYnLI0ZuEWg+ljdKU76GiY3Xnpl1LQnBO7mAiWqnK01wi+cdb/mXM2Nic
+FFXNF9ECgYBJHQJHaDuEapV/HQ5IbCcJY9ll3ALqwhp9CmUdlS/FQMDCdWWzWFOU
+703tYAvT3TWKczMHxLZrzdVm1M/vPJhaxWShxTm4vWLJfHvkWhIBSHVp+/LjQP2w
+Q7hi32GoHYV05Jsj3Ivou0z661t/zgUPwDj33sckO978FrHmL/M/ow==
+-----END RSA PRIVATE KEY-----