Add small UI

Author: xmonader

README.md

@@ -203,3 +203,17 @@ End Time: Sun, 15 Sep 2024 22:08:14 EEST
 Duration: 3 minutes
 ------------------------------
 ```
+
+## Web UI
+
+### HomePage
+
+![home](./img/timetracker_home.png)
+
+### Start a time entry
+
+![start_time](./img/timetracker_start.png)
+
+### Stop a time entry
+
+![stop_time](./img/timetracker_stop.png)

img/timetracker_home.png

@@ -1,18 +1,34 @@
 package models
 
 import (
-    "time"
+	"time"
 )
 
 // TimeEntry represents a time tracking entry
 type TimeEntry struct {
-    ID          uint       `gorm:"primaryKey" json:"id"`
-    Username    string     `json:"username"`
-    URL         string     `json:"url"`
-    Description string     `json:"description"`
-    StartTime   time.Time  `json:"start_time"`
-    EndTime     *time.Time `json:"end_time,omitempty"`
-    Duration    int64      `json:"duration"` // in minutes
-    CreatedAt   time.Time  `json:"created_at"`
-    UpdatedAt   time.Time  `json:"updated_at"`
+	ID          uint       `gorm:"primaryKey" json:"id"`
+	Username    string     `json:"username"`
+	URL         string     `json:"url"`
+	Description string     `json:"description"`
+	StartTime   time.Time  `json:"start_time"`
+	EndTime     *time.Time `json:"end_time,omitempty"`
+	Duration    int64      `json:"duration"` // in minutes
+	CreatedAt   time.Time  `json:"created_at"`
+	UpdatedAt   time.Time  `json:"updated_at"`
+}
+
+// GetCurrentTime returns the current time in RFC3339 format
+func GetCurrentTime() string {
+	return time.Now().Format(time.RFC3339)
+}
+
+// CalculateDuration calculates the duration between start and end times in minutes
+func CalculateDuration(start, end string) int64 {
+	layout := time.RFC3339
+	startTime, err1 := time.Parse(layout, start)
+	endTime, err2 := time.Parse(layout, end)
+	if err1 != nil || err2 != nil {
+		return 0
+	}
+	return int64(endTime.Sub(startTime).Minutes())
 }

img/timetracker_start.png

@@ -107,3 +107,39 @@ func (h *TrackingHandler) StopTracking(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json")
 	_ = json.NewEncoder(w).Encode(entry)
 }
+
+// GetStatus handles the /api/status endpoint
+func (h *TrackingHandler) GetStatus(w http.ResponseWriter, r *http.Request) {
+	username := r.URL.Query().Get("username")
+	if username == "" {
+		http.Error(w, "Username is required", http.StatusBadRequest)
+		return
+	}
+
+	var activeEntry models.TimeEntry
+	if err := h.DB.Where("username = ? AND end_time IS NULL", username).First(&activeEntry).Error; err != nil {
+		// No active entry
+		status := struct {
+			Status string `json:"status"`
+		}{
+			Status: "idle",
+		}
+		w.Header().Set("Content-Type", "application/json")
+		_ = json.NewEncoder(w).Encode(status)
+		return
+	}
+
+	// Active entry exists
+	status := struct {
+		Status string `json:"status"`
+		ID     uint   `json:"id"`
+		URL    string `json:"url"`
+	}{
+		Status: "active",
+		ID:     activeEntry.ID,
+		URL:    activeEntry.URL,
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(w).Encode(status)
+}

img/timetracker_stop.png

@@ -2,8 +2,10 @@
 package server
 
 import (
+	"embed"
 	"log"
 	"net/http"
+	"text/template"
 
 	"github.com/gorilla/mux"
 	"github.com/xmonader/team-timetracker/internal/server/handlers"
@@ -17,22 +19,34 @@ type Server struct {
 	TrackingHandler *handlers.TrackingHandler
 	EntriesHandler  *handlers.EntriesHandler
 	HealthHandler   *handlers.HealthHandler
+	Templates       *template.Template
 }
 
+//go:embed templates
+var viewsFS embed.FS
+
 // NewServer initializes the server with routes and handlers
 func NewServer(db *gorm.DB) *Server {
 	router := mux.NewRouter()
 
 	trackingHandler := &handlers.TrackingHandler{DB: db}
 	entriesHandler := &handlers.EntriesHandler{DB: db}
 	healthHandler := &handlers.HealthHandler{DB: db}
+	templates, err := template.New("").
+		ParseFS(viewsFS,
+			"templates/*.html",
+		)
+	if err != nil {
+		panic(err)
+	}
 
 	server := &Server{
 		Router:          router,
 		DB:              db,
 		TrackingHandler: trackingHandler,
 		EntriesHandler:  entriesHandler,
 		HealthHandler:   healthHandler,
+		Templates:       templates,
 	}
 
 	server.setupRoutes()
@@ -45,13 +59,28 @@ func (s *Server) setupRoutes() {
 	// Tracking routes
 	s.Router.HandleFunc("/api/start", s.TrackingHandler.StartTracking).Methods("POST")
 	s.Router.HandleFunc("/api/stop", s.TrackingHandler.StopTracking).Methods("POST")
+	s.Router.HandleFunc("/api/status", s.TrackingHandler.GetStatus).Methods("GET")
 
 	// Entries routes
 	s.Router.HandleFunc("/api/entries", s.EntriesHandler.GetEntries).Methods("GET")
 
 	// Health and Liveness routes
 	s.Router.HandleFunc("/live", s.HealthHandler.LivenessHandler).Methods("GET")
 	s.Router.HandleFunc("/health", s.HealthHandler.HealthCheckHandler).Methods("GET")
+
+	// Webpage route
+	s.Router.HandleFunc("/", s.HandleHome).Methods("GET")
+
+}
+
+// HandleHome serves the main webpage
+func (s *Server) HandleHome(w http.ResponseWriter, r *http.Request) {
+	err := s.Templates.ExecuteTemplate(w, "index.html", nil)
+	if err != nil {
+		http.Error(w, "Error rendering template", http.StatusInternalServerError)
+		log.Println("Template execution error:", err)
+		return
+	}
 }
 
 // Run starts the HTTP server