Merge branch 'staging' of https://github.com/oslabs-beta/Chronos

Author: ajlee12

app/charts/route-trace.jsx

@@ -1,14 +1,4 @@
 import * as d3 from 'd3';
-
-let text = [{
-  t: 'reverseproxy',
-}, {
-  t: 'books',
-}, {
-  t: 'orders',
-}, {
-  t: 'customers'
-}]
 class RouteTrace {
   containerEl;
   props;
@@ -27,7 +17,6 @@ class RouteTrace {
     this.updateDatapoints();
   }
 
-
   updateDatapoints = () => {
     const { svg, props: { data, width, height } } = this;
     console.log('data: ', data)
@@ -36,61 +25,59 @@ class RouteTrace {
 
     console.log('1st data point: ', data[0][0])
     console.log('4th data point: ', data[0][3])
-
 
     var simulation = d3.forceSimulation(data[0])
-      .force('link', d3.forceLink())
-      .force('charge', d3.forceManyBody())
+      .force('link', d3.forceLink())
+      .force('charge', d3.forceManyBody())
       .force('center', d3.forceCenter(width / 2, height / 2))
-    
-    const node = svg
-      .selectAll('circle')
+
+    const link = svg.append("g")
+      .attr("class", "links")
+      .selectAll("line")
+      .data(data[1])
+      .enter()
+      .append("line")
+      .style('stroke', 'black')
+
+    const node = svg.append("g")
+      .attr("class", "nodes")
+      .selectAll("g")
       .data(data[0])
       .enter()
-      .append('circle')
+      .append("g")
+
+    const circles = node.append("circle")
+      .attr("r", 20)
+      .attr("fill", '#00eda0')
       .on('mouseover', () => d3.select(this).text(d.id))
-    
-    const circleAttr = node
-      .attr('r', 20)
-      .attr('cx', 200)
-      .attr('cy', 200)
-      .style('fill', '#00eda0')
       .on('mouseup', (d, i, nodes) => this.setActiveDatapoint(d, nodes[i]))
 
-    const text = svg.selectAll('text')
-      .data(data[0]).enter().append('text')
-        
-    const textLabels = text
+    const lables = node.append("text")
+      .text(d => d.id)
       .attr('x', d => d.x)
       .attr('y', d => d.y)
-      .attr('dx', 100)
-      .attr('dy','10em')
-      .text(d => d.id);
 
-    const link = svg
-      .selectAll('line')
-      .data(data[1])
-      .enter()
-      .append('line')
-      .style('stroke', 'black')
+    node.append("title")
+      .text(d => d.id)
 
     simulation
       .nodes(data[0])
       .on('tick', ticked);
 
     simulation.force('link')
-      .links(link);
+      // .links(data[1]); // error: cannot create property vx on books
 
     function ticked() {
       link
         .attr('x1', function(d) { return d.source.x; })
         .attr('y1', function(d) { return d.source.y; })
         .attr('x2', function(d) { return d.target.x; })
         .attr('y2', function(d) { return d.target.y; });
-  
+
       node
-        .attr('cx', function(d) { return d.x; })
-        .attr('cy', function(d) { return d.y; });
+        .attr("transform", function(d) {
+          return "translate(" + d.x + "," + d.y + ")";
+        })
     }
   }
 

app/components/AddService.jsx

@@ -33,11 +33,10 @@ const AddService = () => {
 
   return (
     <div className="mainContainer">
-      <img src="app/assets/logo2.png" alt="logo" id="addServiceLogo" />
       <h2 className="signUpHeader">
         Enter Your Database Information
       </h2>
-      <form>
+      <form className="inputForm">
         Database Type:
         <select id="dbType" onChange={() => setDbType(document.getElementById('dbType').value)}>
           <option value="SQL">SQL</option>

app/components/DeleteService.jsx

@@ -37,16 +37,16 @@ const DeleteService = (props) => {
 
   /* Iterates over the serviceList to create a button for each service. Each button is pushed into the databaseButtons array as the button is created. Each button has an onclick function that invokes the window confirm function with a warning message (ex:'Are you sure you want to delete this service?') and stores the result of invoking confirm into a constant moveForward. If the moveForward is true, then onDelete function is invoked with the index of where the service is stored within the serviceList*/
   for(let i = 0; i<serviceList.length; i++){
-    databaseButtons.push(<button className="microserviceBtn deleteMicroservice" key ={"delete"+i} onClick={()=>{
+    databaseButtons.push(<button className="deleteMicroservice" key ={"delete"+i} onClick={()=>{
       const moveForward = confirm(`Are you sure you want to delete ${serviceList[i]}? \n If "YES" press the "OK" button, else press the "Cancel" button`);
       if (moveForward){onDelete(i)}
 
     }}>{serviceList[i]}</button>)
   }
   // returns the title of the page with all of the services that can be deleted as buttons 
   return (
-    <div className="mainContainer">
-        <h1 className='overviewTitle'>Press on the Database You Want to Delete</h1>
+    <div className="deleteMainContainer">
+        <h1 className='overviewTitle'>Select Database To Delete</h1>
         <div className="servicesList">{databaseButtons}</div>
     </div>
   );

app/stylesheets/AddService.css

@@ -1,3 +1,5 @@
+@import url('https://fonts.googleapis.com/css2?family=Josefin+Sans&family=Nunito:wght@200&family=Quicksand:wght@300&display=swap');
+
 #addServiceLogo {
   margin-bottom: 0px;
 }
@@ -10,16 +12,39 @@ form {
   font-size: 2vh;
 }
 
+.mainContainer {
+  font-family: 'Nunito', sans-serif;
+  display: grid;
+  justify-content: center;
+  align-items: center;
+  align-self: center;
+}
+
+#addServiceLogo {
+  display: grid;
+  justify-items: center;
+  justify-content: center;
+}
+
+.inputForm {
+  color: black;
+}
+
+.dbType {
+  color: black;
+}
+
 .userInput {
   width: 70%;
-  border: 2px solid rgb(255, 206, 9);
+  border: 2px solid rgb(0, 0, 0);
   border-radius: 45px;
   box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
   text-align: center;
   height: 50%;
   font-size: 2vh;
   padding-left: 0.25%;
   margin: 15px auto 30px auto;
+  font-family: 'Nunito', sans-serif;
 }
 
 ::placeholder {
@@ -34,17 +59,18 @@ form {
   height: 40px;
   color: white;
   font-size: 2vh;
-  border: 1px solid rgb(255, 206, 9);
-  background-color: #333;
+  border: 1px solid rgb(0, 0, 0);
+  background-color: black;
   transition: 0.25s;
+  border-radius: 10px
 }
 
 .submitBtn:hover {
-  font-weight: 700;
+  font-size: 2vh;
   cursor: pointer;
   border-radius: 10px;
-  color: #333;
-  background-color: rgb(255, 206, 9);
+  color: white;
+  background-color: #494FEE;
 }
 
 .signUpHeader {
@@ -61,7 +87,7 @@ select {
   font-size: 1.75vh;
   font-weight: 400;
   /* background-color: rgb(196, 196, 196); */
-  border: 2px solid rgb(255, 206, 9);
+  border: 2px solid black;
   margin-top: 1%;
   margin-bottom: 2.5%;
 }

app/stylesheets/DeleteServices.css

@@ -1,5 +1,46 @@
-.deleteMicroservice{
+.deleteMicroservice {
   padding: 10px;
   margin: 10px;
-  
+}
+
+.overviewTitle {
+  font-weight: 300;
+  font-size: 5.5vh;
+}
+
+.deleteMainContainer {
+  display: grid;
+  justify-content: center;
+  align-items: center;
+  align-self: center;
+  font-family: 'Nunito', sans-serif;
+  width: 100%;
+}
+
+.servicesList {
+  display: flex;
+  justify-content: center;
+  align-self: flex-start;
+  width: 100%;
+}
+
+.deleteMicroservice {
+  margin-top: 6%;
+  margin-bottom: 10%;
+  width: 50%;
+  height: 40px;
+  color: white;
+  font-size: 2vh;
+  border: 1px solid rgb(0, 0, 0);
+  background-color: black;
+  transition: 0.25s;
+  border-radius: 10px
+}
+
+.deleteMicroservice:hover {
+  font-size: 2vh;
+  cursor: pointer;
+  border-radius: 10px;
+  color: white;
+  background-color: #494FEE;
 }