diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..58702a2e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+// .gitignore file
+code/secret.js
\ No newline at end of file
diff --git a/README.md b/README.md
index 1613a3b0..5e4bc118 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,26 @@
# GitHub Tracker
-Replace this readme with your own information about your project.
-
-Start by briefly describing the assignment in a sentence or two. Keep it short and to the point.
+This week we created a GitHub tracker which uses GitHubs APIs to keep track of our finished projects and a chart to display how many are left.
## The problem
+We worked with fetching APIs and retrieving specific info from them:
+- A list of all repos that are forked from Technigo
+- username and profile picture
+- Most recent update (push) for each repo
+- Name of default branch for each repo
+- URL to the actual GitHub repo
+- Number of commits for each repo
+- It should be responsive (mobile first)
+- A chart of how many projects that are done so far, compared to how many you will do using Chart.js
-Describe how you approached to problem, and what tools and techniques you used to solve it. How did you plan? What technologies did you use? If you had more time, what would be next?
+This was accomplished by fetching and filtering the APIs with filter, startsWith, forEach, and find-methods and then using template literals ${} to displaying this on out webpage.
-## View it live
+The issue of 60 fetches/hour being the limit was solved by using a token from GitHub in a secret js-file and gitignore-file.
-Every project should be deployed somewhere. Be sure to include the link to the deployed project so that the viewer can click around and see what it's all about.
+It was challenging to target the specific info in the APIs and find the right filtering method and parameters to use.
+If I had more time I would like to find a way to put the third API at the top calling it with a const name instead which did not work.
+I would also like to fetch pullrequest and commit stats from the projects that were in teams instead of default messages.
+And connect the chart to the pullrequests length instead of the forked projects length.
+
+## View it live
+https://github-tracker-lo.netlify.app/
diff --git a/code/chart.js b/code/chart.js
index 92e85a30..c51ccc06 100644
--- a/code/chart.js
+++ b/code/chart.js
@@ -1,4 +1,34 @@
-//DOM-selector for the canvas 👇
+//DOM-selector for the canvas
const ctx = document.getElementById('chart').getContext('2d')
-//"Draw" the chart here 👇
+// the function that draws the chart of finished/remaining projects.
+//It gets the value from line 60 in script.js where doughnuCounter and technigoRepos.length
+// is passing the filtered repos length to the chart here
+
+const doughnutCounter = (projects) => {
+ const labels = [
+ 'Finished projects',
+ 'Remaining projects',
+ ];
+
+ const data = {
+ labels: labels,
+ datasets: [{
+ //here is the calculation for remaining projects
+ data: [projects, 19-projects],
+ label: 'My finished projects',
+ backgroundColor: ['rgb(217, 96, 152)', 'rgb(50, 82, 136)'],
+ borderColor: 'rgb(38, 0, 27)',
+ }]
+ };
+
+ const config = {
+ type: 'doughnut',
+ data: data,
+ options: {}
+ };
+
+
+ const myChart = new Chart(document.getElementById('chart'),config);
+ }
+
\ No newline at end of file
diff --git a/code/index.html b/code/index.html
index 2fb5e0ae..d4ad3987 100644
--- a/code/index.html
+++ b/code/index.html
@@ -6,15 +6,28 @@
Project GitHub Tracker
+
+
+
+
+
+
+
+
-
GitHub Tracker
-
Projects:
-
+
+
+
-
+
+
+
+
+
+
diff --git a/code/script.js b/code/script.js
index e69de29b..753b029e 100644
--- a/code/script.js
+++ b/code/script.js
@@ -0,0 +1,117 @@
+const username = 'Kras053'
+const USER_URL =`https://api.github.com/users/${username}`
+const REPOS_URL =`https://api.github.com/users/${username}/repos`
+const repoContainer = document.querySelector('.repo-container')
+const userContainer = document.querySelector('.user-container')
+
+//The secret token from GitHub, we type the options const in the fetch to use it and not get 404 error
+const options = {
+ method: 'GET',
+ headers: {
+ Authorization: `token ${GITHUBTOKEN}`
+ }
+ }
+
+// my user info from GitHub wrapped in a clickable link to my GitHub page
+const userProfile = () => {
+ fetch(USER_URL, options)
+ .then((res) => res.json())
+ .then((data) => {
+ userContainer.innerHTML += `
+
+
+ Github tracker for ${data.login}
+
+ `;
+ });
+};
+
+userProfile();
+
+//my repos in GitHub filtered on those that are forks from Technigo and our weekly projects
+const myRepos = () => {
+
+ fetch(REPOS_URL, options)
+ .then((response) => response.json())
+ .then((data) => {
+ // console.log(data)
+
+ const forkedRepos = data.filter(repo => repo.fork)
+ const technigoRepos = data.filter(repo => repo.name.startsWith('project'))
+ // console.log(forkedRepos)
+ // console.log(technigoRepos)
+
+ // this function gets info from the filtered repos arrays and displays them on my page
+ // using repo.name as dynamic ID to also insert commits
+
+ technigoRepos.forEach((repo) => {
+ repoContainer.innerHTML += `
+
Most recent push: ${new Date(repo.pushed_at).toDateString()}
+
+ `
+ })
+
+ //need to invoke this next function here already, passing along the filtered repos
+ //as an argument when calling the pull request function
+ getPullRequests(technigoRepos)
+
+ //Passing the filtered repos length to the chart in the file chart.js
+ doughnutCounter(technigoRepos.length)
+
+})
+}
+myRepos()
+
+const getPullRequests = (technigoRepos) => {
+ //this fetches all my pull requests for each filtered project.
+ //because of the repo.name it did not work to use a const for it instead and placing it at the top.
+
+ technigoRepos.forEach(repo => {
+ fetch(`https://api.github.com/repos/technigo/${repo.name}/pulls?per_page=100`, options)
+ .then(res => res.json())
+ .then(data => {
+ // console.log(data)
+
+ //this finds the pull requests, PRs, I made by comparing the user.login from the pull API
+ // with the owner.login in the filtered repo API
+
+ const myPullRequests = data.find((pull) => pull.user.login === repo.owner.login)
+ // console.log(myPullRequests)
+ //console.log(myPullRequests.html_url)
+
+
+ // here the PR link is printed or if no link a default message since in console it would say undefined.
+ if (myPullRequests) {
+ document.getElementById(`${repo.name}`).innerHTML +=
+ ` Pull request`
+ } else {
+ document.getElementById(`${repo.name}`).innerHTML +=
+ `
Pull request made by teammate
`
+ }
+
+ //here is a first step to get the commits for each PR, and we add the dynamic id to pass on
+ // or default message that teammate did the commits
+ if (myPullRequests) {
+ getCommits(myPullRequests.commits_url, repo.name)
+
+ } else {
+ document.getElementById(`${repo.name}`).innerHTML +=
+ `
Commits made by teammate
`
+ }
+ })
+
+// To get the commits from a PR we get the URL from the commits_url property in the PR json object
+// and then do a fetch with that url.
+const getCommits = (URL, repoName) => {
+ fetch (URL, options)
+ .then((res) => res.json())
+ .then(data => {
+ document.getElementById(`${repo.name}`).innerHTML += `