Merge pull request #52 from ewilliams0305/banner

Banner

pkg/tui/actions_model.go

@@ -26,6 +26,7 @@ type ActionsModel struct {
 	action   initialAction
 	progress progress.Model
 	results  *actionResult
+	banner   *BannerModel
 }
 
 type actionResult struct {
@@ -58,6 +59,7 @@ func InitialActionModel(message string, action initialAction) *ActionsModel {
 		action:   action,
 		err:      nil,
 		progress: prog,
+		banner:   NewBanner("VCLI Quick Action", 0, w),
 	}
 }
 
@@ -96,6 +98,8 @@ func (m ActionsModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg := msg.(type) {
 	case error:
 		m.err = msg
+		m.banner = NewBanner(m.message, BannerErrorState, m.progress.Width)
+
 		return m, nil
 
 	case vc.ProgramUploadResult:
@@ -140,7 +144,8 @@ func (m ActionsModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 func (m ActionsModel) View() string {
-	s := "\n" + m.message + "\n"
+	s := m.banner.View()
+	s += "\n" + m.message + "\n"
 
 	if m.progress.Percent() != 0.0 {
 		s += "\n" + m.progress.View() + "\n\n"

pkg/tui/banner.go

@@ -0,0 +1,68 @@
+package tui
+
+import (
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+)
+
+const (
+	BannerNormalState BannerState = iota
+	BannerErrorState  BannerState = 1
+)
+
+type BannerModel struct {
+	message string
+	state   BannerState
+	width   int
+}
+
+type BannerState int
+
+func (m BannerModel) Init() tea.Cmd {
+	return nil
+}
+
+func NewBanner(message string, state BannerState, width int) *BannerModel {
+	return &BannerModel{
+		message: message,
+		state:   state,
+		width:   width,
+	}
+}
+
+func (m BannerModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	switch msg := msg.(type) {
+	case BannerState:
+		m.state = msg
+	case string:
+		m.message = msg
+	case error:
+		m.state = BannerErrorState
+		m.message = msg.Error()
+	}
+	return m, nil
+}
+
+func (m BannerModel) View() string {
+	return renderBanner(m)
+}
+
+func renderBanner(model BannerModel) string {
+	var bg lipgloss.Color
+	if model.state == BannerNormalState {
+		bg = lipgloss.Color(PrimaryDark)
+	} else {
+		bg = lipgloss.Color(ErrorColor)
+	}
+
+	return lipgloss.NewStyle().
+		Bold(true).
+		Foreground(lipgloss.Color(PrimaryLight)).
+		Background(lipgloss.Color(bg)).
+		PaddingTop(1).
+		PaddingLeft(1).
+		MarginBottom(1).
+		Width(model.width).
+		Align(lipgloss.Center).
+		Render(model.message + "\n")
+}

pkg/tui/programs.go

@@ -22,6 +22,7 @@ type ProgramsModel struct {
 	help          programsHelpModel
 	busy          busy
 	cursor        int
+	banner        *BannerModel
 	width, height int
 }
 
@@ -34,6 +35,7 @@ func InitialProgramsModel(width, height int) *ProgramsModel {
 		help:     NewProgramsHelpModel(),
 		width:    width,
 		height:   height,
+		banner:   NewBanner("MANAGE PROGRAM LIBRARY", BannerNormalState, width),
 	}
 	return programsView
 }
@@ -72,8 +74,6 @@ func (m ProgramsModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.width = w
 			m.height = h
 		}
-
-		// TODO: handle the errors and stop the polling
 		return m, tea.Batch(ProgramsQuery, tick)
 
 	case tea.WindowSizeMsg:
@@ -166,7 +166,7 @@ func (m ProgramsModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 func (m ProgramsModel) View() string {
-	s := DisplayLogo(m.width)
+	s := m.banner.View() + "\n"
 	s += BaseStyle.Render(m.table.View()) + "\n\n"
 
 	if m.busy.flag {
@@ -194,7 +194,7 @@ func newProgramsTable(Programs vc.Programs, cursor int, width int) table.Model {
 		table.WithColumns(columns),
 		table.WithRows(rows),
 		table.WithFocused(false),
-		table.WithHeight(9),
+		table.WithHeight(16),
 		table.WithWidth(width),
 	)
 

pkg/tui/rooms.go

@@ -24,6 +24,7 @@ type RoomsTableModel struct {
 	busy          busy
 	cursor        int
 	width, height int
+	banner        *BannerModel
 }
 
 func InitialRoomsModel(width, height int) *RoomsTableModel {
@@ -34,6 +35,7 @@ func InitialRoomsModel(width, height int) *RoomsTableModel {
 		help:         NewRoomsHelpModel(),
 		width:        width,
 		height:       height,
+		banner:       NewBanner("MANAGE RUNNING INSTANCES", BannerNormalState, width),
 	}
 	return roomsModel
 }
@@ -46,6 +48,7 @@ func ReturnRoomsModel() *RoomsTableModel {
 		help:         NewRoomsHelpModel(),
 		width:        app.width,
 		height:       app.width,
+		banner:       NewBanner("MANAGE RUNNING INSTANCES", BannerNormalState, app.width),
 	}
 	return roomsModel
 }
@@ -167,7 +170,7 @@ func (m RoomsTableModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 func (m RoomsTableModel) View() string {
-	s := DisplayLogo(m.width)
+	s := m.banner.View() + "\n"
 	s += BaseStyle.Render(m.table.View()) + "\n\n"
 
 	if m.busy.flag {
@@ -190,7 +193,7 @@ func newRoomsTable(rooms vc.Rooms, cursor int, width int) table.Model {
 		table.WithColumns(columns),
 		table.WithRows(rows),
 		table.WithFocused(false),
-		table.WithHeight(9),
+		table.WithHeight(16),
 		table.WithWidth(width),
 	)
 

pkg/tui/service_exec.go

@@ -16,6 +16,7 @@ type VirtualControlServiceModel struct {
 	help            SystemsHelpModel
 	list            list.Model
 	progress        progress.Model
+	banner          *BannerModel
 }
 
 type serviceOption struct {
@@ -49,6 +50,7 @@ func InitialSystemModel() VirtualControlServiceModel {
 		altscreenActive: true,
 		list:            list.New(items, list.NewDefaultDelegate(), 100, 20),
 		progress:        prog,
+		banner:          NewBanner("MANAGE VIRTUAL CONTROL SERVICE", BannerNormalState, app.width),
 	}
 
 	m.list.Title = "Virtual Control Service Actions"
@@ -78,7 +80,8 @@ func (m VirtualControlServiceModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			}
 		case "l", "ctrl+l":
 			if m.list.FilterState() != list.Filtering {
-				return m, tea.Batch(openJournal(), tea.EnterAltScreen)
+				return m, openJournal()
+				// return m, tea.Batch(openJournal(), tea.EnterAltScreen)
 			}
 		case "esc", "ctrl+q", "q":
 			if m.list.FilterState() != list.Filtering {
@@ -95,7 +98,8 @@ func (m VirtualControlServiceModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			case 2:
 				return m, tea.Batch(restartService(), systemTickCmd())
 			case 3:
-				return m, tea.Batch(openJournal(), tea.EnterAltScreen)
+				return m, openJournal()
+				// return m, tea.Batch(openJournal(), tea.EnterAltScreen)
 
 			}
 		}
@@ -126,7 +130,8 @@ func (m VirtualControlServiceModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case progressTick:
 		if m.progress.Percent() == 1.0 {
 			m.progress.SetPercent(0)
-			return m, tea.Batch(openJournal(), tea.EnterAltScreen)
+			// return m, tea.Batch(openJournal(), tea.EnterAltScreen)
+			return m, openJournal()
 		}
 		return m, tea.Batch(systemTickCmd(), m.progress.IncrPercent(0.20))
 	}
@@ -137,7 +142,7 @@ func (m VirtualControlServiceModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 func (m VirtualControlServiceModel) View() string {
-	s := "\n"
+	s := m.banner.View() + "\n"
 	s += docStyle.Render(m.list.View())
 	s += "\n\n\n"