voidcli 1.0.0__tar.gz → 1.1.0__tar.gz

{voidcli-1.0.0 → voidcli-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: voidcli
-Version: 1.0.0
+Version: 1.1.0
 Project-URL: Repository, https://github.com/NelsonUrrutia/void
 Author-email: Nelson Urrutia <nelurrutia15@gmail.com>
 License: MIT License

{voidcli-1.0.0 → voidcli-1.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "voidcli"
-version = "1.0.0"
+version = "1.1.0"
 description = ""
 readme = "README.md"
 license = { file = "LICENSE" }

{voidcli-1.0.0 → voidcli-1.1.0}/void/views/collection.py

@@ -2,11 +2,13 @@ from datetime import date
 from itertools import groupby
 from typing import override
 
+from textual import on
 from textual.app import ComposeResult
-from textual.containers import Grid, Vertical, VerticalScroll
-from textual.widgets import Label, Static
+from textual.containers import Grid, Right, Vertical, VerticalScroll
+from textual.widgets import Button, Label, Static
 
 from void.controllers.note import NoteController
+from void.views.note_modal import NoteModal
 
 
 class CollectionView(Static):
@@ -16,16 +18,24 @@ class CollectionView(Static):
             grid-size: 3;
             grid-gutter: 1;
         }
+        .note_card_actions{
+            height: auto;
+            margin: 0 0 1 0;
+        }
     """
 
     @override
     def __init__(self) -> None:
         super().__init__()
         self.ctrl = NoteController()
+        self.notes_by_date: dict[str, list] = {}
 
     @override
     def compose(self) -> ComposeResult:
         notes = self.ctrl.get_notes()
+        self.notes_by_date = {
+            note_date: list(rows) for note_date, rows in groupby(notes, key=lambda row: row["note_date"])
+        }
         with Vertical(classes="header"):
             yield Label("VOID COLLECTION", classes="module_title")
         with VerticalScroll(classes="main_container"):
@@ -33,7 +43,7 @@ class CollectionView(Static):
                 yield Label("No VOID NOTE saved yet.")
                 return
             with Grid(classes="card_grid note_grid"):
-                for note_date, rows in groupby(notes, key=lambda row: row["note_date"]):
+                for note_date, rows in self.notes_by_date.items():
                     with Vertical(classes="note_card") as card:
                         card.border_title = self.format_date(note_date)
                         for row in rows:
@@ -43,6 +53,14 @@ class CollectionView(Static):
                                     yield Label(row["notes"], classes="entry_note")
                                 else:
                                     yield Label("No notes written.", classes="entry_empty")
+                        with Right(classes="note_card_actions"):
+                            yield Button("EXPAND", name=note_date, classes="open_note", flat=True)
 
     def format_date(self, date_str):
         return date.fromisoformat(date_str).strftime("%B %d, %Y").upper()
+
+    @on(Button.Pressed, ".open_note")
+    def on_open_note(self, event: Button.Pressed) -> None:
+        note_date = event.button.name
+        if note_date in self.notes_by_date:
+            self.app.push_screen(NoteModal(self.format_date(note_date), self.notes_by_date[note_date]))

voidcli-1.1.0/void/views/note_modal.py

@@ -0,0 +1,73 @@
+from itertools import groupby
+from typing import override
+
+from textual import on
+from textual.app import ComposeResult
+from textual.binding import Binding
+from textual.containers import Center, Vertical, VerticalScroll
+from textual.screen import ModalScreen
+from textual.widgets import Button, Label
+
+
+class NoteModal(ModalScreen[None]):
+
+    BINDINGS = [Binding("escape", "close", "Close")]
+
+    DEFAULT_CSS = """
+        NoteModal{
+            align: center middle;
+        }
+        .modal_card{
+            width: 90%;
+            height: 90%;
+            padding: 1 4;
+            border: round $primary;
+            border-title-color: $accent;
+            border-title-style: bold;
+            background: $background;
+        }
+        .modal_card .section_title{
+            padding: 1 0 1 0;
+        }
+        .modal_card .entry_card{
+            padding: 1 0 1 2;
+        }
+        .modal_body{
+            height: 1fr;
+        }
+        .modal_footer{
+            height: auto;
+            padding: 1 0 0 0;
+        }
+    """
+
+    @override
+    def __init__(self, title: str, rows: list) -> None:
+        super().__init__()
+        self.note_title = title
+        self.rows = sorted(rows, key=lambda row: (row["category"], row["activity"]))
+
+    @override
+    def compose(self) -> ComposeResult:
+        with Vertical(classes="modal_card") as card:
+            card.border_title = self.note_title
+            with VerticalScroll(classes="modal_body"):
+                for category, group in groupby(self.rows, key=lambda row: row["category"]):
+                    entries = list(group)
+                    yield Label(f"── {category.upper()} · {len(entries)} ", classes="section_title")
+                    for row in entries:
+                        with Vertical(classes="entry_card"):
+                            yield Label(row["activity"], classes="entry_title")
+                            if row["notes"]:
+                                yield Label(row["notes"], classes="entry_note")
+                            else:
+                                yield Label("No notes written.", classes="entry_empty")
+            with Center(classes="modal_footer"):
+                yield Button("CLOSE", id="close_note_modal", variant="primary", flat=True)
+
+    @on(Button.Pressed, "#close_note_modal")
+    def on_close_pressed(self) -> None:
+        self.action_close()
+
+    def action_close(self) -> None:
+        self.dismiss()