Compare commits

..

7 Commits

Author SHA1 Message Date
june
061006c73b added some maybe functional date parsing for now :3 2025-03-10 21:58:36 +13:00
june
1ec5072ef4 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>
2025-03-10 18:42:06 +13:00
june
3acff6618c Add New Task from Keybind (#3)
press n to add new task, type in title, then press enter to save
Co-authored-by: june <juniper@breadone.xyz>
Co-committed-by: june <juniper@breadone.xyz>
2025-03-10 17:50:38 +13:00
june
ae05b237b4 Fixed textinput bug 2025-03-09 11:20:52 +13:00
june
891ea79d53 added clear terminal function 2025-03-09 11:17:48 +13:00
june
fcb23827e4 fixe bugg 2025-03-09 11:14:33 +13:00
june
117fa5085b YAYAY textinput working now 2025-03-09 11:10:30 +13:00
4 changed files with 128 additions and 37 deletions

View File

@@ -2,8 +2,11 @@ package main
import ( import (
"fmt" "fmt"
"github.com/charmbracelet/lipgloss" "regexp"
"time"
tea "github.com/charmbracelet/bubbletea" tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss"
) )
func (m model) Init() tea.Cmd { func (m model) Init() tea.Cmd {
@@ -14,6 +17,10 @@ func (m model) Init() tea.Cmd {
func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
var cmd tea.Cmd var cmd tea.Cmd
if m.addTask {
m.textinput, cmd = m.textinput.Update(msg)
}
switch msg := msg.(type) { switch msg := msg.(type) {
// Is it a key press? // Is it a key press?
@@ -50,54 +57,108 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
// new task // new task
case "n": case "n":
if !m.addTask {
m.addTask = true m.addTask = true
m.textinput.Focus()
m.textinput.Reset()
}
case "esc": case "esc":
if m.addTask {
m.addTask = false 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 "enter" key and the spacebar (a literal space) toggle
// the selected state for the item that the cursor is pointing at. // 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 {
m.todos[m.cursor].done = false
} else { } else {
m.selected[m.cursor] = struct{}{} m.todos[m.cursor].done = true
} }
}
} }
} }
m.textinput, cmd = m.textinput.Update(msg)
// Return the updated model to the Bubble Tea runtime for processing. // Return the updated model to the Bubble Tea runtime for processing.
// Note that we're not returning a command. // Note that we're not returning a command.
return m, cmd return m, cmd
} }
func AddNewTask(m *model) {
taskTitle := m.textinput.Value()
// parse date in title
var doDate int64 = -1
var deadline int64 = -1
reDate := regexp.MustCompile("\\d{1,2}/\\d{1,2}")
date := reDate.FindStringSubmatch(taskTitle)
if len(date) > 0 {
// what the fuck Go
date, _ := time.Parse("02/01/2006", "10/03/2025")
doDate = date.Unix()
}
t := todo{
name: taskTitle,
done: false,
startdate: doDate,
deadline: deadline,
priority: 1,
isInbox: true,
}
m.todos = append(m.todos, t)
}
func (m model) View() string { func (m model) View() string {
// The header // The header
s := "" s := ""
currentList := []todo{} 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" 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 == midnightToUnix() || t.deadline == 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 == midnightToUnix() + 86400 || t.deadline == 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 // Iterate over our choices
for i, choice := range currentList { for i, value := range currentList {
// Is the cursor pointing at this choice? // Is the cursor pointing at this choice?
cursor := " " // no cursor cursor := " " // no cursor
@@ -107,19 +168,25 @@ func (m model) View() string {
// Is this choice selected? // Is this choice selected?
checked := " " // not 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"
} }
renderedTime := time.Unix(value.startdate, 0)
// Render the row // Render the row
s += fmt.Sprintf("%s [%s] %s\n", cursor, checked, choice) s += fmt.Sprintf("%s [%s] %s %s\n", cursor, checked, value.name, renderedTime)
} }
s += "\n\n"
// render tab bar // render tab bar
for i, v := range []string{"Inbox", "Today", "Tomorrow", "Scheduled", "Anytime"} { for i, v := range []string{"Inbox", "Today", "Tomorrow", "Scheduled", "Anytime"} {
if i == m.tab { if i == m.tab {
s += lipgloss. s += lipgloss.NewStyle().
NewStyle().
Bold(true). Bold(true).
Underline(true). Underline(true).
PaddingRight(3). PaddingRight(3).
@@ -136,8 +203,6 @@ func (m model) View() string {
if m.addTask { if m.addTask {
s += ": " s += ": "
m.textinput.Focus()
m.textinput.Cursor.BlinkCmd()
s += m.textinput.View() s += m.textinput.View()
} }

View File

@@ -1,5 +1,12 @@
package main package main
import (
"os"
"time"
"os/exec"
"runtime"
)
func filter[T any](ss []T, test func(T) bool) (ret []T) { func filter[T any](ss []T, test func(T) bool) (ret []T) {
for _, s := range ss { for _, s := range ss {
if test(s) { if test(s) {
@@ -8,3 +15,20 @@ func filter[T any](ss []T, test func(T) bool) (ret []T) {
} }
return 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()
}

View File

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

View File

@@ -7,15 +7,15 @@ import (
type todo struct { type todo struct {
name string name string
done bool done bool
deadline int deadline int64
startdate int startdate int64
priority int // 1-4, 1 being highest priority, 4 being no priority priority int // 1-4, 1 being highest priority, 4 being no priority
isInbox bool isInbox bool
} }
type model struct { type model struct {
todos []todo // ALL items on the to-do list 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 cursor int // which to-do list item our cursor is pointing at
selected map[int]struct{} // which to-do items are selected selected map[int]struct{} // which to-do items are selected
tab int // which tab is selected tab int // which tab is selected
@@ -36,7 +36,7 @@ func initialModel() model {
// Start empty // Start empty
todos: []todo{}, todos: []todo{},
list: []todo{}, // list: []todo{},
// start on today tab // start on today tab
// 0: inbox, 1: today, 2: tomorrow, 3: scheduled, 4: anytime // 0: inbox, 1: today, 2: tomorrow, 3: scheduled, 4: anytime