zebra-day 1.0.2__py3-none-any.whl → 2.1.4__py3-none-any.whl

zebra_day/zpl_renderer.py

@@ -13,9 +13,9 @@ Supports the ZPL commands used in zebra_day templates:
 - ^BQN: QR code
 - ^BXN: Data Matrix
 """
+
 from __future__ import annotations
 
-import io
 import logging
 import re
 from dataclasses import dataclass, field
@@ -25,6 +25,7 @@ from PIL import Image, ImageDraw, ImageFont
 
 try:
     import zint
+
     ZINT_AVAILABLE = True
 except ImportError:
     ZINT_AVAILABLE = False
@@ -32,21 +33,22 @@ except ImportError:
 _log = logging.getLogger(__name__)
 
 # Default label dimensions for 4x6 inch label at 8 dpmm (203 dpi)
-DEFAULT_LABEL_WIDTH_DOTS = 812   # 4 inches * 203 dpi
+DEFAULT_LABEL_WIDTH_DOTS = 812  # 4 inches * 203 dpi
 DEFAULT_LABEL_HEIGHT_DOTS = 1218  # 6 inches * 203 dpi
 
 # Barcode type mappings
 BARCODE_TYPES = {
-    'B3N': 'CODE39',   # Code 39
-    'BCN': 'CODE128',  # Code 128
-    'BQN': 'QRCODE',   # QR Code
-    'BXN': 'DATAMATRIX',  # Data Matrix
+    "B3N": "CODE39",  # Code 39
+    "BCN": "CODE128",  # Code 128
+    "BQN": "QRCODE",  # QR Code
+    "BXN": "DATAMATRIX",  # Data Matrix
 }
 
 
 @dataclass
 class FontSpec:
     """Font specification from ZPL ^A command."""
+
     height: int = 30
     width: int = 20
 
@@ -54,6 +56,7 @@ class FontSpec:
 @dataclass
 class BarcodeSpec:
     """Barcode specification from ZPL ^BY command."""
+
     module_width: int = 2
     ratio: float = 3.0
     height: int = 10
@@ -62,6 +65,7 @@ class BarcodeSpec:
 @dataclass
 class RenderState:
     """Current rendering state while parsing ZPL."""
+
     x: int = 0
     y: int = 0
     font: FontSpec = field(default_factory=FontSpec)
@@ -74,7 +78,7 @@ def _get_font(height: int) -> ImageFont.FreeTypeFont | ImageFont.ImageFont:
     """Get a font at the specified height. Falls back to default if unavailable."""
     try:
         # Try common monospace fonts
-        for font_name in ['DejaVuSansMono.ttf', 'Menlo.ttc', 'Courier New.ttf', 'monospace']:
+        for font_name in ["DejaVuSansMono.ttf", "Menlo.ttc", "Courier New.ttf", "monospace"]:
             try:
                 return ImageFont.truetype(font_name, height)
             except OSError:
@@ -85,26 +89,28 @@ def _get_font(height: int) -> ImageFont.FreeTypeFont | ImageFont.ImageFont:
         return ImageFont.load_default()
 
 
-def _render_barcode(barcode_type: str, data: str, height: int = 40, module_width: int = 2) -> Image.Image | None:
+def _render_barcode(
+    barcode_type: str, data: str, height: int = 40, module_width: int = 2
+) -> Image.Image | None:
     """Render a barcode using zint-bindings."""
     if not ZINT_AVAILABLE:
         _log.warning("zint-bindings not available, cannot render barcode")
         return None
 
-    import tempfile
     import os
+    import tempfile
 
     try:
         symbol = zint.Symbol()
 
         # Map barcode type to zint symbology
-        if barcode_type == 'CODE39':
+        if barcode_type == "CODE39":
             symbol.symbology = zint.Symbology.CODE39
-        elif barcode_type == 'CODE128':
+        elif barcode_type == "CODE128":
             symbol.symbology = zint.Symbology.CODE128
-        elif barcode_type == 'QRCODE':
+        elif barcode_type == "QRCODE":
             symbol.symbology = zint.Symbology.QRCODE
-        elif barcode_type == 'DATAMATRIX':
+        elif barcode_type == "DATAMATRIX":
             symbol.symbology = zint.Symbology.DATAMATRIX
         else:
             _log.warning("Unknown barcode type: %s", barcode_type)
@@ -115,7 +121,7 @@ def _render_barcode(barcode_type: str, data: str, height: int = 40, module_width
         symbol.show_text = False  # ZPL typically handles text separately
 
         # Create temp file for output
-        with tempfile.NamedTemporaryFile(suffix='.png', delete=False) as f:
+        with tempfile.NamedTemporaryFile(suffix=".png", delete=False) as f:
             temp_path = f.name
 
         symbol.outfile = temp_path
@@ -124,7 +130,7 @@ def _render_barcode(barcode_type: str, data: str, height: int = 40, module_width
 
         # Load the image
         if os.path.exists(temp_path):
-            img = Image.open(temp_path).convert('RGBA')
+            img = Image.open(temp_path).convert("RGBA")
             os.unlink(temp_path)  # Clean up temp file
             return img
         return None
@@ -136,7 +142,7 @@ def _render_barcode(barcode_type: str, data: str, height: int = 40, module_width
 def _parse_font_command(cmd: str) -> FontSpec:
     """Parse ^A0N or ^ADN font command."""
     # ^A0N,height,width or ^ADN,height,width
-    parts = cmd.split(',')
+    parts = cmd.split(",")
     height = int(parts[1]) if len(parts) > 1 and parts[1].strip() else 30
     width = int(parts[2]) if len(parts) > 2 and parts[2].strip() else height // 2
     return FontSpec(height=height, width=width)
@@ -145,7 +151,7 @@ def _parse_font_command(cmd: str) -> FontSpec:
 def _parse_barcode_default(cmd: str) -> BarcodeSpec:
     """Parse ^BY command for barcode defaults."""
     # ^BY[module_width],[ratio],[height]
-    parts = cmd.split(',')
+    parts = cmd.split(",")
     module_width = int(parts[0]) if parts[0].strip() else 2
     ratio = float(parts[1]) if len(parts) > 1 and parts[1].strip() else 3.0
     height = int(parts[2]) if len(parts) > 2 and parts[2].strip() else 10
@@ -155,7 +161,7 @@ def _parse_barcode_default(cmd: str) -> BarcodeSpec:
 def _parse_position(cmd: str) -> tuple[int, int]:
     """Parse ^FO command for field origin."""
     # ^FOx,y
-    parts = cmd.split(',')
+    parts = cmd.split(",")
     x = int(parts[0]) if parts[0].strip() else 0
     y = int(parts[1]) if len(parts) > 1 and parts[1].strip() else 0
     return x, y
@@ -164,7 +170,7 @@ def _parse_position(cmd: str) -> tuple[int, int]:
 def _parse_barcode_command(cmd: str) -> int:
     """Parse barcode command (^B3N, ^BCN, etc.) and return height."""
     # Format: ^B3N,orientation,height,... or ^BCN,orientation,height,...
-    parts = cmd.split(',')
+    parts = cmd.split(",")
     # Height is usually the 3rd parameter (index 2) for most barcode commands
     if len(parts) > 2 and parts[2].strip():
         try:
@@ -196,37 +202,41 @@ def render_zpl_to_png(
     output_path.parent.mkdir(parents=True, exist_ok=True)
 
     # Create white background image
-    img = Image.new('RGB', (width, height), 'white')
+    img = Image.new("RGB", (width, height), "white")
     draw = ImageDraw.Draw(img)
 
     state = RenderState()
 
     # Parse ZPL commands - split on ^ character
-    commands = re.split(r'\^', zpl_string)
-
-    pending_text: str | None = None
+    commands = re.split(r"\^", zpl_string)
 
     for cmd in commands:
         cmd = cmd.strip()
         if not cmd:
             continue
 
+        # Strip inline comments (ZPL uses ; for comments)
+        if ";" in cmd:
+            cmd = cmd.split(";")[0].strip()
+            if not cmd:
+                continue
+
         # Label start/end - ignore
-        if cmd.startswith('XA') or cmd.startswith('XZ'):
+        if cmd.startswith("XA") or cmd.startswith("XZ"):
             continue
 
         # Field origin - set position
-        if cmd.startswith('FO'):
+        if cmd.startswith("FO"):
             state.x, state.y = _parse_position(cmd[2:])
             continue
 
         # Font commands
-        if cmd.startswith('A0N') or cmd.startswith('ADN'):
+        if cmd.startswith("A0N") or cmd.startswith("ADN"):
             state.font = _parse_font_command(cmd)
             continue
 
         # Barcode default
-        if cmd.startswith('BY'):
+        if cmd.startswith("BY"):
             state.barcode = _parse_barcode_default(cmd[2:])
             continue
 
@@ -238,10 +248,10 @@ def render_zpl_to_png(
                 break
         else:
             # Not a barcode command, check for field data
-            if cmd.startswith('FD'):
+            if cmd.startswith("FD"):
                 # Extract data between FD and FS
                 data = cmd[2:]
-                if data.endswith('FS'):
+                if data.endswith("FS"):
                     data = data[:-2]
 
                 # If there's a pending barcode type, render barcode
@@ -253,21 +263,22 @@ def render_zpl_to_png(
                         module_width=state.barcode.module_width,
                     )
                     if bc_img:
-                        img.paste(bc_img, (state.x, state.y), bc_img if bc_img.mode == 'RGBA' else None)
+                        img.paste(
+                            bc_img, (state.x, state.y), bc_img if bc_img.mode == "RGBA" else None
+                        )
                     state.current_barcode_type = None
                 else:
                     # Render text
                     font = _get_font(state.font.height)
-                    draw.text((state.x, state.y), data, fill='black', font=font)
+                    draw.text((state.x, state.y), data, fill="black", font=font)
                 continue
 
         # Field separator - just a marker, usually handled with FD
-        if cmd.startswith('FS'):
+        if cmd.startswith("FS"):
             continue
 
     # Save the image
-    img.save(str(output_path), 'PNG')
+    img.save(str(output_path), "PNG")
     _log.info("Label image saved as %s", output_path)
 
     return str(output_path)
-

{zebra_day-1.0.2.dist-info → zebra_day-2.1.4.dist-info}/METADATA

@@ -1,9 +1,7 @@
 Metadata-Version: 2.4
 Name: zebra_day
-Version: 1.0.2
+Version: 2.1.4
 Summary: A Python library to manage a Zebra printer fleet and an API for ZPL print requests.
-Home-page: https://github.com/Daylily-Informatics/zebra_day
-Author: John Major
 Author-email: John Major <john@daylilyinformatics.com>
 License: MIT
 Project-URL: Homepage, https://github.com/Daylily-Informatics/zebra_day
@@ -37,12 +35,13 @@ Requires-Dist: typer>=0.9.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: pillow>=10.0.0
 Requires-Dist: zint-bindings>=1.2.0
+Requires-Dist: httpx
 Provides-Extra: dev
 Requires-Dist: pytest>=7.4.0; extra == "dev"
 Requires-Dist: pytest-cov>=4.0.0; extra == "dev"
 Requires-Dist: ipython>=8.16.0; extra == "dev"
+Requires-Dist: playwright>=1.40.0; extra == "dev"
 Provides-Extra: lint
-Requires-Dist: black>=23.0.0; extra == "lint"
 Requires-Dist: ruff>=0.1.0; extra == "lint"
 Requires-Dist: mypy>=1.0.0; extra == "lint"
 Provides-Extra: docs
@@ -54,13 +53,17 @@ Requires-Dist: python-jose[cryptography]>=3.3.0; extra == "auth"
 Requires-Dist: boto3>=1.26.0; extra == "auth"
 Provides-Extra: all
 Requires-Dist: zebra_day[auth,dev,docs,lint]; extra == "all"
-Dynamic: author
-Dynamic: home-page
 Dynamic: license-file
 
 <img src=zebra_day/imgs/bar_red.png>
 
-## zebra_day Overview [1.0.2](https://github.com/Daylily-Informatics/zebra_day/releases/tag/1.0.2)
+## zebra_day
+
+[![GitHub Release](https://img.shields.io/github/v/release/Daylily-Informatics/zebra_day?style=flat-square&label=release)](https://github.com/Daylily-Informatics/zebra_day/releases/latest)
+[![GitHub Tag](https://img.shields.io/github/v/tag/Daylily-Informatics/zebra_day?style=flat-square&label=tag)](https://github.com/Daylily-Informatics/zebra_day/tags)
+[![PyPI](https://img.shields.io/pypi/v/zebra_day?style=flat-square)](https://pypi.org/project/zebra_day/)
+[![Python CI](https://github.com/Daylily-Informatics/zebra_day/actions/workflows/main.yaml/badge.svg)](https://github.com/Daylily-Informatics/zebra_day/actions/workflows/main.yaml)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg?style=flat-square)](https://opensource.org/licenses/MIT)
 
 ### Build, Deploy, Run, Monitor, Teardown
 
@@ -76,23 +79,23 @@ pytest -v
 
 # Run Linting (requires pip install -e ".[lint]")
 ruff check zebra_day tests
-black --check zebra_day tests
+ruff format --check zebra_day tests
 mypy zebra_day --ignore-missing-imports
 
-# CLI Commands (new in 0.6.0)
+# CLI Commands
 zday --help               # Show all commands
 zday bootstrap            # First-time setup: scan for printers
 zday gui start            # Start web UI in background
 zday gui stop             # Stop web UI
 zday gui status           # Check if web UI is running
 
-# Health Checks
-curl http://localhost:8118/healthz    # Basic health check
-curl http://localhost:8118/readyz     # Readiness check (printer mgr initialized)
+# Health Checks (use https:// if certificates are configured, http:// otherwise)
+curl https://localhost:8118/healthz    # Basic health check
+curl https://localhost:8118/readyz     # Readiness check (printer mgr initialized)
 
 # API Documentation
-# Visit http://localhost:8118/docs for interactive OpenAPI docs
-# Visit http://localhost:8118/redoc for alternative API documentation
+# Visit https://localhost:8118/docs for interactive OpenAPI docs
+# Visit https://localhost:8118/redoc for alternative API documentation
 ```
 
 <ul>
@@ -153,19 +156,20 @@ zday gui stop
   
   > <a href=zebra_day/docs/zebra_day_ui_guide.md >ui capabilities full details</a>
 
-#### Some UI Niceties
-##### Zebra Printer Fleet Dashboard
-<img width="400" alt="fleetreport" src="https://github.com/Daylily-Informatics/zebra_day/assets/4713659/8a66bc11-f8f5-4c40-9970-36d554a4593a">
+#### Modern Web UI
+
+##### Dashboard
+<img width="800" alt="dashboard" src="zebra_day/imgs/ui_dashboard.png">
 
-##### Zebra Printer, Single Printer Detail View
-<img width="690" alt="Screenshot 2023-11-01 at 1 35 36 AM" src="https://github.com/Daylily-Informatics/zebra_day/assets/4713659/7438df35-9e92-474e-a2ef-57d3c3ee23d7">
+##### Printer Fleet
+<img width="800" alt="printers" src="zebra_day/imgs/ui_printers.png">
 
- ##### ZPL Label Editing IRT
-<img width="345" alt="zpl_editing" src="https://github.com/Daylily-Informatics/zebra_day/assets/4713659/15aac332-c5f8-4ce6-be6c-9c403fd8d35d">
+##### ZPL Template Editor
+<img width="800" alt="templates" src="zebra_day/imgs/ui_templates.png">
 
 </ul>
 
-### CLI Reference (0.6.0+)
+### CLI Reference
 
 The `zday` CLI provides a comprehensive interface for managing your Zebra printer fleet.
 
@@ -181,7 +185,7 @@ zday status       # Show printer fleet status, service health
 zday bootstrap    # First-time setup: scan network, initialize config
 
 # GUI server management
-zday gui start [--auth none|cognito] [--host HOST] [--port PORT]
+zday gui start [--auth none|cognito] [--host HOST] [--port PORT] [--cert FILE] [--key FILE] [--no-https]
 zday gui stop
 zday gui status
 zday gui logs [--tail N] [--follow]
@@ -213,6 +217,79 @@ The old commands `zday_start` and `zday_quickstart` still work but are deprecate
 | `zday_start` | `zday gui start` |
 | `zday_start --auth cognito` | `zday gui start --auth cognito` |
 
+### Local HTTPS Setup
+
+The zebra_day web UI supports HTTPS for secure local development. By default, HTTPS is enabled if certificates are found.
+
+> **Note**: The `zday bootstrap` command automatically generates certificates if mkcert is installed and the CA is configured.
+> Manual certificate generation (below) is only needed if you skip bootstrap or want custom hostnames.
+
+#### One-Time Setup (mkcert)
+
+```bash
+# Install mkcert
+# macOS
+brew install mkcert
+
+# Ubuntu/Debian
+sudo apt install mkcert
+
+# Create and install local CA (one-time, requires password)
+mkcert -install
+```
+
+#### Automatic Certificate Generation (Recommended)
+
+After installing mkcert and running `mkcert -install`, the bootstrap command will automatically generate certificates:
+
+```bash
+zday bootstrap
+# Output includes:
+# ✓ Certificates generated: ~/.config/zebra_day/certs/server.crt
+```
+
+#### Manual Certificate Generation (Alternative)
+
+If you need to manually generate certificates (e.g., for custom hostnames):
+
+```bash
+# Create certificate directory
+mkdir -p ~/.config/zebra_day/certs
+
+# Generate locally-trusted certificates
+mkcert -cert-file ~/.config/zebra_day/certs/server.crt \
+       -key-file ~/.config/zebra_day/certs/server.key \
+       localhost 127.0.0.1 ::1
+```
+
+#### HTTPS Options
+
+| Method | Description |
+|--------|-------------|
+| **Auto-detect** | If certs exist in `~/.config/zebra_day/certs/`, HTTPS is enabled automatically |
+| **Explicit paths** | `zday gui start --cert /path/to/cert.crt --key /path/to/key.key` |
+| **Environment vars** | Set `SSL_CERT_PATH` and `SSL_KEY_PATH` |
+| **Force HTTP** | `zday gui start --no-https` |
+
+#### Verify HTTPS
+
+```bash
+# Start server (will use HTTPS if certs are found)
+zday gui start
+
+# Test connection
+curl https://localhost:8118/healthz
+```
+
+#### Troubleshooting
+
+| Issue | Solution |
+|-------|----------|
+| Browser shows "Not Secure" | Run `mkcert -install` to trust the local CA |
+| Certificate not found | Check paths: `ls ~/.config/zebra_day/certs/` |
+| Permission denied | Ensure cert files are readable: `chmod 644 ~/.config/zebra_day/certs/*` |
+| Want HTTP only | Use `--no-https` flag: `zday gui start --no-https` |
+
 ### It Is 3+ Things
 
   (1) Zebra Printer Management & Configuration
@@ -246,7 +323,7 @@ The old commands `zday_start` and `zday_quickstart` still work but are deprecate
 <ul>
 <ul>
   
-> <img src=zebra_day/imgs/UBC_gantt_chart.png height=200 width=450>
+> <img src=zebra_day/imgs/legacy/UBC_gantt_chart.png height=200 width=450>
 
 </ul>
 </ul>
@@ -304,7 +381,7 @@ python -m build              # Creates dist/*.whl and dist/*.tar.gz
 
 ### File Locations (XDG-compliant)
 
-zebra_day 0.6.0+ uses XDG Base Directory specification for file storage:
+zebra_day uses XDG Base Directory specification for file storage:
 
 | Type | macOS | Linux |
 |------|-------|-------|
@@ -386,11 +463,10 @@ Run 'zday gui start' to launch the web interface.
 $ zday gui start
 
 Starting zebra_day web server...
-Server running at: http://192.168.1.12:8118
+Server running at: https://192.168.1.12:8118
 
-Modern UI:  http://192.168.1.12:8118/
-Legacy UI:  http://192.168.1.12:8118/legacy
-API Docs:   http://192.168.1.12:8118/docs
+Dashboard:  https://192.168.1.12:8118/
+API Docs:   https://192.168.1.12:8118/docs
 
 Server started in background (PID: 12345)
 Use 'zday gui status' to check status
@@ -401,26 +477,23 @@ Use 'zday gui stop' to stop the server
 
 #### zebra_day Web GUI
 
-##### Home Page 
- <img src=zebra_day/imgs/zday_quick_gui.png>
+##### Dashboard
+<img width="800" alt="dashboard" src="zebra_day/imgs/ui_dashboard.png">
 
-##### Zebra Fleet Auto Discovery & Status Report
+##### Printer Fleet
+<img width="800" alt="printers" src="zebra_day/imgs/ui_printers.png">
 
-<img width="1024" alt="fleetreport" src="https://github.com/Daylily-Informatics/zebra_day/assets/4713659/8a66bc11-f8f5-4c40-9970-36d554a4593a">
+##### Print Request
+<img width="800" alt="print_request" src="zebra_day/imgs/ui_print_request.png">
 
+##### ZPL Template Editor
+<img width="800" alt="templates" src="zebra_day/imgs/ui_templates.png">
 
-##### Zebra Printer Fleet Config Json Editing
-<img width="472" alt="pconfjson" src="https://github.com/Daylily-Informatics/zebra_day/assets/4713659/0813cb07-4c5a-4cc9-9b33-d00e8424385e">
-  One printer configured.
-
-
-##### ZPL Template Drafting / Preview PNG / Test Print / Save 
-<img width="953" alt="zpl_editing" src="https://github.com/Daylily-Informatics/zebra_day/assets/4713659/15aac332-c5f8-4ce6-be6c-9c403fd8d35d">
-
-
-##### Manual Print Requests
-<img width="895" alt="printmanual" src="https://github.com/Daylily-Informatics/zebra_day/assets/4713659/72442f68-984f-4264-93ec-9878372d26f2">
+##### Configuration
+<img width="800" alt="config" src="zebra_day/imgs/ui_config.png">
 
+##### API Documentation
+<img width="800" alt="api_docs" src="zebra_day/imgs/ui_api_docs.png">
 
 <br><br>
   
@@ -436,21 +509,20 @@ zlab = zdpm.zpl()
 
 zlab.probe_zebra_printers_add_to_printers_json('192.168.1')  # REPLACE the IP stub with the correct value for your network. This may take a few min to run.  !! This command is not required if you've sucessuflly run the quickstart already, also, won't hurt.
 
-print(zlab.printers)  # This should print out the json dict of all detected zebra printers. An empty dict, {}, is a failure of autodetection, and manual creation of the json file may be needed. If successful, the lab name assigned is 'scan-results', this may be edited latter.
+print(zlab.printers)  # This should print out the json dict of all detected zebra printers. An empty dict, {}, is a failure of autodetection, and manual creation of the json file may be needed. If successful, the lab name assigned is 'default', this may be edited later.
 
-# The json will loook something like this
-## {'labs': {'scan-results': {'192.168.1.7': {'ip_address': '192.168.1.7', 'label_zpl_styles': ['test_2inX1in'], 'print_method': 'unk'}}}
-##               'lab' name     'printer' name(can be edited latter)                              label_zpl_style
+# The json will look something like this (v2.0.0 schema with nested printers)
+## {'schema_version': '2.0.0', 'labs': {'default': {'lab_name': 'Default', 'printers': {'192.168.1.7': {'ip_address': '192.168.1.7', ...}}}}}
 
-# Assuming a printer was detected, send a test print request.  Using the 'lab', 'printer' and 'label_zpl_style' above (you'd have your own IP/Name, other values should remain the same for now.  There are multiple label ZPL formats available, the test_2inX1in is for quick testing & only formats in the two UID values specified.
+# Assuming a printer was detected, send a test print request. Using the 'lab', 'printer' and 'label_zpl_style' above (you'd have your own IP/Name, other values should remain the same for now. There are multiple label ZPL formats available, the test_2inX1in is for quick testing & only formats in the two UID values specified.
 
-zlab.print_zpl(lab='scan-results', printer_name='192.168.1.7', label_zpl_style='test_2inX1in', uid_barcode="123aUID")
+zlab.print_zpl(lab='default', printer_name='192.168.1.7', label_zpl_style='test_2inX1in', uid_barcode="123aUID")
 # ZPL code sent successfully to the printer!
 # Out[13]: '^XA\n^FO235,20\n^BY1\n^B3N,N,40,N,N\n^FD123aUID^FS\n^FO235,70\n^ADN,30,20\n^FD123aUID^FS\n^FO235,115\n^ADN,25,12\n^FDalt_a^FS\n^FO235,145\n^ADN,25,12\n^FDalt_b^FS\n^FO70,180\n^FO235,170\n^ADN,30,20\n^FDalt_c^FS\n^FO490,180\n^ADN,25,12\n^FDalt_d^FS\n^XZ'
 ```
 
 * This will produce a label which looks like this (modulo printer config items needing attention).
-  ![test_lab](zebra_day/imgs/quick_start_test_label2.png)
+  ![test_lab](zebra_day/imgs/legacy/quick_start_test_label2.png)
 
 
 ### [Programatic Guide](zebra_day/docs/programatic_guide.md)
@@ -496,27 +568,33 @@ zday gui start --foreground
 uvicorn zebra_day.web.app:create_app --host 0.0.0.0 --port 8118 --factory
 ```
 
-### Modern vs Legacy UI
+### Web UI
 
-zebra_day 0.6.0+ includes a redesigned modern UI alongside the preserved legacy interface:
+zebra_day 2.0.0+ features a modern, responsive web interface:
 
 | Interface | URL | Description |
 |-----------|-----|-------------|
-| **Modern UI** | `http://localhost:8118/` | New dashboard with stats, quick actions, improved navigation |
-| **Legacy UI** | `http://localhost:8118/legacy` | Original interface, fully functional |
-| **API Docs** | `http://localhost:8118/docs` | Interactive OpenAPI/Swagger documentation |
-| **ReDoc** | `http://localhost:8118/redoc` | Alternative API documentation |
+| **Dashboard** | `https://localhost:8118/` | Printer fleet stats, quick actions, navigation |
+| **Printers** | `https://localhost:8118/printers` | Printer status and management |
+| **Print** | `https://localhost:8118/print` | Send print requests |
+| **Templates** | `https://localhost:8118/templates` | ZPL template editor with live preview |
+| **Config** | `https://localhost:8118/config` | Printer configuration management |
+| **API Docs** | `https://localhost:8118/docs` | Interactive OpenAPI/Swagger documentation |
+| **ReDoc** | `https://localhost:8118/redoc` | Alternative API documentation |
+
+> **Note:** Use `http://` instead of `https://` if running without certificates (`--no-https`).
 
-Both interfaces provide full functionality. The modern UI offers:
+The modern UI offers:
 - Dashboard with printer fleet statistics
 - Streamlined navigation
-- Improved template editor
+- Improved template editor with live PNG preview
 - Better mobile responsiveness
+- Configuration editing with backup management
 
 ### Print via HTTP API
 
 ```http
-http://YOUR.HOST.IP.ADDR:8118/_print_label?lab=scan-results&printer=192.168.1.7&label_zpl_style=test_2inX1in&uid_barcode=123aUID
+http://YOUR.HOST.IP.ADDR:8118/_print_label?lab=default&printer=192.168.1.7&label_zpl_style=test_2inX1in&uid_barcode=123aUID
 ```
 
 * See the [Web UI Guide](zebra_day/docs/zebra_day_ui_guide.md) for full details.
@@ -579,7 +657,7 @@ When `--auth cognito` is enabled:
 
 Include the JWT token in the Authorization header:
 ```bash
-curl -H "Authorization: Bearer YOUR_JWT_TOKEN" http://localhost:8118/api/v1/printers
+curl -H "Authorization: Bearer YOUR_JWT_TOKEN" https://localhost:8118/api/v1/printers
 ```
 
 ### Secrets
@@ -659,23 +737,23 @@ GET /favicon.ico               200 OK        ~
 </pre>
 
 And looks like:
-<img src=zebra_day/imgs/ngrok.png>
+<img src=zebra_day/imgs/legacy/ngrok.png>
 
 * If you leave the ngrok tunnel running, go to a different network, you can use the link named in the `Forwarding` row above to access the zebra_day UI, in the above example, this url would be `https://dfbf-23-93-175-197.ngrok-free.app`.
 
 #### Sending Label Print Requests
 ##### from a web browser on a different network
 
-`https://dfbf-23-93-175-197.ngrok-free.app/_print_label?uid_barcode=UID33344455&alt_a=altTEXTAA&alt_b=altTEXTBB&alt_c=altTEXTCC&alt_d=&alt_e=&alt_f=&lab=scan-results&printer=192.168.1.20&printer_ip=192.168.1.20&label_zpl_style=tube_2inX1in`
+`https://dfbf-23-93-175-197.ngrok-free.app/_print_label?uid_barcode=UID33344455&alt_a=altTEXTAA&alt_b=altTEXTBB&alt_c=altTEXTCC&alt_d=&alt_e=&alt_f=&lab=default&printer=192.168.1.20&printer_ip=192.168.1.20&label_zpl_style=tube_2inX1in`
 
 ##### Using wget from a shell on a machine outside your local network
 ```bash
-wget "https://dfbf-23-93-175-197.ngrok-free.app/_print_label?uid_barcode=UID33344455&alt_a=altTEXTAA&alt_b=altTEXTBB&alt_c=altTEXTCC&alt_d=&alt_e=&alt_f=&lab=scan-results&printer=192.168.1.20&printer_ip=192.168.1.20&label_zpl_style=tube_2inX1in"
+wget "https://dfbf-23-93-175-197.ngrok-free.app/_print_label?uid_barcode=UID33344455&alt_a=altTEXTAA&alt_b=altTEXTBB&alt_c=altTEXTCC&alt_d=&alt_e=&alt_f=&lab=default&printer=192.168.1.20&printer_ip=192.168.1.20&label_zpl_style=tube_2inX1in"
 ```
 
 ### From SalesForce
 
- * There are several ways to do this, but they all boil down to somehow formulating a URL for each print request, ie: `https://dfbf-23-93-175-197.ngrok-free.app/_print_label?uid_barcode=UID33344455&lab=scan-results&printer=192.168.1.20&label_zpl_style=tube_2inX1in`, and hitting the URL via Apex, Flow, etc.
+ * There are several ways to do this, but they all boil down to somehow formulating a URL for each print request, ie: `https://dfbf-23-93-175-197.ngrok-free.app/_print_label?uid_barcode=UID33344455&lab=default&printer=192.168.1.20&label_zpl_style=tube_2inX1in`, and hitting the URL via Apex, Flow, etc.
    * To send a print request, you will need to know the API url, and the `lab`, `printer_name`, and `label_zpl_style` you wish to print the salesforce `Name` aka `UID` as a label.  This example explains how to pass just one variable to print from salesforce, adding additional metadata to print involves adding additional params to the url being constructed.
 
 
@@ -730,7 +808,7 @@ Next, create a flow which uses this Apex Class.
 * Choose `Actions and Related Records`, and check the box at the bottom of the page to `Include a Run Asynchronously path...`
   * upon clicking this box, the graphic representation of the flow to the left of the page will now have 2 branches at the bottom of the flow rule, one `Run Immediately` and one `Run Asynchronously`.  The `Run Immediately` branch was throwing errors, so I removed it to debug at a latter date.
   * Click the node just below the `Run Asynch` oval. Add an `Action`. Select the `Make HTTP Request` we created via the Apex Class above.  Give it a `Label`, let the API Name auto generate.
-  * In the `Endpoint URL` field, enter the url `https://dfbf-23-93-175-197.ngrok-free.app/_print_label?uid_barcode={!$Record.Name}&lab=scan-results&printer=!!YOURPRINTERIP!!&label_zpl_style=tube_2inX1in`, where Record.Name will be replaced with the Object.Name from the object triggering the flow.  Replace !!YOURPRINTERIP!! with one of the printer IPs zebra_day detected above.  If you are using the auto-generated zebra printers config json file, you may leave `scan-results` as the value for `lab=` as this will be the default name given when zebra_day autodetects printers.
+  * In the `Endpoint URL` field, enter the url `https://dfbf-23-93-175-197.ngrok-free.app/_print_label?uid_barcode={!$Record.Name}&lab=default&printer=!!YOURPRINTERIP!!&label_zpl_style=tube_2inX1in`, where Record.Name will be replaced with the Object.Name from the object triggering the flow.  Replace !!YOURPRINTERIP!! with one of the printer IPs zebra_day detected above.  If you are using the auto-generated zebra printers config json file, you may leave `default` as the value for `lab=` as this will be the default name given when zebra_day autodetects printers.
   * add the same HTTPrequest action to the node just below `Run Immediately`.
   * click `Save` in the upper right corner of the page. Give it a name
   * Click `Debug Again`, run the `Run Immediately` branch first. This will fail.
@@ -775,12 +853,4 @@ Tthen run `sudo docker compose up --build -d` to run it then reach it at http://
 
   * Set varios printer config via ZPL commands (presently this package only fetches config).
 
-
-# BadgeLand
-
-[![Python CI](https://github.com/Daylily-Informatics/zebra_day/actions/workflows/main.yaml/badge.svg)](https://github.com/Daylily-Informatics/zebra_day/actions/workflows/main.yaml)
-
-<br>
- 
-