Merge pull request #305 from overmindtech/formatting

Rework the visuals and how we store colours
overmindtech · May 16, 2024 · 2550702 · 2550702
2 parents deaf53d + 78d74c2
commit 2550702
Show file tree

Hide file tree

Showing 9 changed files with 362 additions and 355 deletions.
diff --git a/cmd/overmind-theme-dark.json b/cmd/overmind-theme-dark.json
diff --git a/cmd/overmind-theme.json b/cmd/overmind-theme.json
diff --git a/cmd/tea_revlink.go b/cmd/tea_revlink.go
@@ -106,7 +106,7 @@ func (m revlinkWarmupModel) revlinkWarmupCmd() tea.Msg {
 	ctx := m.ctx
 
 	if viper.GetString("ovm-test-fake") != "" {
-		for i := 0; i < 10; i++ {
+		for i := 0; i < 20; i++ {
 			m.status <- &sdp.RevlinkWarmupResponse{
 				Status: "running (test mode)",
 				Items:  int32(i * 10),

diff --git a/cmd/tea_taskmodel.go b/cmd/tea_taskmodel.go
@@ -6,12 +6,10 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
-	"time"
 
 	"github.com/charmbracelet/bubbles/spinner"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/muesli/ansi"
 )
 
 // waitForCancellation returns a tea.Cmd that will wait for SIGINT and SIGTERM and run the provided cancel on receipt.
@@ -69,11 +67,8 @@ func NewTaskModel(title string) taskModel {
 		status: taskStatusPending,
 		title:  title,
 		spinner: spinner.New(
-			spinner.WithSpinner(spinner.Spinner{
-				Frames: []string{"∙∙∙∙∙∙∙", "●∙∙∙∙∙∙", "∙●∙∙∙∙∙", "∙∙●∙∙∙∙", "∙∙∙●∙∙∙", "∙∙∙∙●∙∙", "∙∙∙∙∙●∙", "∙∙∙∙∙∙●"},
-				FPS:    time.Second / 7, //nolint:gomnd
-			}),
-			spinner.WithStyle(lipgloss.NewStyle().Foreground(lipgloss.Color(ColorPalette.Light.BgMain))),
+			spinner.WithSpinner(DotsSpinner),
+			spinner.WithStyle(lipgloss.NewStyle().Foreground(ColorPalette.BgMain)),
 		),
 	}
 }
@@ -110,21 +105,21 @@ func (m taskModel) View() string {
 	label := ""
 	switch m.status {
 	case taskStatusPending:
-		label = m.spinner.Style.Render("pending:")
+		label = lipgloss.NewStyle().Foreground(ColorPalette.LabelFaint).Render("+")
 	case taskStatusRunning:
 		label = m.spinner.View()
 		// all other lables are 7 cells wide
-		for ansi.PrintableRuneWidth(label) <= 7 {
-			label += " "
-		}
+		// for ansi.PrintableRuneWidth(label) <= 7 {
+		// 	label += " "
+		// }
 	case taskStatusDone:
-		label = m.spinner.Style.Render("done:   ")
+		label = lipgloss.NewStyle().Foreground(ColorPalette.BgSuccess).Render("✔︎")
 	case taskStatusError:
-		label = m.spinner.Style.Render("errored:")
+		label = lipgloss.NewStyle().Foreground(ColorPalette.BgDanger).Render("x")
 	case taskStatusSkipped:
-		label = m.spinner.Style.Render("skipped:")
+		label = lipgloss.NewStyle().Foreground(ColorPalette.LabelFaint).Render("-")
 	default:
-		label = m.spinner.Style.Render("unknown:")
+		label = lipgloss.NewStyle().Render("?")
 	}
 
 	return fmt.Sprintf("%v %v", label, m.title)

diff --git a/cmd/tea_terraform.go b/cmd/tea_terraform.go
@@ -55,7 +55,7 @@ func (m cmdModel) Init() tea.Cmd {
 			m.tasks["01_token"].Init(),
 			// m.tasks["02_config"].Init(),
 			func() tea.Msg {
-				time.Sleep(time.Second)
+				time.Sleep(3 * time.Second)
 				return sourcesInitialisedMsg{}
 			},
 			m.tasks["03_revlink"].Init(),
@@ -232,7 +232,6 @@ func (m cmdModel) View() string {
 			if t.TaskModel().status == taskStatusPending {
 				continue
 			}
-
 		}
 		tasks = append(tasks, m.tasks[k].View())
 	}