move actions list to seprate file

actionsList.go

@@ -0,0 +1,84 @@
+package main
+
+import (
+	"fmt"
+	"gemini_site/gemlog"
+
+	tea "github.com/charmbracelet/bubbletea"
+)
+
+type Action string
+
+const (
+	Write  Action = "write"
+	Read   Action = "read"
+	Edit   Action = "edit"
+	Delete Action = "delete"
+)
+
+var actions = []Action{Write, Read, Edit, Delete}
+
+type ActionListPageModel struct {
+	cursor int
+}
+
+func initialActionListPageModel() ActionListPageModel {
+	return ActionListPageModel{
+		cursor: 0,
+	}
+}
+
+func (m ActionListPageModel) InitActionListPage() tea.Cmd {
+	return nil
+}
+
+func (m ActionListPageModel) Update(msg tea.Msg, ctx *context) (ActionListPageModel, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.KeyMsg:
+		switch msg.String() {
+		case "up", "k":
+			if m.cursor > 0 {
+				m.cursor--
+			}
+		case "down", "j":
+			if m.cursor < len(actions)-1 {
+				m.cursor++
+			}
+		case "enter", " ":
+			action := actions[m.cursor]
+			switch action {
+			case Write:
+				return m, gemlog.WritePostCMD(ctx.config)
+				// case Read:
+				// 	m.ui.page = EntryList
+				// 	m.ui.entryListPage.cursor = 0
+				// 	m.ui.entryListPage.actionToTake = Read
+				// 	return m, gemlog.LoadGemlogCMD(ctx.config)
+				// case Edit:
+				// 	m.ui.page = EntryList
+				// 	m.ui.entryListPage.cursor = 0
+				// 	m.ui.entryListPage.actionToTake = Edit
+				// 	return m, gemlog.LoadGemlogCMD(ctx.config)
+				// case Delete:
+				// 	m.ui.page = EntryList
+				// 	m.ui.entryListPage.cursor = 0
+				// 	m.ui.entryListPage.actionToTake = Delete
+				// 	return m, gemlog.LoadGemlogCMD(m.context.config)
+			}
+		}
+	}
+
+	return m, nil
+}
+
+func (m ActionListPageModel) View() string {
+	s := "Welcome to gemlog cli!\n\nWhat post action would you like to take?\n\n"
+	for i, action := range actions {
+		cursor := " "
+		if m.cursor == i {
+			cursor = ">"
+		}
+		s += fmt.Sprintf("%s %s\n", cursor, action)
+	}
+	return s
+}

main.go

@@ -9,46 +9,27 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 )
 
-type Action string
-
-const (
-	Write  Action = "write"
-	Read   Action = "read"
-	Edit   Action = "edit"
-	Delete Action = "delete"
-)
-
-var actions = []Action{Write, Read, Edit, Delete}
-
-func TODOCmd() tea.Msg {
-	return gemlog.Notification("This action has not been implemented yet. Try another.")
-}
-
 type Page string
 
 const (
 	ActionList Page = "actionList"
-	EntryList  Page = "entryList"
+	// EntryList  Page = "entryList"
-	Entry      Page = "entry"
+	// Entry      Page = "entry"
 )
 
-type entryListPageModel struct {
+// type entryListPageModel struct {
-	entries      []gemlog.GemlogListEntry
+// 	entries      []gemlog.GemlogListEntry
-	actionToTake Action
+// 	actionToTake Action
-	cursor       int
+// 	cursor       int
-}
+// }
-
-type actionListPageModel struct {
-	cursor int
-}
 
 type uiState struct {
 	notification string
 	errorTxt     string
 
 	page Page
-	entryListPage  entryListPageModel
+	// entryListPage  entryListPageModel
-	actionListPage actionListPageModel
+	actionListPage ActionListPageModel
 }
 
 type context struct {
@@ -64,13 +45,11 @@ func initialModel(config *gemlog.Config) model {
 	return model{
 		ui: uiState{
 			page: ActionList,
-			entryListPage: entryListPageModel{
+			// entryListPage: entryListPageModel{
-				cursor:  0,
+			// 	cursor:  0,
-				entries: []gemlog.GemlogListEntry{},
+			// 	entries: []gemlog.GemlogListEntry{},
-			},
+			// },
-			actionListPage: actionListPageModel{
+			actionListPage: initialActionListPageModel(),
-				cursor: 0,
-			},
 		},
 		context: &context{
 			config: config,
@@ -79,70 +58,35 @@ func initialModel(config *gemlog.Config) model {
 }
 
 func (m model) Init() tea.Cmd {
-	return tea.SetWindowTitle("Gemlog CLI")
+	cmds := make([]tea.Cmd, 0)
+	cmds = append(cmds, tea.SetWindowTitle("Gemlog CLI"))
+	// TODO: add init commands from other pages
+	return tea.Batch(cmds...)
 }
 
 func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	cmds := make([]tea.Cmd, 0)
 	switch msg := msg.(type) {
 	case gemlog.ErrorMsg:
 		m.ui.errorTxt = fmt.Sprintf("%s\n\n", fmt.Errorf("%s", msg))
 	case gemlog.Notification:
 		m.ui.notification = fmt.Sprintf("%s\n\n", string(msg))
-	case gemlog.GemLogsLoaded:
-		m.ui.entryListPage.entries = msg.Logs
-		m.ui.entryListPage.cursor = 0
 	case tea.KeyMsg:
 		switch msg.String() {
 		case "ctrl+c", "q":
 			return m, tea.Quit
-		case "up", "k":
-			var cursor *int
-			switch m.ui.page {
-			case EntryList:
-				cursor = &m.ui.entryListPage.cursor
-			case ActionList:
-				cursor = &m.ui.actionListPage.cursor
-			}
-			if cursor != nil && *cursor > 0 {
-				(*cursor)--
-			}
-		case "down", "j":
-			var cursor *int
-			if m.ui.page == EntryList && m.ui.entryListPage.cursor < len(m.ui.entryListPage.entries)-1 {
-				cursor = &m.ui.entryListPage.cursor
-			} else if m.ui.page == ActionList && m.ui.actionListPage.cursor < len(actions)-1 {
-				cursor = &m.ui.actionListPage.cursor
-			}
-			if cursor != nil {
-				(*cursor)++
-			}
-		case "enter", " ":
-			if m.ui.page == ActionList {
-				action := actions[m.ui.actionListPage.cursor]
-				switch action {
-				case Write:
-					return m, gemlog.WritePostCMD(m.context.config)
-				case Read:
-					m.ui.page = EntryList
-					m.ui.entryListPage.cursor = 0
-					m.ui.entryListPage.actionToTake = Read
-					return m, gemlog.LoadGemlogCMD(m.context.config)
-				case Edit:
-					m.ui.page = EntryList
-					m.ui.entryListPage.cursor = 0
-					m.ui.entryListPage.actionToTake = Edit
-					return m, gemlog.LoadGemlogCMD(m.context.config)
-				case Delete:
-					m.ui.page = EntryList
-					m.ui.entryListPage.cursor = 0
-					m.ui.entryListPage.actionToTake = Delete
-					return m, gemlog.LoadGemlogCMD(m.context.config)
-				}
-			}
 		}
 	}
 
-	return m, nil
+	// Delegate to the active page
+	switch m.ui.page {
+	case ActionList:
+		m2, cmd := m.ui.actionListPage.Update(msg, m.context)
+		m.ui.actionListPage = m2
+		cmds = append(cmds, cmd)
+	}
+
+	return m, tea.Batch(cmds...)
 }
 
 func (m model) View() string {
@@ -155,26 +99,19 @@ func (m model) View() string {
 	}
 
 	if m.ui.page == ActionList {
-		s += "Welcome to gemlog cli!\n\nWhat post action would you like to take?\n\n"
+		s += m.ui.actionListPage.View()
-		for i, action := range actions {
-			cursor := " "
-			if m.ui.actionListPage.cursor == i {
-				cursor = ">"
-			}
-			s += fmt.Sprintf("%s %s\n", cursor, action)
-		}
 	}
 
-	if m.ui.page == EntryList {
+	// if m.ui.page == EntryList {
-		s += fmt.Sprintf("Which entry would you like to %s\n\n", m.ui.entryListPage.actionToTake)
+	// 	s += fmt.Sprintf("Which entry would you like to %s\n\n", m.ui.entryListPage.actionToTake)
-		for i, entry := range m.ui.entryListPage.entries {
+	// 	for i, entry := range m.ui.entryListPage.entries {
-			cursor := " "
+	// 		cursor := " "
-			if m.ui.entryListPage.cursor == i {
+	// 		if m.ui.entryListPage.cursor == i {
-				cursor = ">"
+	// 			cursor = ">"
-			}
+	// 		}
-			s += fmt.Sprintf("%s %s : %s\n", cursor, entry.Date, entry.Slug)
+	// 		s += fmt.Sprintf("%s %s : %s\n", cursor, entry.Date, entry.Slug)
-		}
+	// 	}
-	}
+	// }
 
 	s += "\nPress q to quit.\n"
 
@@ -190,13 +127,15 @@ func main() {
 	defer f.Close()
 	slog.Info("Starting gemlog cli")
 	config, err := gemlog.LoadConfig()
-	gemlog.CheckDBConnection(config)
 	if err != nil {
 		fmt.Printf("Error loading config: %v", err)
 		os.Exit(1)
 	}
-
+	err = gemlog.CheckDBConnection(config)
-	// TODO: check if we can reach db before starting program
+	if err != nil {
+		fmt.Printf("Error checking db connection: %v", err)
+		os.Exit(1)
+	}
 	p := tea.NewProgram(initialModel(config))
 	if _, err := p.Run(); err != nil {
 		fmt.Printf("Alas, there's been an error: %v", err)