Merge pull request #2 from shokinn/codex/implement-phase-2-functionality

feat: add view mode status bar
This commit is contained in:
Philip Henning 2025-08-13 14:54:54 +02:00 committed by GitHub
commit 3561d15858
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 45 additions and 5 deletions

View file

@ -1,6 +1,7 @@
package tui package tui
import ( import (
"fmt"
"hosts-go/internal/core" "hosts-go/internal/core"
list "github.com/charmbracelet/bubbles/list" list "github.com/charmbracelet/bubbles/list"
@ -10,16 +11,31 @@ import (
// entryItem wraps a HostEntry for display in a list component. // entryItem wraps a HostEntry for display in a list component.
type entryItem struct{ entry *core.HostEntry } type entryItem struct{ entry *core.HostEntry }
func (e entryItem) Title() string { return e.entry.Hostname } func (e entryItem) Title() string {
prefix := "[ ]"
if e.entry.Active {
prefix = "[✓]"
}
return fmt.Sprintf("%s %s", prefix, e.entry.Hostname)
}
func (e entryItem) Description() string { return e.entry.IP } func (e entryItem) Description() string { return e.entry.IP }
func (e entryItem) FilterValue() string { return e.entry.Hostname } func (e entryItem) FilterValue() string { return e.entry.Hostname }
// Model is the main Bubble Tea model for the application. // Model is the main Bubble Tea model for the application.
type Mode int
const (
ViewMode Mode = iota
EditMode
)
type Model struct { type Model struct {
list list.Model list list.Model
hosts *core.HostsFile hosts *core.HostsFile
width int width int
height int height int
mode Mode
} }
// NewModel constructs the TUI model from a parsed HostsFile. // NewModel constructs the TUI model from a parsed HostsFile.
@ -38,6 +54,7 @@ func NewModel(hf *core.HostsFile) Model {
return Model{ return Model{
list: l, list: l,
hosts: hf, hosts: hf,
mode: ViewMode,
} }
} }

View file

@ -10,6 +10,7 @@ import (
var ( var (
listStyle = lipgloss.NewStyle().Padding(0, 1) listStyle = lipgloss.NewStyle().Padding(0, 1)
detailStyle = lipgloss.NewStyle().Padding(0, 1) detailStyle = lipgloss.NewStyle().Padding(0, 1)
statusStyle = lipgloss.NewStyle().Padding(0, 1).Foreground(lipgloss.Color("240")).Background(lipgloss.Color("236"))
) )
// View renders the two-pane layout. // View renders the two-pane layout.
@ -36,5 +37,9 @@ func (m Model) View() string {
left := listStyle.Width(m.width / 2).Height(m.height).Render(listView) left := listStyle.Width(m.width / 2).Height(m.height).Render(listView)
right := detailStyle.Width(m.width - m.width/2).Height(m.height).Render(detail.String()) right := detailStyle.Width(m.width - m.width/2).Height(m.height).Render(detail.String())
return lipgloss.JoinHorizontal(lipgloss.Top, left, right) panes := lipgloss.JoinHorizontal(lipgloss.Top, left, right)
status := fmt.Sprintf("VIEW MODE • %d entries", len(m.hosts.Entries))
bar := statusStyle.Width(m.width).Render(status)
return lipgloss.JoinVertical(lipgloss.Left, panes, bar)
} }

View file

@ -51,7 +51,8 @@
4. **View Mode Implementation** 🟡 4. **View Mode Implementation** 🟡
- Read-only display of `/etc/hosts` entries - Read-only display of `/etc/hosts` entries
- Needs status indicators and better styling - Status bar and active/inactive indicators in list implemented
- Further styling improvements pending
### Medium-term (Phase 3) ### Medium-term (Phase 3)
1. **Edit Mode Implementation** 1. **Edit Mode Implementation**

View file

@ -49,7 +49,7 @@
- [x] **Two-pane layout**: Left list + right detail view - [x] **Two-pane layout**: Left list + right detail view
- [x] **Entry list display**: Show IP and hostname columns - [x] **Entry list display**: Show IP and hostname columns
- [x] **Entry selection**: Navigate and select entries with keyboard - [x] **Entry selection**: Navigate and select entries with keyboard
- [ ] **View mode**: Safe browsing with status indicators - [x] **View mode**: Safe browsing with status bar and active/inactive indicators
- [ ] **Integration**: Connect TUI with existing parser functionality - [ ] **Integration**: Connect TUI with existing parser functionality
### 🔧 Edit Functionality (Phase 3) ### 🔧 Edit Functionality (Phase 3)

View file

@ -28,3 +28,20 @@ func TestModelSelection(t *testing.T) {
m = nm.(tui.Model) m = nm.(tui.Model)
assert.Equal(t, "example.com", m.SelectedEntry().Hostname) assert.Equal(t, "example.com", m.SelectedEntry().Hostname)
} }
func TestViewModeStatusBar(t *testing.T) {
sample := `127.0.0.1 localhost
# 192.168.1.10 example.com`
lines := strings.Split(sample, "\n")
hf, _, err := core.ParseHostsContent(lines)
require.NoError(t, err)
m := tui.NewModel(hf)
nm, _ := m.Update(tea.WindowSizeMsg{Width: 80, Height: 20})
m = nm.(tui.Model)
view := m.View()
assert.Contains(t, view, "VIEW MODE")
assert.Contains(t, view, "[✓] localhost")
assert.Contains(t, view, "[ ] example.com")
}