git.iko.soy/crush
on main help sign in
add initial mock sidebar
08bd75bKujtim Hoxha
internal/tui/components/chat/editor.go+70−3
compare with main
unifiedsplit
@@ -13,14 +13,75 @@ type editorCmp struct {
13 textarea textarea.Model
13 textarea textarea.Model
14}
14}
15
15
16+type focusedEditorKeyMaps struct {
17+ Send key.Binding
18+ Blur key.Binding
19+}
20+
21+type bluredEditorKeyMaps struct {
22+ Send key.Binding
23+ Focus key.Binding
24+}
25+
26+var focusedKeyMaps = focusedEditorKeyMaps{
27+ Send: key.NewBinding(
28+ key.WithKeys("ctrl+s"),
29+ key.WithHelp("ctrl+s", "send message"),
30+ ),
31+ Blur: key.NewBinding(
32+ key.WithKeys("esc"),
33+ key.WithHelp("esc", "blur editor"),
34+ ),
35+}
36+
37+var bluredKeyMaps = bluredEditorKeyMaps{
38+ Send: key.NewBinding(
39+ key.WithKeys("ctrl+s", "enter"),
40+ key.WithHelp("ctrl+s/enter", "send message"),
41+ ),
42+ Focus: key.NewBinding(
43+ key.WithKeys("i"),
44+ key.WithHelp("i", "focus editor"),
45+ ),
46+}
47+
16func (m *editorCmp) Init() tea.Cmd {
48func (m *editorCmp) Init() tea.Cmd {
17 return textarea.Blink
49 return textarea.Blink
18}
50}
19
51
20func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
52func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
21 var cmd tea.Cmd
53 var cmd tea.Cmd
54+ if m.textarea.Focused() {
55+ switch msg := msg.(type) {
56+ case tea.KeyMsg:
57+ if key.Matches(msg, focusedKeyMaps.Send) {
58+ // TODO: send message
59+ m.textarea.Reset()
60+ m.textarea.Blur()
61+ return m, nil
62+ }
63+ if key.Matches(msg, focusedKeyMaps.Blur) {
64+ m.textarea.Blur()
65+ return m, nil
66+ }
67+ }
22− m.textarea, cmd = m.textarea.Update(msg)
68+ m.textarea, cmd = m.textarea.Update(msg)
69+ return m, cmd
70+ }
71+ switch msg := msg.(type) {
72+ case tea.KeyMsg:
73+ if key.Matches(msg, bluredKeyMaps.Send) {
74+ // TODO: send message
75+ m.textarea.Reset()
76+ return m, nil
77+ }
78+ if key.Matches(msg, bluredKeyMaps.Focus) {
79+ m.textarea.Focus()
80+ return m, textarea.Blink
81+ }
82+ }
83+
23− return m, cmd
84+ return m, nil
24}
85}
25
86
26func (m *editorCmp) View() string {
87func (m *editorCmp) View() string {
@@ -39,7 +100,13 @@ func (m *editorCmp) GetSize() (int, int) {
39}
100}
40
101
41func (m *editorCmp) BindingKeys() []key.Binding {
102func (m *editorCmp) BindingKeys() []key.Binding {
42− return layout.KeyMapToSlice(m.textarea.KeyMap)
103+ bindings := layout.KeyMapToSlice(m.textarea.KeyMap)
104+ if m.textarea.Focused() {
105+ bindings = append(bindings, layout.KeyMapToSlice(focusedKeyMaps)...)
106+ } else {
107+ bindings = append(bindings, layout.KeyMapToSlice(bluredKeyMaps)...)
108+ }
109+ return bindings
43}
110}
44
111
45func NewEditorCmp() tea.Model {
112func NewEditorCmp() tea.Model {
internal/tui/components/chat/sidebar.go+180−3
@@ -1,8 +1,18 @@
1package chat
1package chat
2
2
3−import tea "github.com/charmbracelet/bubbletea"
3+import (
4+ "fmt"
4
5
6+ tea "github.com/charmbracelet/bubbletea"
7+ "github.com/charmbracelet/lipgloss"
8+ "github.com/kujtimiihoxha/termai/internal/config"
9+ "github.com/kujtimiihoxha/termai/internal/tui/styles"
10+ "github.com/kujtimiihoxha/termai/internal/version"
11+)
12+
5−type sidebarCmp struct{}
13+type sidebarCmp struct {
14+ width, height int
15+}
6
16
7func (m *sidebarCmp) Init() tea.Cmd {
17func (m *sidebarCmp) Init() tea.Cmd {
8 return nil
18 return nil
@@ -13,7 +23,174 @@ func (m *sidebarCmp) Update(tea.Msg) (tea.Model, tea.Cmd) {
13}
23}
14
24
15func (m *sidebarCmp) View() string {
25func (m *sidebarCmp) View() string {
16− return "Sidebar"
26+ return styles.BaseStyle.Width(m.width).Render(
27+ lipgloss.JoinVertical(
28+ lipgloss.Top,
29+ m.header(),
30+ " ",
31+ m.session(),
32+ " ",
33+ m.modifiedFiles(),
34+ " ",
35+ m.lspsConfigured(),
36+ ),
37+ )
38+}
39+
40+func (m *sidebarCmp) session() string {
41+ sessionKey := styles.BaseStyle.Foreground(styles.PrimaryColor).Render("Session")
42+ sessionValue := styles.BaseStyle.
43+ Foreground(styles.Forground).
44+ Width(m.width - lipgloss.Width(sessionKey)).
45+ Render(": New Session")
46+ return lipgloss.JoinHorizontal(
47+ lipgloss.Left,
48+ sessionKey,
49+ sessionValue,
50+ )
51+}
52+
53+func (m *sidebarCmp) modifiedFile(filePath string, additions, removals int) string {
54+ stats := ""
55+ if additions > 0 && removals > 0 {
56+ stats = styles.BaseStyle.Foreground(styles.ForgroundDim).Render(fmt.Sprintf("%d additions and %d removals", additions, removals))
57+ } else if additions > 0 {
58+ stats = styles.BaseStyle.Foreground(styles.ForgroundDim).Render(fmt.Sprintf("%d additions", additions))
59+ } else if removals > 0 {
60+ stats = styles.BaseStyle.Foreground(styles.ForgroundDim).Render(fmt.Sprintf("%d removals", removals))
61+ }
62+ filePathStr := styles.BaseStyle.Foreground(styles.Forground).Render(filePath)
63+
64+ return styles.BaseStyle.
65+ Width(m.width).
66+ Render(
67+ lipgloss.JoinHorizontal(
68+ lipgloss.Left,
69+ filePathStr,
70+ " ",
71+ stats,
72+ ),
73+ )
74+}
75+
76+func (m *sidebarCmp) lspsConfigured() string {
77+ lsps := styles.BaseStyle.Width(m.width).Foreground(styles.PrimaryColor).Render("LSP Configuration:")
78+ lspsConfigured := []struct {
79+ name string
80+ path string
81+ }{
82+ {"golsp", "path/to/lsp1"},
83+ {"vtsls", "path/to/lsp2"},
84+ }
85+
86+ var lspViews []string
87+ for _, lsp := range lspsConfigured {
88+ lspName := styles.BaseStyle.Foreground(styles.Forground).Render(
89+ fmt.Sprintf("• %s", lsp.name),
90+ )
91+ lspPath := styles.BaseStyle.Foreground(styles.ForgroundDim).Render(
92+ fmt.Sprintf("(%s)", lsp.path),
93+ )
94+ lspViews = append(lspViews,
95+ styles.BaseStyle.
96+ Width(m.width).
97+ Render(
98+ lipgloss.JoinHorizontal(
99+ lipgloss.Left,
100+ lspName,
101+ " ",
102+ lspPath,
103+ ),
104+ ),
105+ )
106+
107+ }
108+ return styles.BaseStyle.
109+ Width(m.width).
110+ Render(
111+ lipgloss.JoinVertical(
112+ lipgloss.Left,
113+ lsps,
114+ lipgloss.JoinVertical(
115+ lipgloss.Left,
116+ lspViews...,
117+ ),
118+ ),
119+ )
120+}
121+
122+func (m *sidebarCmp) modifiedFiles() string {
123+ modifiedFiles := styles.BaseStyle.Width(m.width).Foreground(styles.PrimaryColor).Render("Modified Files:")
124+ files := []struct {
125+ path string
126+ additions int
127+ removals int
128+ }{
129+ {"file1.txt", 10, 5},
130+ {"file2.txt", 20, 0},
131+ {"file3.txt", 0, 15},
132+ }
133+ var fileViews []string
134+ for _, file := range files {
135+ fileViews = append(fileViews, m.modifiedFile(file.path, file.additions, file.removals))
136+ }
137+
138+ return styles.BaseStyle.
139+ Width(m.width).
140+ Render(
141+ lipgloss.JoinVertical(
142+ lipgloss.Top,
143+ modifiedFiles,
144+ lipgloss.JoinVertical(
145+ lipgloss.Left,
146+ fileViews...,
147+ ),
148+ ),
149+ )
150+}
151+
152+func (m *sidebarCmp) logo() string {
153+ logo := fmt.Sprintf("%s %s", styles.OpenCodeIcon, "OpenCode")
154+
155+ version := styles.BaseStyle.Foreground(styles.ForgroundDim).Render(version.Version)
156+
157+ return styles.BaseStyle.
158+ Bold(true).
159+ Width(m.width).
160+ Render(
161+ lipgloss.JoinHorizontal(
162+ lipgloss.Left,
163+ logo,
164+ " ",
165+ version,
166+ ),
167+ )
168+}
169+
170+func (m *sidebarCmp) header() string {
171+ header := lipgloss.JoinVertical(
172+ lipgloss.Top,
173+ m.logo(),
174+ m.cwd(),
175+ )
176+ return header
177+}
178+
179+func (m *sidebarCmp) cwd() string {
180+ cwd := fmt.Sprintf("cwd: %s", config.WorkingDirectory())
181+ return styles.BaseStyle.
182+ Foreground(styles.ForgroundDim).
183+ Width(m.width).
184+ Render(cwd)
185+}
186+
187+func (m *sidebarCmp) SetSize(width, height int) {
188+ m.width = width
189+ m.height = height
190+}
191+
192+func (m *sidebarCmp) GetSize() (int, int) {
193+ return m.width, m.height
17}
194}
18
195
19func NewSidebarCmp() tea.Model {
196func NewSidebarCmp() tea.Model {
internal/tui/styles/icons.go+1
@@ -1,6 +1,7 @@
1package styles
1package styles
2
2
3const (
3const (
4+ OpenCodeIcon string = "⌬"
4 SessionsIcon string = "󰧑"
5 SessionsIcon string = "󰧑"
5 ChatIcon string = "󰭹"
6 ChatIcon string = "󰭹"
6
7
internal/tui/styles/styles.go+23
@@ -16,6 +16,10 @@ var (
16 Dark: "#212121",
16 Dark: "#212121",
17 Light: "#212121",
17 Light: "#212121",
18 }
18 }
19+ BackgroundDim = lipgloss.AdaptiveColor{
20+ Dark: "#2c2c2c",
21+ Light: "#2c2c2c",
22+ }
19 BackgroundDarker = lipgloss.AdaptiveColor{
23 BackgroundDarker = lipgloss.AdaptiveColor{
20 Dark: "#181818",
24 Dark: "#181818",
21 Light: "#181818",
25 Light: "#181818",
@@ -24,6 +28,25 @@ var (
24 Dark: "#4b4c5c",
28 Dark: "#4b4c5c",
25 Light: "#4b4c5c",
29 Light: "#4b4c5c",
26 }
30 }
31+
32+ Forground = lipgloss.AdaptiveColor{
33+ Dark: "#d3d3d3",
34+ Light: "#d3d3d3",
35+ }
36+
37+ ForgroundDim = lipgloss.AdaptiveColor{
38+ Dark: "#737373",
39+ Light: "#737373",
40+ }
41+
42+ BaseStyle = lipgloss.NewStyle().
43+ Background(Background).
44+ Foreground(Forground)
45+
46+ PrimaryColor = lipgloss.AdaptiveColor{
47+ Dark: "#fab283",
48+ Light: "#fab283",
49+ }
27)
50)
28
51
29var (
52var (