feat: view for selector

Author: Benzbeeb

models/homepage.go

@@ -1,11 +1,10 @@
 package models
 
 import (
-	"fmt"
-	"github.com/initia-labs/weave/styles"
-
 	tea "github.com/charmbracelet/bubbletea"
+
 	"github.com/initia-labs/weave/models/weaveinit"
+	"github.com/initia-labs/weave/styles"
 	"github.com/initia-labs/weave/utils"
 )
 
@@ -67,20 +66,11 @@ func (m *Homepage) View() string {
 	view := "Hi 👋🏻 Weave is a CLI for managing Initia deployments.\n"
 
 	if m.isFirstTimeSetup {
-		view += fmt.Sprintf(
-			styles.RenderPrompt("It looks like this is your first time using Weave. Let's get started!\nPlease set up a Gas Station account (The account that will hold the funds required by the OPinit-bots or relayer to send transactions):", []string{}, styles.Information),
-			m.TextInput.View(),
-		)
+		view += styles.RenderPrompt("It looks like this is your first time using Weave. Let's get started!\n"+
+			"Please set up a Gas Station account (The account that will hold the funds required by the "+
+			"OPinit-bots or relayer to send transactions):", []string{}, styles.Information) + m.TextInput.View()
 	} else {
-		view += "What would you like to do today?\n"
-		for i, option := range m.Options {
-			if i == m.Cursor {
-				view += "(■) " + string(option) + "\n"
-			} else {
-				view += "( ) " + string(option) + "\n"
-			}
-		}
-		view += "\nPress Enter to select, or q to quit."
+		view += styles.RenderPrompt("What would you like to do today?", []string{}, styles.Question) + m.Selector.View()
 	}
 
 	return view

models/weaveinit/run_l1_node.go

@@ -2,12 +2,12 @@ package weaveinit
 
 import (
 	"fmt"
-	"github.com/initia-labs/weave/styles"
 	"os"
 	"path/filepath"
 
 	tea "github.com/charmbracelet/bubbletea"
 
+	"github.com/initia-labs/weave/styles"
 	"github.com/initia-labs/weave/utils"
 )
 
@@ -66,19 +66,7 @@ func (m *RunL1NodeNetworkSelect) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 func (m *RunL1NodeNetworkSelect) View() string {
-	view := m.state.weave.PreviousResponse + styles.RenderPrompt(
-		m.GetQuestion(),
-		[]string{},
-		styles.Question,
-	) + "\n"
-	for i, option := range m.Options {
-		if i == m.Cursor {
-			view += "(■) " + string(option) + "\n"
-		} else {
-			view += "( ) " + string(option) + "\n"
-		}
-	}
-	return view + "\nPress Enter to select, or q to quit."
+	return styles.RenderPrompt("Which network will your node participate in?", []string{}, styles.Question) + m.Selector.View()
 }
 
 type RunL1NodeVersionInput struct {
@@ -287,19 +275,7 @@ func (m *ExistingAppReplaceSelect) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 func (m *ExistingAppReplaceSelect) View() string {
-	view := m.state.weave.PreviousResponse + styles.RenderPrompt(
-		m.GetQuestion(),
-		[]string{},
-		styles.Question,
-	) + "\n"
-	for i, option := range m.Options {
-		if i == m.Cursor {
-			view += "(■) " + string(option) + "\n"
-		} else {
-			view += "( ) " + string(option) + "\n"
-		}
-	}
-	return view + "\nPress Enter to select, or q to quit."
+	return styles.RenderPrompt("Existing config/app.toml and config/config.toml detected. Would you like to use the current files or replace them", []string{"config/app.toml", "config/config.toml"}, styles.Question) + m.Selector.View()
 }
 
 type MinGasPriceInput struct {
@@ -569,17 +545,11 @@ func (m *ExistingGenesisReplaceSelect) Update(msg tea.Msg) (tea.Model, tea.Cmd)
 func (m *ExistingGenesisReplaceSelect) View() string {
 	view := m.state.weave.PreviousResponse + styles.RenderPrompt(
 		m.GetQuestion(),
-		[]string{},
+		[]string{"config/genesis.json"},
 		styles.Question,
 	) + "\n"
-	for i, option := range m.Options {
-		if i == m.Cursor {
-			view += "(■) " + string(option) + "\n"
-		} else {
-			view += "( ) " + string(option) + "\n"
-		}
-	}
-	return view + "\nPress Enter to select, or q to quit."
+
+	return view + m.Selector.View()
 }
 
 type GenesisEndpointInput struct {

models/weaveinit/weaveinit.go

@@ -2,6 +2,7 @@ package weaveinit
 
 import (
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/initia-labs/weave/styles"
 	"github.com/initia-labs/weave/utils"
 )
 
@@ -49,13 +50,5 @@ func (m *WeaveInit) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 func (m *WeaveInit) View() string {
-	view := "? What action would you like to perform?\n"
-	for i, option := range m.Options {
-		if i == m.Cursor {
-			view += "(■) " + string(option) + "\n"
-		} else {
-			view += "( ) " + string(option) + "\n"
-		}
-	}
-	return view + "\nPress Enter to select, or q to quit."
+	return styles.RenderPrompt("What action would you like to perform?", []string{}, styles.Question) + m.Selector.View()
 }

styles/text.go

@@ -41,6 +41,7 @@ var (
 	QuestionMark    string = Text("? ", Cyan)
 	CorrectMark     string = Text("✓ ", Green)
 	InformationMark string = Text("i ", Cyan)
+	SelectorCursor  string = Text("> ", Cyan)
 )
 
 // RenderPrompt highlights phrases in the text if they match any phrase in the highlights list
@@ -59,7 +60,12 @@ func RenderPrompt(text string, highlights []string, status PromptStatus) string
 	for _, highlight := range highlights {
 		if strings.Contains(text, highlight) {
 			// Apply Cyan color to the matching highlight
-			coloredHighlight := BoldText(highlight, Cyan)
+			coloredHighlight := ""
+			if status == Information {
+				coloredHighlight = BoldText(highlight, White)
+			} else {
+				coloredHighlight = BoldText(highlight, Cyan)
+			}
 			text = strings.ReplaceAll(text, highlight, coloredHighlight)
 		}
 	}

utils/selector.go

@@ -1,6 +1,11 @@
 package utils
 
-import tea "github.com/charmbracelet/bubbletea"
+import (
+	"fmt"
+
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/initia-labs/weave/styles"
+)
 
 type Selector[T any] struct {
 	Options []T
@@ -25,3 +30,16 @@ func (s *Selector[T]) Select(msg tea.Msg) (*T, tea.Cmd) {
 	}
 	return nil, nil
 }
+
+func (s *Selector[T]) View() string {
+	view := "\n"
+	for i, option := range s.Options {
+		if i == s.Cursor {
+			view += styles.SelectorCursor + styles.BoldText(fmt.Sprintf("%v", option), styles.White) + "\n"
+		} else {
+			view += "  " + styles.Text(fmt.Sprintf("%v", option), styles.White) + "\n"
+		}
+	}
+
+	return view + "Press Enter to select, or q to quit.\n"
+}