Tasks should be filtered into their specific areas (#5)

All inbox tasks should remain in the inbox. all tasks with a start/deadline time of today should be in today. Any task that does have a start date should be in scheduled. All tasks that do not have a start date should be in Anytime.

Fixes #1
Co-authored-by: june <juniper@breadone.xyz>
Co-committed-by: june <juniper@breadone.xyz>

bubbletea.go

@@ -13,6 +13,10 @@ func (m model) Init() tea.Cmd {
 
 func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var cmd tea.Cmd
+
+	if m.addTask {
+		m.textinput, cmd = m.textinput.Update(msg)
+	}
 	
 	switch msg := msg.(type) {
 
@@ -50,54 +54,92 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 		// new task
 		case "n":
-			m.addTask = true
+			if !m.addTask {
+				m.addTask = true
+				m.textinput.Focus()
+				m.textinput.Reset()
+			}
 		
 		case "esc":
-			m.addTask = false
+			if m.addTask {
+				m.addTask = false
+				m.textinput.Reset()
+			}
+
+		case "enter":
+			if m.addTask {
+				AddNewTask(&m)
+				m.addTask = false
+				m.textinput.Reset()
+			}
 
 		// The "enter" key and the spacebar (a literal space) toggle
 		// the selected state for the item that the cursor is pointing at.
-		case "enter", " ":
+		case " ":
-			_, ok := m.selected[m.cursor]
+
-			if ok {
+			if !m.addTask {
-				delete(m.selected, m.cursor)
+				if m.todos[m.cursor].done {
-			} else {
+					m.todos[m.cursor].done = false
-				m.selected[m.cursor] = struct{}{}
+				} else {
+					m.todos[m.cursor].done = true
+				}
 			}
+
 		}
 	}
 
-	m.textinput, cmd = m.textinput.Update(msg)
 
 	// Return the updated model to the Bubble Tea runtime for processing.
 	// Note that we're not returning a command.
 	return m, cmd
 }
 
+func AddNewTask(m *model) {
+	t := todo{
+		name: m.textinput.Value(),
+		done: false,
+		startdate: 0,
+		deadline: 0,
+		priority: 1,
+		isInbox: true,
+	}
+	m.todos = append(m.todos, t)
+}
+
 func (m model) View() string {
 	// The header
 	s := ""
 	currentList := []todo{}
 
-	// switch m.tab {
-	// case 0:
-	// 	s += "Inbox"
-	// 	inboxFilter := func(t todo) bool { return t.isInbox }
-	// 	currentList = filter(m.todos, inboxFilter)
-	// case 1:
-	// 	s += "Today"
-	// case 2:
-	// 	s += "Tomorrow"
-	// case 3:
-	// 	s += "Scheduled"
-	// case 4:
-	// 	s += "Anytime"
-	// }
-
 	s += "GOTD\n\n"
 
+	switch m.tab {
+	case 0:
+		// s += "Inbox"
+		taskFilter := func(t todo) bool { return t.isInbox }
+		currentList = filter(m.todos, taskFilter)
+	case 1:
+		// s += "Today"
+		taskFilter := func(t todo) bool { return t.startdate == int(midnightToUnix()) || t.deadline == int(midnightToUnix()) }
+		currentList = filter(m.todos, taskFilter)
+	case 2:
+		// s += "Tomorrow"
+		// 86400 seconds in 24h, add it on to today's midnight for tomorrow's midnight
+		taskFilter := func(t todo) bool { return t.startdate == int(midnightToUnix()) + 86400 || t.deadline == int(midnightToUnix()) + 86400}
+		currentList = filter(m.todos, taskFilter)
+	case 3:
+		// s += "Scheduled"
+		taskFilter := func(t todo) bool { return t.startdate != -1 }
+		currentList = filter(m.todos, taskFilter)
+	case 4:
+		// s += "Anytime"
+		taskFilter := func(t todo) bool { return t.startdate == -1 }
+		currentList = filter(m.todos, taskFilter)
+	}
+
+
 	// Iterate over our choices
-	for i, choice := range currentList {
+	for i, value := range currentList {
 
 		// Is the cursor pointing at this choice?
 		cursor := " " // no cursor
@@ -107,19 +149,23 @@ func (m model) View() string {
 
 		// Is this choice selected?
 		checked := " " // not selected
-		if _, ok := m.selected[i]; ok {
+		// if _, ok := m.selected[i]; ok {
-			checked = "x" // selected!
+		// 	checked = "x" // selected!
+		// }
+		if value.done {
+			checked = "x"
 		}
 
 		// Render the row
-		s += fmt.Sprintf("%s [%s] %s\n", cursor, checked, choice)
+		s += fmt.Sprintf("%s [%s] %s\n", cursor, checked, value.name)
 	}
 
+	s += "\n\n"
+
 	// render tab bar
 	for i, v := range []string{"Inbox", "Today", "Tomorrow", "Scheduled", "Anytime"} {
 		if i == m.tab {
-			s += lipgloss.
+			s += lipgloss.NewStyle().
-			NewStyle().
 			Bold(true).
 			Underline(true).
 			PaddingRight(3).
@@ -136,8 +182,6 @@ func (m model) View() string {
 
 	if m.addTask {
 		s += ": "
-		m.textinput.Focus()
-		m.textinput.Cursor.BlinkCmd()
 		s += m.textinput.View()
 	}
 

helper.go

@@ -1,5 +1,12 @@
 package main
 
+import (
+    "os"
+    "time"
+    "os/exec"
+    "runtime"
+)
+
 func filter[T any](ss []T, test func(T) bool) (ret []T) {
     for _, s := range ss {
         if test(s) {
@@ -7,4 +14,21 @@ func filter[T any](ss []T, test func(T) bool) (ret []T) {
         }
     }
     return
+}
+
+func midnightToUnix() int64 {
+	now := time.Now()
+	midnight := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
+	return midnight.Unix()
+}
+
+func clearTerminal() {
+    var cmd *exec.Cmd
+    if runtime.GOOS == "windows" {
+        cmd = exec.Command("cmd", "/c", "cls")
+    } else {
+        cmd = exec.Command("clear")
+    }
+    cmd.Stdout = os.Stdout
+    cmd.Run()
 }

main.go

@@ -11,6 +11,8 @@ import (
 )
 
 func main() {
+    clearTerminal()
+
     p := tea.NewProgram(initialModel())
     if _, err := p.Run(); err != nil {
         fmt.Printf("Alas, there's been an error: %v", err)

model.go

@@ -15,7 +15,7 @@ type todo struct {
 
 type model struct {
     todos		[]todo			// ALL items on the to-do list
-	list		[]todo			// items currently visible on the list right now
+	// list		[]todo			// items currently visible on the list right now
     cursor		int					// which to-do list item our cursor is pointing at
     selected	map[int]struct{}	// which to-do items are selected
 	tab			int					// which tab is selected
@@ -36,7 +36,7 @@ func initialModel() model {
 		// Start empty
 		todos:  []todo{},
 
-		list: []todo{},
+		// list: []todo{},
 
 		// start on today tab
 		// 0: inbox, 1: today, 2: tomorrow, 3: scheduled, 4: anytime