zrb 1.0.0b10__py3-none-any.whl → 1.2.0__py3-none-any.whl

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/crud/util.js

@@ -0,0 +1,94 @@
+const CRUD_UTIL = {
+
+    renderPagination(paginationComponent, crudState, total, fetchFunction = "fetchRows") {
+        const totalPages = Math.ceil(total / crudState.pageSize);
+        paginationComponent.innerHTML = "";
+        // Ensure left alignment (if not already handled by PicoCSS or external CSS)
+        paginationComponent.style.textAlign = "left";
+        let paginationHTML = "";
+        // Only show "First" and "Previous" if we're not on page 1
+        if (crudState.currentPage > 1) {
+            paginationHTML += `<button class="secondary" onclick="${fetchFunction}(1)">&laquo;</button>`;
+            paginationHTML += `<button class="secondary" onclick="${fetchFunction}(${crudState.currentPage - 1})">&lt;</button>`;
+        }
+        if (totalPages <= 5) {
+            // If total pages are few, simply list them all
+            for (let i = 1; i <= totalPages; i++) {
+                paginationHTML += `<button class="secondary" onclick="${fetchFunction}(${i})" ${i === crudState.currentPage ? "disabled" : ""}>${i}</button>`;
+            }
+        } else {
+            // Always show first page
+            paginationHTML += `<button class="secondary" onclick="${fetchFunction}(1)" ${crudState.currentPage === 1 ? "disabled" : ""}>1</button>`;
+            // Determine start and end for the page range around current page
+            const start = Math.max(2, crudState.currentPage - 1);
+            const end = Math.min(totalPages - 1, crudState.currentPage + 1);
+            // Add ellipsis if there's a gap between first page and the start of the range
+            if (start > 2) {
+                paginationHTML += `<span style="padding: 0 5px;">...</span>`;
+            }
+            // Render the range around the current page
+            for (let i = start; i <= end; i++) {
+                paginationHTML += `<button class="secondary" onclick="${fetchFunction}(${i})" ${i === crudState.currentPage ? "disabled" : ""}>${i}</button>`;
+            }
+            // Add ellipsis if there's a gap between the end of the range and the last page
+            if (end < totalPages - 1) {
+                paginationHTML += `<span style="padding: 0 5px;">...</span>`;
+            }
+            // Always show last page
+            paginationHTML += `<button class="secondary" onclick="${fetchFunction}(${totalPages})" ${crudState.currentPage === totalPages ? "disabled" : ""}>${totalPages}</button>`;
+        }
+        // Only show "Next" and "Last" if we're not on the last page
+        if (crudState.currentPage < totalPages) {
+            paginationHTML += `<button class="secondary" onclick="${fetchFunction}(${crudState.currentPage + 1})">&gt;</button>`;
+            paginationHTML += `<button class="secondary" onclick="${fetchFunction}(${totalPages})">&raquo;</button>`;
+        }
+        paginationComponent.innerHTML = paginationHTML;
+    },
+
+    splitUnescaped(query, delimiter=",") {
+        const parts = [];
+        let current = "";
+        let escaped = false;
+        for (let i = 0; i < query.length; i++) {
+            const char = query[i];
+            if (escaped) {
+                current += char;
+                escaped = false;
+            } else if (char === "\\") {
+                escaped = true;
+            } else if (char === delimiter) {
+                parts.push(current);
+                current = "";
+            } else {
+                current += char;
+            }
+        }
+        if (current != "") {
+            parts.push(current);
+        }
+        return parts;
+    },
+
+    isValidFilterQuery(query) {
+        const filterPattern = /^([\w]+):(eq|ne|gt|gte|lt|lte|like|in):(.+)$/;
+        const parts = this.splitUnescaped(query);
+        return parts.every(part => filterPattern.test(part));
+    },
+
+    getSearchParam(crudState, defaultSearchColumn, apiMode = false) {
+        return new URLSearchParams({
+            page: crudState.currentPage || 1,
+            page_size: crudState.pageSize || 10,
+            filter: this._getFilterSearchParamValue(crudState, defaultSearchColumn, apiMode),
+        }).toString();
+    },
+
+    _getFilterSearchParamValue(crudState, defaultSearchColumn, apiMode = false) {
+        const filter = crudState.filter || "";
+        if (!apiMode) {
+            return filter;
+        }
+        return this.isValidFilterQuery(filter) ? filter : `${defaultSearchColumn}:like:%${filter}%`;
+    }
+
+}

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/default/pico-style.css

@@ -0,0 +1,23 @@
+h1 {
+    color: var(--pico-primary)
+}
+
+h2 {
+    color: var(--pico-primary)
+}
+
+h3 {
+    color: var(--pico-primary)
+}
+
+h4 {
+    color: var(--pico-primary)
+}
+
+h5 {
+    color: var(--pico-primary)
+}
+
+h6 {
+    color: var(--pico-primary)
+}

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/default/script.js

@@ -0,0 +1,44 @@
+// Hamburger menu functionality
+const hamburgerMenu = document.querySelector('.hamburger-menu');
+const layoutContainer = document.querySelector('.layout-container');
+
+hamburgerMenu.addEventListener('click', function() {
+    layoutContainer.classList.toggle('menu-active');
+});
+
+// Close menu when clicking outside
+document.addEventListener('click', function(event) {
+    if (!layoutContainer.contains(event.target) && !hamburgerMenu.contains(event.target)) {
+        layoutContainer.classList.remove('menu-active');
+    }
+});
+
+// Theme switcher functionality
+const themeSelect = document.getElementById('theme-select');
+
+function setTheme(theme) {
+    document.documentElement.setAttribute('data-theme', theme);
+    localStorage.setItem('theme', theme);
+}
+
+function getSavedTheme() {
+    return localStorage.getItem('theme') || 'auto';
+}
+
+const savedTheme = getSavedTheme();
+setTheme(savedTheme);
+themeSelect.value = savedTheme;
+
+themeSelect.addEventListener('change', (e) => {
+    setTheme(e.target.value);
+});
+
+function updateAutoTheme() {
+    if (getSavedTheme() === 'auto') {
+        const isDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
+        document.documentElement.setAttribute('data-theme', isDark ? 'dark' : 'light');
+    }
+}
+
+updateAutoTheme();
+window.matchMedia('(prefers-color-scheme: dark)').addListener(updateAutoTheme);

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/default/style.css

@@ -0,0 +1,102 @@
+body {
+    overflow-x: hidden;
+    margin: 0;
+    padding: 0;
+    min-height: 100vh;
+}
+.layout-container {
+    display: flex;
+    min-height: 100vh;
+}
+aside {
+    position: fixed;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    width: 300px;
+    padding: 1rem;
+    border-right: 1px solid var(--muted-border-color);
+    height: 100vh;
+    background: var(--background-color);
+    display: flex;
+    flex-direction: column;
+}
+aside nav {
+    flex-grow: 1; /* Pushes theme-switcher to the bottom */
+    overflow-y: auto;
+    overflow-x: hidden;
+}
+aside ul {
+    padding: 0;
+    list-style: none;
+}
+aside li {
+    margin-bottom: 0.5rem;
+}
+aside li > ul {
+    padding-left: 1rem;
+}
+.content-wrapper {
+    flex: 1;
+    overflow-x: hidden;
+}
+.content {
+    padding: 1rem;
+}
+.hamburger-menu {
+    display: none;
+    background: var(--pico-primary);
+    border: none;
+    font-size: 1.5rem;
+    cursor: pointer;
+    position: fixed;
+    top: 1rem;
+    left: 1rem;
+    z-index: 1001;
+    color: var(--contrast);
+}
+.theme-switcher {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    margin-top: auto;
+}
+.active-link {
+    font-weight: bold;
+    color: var(--primary);
+}
+
+@media (max-width: 768px) {
+    .layout-container {
+        position: relative;
+        left: 0;
+        transition: left 0.3s ease;
+    }
+    .hamburger-menu {
+        display: block;
+    }
+    aside {
+        left: -300px;
+        top: 0;
+        bottom: 0;
+        z-index: 1000;
+        transition: left 0.3s ease;
+        padding-top: 4rem;
+    }
+    .layout-container.menu-active {
+        margin-left: 300px;
+        /*left: 300px;*/
+    }
+    .layout-container.menu-active aside {
+        left: 0;
+    }
+    .content {
+        padding-top: 4rem;
+    }
+}
+
+@media (min-width: 769px) {
+  .content-wrapper {
+    margin-left: 300px;
+  }
+}

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/template/default.html

@@ -4,31 +4,86 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="color-scheme" content="light dark">
-        {% for css_path in partials.css_path_list -%}
+        <link rel="stylesheet" href="{{pico_css_path}}">
+        <link rel="stylesheet" href="/static/default/pico-style.css">
+        <link rel="stylesheet" href="/static/default/style.css">
+        {% for css_path in css_path_list -%}
         <link rel="stylesheet" href="{{css_path}}">
         {% endfor %}
-        <link rel="icon" href="{{partials.favicon_path}}" sizes="32x32" type="image/png">
-        <title>{{partials.title}}</title>
+        <link rel="icon" href="{{favicon_path}}" sizes="32x32" type="image/png">
+        <title>{{title}}</title>
     </head>
     <body>
-        <header class="container">
-            <hgroup>
-                <h1>{{partials.title}}</h1>
-                <p>{{partials.subtitle}}</p>
+        <button class="hamburger-menu" aria-label="Menu">☰</button>
+        <div class="layout-container">
+            <aside>
                 <nav>
                     <ul>
-                        <li><a href="/">🏠 Home</a></li>
-                        <li><a href="/docs">💻 API Documentation</a></li>
-                    </ul>
-                    <ul>
-                        <li>Hi</li>
+                        {% for navigation in navigations %}
+                            {% if navigation|attr("pages") %}
+                            <li>
+                                <details {% if navigation.active %}open{% endif %}>
+                                    <summary>{{navigation.caption}}</summary>
+                                    <ul>
+                                        {% for page in navigation.pages %}
+                                        <li><a href="{{page.url}}" class="{{ 'active-link' if page.active else '' }}">{{page.caption}}</a></li>
+                                        {% endfor %}
+                                    </ul>
+                                </details>
+                            </li>
+                            {% else %}
+                                <li><a href="{{navigation.url}}" class="{{ 'active-link' if navigation.active else '' }}">{{navigation.caption}}</a></li>
+                            {% endif %}
+                        {% endfor %}
                     </ul>
                 </nav>
-            </hgroup>
-        </header>
-        {{content}}
+                <div class="theme-switcher">
+                    <label for="theme-select">Theme:</label>
+                    <select id="theme-select">
+                        <option value="auto">🌗 Auto</option>
+                        <option value="light">☀️ Light</option>
+                        <option value="dark">🌙 Dark</option>
+                    </select>
+                </div>
+            </aside>
+            <div class="content-wrapper">
+                <main class="content">
+                    <header>
+                        <hgroup>
+                            <h1>{{title}}</h1>
+                            <p>{{subtitle}}</p>
+                        </hgroup>
+                        {% if show_user_info %}
+                        <nav>
+                            <ul></ul>
+                            <ul>
+                                <li>
+                                    {% if current_user is none %}
+                                        <p>Hi Visitor <a href="/login">🔓</a></p>
+                                    {% elif current_user.is_guest %}
+                                        <p>Hi {{current_user.username}} <a href="/login">🔓</a></p>
+                                    {% else %}
+                                        <p>Hi {{current_user.username}} <a href="/logout">🔒</a></p>
+                                    {% endif %}
+                                </li>
+                            </ul>
+                        </nav>
+                        {% endif %}
+                    </header>
+                    <script src="/static/common/util.js"></script>
+                    {{content}}
+                    <footer>{{footer}}</footer>
+                </main>
+            </div>
+        </div>
+        {% for js_path in js_path_list -%}
+        <script src="{{js_path}}"></script>
+        {% endfor %}
+        <script src="/static/default/script.js"></script>
+        <script>
+            {% if should_refresh_session %}
+            UTIL.refreshAccessTokenPeriodically({{refresh_session_interval_seconds}});
+            {% endif %}
+        </script>
     </body>
-    {% for js_path in partials.js_path_list -%}
-    <script src="{{js_path}}"></script>
-    {% endfor %}
 </html>

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/requirements.txt

@@ -4,7 +4,7 @@ sqlmodel~=0.0.22
 ulid-py~=1.1.0
 passlib~=1.7.4
 Jinja2~=3.1.5
-python-jose~=3.3.0
+python-jose~=3.4.0
 passlib~=1.7.4
 
 pytest~=8.3.4

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/test/test_homepage.py

@@ -2,7 +2,7 @@ import os
 
 from fastapi.testclient import TestClient
 from my_app_name.main import app
-from my_app_name.module.gateway.util.view import render
+from my_app_name.module.gateway.util.view import render_content
 
 
 def test_homepage():
@@ -12,6 +12,4 @@ def test_homepage():
     view_path = os.path.join(
         os.path.dirname(os.path.dirname(__file__)), "module", "gateway", "view"
     )
-    assert response.text == render(
-        os.path.join(view_path, "content", "homepage.html")
-    ).body.decode("utf-8")
+    assert response.text == render_content("homepage.html").body.decode("utf-8")

zrb/builtin/project/create/project_task.py

@@ -15,13 +15,13 @@ scaffold_project = Scaffolder(
             name="project-dir",
             description="Project directory",
             prompt="Project directory",
-            default_str=lambda _: os.getcwd(),
+            default=lambda _: os.getcwd(),
         ),
         StrInput(
             name="project",
             description="Project name",
             prompt="Project name",
-            default_str=lambda ctx: os.path.basename(ctx.input.project_dir),
+            default=lambda ctx: os.path.basename(ctx.input.project_dir),
         ),
     ],
     source_path=os.path.join(_DIR, "project-template"),

zrb/builtin/random.py

@@ -15,13 +15,13 @@ from zrb.task.make_task import make_task
             name="side",
             description="Number of sides",
             prompt="How many sides (comma separated)",
-            default_str="6",
+            default="6",
         ),
         IntInput(
             name="num-rolls",
             description="Number of rolls",
             prompt="How many rolls",
-            default_str="1",
+            default="1",
         ),
     ],
     retries=0,
@@ -48,7 +48,7 @@ def throw_dice(ctx: AnyContext) -> str:
         name="values",
         description="Value to be shuffled",
         prompt="List of values (comma separated)",
-        default_str="🪙, 🪄, ⚔️, 🍷",
+        default="🪙, 🪄, ⚔️, 🍷",
     ),
     retries=0,
     group=random_group,

zrb/builtin/setup/common_input.py

@@ -6,30 +6,30 @@ package_manager_input = OptionInput(
     description="Your package manager",
     prompt="Your package manager",
     options=["apt", "dnf", "pacman", "zypper", "pkg", "brew", "spack"],
-    default_str="apt",
+    default="apt",
 )
 
 use_sudo_input = BoolInput(
     name="use-sudo",
     description="Use sudo or not",
     prompt="Need sudo",
-    default_str="yes",
+    default=True,
 )
 
 setup_bash_input = BoolInput(
     name="setup-bash",
     description="Setup bash",
     prompt="Setup bash",
-    default_str="yes",
+    default=True,
 )
 
 setup_zsh_input = BoolInput(
-    name="setup-zsh", description="Setup zsh", prompt="Setup zsh", default_str="yes"
+    name="setup-zsh", description="Setup zsh", prompt="Setup zsh", default=True
 )
 
 setup_powershell_input = BoolInput(
     name="setup-powershell",
     description="Setup powershell",
     prompt="Setup powershell",
-    default_str="no",
+    default=False,
 )

zrb/builtin/setup/tmux/tmux.py

@@ -22,7 +22,7 @@ install_tmux = CmdTask(
         name="tmux-config",
         description="Tmux config file",
         prompt="Tmux config file",
-        default_str="~/.tmux.conf",
+        default="~/.tmux.conf",
     ),
     description="📺 Setup `tmux`.",
     group=setup_group,

zrb/builtin/setup/zsh/zsh.py

@@ -34,7 +34,7 @@ install_zinit = CmdTask(
         name="zsh-config",
         description="zsh config file",
         prompt="zsh config file",
-        default_str="~/.zshrc",
+        default="~/.zshrc",
     ),
     upstream=[install_omz, install_zinit],
     description="💻 Setup `zsh`.",

zrb/builtin/todo.py

@@ -37,7 +37,7 @@ from zrb.util.todo import (
             name="priority",
             description="Task priority",
             prompt="Task priority",
-            default_str="E",
+            default="E",
         ),
         StrInput(
             name="project",
@@ -208,13 +208,13 @@ def archive_todo(ctx: AnyContext):
             name="duration",
             prompt="Working duration",
             description="Working duration",
-            default_str="30m",
+            default="30m",
         ),
         StrInput(
             name="stop",
             prompt="Working stop time (%Y-%m-%d %H:%M:%S)",
             description="Working stop time",
-            default_str=lambda _: _get_default_stop_work_time_str(),
+            default=lambda _: _get_default_stop_work_time_str(),
         ),
     ],
     description="🕒 Log work todo",
@@ -293,7 +293,7 @@ def _get_default_stop_work_time_str() -> str:
             name="text",
             description="Todo.txt content",
             prompt="Todo.txt content (will override existing)",
-            default_str=lambda _: _get_todo_txt_content(),
+            default=lambda _: _get_todo_txt_content(),
             allow_positional_parsing=False,
         ),
     ],

zrb/input/base_input.py

@@ -1,9 +1,9 @@
 from typing import Any
 
-from zrb.attr.type import StrAttr
+from zrb.attr.type import AnyAttr
 from zrb.context.any_shared_context import AnySharedContext
 from zrb.input.any_input import AnyInput
-from zrb.util.attr import get_str_attr
+from zrb.util.attr import get_attr
 from zrb.util.string.conversion import to_snake_case
 
 
@@ -13,7 +13,7 @@ class BaseInput(AnyInput):
         name: str,
         description: str | None = None,
         prompt: str | None = None,
-        default_str: StrAttr = "",
+        default: AnyAttr = "",
         auto_render: bool = True,
         allow_empty: bool = False,
         allow_positional_parsing: bool = True,
@@ -21,7 +21,7 @@ class BaseInput(AnyInput):
         self._name = name
         self._description = description
         self._prompt = prompt
-        self._default_str = default_str
+        self._default_value = default
         self._auto_render = auto_render
         self._allow_empty = allow_empty
         self._allow_positional_parsing = allow_positional_parsing
@@ -45,10 +45,10 @@ class BaseInput(AnyInput):
     def allow_positional_parsing(self) -> bool:
         return self._allow_positional_parsing
 
-    def to_html(self, ctx: AnySharedContext) -> str:
+    def to_html(self, shared_ctx: AnySharedContext) -> str:
         name = self.name
         description = self.description
-        default = self.get_default_str(ctx)
+        default = self.get_default_str(shared_ctx)
         return f'<input name="{name}" placeholder="{description}" value="{default}" />'
 
     def update_shared_context(
@@ -74,6 +74,7 @@ class BaseInput(AnyInput):
         return str_value
 
     def prompt_cli_str(self, shared_ctx: AnySharedContext) -> str:
+        """Prompting user to input the value"""
         value = self._prompt_cli_str(shared_ctx)
         while not self._allow_empty and value == "":
             value = self._prompt_cli_str(shared_ctx)
@@ -81,16 +82,20 @@ class BaseInput(AnyInput):
 
     def _prompt_cli_str(self, shared_ctx: AnySharedContext) -> str:
         prompt_message = self.prompt_message
-        default_value = self.get_default_str(shared_ctx)
-        if default_value != "":
-            prompt_message = f"{prompt_message} [{default_value}]"
+        default_str = self.get_default_str(shared_ctx)
+        if default_str != "":
+            prompt_message = f"{prompt_message} [{default_str}]"
         print(f"{prompt_message}: ", end="")
         value = input()
         if value.strip() == "":
-            value = default_value
+            value = default_str
         return value
 
     def get_default_str(self, shared_ctx: AnySharedContext) -> str:
-        return get_str_attr(
-            shared_ctx, self._default_str, auto_render=self._auto_render
+        """Get default value as str"""
+        default_value = get_attr(
+            shared_ctx, self._default_value, default="", auto_render=self._auto_render
         )
+        if not isinstance(default_value, str):
+            return str(default_value)
+        return default_value

zrb/input/bool_input.py

@@ -1,6 +1,7 @@
-from zrb.attr.type import StrAttr
+from zrb.attr.type import BoolAttr
 from zrb.context.any_shared_context import AnySharedContext
 from zrb.input.base_input import BaseInput
+from zrb.util.attr import get_bool_attr
 from zrb.util.string.conversion import to_boolean
 
 
@@ -10,7 +11,7 @@ class BoolInput(BaseInput):
         name: str,
         description: str | None = None,
         prompt: str | None = None,
-        default_str: StrAttr = "False",
+        default: BoolAttr = False,
         auto_render: bool = True,
         allow_empty: bool = False,
         allow_positional_parsing: bool = True,
@@ -19,16 +20,16 @@ class BoolInput(BaseInput):
             name=name,
             description=description,
             prompt=prompt,
-            default_str=default_str,
+            default=default,
             auto_render=auto_render,
             allow_empty=allow_empty,
             allow_positional_parsing=allow_positional_parsing,
         )
 
-    def to_html(self, ctx: AnySharedContext) -> str:
+    def to_html(self, shared_ctx: AnySharedContext) -> str:
         name = self.name
         description = self.description
-        default = to_boolean(self.get_default_str(ctx))
+        default = to_boolean(self.get_default_str(shared_ctx))
         selected_true = "selected" if default else ""
         selected_false = "selected" if not default else ""
         return "\n".join(
@@ -40,5 +41,11 @@ class BoolInput(BaseInput):
             ]
         )
 
+    def get_default_str(self, shared_ctx: AnySharedContext) -> str:
+        default_value = get_bool_attr(
+            shared_ctx, self._default_value, auto_render=self._auto_render
+        )
+        return f"{default_value}"
+
     def _parse_str_value(self, str_value: str) -> bool:
         return to_boolean(str_value)