This commit is contained in:
Martin Pander
2026-03-03 21:11:58 +01:00
parent f6ce2e30dc
commit 6f77b03555
8 changed files with 1409 additions and 295 deletions

18
flake.lock generated
View File

@@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1769996383,
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
"lastModified": 1777988971,
"narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
"rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
"type": "github"
},
"original": {
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1771848320,
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
"lastModified": 1777954456,
"narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2fc6539b481e1d2569f25f8799236694180c0993",
"rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
"type": "github"
},
"original": {
@@ -36,11 +36,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1769909678,
"narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
"lastModified": 1777168982,
"narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "72716169fe93074c333e8d0173151350670b824c",
"rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
"type": "github"
},
"original": {

37
go.mod
View File

@@ -1,28 +1,35 @@
module tasksquire
go 1.25
toolchain go1.25.7
go 1.26.2
require (
charm.land/bubbles/v2 v2.0.0 // indirect
charm.land/bubbletea/v2 v2.0.0 // indirect
charm.land/lipgloss/v2 v2.0.0 // indirect
github.com/charmbracelet/colorprofile v0.4.2 // indirect
github.com/charmbracelet/ultraviolet v0.0.0-20260205113103-524a6607adb8 // indirect
github.com/charmbracelet/x/ansi v0.11.6 // indirect
charm.land/bubbles/v2 v2.1.0
charm.land/bubbletea/v2 v2.0.6
charm.land/huh/v2 v2.0.3
charm.land/lipgloss/v2 v2.0.3
github.com/charmbracelet/x/ansi v0.11.7
golang.org/x/term v0.43.0
)
require (
github.com/atotto/clipboard v0.1.4 // indirect
github.com/catppuccin/go v0.3.0 // indirect
github.com/charmbracelet/colorprofile v0.4.3 // indirect
github.com/charmbracelet/ultraviolet v0.0.0-20260428153724-66037269d7be // indirect
github.com/charmbracelet/x/exp/ordered v0.1.0 // indirect
github.com/charmbracelet/x/exp/strings v0.1.0 // indirect
github.com/charmbracelet/x/term v0.2.2 // indirect
github.com/charmbracelet/x/termios v0.1.1 // indirect
github.com/charmbracelet/x/windows v0.2.2 // indirect
github.com/clipperhouse/displaywidth v0.11.0 // indirect
github.com/clipperhouse/stringish v0.1.1 // indirect
github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
github.com/mattn/go-runewidth v0.0.20 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/lucasb-eyer/go-colorful v1.4.0 // indirect
github.com/mattn/go-runewidth v0.0.23 // indirect
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.41.0 // indirect
golang.org/x/term v0.40.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.44.0 // indirect
)

86
go.sum
View File

@@ -1,50 +1,68 @@
charm.land/bubbles/v2 v2.0.0 h1:tE3eK/pHjmtrDiRdoC9uGNLgpopOd8fjhEe31B/ai5s=
charm.land/bubbles/v2 v2.0.0/go.mod h1:rCHoleP2XhU8um45NTuOWBPNVHxnkXKTiZqcclL/qOI=
charm.land/bubbletea/v2 v2.0.0 h1:p0d6CtWyJXJ9GfzMpUUqbP/XUUhhlk06+vCKWmox1wQ=
charm.land/bubbletea/v2 v2.0.0/go.mod h1:3LRff2U4WIYXy7MTxfbAQ+AdfM3D8Xuvz2wbsOD9OHQ=
charm.land/lipgloss/v2 v2.0.0 h1:sd8N/B3x892oiOjFfBQdXBQp3cAkvjGaU5TvVZC3ivo=
charm.land/lipgloss/v2 v2.0.0/go.mod h1:w6SnmsBFBmEFBodiEDurGS/sdUY/u1+v72DqUzc6J14=
github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco3ej+ngLk1kk=
github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk=
github.com/charmbracelet/colorprofile v0.4.2 h1:BdSNuMjRbotnxHSfxy+PCSa4xAmz7szw70ktAtWRYrY=
github.com/charmbracelet/colorprofile v0.4.2/go.mod h1:0rTi81QpwDElInthtrQ6Ni7cG0sDtwAd4C4le060fT8=
github.com/charmbracelet/ultraviolet v0.0.0-20260205113103-524a6607adb8 h1:eyFRbAmexyt43hVfeyBofiGSEmJ7krjLOYt/9CF5NKA=
github.com/charmbracelet/ultraviolet v0.0.0-20260205113103-524a6607adb8/go.mod h1:SQpCTRNBtzJkwku5ye4S3HEuthAlGy2n9VXZnWkEW98=
github.com/charmbracelet/x/ansi v0.11.6 h1:GhV21SiDz/45W9AnV2R61xZMRri5NlLnl6CVF7ihZW8=
github.com/charmbracelet/x/ansi v0.11.6/go.mod h1:2JNYLgQUsyqaiLovhU2Rv/pb8r6ydXKS3NIttu3VGZQ=
charm.land/bubbles/v2 v2.1.0 h1:YSnNh5cPYlYjPxRrzs5VEn3vwhtEn3jVGRBT3M7/I0g=
charm.land/bubbles/v2 v2.1.0/go.mod h1:l97h4hym2hvWBVfmJDtrEHHCtkIKeTEb3TTJ4ZOB3wY=
charm.land/bubbletea/v2 v2.0.6 h1:UHN/91OyuhaOFGSrBXQ/hMZD8IO1Uc4BvHlgHXL2WJo=
charm.land/bubbletea/v2 v2.0.6/go.mod h1:MH/D8ZLlN3op37vQvijKuU29g3rqTp+aQapURFonF9g=
charm.land/huh/v2 v2.0.3 h1:2cJsMqEPwSywGHvdlKsJyQKPtSJLVnFKyFbsYZTlLkU=
charm.land/huh/v2 v2.0.3/go.mod h1:93eEveeeqn47MwiC3tf+2atZ2l7Is88rAtmZNZ8x9Wc=
charm.land/lipgloss/v2 v2.0.3 h1:yM2zJ4Cf5Y51b7RHIwioil4ApI/aypFXXVHSwlM6RzU=
charm.land/lipgloss/v2 v2.0.3/go.mod h1:7myLU9iG/3xluAWzpY/fSxYYHCgoKTie7laxk6ATwXA=
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
github.com/aymanbagabas/go-udiff v0.4.1 h1:OEIrQ8maEeDBXQDoGCbbTTXYJMYRCRO1fnodZ12Gv5o=
github.com/aymanbagabas/go-udiff v0.4.1/go.mod h1:0L9PGwj20lrtmEMeyw4WKJ/TMyDtvAoK9bf2u/mNo3w=
github.com/catppuccin/go v0.3.0 h1:d+0/YicIq+hSTo5oPuRi5kOpqkVA5tAsU6dNhvRu+aY=
github.com/catppuccin/go v0.3.0/go.mod h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc=
github.com/charmbracelet/colorprofile v0.4.3 h1:QPa1IWkYI+AOB+fE+mg/5/4HRMZcaXex9t5KX76i20Q=
github.com/charmbracelet/colorprofile v0.4.3/go.mod h1:/zT4BhpD5aGFpqQQqw7a+VtHCzu+zrQtt1zhMt9mR4Q=
github.com/charmbracelet/ultraviolet v0.0.0-20260428153724-66037269d7be h1:j7w8VP/D4lu5+/4GamMmFy8nrtadcl82/fjvDgSHwLo=
github.com/charmbracelet/ultraviolet v0.0.0-20260428153724-66037269d7be/go.mod h1:3YdTxlnV/L0bQ3VN8WOSw8doF7LZV/xawUQ4MuAPDvo=
github.com/charmbracelet/x/ansi v0.11.7 h1:kzv1kJvjg2S3r9KHo8hDdHFQLEqn4RBCb39dAYC84jI=
github.com/charmbracelet/x/ansi v0.11.7/go.mod h1:9qGpnAVYz+8ACONkZBUWPtL7lulP9No6p1epAihUZwQ=
github.com/charmbracelet/x/conpty v0.1.1 h1:s1bUxjoi7EpqiXysVtC+a8RrvPPNcNvAjfi4jxsAuEs=
github.com/charmbracelet/x/conpty v0.1.1/go.mod h1:OmtR77VODEFbiTzGE9G1XiRJAga6011PIm4u5fTNZpk=
github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86 h1:JSt3B+U9iqk37QUU2Rvb6DSBYRLtWqFqfxf8l5hOZUA=
github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86/go.mod h1:2P0UgXMEa6TsToMSuFqKFQR+fZTO9CNGUNokkPatT/0=
github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f h1:pk6gmGpCE7F3FcjaOEKYriCvpmIN4+6OS/RD0vm4uIA=
github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f/go.mod h1:IfZAMTHB6XkZSeXUqriemErjAWCCzT0LwjKFYCZyw0I=
github.com/charmbracelet/x/exp/ordered v0.1.0 h1:55/qLwjIh0gL0Vni+QAWk7T/qRVP6sBf+2agPBgnOFE=
github.com/charmbracelet/x/exp/ordered v0.1.0/go.mod h1:5UHwmG+is5THxMyCJHNPCn2/ecI07aKNrW+LcResjJ8=
github.com/charmbracelet/x/exp/strings v0.1.0 h1:i69S2XI7uG1u4NLGeJPSYU++Nmjvpo9nwd6aoEm7gkA=
github.com/charmbracelet/x/exp/strings v0.1.0/go.mod h1:/ehtMPNh9K4odGFkqYJKpIYyePhdp1hLBRvyY4bWkH8=
github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
github.com/charmbracelet/x/termios v0.1.1 h1:o3Q2bT8eqzGnGPOYheoYS8eEleT5ZVNYNy8JawjaNZY=
github.com/charmbracelet/x/termios v0.1.1/go.mod h1:rB7fnv1TgOPOyyKRJ9o+AsTU/vK5WHJ2ivHeut/Pcwo=
github.com/charmbracelet/x/windows v0.2.2 h1:IofanmuvaxnKHuV04sC0eBy/smG6kIKrWG2/jYn2GuM=
github.com/charmbracelet/x/windows v0.2.2/go.mod h1:/8XtdKZzedat74NQFn0NGlGL4soHB0YQZrETF96h75k=
github.com/clipperhouse/displaywidth v0.9.0 h1:Qb4KOhYwRiN3viMv1v/3cTBlz3AcAZX3+y9OLhMtAtA=
github.com/clipperhouse/displaywidth v0.9.0/go.mod h1:aCAAqTlh4GIVkhQnJpbL0T/WfcrJXHcj8C0yjYcjOZA=
github.com/charmbracelet/x/xpty v0.1.3 h1:eGSitii4suhzrISYH50ZfufV3v085BXQwIytcOdFSsw=
github.com/charmbracelet/x/xpty v0.1.3/go.mod h1:poPYpWuLDBFCKmKLDnhBp51ATa0ooD8FhypRwEFtH3Y=
github.com/clipperhouse/displaywidth v0.11.0 h1:lBc6kY44VFw+TDx4I8opi/EtL9m20WSEFgwIwO+UVM8=
github.com/clipperhouse/displaywidth v0.11.0/go.mod h1:bkrFNkf81G8HyVqmKGxsPufD3JhNl3dSqnGhOoSD/o0=
github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
github.com/clipperhouse/uax29/v2 v2.5.0 h1:x7T0T4eTHDONxFJsL94uKNKPHrclyFI0lm7+w94cO8U=
github.com/clipperhouse/uax29/v2 v2.5.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk=
github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag=
github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
github.com/mattn/go-runewidth v0.0.20 h1:WcT52H91ZUAwy8+HUkdM3THM6gXqXuLJi9O3rjcQQaQ=
github.com/mattn/go-runewidth v0.0.20/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4=
github.com/lucasb-eyer/go-colorful v1.4.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
github.com/mattn/go-runewidth v0.0.23 h1:7ykA0T0jkPpzSvMS5i9uoNn2Xy3R383f9HDx3RybWcw=
github.com/mattn/go-runewidth v0.0.23/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=
github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=
golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4=
golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk=

View File

@@ -0,0 +1,34 @@
package components
import (
tea "charm.land/bubbletea/v2"
"charm.land/huh/v2"
)
type Page struct {
form huh.Form
}
type MultiPageForm struct {
// pages []Page
form huh.Form
}
func NewMultiPageForm(form huh.Form) *MultiPageForm {
return &MultiPageForm{
form: form,
}
}
func (f *MultiPageForm) Init() tea.Cmd {
return nil
}
func (f *MultiPageForm) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
_, cmd := f.form.Update(msg)
return f, cmd
}
func (f *MultiPageForm) View() tea.View {
return tea.NewView(f.form.View())
}

File diff suppressed because it is too large Load Diff

View File

@@ -3,8 +3,8 @@ package pages
import (
"tasksquire/internal/common"
tea "charm.land/bubbletea/v2"
"charm.land/bubbles/v2/key"
tea "charm.land/bubbletea/v2"
"charm.land/lipgloss/v2"
)
@@ -48,7 +48,7 @@ func (m *MainPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
m.common.SetSize(msg.Width, msg.Height)
tabHeight := lipgloss.Height(m.renderTabBar())
contentHeight := max(msg.Height - tabHeight, 0)
contentHeight := max(msg.Height-tabHeight, 0)
newMsg := tea.WindowSizeMsg{Width: msg.Width, Height: contentHeight}
activePage, cmd := m.activePage.Update(newMsg)
@@ -58,14 +58,14 @@ func (m *MainPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
case tea.KeyMsg:
// Only handle tab key for page switching when at the top level (no subpages active)
if key.Matches(msg, m.common.Keymap.Next) && !m.common.HasSubpages() {
// if m.activePage == m.taskPage {
// m.activePage = m.timePage
// m.currentTab = 1
// } else {
// m.activePage = m.taskPage
// m.currentTab = 0
// }
//
// if m.activePage == m.taskPage {
// m.activePage = m.timePage
// m.currentTab = 1
// } else {
// m.activePage = m.taskPage
// m.currentTab = 0
// }
//
tabHeight := lipgloss.Height(m.renderTabBar())
contentHeight := m.height - tabHeight
if contentHeight < 0 {
@@ -100,7 +100,7 @@ func (m *MainPage) renderTabBar() string {
}
func (m *MainPage) View() tea.View {
v := tea.NewView(lipgloss.JoinVertical(lipgloss.Left, m.renderTabBar(), m.activePage.View().Content))
v := tea.NewView(lipgloss.NewStyle().Margin(1, 3).Render(lipgloss.JoinVertical(lipgloss.Left, m.renderTabBar(), m.activePage.View().Content)))
v.AltScreen = true
return v
// return lipgloss.JoinVertical(lipgloss.Left, m.renderTabBar(), m.activePage.View())

View File

@@ -6,9 +6,9 @@ import (
"tasksquire/internal/components/table"
"tasksquire/internal/taskwarrior"
"charm.land/bubbles/v2/key"
tea "charm.land/bubbletea/v2"
"charm.land/lipgloss/v2"
"charm.land/bubbles/v2/key"
)
type TaskPage struct {
@@ -33,11 +33,11 @@ type TaskPage struct {
func NewTaskPage(com *common.Common, report *taskwarrior.Report) *TaskPage {
p := &TaskPage{
common: com,
activeReport: report,
activeContext: com.TW.GetActiveContext(),
activeProject: "",
taskTable: table.New(),
common: com,
activeReport: report,
activeContext: com.TW.GetActiveContext(),
activeProject: "",
taskTable: table.New(),
// detailsPanelActive: false,
// detailsViewer: detailsviewer.New(com),
}
@@ -61,7 +61,7 @@ func (p *TaskPage) SetSize(width int, height int) {
// // Set component size (component handles its own border/padding)
// // p.detailsViewer.SetSize(baseWidth, detailsHeight)
// } else {
tableHeight = baseHeight
tableHeight = baseHeight
// }
p.taskTable.SetWidth(baseWidth)
@@ -75,170 +75,170 @@ func (p *TaskPage) Init() tea.Cmd {
func (p *TaskPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
var cmds []tea.Cmd
switch msg := msg.(type) {
case tea.WindowSizeMsg:
p.SetSize(msg.Width, msg.Height)
// case BackMsg:
case common.TickMsg:
cmds = append(cmds, p.getTasks())
cmds = append(cmds, common.DoTick())
return p, tea.Batch(cmds...)
case common.TaskMsg:
p.tasks = taskwarrior.Tasks(msg)
p.populateTaskTable(p.tasks)
// case UpdateReportMsg:
// p.activeReport = msg
// cmds = append(cmds, p.getTasks())
// case UpdateContextMsg:
// p.activeContext = msg
// p.common.TW.SetContext(msg)
// cmds = append(cmds, p.getTasks())
// case UpdateProjectMsg:
// p.activeProject = string(msg)
// cmds = append(cmds, p.getTasks())
// case TaskPickedMsg:
// if msg.Task != nil && msg.Task.Status == "pending" {
// p.common.TW.StopActiveTasks()
// p.common.TW.StartTask(msg.Task)
// }
// cmds = append(cmds, p.getTasks())
// case UpdatedTasksMsg:
// cmds = append(cmds, p.getTasks())
case tea.KeyPressMsg:
// Handle ESC when details panel is active
// if p.detailsPanelActive && key.Matches(msg, p.common.Keymap.Back) {
// p.detailsPanelActive = false
// p.detailsViewer.Blur()
// p.SetSize(p.common.Width(), p.common.Height())
// return p, nil
// }
case tea.WindowSizeMsg:
p.SetSize(msg.Width, msg.Height)
// case BackMsg:
case common.TickMsg:
cmds = append(cmds, p.getTasks())
cmds = append(cmds, common.DoTick())
return p, tea.Batch(cmds...)
case common.TaskMsg:
p.tasks = taskwarrior.Tasks(msg)
p.populateTaskTable(p.tasks)
// case UpdateReportMsg:
// p.activeReport = msg
// cmds = append(cmds, p.getTasks())
// case UpdateContextMsg:
// p.activeContext = msg
// p.common.TW.SetContext(msg)
// cmds = append(cmds, p.getTasks())
// case UpdateProjectMsg:
// p.activeProject = string(msg)
// cmds = append(cmds, p.getTasks())
// case TaskPickedMsg:
// if msg.Task != nil && msg.Task.Status == "pending" {
// p.common.TW.StopActiveTasks()
// p.common.TW.StartTask(msg.Task)
// }
// cmds = append(cmds, p.getTasks())
// case UpdatedTasksMsg:
// cmds = append(cmds, p.getTasks())
case tea.KeyPressMsg:
// Handle ESC when details panel is active
// if p.detailsPanelActive && key.Matches(msg, p.common.Keymap.Back) {
// p.detailsPanelActive = false
// p.detailsViewer.Blur()
// p.SetSize(p.common.Width(), p.common.Height())
// return p, nil
// }
switch {
case key.Matches(msg, p.common.Keymap.Quit):
return p, tea.Quit
}
// case key.Matches(msg, p.common.Keymap.SetReport):
// p.subpage = NewReportPickerPage(p.common, p.activeReport)
// cmd := p.subpage.Init()
// p.common.PushPage(p)
// return p.subpage, cmd
// case key.Matches(msg, p.common.Keymap.SetContext):
// p.subpage = NewContextPickerPage(p.common)
// cmd := p.subpage.Init()
// p.common.PushPage(p)
// return p.subpage, cmd
// case key.Matches(msg, p.common.Keymap.Add):
// p.subpage = NewTaskEditorPage(p.common, taskwarrior.NewTask())
// cmd := p.subpage.Init()
// p.common.PushPage(p)
// return p.subpage, cmd
// case key.Matches(msg, p.common.Keymap.Edit):
// p.subpage = NewTaskEditorPage(p.common, *p.selectedTask)
// cmd := p.subpage.Init()
// p.common.PushPage(p)
// return p.subpage, cmd
// case key.Matches(msg, p.common.Keymap.Subtask):
// if p.selectedTask != nil {
// // Create new task inheriting parent's attributes
// newTask := taskwarrior.NewTask()
//
// // Set parent relationship
// newTask.Parent = p.selectedTask.Uuid
//
// // Copy parent's attributes
// newTask.Project = p.selectedTask.Project
// newTask.Priority = p.selectedTask.Priority
// newTask.Tags = make([]string, len(p.selectedTask.Tags))
// copy(newTask.Tags, p.selectedTask.Tags)
//
// // Copy UDAs (except "details" which is task-specific)
// if p.selectedTask.Udas != nil {
// newTask.Udas = make(map[string]any)
// for k, v := range p.selectedTask.Udas {
// // Skip "details" UDA - it's specific to parent task
// if k == "details" {
// continue
// }
// // Deep copy other UDA values
// newTask.Udas[k] = v
// }
// }
//
// // Open task editor with pre-populated task
// p.subpage = NewTaskEditorPage(p.common, newTask)
// cmd := p.subpage.Init()
// p.common.PushPage(p)
// return p.subpage, cmd
// }
// return p, nil
// case key.Matches(msg, p.common.Keymap.Ok):
// p.common.TW.SetTaskDone(p.selectedTask)
// return p, p.getTasks()
// case key.Matches(msg, p.common.Keymap.Delete):
// p.common.TW.DeleteTask(p.selectedTask)
// return p, p.getTasks()
// case key.Matches(msg, p.common.Keymap.SetProject):
// p.subpage = NewProjectPickerPage(p.common, p.activeProject)
// cmd := p.subpage.Init()
// p.common.PushPage(p)
// return p.subpage, cmd
// case key.Matches(msg, p.common.Keymap.PickProjectTask):
// p.subpage = NewProjectTaskPickerPage(p.common)
// cmd := p.subpage.Init()
// p.common.PushPage(p)
// return p.subpage, cmd
// case key.Matches(msg, p.common.Keymap.Tag):
// if p.selectedTask != nil {
// tag := p.common.TW.GetConfig().Get("uda.tasksquire.tag.default")
// if p.selectedTask.HasTag(tag) {
// p.selectedTask.RemoveTag(tag)
// } else {
// p.selectedTask.AddTag(tag)
// }
// p.common.TW.ImportTask(p.selectedTask)
// return p, p.getTasks()
// }
// return p, nil
// case key.Matches(msg, p.common.Keymap.Undo):
// p.common.TW.Undo()
// return p, p.getTasks()
// case key.Matches(msg, p.common.Keymap.StartStop):
// if p.selectedTask != nil && p.selectedTask.Status == "pending" {
// if p.selectedTask.Start == "" {
// p.common.TW.StopActiveTasks()
// p.common.TW.StartTask(p.selectedTask)
// } else {
// p.common.TW.StopTask(p.selectedTask)
// }
// return p, p.getTasks()
// }
// case key.Matches(msg, p.common.Keymap.ViewDetails):
// if p.selectedTask != nil {
// // Toggle details panel
// p.detailsPanelActive = !p.detailsPanelActive
// if p.detailsPanelActive {
// p.detailsViewer.SetTask(p.selectedTask)
// p.detailsViewer.Focus()
// } else {
// p.detailsViewer.Blur()
// }
// p.SetSize(p.common.Width(), p.common.Height())
// return p, nil
// }
// }
// }
//
var cmd tea.Cmd
//
// // Route keyboard messages to details viewer when panel is active
// if p.detailsPanelActive {
// var viewerCmd tea.Cmd
// var viewerModel tea.Model
// viewerModel, viewerCmd = p.detailsViewer.Update(msg)
// p.detailsViewer = viewerModel.(*detailsviewer.DetailsViewer)
// cmds = append(cmds, viewerCmd)
// } else {
// // Route to table when details panel not active
p.taskTable, cmd = p.taskTable.Update(msg)
switch {
case key.Matches(msg, p.common.Keymap.Quit):
return p, tea.Quit
}
// case key.Matches(msg, p.common.Keymap.SetReport):
// p.subpage = NewReportPickerPage(p.common, p.activeReport)
// cmd := p.subpage.Init()
// p.common.PushPage(p)
// return p.subpage, cmd
// case key.Matches(msg, p.common.Keymap.SetContext):
// p.subpage = NewContextPickerPage(p.common)
// cmd := p.subpage.Init()
// p.common.PushPage(p)
// return p.subpage, cmd
// case key.Matches(msg, p.common.Keymap.Add):
// p.subpage = NewTaskEditorPage(p.common, taskwarrior.NewTask())
// cmd := p.subpage.Init()
// p.common.PushPage(p)
// return p.subpage, cmd
// case key.Matches(msg, p.common.Keymap.Edit):
// p.subpage = NewTaskEditorPage(p.common, *p.selectedTask)
// cmd := p.subpage.Init()
// p.common.PushPage(p)
// return p.subpage, cmd
// case key.Matches(msg, p.common.Keymap.Subtask):
// if p.selectedTask != nil {
// // Create new task inheriting parent's attributes
// newTask := taskwarrior.NewTask()
//
// // Set parent relationship
// newTask.Parent = p.selectedTask.Uuid
//
// // Copy parent's attributes
// newTask.Project = p.selectedTask.Project
// newTask.Priority = p.selectedTask.Priority
// newTask.Tags = make([]string, len(p.selectedTask.Tags))
// copy(newTask.Tags, p.selectedTask.Tags)
//
// // Copy UDAs (except "details" which is task-specific)
// if p.selectedTask.Udas != nil {
// newTask.Udas = make(map[string]any)
// for k, v := range p.selectedTask.Udas {
// // Skip "details" UDA - it's specific to parent task
// if k == "details" {
// continue
// }
// // Deep copy other UDA values
// newTask.Udas[k] = v
// }
// }
//
// // Open task editor with pre-populated task
// p.subpage = NewTaskEditorPage(p.common, newTask)
// cmd := p.subpage.Init()
// p.common.PushPage(p)
// return p.subpage, cmd
// }
// return p, nil
// case key.Matches(msg, p.common.Keymap.Ok):
// p.common.TW.SetTaskDone(p.selectedTask)
// return p, p.getTasks()
// case key.Matches(msg, p.common.Keymap.Delete):
// p.common.TW.DeleteTask(p.selectedTask)
// return p, p.getTasks()
// case key.Matches(msg, p.common.Keymap.SetProject):
// p.subpage = NewProjectPickerPage(p.common, p.activeProject)
// cmd := p.subpage.Init()
// p.common.PushPage(p)
// return p.subpage, cmd
// case key.Matches(msg, p.common.Keymap.PickProjectTask):
// p.subpage = NewProjectTaskPickerPage(p.common)
// cmd := p.subpage.Init()
// p.common.PushPage(p)
// return p.subpage, cmd
// case key.Matches(msg, p.common.Keymap.Tag):
// if p.selectedTask != nil {
// tag := p.common.TW.GetConfig().Get("uda.tasksquire.tag.default")
// if p.selectedTask.HasTag(tag) {
// p.selectedTask.RemoveTag(tag)
// } else {
// p.selectedTask.AddTag(tag)
// }
// p.common.TW.ImportTask(p.selectedTask)
// return p, p.getTasks()
// }
// return p, nil
// case key.Matches(msg, p.common.Keymap.Undo):
// p.common.TW.Undo()
// return p, p.getTasks()
// case key.Matches(msg, p.common.Keymap.StartStop):
// if p.selectedTask != nil && p.selectedTask.Status == "pending" {
// if p.selectedTask.Start == "" {
// p.common.TW.StopActiveTasks()
// p.common.TW.StartTask(p.selectedTask)
// } else {
// p.common.TW.StopTask(p.selectedTask)
// }
// return p, p.getTasks()
// }
// case key.Matches(msg, p.common.Keymap.ViewDetails):
// if p.selectedTask != nil {
// // Toggle details panel
// p.detailsPanelActive = !p.detailsPanelActive
// if p.detailsPanelActive {
// p.detailsViewer.SetTask(p.selectedTask)
// p.detailsViewer.Focus()
// } else {
// p.detailsViewer.Blur()
// }
// p.SetSize(p.common.Width(), p.common.Height())
// return p, nil
// }
// }
// }
//
var cmd tea.Cmd
//
// // Route keyboard messages to details viewer when panel is active
// if p.detailsPanelActive {
// var viewerCmd tea.Cmd
// var viewerModel tea.Model
// viewerModel, viewerCmd = p.detailsViewer.Update(msg)
// p.detailsViewer = viewerModel.(*detailsviewer.DetailsViewer)
// cmds = append(cmds, viewerCmd)
// } else {
// // Route to table when details panel not active
p.taskTable, cmd = p.taskTable.Update(msg)
cmds = append(cmds, cmd)
if len(p.tasks) > 0 {
@@ -246,7 +246,7 @@ func (p *TaskPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
} else {
p.selectedTask = nil
}
// }
// }
}
return p, tea.Batch(cmds...)
@@ -259,21 +259,23 @@ func (p *TaskPage) View() tea.View {
tableView := p.taskTable.View()
//
// if !p.detailsPanelActive {
// return tableView
// }
//
// // Combine table and details panel vertically
// return lipgloss.JoinVertical(
// lipgloss.Left,
// tableView,
// p.detailsViewer.View(),
// )
// }
//
return tea.NewView(tableView)
}
//
// if !p.detailsPanelActive {
// return tableView
// }
//
// // Combine table and details panel vertically
// return lipgloss.JoinVertical(
// lipgloss.Left,
// tableView,
// p.detailsViewer.View(),
// )
// }
//
func (p *TaskPage) populateTaskTable(tasks taskwarrior.Tasks) {
if len(tasks) == 0 {
return
@@ -286,15 +288,15 @@ func (p *TaskPage) populateTaskTable(tasks taskwarrior.Tasks) {
baseWidth := p.common.Width() - p.common.Styles.Base.GetHorizontalFrameSize()
var tableHeight int
// if p.detailsPanelActive {
// // Allocate 60% for table, 40% for details panel
// // Minimum 5 lines for details, minimum 10 lines for table
// detailsHeight := max(min(baseHeight*2/5, baseHeight-10), 5)
// tableHeight = baseHeight - detailsHeight - 1 // -1 for spacing
// } else {
tableHeight = baseHeight
// }
//
// if p.detailsPanelActive {
// // Allocate 60% for table, 40% for details panel
// // Minimum 5 lines for details, minimum 10 lines for table
// detailsHeight := max(min(baseHeight*2/5, baseHeight-10), 5)
// tableHeight = baseHeight - detailsHeight - 1 // -1 for spacing
// } else {
tableHeight = baseHeight
// }
//
numCols := len(p.activeReport.Columns)
taskRows := make([]table.Row, len(tasks))
@@ -302,40 +304,40 @@ func (p *TaskPage) populateTaskTable(tasks taskwarrior.Tasks) {
widths := make([]int, numCols)
for i, task := range tasks {
row := make(table.Row, numCols)
for j, colKey := range p.activeReport.Columns {
val := task.GetString(colKey)
row[j] = val
widths[j] = max(widths[j], lipgloss.Width(val))
}
taskRows[i] = row
taskStyles[i] = common.GetTaskTabelStyle(task, *p.common)
row := make(table.Row, numCols)
for j, colKey := range p.activeReport.Columns {
val := task.GetString(colKey)
row[j] = val
widths[j] = max(widths[j], lipgloss.Width(val))
}
taskRows[i] = row
taskStyles[i] = common.GetTaskTabelStyle(task, *p.common)
}
var columns []table.Column
for j, w := range widths {
title := p.activeReport.Labels[j]
title := p.activeReport.Labels[j]
width := 0
if w > 0 {
width = max(w, lipgloss.Width(title))
}
columns = append(columns, table.Column{
Title: title,
Width: width,
})
width := 0
if w > 0 {
width = max(w, lipgloss.Width(title))
}
columns = append(columns, table.Column{
Title: title,
Width: width,
})
}
if len(columns) > 0 {
usedWidth := 0
for i := 0; i < len(columns)-1; i++ {
usedWidth += columns[i].Width + 1 // padding/border offset
}
usedWidth := 0
for i := 0; i < len(columns)-1; i++ {
usedWidth += columns[i].Width + 1 // padding/border offset
}
remaining := p.taskTable.Width() - usedWidth - 1
lastIdx := len(columns) - 1
columns[lastIdx].Width = max(columns[lastIdx].Width, remaining)
remaining := p.taskTable.Width() - usedWidth - 1
lastIdx := len(columns) - 1
columns[lastIdx].Width = max(columns[lastIdx].Width, remaining)
}
p.taskTable = table.New(
@@ -346,9 +348,9 @@ func (p *TaskPage) populateTaskTable(tasks taskwarrior.Tasks) {
table.WithWidth(baseWidth),
table.WithHeight(tableHeight),
table.WithStyles(table.Styles{
Header: p.common.Styles.TableStyle.Header ,
Cell: p.common.Styles.TableStyle.Cell,
Selected: p.common.Styles.TableStyle.Selected,
Header: p.common.Styles.TableStyle.Header,
Cell: p.common.Styles.TableStyle.Cell,
Selected: p.common.Styles.TableStyle.Selected,
}),
)
@@ -360,11 +362,11 @@ func (p *TaskPage) populateTaskTable(tasks taskwarrior.Tasks) {
} else {
p.taskTable.SetCursor(len(p.tasks) - 1)
}
//
// // Refresh details content if panel is active
// if p.detailsPanelActive && p.selectedTask != nil {
// p.detailsViewer.SetTask(p.selectedTask)
// }
// // Refresh details content if panel is active
//
// if p.detailsPanelActive && p.selectedTask != nil {
// p.detailsViewer.SetTask(p.selectedTask)
// }
}
func (p *TaskPage) getTasks() tea.Cmd {

10
todo.md Normal file
View File

@@ -0,0 +1,10 @@
- [>] Integrate task editor
- v1
* Single huh form
- v2
* custom pages
- [ ] Integrate report switcher
- [ ] Use modal (lipgloss compositing?)
- [ ] Make modal reusable for other switchers
- [x] Add padding to main page