Merge remote-tracking branch 'origin/main' into WIP-LPM-79

2026-03-06 16:02:50 +01:00
parent cd1f90e546 f371f9a8e9
commit a63edceb00
45 changed files with 2385 additions and 212 deletions
--- a/pkg/tui/views/dashboard/view.go
+++ b/pkg/tui/views/dashboard/view.go
@@ -61,29 +61,119 @@ func (m *Model) View() string {

 	mainView := lipgloss.JoinVertical(lipgloss.Left, header, content, footer)

-	return components.RenderModals(
-		m.width,
-		m.height,
-		m.editingTitle,
-		m.titleInput.View(),
-		m.editingDescription,
-		m.descriptionInput.View(),
-		m.creatingIssue,
-		m.createTitleInput.View(),
-		m.confirmingDelete,
-		m.deleteConfirmID,
-		m.choosingStatus,
-		m.statusIssueID,
-		m.choosingPriority,
-		m.priorityIssueID,
-		m.choosingType,
-		m.typeIssueID,
-		mainView,
-	)
+	if m.editingTitle {
+		editBoxWidth := min(60, m.width-4)
+		m.titleInput.Width = editBoxWidth - 2
+		editContent := lipgloss.JoinVertical(lipgloss.Left,
+			styles.LabelStyle.Render("Edit title (Enter to save, Esc to cancel):"),
+			m.titleInput.View(),
+		)
+		editBox := styles.ContainerStyle.
+			Width(editBoxWidth).
+			BorderForeground(styles.PrimaryBorder).
+			Render(editContent)
+		return lipgloss.Place(m.width, m.height, lipgloss.Center, lipgloss.Center, editBox)
+	}
+
+	if m.addingComment {
+		editBoxWidth := min(60, m.width-4)
+		m.commentInput.SetWidth(editBoxWidth - 2)
+		m.commentInput.SetHeight(8)
+		editContent := lipgloss.JoinVertical(lipgloss.Left,
+			styles.LabelStyle.Render("Add comment for "+m.commentIssueID+" (Ctrl+S or Enter to save, Esc to cancel):"),
+			m.commentInput.View(),
+		)
+		editBox := styles.ContainerStyle.
+			Width(editBoxWidth).
+			BorderForeground(styles.PrimaryBorder).
+			Render(editContent)
+		return lipgloss.Place(m.width, m.height, lipgloss.Center, lipgloss.Center, editBox)
+	}
+
+	if m.editingDescription {
+		editBoxWidth := min(60, m.width-4)
+		m.descriptionInput.SetWidth(editBoxWidth - 2)
+		m.descriptionInput.SetHeight(10)
+		editContent := lipgloss.JoinVertical(lipgloss.Left,
+			styles.LabelStyle.Render("Edit description (Ctrl+S to save, Esc to cancel):"),
+			m.descriptionInput.View(),
+		)
+		editBox := styles.ContainerStyle.
+			Width(editBoxWidth).
+			BorderForeground(styles.PrimaryBorder).
+			Render(editContent)
+		return lipgloss.Place(m.width, m.height, lipgloss.Center, lipgloss.Center, editBox)
+	}
+
+	if m.creatingIssue {
+		createBoxWidth := min(60, m.width-4)
+		m.createTitleInput.Width = createBoxWidth - 2
+		createContent := lipgloss.JoinVertical(lipgloss.Left,
+			styles.LabelStyle.Render("New issue (Enter to create, Esc to cancel):"),
+			m.createTitleInput.View(),
+		)
+		createBox := styles.ContainerStyle.
+			Width(createBoxWidth).
+			BorderForeground(styles.PrimaryBorder).
+			Render(createContent)
+		return lipgloss.Place(m.width, m.height, lipgloss.Center, lipgloss.Center, createBox)
+	}
+
+	if m.confirmingDelete {
+		confirmContent := lipgloss.JoinVertical(lipgloss.Left,
+			styles.LabelStyle.Render("Delete issue "+m.deleteConfirmID+"?"),
+			lipgloss.NewStyle().Foreground(styles.FaintText).Render("Press y to delete, n or Esc to cancel"),
+		)
+		confirmBoxWidth := min(50, m.width-4)
+		confirmBox := styles.ContainerStyle.
+			Width(confirmBoxWidth).
+			BorderForeground(styles.PrimaryBorder).
+			Render(confirmContent)
+		return lipgloss.Place(m.width, m.height, lipgloss.Center, lipgloss.Center, confirmBox)
+	}
+
+	if m.choosingStatus {
+		statusContent := lipgloss.JoinVertical(lipgloss.Left,
+			styles.LabelStyle.Render("Change status for "+m.statusIssueID+":"),
+			lipgloss.NewStyle().Foreground(styles.FaintText).Render("o = open   i = in_progress   c = closed"),
+			lipgloss.NewStyle().Foreground(styles.FaintText).Render("Esc = cancel"),
+		)
+		statusBoxWidth := min(50, m.width-4)
+		statusBox := styles.ContainerStyle.
+			Width(statusBoxWidth).
+			BorderForeground(styles.PrimaryBorder).
+			Render(statusContent)
+		return lipgloss.Place(m.width, m.height, lipgloss.Center, lipgloss.Center, statusBox)
+	}
+
+	if m.choosingPriority {
+		priorityContent := lipgloss.JoinVertical(lipgloss.Left,
+			styles.LabelStyle.Render("Change priority for "+m.priorityIssueID+":"),
+			lipgloss.NewStyle().Foreground(styles.FaintText).Render("0 = irrelevant 1 = low  2 = normal  3 = high  4 = critical"),
+			lipgloss.NewStyle().Foreground(styles.FaintText).Render("Esc = cancel"),
+		)
+		priorityBoxWidth := min(60, m.width-4)
+		priorityBox := styles.ContainerStyle.
+			Width(priorityBoxWidth).
+			BorderForeground(styles.PrimaryBorder).
+			Render(priorityContent)
+		return lipgloss.Place(m.width, m.height, lipgloss.Center, lipgloss.Center, priorityBox)
+	}
+
+	if m.choosingType {
+		typeContent := lipgloss.JoinVertical(lipgloss.Left,
+			styles.LabelStyle.Render("Change type for "+m.typeIssueID+":"),
+			lipgloss.NewStyle().Foreground(styles.FaintText).Render("b = bug   f = feature   t = task   e = epic   c = chore"),
+			lipgloss.NewStyle().Foreground(styles.FaintText).Render("Esc = cancel"),
+		)
+		typeBoxWidth := min(65, m.width-4)
+		typeBox := styles.ContainerStyle.
+			Width(typeBoxWidth).
+			BorderForeground(styles.PrimaryBorder).
+			Render(typeContent)
+		return lipgloss.Place(m.width, m.height, lipgloss.Center, lipgloss.Center, typeBox)
+	}
+
+	return mainView

 }
-
-func (m *Model) footer() string {
-	// Kept for backwards compatibility; delegate to the shared helper.
-	return components.RenderFooter(m.width, &m.helpBar, m.currentFeedback)
-}