voidcli 0.1.0__tar.gz → 1.1.0__tar.gz

{voidcli-0.1.0 → voidcli-1.1.0}/.gitignore

@@ -2,3 +2,4 @@ __pycache__
 .venv
 myvenv/
 dist/
+*.db

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: voidcli
-Version: 0.1.0
+Version: 1.1.0
 Project-URL: Repository, https://github.com/NelsonUrrutia/void
 Author-email: Nelson Urrutia <nelurrutia15@gmail.com>
 License: MIT License
@@ -44,6 +44,7 @@ Description-Content-Type: text/markdown
 # **V**ital **O**ffline **I**nformation **D**iary
 
 ---
+![VOID: wellcome screen, void activities, void collection, void day](https://github.com/NelsonUrrutia/void/blob/main/assets/void-banner.png)
 
 > **VOID** is an offline diary to be used in the terminal.
 
@@ -75,3 +76,7 @@ I made it public so there's proof on the Internet of my work.
 ### How to install
 
 The project is available on PyPI, so you can install it with `pipx install voidcli`.
+
+### How to use
+
+After installation, run `void` in your terminal.

{voidcli-0.1.0 → voidcli-1.1.0}/README.md

@@ -12,6 +12,7 @@
 # **V**ital **O**ffline **I**nformation **D**iary
 
 ---
+![VOID: wellcome screen, void activities, void collection, void day](https://github.com/NelsonUrrutia/void/blob/main/assets/void-banner.png)
 
 > **VOID** is an offline diary to be used in the terminal.
 
@@ -43,3 +44,7 @@ I made it public so there's proof on the Internet of my work.
 ### How to install
 
 The project is available on PyPI, so you can install it with `pipx install voidcli`.
+
+### How to use
+
+After installation, run `void` in your terminal.

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

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

{voidcli-0.1.0 → voidcli-1.1.0}/void/main.py

@@ -45,11 +45,43 @@ class VoidApp(App):
             padding: 1 0;
         }
 
+        /* FORM FIELDS */
+        .field, Select.field > SelectCurrent{
+            border: round $panel-lighten-2;
+            border-title-color: $text-muted;
+            background: transparent;
+            padding: 1 2;
+        }
+        Input.field, Select.field > SelectCurrent{
+            height: 5;
+        }
+        .field:focus, Select.field:focus > SelectCurrent{
+            border: round $primary;
+            border-title-color: $primary;
+            border-title-style: bold;
+        }
+        Select.field, Select.field:focus{
+            border: none;
+            padding: 0;
+        }
+        TextArea.field > .text-area--cursor-line{
+            background: transparent;
+        }
+        Select.field > SelectOverlay{
+            border: round $primary;
+            background: $background;
+        }
+        Checkbox.field.-on{
+            border: round $success;
+        }
+
         /* CARDS */
         .note_card{
             height: auto;
-            padding: 0 2;
-            border: round $primary;
+            padding: 1 2 0 2;
+            border: round $primary 40%;
+            border-title-color: $accent;
+            border-title-style: bold;
         }
         .note_card Label{
             width: 100%;

{voidcli-0.1.0 → voidcli-1.1.0}/void/views/activity.py

@@ -5,6 +5,7 @@ from textual.app import ComposeResult
 from textual.containers import Horizontal, Vertical
 from textual.message import Message
 from textual.widgets import Button, DataTable, Input, Label, Select, Static
+from textual.widgets._select import SelectCurrent
 
 from void.controllers.activity import ActivityController
 from void.controllers.category import CategoryController
@@ -29,7 +30,7 @@ class ActivitiesView(Static):
             width: 70%;
         }
 
-        .field_label{
+        #new_category, #new_activity, #category_select{
             margin: 1 0 0 0;
         }
 
@@ -75,17 +76,14 @@ class ActivitiesView(Static):
         with Horizontal(classes="main_container"):
             with Vertical(id="category_module"):
                 yield Label("CATEGORIES", classes="module_title")
-                yield Label("New Category", classes="field_label")
-                yield Input(placeholder="Add a new category", id="new_category")
+                yield Input(placeholder="Add a new category", id="new_category", classes="field")
                 yield Button(label="ADD",  flat=True, id="add_category")
                 yield DataTable(id="categories_table")
             with Vertical(id="activity_module"):
                 with Vertical(id="activity_form"):
                     yield Label("ACTIVITIES", classes="module_title")
-                    yield Label("Activity", classes="field_label")
-                    yield Input(placeholder="Add a new activity", id="new_activity")
-                    yield Label("Select a category", classes="field_label")
-                    yield Select([], type_to_search=True, id="category_select")
+                    yield Input(placeholder="Add a new activity", id="new_activity", classes="field")
+                    yield Select([], type_to_search=True, id="category_select", classes="field")
                     yield Input(id="activity_id", compact=True)
                     with Horizontal(id="activity_form_cta_container"):
                         yield Button(label="ADD",  flat=True, id="add_activity", variant="success")
@@ -110,6 +108,12 @@ class ActivitiesView(Static):
         self.clear_activity_form_btn = self.query_one("#clear_activity_form", Button)
         self.activities_table = self.query_one("#activities_table", DataTable)
 
+        # Border titles
+        self.add_category_input.border_title = "New Category"
+        self.add_activity_input.border_title = "Activity"
+        # Select draws its border on its inner SelectCurrent widget
+        self.category_selector.query_one(SelectCurrent).border_title = "Select a category"
+
         self.init_activities_table()
         self.init_categories_selector()
         self.init_categories_table()

{voidcli-0.1.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,9 +18,9 @@ class CollectionView(Static):
             grid-size: 3;
             grid-gutter: 1;
         }
-        .note_card_date{
-            color: $text-muted;
-            padding: 0 0 1 0;
+        .note_card_actions{
+            height: auto;
+            margin: 0 0 1 0;
         }
     """
 
@@ -26,10 +28,14 @@ class CollectionView(Static):
     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"):
@@ -37,9 +43,9 @@ 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"]):
-                    with Vertical(classes="note_card"):
-                        yield Label(self.format_date(note_date), classes="note_card_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:
                             with Vertical(classes="entry_card"):
                                 yield Label(row["activity"], classes="entry_title")
@@ -47,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-0.1.0 → voidcli-1.1.0}/void/views/note_form.py

@@ -34,12 +34,11 @@ class NoteForm(Static):
 
         .category_block{
             height: auto;
-            padding: 0 0 1 0;
-        }
-        .category_title{
-            text-style: bold;
-            color: $accent;
-            padding: 0 0 1 0;
+            margin: 0 0 1 0;
+            padding: 1 1 0 1;
+            border: round $primary 40%;
+            border-title-color: $accent;
+            border-title-style: bold;
         }
         .activity_grid{
             grid-size: 2;
@@ -53,7 +52,7 @@ class NoteForm(Static):
             width: 100%;
         }
         .activity_card TextArea{
-            height: 6;
+            height: 8;
         }
         .activity_handle{
             display: none;
@@ -90,15 +89,17 @@ class NoteForm(Static):
         with VerticalScroll(classes="main_container"):
             for _, category, activities in self.activities_by_category_data:
                 if activities:
-                    with Vertical(classes="category_block"):
-                        yield Label(f"── {category} ", classes="category_title")
+                    with Vertical(classes="category_block") as block:
+                        block.border_title = category
                         with Grid(classes="card_grid activity_grid"):
                             for id, name in activities:
                                 handle = f"{id}::{self.handleize(name)}"
                                 with Vertical(classes="activity_card"):
-                                    yield Checkbox(label=name)
+                                    yield Checkbox(label=name, classes="field")
                                     yield Input(value=handle, classes="activity_handle")
-                                    yield TextArea()
+                                    notes = TextArea(classes="field")
+                                    notes.border_title = "Notes"
+                                    yield notes
 
     @on(Checkbox.Changed)
     def on_activity_toggled(self) -> None:

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()