changes to settings.json

Author: gracepark01

app/charts/RouteChart.jsx

@@ -89,37 +89,7 @@ const RouteLocations = props => {
       backgroundColor: '#ffffff',
       borderRadius: 3,
       border: '0',
-<<<<<<< HEAD:app/charts/RouteCopy.jsx
-      boxShadow:
-        '0 6px 6px 0 rgba(153, 153, 153, 0.14), 0 6px 6px -2px rgba(153, 153, 153, 0.2), 0 6px 8px 0 rgba(153, 153, 153, 0.12)',
-      '&:hover, &.Mui-focusVisible': {
-        backgroundColor: `#ccd8e1`,
-        color: '#ffffff',
-      },
-    },
-    hover: {
-      boxShadow: 'none',
-      color: 'transparent',
-    },
-    btnStyle: {
-      position: 'absolute',
-      top: -10,
-      left: -10,
-      margin: '0',
-      color: '#eeeeee',
-      borderRadius: '0',
-      backgroundColor: 'transparent',
-      '&:hover': {
-        backgroundColor: 'none',
-      },
-    },
-    icon: {
-      width: '75px',
-      height: '75px',
-      boxShadow: 'none',
-=======
       boxShadow: '2px 2px 6px #bbbbbb',
->>>>>>> 50f13071f2225c509ec51921f966dc3c8979699d:app/charts/RouteChart.jsx
     },
   }));
   const classes = useStyles({});
@@ -133,7 +103,6 @@ const RouteLocations = props => {
       // check if node exists if not then add node
       let id = route[i].microservice;
       if (nodeListObj[id] === undefined) {
-<<<<<<< HEAD:app/charts/RouteCopy.jsx
         nodeListObj[id] = {
           id: id,
           label: id,
@@ -144,9 +113,6 @@ const RouteLocations = props => {
           },
           shape: 'circle',
         };
-=======
-        nodeListObj[id] = { id: id, label: id, color: { background: '#24d2f1', border: 'white', hover: { background: '#4d55ec', border: 'white' } }, shape: 'circle' }
->>>>>>> 50f13071f2225c509ec51921f966dc3c8979699d:app/charts/RouteChart.jsx
       }
       // add edge from node 1 to node 2 (repeat til end)
       if (i !== 0) {
@@ -157,8 +123,8 @@ const RouteLocations = props => {
     }
   }
   const nodeList = Object.values(nodeListObj);
-  console.log(edgeList);
-  console.log(nodeList);
+  console.log('edgeList', edgeList);
+  console.log('nodeList', nodeList);
 
   const graph = {
     nodes: nodeList,
@@ -175,13 +141,8 @@ const RouteLocations = props => {
   //   edges: [{ from: 4, to: 2, label: 'hello' }, { from: 'one', to: 3 }, { from: 2, to: 4 }, { from: 2, to: 5 }]
   // };
   const options = {
-<<<<<<< HEAD:app/charts/RouteCopy.jsx
-    height: '400px',
-    width: '400px',
-=======
     height: '300px',
     width: '300px',
->>>>>>> 50f13071f2225c509ec51921f966dc3c8979699d:app/charts/RouteChart.jsx
     style: 'surface',
     layout: {
       hierarchical: false,
@@ -208,27 +169,22 @@ const RouteLocations = props => {
   };
 
   return (
-<<<<<<< HEAD:app/charts/RouteCopy.jsx
     <div className="traceContainer">
-      <span id="trace">Traces</span>
+      <span id="tracesTitle">Route Traces</span>
       <Graph
         className={classes.paper}
         graph={graph}
         options={options}
         events={events}
         style={{
-          fontSize: '8px',
+          fontSize: '2px',
           color: '#555555',
           fontFamily: 'Open Sans',
-          boxShadow: '0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19)',
+          boxShadow: '3px 3px 6px 1px rgb(175, 175, 175)',
           backgroundColor: 'white',
+          borderRadius: '3px',
         }}
       />
-=======
-    <div className='traceContainer'>
-      <span id='tracesTitle'>Route Traces</span>
-      <Graph className={classes.paper} graph={graph} options={options} events={events} style={{ fontSize: '2px', color: '#555555', fontFamily: 'Open Sans', boxShadow: '3px 3px 6px 1px rgb(175, 175, 175)', backgroundColor: 'white', borderRadius: '3px' }} />
->>>>>>> 50f13071f2225c509ec51921f966dc3c8979699d:app/charts/RouteChart.jsx
     </div>
   );
 };

electron/user/settings.json

@@ -8,27 +8,13 @@
       "Online bookstore with that keeps track of orders and customers",
       "Jun 28, 2020 4:58 PM"
     ],
-    [
-      "myMongo",
-      "MongoDB",
-      "mongodb+srv://chronos:pass123@cluster0-xluio.mongodb.net/chronos?retryWrites=true&w=majority",
-      "E-commerce website for buying and selling clothes",
-      "Jul 01, 2020 10:33 PM"
-    ],
     [
       "ToddDB",
       "MongoDB",
       "mongodb+srv://tdwolf6:password16@cluster0-0xvd7.gcp.mongodb.net/Chronos?retryWrites=true&w=majority",
       "Web app deployed on AWS",
       "Jul 3, 2020 7:12AM"
-    ],
-    [
-      "pattyDB",
-      "MongoDB",
-      "mongodb+srv://chronos:chronos@cluster0.tpeie.mongodb.net/chronos?retryWrites=true&w=majority",
-      "dummy microservice: books/customer/orders/reverse-proxy",
-      "Jul 3, 2020 11:12AM"
     ]
   ],
   "splash": true
-}
+}