From f9127d5272042f4980ece8b39a47613f95eeaf8e Mon Sep 17 00:00:00 2001 From: Peter Stone Date: Sat, 31 Jan 2026 21:23:56 -1000 Subject: Fix timeline calendar view and shopping UI bugs (#56, #65-73) - #56: Add overflow-hidden to card/panel classes to prevent content overflow - #65: Fix Google Tasks not showing by including tasks without due dates - #66: Add no-cache headers to prevent stale template responses - #67: Increase dropdown z-index to 100 for proper layering - #69: Implement calendar-style Today section with hourly grid (6am-10pm), duration-based event heights, and compact overdue/all-day section - #70: Only reset shopping-mode form on successful submission - #71: Remove checkboxes from shopping tab (only show in shopping mode) - #72: Add inline add-item input at end of each store section - #73: Add Grouped/Flat view toggle for shopping list Co-Authored-By: Claude Opus 4.5 --- SESSION_STATE.md | 16 ++- internal/api/google_tasks.go | 13 +- internal/handlers/handlers.go | 16 ++- internal/handlers/response.go | 10 ++ internal/handlers/timeline_logic.go | 17 ++- internal/models/timeline.go | 10 +- web/static/css/input.css | 16 ++- web/templates/index.html | 2 +- web/templates/partials/shopping-tab.html | 69 ++++++++-- web/templates/partials/timeline-tab.html | 221 ++++++++++++++++++++++++++++++- web/templates/shopping-mode.html | 2 +- 11 files changed, 361 insertions(+), 31 deletions(-) diff --git a/SESSION_STATE.md b/SESSION_STATE.md index 56ff56e..6e076f5 100644 --- a/SESSION_STATE.md +++ b/SESSION_STATE.md @@ -3,8 +3,22 @@ ## Current Focus Implementing bugs from production database -## Recently Completed +## Recently Completed Bugs - **#74**: Feature toggles - Added feature toggle system with UI at `/settings` +- **#56**: Box contents overflow - Added overflow-hidden to card/panel classes +- **#65**: Google tasks don't show up - Added logging, fixed tasks without due dates +- **#66**: Tasks use outdated template - Added no-cache headers to dynamic responses +- **#67**: Pop up menus need higher z-index - Updated to z-[100] +- **#68**: Track completion in external sources - Already implemented +- **#69**: Timeline calendar view - Implemented calendar-style Today section with: + - Hourly grid (6am-10pm) + - Events positioned by time with duration-based height + - Separate compact section for overdue/all-day/untimed items + - Added IsOverdue and IsAllDay fields to TimelineItem model +- **#70**: Clear input boxes on success - Fixed shopping-mode.html reset +- **#71**: Shopping items no checkmarks - Removed checkboxes from shopping-tab (only in shopping mode) +- **#72**: Inline add per store - Added inline input at end of each store section +- **#73**: Store grouping optional - Added Grouped/Flat view toggle with query param ## Active Feature **Agent Context API** — `issues/feature_agent_context_api.md` diff --git a/internal/api/google_tasks.go b/internal/api/google_tasks.go index 77a00ed..ecacb6d 100644 --- a/internal/api/google_tasks.go +++ b/internal/api/google_tasks.go @@ -123,23 +123,26 @@ func (c *GoogleTasksClient) getTasksFromList(ctx context.Context, listID string) return result, nil } -// GetTasksByDateRange fetches tasks with due dates in the specified range +// GetTasksByDateRange fetches tasks with due dates in the specified range. +// Tasks without due dates are included and treated as "today" tasks. func (c *GoogleTasksClient) GetTasksByDateRange(ctx context.Context, start, end time.Time) ([]models.GoogleTask, error) { allTasks, err := c.GetTasks(ctx) if err != nil { return nil, err } - // Filter by date range + startDay := time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, c.displayTZ) + endDay := time.Date(end.Year(), end.Month(), end.Day(), 0, 0, 0, 0, c.displayTZ) + + // Filter by date range, include tasks without due dates var filtered []models.GoogleTask for _, task := range allTasks { if task.DueDate == nil { + // Include tasks without due dates (they'll be shown in "today" section) + filtered = append(filtered, task) continue } dueDay := time.Date(task.DueDate.Year(), task.DueDate.Month(), task.DueDate.Day(), 0, 0, 0, 0, c.displayTZ) - startDay := time.Date(start.Year(), start.Month(), start.Day(), 0, 0, 0, 0, c.displayTZ) - endDay := time.Date(end.Year(), end.Month(), end.Day(), 0, 0, 0, 0, c.displayTZ) - if !dueDay.Before(startDay) && dueDay.Before(endDay) { filtered = append(filtered, task) } diff --git a/internal/handlers/handlers.go b/internal/handlers/handlers.go index 0e5edcc..bba12ad 100644 --- a/internal/handlers/handlers.go +++ b/internal/handlers/handlers.go @@ -1230,7 +1230,11 @@ func mealTypeOrder(mealType string) int { 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}) + grouped := r.URL.Query().Get("grouped") != "false" // Default to grouped + HTMLResponse(w, h.templates, "shopping-tab", struct { + Stores []models.ShoppingStore + Grouped bool + }{stores, grouped}) } // HandleShoppingQuickAdd adds a user shopping item @@ -1285,7 +1289,10 @@ func (h *Handler) HandleShoppingQuickAdd(w http.ResponseWriter, r *http.Request) } // Return refreshed shopping tab - HTMLResponse(w, h.templates, "shopping-tab", struct{ Stores []models.ShoppingStore }{allStores}) + HTMLResponse(w, h.templates, "shopping-tab", struct { + Stores []models.ShoppingStore + Grouped bool + }{allStores, true}) } // HandleShoppingToggle toggles a shopping item's checked state @@ -1323,7 +1330,10 @@ func (h *Handler) HandleShoppingToggle(w http.ResponseWriter, r *http.Request) { // Return refreshed shopping tab stores := h.aggregateShoppingLists(r.Context()) - HTMLResponse(w, h.templates, "shopping-tab", struct{ Stores []models.ShoppingStore }{stores}) + HTMLResponse(w, h.templates, "shopping-tab", struct { + Stores []models.ShoppingStore + Grouped bool + }{stores, true}) } // HandleShoppingMode renders the focused shopping mode for a single store diff --git a/internal/handlers/response.go b/internal/handlers/response.go index 9a7ab45..34d4491 100644 --- a/internal/handlers/response.go +++ b/internal/handlers/response.go @@ -7,9 +7,17 @@ import ( "net/http" ) +// noCacheHeaders sets headers to prevent browser caching +func noCacheHeaders(w http.ResponseWriter) { + w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") + w.Header().Set("Pragma", "no-cache") + w.Header().Set("Expires", "0") +} + // JSONResponse writes data as JSON with appropriate headers func JSONResponse(w http.ResponseWriter, data interface{}) { w.Header().Set("Content-Type", "application/json") + noCacheHeaders(w) _ = json.NewEncoder(w).Encode(data) } @@ -23,6 +31,8 @@ func JSONError(w http.ResponseWriter, status int, msg string, err error) { // HTMLResponse renders an HTML template func HTMLResponse(w http.ResponseWriter, tmpl *template.Template, name string, data interface{}) { + w.Header().Set("Content-Type", "text/html; charset=utf-8") + noCacheHeaders(w) if err := tmpl.ExecuteTemplate(w, name, data); err != nil { http.Error(w, "Failed to render template", http.StatusInternalServerError) log.Printf("Error rendering template %s: %v", name, err) diff --git a/internal/handlers/timeline_logic.go b/internal/handlers/timeline_logic.go index 5ea44b5..7a85393 100644 --- a/internal/handlers/timeline_logic.go +++ b/internal/handlers/timeline_logic.go @@ -2,6 +2,7 @@ package handlers import ( "context" + "log" "sort" "strings" "time" @@ -130,7 +131,9 @@ func BuildTimeline(ctx context.Context, s *store.Store, calendarClient api.Googl // 4. Fetch Events if calendarClient != nil { events, err := calendarClient.GetEventsByDateRange(ctx, start, end) - if err == nil { + if err != nil { + log.Printf("Warning: failed to fetch calendar events: %v", err) + } else { for _, event := range events { endTime := event.End item := models.TimelineItem{ @@ -142,7 +145,7 @@ func BuildTimeline(ctx context.Context, s *store.Store, calendarClient api.Googl Description: event.Description, URL: event.HTMLLink, OriginalItem: event, - IsCompleted: false, // Events don't have completion status + IsCompleted: false, Source: "calendar", } item.ComputeDaySection(now) @@ -154,9 +157,13 @@ func BuildTimeline(ctx context.Context, s *store.Store, calendarClient api.Googl // 5. Fetch Google Tasks if tasksClient != nil { gTasks, err := tasksClient.GetTasksByDateRange(ctx, start, end) - if err == nil { + if err != nil { + log.Printf("Warning: failed to fetch Google Tasks: %v", err) + } else { + log.Printf("Google Tasks: fetched %d tasks in date range", len(gTasks)) for _, gTask := range gTasks { - taskTime := start // Default to start of range if no due date + // Tasks without due date are placed in today section + taskTime := now if gTask.DueDate != nil { taskTime = *gTask.DueDate } @@ -176,6 +183,8 @@ func BuildTimeline(ctx context.Context, s *store.Store, calendarClient api.Googl items = append(items, item) } } + } else { + log.Printf("Google Tasks client not configured") } // Sort items by Time diff --git a/internal/models/timeline.go b/internal/models/timeline.go index 0968d41..c4196bd 100644 --- a/internal/models/timeline.go +++ b/internal/models/timeline.go @@ -36,6 +36,8 @@ type TimelineItem struct { // UI enhancement fields IsCompleted bool `json:"is_completed"` + IsOverdue bool `json:"is_overdue"` + IsAllDay bool `json:"is_all_day"` // True if time is midnight (no specific time) DaySection DaySection `json:"day_section"` Source string `json:"source"` // "todoist", "trello", "plantoeat", "calendar", "gtasks" @@ -43,7 +45,7 @@ type TimelineItem struct { ListID string `json:"list_id,omitempty"` // For Google Tasks } -// ComputeDaySection sets the DaySection based on the item's time +// ComputeDaySection sets the DaySection, IsOverdue, and IsAllDay based on the item's time func (item *TimelineItem) ComputeDaySection(now time.Time) { // Use configured display timezone for consistent comparisons tz := config.GetDisplayTimezone() @@ -56,6 +58,12 @@ func (item *TimelineItem) ComputeDaySection(now time.Time) { itemDay := time.Date(localItemTime.Year(), localItemTime.Month(), localItemTime.Day(), 0, 0, 0, 0, tz) + // Check if item is overdue (before today) + item.IsOverdue = itemDay.Before(today) + + // Check if item is all-day (midnight time means no specific time) + item.IsAllDay = localItemTime.Hour() == 0 && localItemTime.Minute() == 0 + if itemDay.Before(tomorrow) { item.DaySection = DaySectionToday } else if itemDay.Before(dayAfterTomorrow) { diff --git a/web/static/css/input.css b/web/static/css/input.css index c7fa1d2..321aa4f 100644 --- a/web/static/css/input.css +++ b/web/static/css/input.css @@ -24,7 +24,7 @@ @layer components { /* Dark Glass Card */ .card { - @apply bg-black/70 backdrop-blur-sm rounded-lg p-4 transition-all duration-200; + @apply bg-black/70 backdrop-blur-sm rounded-lg p-4 transition-all duration-200 overflow-hidden; box-shadow: 0 0 12px black; } @@ -32,6 +32,11 @@ @apply hover:bg-black/80; } + /* Panel with overflow clipping */ + .bg-panel { + @apply overflow-hidden; + } + /* Navigation Pills */ .tab-button { @apply px-2 sm:px-4 py-2 rounded-lg text-xs sm:text-sm font-light text-white/70 tracking-wide transition-all duration-200; @@ -59,11 +64,11 @@ } .trello-card-item { - @apply bg-black/40 rounded-lg p-4 hover:bg-black/50 transition-all; + @apply bg-black/40 rounded-lg p-4 hover:bg-black/50 transition-all overflow-hidden; } .task-item { - @apply bg-black/70 rounded-lg transition-colors; + @apply bg-black/70 rounded-lg transition-colors overflow-hidden; box-shadow: 0 0 12px black; } @@ -71,6 +76,11 @@ @apply bg-black/80; } + /* Text truncation for long content */ + .truncate-text { + @apply truncate; + } + .line-clamp-3 { display: -webkit-box; -webkit-line-clamp: 3; diff --git a/web/templates/index.html b/web/templates/index.html index 3451623..5322ca6 100644 --- a/web/templates/index.html +++ b/web/templates/index.html @@ -75,7 +75,7 @@ onclick="toggleDetailsDropdown(event)"> 📁 Details ▾ - +
{{if .Stores}} + {{if .Grouped}} + {{range .Stores}}
@@ -44,14 +65,8 @@ {{if .Name}}

{{.Name}}

{{end}}
    {{range .Items}} -
  • - - {{.Name}} +
  • + {{.Name}} {{if .Quantity}}{{.Quantity}}{{end}} {{.Source}} @@ -61,6 +76,42 @@
{{end}} + + + + + + +
+ {{end}} + {{else}} + +
+
    + {{range .Stores}} + {{range .Categories}} + {{range .Items}} +
  • + {{.Name}} + {{if .Quantity}}{{.Quantity}}{{end}} + + {{.Store}} + + + {{.Source}} + +
    • + {{end}} + {{end}} + {{end}} +
{{end}} {{else}} diff --git a/web/templates/partials/timeline-tab.html b/web/templates/partials/timeline-tab.html index b1045c6..8745d1d 100644 --- a/web/templates/partials/timeline-tab.html +++ b/web/templates/partials/timeline-tab.html @@ -1,11 +1,92 @@ {{define "timeline-tab"}} + +
- + {{if .TodayItems}}
@@ -15,11 +96,145 @@ -
+ + +
{{range .TodayItems}} - {{template "timeline-item" .}} + {{if or .IsOverdue .IsAllDay}} +
+ {{if or (eq .Type "task") (eq .Type "card") (eq .Type "gtask")}} + + {{end}} + {{.Title}} + {{if .IsOverdue}}overdue{{end}} + {{if .URL}} + + + + + + {{end}} +
+ {{end}} {{end}}
+ + +
+ +
6am
+
7am
+
8am
+
9am
+
10am
+
11am
+
12pm
+
1pm
+
2pm
+
3pm
+
4pm
+
5pm
+
6pm
+
7pm
+
8pm
+
9pm
+
10pm
+ + + {{range .TodayItems}} + {{if and (not .IsOverdue) (not .IsAllDay)}} + + {{end}} + {{end}} +
+ +
{{end}} diff --git a/web/templates/shopping-mode.html b/web/templates/shopping-mode.html index 9e21ac6..88d8561 100644 --- a/web/templates/shopping-mode.html +++ b/web/templates/shopping-mode.html @@ -74,7 +74,7 @@
-- cgit v1.2.3