config/config.go

@@ -6,14 +6,12 @@ type Config struct {
 	Port         int    `json:"port"`
 	LogPath      string `json:"logPath"`
 	DatabasePath string `json:"databasePath"`
-	AdminPassword string `json:"adminPassword"`
 }
 
 func ParseFlags() Config {
 	port := flag.Int("Port", 8080, "Listen port")
 	logPath := flag.String("LogPath", "logs", "Path to log files")
 	databasePath := flag.String("DatabasePath", "badgerdb", "Path to the database directory")
-	adminPassword := flag.String("AdminPassword", "", "Admin password for the web interface, disabled if empty")
 
 	flag.Parse()
 
@@ -21,6 +19,5 @@ func ParseFlags() Config {
 		Port:         *port,
 		LogPath:      *logPath,
 		DatabasePath: *databasePath,
-		AdminPassword: *adminPassword,
 	}
 }

database/db.go

@@ -258,9 +258,10 @@ func GetDailyStats(db *clover.DB, date time.Time) (*models.DailyStats, error) {
 	dateStr := date.Format(time.DateOnly)
 
 	// Check if stats already exist
+	isToday := dateStr == time.Now().UTC().Format(time.DateOnly)
 	existingDoc, err := db.FindFirst(c.NewQuery(DailyStatsCollectionName).
 		Where(c.Field("Date").Eq(dateStr)))
-	if err == nil && existingDoc != nil {
+	if !isToday && err == nil && existingDoc != nil {
 		var stats models.DailyStats
 		if err := existingDoc.Unmarshal(&stats); err != nil {
 			return nil, fmt.Errorf("failed to unmarshal daily stats: %v", err)
@@ -295,9 +296,6 @@ func GetDailyStats(db *clover.DB, date time.Time) (*models.DailyStats, error) {
 	}
 	for workerName, workerShares := range sharesByWorker {
 		workerHashrate := helpers.CalculateAverageHashrate(workerShares)
-		sort.Slice(workerShares, func(i, j int) bool {
-			return workerShares[i].SDiff > workerShares[j].SDiff
-		})
 		workerTopShare := workerShares[0] // Already sorted by SDiff
 
 		stats.Workers[workerName] = models.WorkerDailyStats{
@@ -309,12 +307,6 @@ func GetDailyStats(db *clover.DB, date time.Time) (*models.DailyStats, error) {
 
 	// Insert or update the daily stats in the collection
 	doc := document.NewDocumentOf(stats)
-
-	isToday := dateStr == time.Now().UTC().Format(time.DateOnly)
-	if isToday {
-		doc.SetExpiresAt(time.Now().Add(5 * time.Minute))
-	}
-
 	if _, err := db.InsertOne(DailyStatsCollectionName, doc); err != nil {
 		return nil, fmt.Errorf("failed to insert daily stats: %v", err)
 	}

go.mod

@@ -2,16 +2,14 @@ module pool-stats
 
 go 1.24.3
 
-require (
+require github.com/ostafen/clover/v2 v2.0.0-alpha.3.0.20250212110647-35f6fd38bde2
-	github.com/gofrs/uuid/v5 v5.3.1
-	github.com/ostafen/clover/v2 v2.0.0-alpha.3.0.20250212110647-35f6fd38bde2
-)
 
 require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/dgraph-io/badger/v4 v4.5.1 // indirect
 	github.com/dgraph-io/ristretto/v2 v2.1.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/gofrs/uuid/v5 v5.3.1 // indirect
 	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/google/flatbuffers v25.2.10+incompatible // indirect
 	github.com/google/orderedcode v0.0.1 // indirect

jobs/recalculateCurrentDayStatsJob.go

@@ -32,7 +32,6 @@ func (job *RecalculateCurrentDayStatsJob) recalculateCurrentDayStats() {
 	today := time.Now().Truncate(24 * time.Hour)
 	yesterday := today.Add(-24 * time.Hour)
 
-	database.DeleteDailyStatsForDay(job.DB, today)
 	database.GetDailyStats(job.DB, today)
 
 	// Need to keep yesterday's stats cache updated

main.go

@@ -34,7 +34,7 @@ func main() {
 	currentDayStatsRecalcJob := jobs.NewRecalculateCurrentDayStatsJob(db)
 	go currentDayStatsRecalcJob.Run()
 
-	webServer := web.NewWebServer(db, config.Port, config.AdminPassword)
+	webServer := web.NewWebServer(db, config.Port)
 	if err := webServer.Start(); err != nil {
 		log.Fatalf("Failed to start web server: %v", err)
 	}

templates/cp.html

@@ -1,24 +0,0 @@
-{{ define "title" }}Control Panel{{ end }} {{ define "header" }}⚙️ Control
-Panel{{ end }} {{ define "content" }}
-
-<div>
-  {{ if .Message }}
-  <strong>Info:</strong> {{ .Message }} {{ end }}
-
-  <table>
-    <thead>
-      <tr>
-        <th>Action</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><a href="/cp?action=ClearDailyStats">Clear Daily Stats</a></td>
-        <td>Clear Daily Stats cache</td>
-      </tr>
-    </tbody>
-  </table>
-</div>
-
-{{ end }} {{ template "layout" . }}

templates/daily_stats.html

@@ -1,25 +1,8 @@
 {{ define "title" }}Daily Stats{{ end }} {{ define "header" }}📊 Pool Daily
 Stats{{ end }} {{ define "content" }}
-<style>
-  .worker-rows {
-    display: none;
-  }
-  .expand-btn {
-    cursor: pointer;
-  }
-  .worker-table {
-    width: 100%;
-  }
-  .worker-table th,
-  .worker-table td {
-    font-size: 0.9em;
-  }
-</style>
-
 <table>
   <thead>
     <tr>
-      <th></th>
       <th>Date (UTC)</th>
       <th>Share Count</th>
       <th>Top Share Diff</th>
@@ -27,57 +10,21 @@ Stats{{ end }} {{ define "content" }}
     </tr>
   </thead>
   <tbody>
-    {{ range $i, $ds := .DailyStats }}
+    {{ range .DailyStats }}
     <tr>
-      <td>
+      <td>{{ .Date }}</td>
-        <span class="expand-btn" onclick="toggleWorkers({{ $i }})">➕</span>
+      <td>{{ .ShareCount }}</td>
-      </td>
+      <td>{{ humanDiff .TopShare.SDiff }}</td>
-      <td>{{ $ds.Date }}</td>
+      <td>{{ formatHashrate .PoolHashrate }}</td>
-      <td>{{ $ds.ShareCount }}</td>
-      <td>{{ humanDiff $ds.TopShare.SDiff }}</td>
-      <td>{{ formatHashrate $ds.PoolHashrate }}</td>
-    </tr>
-    <tr class="worker-rows" id="workers-{{ $i }}">
-      <td colspan="5">
-        <table class="worker-table">
-          <thead>
-            <tr>
-              <th>Shares</th>
-              <th>Top Share Diff</th>
-              <th>Hashrate</th>
-            </tr>
-          </thead>
-          <tbody>
-            {{ range $name, $w := $ds.Workers }}
-            <tr>
-              <td>{{ $w.Shares }}</td>
-              <td>{{ humanDiff $w.TopShare.SDiff }}</td>
-              <td>{{ formatHashrate $w.Hashrate }}</td>
-            </tr>
-            {{ end }}
-          </tbody>
-        </table>
-      </td>
     </tr>
     {{ else }}
     <tr>
-      <td colspan="5">No stats found for this date range.</td>
+      <td colspan="4">No stats found for this date range.</td>
     </tr>
     {{ end }}
   </tbody>
 </table>
 
-<script>
-  function toggleWorkers(index) {
-    const row = document.getElementById(`workers-${index}`);
-    if (row.style.display === "none" || row.style.display === "") {
-      row.style.display = "table-row";
-    } else {
-      row.style.display = "none";
-    }
-  }
-</script>
-
 <div>
   {{ if .PrevPageAvailable }}
   <a class="page-link" href="?start={{ .PrevPageStart }}&end={{ .PrevPageEnd }}"

templates/layout.html

@@ -6,50 +6,12 @@
     <title>{{ template "title" . }}</title>
     <style>
       body {
-        font-family: "Courier New", Courier, monospace;
+        font-family: sans-serif;
         background: #111;
         color: #eee;
-        padding: 0;
+        padding: 20px;
-        margin: 0;
         text-align: center;
       }
-      nav {
-        background-color: #222;
-        border-bottom: 1px solid #444;
-        padding: 5px 0;
-        margin-bottom: 20px;
-        display: flex;
-        justify-content: space-between;
-      }
-      nav ul {
-        margin: 0;
-        padding: 0;
-        list-style: none;
-        display: inline-flex;
-        gap: 15px;
-      }
-      nav li {
-        display: inline;
-      }
-      nav a {
-        color: #0af;
-        text-decoration: none;
-        padding: 4px 8px;
-        border: 1px solid transparent;
-        font-weight: bold;
-        font-size: 14px;
-      }
-      nav a:hover {
-        background-color: #0af;
-        color: #111;
-        border-color: #0af;
-        border-radius: 3px;
-      }
-
-      h1 {
-        margin-top: 0;
-      }
-
       table {
         border-collapse: collapse;
         margin: auto;
@@ -84,32 +46,23 @@
         color: #0af;
         text-decoration: none;
       }
+      li {
+        display: inline;
+        margin: 0 10px;
+      }
     </style>
   </head>
   <body>
-    <nav>
+    <h1>{{ template "header" . }}</h1>
+
+    {{ template "content" . }} {{ template "navigation" . }}
+  </body>
+</html>
+{{ end }} {{ define "navigation" }}
 <ul>
   <li><a href="/">Home</a></li>
   <li><a href="/shares">View Shares</a></li>
   <li><a href="/top-shares">Top Shares</a></li>
   <li><a href="/daily-stats">Daily Stats</a></li>
 </ul>
-
-      {{ if .UserName }}
-      <ul>
-        <li>{{ .UserName }}</li>
-        <li><a href="/logout">Logout</a></li>
-      </ul>
-      {{ else }}
-      <ul>
-        <li><a href="/login">Login</a></li>
-      </ul>
-      {{ end }}
-    </nav>
-
-    <h1>{{ template "header" . }}</h1>
-
-    {{ template "content" . }}
-  </body>
-</html>
 {{ end }}

templates/login.html

@@ -1,61 +0,0 @@
-{{ define "title" }}Login{{ end }} {{ define "header" }}🔒 Login{{ end }} {{
-define "content" }}
-<style>
-  .login-form {
-    display: inline-block;
-    text-align: left;
-    padding: 20px 25px;
-    background-color: #1a1a1a;
-    border: 1px solid #444;
-    color: #eee;
-    margin: 0 auto;
-  }
-
-  .login-form label {
-    display: block;
-    margin-bottom: 8px;
-    color: #ccc;
-    font-weight: bold;
-  }
-
-  .login-form input[type="password"],
-  .login-form input[type="submit"] {
-    width: 100%;
-    padding: 10px;
-    margin-bottom: 12px;
-    border: 1px solid #444;
-    background-color: #222;
-    color: #eee;
-    border-radius: 4px;
-    box-sizing: border-box;
-  }
-
-  .login-form input[type="submit"] {
-    background-color: #0af;
-    color: #111;
-    font-weight: bold;
-    cursor: pointer;
-    transition: background-color 0.3s ease;
-  }
-
-  .login-form input[type="submit"]:hover {
-    background-color: #08c;
-  }
-
-  .error {
-    color: #ff6b6b;
-    font-size: 0.9em;
-    margin-top: -8px;
-  }
-</style>
-
-<form method="POST" action="/login" class="login-form">
-  <label for="password">Password</label><br />
-  <input type="password" id="password" name="password" required /><br /><br />
-  <input type="submit" value="Login" />
-  {{ if .ErrorMessage }}
-  <p class="error">{{ .ErrorMessage }}</p>
-  {{ end }}
-</form>
-
-{{ end }} {{ template "layout" . }}

web/controlPanelHandler.go

@@ -1,39 +0,0 @@
-package web
-
-import (
-	"net/http"
-	"pool-stats/database"
-)
-
-type ControlPanelPageData struct {
-	PageDataBase
-
-	Message string
-}
-
-func (ws *WebServer) ControlPanelHandler(w http.ResponseWriter, r *http.Request) {
-	username := ws.getUser(r)
-	if username == "" {
-		http.Error(w, "Unauthorized", http.StatusUnauthorized)
-		return
-	}
-
-	data := ControlPanelPageData{}
-
-	action := r.URL.Query().Get("action")
-	if action != "" {
-		data.Message = ws.executeAction(action)
-	}
-
-	ws.renderTemplate(w, r, "templates/cp.html", &data)
-}
-
-func (ws *WebServer) executeAction(action string) string {
-	switch action {
-	case "ClearDailyStats":
-		database.ClearDailyStats(ws.db)
-		return "Daily stats cleared successfully"
-	default:
-		return "Unknown action"
-	}
-}

web/dailyStatsHandler.go

@@ -1,6 +1,7 @@
 package web
 
 import (
+	"html/template"
 	"net/http"
 	"pool-stats/constants"
 	"pool-stats/database"
@@ -9,8 +10,6 @@ import (
 )
 
 type DailyStatsPageData struct {
-	PageDataBase
-
 	DailyStats []models.DailyStats
 
 	Start string
@@ -26,10 +25,16 @@ type DailyStatsPageData struct {
 }
 
 func (ws *WebServer) DailyStatsHandler(w http.ResponseWriter, r *http.Request) {
+	tmpl, err := template.Must(ws.templates.Clone()).ParseFiles("templates/daily_stats.html")
+	if err != nil {
+		http.Error(w, "Failed to parse template", http.StatusInternalServerError)
+		println("Error parsing template:", err.Error())
+		return
+	}
+
 	startParam := r.URL.Query().Get("start")
 	endParam := r.URL.Query().Get("end")
 	var startTime, endTime time.Time
-	var err error
 
 	if startParam == "" || endParam == "" {
 		endTime = time.Now().Truncate(24 * time.Hour)
@@ -86,6 +91,9 @@ func (ws *WebServer) DailyStatsHandler(w http.ResponseWriter, r *http.Request) {
 		PrevPageStart:     prevPageStart.Format(time.DateOnly),
 		PrevPageEnd:       prevPageEnd.Format(time.DateOnly),
 	}
-
+	if err := tmpl.ExecuteTemplate(w, "daily_stats.html", data); err != nil {
-	ws.renderTemplate(w, r, "templates/daily_stats.html", &data)
+		http.Error(w, "Failed to render template", http.StatusInternalServerError)
+		println("Error rendering template:", err.Error())
+		return
+	}
 }

web/indexHandler.go

@@ -1,6 +1,7 @@
 package web
 
 import (
+	"html/template"
 	"net/http"
 
 	"pool-stats/database"
@@ -8,12 +9,17 @@ import (
 )
 
 type IndexPageData struct {
-	PageDataBase
-
 	Stats []models.TimeWindowHighShare
 }
 
 func (ws *WebServer) IndexHandler(w http.ResponseWriter, r *http.Request) {
+	tmpl, err := template.Must(ws.templates.Clone()).ParseFiles("templates/index.html")
+	if err != nil {
+		http.Error(w, "Failed to parse template", 500)
+		println("Error parsing template:", err.Error())
+		return
+	}
+
 	tws := database.GetTimeWindowHighShares(ws.db)
 	if tws == nil {
 		http.Error(w, "Failed to load time window high shares", 500)
@@ -24,5 +30,9 @@ func (ws *WebServer) IndexHandler(w http.ResponseWriter, r *http.Request) {
 		Stats: tws,
 	}
 
-	ws.renderTemplate(w, r, "templates/index.html", &indexData)
+	if err := tmpl.ExecuteTemplate(w, "index.html", indexData); err != nil {
+		http.Error(w, "Failed to render template", 500)
+		println("Error rendering template:", err.Error())
+		return
+	}
 }

web/loginHandler.go

@@ -1,42 +0,0 @@
-package web
-
-import (
-	"net/http"
-)
-
-type LoginPageData struct {
-	PageDataBase
-
-	ErrorMessage string
-}
-
-func (ws *WebServer) LoginHandler(w http.ResponseWriter, r *http.Request) {
-	loginData := LoginPageData{}
-
-	if r.Method == http.MethodPost {
-		if err := r.ParseForm(); err != nil {
-			loginData.ErrorMessage = "Failed to parse form data"
-		} else {
-			password := r.FormValue("password")
-			if password != ws.adminPassword || ws.adminPassword == "" {
-				loginData.ErrorMessage = "Invalid password"
-			} else {
-				sessionID := generateSessionID()
-				if sessionID == "" {
-					loginData.ErrorMessage = "Failed to generate session ID"
-				}
-
-				ws.sessions[sessionID] = "admin"
-				http.SetCookie(w, &http.Cookie{
-					Name:     "session_id",
-					Value:    sessionID,
-					Path:     "/",
-					HttpOnly: true,
-				})
-				http.Redirect(w, r, "/", http.StatusSeeOther)
-			}
-		}
-	}
-
-	ws.renderTemplate(w, r, "templates/login.html", &loginData)
-}

web/logoutHandler.go

@@ -1,25 +0,0 @@
-package web
-
-import (
-	"net/http"
-	"time"
-)
-
-func (ws *WebServer) LogoutHandler(w http.ResponseWriter, r *http.Request) {
-	cookie, err := r.Cookie("session_id")
-	if err != nil {
-		http.Error(w, "No session found", http.StatusUnauthorized)
-		return
-	}
-
-	delete(ws.sessions, cookie.Value)
-
-	http.SetCookie(w, &http.Cookie{
-		Name:     "session_id",
-		Value:    "",
-		Path:     "/",
-		HttpOnly: true,
-		Expires:  <-time.After(time.Second * 1),
-	})
-	http.Redirect(w, r, "/", http.StatusSeeOther)
-}

web/models.go

@@ -1,18 +0,0 @@
-package web
-
-type PageDataBase struct {
-	UserName string
-}
-
-func (pageData PageDataBase) GetUserName() string {
-	return pageData.UserName
-}
-
-func (pageData *PageDataBase) SetUserName(userName string) {
-	pageData.UserName = userName
-}
-
-type IPageDataBase interface {
-	GetUserName() string
-	SetUserName(userName string)
-}

web/server.go

@@ -3,12 +3,10 @@ package web
 import (
 	"html/template"
 	"net/http"
-	"path/filepath"
 	"pool-stats/helpers"
 
 	"fmt"
 
-	"github.com/gofrs/uuid/v5"
 	"github.com/ostafen/clover/v2"
 )
 
@@ -16,11 +14,9 @@ type WebServer struct {
 	db        *clover.DB
 	port      int
 	templates *template.Template
-	sessions      map[string]string
-	adminPassword string
 }
 
-func NewWebServer(db *clover.DB, port int, adminPassword string) *WebServer {
+func NewWebServer(db *clover.DB, port int) *WebServer {
 	templates := template.New("base").Funcs(template.FuncMap{
 		"add":              func(a, b int) int { return a + b },
 		"sub":              func(a, b int) int { return a - b },
@@ -37,16 +33,11 @@ func NewWebServer(db *clover.DB, port int, adminPassword string) *WebServer {
 		db:        db,
 		port:      port,
 		templates: templates,
-		sessions:      make(map[string]string),
-		adminPassword: adminPassword,
 	}
 }
 
 func (ws *WebServer) Start() error {
 	http.HandleFunc("/", ws.IndexHandler)
-	http.HandleFunc("/cp", ws.ControlPanelHandler)
-	http.HandleFunc("/login", ws.LoginHandler)
-	http.HandleFunc("/logout", ws.LogoutHandler)
 	http.HandleFunc("/shares", ws.SharesHandler)
 	http.HandleFunc("/top-shares", ws.TopSharesHandler)
 	http.HandleFunc("/daily-stats", ws.DailyStatsHandler)
@@ -55,48 +46,3 @@ func (ws *WebServer) Start() error {
 	println("Listening on", address)
 	return http.ListenAndServe(address, nil)
 }
-
-func generateSessionID() string {
-	uuid, err := uuid.NewV4()
-	if err != nil {
-		fmt.Println("Error generating session ID:", err)
-		return ""
-	}
-
-	return uuid.String()
-}
-
-func (ws *WebServer) getUser(r *http.Request) string {
-	cookie, err := r.Cookie("session_id")
-	if err != nil {
-		return ""
-	}
-	if user, ok := ws.sessions[cookie.Value]; ok {
-		return user
-	}
-	return ""
-}
-
-func (ws *WebServer) renderTemplate(
-	w http.ResponseWriter,
-	r *http.Request,
-	templateFile string,
-	data IPageDataBase) {
-
-	data.SetUserName(ws.getUser(r))
-
-	tmpl, err := template.Must(ws.templates.Clone()).ParseFiles(templateFile)
-	if err != nil {
-		http.Error(w, "Failed to parse template", 500)
-		println("Error parsing template:", err.Error())
-		return
-	}
-
-	templateName := filepath.Base(templateFile)
-
-	if err := tmpl.ExecuteTemplate(w, templateName, data); err != nil {
-		http.Error(w, "Failed to render template", 500)
-		println("Error rendering template:", err.Error())
-		return
-	}
-}

web/sharesHandler.go

@@ -1,6 +1,7 @@
 package web
 
 import (
+	"html/template"
 	"net/http"
 	"pool-stats/database"
 	"pool-stats/models"
@@ -8,14 +9,19 @@ import (
 )
 
 type SharePageData struct {
-	PageDataBase
-
 	Shares  []models.ShareLog
 	Page    int
 	HasMore bool
 }
 
 func (ws *WebServer) SharesHandler(w http.ResponseWriter, r *http.Request) {
+	tmpl, err := template.Must(ws.templates.Clone()).ParseFiles("templates/shares.html")
+	if err != nil {
+		http.Error(w, "Failed to parse template", 500)
+		println("Error parsing template:", err.Error())
+		return
+	}
+
 	entriesPerPage := 10
 	page := r.URL.Query().Get("page")
 	if page == "" {
@@ -40,6 +46,8 @@ func (ws *WebServer) SharesHandler(w http.ResponseWriter, r *http.Request) {
 		Page:    offset/entriesPerPage + 1,
 		HasMore: len(shareLogs) == entriesPerPage,
 	}
-
+	if err := tmpl.ExecuteTemplate(w, "shares.html", data); err != nil {
-	ws.renderTemplate(w, r, "templates/shares.html", &data)
+		http.Error(w, "Failed to render template", 500)
+		return
+	}
 }

web/topSharesHandler.go

@@ -1,18 +1,24 @@
 package web
 
 import (
+	"html/template"
 	"net/http"
 	"pool-stats/database"
 	"pool-stats/models"
 )
 
 type TopSharesPageData struct {
-	PageDataBase
-
 	Shares []models.ShareLog
 }
 
 func (ws *WebServer) TopSharesHandler(w http.ResponseWriter, r *http.Request) {
+	tmpl, err := template.Must(ws.templates.Clone()).ParseFiles("templates/top_shares.html")
+	if err != nil {
+		http.Error(w, "Failed to parse template", 500)
+		println("Error parsing template:", err.Error())
+		return
+	}
+
 	topShares := database.ListTopShares(ws.db)
 	if topShares == nil {
 		http.Error(w, "Failed to load top shares", 500)
@@ -22,6 +28,8 @@ func (ws *WebServer) TopSharesHandler(w http.ResponseWriter, r *http.Request) {
 	data := TopSharesPageData{
 		Shares: topShares,
 	}
-
+	if err := tmpl.ExecuteTemplate(w, "top_shares.html", data); err != nil {
-	ws.renderTemplate(w, r, "templates/top_shares.html", &data)
+		http.Error(w, "Failed to render template", 500)
+		return
+	}
 }