Resolve #7.

main.go

@@ -3,10 +3,13 @@ package main
 import (
 	"crypto/md5"
 	"encoding/hex"
+	"encoding/json"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/codegangsta/negroni"
@@ -26,6 +29,8 @@ import (
 	_ "github.com/jinzhu/gorm/dialects/mysql"
 )
 
+// TODO: Refactor entire project to be structured after business domains
+
 func readConfig() *models.Config {
 	if err := godotenv.Load(); err != nil {
 		log.Fatal(err)
@@ -64,6 +69,27 @@ func readConfig() *models.Config {
 		customLangs[k.Name()] = k.MustString("unknown")
 	}
 
+	// Read language colors
+	// Source: https://raw.githubusercontent.com/ozh/github-colors/master/colors.json
+	var colors = make(map[string]string)
+	var rawColors map[string]struct {
+		Color string `json:"color"`
+		Url   string `json:"url"`
+	}
+
+	data, err := ioutil.ReadFile("data/colors.json")
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	if err := json.Unmarshal(data, &rawColors); err != nil {
+		log.Fatal(err)
+	}
+
+	for k, v := range rawColors {
+		colors[strings.ToLower(k)] = v.Color
+	}
+
 	return &models.Config{
 		Env:             env,
 		Port:            port,
@@ -77,6 +103,7 @@ func readConfig() *models.Config {
 		DbMaxConn:       dbMaxConn,
 		CleanUp:         cleanUp,
 		CustomLanguages: customLangs,
+		LanguageColors:  colors,
 	}
 }
 
@@ -147,8 +174,8 @@ func main() {
 	mainRouter.Path("/").Methods(http.MethodGet).HandlerFunc(summaryHandler.Index)
 
 	// API Routes
-	apiRouter.Path("/heartbeat").Methods(http.MethodPost).HandlerFunc(heartbeatHandler.Post)
-	apiRouter.Path("/summary").Methods(http.MethodGet).HandlerFunc(summaryHandler.Get)
+	apiRouter.Path("/heartbeat").Methods(http.MethodPost).HandlerFunc(heartbeatHandler.ApiPost)
+	apiRouter.Path("/summary").Methods(http.MethodGet).HandlerFunc(summaryHandler.ApiGet)
 
 	// Static Routes
 	router.PathPrefix("/assets").Handler(negroni.Classic().With(negroni.Wrap(http.FileServer(http.Dir("./static")))))

models/config.go

@@ -13,6 +13,7 @@ type Config struct {
 	DbMaxConn       uint
 	CleanUp         bool
 	CustomLanguages map[string]string
+	LanguageColors  map[string]string
 }
 
 func (c *Config) IsDev() bool {

models/summary.go

@@ -35,3 +35,8 @@ type SummaryItemContainer struct {
 	Type  uint8
 	Items []*SummaryItem
 }
+
+type SummaryViewModel struct {
+	*Summary
+	LanguageColors map[string]string
+}

routes/heartbeat.go

@@ -15,7 +15,7 @@ type HeartbeatHandler struct {
 	HeartbeatSrvc *services.HeartbeatService
 }
 
-func (h *HeartbeatHandler) Post(w http.ResponseWriter, r *http.Request) {
+func (h *HeartbeatHandler) ApiPost(w http.ResponseWriter, r *http.Request) {
 	if r.Method != http.MethodPost {
 		w.WriteHeader(http.StatusMethodNotAllowed)
 		return

routes/summary.go

@@ -44,7 +44,7 @@ func (m *SummaryHandler) loadTemplates() {
 	m.indexTemplate = indexTpl
 }
 
-func (h *SummaryHandler) Get(w http.ResponseWriter, r *http.Request) {
+func (h *SummaryHandler) ApiGet(w http.ResponseWriter, r *http.Request) {
 	if r.Method != http.MethodGet {
 		w.WriteHeader(http.StatusMethodNotAllowed)
 		return
@@ -91,7 +91,12 @@ func (h *SummaryHandler) Index(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	h.indexTemplate.Execute(w, summary)
+	vm := models.SummaryViewModel{
+		Summary:        summary,
+		LanguageColors: utils.FilterLanguageColors(h.SummarySrvc.Config.LanguageColors, summary),
+	}
+
+	h.indexTemplate.Execute(w, vm)
 }
 
 func loadUserSummary(r *http.Request, summaryService *services.SummaryService) (*models.Summary, error, int) {

static/assets/app.js

@@ -121,7 +121,7 @@ function draw() {
                 data: wakapiData.languages
                     .slice(0, Math.min(SHOW_TOP_N, wakapiData.languages.length))
                     .map(p => parseInt(p.total)),
-                backgroundColor: wakapiData.languages.map(p => getRandomColor(p.key))
+                backgroundColor: wakapiData.languages.map(p => languageColors[p.key.toLowerCase()] || getRandomColor(p.key))
             }],
             labels: wakapiData.languages
                 .slice(0, Math.min(SHOW_TOP_N, wakapiData.languages.length))

utils/color.go

@@ -0,0 +1,16 @@
+package utils
+
+import (
+	"github.com/n1try/wakapi/models"
+	"strings"
+)
+
+func FilterLanguageColors(all map[string]string, summary *models.Summary) map[string]string {
+	subset := make(map[string]string)
+	for _, item := range summary.Languages {
+		if c, ok := all[strings.ToLower(item.Key)]; ok {
+			subset[strings.ToLower(item.Key)] = c
+		}
+	}
+	return subset
+}

views/index.tpl.html

@@ -64,7 +64,8 @@
 
     <script>
         let wakapiData = {}
-        wakapiData.projects = {{ json .Projects }}
+        let languageColors = {{ .LanguageColors | json }}
+        wakapiData.projects = {{ .Projects | json }}
         wakapiData.operatingSystems = {{ .OperatingSystems | json }}
         wakapiData.editors = {{ .Editors | json }}
         wakapiData.languages = {{ .Languages | json }}