From add177a5de08b2e1bcda977b499c874455567d50 Mon Sep 17 00:00:00 2001 From: CetaceanNation Date: Sat, 16 Feb 2019 21:22:17 -0500 Subject: [PATCH 1/3] Minor edits --- public/index.html | 18 ++++++++++++++---- public/style.css | 9 ++++++++- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/public/index.html b/public/index.html index 0e8271e..903f591 100644 --- a/public/index.html +++ b/public/index.html @@ -37,7 +37,7 @@ -
+
@@ -46,11 +46,21 @@

Head over to the 'Generate graphs' page and enter - the username of a GitHub user. The space on that - page will then populate with the requested GitHub - user and all the related user, visualizing the + the username of a GitHub user. The space on that + page will then populate with the requested GitHub + user and all the related user, visualizing the connections between them.

+

+ If you'd like to see how everything works, follow + the link to GitHub, where you can view all the work + that went into making this functional. +

+

+ If you're interested in knowing more about this + project, additional information can be found on + the About page. +

diff --git a/public/style.css b/public/style.css index f640648..34d156e 100644 --- a/public/style.css +++ b/public/style.css @@ -71,6 +71,7 @@ } .home-content { padding: 20px; + width: 100%; max-height: 40px; } .side-img { @@ -85,7 +86,6 @@ display: block; position: relative; width: 50%; - max-width: 500px; } .text-title { background-color: rgb(208, 208, 208); @@ -109,6 +109,13 @@ body { .side-img { display: none; } + .side-txt { + position: absolute; + top: 10px; + left: 50%; + transform: translate(-50%, 0%); + width: 100%; + } #navigation { position: absolute; top: 50px; From 1ac3434bd72158f8387443b870307006897969cc Mon Sep 17 00:00:00 2001 From: CetaceanNation Date: Sat, 16 Feb 2019 21:23:27 -0500 Subject: [PATCH 2/3] Fixed header bar on graph page. --- public/FriendsGraph.html | 52 +++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/public/FriendsGraph.html b/public/FriendsGraph.html index e1b0db9..8e0927c 100644 --- a/public/FriendsGraph.html +++ b/public/FriendsGraph.html @@ -22,32 +22,34 @@ - +
+ +
From 8741b6b85d1f3586fe564ff7fe144c908f1f43d8 Mon Sep 17 00:00:00 2001 From: jrtechs Date: Sat, 16 Feb 2019 22:02:21 -0500 Subject: [PATCH 3/3] Got the repository time line working and pretty. --- public/TimeLineGraph.html | 14 ++++- public/js/profileTimeLine.js | 111 ++++++++++++++++++++++++++++++++--- 2 files changed, 116 insertions(+), 9 deletions(-) diff --git a/public/TimeLineGraph.html b/public/TimeLineGraph.html index 9c70585..ca3f301 100644 --- a/public/TimeLineGraph.html +++ b/public/TimeLineGraph.html @@ -67,6 +67,14 @@ border-width: 2px; border-color: #0B002B; } + + .containerCustom { + width: 100%; + padding-right: 0px; + padding-left: 0px; + margin-right: 0px; + margin-left: 0px; + } @@ -96,7 +104,7 @@
-
+
-
+ 


+
+            

         

         

             

diff --git a/public/js/profileTimeLine.js b/public/js/profileTimeLine.js
index 477e516..ab48659 100644
--- a/public/js/profileTimeLine.js
+++ b/public/js/profileTimeLine.js
@@ -1,36 +1,132 @@
 var events = [];
 
+var repositoryData;
+
+
+function addEvent(group, date, content)
+{
+    var dateFormat = new Date(date);
+    var dd = new Date(dateFormat.getFullYear(), dateFormat.getMonth(), dateFormat.getDay());
+    events.push({id: events.length, group: group, start: dd, content: content});
+}
+
 //        {id: 0, group: 0, start: new Date(2013,7,1), end: new Date(2017,5,15), content: 'High School'},
 function addRepositories(userName, groupID)
 {
     return new Promise(function(resolve, reject)
     {
-
+        queryAPIByUser(API_REPOSITORIES, userName,
+            function(data)
+            {
+                repositoryData = data;
+                for(var i = 0; i < data.length; i++)
+                {
+                    data[i].id = events.length;
+                    addEvent(groupID, data[i]['created_at'], data[i]['name'])
+                }
+                resolve();
+            },
+            function(error)
+            {
+                console.log(error);
+                reject(error);
+            })
     })
 }
 
 
-function addOrgs(userName, groupID)
+function timeLineClickEvent(properties)
 {
-    return new Promise(function(resolve, reject)
+    if(properties.item !== null && typeof repositoryData[properties.item].name !== 'undefined')
     {
+        var item = repositoryData[properties.item];
 
-    })
-}
+        var html = "
\n" +
+            "  
\n" +
+            item.name +
+            "  
\n" +
+            "  
\n";
+
+        html += "
" + item.description + "
";
+
+        console.log(item.license);
+        if(item.license === null)
+        {
+            item.license = new Object();
+            item.license.name = 'none';
+        }
 
+        html += "
\n" +
+            "        
    \n" +
+            "            
  • \n" +
+            "                
    Fork Count
    \n" +
+            "                
    " +
+            item.forks +
+            "
    \n" +
+            "            
    • \n" +
+            "            
  • \n" +
+            "                
    Languages
    \n" +
+            "                
    " +
+            item.language+
+            "
    \n" +
+            "            
    • \n" +
+            "            
  • \n" +
+            "                
    Liscense
    \n" +
+            "                
    " +
+            item.license.name +
+            "
    \n" +
+            "            
    • \n" +
+            "            
  • \n" +
+            "                
    Home Page
    \n" +
+            "                
    " +
+            "" +item.homepage + "" +
+            "
    \n" +
+            "            
    • \n" +
+            "        
\n" +
+            "    
";
+
+        html += "
\n" +
+            "        
    \n" +
+            "            
  • \n" +
+            "                
    Repository URL
    \n" +
+            "                
    " +
+            "" +item.html_url + "" +
+            "
    \n" +
+            "            
    • \n" +
+            "            
  • \n" +
+            "                
    Open Issues
    \n" +
+            "                
    " +
+            item.open_issues_count +
+            "
    \n" +
+            "            
    • \n" +
+            "            
  • \n" +
+            "                
    Watchers
    \n" +
+            "                
    " +
+            item.watchers +
+            "
    \n" +
+            "            
    • \n" +
+            "        
\n" +
+            "    
";
+
+        html +="  
\n" +
+            "
";
+
+        $("#repositoryInformation").html(html);
+    }
+}
 
 function createProfileTimeLine(username, containerName)
 {
     var container = document.getElementById(containerName);
 
 
-    var prom = [addRepositories(username, 1), addOrgs(username, 1)];
+    var prom = [addRepositories(username, 1)];
 
     var groups = new vis.DataSet([
-        {id: 0, content: 'Organizations', value: 1},
         {id: 1, content: 'Repositories', value: 2}
     ]);
 
+    console.log("up up duper");
     Promise.all(prom).then(function()
     {
         // note that months are zero-based in the JavaScript Date object
@@ -53,5 +149,6 @@ function createProfileTimeLine(username, containerName)
         timeline.setOptions(options);
         timeline.setGroups(groups);
         timeline.setItems(items);
+        timeline.on('click', timeLineClickEvent);
     });
 }
\ No newline at end of file