Merge pull request #14 from LazyBachelor/LPM-52

LPM-52 Survey Tasks

pkg/cli/cli.go

@@ -11,8 +11,14 @@ import (
 // CLIConfig is an alias for service.Config, used to configure the CLI.
 type CLIConfig = service.Config
 
+type CLI struct{}
+
+func NewCli() *CLI {
+	return &CLI{}
+}
+
 // Run initializes the services and executes the CLI commands.
-func Run(ctx context.Context, config CLIConfig) error {
+func (c *CLI) Run(ctx context.Context, config CLIConfig) error {
 	svc, cleanup, err := service.NewServices(ctx, config)
 	if err != nil {
 		return err
@@ -30,7 +36,7 @@ func Run(ctx context.Context, config CLIConfig) error {
 }
 
 // RunWithArgs initializes the services and executes the CLI commands with the provided arguments.
-func RunWithArgs(ctx context.Context, config CLIConfig, args []string) error {
+func (c *CLI) RunWithArgs(ctx context.Context, config CLIConfig, args []string) error {
 	svc, cleanup, err := service.NewServices(ctx, config)
 	if err != nil {
 		return err

pkg/cli/repl/repl.go

@@ -22,8 +22,14 @@ You can also run shell commands directly. Type 'exit' or 'quit' to leave.`
 	ReplTitle = "Welcome to Project Management CLI! " + ReplHelp
 )
 
-// RunREPL starts the interactive Read-Eval-Print Loop for the PM CLI.
-func RunREPL(ctx context.Context, config cli.CLIConfig) error {
+type REPL struct{}
+
+func NewRepl() *REPL {
+	return &REPL{}
+}
+
+// Run starts the interactive Read-Eval-Print Loop for the PM CLI.
+func (r *REPL) Run(ctx context.Context, config cli.CLIConfig) error {
 	// Set terminal to raw mode to capture input properly in the REPL.
 	// This allows us to handle input character by character and provide a better user experience.
 	// We also ensure that the terminal state is restored when the REPL exits, even if an error occurs.

pkg/survey.go

@@ -1,19 +0,0 @@
-package pkg
-
-import (
-	"context"
-
-	"github.com/LazyBachelor/LazyPM/internal/service"
-)
-
-type SurveyConfig = service.Config
-
-func Run(ctx context.Context, config SurveyConfig) error {
-	_, cleanup, err := service.NewServices(ctx, config)
-	if err != nil {
-		return err
-	}
-	defer cleanup()
-
-	return nil
-}

pkg/task/runner.go

@@ -0,0 +1,32 @@
+package task
+
+import (
+	"context"
+	"fmt"
+
+	tea "github.com/charmbracelet/bubbletea"
+)
+
+func (t *Task) IntroduceTask() error {
+	if t.aboutScreen == nil {
+		return fmt.Errorf("aboutScreen is not set")
+	}
+	_, err := tea.NewProgram(t.aboutScreen, tea.WithAltScreen()).Run()
+	return err
+}
+
+func (t *Task) StartInterface(ctx context.Context, cfg TaskConfig) error {
+	if t.interfaceType == nil {
+		return fmt.Errorf("interfaceType is not set")
+	}
+
+	return t.interfaceType.Run(ctx, cfg)
+}
+
+func (t *Task) StartQuestionnaire() error {
+	if t.questionnaire == nil {
+		return fmt.Errorf("questionnaire is not set")
+	}
+	_, err := tea.NewProgram(t.questionnaire, tea.WithAltScreen()).Run()
+	return err
+}

pkg/task/task.go

@@ -0,0 +1,56 @@
+package task
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/LazyBachelor/LazyPM/internal/service"
+	tea "github.com/charmbracelet/bubbletea"
+)
+
+type Task struct {
+	Config        TaskConfig
+	interfaceType Interface
+	aboutScreen   tea.Model
+	questionnaire tea.Model
+
+	validateFunc ValidateFunc
+	dbStateFunc  DbStateFunc
+}
+
+func NewTask(aboutScreen tea.Model, questionnaire tea.Model) *Task {
+	return &Task{
+		aboutScreen:   aboutScreen,
+		questionnaire: questionnaire,
+	}
+}
+
+func (t *Task) SetConfigFunc(fn ConfigFunc) {
+	t.Config = fn()
+}
+
+func (t *Task) SetInterface(interfaceType Interface) {
+	t.interfaceType = interfaceType
+}
+
+func (t *Task) SetDbStateFunc(fn DbStateFunc) {
+	t.dbStateFunc = fn
+}
+
+func (t *Task) SetValidateFunc(fn ValidateFunc) {
+	t.validateFunc = fn
+}
+
+func (t *Task) Initialize(ctx context.Context, svc *service.Services) error {
+	if t.dbStateFunc == nil {
+		return fmt.Errorf("dbStateFunc is not set")
+	}
+	return t.dbStateFunc(ctx, svc)
+}
+
+func (t *Task) Validate(ctx context.Context, svc *service.Services) (bool, error) {
+	if t.validateFunc == nil {
+		return false, fmt.Errorf("validateFunc is not set")
+	}
+	return t.validateFunc(ctx, svc)
+}

pkg/task/types.go

@@ -0,0 +1,17 @@
+package task
+
+import (
+	"context"
+
+	"github.com/LazyBachelor/LazyPM/internal/service"
+)
+
+type TaskConfig = service.Config
+
+type Interface interface {
+	Run(context.Context, TaskConfig) error
+}
+
+type ConfigFunc func() TaskConfig
+type ValidateFunc func(context.Context, *service.Services) (ok bool, err error)
+type DbStateFunc func(context.Context, *service.Services) error

pkg/task/ui/help.go

@@ -0,0 +1,27 @@
+package taskui
+
+import "github.com/charmbracelet/bubbles/key"
+
+type TaskHelpKeys struct {
+	Quit     key.Binding
+	Continue key.Binding
+}
+
+var DefaultTaskKeys = TaskHelpKeys{
+	Quit: key.NewBinding(
+		key.WithKeys("q", "ctrl+c"),
+		key.WithHelp("q", "Quit"),
+	),
+	Continue: key.NewBinding(
+		key.WithKeys(" "),
+		key.WithHelp("space", "Continue"),
+	),
+}
+
+func (h TaskHelpKeys) ShortHelp() []key.Binding {
+	return []key.Binding{h.Continue, h.Quit}
+}
+
+func (h TaskHelpKeys) FullHelp() [][]key.Binding {
+	return [][]key.Binding{{h.Continue, h.Quit}}
+}

pkg/task/ui/questionnaire.go

@@ -0,0 +1,54 @@
+package taskui
+
+import (
+	"charm.land/lipgloss/v2"
+	"github.com/LazyBachelor/LazyPM/internal/style"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/huh"
+)
+
+func NewQuestionnaireModel(questions Questions) *QuestionnaireModel {
+	form := huh.NewForm(questions...).
+		WithTheme(style.HuhCenterTheme()).WithLayout(huh.LayoutGrid(1, 1))
+
+	return &QuestionnaireModel{
+		Questions: questions,
+		form:      form,
+	}
+}
+
+func (q *QuestionnaireModel) Init() tea.Cmd {
+	return q.form.Init()
+}
+
+func (q *QuestionnaireModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		q.SetSize(msg.Width, msg.Height)
+	case tea.KeyMsg:
+		switch msg.String() {
+		case "q", "ctrl+c":
+			return q, tea.Quit
+		}
+	}
+
+	form, cmd := q.form.Update(msg)
+	if f, ok := form.(*huh.Form); ok {
+		q.form = f
+	}
+	return q, cmd
+}
+
+func (q *QuestionnaireModel) View() string {
+	form := lipgloss.NewStyle().
+		Width(q.width).Align(lipgloss.Center).
+		Render(q.form.View())
+
+	return lipgloss.Place(
+		q.width, q.height, lipgloss.Center, lipgloss.Center, form,
+	)
+}
+
+func (q *QuestionnaireModel) SetSize(width, height int) {
+	q.width, q.height = width, height
+}

pkg/task/ui/task.go

@@ -0,0 +1,72 @@
+package taskui
+
+import (
+	"fmt"
+
+	"charm.land/lipgloss/v2"
+	"github.com/charmbracelet/bubbles/help"
+	"github.com/charmbracelet/bubbles/key"
+	tea "github.com/charmbracelet/bubbletea"
+)
+
+func NewTaskModel(details TaskDetails) TaskModel {
+	return TaskModel{
+		TaskDetails: details,
+		keys:        DefaultTaskKeys,
+		help:        help.New(),
+	}
+}
+
+func (m TaskModel) Init() tea.Cmd {
+	return nil
+}
+
+func (m TaskModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		m.SetSize(msg.Width, msg.Height)
+	case tea.KeyMsg:
+		switch {
+		case key.Matches(msg, m.keys.Quit):
+			return m, tea.Quit
+		case key.Matches(msg, m.keys.Continue):
+			return m, tea.Quit
+		}
+	}
+	return m, nil
+}
+
+func (m TaskModel) View() string {
+	padding := 3
+
+	header := lipgloss.NewStyle().
+		PaddingTop(padding).Width(m.width).Align(lipgloss.Center).
+		Bold(true).Render(m.Title)
+
+	headerHeight := lipgloss.Height(header)
+
+	helpView := lipgloss.NewStyle().
+		PaddingBottom(padding).
+		Width(m.width).Align(lipgloss.Center).
+		Render(m.help.View(m.keys))
+
+	helpHeight := lipgloss.Height(helpView)
+
+	detailsText := fmt.Sprintf("Time to complete: %s | Difficulty: %s", m.TimeToComplete, m.Difficulty)
+	details := lipgloss.NewStyle().Align(lipgloss.Center).
+		Width(m.width).PaddingBottom(1).Render(detailsText)
+
+	detailsHeight := lipgloss.Height(details)
+
+	content := lipgloss.NewStyle().
+		Width(m.width).Height(m.height-headerHeight-helpHeight-detailsHeight).
+		Align(lipgloss.Center, lipgloss.Center).
+		Render(m.Description)
+
+	return lipgloss.JoinVertical(lipgloss.Top, header, content, details, helpView)
+
+}
+
+func (m *TaskModel) SetSize(width, height int) {
+	m.width, m.height = width, height
+}

pkg/task/ui/types.go

@@ -0,0 +1,28 @@
+package taskui
+
+import (
+	"github.com/charmbracelet/bubbles/help"
+	"github.com/charmbracelet/huh"
+)
+
+type TaskDetails struct {
+	Title          string
+	Description    string
+	TimeToComplete string
+	Difficulty     string
+}
+
+type TaskModel struct {
+	TaskDetails
+	keys          TaskHelpKeys
+	help          help.Model
+	width, height int
+}
+
+type Questions []*huh.Group
+
+type QuestionnaireModel struct {
+	Questions
+	form          *huh.Form
+	width, height int
+}

pkg/tui/tui.go

@@ -10,16 +10,24 @@ import (
 
 type TUIConfig = service.Config
 
-func Run(ctx context.Context, config TUIConfig) (tea.Model, error) {
+type Tui struct{}
+
+func NewTui() *Tui {
+	return &Tui{}
+}
+
+func (t *Tui) Run(ctx context.Context, config TUIConfig) error {
 	svc, cleanup, err := service.NewServices(ctx, config)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	defer cleanup()
 
-	app := tea.NewProgram(views.NewDashboardView(svc),
-		tea.WithAltScreen(), tea.WithMouseAllMotion())
+	if _, err := tea.NewProgram(views.NewDashboardView(svc),
+		tea.WithAltScreen(), tea.WithMouseAllMotion()).Run(); err != nil {
+		return err
+	}
 
-	return app.Run()
+	return nil
 }

pkg/web/web.go

@@ -11,10 +11,16 @@ import (
 
 type WebConfig = service.Config
 
+type Web struct{}
+
+func NewWeb() *Web {
+	return &Web{}
+}
+
 //go:embed assets/*
 var assets embed.FS
 
-func Run(ctx context.Context, config WebConfig) error {
+func (w *Web) Run(ctx context.Context, config WebConfig) error {
 	svc, cleanup, err := service.NewServices(ctx, config)
 	if err != nil {
 		return err