Merge branch 'master' of github.com:jrtechs/github-graphs

Bryce Murphy · Bryce Murphy · commit af2e11397b9f · 2019-02-17T08:58:20.000-05:00
diff --git a/public/GraphGenerator.html b/public/GraphGenerator.html
@@ -121,7 +121,26 @@ <h1 class="m-title">Interactive Organization Chart</h1>
 </body>
 </html>
 <script>
-    function fetchUserInput() {
+    $('#txtOrgname').keydown(function(event)
+    {
+        if(event.keyCode == 13)
+        {
+            event.preventDefault();
+            toOrgRepos();
+        }
+    });
+
+    $('#txtUsername').keydown(function(event)
+    {
+        if(event.keyCode == 13)
+        {
+            event.preventDefault();
+            toFriends();
+        }
+    });
+
+    function fetchUserInput()
+    {
         const inputedName = $("#txtUsername").val();
 
         if(inputedName === "")
diff --git a/public/OrgRepoGraph.html b/public/OrgRepoGraph.html
@@ -100,7 +100,8 @@
                 createOrgInfo(orgname, 'organizationInfo')
             }
         
-            if(findGetParameter("name") !== null) {
+            if(findGetParameter("name") !== null)
+            {
                 createGraphs(findGetParameter("name"))
             }
             
diff --git a/public/js/createOrgInfo.js b/public/js/createOrgInfo.js
@@ -13,8 +13,13 @@ function createOrgInfo(orgName, container) {
         </div>"
 
         $("#" + container).html(html);
-        $('#dataTable').DataTable();   
+
+        setTimeout(function() {
+            $('#dataTable').DataTable();
+        }, 1500);
+
     }, function(error) {
-        console.log("Unable to load table data");
+        alert("Organization Does Not Exist");
+        window.location.href = "./GraphGenerator.html";
     });
 }
diff --git a/public/js/createOrgRepoGraph.js b/public/js/createOrgRepoGraph.js
@@ -52,7 +52,6 @@ function alreadyInGraph(userID)
  */
 function edgeInGraph(id1, id2)
 {
-    console.log("edge check");
     for(var i = 0;i < edges.length; i++)
     {
         if(edges[i].from === id1 && edges[i].to === id2)
diff --git a/public/js/createOrgTable.js b/public/js/createOrgTable.js
@@ -52,7 +52,10 @@ function createOrgTable(orgName, tableContainer)
         }
 
         $("#" + tableContainer).html(html);
-        $('#dataTable').DataTable();
+
+        $(document).ready(function() {
+            $('#dataTable').DataTable();
+        } );
     }).catch(function(error)
     {
         //console.log("Unable to create table");
diff --git a/public/js/profileGen.js b/public/js/profileGen.js
@@ -65,7 +65,8 @@ function profileGen(username, container)
             $("#"+container).html(html);
         })
     }, () => {
-        console.error("error getting user info");
+        alert("User Does Not Exist");
+        window.location.href = "./GraphGenerator.html";
     });
 }
 
diff --git a/public/js/profileTimeLine.js b/public/js/profileTimeLine.js
@@ -74,18 +74,21 @@ function timeLineClickEvent(properties)
             "                <div class=\"col-md-6\"><b>Liscense</b></div>\n" +
             "                <div class=\"col-md-6\">" +
             item.license.name +
-            "</div>\n" +
-            "            </li>\n" +
-            "            <li class=\"row\">\n" +
-            "                <div class=\"col-md-6\"><b>Home Page</b></div>\n" +
-            "                <div class=\"col-md-6\">" +
-            "<a href='" + item.homepage + "'>" +item.homepage + "</a>" +
-            "</div>\n" +
-            "            </li>\n" +
-            "        </ul>\n" +
-            "    </div>";
+            "</div></li>";
+            if(item.homepage !== null)
+            {
+                html +=
+                "            <li class=\"row\">\n" +
+                "                <div class=\"col-md-6\"><b>Home Page</b></div>\n" +
+                "                <div class=\"col-md-6\">" +
+                "<a href='" + item.homepage + "'>" +item.homepage + "</a>" +
+                "</div>\n" +
+                "            </li>\n" +
+                "        </ul>\n";
+            }
+
 
-        html += "<div class=\"col-6\">\n" +
+        html += "</div><div class=\"col-6\">\n" +
             "        <ul class=\"list-group\">\n" +
             "            <li class=\"row\">\n" +
             "                <div class=\"col-md-6\"><b>Repository URL</b></div>\n" +

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,8 @@`
`100`	`100`	`createOrgInfo(orgname, 'organizationInfo')`
`101`	`101`	`}`
`102`	`102`
`103`		`- if(findGetParameter("name") !== null) {`
	`103`	`+ if(findGetParameter("name") !== null)`
	`104`	`+ {`
`104`	`105`	`createGraphs(findGetParameter("name"))`
`105`	`106`	`}`
`106`	`107`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ function alreadyInGraph(userID)`
`52`	`52`	`*/`
`53`	`53`	`function edgeInGraph(id1, id2)`
`54`	`54`	`{`
`55`		`- console.log("edge check");`
`56`	`55`	`for(var i = 0;i < edges.length; i++)`
`57`	`56`	`{`
`58`	`57`	`if(edges[i].from === id1 && edges[i].to === id2)`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,10 @@ function createOrgTable(orgName, tableContainer)`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`$("#" + tableContainer).html(html);`
`55`		`- $('#dataTable').DataTable();`
	`55`	`+`
	`56`	`+ $(document).ready(function() {`
	`57`	`+ $('#dataTable').DataTable();`
	`58`	`+ } );`
`56`	`59`	`}).catch(function(error)`
`57`	`60`	`{`
`58`	`61`	`//console.log("Unable to create table");`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,8 @@ function profileGen(username, container)`
`65`	`65`	`$("#"+container).html(html);`
`66`	`66`	`})`
`67`	`67`	`}, () => {`
`68`		`- console.error("error getting user info");`
	`68`	`+ alert("User Does Not Exist");`
	`69`	`+ window.location.href = "./GraphGenerator.html";`
`69`	`70`	`});`
`70`	`71`	`}`
`71`	`72`