Merge pull request #14 from DSCKGEC/main

v2.0 - new leaderboard and theme

Author: singhayushh

api/controller.go

@@ -4,6 +4,124 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
+type Repo struct {
+	Name        string   `json:"name,omitempty"`
+	Url         string   `json:"url,omitempty"`
+	Description string   `json:"description,omitempty"`
+	Tags        []string `json:"tags,omitempty"`
+}
+
+var projects = []Repo{
+	{
+		Name:        "Parkify",
+		Url:         "​​https://github.com/DSCKGEC/parkify",
+		Description: "Hassle-free way to book your parking space with easy cancellations and timeline extensions",
+		Tags:        []string{},
+	},
+	{
+		Name:        "Libraryly",
+		Url:         "​​https://github.com/DSCKGEC/Libraryly",
+		Description: "A software solution to handle the primary functions of a library like managing books, members and issues",
+		Tags:        []string{},
+	},
+	{
+		Name:        "Seat&Eat",
+		Url:         "​​https://github.com/DSCKGEC/SeatAndEat",
+		Description: "This is a beautifully designed commercial website template for a restaurant. This project is a beginner-friendly project. It is a static website and mostly based on the front end.",
+		Tags:        []string{},
+	},
+	{
+		Name:        "DevBook",
+		Url:         "​​https://github.com/DSCKGEC/DevBook",
+		Description: "DevBook is a social development environment for front-end designers and developers. A project editor that supports HTML, CSS, and JavaScript, where you can show off your work, build test cases to learn and debug and find inspiration",
+		Tags:        []string{},
+	},
+	{
+		Name:        "Leucos",
+		Url:         "​​https://github.com/DSCKGEC/Leucos",
+		Description: "Real-time chatting application within private rooms, from anywhere in the world",
+		Tags:        []string{},
+	},
+	{
+		Name:        "Taskify",
+		Url:         "​​https://github.com/DSCKGEC/Taskify",
+		Description: "It is a task management system for everyone. It is designed to help you manage your tasks and projects from ideation to delivery. This task manager helps to bring in only the necessary parts – without all the annoying clutter.",
+		Tags:        []string{},
+	},
+	{
+		Name:        "Codeaon",
+		Url:         "​​https://github.com/DSCKGEC/Codeaon",
+		Description: "A one-stop website for all developers and coders. This platform helps us to get all YouTube tutorials, blogs and articles for a certain topic in one place. This project proves to be a very handy and effective yet resourceful tool for learners.",
+		Tags:        []string{},
+	},
+	{
+		Name:        "C-Coins",
+		Url:         "​​https://github.com/DSCKGEC/C-Coins",
+		Description: "Defining the basic behaviour of Blockchains and Web-2.0 imitation",
+		Tags:        []string{},
+	},
+	{
+		Name:        "kitkat.virus",
+		Url:         "​​https://github.com/DSCKGEC/kitkat.virus",
+		Description: "A simple python based keylogger",
+		Tags:        []string{},
+	},
+	{
+		Name:        "CSGO-Professional",
+		Url:         "​​https://github.com/DSCKGEC/CSGO-Professional",
+		Description: "Scraping, Cleaning and Exploring a Dataset about CSGO Athletes from hltv.org",
+		Tags:        []string{},
+	},
+	{
+		Name:        "Learn-Machine-Learn",
+		Url:         "​​https://github.com/DSCKGEC/Learn-Machine-Learn",
+		Description: "A machine learning repository to demonstrate regression and classification problems",
+		Tags:        []string{},
+	},
+	{
+		Name:        "Text Recognition",
+		Url:         "​​https://github.com/DSCKGEC/OCR-TextRecognition",
+		Description: "Recognizes text from any image and prints them",
+		Tags:        []string{},
+	},
+	{
+		Name:        "Movie Recommendation",
+		Url:         "​​https://github.com/DSCKGEC/MovieRecommendationSystem",
+		Description: "A Movie Recommendation System along with Data Analysis and Data Visualization and Revenue Prediction Model",
+		Tags:        []string{},
+	},
+	{
+		Name:        "NASA Collision Detection",
+		Url:         "​​https://github.com/DSCKGEC/NASA_nearest_earth_object_classifier",
+		Description: "Classifying hazardous asteroids based on NASA Dataset.",
+		Tags:        []string{},
+	},
+	{
+		Name:        "Resumie",
+		Url:         "​​https://github.com/DSCKGEC/Resumie",
+		Description: "Resumie is an android CV & Portfolio app. Now carry your resume with you wherever you go!",
+		Tags:        []string{},
+	},
+	{
+		Name:        "Health Tracker App",
+		Url:         "​https://github.com/DSCKGEC/Health-Tracker-App",
+		Description: "Health Tracker is your one stop solution to keep your heath related information in a secured way",
+		Tags:        []string{},
+	},
+	{
+		Name:        "Samsung Gallery",
+		Url:         "​​https://github.com/DSCKGEC/samsung-gallery-clone",
+		Description: "Clone of Samsung's Default Gallery",
+		Tags:        []string{},
+	},
+	{
+		Name:        "Wallpaper App",
+		Url:         "​​https://github.com/DSCKGEC/flutter-wallx-wallpaperApp",
+		Description: "",
+		Tags:        []string{},
+	},
+}
+
 // RenderHome ...
 func (g *GitHubAPI) RenderHome(c *gin.Context) {
 	c.HTML(200, "index.html", gin.H{
@@ -21,9 +139,18 @@ func (g *GitHubAPI) RenderDashboard(c *gin.Context) {
 	})
 }
 
+// RenderLeaderboard ...
+func (g *GitHubAPI) RenderLeaderboard(c *gin.Context) {
+	c.HTML(200, "leaderboard.html", gin.H{
+		"title":  "Leaderboard | KGEC Summer of Code 2021",
+		"issues": g.issues,
+		"pulls":  g.pulls,
+	})
+}
+
 func (g *GitHubAPI) GetData(c *gin.Context) {
 	c.JSON(200, gin.H{
-		"pulls": g.pulls,
+		"pulls":  g.pulls,
 		"issues": g.issues,
 	})
 }
@@ -42,9 +169,11 @@ func (g *GitHubAPI) Refresh(c *gin.Context) {
 
 // RenderProject ...
 func (g *GitHubAPI) RenderProject(c *gin.Context) {
+
 	c.HTML(200, "projects.html", gin.H{
-		"title": "Projects",
-		"button": "View Dashboard",
+		"title":  "Projects",
+		"button": "View Leaderboard",
+		"repos":  projects,
 	})
 }
 

api/github.go

@@ -4,16 +4,17 @@ import (
 	"context"
 	"log"
 	"os"
+	"sort"
 	"time"
 
 	"github.com/andanhm/go-prettytime"
 	"github.com/google/go-github/github"
 	"golang.org/x/oauth2"
 )
 
-var repos [15]string = [15]string{"space-missions", "computer-vision-into-reality", "multipurpose-chatbot", "heart-saver", "hello-ml", "passman", "androlearn", "resumie", "cleanurge-mcu", "cleanurge-backend", "libraryly", "sac-kgec-web", "dsck-website", "cleanurge-app", "kgec-summer-of-code"}
+var repos [19]string = [19]string{"parkify", "Libraryly", "SeatAndEat", "codepen-clone", "Leucos", "Taskify", "Codeaon", "C-Coin", "kitkat.v1rus", "CS-GO-Professionals", "learn-machine-learn", "OCR-TextRecognition", "MovieRecommendationSystem", "NASA_nearest_earth_object_classifier", "Resumie", "Ksoc22-Health-Tracker-App", "samsung-gallery-clone", "flutter-wallx-wallpaperApp", "kgec-summer-of-code"}
 
-var startOfTime time.Time = time.Date(2021, time.Month(4), 10, 0, 0, 0, 0, time.UTC)
+var startOfTime time.Time = time.Date(2022, time.Month(7), 10, 0, 0, 0, 0, time.UTC)
 
 const (
 	layout = "2006-01-02T15:04:05Z"
@@ -41,16 +42,25 @@ type Pull struct {
 	Title      string `json:"title,omitempty"`
 	URL        string `json:"url,omitempty"`
 	Repository string `json:"repository,omitempty"`
-	Labels		[]*github.Label `json:"label"`
 }
 
 // User struct
 type User struct {
-	Login   string `json:"name,omitempty"`
-	HTMLURL string `json:"url,omitempty"`
-	Pulls   []Pull `json:"user,omitempty"`
+	Login     string `json:"username,omitempty"`
+	Name      string `json:"name,omitempty"`
+	AvatarURL string `json:"avatar_url,omitempty"`
+	HTMLURL   string `json:"url,omitempty"`
+	Pulls     []Pull `json:"pulls,omitempty"`
+	Points    uint64 `json:"points"`
 }
 
+// PointsSorter sorts users by points
+type PointsSorter []User
+
+func (a PointsSorter) Len() int           { return len(a) }
+func (a PointsSorter) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
+func (a PointsSorter) Less(i, j int) bool { return a[i].Points > a[j].Points }
+
 // Init ...
 func (g *GitHubAPI) Init() {
 	g.ctx = context.Background()
@@ -92,33 +102,73 @@ func (g *GitHubAPI) FetchIssueStats() {
 
 // FetchPullStats ...
 func (g *GitHubAPI) FetchPullStats() {
-	for index, repo := range repos {
-		index = index + 1
+	for _, repo := range repos {
 		pulls, _, err := g.client.PullRequests.List(g.ctx, "dsckgec", repo, &github.PullRequestListOptions{State: "all"})
 		if err != nil {
 			continue
 		}
 
 		for _, pull := range pulls {
-			newPull := Pull{*pull.Title, *pull.HTMLURL, repo, pull.Labels}
+			if (*pull.CreatedAt).Before(startOfTime) || pull.MergedAt == nil {
+				continue
+			}
+			newPull := Pull{*pull.Title, *pull.HTMLURL, repo}
 			flag := 0
 			for i := 0; i < len(g.pulls); i++ {
 				user := &g.pulls[i]
 				if user.Login == *pull.User.Login {
 					flag = 1
 					user.addPull(newPull)
+					if len(pull.Labels) > 0 {
+						for j := 0; j < len(pull.Labels); j++ {
+
+							if *pull.Labels[j].Name == "easy" {
+								user.Points += 100
+								break
+							} else if *pull.Labels[j].Name == "medium" {
+								user.Points += 200
+								break
+							} else if *pull.Labels[j].Name == "hard" {
+								user.Points += 300
+								break
+							}
+						}
+					}
 				}
 			}
 			if flag == 0 {
 				newUser := User{}
 				newUser.Login = *pull.User.Login
+				if pull.User.GetName() == "" {
+					newUser.Name = newUser.Login
+				} else {
+					newUser.Name = pull.User.GetName()
+				}
+				newUser.AvatarURL = *pull.User.AvatarURL
 				newUser.HTMLURL = *pull.User.HTMLURL
 				newUser.Pulls = newUser.addPull(newPull)
+				newUser.Points = 0
+				if len(pull.Labels) > 0 {
+					for j := 0; j < len(pull.Labels); j++ {
+
+						if *pull.Labels[j].Name == "easy" {
+							newUser.Points += 100
+							break
+						} else if *pull.Labels[j].Name == "medium" {
+							newUser.Points += 200
+							break
+						} else if *pull.Labels[j].Name == "hard" {
+							newUser.Points += 300
+							break
+						}
+					}
+				}
 				g.pulls = append(g.pulls, newUser)
 			}
 
 		}
 	}
+	sort.Sort(PointsSorter(g.pulls))
 }
 
 func (user *User) addPull(pull Pull) []Pull {

api/routes.go

@@ -7,6 +7,7 @@ func (server *Server) initRoutes() {
 	server.Router.GET("/api", g.GetData)
 	server.Router.GET("/refresh", g.Refresh)
 	server.Router.GET("/dashboard", g.RenderDashboard)
+	server.Router.GET("/leaderboard", g.RenderLeaderboard)
 	server.Router.GET("/projects", g.RenderProject)
 	server.Router.GET("/about", g.RenderAbout)
 }

go.mod

@@ -4,7 +4,7 @@ go 1.15
 
 require (
 	github.com/andanhm/go-prettytime v1.1.0
-	github.com/gin-contrib/cors v1.4.0 // indirect
+	github.com/gin-contrib/cors v1.4.0
 	github.com/gin-gonic/gin v1.8.1
 	github.com/google/go-github v17.0.0+incompatible
 	github.com/google/go-querystring v1.1.0 // indirect

run.sh

@@ -0,0 +1,3 @@
+# Install nodemon globally before running this command 
+
+nodemon --watch './**/*.go' --signal SIGTERM --exec 'go' run main.go