Delete the extra line break in spinner hint (#43)

tidbcloud · Dec 5, 2022 · 97bf81b · 97bf81b
1 parent 190538a
commit 97bf81b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/internal/cli/cluster/create.go b/internal/cli/cluster/create.go
@@ -336,7 +336,7 @@ func CreateAndSpinnerWait(d cloud.TiDBCloudClient, projectID string, clusterDefB
 		}
 	}
 
-	p := tea.NewProgram(ui.InitialSpinnerModel(task, "Waiting for cluster to be ready...\n"))
+	p := tea.NewProgram(ui.InitialSpinnerModel(task, "Waiting for cluster to be ready"))
 	createModel, err := p.StartReturningModel()
 	if err != nil {
 		return errors.Trace(err)

diff --git a/internal/ui/spinner_model.go b/internal/ui/spinner_model.go
@@ -15,6 +15,7 @@
 package ui
 
 import (
+	"github.com/charmbracelet/lipgloss"
 	"github.com/fatih/color"
 
 	"github.com/charmbracelet/bubbles/spinner"
@@ -37,7 +38,7 @@ type Result string
 func InitialSpinnerModel(task tea.Cmd, hint string) SpinnerModel {
 	s := spinner.New()
 	s.Spinner = spinner.Points
-	//s.Style = lipgloss.NewStyle().Foreground(lipgloss.Color("205"))
+	s.Style = lipgloss.NewStyle().Foreground(lipgloss.Color("32"))
 	return SpinnerModel{spinner: s, Task: task, Output: "", Hint: hint}
 }
 
@@ -72,7 +73,7 @@ func (m SpinnerModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 func (m SpinnerModel) View() string {
-	str := color.New(color.FgYellow).Sprintf("%s %s.", m.spinner.View(), m.Hint) + "\n"
+	str := color.New(color.FgYellow).Sprintf("%s %s.", m.spinner.View(), color.BlueString(m.Hint)) + "\n"
 	if m.quitting {
 		return str + "\n"
 	}