feat: the logo on top of the status pane, as text further down #18

Merged
keb merged 2 commits from feat/logo into main 2026-10-11 14:29:38 +02:00
5 changed files with 49 additions and 2 deletions
Showing only changes of commit 5bbb3f42c9 - Show all commits

No files matched your search

+2 -1
View File
@@ -113,7 +113,8 @@ Secrets. Going into it (`l`, or `4`) keeps it on that; there `j`/`k`,
it's hidden.
On top, the status pane (`0`) shows the version, a newer release and how
your accounts are doing. Focused, the right pane lists more: the version
your accounts are doing. Focused, the right pane lists more under the
logo (when there's room): the version
and updates (`U`), each account (`L` on one that needs it signs in), the
config, state and cache files (`e` opens one in your editor), and links
to the docs, source, issues, releases and changelog (`o` opens one; on
+6 -1
View File
@@ -1190,7 +1190,7 @@ func TestStatusPane(t *testing.T) {
t.Fatalf("focus %v", d.m.focus)
}
scr := d.screen()
for _, want := range []string{"version v0.1.0", "GPL-3.0-or-later", "Azure · 2 subscriptions", "Azure · admin · sign-in required",
for _, want := range []string{logo[2], "version v0.1.0", "GPL-3.0-or-later", "Azure · 2 subscriptions", "Azure · admin · sign-in required",
"/cfg/config.yaml", "/state/state.json", "lazysecrets/…/docs"} {
if !strings.Contains(scr, want) {
t.Errorf("missing %q:\n%s", want, scr)
@@ -1216,6 +1216,11 @@ func TestStatusPane(t *testing.T) {
if len(opened) != 1 || !strings.HasSuffix(opened[0], "/src/branch/main/docs") {
t.Errorf("o opened %q", opened)
}
d.m.fields.SelectWhere(func(f panes.Field) bool { return f.Label == "version" })
d.keys("o")
if len(opened) != 2 || !strings.HasSuffix(opened[1], "/releases/tag/v0.1.0") {
t.Errorf("o on the version opened %q", opened)
}
d.keys("shift+tab")
if d.m.focus != paneStatus {
t.Errorf("back to %v", d.m.focus)
+2
View File
@@ -50,6 +50,7 @@ func (m *Model) syncFields() tea.Cmd {
m.fields.Hide()
return nil
}
m.fields.Header = nil
switch m.detailOf() {
case paneSources:
r, ok := m.sources.Selected()
@@ -68,6 +69,7 @@ func (m *Model) syncFields() tea.Cmd {
m.fields.Show("", nil)
}
case paneStatus:
m.fields.Header = logo
m.fields.Show("lazysecrets", m.statusFields())
case paneContainers:
if c, ok := m.containers.Selected(); ok {
+10
View File
@@ -16,6 +16,16 @@ import (
// (0), the right pane has the rest: updates, each account, the files
// lazysecrets uses, links, and the changelog.
// logo heads the status pane's rows.
var logo = []string{
` _ _`,
`| | __ _ _____ _ ___ ___ ___ _ __ ___| |_ ___`,
`| |/ _` + "`" + ` |_ / | | / __|/ _ \/ __| '__/ _ \ __/ __|`,
`| | (_| |/ /| |_| \__ \ __/ (__| | | __/ |_\__ \`,
`|_|\__,_/___|\__, |___/\___|\___|_| \___|\__|___/`,
` |___/`,
}
// statusH is the status pane's height: one line in a box.
const statusH = 3
+29
View File
@@ -37,6 +37,9 @@ type List[T any] struct {
// Age says how old the items are ("2h ago") while they reload, by
// the counter.
Age string
// Header lines (a logo) go above the items, when the pane has room
// for them and there's no filter.
Header []string
item Item[T]
items []T
@@ -163,9 +166,29 @@ func (l List[T]) rows() int {
if l.filtering {
r--
}
if l.headerShown() {
r -= len(l.Header) + 1
}
return max(0, r)
}
// headerMinRows is how many item rows the header leaves at least.
const headerMinRows = 5
// headerShown reports whether Header fits: as wide as the pane allows,
// leaving headerMinRows, a blank line under it, and no filter.
func (l List[T]) headerShown() bool {
if len(l.Header) == 0 || l.filtering || l.input.Value() != "" {
return false
}
for _, line := range l.Header {
if ansi.StringWidth(line) > l.w-3 {
return false
}
}
return l.h-2-len(l.Header)-1 >= headerMinRows
}
// Filtering reports whether the filter input has focus.
func (l List[T]) Filtering() bool { return l.filtering }
@@ -329,6 +352,12 @@ func (l List[T]) View(st styles.Styles, focused bool, spin string) string {
if l.filtering {
body = append(body, l.input.View())
}
if l.headerShown() {
for _, line := range l.Header {
body = append(body, st.Notice.Render(" "+line))
}
body = append(body, "")
}
switch {
case l.Loading && len(l.items) == 0: