From dedda31d064ddcb4f857f2db851c5a8c1e19deba Mon Sep 17 00:00:00 2001 From: Peter Stone Date: Sun, 25 Jan 2026 17:05:49 -1000 Subject: Implement architectural refactors for feature requests #28, #30, #31, #33-38 Phase 1: Bugs as First-Class Atoms (#28) - Add resolved_at column to bugs table (migration 007) - Add GetUnresolvedBugs(), ResolveBug(), UnresolveBug() store methods - Include bugs in Tasks tab via BugToAtom() with completion toggle - Add unit tests for bug resolution Phase 2: Timeline as Default + Enhancements (#35, #37) - Change default tab from tasks to timeline - Add IsCompleted, DaySection, Source fields to TimelineItem - Group timeline items by today/tomorrow/later sections - Add completion checkboxes for tasks/cards, grey completed items - Collapse tomorrow/later sections by default Phase 3: Shopping Quick-Add (#33) - Add user_shopping_items table (migration 008) - Add SaveUserShoppingItem(), GetUserShoppingItems(), ToggleUserShoppingItem() - Add HandleShoppingQuickAdd() and HandleShoppingToggle() handlers - Add quick-add form to shopping tab Phase 4: Mobile Swipe Navigation (#38) - Add touch event handlers for swipe left/right tab switching - 50px threshold triggers tab change Phase 5: Consistent Background Opacity (#30) - Add CSS variables for panel/card/input/modal backgrounds - Update templates to use consistent opacity classes Phase 6: Tab Reorganization (#37) - Reorganize tabs: Timeline, Shopping, Conditions as main tabs - Move Tasks, Planning, Meals under Details dropdown Co-Authored-By: Claude Opus 4.5 --- internal/handlers/handlers.go | 150 ++++++++++++++++++++++++++++++++++-- internal/handlers/timeline.go | 27 +++++-- internal/handlers/timeline_logic.go | 36 ++++++--- 3 files changed, 192 insertions(+), 21 deletions(-) (limited to 'internal/handlers') diff --git a/internal/handlers/handlers.go b/internal/handlers/handlers.go index 5c86ce2..ee28a87 100644 --- a/internal/handlers/handlers.go +++ b/internal/handlers/handlers.go @@ -62,7 +62,7 @@ func (h *Handler) HandleDashboard(w http.ResponseWriter, r *http.Request) { // Extract tab query parameter for state persistence tab := r.URL.Query().Get("tab") if tab == "" { - tab = "tasks" + tab = "timeline" } // Aggregate data from all sources @@ -626,6 +626,18 @@ func (h *Handler) handleAtomToggle(w http.ResponseWriter, r *http.Request, compl } case "trello": err = h.trelloClient.UpdateCard(ctx, id, map[string]interface{}{"closed": complete}) + case "bug": + // Bug IDs are prefixed with "bug-", extract the numeric ID + var bugID int64 + if _, parseErr := fmt.Sscanf(id, "bug-%d", &bugID); parseErr != nil { + JSONError(w, http.StatusBadRequest, "Invalid bug ID format", parseErr) + return + } + if complete { + err = h.store.ResolveBug(bugID) + } else { + err = h.store.UnresolveBug(bugID) + } default: JSONError(w, http.StatusBadRequest, "Unknown source: "+source, nil) return @@ -684,7 +696,7 @@ func (h *Handler) handleAtomToggle(w http.ResponseWriter, r *http.Request, compl } } -// getAtomTitle retrieves the title for a task/card from the store +// getAtomTitle retrieves the title for a task/card/bug from the store func (h *Handler) getAtomTitle(id, source string) string { switch source { case "todoist": @@ -705,6 +717,16 @@ func (h *Handler) getAtomTitle(id, source string) string { } } } + case "bug": + if bugs, err := h.store.GetBugs(); err == nil { + var bugID int64 + fmt.Sscanf(id, "bug-%d", &bugID) + for _, b := range bugs { + if b.ID == bugID { + return b.Description + } + } + } } return "Task" } @@ -943,7 +965,7 @@ func (h *Handler) HandleUpdateTask(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) } -// HandleTabTasks renders the unified Tasks tab (Todoist + Trello cards with due dates) +// HandleTabTasks renders the unified Tasks tab (Todoist + Trello cards with due dates + Bugs) func (h *Handler) HandleTabTasks(w http.ResponseWriter, r *http.Request) { tasks, err := h.store.GetTasks() if err != nil { @@ -957,6 +979,12 @@ func (h *Handler) HandleTabTasks(w http.ResponseWriter, r *http.Request) { return } + bugs, err := h.store.GetUnresolvedBugs() + if err != nil { + log.Printf("Warning: failed to fetch bugs: %v", err) + bugs = nil + } + atoms := make([]models.Atom, 0) for _, task := range tasks { @@ -973,6 +1001,15 @@ func (h *Handler) HandleTabTasks(w http.ResponseWriter, r *http.Request) { } } + // Add unresolved bugs as atoms + for _, bug := range bugs { + atoms = append(atoms, models.BugToAtom(models.Bug{ + ID: bug.ID, + Description: bug.Description, + CreatedAt: bug.CreatedAt, + })) + } + for i := range atoms { atoms[i].ComputeUIFields() } @@ -1171,14 +1208,89 @@ func (h *Handler) HandleTabMeals(w http.ResponseWriter, r *http.Request) { HTMLResponse(w, h.templates, "meals-tab", struct{ Meals []models.Meal }{meals}) } -// HandleTabShopping renders the Shopping tab (Trello Shopping board + PlanToEat) +// HandleTabShopping renders the Shopping tab (Trello Shopping board + PlanToEat + User items) func (h *Handler) HandleTabShopping(w http.ResponseWriter, r *http.Request) { ctx := r.Context() stores := h.aggregateShoppingLists(ctx) HTMLResponse(w, h.templates, "shopping-tab", struct{ Stores []models.ShoppingStore }{stores}) } -// aggregateShoppingLists combines Trello and PlanToEat shopping items by store +// HandleShoppingQuickAdd adds a user shopping item +func (h *Handler) HandleShoppingQuickAdd(w http.ResponseWriter, r *http.Request) { + if err := r.ParseForm(); err != nil { + JSONError(w, http.StatusBadRequest, "Failed to parse form", err) + return + } + + name := strings.TrimSpace(r.FormValue("name")) + store := strings.TrimSpace(r.FormValue("store")) + + if name == "" { + JSONError(w, http.StatusBadRequest, "Name is required", nil) + return + } + if store == "" { + store = "Quick Add" + } + + if err := h.store.SaveUserShoppingItem(name, store); err != nil { + JSONError(w, http.StatusInternalServerError, "Failed to save item", err) + return + } + + // Return refreshed shopping tab + ctx := r.Context() + stores := h.aggregateShoppingLists(ctx) + HTMLResponse(w, h.templates, "shopping-tab", struct{ Stores []models.ShoppingStore }{stores}) +} + +// HandleShoppingToggle toggles a shopping item's checked state +func (h *Handler) HandleShoppingToggle(w http.ResponseWriter, r *http.Request) { + if err := r.ParseForm(); err != nil { + JSONError(w, http.StatusBadRequest, "Failed to parse form", err) + return + } + + id := r.FormValue("id") + source := r.FormValue("source") + checked := r.FormValue("checked") == "true" + + if source == "user" { + var userID int64 + if _, err := fmt.Sscanf(id, "user-%d", &userID); err != nil { + JSONError(w, http.StatusBadRequest, "Invalid user item ID", err) + return + } + if err := h.store.ToggleUserShoppingItem(userID, checked); err != nil { + JSONError(w, http.StatusInternalServerError, "Failed to toggle item", err) + return + } + } + // Note: Trello and PlanToEat toggle would need their own API calls + + // Return updated item HTML + checkedClass := "" + checkedAttr := "" + textClass := "text-white" + if checked { + checkedClass = "opacity-50" + checkedAttr = "checked" + textClass = "line-through text-white/40" + } + html := fmt.Sprintf(`
  • + + %s + user +
    • `, checkedClass, checkedAttr, template.HTMLEscapeString(id), template.HTMLEscapeString(source), !checked, textClass, template.HTMLEscapeString(r.FormValue("name"))) + HTMLString(w, html) +} + +// aggregateShoppingLists combines Trello, PlanToEat, and user shopping items by store func (h *Handler) aggregateShoppingLists(ctx context.Context) []models.ShoppingStore { storeMap := make(map[string]map[string][]models.UnifiedShoppingItem) @@ -1245,7 +1357,33 @@ func (h *Handler) aggregateShoppingLists(ctx context.Context) []models.ShoppingS log.Printf("DEBUG [Shopping/PlanToEat]: Client not configured") } - // 3. Convert map to sorted slice + // 3. Fetch user-added shopping items + userItems, err := h.store.GetUserShoppingItems() + if err != nil { + log.Printf("ERROR [Shopping/User]: %v", err) + } else { + for _, item := range userItems { + storeName := item.Store + if storeName == "" { + storeName = "Quick Add" + } + + if storeMap[storeName] == nil { + storeMap[storeName] = make(map[string][]models.UnifiedShoppingItem) + } + + unified := models.UnifiedShoppingItem{ + ID: fmt.Sprintf("user-%d", item.ID), + Name: item.Name, + Store: storeName, + Source: "user", + Checked: item.Checked, + } + storeMap[storeName][""] = append(storeMap[storeName][""], unified) + } + } + + // 4. Convert map to sorted slice var stores []models.ShoppingStore for storeName, categories := range storeMap { store := models.ShoppingStore{Name: storeName} diff --git a/internal/handlers/timeline.go b/internal/handlers/timeline.go index b923d3e..ce0e831 100644 --- a/internal/handlers/timeline.go +++ b/internal/handlers/timeline.go @@ -8,6 +8,15 @@ import ( "task-dashboard/internal/models" ) +// TimelineData holds grouped timeline items for the template +type TimelineData struct { + TodayItems []models.TimelineItem + TomorrowItems []models.TimelineItem + LaterItems []models.TimelineItem + Start time.Time + Days int +} + // HandleTimeline renders the timeline view func (h *Handler) HandleTimeline(w http.ResponseWriter, r *http.Request) { // Parse query params @@ -45,15 +54,21 @@ func (h *Handler) HandleTimeline(w http.ResponseWriter, r *http.Request) { return } - data := struct { - Items []models.TimelineItem - Start time.Time - Days int - }{ - Items: items, + // Group items by day section + data := TimelineData{ Start: start, Days: days, } + for _, item := range items { + switch item.DaySection { + case models.DaySectionToday: + data.TodayItems = append(data.TodayItems, item) + case models.DaySectionTomorrow: + data.TomorrowItems = append(data.TomorrowItems, item) + case models.DaySectionLater: + data.LaterItems = append(data.LaterItems, item) + } + } HTMLResponse(w, h.templates, "timeline-tab", data) } diff --git a/internal/handlers/timeline_logic.go b/internal/handlers/timeline_logic.go index 1aba780..c51262a 100644 --- a/internal/handlers/timeline_logic.go +++ b/internal/handlers/timeline_logic.go @@ -13,6 +13,7 @@ import ( // BuildTimeline aggregates and normalizes data into a timeline structure func BuildTimeline(ctx context.Context, s *store.Store, calendarClient api.GoogleCalendarAPI, start, end time.Time) ([]models.TimelineItem, error) { var items []models.TimelineItem + now := time.Now() // 1. Fetch Tasks tasks, err := s.GetTasksByDateRange(start, end) @@ -23,7 +24,7 @@ func BuildTimeline(ctx context.Context, s *store.Store, calendarClient api.Googl if task.DueDate == nil { continue } - items = append(items, models.TimelineItem{ + item := models.TimelineItem{ ID: task.ID, Type: models.TimelineItemTypeTask, Title: task.Content, @@ -31,7 +32,11 @@ func BuildTimeline(ctx context.Context, s *store.Store, calendarClient api.Googl Description: task.Description, URL: task.URL, OriginalItem: task, - }) + IsCompleted: task.Completed, + Source: "todoist", + } + item.ComputeDaySection(now) + items = append(items, item) } // 2. Fetch Meals @@ -53,14 +58,18 @@ func BuildTimeline(ctx context.Context, s *store.Store, calendarClient api.Googl mealTime = time.Date(mealTime.Year(), mealTime.Month(), mealTime.Day(), 12, 0, 0, 0, mealTime.Location()) } - items = append(items, models.TimelineItem{ + item := models.TimelineItem{ ID: meal.ID, Type: models.TimelineItemTypeMeal, Title: meal.RecipeName, Time: mealTime, URL: meal.RecipeURL, OriginalItem: meal, - }) + IsCompleted: false, // Meals don't have completion status + Source: "plantoeat", + } + item.ComputeDaySection(now) + items = append(items, item) } // 3. Fetch Cards @@ -72,14 +81,18 @@ func BuildTimeline(ctx context.Context, s *store.Store, calendarClient api.Googl if card.DueDate == nil { continue } - items = append(items, models.TimelineItem{ + item := models.TimelineItem{ ID: card.ID, Type: models.TimelineItemTypeCard, Title: card.Name, Time: *card.DueDate, URL: card.URL, OriginalItem: card, - }) + IsCompleted: false, // Cards in timeline are not completed (closed cards filtered out) + Source: "trello", + } + item.ComputeDaySection(now) + items = append(items, item) } // 4. Fetch Events @@ -87,16 +100,21 @@ func BuildTimeline(ctx context.Context, s *store.Store, calendarClient api.Googl events, err := calendarClient.GetEventsByDateRange(ctx, start, end) if err == nil { for _, event := range events { - items = append(items, models.TimelineItem{ + endTime := event.End + item := models.TimelineItem{ ID: event.ID, Type: models.TimelineItemTypeEvent, Title: event.Summary, Time: event.Start, - EndTime: &event.End, + EndTime: &endTime, Description: event.Description, URL: event.HTMLLink, OriginalItem: event, - }) + IsCompleted: false, // Events don't have completion status + Source: "calendar", + } + item.ComputeDaySection(now) + items = append(items, item) } } } -- cgit v1.2.3