Merge branch 'master' into 'master'

getContribution



See merge request !10

@@ -24,6 +24,7 @@
     "mongoose": "^5.12.9",
     "mongoose": "^5.12.9",
     "morgan": "^1.10.0",
     "morgan": "^1.10.0",
     "multer": "^1.4.2",
     "multer": "^1.4.2",
+    "node-fetch": "^2.6.1",
     "nodemon": "^2.0.7",
     "nodemon": "^2.0.7",
     "passport": "^0.4.1",
     "passport": "^0.4.1",
     "passport-github2": "^0.1.12",
     "passport-github2": "^0.1.12",

 import axios from "axios";
 import axios from "axios";
 import passport from "passport";
 import passport from "passport";
 import User from "../models/User";
 import User from "../models/User";
+import fetch from "node-fetch";
 
 
 const getQuote = async (req, res) => {
 const getQuote = async (req, res) => {
   const url = "http://quotes.stormconsultancy.co.uk/random.json";
   const url = "http://quotes.stormconsultancy.co.uk/random.json";
@@ -74,11 +75,18 @@ export const getUserDetail = async (req, res) => {
     const id = req.params.id;
     const id = req.params.id;
     const quote = await getQuote();
     const quote = await getQuote();
     const user = await User.findById(id);
     const user = await User.findById(id);
+    const repo = await getRepos();
+    const totalCon = await getContributions();
     res.render("userDetail", {
     res.render("userDetail", {
       pagetTitle: "User Detail",
       pagetTitle: "User Detail",
       quote: quote.quote,
       quote: quote.quote,
       author: quote.author,
       author: quote.author,
       user,
       user,
+      fitstRepoName: repo.fitstRepoName,
+      firstRepoUrl: repo.firstRepoUrl,
+      secondRepoName: repo.secondRepoName,
+      secondRepoUrl: repo.secondRepoUrl,
+      totalContributions: totalCon,
     });
     });
   } catch(error){
   } catch(error){
     console.log(error);
     console.log(error);
@@ -194,3 +202,36 @@ export const logout = (req, res) => {
   req.logout();
   req.logout();
   res.redirect("/");
   res.redirect("/");
 };
 };
+
+const getRepos = async(req,res) =>{
+  const url = "https://api.github.com/users/lsj8706/repos?sort=updated&per_page=2";
+  const latelyRepos = await axios.get(url).then(function(response){
+      return response.data;
+  });
+  const fitstRepoName = latelyRepos[0].name;
+  const secondRepoName = latelyRepos[1].name;
+  const firstRepoUrl = latelyRepos[0].html_url;
+  const secondRepoUrl = latelyRepos[1].html_url;
+
+  return {
+    fitstRepoName,
+    firstRepoUrl,
+    secondRepoName,
+    secondRepoUrl,
+  };
+};
+
+const getContributions = async(req, res) =>{
+  const token = process.env.GH_SECRET_SH;
+  const username = 'lsj8706'
+  const headers = {
+      'Authorization': `bearer ${token}`,
+  };
+  const body = {
+    "query": `query {user(login: "${username}") {contributionsCollection {contributionCalendar {totalContributions}}}}`
+  };
+  const response = await fetch('https://api.github.com/graphql', { method: "POST", body: JSON.stringify(body), headers: headers });
+  const totalContributions = await response.json();
+  const total = totalContributions.data.user.contributionsCollection.contributionCalendar.totalContributions;
+  return total;
+};
\ No newline at end of file

@@ -37,6 +37,9 @@ block content
     hr
     hr
     .user-status
     .user-status
         .user-status__contributions
         .user-status__contributions
+            img(src="http://ghchart.rshah.org/lsj8706" alt="Name Your Github chart")
+            a(href=Url0, style={color:'grey'})
+               p=totalContributions
             img(src=`http://ghchart.rshah.org/${user.githubName}` alt="Name Your Github chart")
             img(src=`http://ghchart.rshah.org/${user.githubName}` alt="Name Your Github chart")
         .user-status__character
         .user-status__character
             h3 Your step | commit numbers 
             h3 Your step | commit numbers 
@@ -44,6 +47,9 @@ block content
     .user-repositories
     .user-repositories
         .user-repo
         .user-repo
             h3 REPO 1
             h3 REPO 1
-            
-
-            
\ No newline at end of file
+            a(href=Url0, style={color:'grey'})
+               p=fitstRepoName+": "+firstRepoUrl
+            br
+            h3 REPO 2
+            a(href=Url0, style={color:'grey'})
+               p=secondRepoName+": "+secondRepoUrl