Added struct for representing Github API response

metamemelord · Mar 13, 2024 · c11945c · c11945c
1 parent 22f19b3
commit c11945c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/model/repository.go b/model/repository.go
@@ -0,0 +1,10 @@
+package model
+
+type Repository struct {
+	Name        string `json:"name"`
+	Description string `json:"description"`
+	Language    string `json:"language"`
+	PushedAt    string `json:"pushed_at"`
+	HtmlUrl     string `json:"html_url"`
+	Fork        bool   `json:"fork"`
+}
diff --git a/pkg/worker/worker.go b/pkg/worker/worker.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"log"
 	"net/http"
+	"sort"
 	"sync"
 
 	"github.com/metamemelord/portfolio-website/model"
@@ -12,7 +13,7 @@ import (
 var githubWPMutex sync.Mutex
 
 type Data struct {
-	GithubData    []interface{}
+	GithubData    []*model.Repository
 	WordpressData []*model.Post
 }
 
@@ -35,12 +36,15 @@ func githubPackageRefresher() {
 		return
 	}
 	defer resp.Body.Close()
-	githubResponse := []interface{}{}
+	githubResponse := []*model.Repository{}
 	err = json.NewDecoder(resp.Body).Decode(&githubResponse)
 	if err != nil {
 		log.Println("Error while unmarshalling Github response", err)
 		return
 	}
+	sort.Slice(githubResponse, func(i, j int) bool {
+		return githubResponse[i].PushedAt > githubResponse[j].PushedAt
+	})
 	githubWPMutex.Lock()
 	data.GithubData = githubResponse
 	githubWPMutex.Unlock()

diff --git a/src/components/Home components/Github/ProjectCard.vue b/src/components/Home components/Github/ProjectCard.vue
@@ -5,7 +5,7 @@
     <div class="github__card-technology-label">
       <span>{{cardData.language}}</span>
     </div>
-    <span>{{cardData.updated_at|getLastUpdateTime}}</span>
+    <span>{{cardData.pushed_at|getLastUpdateTime}}</span>
     <a :href="cardData.html_url" target="_blank" rel="noopener noreferrer">
       <button>Checkout</button>
     </a>

diff --git a/src/components/Home components/Github/index.vue b/src/components/Home components/Github/index.vue
@@ -62,15 +62,7 @@ export default {
   },
   computed: {
     ownedRepos() {
-      let ownedRepos = this.repos.filter(repo => !repo.fork);
-      ownedRepos.sort((repo1, repo2) => {
-        let key1 = moment().diff(repo1.updated_at);
-        let key2 = moment().diff(repo2.updated_at);
-        if (key1 > key2) return 1;
-        if (key1 < key2) return -1;
-        return 0;
-      });
-      return ownedRepos;
+      return this.repos.filter(repo => !repo.fork);
     },
     forkedRepos() {
       return this.repos.filter(repo => repo.fork);