small refactor

Kaya-Sem · Aug 19, 2024 · 19e4f67 · 19e4f67
1 parent 07e5f2e
commit 19e4f67
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 26 deletions.
diff --git a/cmd/tables/baseTable.go b/cmd/tables/baseTable.go
@@ -10,21 +10,21 @@ import (
 	"github.com/charmbracelet/lipgloss"
 )
 
-type TableData interface {
+type Data interface {
 	api.Connection | api.TimetableDeparture
 }
 
-type TableModel[T TableData] struct {
+type Model[T Data] struct {
 	table           table.Model
 	selectedDetails string
 	showMessage     bool
 	message         string
 	data            []T
 }
 
-func (m *TableModel[T]) Init() tea.Cmd { return nil }
+func (m *Model[T]) Init() tea.Cmd { return nil }
 
-func (m *TableModel[T]) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+func (m *Model[T]) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var teaCmd tea.Cmd
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
@@ -46,16 +46,16 @@ func (m *TableModel[T]) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	return m, teaCmd
 }
 
-func (m *TableModel[T]) View() string {
+func (m *Model[T]) View() string {
 	if m.showMessage {
 		return m.message
 	}
 	tableView := m.table.View()
-	detailsView := detailsBoxStyle.Render(m.selectedDetails)
+	detailsView := DetailsBoxStyle.Render(m.selectedDetails)
 	return lipgloss.JoinHorizontal(lipgloss.Top, tableView, detailsView)
 }
 
-func (m *TableModel[T]) updateSelectedDetails() {
+func (m *Model[T]) updateSelectedDetails() {
 	selectedRow := m.table.SelectedRow()
 	if selectedRow != nil {
 		selectedIndex := m.table.Cursor()
@@ -65,7 +65,7 @@ func (m *TableModel[T]) updateSelectedDetails() {
 	}
 }
 
-func (m *TableModel[T]) getDetailedInfo(item T) string {
+func (m *Model[T]) getDetailedInfo(item T) string {
 	switch v := any(item).(type) {
 	case api.Connection:
 		return getDetailedConnectionInfo(v)
@@ -76,7 +76,7 @@ func (m *TableModel[T]) getDetailedInfo(item T) string {
 	}
 }
 
-func RenderTable[T TableData](
+func RenderTable[T Data](
 	columnItems []table.Column,
 	rowItems []table.Row,
 	data []T,
@@ -98,7 +98,7 @@ func RenderTable[T TableData](
 		Foreground(lipgloss.Color(SelectedForeground)).
 		Background(lipgloss.Color(SelectedBackground))
 	t.SetStyles(s)
-	m := &TableModel[T]{
+	m := &Model[T]{
 		table: t,
 		data:  data,
 	}

diff --git a/cmd/tables/connectionTable.go b/cmd/tables/connectionTable.go
@@ -8,11 +8,11 @@ import (
 
 func getDetailedConnectionInfo(c api.Connection) string {
 	return fmt.Sprintf(`
-Departure in %s
-Destination: %s
-Track: %s
-Departure Time: %s
-Vehicle: %s
+	Departure in %s
+	Destination: %s
+	Track: %s
+	Departure Time: %s
+	Vehicle: %s
 `,
 		CalculateHumanRelativeTime(c),
 		c.Departure.Station,

diff --git a/cmd/tables/tableUtil.go b/cmd/tables/tableUtil.go
@@ -7,8 +7,6 @@ import (
 	"github.com/charmbracelet/lipgloss"
 )
 
-const ()
-
 const (
 	Gray               = "240"
 	White              = "15"
@@ -19,6 +17,8 @@ const (
 	tableHeight        = 10
 )
 
+var DetailsBoxStyle = lipgloss.NewStyle().Padding(1)
+
 var (
 	baseOccupancyStyle = lipgloss.NewStyle().Italic(true)
 

diff --git a/cmd/tables/timetableTable.go b/cmd/tables/timetableTable.go
@@ -4,17 +4,16 @@ import (
 	"fmt"
 	"github.com/Kaya-Sem/commandtrein/cmd"
 	"github.com/Kaya-Sem/commandtrein/cmd/api"
-	"github.com/charmbracelet/lipgloss"
 )
 
 func getDetailedDepartureInfo(d api.TimetableDeparture) string {
 	relativeTime := CalculateHumanRelativeTime(d)
 	return fmt.Sprintf(`
-Departure in: %s
-Track: %s
-Departure Time: %s
-Vehicle: %s
-Occupancy: %s
+	Departure in: %s
+	Track: %s
+	Departure Time: %s
+	Vehicle: %s
+	Occupancy: %s
 `,
 		relativeTime,
 		d.Platform,
@@ -23,6 +22,3 @@ Occupancy: %s
 		styleOccupancy(d.Occupancy.Name),
 	)
 }
-
-// TODO: export to consts
-var detailsBoxStyle = lipgloss.NewStyle().Padding(1)