Merge remote-tracking branch 'origin/master'

public/about.css

@@ -20,6 +20,12 @@
     position: relative;
     padding-top: 20px;
 }
+.card {
+    background-color: rgb(208, 208, 208);
+}
+.card-body {
+    background-color: rgb(242, 242, 242);
+}
 .rounder {
     border-radius: 20px !important;
 }
@@ -29,6 +35,15 @@
     position: relative;
     width: 70%;
 }
+.links {
+    padding: 10px;
+}
+.links a {
+    text-decoration: none;
+}
+.link-ico {
+    width: 40px;
+}
 .plink {
     color: rgb(250, 152, 33);
 }

public/about.html

@@ -18,7 +18,7 @@
         </div>
         <ul id="navigation" class="nav justify-content-end">
             <li class="nav-item">
-                <a href="./GraphTest.html">
+                <a href="./FriendsGraph.html">
                     Generate graphs
                 </a>
             </li>
@@ -51,7 +51,7 @@
             </div>
             <div id="content-body" class="container">
                 <p style="padding: 10px;">
-                    This project was made for participation in <a class="plink" href="https://brickhack.io/">BrickHack V</a>.
+                    This project was completed in 24 hours for participation in <a class="plink" href="https://brickhack.io/">BrickHack V</a> at the Rochester Institute of Technology.
                 </p>
             </div>
             <div id="content-title" style="border-radius: 20px;">
@@ -68,6 +68,23 @@
                             did stuff
                         </p>
                     </div>
+                    <div class="links row text-center">
+                        <div class="col">
+                            <a href="https://github.com/jrtechs">
+                                <img class="link-ico" src="./img/github.png" />
+                            </a>
+                        </div>
+                        <div class="col">
+                            <a href="https://www.linkedin.com/in/jrtechs/">
+                                <img class="link-ico" src="./img/linkedin.png" />
+                            </a>
+                        </div>
+                        <div class="col">
+                            <a href="mailto:jeffery@jrtechs.net">
+                                <img class="link-ico" src="./img/email.png" />
+                            </a>
+                        </div>
+                    </div>
                 </div>
                 <div class="card rounder">
                     <img class="avatar mx-auto d-block" src="https://avatars0.githubusercontent.com/u/32306409?s=400&v=4" />
@@ -79,6 +96,23 @@
                             also did stuff
                         </p>
                     </div>
+                    <div class="links row text-center">
+                        <div class="col">
+                            <a href="https://github.com/theshmurph">
+                                <img class="link-ico" src="./img/github.png" />
+                            </a>
+                        </div>
+                        <div class="col">
+                            <a href="https://www.linkedin.com/in/theshmurph">
+                                <img class="link-ico" src="./img/linkedin.png" />
+                            </a>
+                        </div>
+                        <div class="col">
+                            <a href="mailto:brshmurphy@gmail.com">
+                                <img class="link-ico" src="./img/email.png" />
+                            </a>
+                        </div>
+                    </div>
                 </div>
                 <div class="card rounder">
                     <img class="avatar mx-auto d-block" src="https://avatars3.githubusercontent.com/u/32624140?s=400&v=4" />
@@ -90,6 +124,23 @@
                             kinda did stuff
                         </p>
                     </div>
+                    <div class="links row text-center">
+                        <div class="col">
+                            <a href="https://github.com/CetaceanNation">
+                                <img class="link-ico" src="./img/github.png" />
+                            </a>
+                        </div>
+                        <div class="col">
+                            <a href="mailto:axn5966@rit.edu">
+                                <img class="link-ico" src="./img/linkedin.png" />
+                            </a>
+                        </div>
+                        <div class="col">
+                            <a href="https://github.com/CetaceanNation">
+                                <img class="link-ico" src="./img/email.png" />
+                            </a>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>

public/index.html

@@ -43,7 +43,11 @@
                 </div>
                 <div class="text-content">
                     <p style="position: relative; padding-left: 10px; padding-right: 10px;">
-                        Head over to the 'Generate graphs' page and enter the username of the user you want to generate your graph around.
+                        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 
+                        connections between them.
                     </p>
                 </div>
             </div>

public/js/profileGen.js

@@ -1,27 +1,68 @@
 function profileGen(username, container) {
-    queryAPIByUser("", username, (data) => {
-        console.log(data);
-        html = 
-        "<div> \
-            <img src=\""+data.avatar_url+"\"></img> \
-            <h1>"+data.name+"</h1> \
-            <h2>"+data.login+"</h2> \
-            <p>Followers: "+data.followers+"</p> \
-            <p>Following: "+data.following+"</p> \
-            <p>"+(data.bio != null ? "Bio: "+data.bio : "")+"</p> \
-            <p>"+(data.location != null ? "Location: "+data.location : "")+"</p> \
-            <p>"+(data.email != null ? "Email: "+data.email : "")+"</p> \
-            <p>"+(data.blog != null ? "Site: "+data.blog : "")+"</p> \
-            <p>"+(data.company != null ? "Company: "+data.company : "")+"</p> \
-            <a href=\""+data.html_url+"\">"+data.html_url+"</h2> \
-            <h2></h2> \
-        </div>"
-        $("#"+container).html(html);
+    queryAPIByUser("", username, (user) => {
+        parseOrgs(user.login).then(function(orgsReturn) {
+            let html = 
+            "<div> \
+                <img src=\""+user.avatar_url+"\"></img> \
+                <h1>"+user.name+"</h1> \
+                <h2>"+user.login+"</h2> \
+                <p>Followers: "+user.followers+"</p> \
+                <p>Following: "+user.following+"</p> \
+                <p>"+(user.bio != null ? "Bio: "+user.bio : "")+"</p> \
+                <p>"+(user.location != null ? "Location: "+user.location : "")+"</p> \
+                <p>"+(user.email != null ? "Email: "+user.email : "")+"</p> \
+                <p>"+(user.blog != null ? "Site: "+user.blog : "")+"</p> \
+                <p>"+(user.company != null ? "Company: "+user.company : "")+"</p> \
+                <p>"+(user.organizations_url != null ? "Organizations: "+orgsReturn: "")+"</p> \
+                <a href=\""+user.html_url+"\">"+user.html_url+"</h2> \
+                <h2></h2> \
+            </div>"
+            $("#"+container).html(html);
+        })
     }, () => {
-        console.log("error");
+        console.error("error getting user info");
     });
 }
 
-function parseOrgs(oranization_url) {
-    
+async function parseOrgs(name) {
+    const urlpath = `api/users/${name}/orgs`;
+    let orgs_final = [];
+
+    await queryUrl(urlpath, async (orgs) => {
+        orgs.map(org => {
+            return new Promise(function (res, rej) {
+                url = org.url;
+                queryUrl(url, (orgData) => {
+                    orgs_final.push("<a href=\"" + orgData.html_url + "\"><img src=\"" + orgData.avatar_url + "\"></img></a>");
+                    //console.log(orgs_final);
+                    res();
+                }, () => {
+                    console.error("error getting org info");
+                });
+            });
+        });
+        console.log(orgs);
+        await Promise.all(orgs);
+    }, () => {
+        console.error("error getting orgs");
+    });
+
+    console.log(orgs_final);
+    console.log(orgs_final.length);
+    console.log(orgs_final[0]);
+    return orgs_final.join(" ");
+}
+
+
+
+function queryUrl(url, successCallBack, errorCallBack) {
+    console.log(url);
+    $.ajax({
+        type:'GET',
+        url: url,
+        crossDomain: true,
+        dataType: "json",
+        success: successCallBack,
+        error:errorCallBack
+    });
 }