🚨 feat: rework ui 🚨

go.mod

@@ -45,7 +45,7 @@ require (
 	github.com/muesli/reflow v0.3.0 // indirect
 	github.com/muesli/termenv v0.15.2 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
-	golang.org/x/sync v0.4.0 // indirect
+	golang.org/x/sync v0.4.0
 	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 )

go.sum

@@ -24,8 +24,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=
 github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
-github.com/evertras/bubble-table v0.15.4 h1:iqsVVnSKNcbVV0miLJhtME2S8SNHE/O7UL7n2OairJI=
-github.com/evertras/bubble-table v0.15.4/go.mod h1:SPOZKbIpyYWPHBNki3fyNpiPBQkvkULAtOT7NTD5fKY=
 github.com/evertras/bubble-table v0.15.5 h1:vMsjp0FI7lEyzJG8fT2WRmg0OhVfgMf1a0P7r/ekXPY=
 github.com/evertras/bubble-table v0.15.5/go.mod h1:SPOZKbIpyYWPHBNki3fyNpiPBQkvkULAtOT7NTD5fKY=
 github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=

ui/common/commands.go

@@ -14,17 +14,33 @@ func FocusCmd() tea.Cmd {
 
 type SpaceChangeMsg string
 
-func SpaceChangeCmd(space string) tea.Cmd {
+func SpaceChangeCmd(id string) tea.Cmd {
 	return func() tea.Msg {
-		return SpaceChangeMsg(space)
+		return SpaceChangeMsg(id)
+	}
+}
+
+type SpacePreviewMsg string
+
+func SpacePreviewCmd(id string) tea.Cmd {
+	return func() tea.Msg {
+		return SpacePreviewMsg(id)
 	}
 }
 
 type FolderChangeMsg string
 
-func FolderChangeCmd(space string) tea.Cmd {
+func FolderChangeCmd(id string) tea.Cmd {
+	return func() tea.Msg {
+		return FolderChangeMsg(id)
+	}
+}
+
+type FolderPreviewMsg string
+
+func FolderPreviewCmd(id string) tea.Cmd {
 	return func() tea.Msg {
-		return FolderChangeMsg(space)
+		return FolderPreviewMsg(id)
 	}
 }
 
@@ -36,6 +52,14 @@ func ListChangeCmd(id string) tea.Cmd {
 	}
 }
 
+type ListPreviewMsg string
+
+func ListPreviewCmd(id string) tea.Cmd {
+	return func() tea.Msg {
+		return ListPreviewMsg(id)
+	}
+}
+
 type WorkspaceChangeMsg string
 
 func WorkspaceChangeCmd(workspace string) tea.Cmd {
@@ -44,6 +68,14 @@ func WorkspaceChangeCmd(workspace string) tea.Cmd {
 	}
 }
 
+type WorkspacePreviewMsg string
+
+func WorkspacePreviewCmd(workspace string) tea.Cmd {
+	return func() tea.Msg {
+		return WorkspacePreviewMsg(workspace)
+	}
+}
+
 type BackToPreviousViewMsg ViewId
 
 func BackToPreviousViewCmd(currentView ViewId) tea.Cmd {

ui/common/keymaps.go

@@ -14,15 +14,9 @@ func NewEmptyKeyMap() help.KeyMap {
 	)
 }
 
-var (
-	KeyBindingBack = key.NewBinding(
-		key.WithKeys("escape"),
-		key.WithHelp("escape", "back to previous view"),
-	)
-	KeyBindingOpenInBrowser = key.NewBinding(
-		key.WithKeys("p"),
-		key.WithHelp("p", "open in browser"),
-	)
+var KeyBindingBack = key.NewBinding(
+	key.WithKeys("escape"),
+	key.WithHelp("escape", "back to previous view"),
 )
 
 type KeyMap struct {

ui/common/types.go

@@ -14,6 +14,8 @@ type ViewId string
 
 type WidgetId string
 
+type ComponentId string
+
 type View interface {
 	View() string
 	KeyMap() help.KeyMap

ui/widgets/folders/commands.go → ui/components/folders-list/commands.go

@@ -1,4 +1,4 @@
-package folders
+package folderslist
 
 import tea "github.com/charmbracelet/bubbletea"
 

ui/widgets/folders/folders.go → ui/components/folders-list/folders.go

@@ -1,4 +1,4 @@
-package folders
+package folderslist
 
 import (
 	"github.com/charmbracelet/bubbles/help"
@@ -11,13 +11,13 @@ import (
 	"github.com/prgrs/clickup/ui/context"
 )
 
-const WidgetId = "widgetFoldersList"
+const ComponentId = "widgetFoldersList"
 
 type Model struct {
 	list           list.Model
 	ctx            *context.UserContext
 	log            *log.Logger
-	WidgetId       common.WidgetId
+	ComponentId    common.ComponentId
 	SelectedSpace  string
 	SelectedFolder string
 	folders        []clickup.Folder
@@ -36,11 +36,12 @@ func InitialModel(ctx *context.UserContext, logger *log.Logger) Model {
 		0, 0)
 	l.KeyMap.Quit.Unbind()
 	l.SetShowHelp(false)
+	l.Title = "Folders"
 
-	log := logger.WithPrefix(logger.GetPrefix() + "/" + WidgetId)
+	log := logger.WithPrefix(logger.GetPrefix() + "/" + ComponentId)
 
 	return Model{
-		WidgetId:       WidgetId,
+		ComponentId:    ComponentId,
 		list:           l,
 		ctx:            ctx,
 		SelectedFolder: "",
@@ -83,7 +84,29 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 			selectedFolder := listitem.BubblesItemToItem(m.list.SelectedItem()).Description()
 			m.log.Infof("Selected folder %s", selectedFolder)
 			m.SelectedFolder = selectedFolder
-			cmds = append(cmds, FolderChangeCmd(selectedFolder))
+			return m, FolderChangeCmd(selectedFolder)
+
+		case "J", "shift+down":
+			m.list.CursorDown()
+			if m.list.SelectedItem() == nil {
+				m.log.Info("List is empty")
+				break
+			}
+			selectedFolder := listitem.BubblesItemToItem(m.list.SelectedItem()).Description()
+			m.log.Infof("Selected folder %s", selectedFolder)
+			m.SelectedFolder = selectedFolder
+			return m, common.FolderPreviewCmd(selectedFolder)
+
+		case "K", "shift+up":
+			m.list.CursorUp()
+			if m.list.SelectedItem() == nil {
+				m.log.Info("List is empty")
+				break
+			}
+			selectedFolder := listitem.BubblesItemToItem(m.list.SelectedItem()).Description()
+			m.log.Infof("Selected folder %s", selectedFolder)
+			m.SelectedFolder = selectedFolder
+			return m, common.FolderPreviewCmd(selectedFolder)
 		}
 	}
 
@@ -102,13 +125,12 @@ func (m Model) Init() tea.Cmd {
 	return nil
 }
 
-func (m Model) SetSize(s common.Size) Model {
+func (m *Model) SetSize(s common.Size) {
 	m.list.SetSize(s.Width, s.Height)
-	return m
 }
 
-func (m *Model) SpaceChange(id string) error {
-	m.log.Infof("Received: SpaceChangeMsg: %s", id)
+func (m *Model) SpaceChanged(id string) error {
+	m.log.Infof("Received: SpaceChangedMsg: %s", id)
 	m.SelectedSpace = id
 
 	folders, err := m.ctx.Api.GetFolders(id)

ui/widgets/folders/utils.go → ui/components/folders-list/utils.go

@@ -1,4 +1,4 @@
-package folders
+package folderslist
 
 import (
 	"github.com/prgrs/clickup/pkg/clickup"

ui/widgets/lists/commands.go → ui/components/lists-list/commands.go

@@ -1,4 +1,4 @@
-package lists
+package listslist
 
 import (
 	tea "github.com/charmbracelet/bubbletea"

ui/widgets/lists/lists.go → ui/components/lists-list/lists.go

@@ -1,4 +1,4 @@
-package lists
+package listslist
 
 import (
 	"github.com/charmbracelet/bubbles/help"
@@ -11,13 +11,13 @@ import (
 	"github.com/prgrs/clickup/ui/context"
 )
 
-const WidgetId = "viewLists"
+const ComponentId = "viewLists"
 
 type Model struct {
 	list           list.Model
 	ctx            *context.UserContext
 	log            *log.Logger
-	WidgetId       common.WidgetId
+	ComponentId    common.ComponentId
 	SelectedList   string
 	SelectedFolder string
 	lists          []clickup.List
@@ -29,11 +29,12 @@ func InitialModel(ctx *context.UserContext, logger *log.Logger) Model {
 		0, 0)
 	l.KeyMap.Quit.Unbind()
 	l.SetShowHelp(false)
+	l.Title = "Lists"
 
-	log := logger.WithPrefix(logger.GetPrefix() + "/" + WidgetId)
+	log := logger.WithPrefix(logger.GetPrefix() + "/" + ComponentId)
 
 	return Model{
-		WidgetId:       WidgetId,
+		ComponentId:    ComponentId,
 		list:           l,
 		ctx:            ctx,
 		SelectedFolder: "",
@@ -77,7 +78,29 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 			selectedList := listitem.BubblesItemToItem(m.list.SelectedItem()).Description()
 			m.log.Infof("Selected list %s", selectedList)
 			m.SelectedList = selectedList
-			cmds = append(cmds, ListChangedCmd(m.SelectedList))
+			return m, ListChangedCmd(m.SelectedList)
+
+		case "J", "shift+down":
+			m.list.CursorDown()
+			if m.list.SelectedItem() == nil {
+				m.log.Info("List is empty")
+				break
+			}
+			selectedList := listitem.BubblesItemToItem(m.list.SelectedItem()).Description()
+			m.log.Infof("Selected list %s", selectedList)
+			m.SelectedList = selectedList
+			return m, common.ListPreviewCmd(m.SelectedList)
+
+		case "K", "shift+up":
+			m.list.CursorUp()
+			if m.list.SelectedItem() == nil {
+				m.log.Info("List is empty")
+				break
+			}
+			selectedList := listitem.BubblesItemToItem(m.list.SelectedItem()).Description()
+			m.log.Infof("Selected list %s", selectedList)
+			m.SelectedList = selectedList
+			return m, common.ListPreviewCmd(m.SelectedList)
 		}
 	}
 
@@ -96,9 +119,8 @@ func (m Model) Init() tea.Cmd {
 	return nil
 }
 
-func (m Model) SetSize(size common.Size) Model {
+func (m *Model) SetSize(size common.Size) {
 	m.list.SetSize(size.Width, size.Height)
-	return m
 }
 
 func (m *Model) SpaceChanged(id string) error {

ui/widgets/lists/utils.go → ui/components/lists-list/utils.go

@@ -1,4 +1,4 @@
-package lists
+package listslist
 
 import (
 	"github.com/prgrs/clickup/pkg/clickup"

ui/widgets/spaces/commands.go → ui/components/spaces-list/commands.go

@@ -1,4 +1,4 @@
-package spaces
+package spaceslist
 
 import tea "github.com/charmbracelet/bubbletea"
 

ui/widgets/spaces/spaces.go → ui/components/spaces-list/spaces.go

@@ -1,4 +1,4 @@
-package spaces
+package spaceslist
 
 import (
 	"github.com/charmbracelet/bubbles/help"
@@ -11,13 +11,13 @@ import (
 	"github.com/prgrs/clickup/ui/context"
 )
 
-const WidgetId = "spacesList"
+const ComponentId = "spacesList"
 
 type Model struct {
 	list              list.Model
 	ctx               *context.UserContext
 	log               *log.Logger
-	WidgetId          common.WidgetId
+	ComponentId       common.ComponentId
 	SelectedSpace     string
 	SelectedWorkspace string
 	spaces            []clickup.Space
@@ -36,11 +36,12 @@ func InitialModel(ctx *context.UserContext, logger *log.Logger) Model {
 		0, 0)
 	l.KeyMap.Quit.Unbind()
 	l.SetShowHelp(false)
+	l.Title = "Spaces"
 
-	log := logger.WithPrefix(logger.GetPrefix() + "/" + WidgetId)
+	log := logger.WithPrefix(logger.GetPrefix() + "/" + ComponentId)
 
 	return Model{
-		WidgetId:      WidgetId,
+		ComponentId:   ComponentId,
 		list:          l,
 		ctx:           ctx,
 		SelectedSpace: "",
@@ -84,7 +85,29 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 			selectedSpace := listitem.BubblesItemToItem(m.list.SelectedItem()).Description()
 			m.log.Infof("Selected space %s", selectedSpace)
 			m.SelectedSpace = selectedSpace
-			cmds = append(cmds, SpaceChangedCmd(selectedSpace))
+			return m, SpaceChangedCmd(selectedSpace)
+
+		case "J", "shift+down":
+			m.list.CursorDown()
+			if m.list.SelectedItem() == nil {
+				m.log.Info("List is empty")
+				break
+			}
+			selectedSpace := listitem.BubblesItemToItem(m.list.SelectedItem()).Description()
+			m.log.Info("Selected space", "space", selectedSpace)
+			m.SelectedSpace = selectedSpace
+			return m, common.SpacePreviewCmd(selectedSpace)
+
+		case "K", "shift+up":
+			m.list.CursorUp()
+			if m.list.SelectedItem() == nil {
+				m.log.Info("List is empty")
+				break
+			}
+			selectedSpace := listitem.BubblesItemToItem(m.list.SelectedItem()).Description()
+			m.log.Info("Selected space", "space", selectedSpace)
+			m.SelectedSpace = selectedSpace
+			return m, common.SpacePreviewCmd(selectedSpace)
 		}
 	}
 
@@ -103,9 +126,8 @@ func (m Model) Init() tea.Cmd {
 	return nil
 }
 
-func (m Model) SetSize(s common.Size) Model {
+func (m *Model) SetSize(s common.Size) {
 	m.list.SetSize(s.Width, s.Height)
-	return m
 }
 
 func (m *Model) WorkspaceChanged(id string) error {

ui/widgets/spaces/utils.go → ui/components/spaces-list/utils.go

@@ -1,4 +1,4 @@
-package spaces
+package spaceslist
 
 import (
 	"github.com/prgrs/clickup/pkg/clickup"

ui/widgets/tasks-table/commands.go → ui/components/table-tasks/commands.go

@@ -1,4 +1,4 @@
-package taskstable
+package tabletasks
 
 import (
 	tea "github.com/charmbracelet/bubbletea"