```

Refactor Makefile and improve code formatting
```

Author: Irae Hueck Costa

Makefile

@@ -18,7 +18,7 @@ tests:
 
 .PHONY: format
 format:
-	find -type f -name \*.go | xargs -L1 go fmt
+	find backend -type f -name \*.go | xargs -L1 go fmt
 	prettier --html-whitespace-sensitivity ignore --write .
 
 .PHONY: logs

backend/endpoints/dump.go

@@ -5,17 +5,17 @@ import (
 	"time"
 
 	"github.com/gomodule/redigo/redis"
-	"github.com/ihucos/counter.dev/utils"
 	"github.com/ihucos/counter.dev/lib"
 	"github.com/ihucos/counter.dev/models"
+	"github.com/ihucos/counter.dev/utils"
 )
 
 type UserDump struct {
-	Id    string            `json:"id"`
-	Token string            `json:"token"`
-	UUID string            `json:"uuid"`
-	IsSubscribed bool `json:"isSubscribed"`
-	Prefs map[string]string `json:"prefs"`
+	Id           string            `json:"id"`
+	Token        string            `json:"token"`
+	UUID         string            `json:"uuid"`
+	IsSubscribed bool              `json:"isSubscribed"`
+	Prefs        map[string]string `json:"prefs"`
 }
 
 type SitesDumpVal struct {
@@ -127,7 +127,7 @@ func init() {
 
 		user.TouchDump()
 
-		archive := make(map[string]lib.QueryArchiveResult) 
+		archive := make(map[string]lib.QueryArchiveResult)
 		now := utils.TimeNow(utcOffset)
 		var err error
 
@@ -148,7 +148,6 @@ func init() {
 		oldestArchiveDate, err := ctx.App.QueryArchiveOldestDate(user.Id)
 		ctx.CatchError(err)
 
-
 		ctx.SendEventSourceData(EventSourceData{
 			Type:    "oldest-archive-date",
 			Payload: oldestArchiveDate})

backend/endpoints/lang.go

@@ -1,4 +1,3 @@
-
 package endpoints
 
 import (

backend/endpoints/recover.go

@@ -22,7 +22,7 @@ func init() {
 			ctx.LogEvent("recovery")
 
 			ctx.NoAutoCleanup()
-			go func(){
+			go func() {
 				defer ctx.Cleanup()
 				err = claimedUser.PasswordRecovery(ctx.App.Config.SMTPSecret)
 				if err != nil {

backend/endpoints/subscribed.go

@@ -1,4 +1,3 @@
-
 package endpoints
 
 import (

backend/endpoints/track.go

@@ -113,7 +113,7 @@ func init() {
 		if country == "" {
 			country = ctx.R.Header.Get("CF-IPCountry")
 		}
-		
+
 		if country != "" && country != "XX" {
 			visit["country"] = strings.ToLower(country)
 		}

backend/lib/app.go

@@ -7,10 +7,10 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"regexp"
 	"runtime"
 	"strings"
 	"time"
-	"regexp"
 
 	"log"
 
@@ -44,7 +44,7 @@ func (ah appAdapter) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	ctx := ah.App.NewContext(w, r)
 	go func() {
 		<-r.Context().Done()
-		if ! ctx.noAutoCleanup {
+		if !ctx.noAutoCleanup {
 			ctx.Cleanup()
 		}
 	}()
@@ -132,7 +132,7 @@ func NewApp() *App {
 			} else {
 				prefix = "./static"
 			}
-		} else if r.Host == "counter.dev"|| r.Host == "counter" || r.Host == "simple-web-analytics.com" {
+		} else if r.Host == "counter.dev" || r.Host == "counter" || r.Host == "simple-web-analytics.com" {
 			prefix = "/state/static/master"
 		} else if r.Host == "www.counter.dev" || r.Host == "www.simple-web-analytics.com" {
 			prefix = "/state/static/master"

backend/lib/archive.go

@@ -86,10 +86,10 @@ func (app *App) archiveHotVisitsPartForce(cursor int) int {
 	app.Logger.Printf(
 		"archiving visits failed, will retry later: %s\n", err)
 	time.Sleep(30 * time.Second)
-	app.Logger.Printf( "archiving visits will retry now")
+	app.Logger.Printf("archiving visits will retry now")
 	cursor, err = app.archiveHotVisitsPart(cursor)
 	if err == nil {
-		app.Logger.Printf( "archiving visits recovered")
+		app.Logger.Printf("archiving visits recovered")
 		return cursor
 	}
 	panic(err)
@@ -213,7 +213,6 @@ func (app *App) QueryArchive(queryArgs QueryArchiveArgs) (QueryArchiveResult, er
 	return visits, nil
 }
 
-
 func (app *App) QueryArchiveOldestDate(userId string) (string, error) {
 	var date string
 	query := app.DB.Model(&Record{}).Select(

backend/lib/config.go

@@ -7,14 +7,14 @@ import (
 )
 
 type Config struct {
-	RedisUrl     string
-	Bind         string
-	CookieSecret []byte
-	PasswordSalt []byte
-	ArchiveDatabase string
-	ArchiveMaxAge time.Duration
+	RedisUrl            string
+	Bind                string
+	CookieSecret        []byte
+	PasswordSalt        []byte
+	ArchiveDatabase     string
+	ArchiveMaxAge       time.Duration
 	MailgunSecretApiKey string
-	SMTPSecret string
+	SMTPSecret          string
 }
 
 func env(env string) string {
@@ -32,7 +32,6 @@ func envDefault(env string, fallback string) string {
 	return v
 }
 
-
 func envDuration(envName string) time.Duration {
 	strVal := env(envName)
 	duration, err := time.ParseDuration(strVal)
@@ -44,13 +43,13 @@ func envDuration(envName string) time.Duration {
 
 func NewConfigFromEnv() Config {
 	return Config{
-		RedisUrl:     envDefault("WEBSTATS_REDIS_URL", "redis://localhost:6379"),
-		Bind:         envDefault("WEBSTATS_BIND", ":8000"),
-		CookieSecret: []byte(env("WEBSTATS_COOKIE_SECRET")),
-		PasswordSalt: []byte(env("WEBSTATS_PASSWORD_SALT")),
-		ArchiveDatabase: env("WEBSTATS_ARCHIVE_DATABASE"),
-		ArchiveMaxAge: envDuration("WEBSTATS_ARCHIVE_MAX_AGE"),
-		MailgunSecretApiKey:     envDefault("WEBSTATS_MAILGUN_SECRET_API_KEY", "dummy"),
-		SMTPSecret:     envDefault("WEBSTATS_SMTP_SECRET", "dummy"),
+		RedisUrl:            envDefault("WEBSTATS_REDIS_URL", "redis://localhost:6379"),
+		Bind:                envDefault("WEBSTATS_BIND", ":8000"),
+		CookieSecret:        []byte(env("WEBSTATS_COOKIE_SECRET")),
+		PasswordSalt:        []byte(env("WEBSTATS_PASSWORD_SALT")),
+		ArchiveDatabase:     env("WEBSTATS_ARCHIVE_DATABASE"),
+		ArchiveMaxAge:       envDuration("WEBSTATS_ARCHIVE_MAX_AGE"),
+		MailgunSecretApiKey: envDefault("WEBSTATS_MAILGUN_SECRET_API_KEY", "dummy"),
+		SMTPSecret:          envDefault("WEBSTATS_SMTP_SECRET", "dummy"),
 	}
 }

backend/lib/ctx.go

@@ -19,10 +19,10 @@ type UserDataResp struct {
 }
 
 type Ctx struct {
-	W         http.ResponseWriter
-	R         *http.Request
-	OpenConns []io.Closer
-	App       *App
+	W             http.ResponseWriter
+	R             *http.Request
+	OpenConns     []io.Closer
+	App           *App
 	noAutoCleanup bool
 }
 
@@ -205,7 +205,6 @@ func (ctx *Ctx) CheckMethod(methods ...string) {
 	}
 }
 
-
 func (ctx *Ctx) SendEventSourceData(data interface{}) {
 	jsonBin, err := json.Marshal(data)
 	ctx.CatchError(err)
@@ -217,7 +216,6 @@ func (ctx *Ctx) SendEventSourceData(data interface{}) {
 	f.Flush()
 }
 
-
 func (ctx *Ctx) NoAutoCleanup() {
 	ctx.noAutoCleanup = true
 }

backend/models/site.go

@@ -2,11 +2,11 @@ package models
 
 import (
 	"fmt"
+	"gorm.io/gorm"
 	"math/rand"
 	"net/url"
-	"time"
 	"strings"
-	"gorm.io/gorm"
+	"time"
 
 	"github.com/gomodule/redigo/redis"
 	"github.com/ihucos/counter.dev/utils"
@@ -62,24 +62,24 @@ func NewVisitItemKey(key string) VisitItemKey {
 }
 
 func (vik VisitItemKey) RedisType() string {
-    for _, i := range fieldsHash {
-        if i == vik.Field {
-            return "hash"
-        }
-    }
-    for _, i := range fieldsZet {
-        if i == vik.Field {
-            return "zet"
-        }
-    }
-    return ""
+	for _, i := range fieldsHash {
+		if i == vik.Field {
+			return "hash"
+		}
+	}
+	for _, i := range fieldsZet {
+		if i == vik.Field {
+			return "zet"
+		}
+	}
+	return ""
 }
 
 type Site struct {
 	redis  redis.Conn
 	id     string
 	userId string
-	db *gorm.DB
+	db     *gorm.DB
 }
 
 // taken from here at August 2020:
@@ -241,7 +241,6 @@ func (site Site) delHotVisits() error {
 	return nil
 }
 
-
 func (site Site) delArchiveVisits() error {
 	err := site.db.Table("records").Where("origin = ?", site.id).Delete(nil).Error
 	if err != nil {