cleanup

Author: flipswitchingmonkey

styles.go

@@ -30,11 +30,11 @@ const (
 
 var BaseStyle = lipgloss.NewStyle().
 	BorderStyle(lipgloss.NormalBorder()).
-	BorderForeground(lipgloss.Color("240")).Height(20)
+	BorderForeground(lipgloss.Color("240")).Height(5)
 
 var FocusStyle = lipgloss.NewStyle().
 	BorderStyle(lipgloss.ThickBorder()).
-	BorderForeground(lipgloss.Color("250")).Height(20)
+	BorderForeground(lipgloss.Color("250")).Height(5)
 
 var DocStyle = lipgloss.NewStyle().Margin(1, 2)
 
@@ -51,65 +51,10 @@ var H2Style = lipgloss.NewStyle().
 	Foreground(lipgloss.Color(cTextLightGray)).
 	Background(lipgloss.Color(cTitle)).
 	Padding(0, 1).Bold(true)
-
-var DetailTitleStyle = lipgloss.NewStyle().
-	Width(defaultDetailWidth).
-	Foreground(lipgloss.Color(cTextLightGray)).
-	Background(lipgloss.Color(cDetailTitle)).
-	Padding(0, 1).
-	Align(lipgloss.Center)
-var InputTitleStyle = lipgloss.NewStyle().
-	Width(defaultInputWidth).
-	Foreground(lipgloss.Color(cTextLightGray)).
-	Background(lipgloss.Color(cDetailTitle)).
-	Padding(0, 1).
-	Align(lipgloss.Center)
-var SelectedTitle = lipgloss.NewStyle().
-	Border(lipgloss.NormalBorder(), false, false, false, true).
-	BorderForeground(lipgloss.AdaptiveColor{Light: cItemTitleLight, Dark: cItemTitleDark}).
-	Foreground(lipgloss.AdaptiveColor{Light: cItemTitleLight, Dark: cItemTitleDark}).
-	Padding(0, 0, 0, 1)
-var SelectedDesc = SelectedTitle.Copy().
-	Foreground(lipgloss.AdaptiveColor{Light: cItemDescLight, Dark: cItemDescDark})
-var DimmedTitle = lipgloss.NewStyle().
-	Foreground(lipgloss.AdaptiveColor{Light: cDimmedTitleLight, Dark: cDimmedTitleDark}).
-	Padding(0, 0, 0, 2)
-var DimmedDesc = DimmedTitle.Copy().
-	Foreground(lipgloss.AdaptiveColor{Light: cDimmedDescDark, Dark: cDimmedDescLight})
-var InputStyle = lipgloss.NewStyle().
-	Margin(1, 1).
-	Padding(1, 2).
-	Border(lipgloss.RoundedBorder(), true, true, true, true).
-	BorderForeground(lipgloss.Color(cPromptBorder)).
-	Render
-var DetailStyle = lipgloss.NewStyle().
-	Padding(1, 2).
-	Border(lipgloss.ThickBorder(), false, false, false, true).
-	BorderForeground(lipgloss.AdaptiveColor{Light: cItemTitleLight, Dark: cItemTitleDark}).
-	Render
-var ErrStyle = lipgloss.NewStyle().Foreground(lipgloss.Color(cError)).Render
-var NoStyle = lipgloss.NewStyle()
-var FocusedStyle = lipgloss.NewStyle().Foreground(lipgloss.Color(cPromptBorder))
-var BlurredStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("240"))
 var BrightTextStyle = lipgloss.NewStyle().
 	Foreground(lipgloss.AdaptiveColor{Light: cDimmedTitleLight, Dark: cDimmedTitleDark}).Render
 var NormalTextStyle = lipgloss.NewStyle().
 	Foreground(lipgloss.AdaptiveColor{Light: cDimmedDescLight, Dark: cDimmedDescDark})
-var SpecialTextStyle = lipgloss.NewStyle().
-	Width(defaultDetailWidth).
-	Margin(0, 0, 1, 0).
-	Foreground(lipgloss.AdaptiveColor{Light: cItemTitleLight, Dark: cItemTitleDark}).
-	Align(lipgloss.Center).Render
-var DetailsBlockLeft = lipgloss.NewStyle().
-	Width(defaultDetailWidth / 2).
-	Foreground(lipgloss.AdaptiveColor{Light: cDimmedTitleLight, Dark: cDimmedTitleDark}).
-	Align(lipgloss.Right).
-	Render
-var DetailsBlockRight = lipgloss.NewStyle().
-	Width(defaultDetailWidth / 2).
-	Foreground(lipgloss.AdaptiveColor{Light: cDimmedDescLight, Dark: cDimmedDescDark}).
-	Align(lipgloss.Left).
-	Render
 var HelpStyle = list.DefaultStyles().HelpStyle.Width(defaultListWidth).Height(5)
 
 func init() {

view.go

@@ -28,6 +28,10 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			}
 		case tea.WindowSizeMsg:
 			verticalMarginHeight := 2
+			leftSideWidth := m.workerTable.Width()
+			BaseStyle.Height(msg.Height - verticalMarginHeight)
+			FocusStyle.Height(msg.Height - verticalMarginHeight)
+
 			if !m.ready {
 				// Since this program is using the full size of the viewport we
 				// need to wait until we've received the window dimensions before
@@ -40,8 +44,10 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				m.viewport.SetContent(RenderWorkerDetails(m))
 				m.ready = true
 			} else {
-				m.viewport.Width = msg.Width
+				m.viewport.Width = msg.Width - leftSideWidth
+				m.jobsTable.SetWidth(msg.Width)
 				m.viewport.Height = msg.Height - verticalMarginHeight
+				m.jobsTable.SetHeight(msg.Height - verticalMarginHeight * 2)
 			}
 		case tea.KeyMsg:
 			selectedWorkerName, _ := m.GetSelectedRowName()
@@ -102,6 +108,9 @@ func (m model) View() string {
 		rightStyle = FocusStyle
 	}
 
+	var leftSide string
+	leftSide = leftStyle.Render(m.workerTable.View())
+
 	var rightSide string
 	if m.showDetails {
 		rightSide = rightStyle.Render(m.viewport.View())
@@ -111,7 +120,8 @@ func (m model) View() string {
 
 	return lipgloss.JoinHorizontal(
 	  lipgloss.Left,
-	  leftStyle.Render(m.workerTable.View()),
+	  leftSide,
 		rightSide,
 	 )
+	 
 }