From 6fb4951c9c8e992b03dcac49053f21249fc40bb2 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 14:08:36 +0530 Subject: [PATCH 01/70] perf: increase process guard interval to 2s and snapshot blocked set --- src/services/blocking_service.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/services/blocking_service.py b/src/services/blocking_service.py index b8e2ecd..83417e9 100644 --- a/src/services/blocking_service.py +++ b/src/services/blocking_service.py @@ -6,7 +6,7 @@ from src.database.database import get_blocked_apps LIMIT_CHECK_INTERVAL = 15 -PROCESS_CHECK_INTERVAL = 0.5 +PROCESS_CHECK_INTERVAL = 2 class BlockingService: @@ -165,16 +165,23 @@ def _process_guard(self): Scans running processes every PROCESS_CHECK_INTERVAL seconds and kills any that match the in-memory blocked_apps set. No DB access here — reads from the set updated by _limit_monitor. + + Optimisation: takes a snapshot of the blocked set each cycle to avoid + racing with _limit_monitor, and skips the full process_iter entirely + when nothing is blocked. """ while self.running: try: - if not self.blocked_apps: + # Snapshot — avoids racing with _limit_monitor updates + blocked_snapshot = self.blocked_apps.copy() + + if not blocked_snapshot: time.sleep(PROCESS_CHECK_INTERVAL) continue for proc in psutil.process_iter(['name']): try: - if proc.info['name'] in self.blocked_apps: + if proc.info['name'] in blocked_snapshot: proc.kill() except (psutil.NoSuchProcess, psutil.AccessDenied): continue From 3616e56ce08f2b5759a721340dd40b50841317f6 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 14:10:36 +0530 Subject: [PATCH 02/70] perf: decouple URL sniffing from logger loop via background resolver --- src/core/activity_logger.py | 11 ++++-- src/core/url_sniffer.py | 71 ++++++++++++++++++++++++++++++++++++- 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/src/core/activity_logger.py b/src/core/activity_logger.py index 668e565..4163123 100644 --- a/src/core/activity_logger.py +++ b/src/core/activity_logger.py @@ -6,7 +6,7 @@ import gc from pynput import mouse, keyboard -from src.core.url_sniffer import get_browser_url +from src.core.url_sniffer import get_browser_url, url_resolver from src.analytics.daily_summary import update_daily_stats from src.database.database import get_connection, get_setting from src.core.settings_cache import settings_cache @@ -396,9 +396,10 @@ def get_active_window_info() -> dict | None: url = "N/A" - if browser_tracking and any(b in app_name.lower() for b in ["chrome", "msedge", "brave", "firefox", "opera"]): + if browser_tracking: try: - detected = get_browser_url(hwnd=hwnd) + # Fast path: read cached URL from background resolver (never blocks) + detected = url_resolver.get_cached_url(hwnd, app_name) if detected: url = detected except Exception: @@ -580,6 +581,9 @@ def flush_session(session: SessionState, cursor) -> bool: # MAIN LOGGER LOOP # =============================== def start_logging(): + # Start background URL resolver so get_active_window_info() never blocks + url_resolver.start() + session: SessionState | None = None conn = get_connection() cursor = conn.cursor() @@ -704,6 +708,7 @@ def reset_session(new_info: dict | None): except Exception as e: print(f"[Logger] Fatal error: {e}") finally: + url_resolver.stop() if session: flush_session(session, cursor) try: diff --git a/src/core/url_sniffer.py b/src/core/url_sniffer.py index ad53ac5..ab1da93 100644 --- a/src/core/url_sniffer.py +++ b/src/core/url_sniffer.py @@ -137,4 +137,73 @@ def get_browser_url(hwnd=None): finally: _co_uninitialize() - return result[0] \ No newline at end of file + return result[0] + + +# =============================== +# BACKGROUND URL RESOLVER +# =============================== +_URL_POLL_INTERVAL = 3 # seconds between background URL polls + +BROWSER_NAMES = ["chrome", "msedge", "brave", "firefox", "opera", "vivaldi"] + + +class BackgroundURLResolver: + """ + Resolves browser URLs on a dedicated daemon thread every _URL_POLL_INTERVAL + seconds. The main logger loop reads the cached result via get_cached_url() + which never blocks. + + This keeps the heavy COM/UIA work off the 1-second logger tick. + """ + + def __init__(self): + self._cached_url: str | None = None + self._cached_hwnd: int | None = None + self._lock = threading.Lock() + self._stop = threading.Event() + self._thread: threading.Thread | None = None + + # -- public --------------------------------------------------------- + def start(self): + if self._thread and self._thread.is_alive(): + return + self._stop.clear() + self._thread = threading.Thread( + target=self._poll_loop, daemon=True, name="URLResolver" + ) + self._thread.start() + + def stop(self): + self._stop.set() + + def get_cached_url(self, hwnd: int, app_name: str) -> str | None: + """ + Returns the last resolved URL if *hwnd* matches the window that was + resolved. If the foreground window changed since the last poll, + returns None (the next poll cycle will pick it up). + """ + if not any(b in app_name.lower() for b in BROWSER_NAMES): + return None + with self._lock: + if self._cached_hwnd == hwnd: + return self._cached_url + return None + + # -- internal ------------------------------------------------------- + def _poll_loop(self): + while not self._stop.is_set(): + try: + hwnd = win32gui.GetForegroundWindow() + if hwnd: + url = get_browser_url(hwnd=hwnd) + with self._lock: + self._cached_hwnd = hwnd + self._cached_url = url + except Exception: + pass + self._stop.wait(_URL_POLL_INTERVAL) + + +# Singleton — started in activity_logger.start_logging() +url_resolver = BackgroundURLResolver() \ No newline at end of file From f2e9c0e92873c74685dccc103ca19d1565fe4bb9 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 14:12:48 +0530 Subject: [PATCH 03/70] perf: batch file monitor DB writes with 2s flush interval and bounded queue --- src/core/file_monitor.py | 60 +++++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/src/core/file_monitor.py b/src/core/file_monitor.py index 99f83ae..100500d 100644 --- a/src/core/file_monitor.py +++ b/src/core/file_monitor.py @@ -24,6 +24,7 @@ import time import datetime import threading +import collections import psutil from watchdog.observers import Observer from watchdog.events import FileSystemEventHandler @@ -64,11 +65,25 @@ def _get_local_drives(): # ─── Event handler ──────────────────────────────────────────────────────────── class _ActivityHandler(FileSystemEventHandler): - """Handles raw watchdog events and writes qualifying ones to the DB.""" + """Handles raw watchdog events and batches DB writes for efficiency.""" + + _FLUSH_INTERVAL = 2 # seconds between batch flushes + _MAX_QUEUE = 500 # drop oldest if queue exceeds this def __init__(self, essential_only: bool): self._essential_only = essential_only self._last_logged: dict[str, float] = {} + self._queue: collections.deque = collections.deque(maxlen=self._MAX_QUEUE) + self._queue_lock = threading.Lock() + self._flush_thread = threading.Thread( + target=self._flush_loop, daemon=True, name="FileMonitorFlush" + ) + self._stop = threading.Event() + self._flush_thread.start() + + def stop_flusher(self): + self._stop.set() + self._flush_pending() # drain remaining items def _should_ignore(self, path: str) -> bool: if path.startswith(BASE_DIR): @@ -81,7 +96,7 @@ def _should_ignore(self, path: str) -> bool: return True return False - def _log(self, action: str, path: str): + def _enqueue(self, action: str, path: str): now = time.time() # Throttle: same path within 1 s → skip if path in self._last_logged and now - self._last_logged[path] < 1: @@ -89,36 +104,50 @@ def _log(self, action: str, path: str): self._last_logged[path] = now timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") + with self._queue_lock: + self._queue.append((timestamp, action, path)) + + def _flush_pending(self): + with self._queue_lock: + batch = list(self._queue) + self._queue.clear() + if not batch: + return try: conn = get_connection() cursor = conn.cursor() - cursor.execute( + cursor.executemany( "INSERT INTO file_logs (timestamp, action, file_path) VALUES (?, ?, ?)", - (timestamp, action, path), + batch, ) conn.commit() conn.close() except Exception as exc: - logger.error("File DB insert error: %s", exc) + logger.error("File DB batch insert error: %s", exc) + + def _flush_loop(self): + while not self._stop.is_set(): + self._stop.wait(self._FLUSH_INTERVAL) + self._flush_pending() def on_created(self, event): if not event.is_directory and not self._should_ignore(event.src_path): - self._log("CREATED/DOWNLOADED", event.src_path) + self._enqueue("CREATED/DOWNLOADED", event.src_path) def on_modified(self, event): if not event.is_directory and not self._should_ignore(event.src_path): - self._log("MODIFIED", event.src_path) + self._enqueue("MODIFIED", event.src_path) def on_moved(self, event): if not event.is_directory: src_ok = not self._should_ignore(event.src_path) dst_ok = not self._should_ignore(event.dest_path) if src_ok or dst_ok: - self._log("MOVED/RENAMED", f"{event.src_path} -> {event.dest_path}") + self._enqueue("MOVED/RENAMED", f"{event.src_path} -> {event.dest_path}") def on_deleted(self, event): if not event.is_directory and not self._should_ignore(event.src_path): - self._log("DELETED", event.src_path) + self._enqueue("DELETED", event.src_path) # ─── Controller ─────────────────────────────────────────────────────────────── @@ -137,6 +166,7 @@ class FileMonitorController: def __init__(self): self._observer: Observer | None = None + self._handler: _ActivityHandler | None = None self._observer_lock = threading.Lock() # Poked whenever the file_logging_enabled setting changes self._change_event = threading.Event() @@ -187,6 +217,7 @@ def _start_observer(self): observer.start() self._observer = observer + self._handler = handler logger.info("FileMonitor: Observer started (file logging ON).") def _stop_observer(self): @@ -202,7 +233,16 @@ def _stop_observer(self): logger.warning("FileMonitor: error stopping Observer — %s", exc) finally: self._observer = None - logger.info("FileMonitor: Observer stopped (file logging OFF).") + + # Drain queued file events to DB before discarding handler + if self._handler is not None: + try: + self._handler.stop_flusher() + except Exception: + pass + self._handler = None + + logger.info("FileMonitor: Observer stopped (file logging OFF).") def _manager_loop(self): """ From 63530f298b4a3e90d86b7c74c5b849cf90d20790 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 14:13:27 +0530 Subject: [PATCH 04/70] perf: enable threaded mode for Werkzeug API server --- src/api/api_server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/api_server.py b/src/api/api_server.py index 6600c7b..c8ab279 100644 --- a/src/api/api_server.py +++ b/src/api/api_server.py @@ -31,9 +31,9 @@ def __init__(self, app_controller, host="127.0.0.1", port=7432): self.app = create_app(app_controller) def start(self): - self.server = make_server(self.host, self.port, self.app) + self.server = make_server(self.host, self.port, self.app, threaded=True) - print(f"API running on http://{self.host}:{self.port}") + print(f"API running on http://{self.host}:{self.port} (threaded)") self.server.serve_forever() From 0c4ecfddfc6e6e65e8a90d2a76d2371c50196bd8 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 14:15:20 +0530 Subject: [PATCH 05/70] perf: push date-range filtering into SQL for heatmap, weekly-trend, spark-series --- src/api/activity_routes.py | 2 ++ src/api/spark_routes.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/api/activity_routes.py b/src/api/activity_routes.py index 24abab6..ae8dc87 100644 --- a/src/api/activity_routes.py +++ b/src/api/activity_routes.py @@ -50,6 +50,7 @@ def heatmap(): ELSE 0 END FROM daily_stats + WHERE date >= date('now', '-60 days') ORDER BY date DESC """) @@ -161,6 +162,7 @@ def weekly_trend(): ELSE 0 END FROM daily_stats + WHERE date >= date('now', '-14 days') ORDER BY date DESC """) diff --git a/src/api/spark_routes.py b/src/api/spark_routes.py index dcb3a86..cfb9206 100644 --- a/src/api/spark_routes.py +++ b/src/api/spark_routes.py @@ -45,6 +45,7 @@ def spark_series(): try: # One query: aggregate everything we need per (date, category) + # Limited to the requested window to avoid scanning the full table cursor.execute(""" SELECT date, @@ -56,9 +57,10 @@ def spark_series(): SUM(sessions) AS sessions, app_name FROM daily_stats + WHERE date >= date('now', ? || ' days') GROUP BY date, main_category, app_name ORDER BY date DESC - """) + """, (str(-days),)) rows = cursor.fetchall() From a854efe7913340cd2c3c1c8967d2f04680fde9cb Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 14:16:08 +0530 Subject: [PATCH 06/70] perf: replace date() function call with range filter in focus query for index usage --- src/api/focus_routes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/focus_routes.py b/src/api/focus_routes.py index 3d683e3..e3eb287 100644 --- a/src/api/focus_routes.py +++ b/src/api/focus_routes.py @@ -58,9 +58,9 @@ def focus(): cursor.execute(""" SELECT timestamp, app_name FROM activity_logs - WHERE date(timestamp) = ? + WHERE timestamp >= ? AND timestamp < date(?, '+1 day') ORDER BY timestamp ASC - """, (selected_date,)) + """, (selected_date, selected_date)) logs = [ (ts, app) From 95302bc13d57cb5506dd818550f4455f8ce87265 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 14:19:22 +0530 Subject: [PATCH 07/70] perf: add /api/dashboard-bundle endpoint and use single fetch in frontend --- frontend/src/WellbeingDashboard.jsx | 28 ++++++------- src/api/dashboard_routes.py | 62 ++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 17 deletions(-) diff --git a/frontend/src/WellbeingDashboard.jsx b/frontend/src/WellbeingDashboard.jsx index 052cf4e..50a1ae3 100644 --- a/frontend/src/WellbeingDashboard.jsx +++ b/frontend/src/WellbeingDashboard.jsx @@ -320,21 +320,19 @@ export default function WellbeingDashboard({ onDisconnect, initialData = null }) const fetchDate = useCallback(async (date) => { if (inflight.current[date]) return inflight.current[date]; - const yd = yesterday(date); - const promise = Promise.all([ - fetch(`${BASE}/api/wellbeing?date=${date}`).then(r => r.json()), - fetch(`${BASE}/api/daily-stats?date=${date}`).then(r => r.json()), - fetch(`${BASE}/api/hourly?date=${date}`).then(r => r.json()), - fetch(`${BASE}/api/focus?date=${date}`).then(r => r.json()), - fetch(`${BASE}/api/daily-stats?date=${yd}`).then(r => r.json()).catch(() => []), - fetch(`${BASE}/limits/all`).then(r => r.json()).catch(() => []), - fetch(`${BASE}/api/wellbeing?date=${yd}`).then(r => r.json()).catch(() => null), - ]).then(([wb, ds, hr, fc, prev, lim, prevWb]) => { - const entry = { wb, ds, hr, fc, prev, lim, prevWb, fetchedAt: Date.now() }; - cache.current[date] = entry; - delete inflight.current[date]; - return entry; - }).catch(err => { delete inflight.current[date]; throw err; }); + const promise = fetch(`${BASE}/api/dashboard-bundle?date=${date}`) + .then(r => r.json()) + .then(bundle => { + const entry = { + wb: bundle.wb, ds: bundle.ds, hr: bundle.hr, fc: bundle.fc, + prev: bundle.prev, lim: bundle.lim, prevWb: bundle.prevWb, + fetchedAt: Date.now(), + }; + cache.current[date] = entry; + delete inflight.current[date]; + return entry; + }) + .catch(err => { delete inflight.current[date]; throw err; }); inflight.current[date] = promise; return promise; }, [BASE]); diff --git a/src/api/dashboard_routes.py b/src/api/dashboard_routes.py index b046411..34271c8 100644 --- a/src/api/dashboard_routes.py +++ b/src/api/dashboard_routes.py @@ -1,4 +1,4 @@ -from flask import jsonify +from flask import jsonify, request from src.api.wellbeing_routes import wellbeing_bp, safe, get_selected_date from src.database.database import get_connection @@ -273,4 +273,62 @@ def wellbeing(): }) finally: - conn.close() \ No newline at end of file + conn.close() + + +# ===================================== +# Dashboard Bundle (single round-trip) +# ===================================== + +@wellbeing_bp.route("/api/dashboard-bundle") +def dashboard_bundle(): + """ + Returns wellbeing + daily-stats + hourly + focus + yesterday stats + limits + in a single JSON response, eliminating 7 parallel fetches from the frontend. + Each sub-key calls the existing view function internally via Flask's test + client so the logic stays DRY. + """ + from flask import current_app + import datetime as _dt + + selected_date = get_selected_date() + try: + d = _dt.datetime.strptime(selected_date, "%Y-%m-%d") + yd = (d - _dt.timedelta(days=1)).strftime("%Y-%m-%d") + except Exception: + yd = selected_date + + results = {} + client = current_app.test_client() + endpoints = { + "wb": f"/api/wellbeing?date={selected_date}", + "ds": f"/api/daily-stats?date={selected_date}", + "hr": f"/api/hourly?date={selected_date}", + "fc": f"/api/focus?date={selected_date}", + "prev": f"/api/daily-stats?date={yd}", + "prevWb": f"/api/wellbeing?date={yd}", + } + for key, path in endpoints.items(): + try: + resp = client.get(path) + results[key] = resp.get_json() + except Exception: + results[key] = None + + # Limits don't depend on date + try: + from src.database.database import get_all_limits + limits = get_all_limits() + results["lim"] = [ + { + "id": row[0], + "app_name": row[1], + "daily_limit_seconds": row[2], + "is_enabled": bool(row[3]) + } + for row in limits + ] + except Exception: + results["lim"] = [] + + return jsonify(results) \ No newline at end of file From 15303c196cc634490557b2e63eb6be2f9548b7ba Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 14:20:18 +0530 Subject: [PATCH 08/70] perf: expand data retention cleanup to daily_stats and file_logs tables --- src/database/database.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/database/database.py b/src/database/database.py index 183d813..1c9ec75 100644 --- a/src/database/database.py +++ b/src/database/database.py @@ -499,19 +499,30 @@ def get_auto_delete_days(): def delete_activity_older_than(days: int): """ - Delete activity records older than N days + Delete activity records older than N days across all log tables. """ conn = get_connection() cursor = conn.cursor() cutoff = (datetime.now() - timedelta(days=days)).isoformat() + cutoff_date = (datetime.now() - timedelta(days=days)).strftime("%Y-%m-%d") cursor.execute(""" DELETE FROM activity_logs WHERE timestamp < ? """, (cutoff,)) + cursor.execute(""" + DELETE FROM daily_stats + WHERE date < ? + """, (cutoff_date,)) + + cursor.execute(""" + DELETE FROM file_logs + WHERE timestamp < ? + """, (cutoff,)) + conn.commit() conn.close() From bfd22d911ca2f7d1300c107e4ab732124f7d2803 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 14:22:41 +0530 Subject: [PATCH 09/70] stability: make setup_logger() idempotent to prevent handler loss --- src/utils/logger.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/utils/logger.py b/src/utils/logger.py index 8a01c17..3803360 100644 --- a/src/utils/logger.py +++ b/src/utils/logger.py @@ -22,16 +22,28 @@ def cleanup_old_logs(log_dir): pass +# Guard: only configure once per process even if called from multiple modules +_logger_initialized = False + + def setup_logger(): + global _logger_initialized + + logger = logging.getLogger("stasis") + + # If already set up in this process, just return the existing logger + if _logger_initialized and logger.hasHandlers(): + return logger + log_dir = get_logs_dir() today = datetime.now().strftime("%Y-%m-%d") log_file = os.path.join(log_dir, f"stasis_{today}.log") - logger = logging.getLogger("stasis") logger.setLevel(logging.INFO) logger.propagate = False + # Only clear + re-add on first init (avoids handler churn) if logger.hasHandlers(): logger.handlers.clear() @@ -45,6 +57,8 @@ def setup_logger(): file_handler.setFormatter(formatter) logger.addHandler(file_handler) + _logger_initialized = True + cleanup_old_logs(log_dir) return logger From 9fecb825f47442407470a08afe836960e2156f87 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 14:23:30 +0530 Subject: [PATCH 10/70] stability: standardize boolean settings to true/false format --- src/api/danger_routes.py | 4 ++-- src/config/settings_manager.py | 4 ++-- src/core/activity_logger.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/api/danger_routes.py b/src/api/danger_routes.py index 7ec7d16..e787605 100644 --- a/src/api/danger_routes.py +++ b/src/api/danger_routes.py @@ -178,7 +178,7 @@ def toggle_browser_tracking(): set_setting( "browser_tracking", - "1" if enabled else "0" + "true" if enabled else "false" ) return jsonify({ @@ -208,7 +208,7 @@ def toggle_idle_detection(): set_setting( "idle_detection", - "1" if enabled else "0" + "true" if enabled else "false" ) return jsonify({ diff --git a/src/config/settings_manager.py b/src/config/settings_manager.py index 9f9aa52..3b28e4c 100644 --- a/src/config/settings_manager.py +++ b/src/config/settings_manager.py @@ -86,8 +86,8 @@ def initialize_defaults(): "file_logging_essential_only": "false", "show_yesterday_comparison": "true", "hardware_acceleration": "true", - "idle_detection": "1", - "browser_tracking": "1" + "idle_detection": "true", + "browser_tracking": "true" } for key, value in defaults.items(): diff --git a/src/core/activity_logger.py b/src/core/activity_logger.py index 4163123..2a8b8a7 100644 --- a/src/core/activity_logger.py +++ b/src/core/activity_logger.py @@ -392,7 +392,7 @@ def get_active_window_info() -> dict | None: if not app_name: return None - browser_tracking = settings_cache.get("browser_tracking", "1") == "1" + browser_tracking = settings_cache.get("browser_tracking", "true") in ("true", "1") url = "N/A" @@ -637,7 +637,7 @@ def reset_session(new_info: dict | None): info = get_active_window_info() # ---- determine idle state ---- - idle_detection_enabled = settings_cache.get("idle_detection", "1") == "1" + idle_detection_enabled = settings_cache.get("idle_detection", "true") in ("true", "1") idle_secs = input_tracker.get_idle_seconds() if idle_detection_enabled else 0 media_playing = is_media_active(info) From 07cbbbacc7dce07aacacdfea07f2eb12d719954b Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 14:54:40 +0530 Subject: [PATCH 11/70] fix: include all categories in wellbeing totalScreenTime calculation Previously totalScreenTime only summed productive + neutral + other + unproductive, excluding entertainment, communication, and system categories. Now uses sum(category_data.values()) to count ALL non-ignored app usage as screen time. Productivity formula unchanged entertainment/communication/system contribute 0 weight, lowering productivity% when present (correct behavior). --- src/api/dashboard_routes.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api/dashboard_routes.py b/src/api/dashboard_routes.py index 34271c8..6db5c27 100644 --- a/src/api/dashboard_routes.py +++ b/src/api/dashboard_routes.py @@ -189,7 +189,8 @@ def wellbeing(): unproductive = safe(category_data.get("unproductive", 0)) - total_active = productive + neutral + unproductive + # Screen time = ALL non-ignored usage (entertainment, communication, system, etc.) + total_active = sum(category_data.values()) cursor.execute(""" SELECT From 82bf424230dbdad6d663fcc3df3ad8de94e20c29 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 15:08:17 +0530 Subject: [PATCH 12/70] fix: cap file monitor throttle cache at 10k entries to prevent memory leak The _last_logged dict grew unboundedly with every unique file path seen. Now uses OrderedDict with FIFO eviction when exceeding _MAX_THROTTLE_CACHE. --- src/core/file_monitor.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/file_monitor.py b/src/core/file_monitor.py index 100500d..aa804d3 100644 --- a/src/core/file_monitor.py +++ b/src/core/file_monitor.py @@ -69,10 +69,11 @@ class _ActivityHandler(FileSystemEventHandler): _FLUSH_INTERVAL = 2 # seconds between batch flushes _MAX_QUEUE = 500 # drop oldest if queue exceeds this + _MAX_THROTTLE_CACHE = 10_000 # max unique paths in throttle dict def __init__(self, essential_only: bool): self._essential_only = essential_only - self._last_logged: dict[str, float] = {} + self._last_logged: collections.OrderedDict = collections.OrderedDict() self._queue: collections.deque = collections.deque(maxlen=self._MAX_QUEUE) self._queue_lock = threading.Lock() self._flush_thread = threading.Thread( @@ -101,6 +102,9 @@ def _enqueue(self, action: str, path: str): # Throttle: same path within 1 s → skip if path in self._last_logged and now - self._last_logged[path] < 1: return + # Evict oldest entries when cache is full to prevent unbounded growth + while len(self._last_logged) >= self._MAX_THROTTLE_CACHE: + self._last_logged.popitem(last=False) self._last_logged[path] = now timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") From f52cdd2350a5cc55dcfeed0cadceb62843836d4c Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 15:08:27 +0530 Subject: [PATCH 13/70] perf: add in-memory cache to BaseSettingsManager to avoid per-call DB connections get() now checks a thread-safe dict cache before hitting SQLite. set() and delete() write-through to both DB and cache. --- src/config/settings_manager.py | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/config/settings_manager.py b/src/config/settings_manager.py index 3b28e4c..a773bae 100644 --- a/src/config/settings_manager.py +++ b/src/config/settings_manager.py @@ -1,12 +1,20 @@ +import threading from src.database.database import get_connection class BaseSettingsManager: """Base class for key-value settings management in different tables.""" TABLE_NAME = "settings" + _cache: dict = {} + _cache_lock = threading.Lock() @classmethod def get(cls, key: str): + cache_key = f"{cls.TABLE_NAME}:{key}" + with cls._cache_lock: + if cache_key in cls._cache: + return cls._cache[cache_key] + conn = get_connection() cursor = conn.cursor() @@ -18,10 +26,10 @@ def get(cls, key: str): row = cursor.fetchone() conn.close() - if row: - return row[0] - - return None + value = row[0] if row else None + with cls._cache_lock: + cls._cache[cache_key] = value + return value @classmethod def set(cls, key: str, value): @@ -36,6 +44,10 @@ def set(cls, key: str, value): conn.commit() conn.close() + cache_key = f"{cls.TABLE_NAME}:{key}" + with cls._cache_lock: + cls._cache[cache_key] = str(value) + @classmethod def delete(cls, key: str): conn = get_connection() @@ -49,6 +61,10 @@ def delete(cls, key: str): conn.commit() conn.close() + cache_key = f"{cls.TABLE_NAME}:{key}" + with cls._cache_lock: + cls._cache.pop(cache_key, None) + @classmethod def get_bool(cls, key: str, default: bool = False) -> bool: value = cls.get(key) From 2f4b26d1298c902b5dc810220d5f467c9d5c57f7 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 15:08:40 +0530 Subject: [PATCH 14/70] perf: eliminate redundant top_app SQL query in wellbeing endpoint top_app is now computed during the existing category_rows iteration, removing a separate GROUP BY + ORDER BY query on daily_stats. --- src/api/dashboard_routes.py | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/src/api/dashboard_routes.py b/src/api/dashboard_routes.py index 6db5c27..54a0b3b 100644 --- a/src/api/dashboard_routes.py +++ b/src/api/dashboard_routes.py @@ -171,6 +171,9 @@ def wellbeing(): category_data = {} + top_app = "N/A" + app_totals = {} # track per-app total for top_app without extra query + for main_cat, active_secs, app_name in category_rows: if is_ignored(app_name): @@ -179,6 +182,11 @@ def wellbeing(): category_data[main_cat] = ( category_data.get(main_cat, 0) + active_secs ) + app_totals[app_name] = app_totals.get(app_name, 0) + safe(active_secs) + + # Determine top app from the data we already have + if app_totals: + top_app = max(app_totals, key=app_totals.get) productive = safe(category_data.get("productive", 0)) @@ -221,23 +229,6 @@ def wellbeing(): total_clicks += safe(clicks) total_sessions += safe(sessions) - cursor.execute(""" - SELECT app_name, SUM(active_seconds) - FROM daily_stats - WHERE date = ? - GROUP BY app_name - ORDER BY SUM(active_seconds) DESC - """, (selected_date,)) - - top_app = "N/A" - - for app_name, total in cursor.fetchall(): - - if not is_ignored(app_name): - - top_app = app_name - break - if total_active == 0: productivity_percent = 0.0 From db651dade7aa6c49aa25b9a4a4fa1401b91719cc Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 15:08:50 +0530 Subject: [PATCH 15/70] perf: cache focus score per date with 45s TTL for today Historical dates cached permanently (immutable). Today's score refreshes every 45s instead of recalculating on every request. --- src/api/focus_routes.py | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/api/focus_routes.py b/src/api/focus_routes.py index e3eb287..18d3b71 100644 --- a/src/api/focus_routes.py +++ b/src/api/focus_routes.py @@ -1,15 +1,30 @@ from flask import jsonify +import time from src.api.wellbeing_routes import wellbeing_bp, safe, get_selected_date from src.database.database import get_connection from src.config.ignored_apps_manager import is_ignored +# ── Focus score cache ───────────────────────────────────────────────────────── +# Today's date is cached for up to _TTL seconds; historical dates are cached +# permanently (they can never change). +_focus_cache: dict = {} # date -> (result_dict, timestamp) +_FOCUS_TTL = 45 # seconds — today's score refreshes this often + @wellbeing_bp.route("/api/focus") def focus(): selected_date = get_selected_date() + # Check cache + import datetime as _dt + today = _dt.date.today().isoformat() + if selected_date in _focus_cache: + cached_result, cached_at = _focus_cache[selected_date] + if selected_date != today or (time.monotonic() - cached_at) < _FOCUS_TTL: + return jsonify(cached_result) + conn = get_connection() cursor = conn.cursor() @@ -170,14 +185,19 @@ def focus(): score = max(0, min(100, round(score))) - return jsonify({ + result = { "score": score, "deepWorkSeconds": productive_seconds, "flowBonus": flow_bonus, "engagementScore": round(engagement_score, 1), "switchPenalty": round(switch_penalty, 1), "idlePenalty": round(idle_penalty, 1) - }) + } + + # Store in cache + _focus_cache[selected_date] = (result, time.monotonic()) + + return jsonify(result) finally: conn.close() \ No newline at end of file From c0bf191992308e3c66acd17ee2267025dbbac0e5 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 15:09:03 +0530 Subject: [PATCH 16/70] stability: add threading.Lock to BlockingService.blocked_apps access Protects reads in _process_guard and writes in _limit_monitor with _blocked_apps_lock for proper thread safety. --- src/services/blocking_service.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/services/blocking_service.py b/src/services/blocking_service.py index 83417e9..5d928e6 100644 --- a/src/services/blocking_service.py +++ b/src/services/blocking_service.py @@ -26,6 +26,7 @@ def __init__(self): self.running = False self.blocked_apps = set() + self._blocked_apps_lock = threading.Lock() self.limit_thread = None self.guard_thread = None @@ -147,7 +148,8 @@ def _limit_monitor(self): # Single commit for the entire cycle conn.commit() - self.blocked_apps = new_blocked + with self._blocked_apps_lock: + self.blocked_apps = new_blocked finally: conn.close() @@ -173,7 +175,8 @@ def _process_guard(self): while self.running: try: # Snapshot — avoids racing with _limit_monitor updates - blocked_snapshot = self.blocked_apps.copy() + with self._blocked_apps_lock: + blocked_snapshot = self.blocked_apps.copy() if not blocked_snapshot: time.sleep(PROCESS_CHECK_INTERVAL) From e5731cc215d8c05647102e418584c0bb7b72aaa7 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 15:09:13 +0530 Subject: [PATCH 17/70] fix: use mtime-based cache for ignored_apps instead of permanent lru_cache File changes are now detected via os.path.getmtime and the cache refreshes automatically. Also switched is_ignored to O(1) set lookup. --- src/config/ignored_apps_manager.py | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/src/config/ignored_apps_manager.py b/src/config/ignored_apps_manager.py index 9c996e8..426c2b3 100644 --- a/src/config/ignored_apps_manager.py +++ b/src/config/ignored_apps_manager.py @@ -1,27 +1,43 @@ import json import os -from functools import lru_cache IGNORED_APPS_FILE = os.path.join( os.path.dirname(__file__), "ignored_apps.json" ) -@lru_cache(maxsize=1) +_cached_list: list = [] +_cached_mtime: float = 0.0 + + def load_ignored_apps(): + global _cached_list, _cached_mtime if not os.path.exists(IGNORED_APPS_FILE): return [] try: - with open(IGNORED_APPS_FILE, "r", encoding="utf-8") as f: - data = json.load(f) - return data.get("ignore_processes", []) + mtime = os.path.getmtime(IGNORED_APPS_FILE) + if mtime != _cached_mtime: + with open(IGNORED_APPS_FILE, "r", encoding="utf-8") as f: + data = json.load(f) + _cached_list = data.get("ignore_processes", []) + _cached_mtime = mtime + return _cached_list except Exception as e: print(f"Error loading ignored apps: {e}") return [] + +# Pre-built lowercase set for O(1) lookup, refreshed when file changes +_ignored_set: set = set() +_ignored_set_mtime: float = 0.0 + + def is_ignored(app_name: str) -> bool: + global _ignored_set, _ignored_set_mtime if not app_name: return False ignored_list = load_ignored_apps() - app_name_lower = app_name.lower().replace(".exe", "") - return any(ignored.lower().replace(".exe", "") == app_name_lower for ignored in ignored_list) + if _ignored_set_mtime != _cached_mtime: + _ignored_set = {n.lower().replace(".exe", "") for n in ignored_list} + _ignored_set_mtime = _cached_mtime + return app_name.lower().replace(".exe", "") in _ignored_set From 0b85cc300939be6ecece0831037198afaa50ba68 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 15:09:25 +0530 Subject: [PATCH 18/70] perf: add /api/init-bundle endpoint and consolidate 6 mount-time fetches Frontend now makes a single request for settings, ignored apps, available dates, heatmap, spark series, and update status on mount. --- frontend/src/WellbeingDashboard.jsx | 23 ++++++++--------- src/api/system_routes.py | 39 ++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 14 deletions(-) diff --git a/frontend/src/WellbeingDashboard.jsx b/frontend/src/WellbeingDashboard.jsx index 50a1ae3..92e71bc 100644 --- a/frontend/src/WellbeingDashboard.jsx +++ b/frontend/src/WellbeingDashboard.jsx @@ -300,10 +300,15 @@ export default function WellbeingDashboard({ onDisconnect, initialData = null }) // Version + settings useEffect(() => { - fetch(`${BASE}/api/update/status`).then(r => r.json()) - .then(d => { if (d?.current_version) setAppVersion(d.current_version); }).catch(() => { }); - fetch(`${BASE}/api/settings`).then(r => r.json()) - .then(d => { if (d?.show_yesterday_comparison !== undefined) setShowYesterdayComparison(d.show_yesterday_comparison); }).catch(() => { }); + fetch(`${BASE}/api/init-bundle`).then(r => r.json()) + .then(d => { + if (d?.updateStatus?.current_version) setAppVersion(d.updateStatus.current_version); + if (d?.settings?.show_yesterday_comparison !== undefined) setShowYesterdayComparison(d.settings.show_yesterday_comparison); + if (d?.availableDates) setAvailableDates(d.availableDates); + if (d?.heatmap) setHeatmapData(d.heatmap); + if (d?.sparkSeries) setSparkData(d.sparkSeries); + if (d?.ignoredApps) setIgnoredApps(new Set((Array.isArray(d.ignoredApps) ? d.ignoredApps : []).map(a => a.toLowerCase()))); + }).catch(() => { }); }, [BASE, showSettings]); const cache = useRef(initialData ? { [localYMD()]: { ...initialData, fetchedAt: Date.now() } } : {}); @@ -344,15 +349,7 @@ export default function WellbeingDashboard({ onDisconnect, initialData = null }) }); }, [fetchDate]); - useEffect(() => { - fetch(`${BASE}/api/available-dates`).then(r => r.json()).then(d => setAvailableDates(d)).catch(() => setAvailableDates([localYMD()])); - fetch(`${BASE}/api/heatmap`).then(r => r.json()).then(d => setHeatmapData(d)).catch(() => { }); - // Dedicated sparkline endpoint — fetches 7-day focus, keystrokes, clicks etc. - fetch(`${BASE}/api/spark-series?days=7`).then(r => r.json()).then(d => setSparkData(d)).catch(() => { }); - fetch(`${BASE}/api/ignored-apps`).then(r => r.json()).then(d => { - setIgnoredApps(new Set((Array.isArray(d) ? d : []).map(a => a.toLowerCase()))); - }).catch(() => { }); - }, []); + // init-bundle above handles available-dates, heatmap, spark-series, and ignored-apps useEffect(() => { const today = localYMD(); diff --git a/src/api/system_routes.py b/src/api/system_routes.py index e13a51b..6757ff0 100644 --- a/src/api/system_routes.py +++ b/src/api/system_routes.py @@ -2,7 +2,7 @@ import io import base64 import hashlib -from flask import jsonify, send_file +from flask import jsonify, send_file, current_app from src.api.wellbeing_routes import wellbeing_bp from src.database.database import get_connection from src.config.storage import get_icons_dir @@ -11,6 +11,43 @@ from src.config.ignored_apps_manager import load_ignored_apps +# ===================================== +# Init Bundle — single request for all mount-time metadata +# ===================================== + +@wellbeing_bp.route("/api/init-bundle") +def init_bundle(): + """ + Returns everything the frontend needs on first mount in a single + round-trip: settings, ignored apps, available dates, heatmap, + spark series, and update status. + """ + client = current_app.test_client() + keys = { + "settings": "/api/settings", + "ignoredApps": "/api/ignored-apps", + "availableDates": "/api/available-dates", + "heatmap": "/api/heatmap", + "sparkSeries": "/api/spark-series?days=7", + } + result = {} + for key, path in keys.items(): + try: + resp = client.get(path) + result[key] = resp.get_json() + except Exception: + result[key] = None + + # Update status comes from a different blueprint + try: + resp = client.get("/api/update/status") + result["updateStatus"] = resp.get_json() + except Exception: + result["updateStatus"] = None + + return jsonify(result) + + @wellbeing_bp.route("/api/ignored-apps") def ignored_apps(): try: From ba509f19bf2e10e698fef812b0a24d377be50679 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 15:09:39 +0530 Subject: [PATCH 19/70] perf: warm settings cache at startup to avoid first-call DB hit Added warm() method to SettingsCache and call it from main() right after init_db(). First get() now reads from pre-populated cache. --- src/core/settings_cache.py | 4 ++++ src/main.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/core/settings_cache.py b/src/core/settings_cache.py index 9965411..3134392 100644 --- a/src/core/settings_cache.py +++ b/src/core/settings_cache.py @@ -21,6 +21,10 @@ def refresh(self): self.cache = {k: v for k, v in rows} self.last_refresh = time.monotonic() + def warm(self): + """Load all settings into cache immediately; avoids DB hit on first get().""" + self.refresh() + def get(self, key, default=None): now = time.monotonic() diff --git a/src/main.py b/src/main.py index 39530c4..8ad0797 100644 --- a/src/main.py +++ b/src/main.py @@ -82,6 +82,10 @@ def api_server_vessel(): init_db() + # Pre-warm settings cache so the first get() doesn't hit the DB + from src.core.settings_cache import settings_cache + settings_cache.warm() + if getattr(sys, "frozen", False): add_to_startup(get_executable_path()) From ef603c4610cf6ae80c83a704ac1898fc87d48764 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 15:33:12 +0530 Subject: [PATCH 20/70] feat(HourlyBar): add live now needle with pulsing dot - Track fractional hour position (nowFrac) via 15s interval - Render 1px gradient vertical line at (nowFrac/24)*100% across bar area - Pulsing 7px dot at needle top using new now-pulse keyframe - Needle only renders when selectedDate === today (hidden on historical views) - Added now-pulse keyframe to DONUT_CSS --- frontend/src/shared/components.jsx | 40 +++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/frontend/src/shared/components.jsx b/frontend/src/shared/components.jsx index ff9bc37..3497a85 100644 --- a/frontend/src/shared/components.jsx +++ b/frontend/src/shared/components.jsx @@ -355,6 +355,21 @@ export function HourlyBar({ data, peakHour, BASE, selectedDate }) { const nowHour = new Date().getHours(); const lbl = i => i === 0 ? "12 am" : i === 12 ? "12 pm" : i < 12 ? `${i} am` : `${i - 12} pm`; + // Live clock — fractional hour position for "now" needle + const isToday = selectedDate === localYMD(); + const [nowFrac, setNowFrac] = useState(() => { + const n = new Date(); return n.getHours() + n.getMinutes() / 60 + n.getSeconds() / 3600; + }); + useEffect(() => { + if (!isToday) return; + const tick = () => { + const n = new Date(); + setNowFrac(n.getHours() + n.getMinutes() / 60 + n.getSeconds() / 3600); + }; + const iv = setInterval(tick, 15000); // update every 15s — no flicker + return () => clearInterval(iv); + }, [isToday]); + // Per-hour app breakdown from session data const [hourlyApps, setHourlyApps] = useState({}); const fetchedRef = useRef(null); @@ -455,6 +470,25 @@ export function HourlyBar({ data, peakHour, BASE, selectedDate }) { {max}m
+ {/* ── Live "now" needle ── */} + {isToday && ( +
+
+
+ )}
{data.map((v, i) => { const h = max > 0 ? (v / max) * 68 : 2; @@ -505,6 +539,10 @@ export function HourlyBar({ data, peakHour, BASE, selectedDate }) { // ─── DONUT CSS ──────────────────────────────────────────────────────────────── export const DONUT_CSS = ` + @keyframes now-pulse { + 0%, 100% { box-shadow: 0 0 0 3px rgba(74,222,128,0.25); transform: translate(-50%, -4px) scale(1); } + 50% { box-shadow: 0 0 0 6px rgba(74,222,128,0.08); transform: translate(-50%, -4px) scale(1.2); } + } @keyframes center-fade-in { from {opacity: 0; transform: scale(0.88) translateY(4px); } to {opacity: 1; transform: scale(1) translateY(0); } @@ -531,4 +569,4 @@ export const DONUT_CSS = ` .cat-swatch {transition: box-shadow 0.28s ease, transform 0.28s cubic-bezier(0.34,1.56,0.64,1); } .cat-row:hover .cat-swatch {transform: scale(1.35); } .cat-label, .cat-pct {transition: color 0.28s ease; } - `; + `; \ No newline at end of file From 2aec43b5a2a2d2b2eb20082cafb45535f6445e2e Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 15:33:56 +0530 Subject: [PATCH 21/70] feat(ScreenTimeCard): add active/idle ratio segmented bar - Segmented 6px bar below Active/Idle stat boxes showing proportional split - Green gradient segment for active time, muted slate for idle - Percentage labels underneath: X% active / X% idle - Animates in with 1.4s spring transition on date change - Guarded with totalScreenTime > 0 check to avoid rendering on empty days --- frontend/src/pages/ScreenTimeCard.jsx | 35 ++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/frontend/src/pages/ScreenTimeCard.jsx b/frontend/src/pages/ScreenTimeCard.jsx index 8d9de89..716baad 100644 --- a/frontend/src/pages/ScreenTimeCard.jsx +++ b/frontend/src/pages/ScreenTimeCard.jsx @@ -70,6 +70,39 @@ export default function ScreenTimeCard({ data, prevWellbeing, showComparison, co
+ {/* ── Active / Idle ratio bar ── */} + {data.totalScreenTime > 0 && (() => { + const activeTime = data.totalScreenTime - data.totalIdleTime; + const activePct = Math.round((activeTime / data.totalScreenTime) * 100); + const idlePct = 100 - activePct; + return ( +
+
+
+
+
+
+ {activePct}% active + {idlePct}% idle +
+
+ ); + })()} + {sparkValues?.length >= 2 && (
); -} +} \ No newline at end of file From 6c744e3f5f56947f994ff6246268ce397a51fa68 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 15:34:40 +0530 Subject: [PATCH 22/70] feat(AppsPage): animate category filter chip count badges MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Added prevFilter state and handleFilterChange handler - Count badge gets key={cat-cnt} so React remounts it on filter change - Newly active chip count plays badge-pop spring animation (scale 0.6 → 1.35 → 1) - badge-pop keyframe injected via scoped style tag in component return --- frontend/src/pages/AppsPage.jsx | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/frontend/src/pages/AppsPage.jsx b/frontend/src/pages/AppsPage.jsx index a97b37d..a171870 100644 --- a/frontend/src/pages/AppsPage.jsx +++ b/frontend/src/pages/AppsPage.jsx @@ -186,12 +186,25 @@ function BrowserRow({ browsers, maxActive, index, BASE, selectedDate, prevActive // ─── APPS PAGE ──────────────────────────────────────────────────────────────── export default function AppsPage({ BASE, stats, prevStats, selectedDate, ignoredApps }) { const [appFilter, setAppFilter] = useState("all"); + const [prevFilter, setPrevFilter] = useState("all"); + + const handleFilterChange = (cat) => { + setPrevFilter(appFilter); + setAppFilter(cat); + }; const prevMap = prevStats.reduce((a, s) => { a[s.app] = (a[s.app] || 0) + s.active; return a; }, {}); const sorted = [...stats].sort((a, b) => b.active - a.active); return ( +
Time by App
vs yesterday
@@ -205,7 +218,7 @@ export default function AppsPage({ BASE, stats, prevStats, selectedDate, ignored const cnt = cat === "all" ? sorted.length : sorted.filter(s => s.main === cat).length; if (cat !== "all" && cnt === 0) return null; return ( - ); })} @@ -262,4 +282,4 @@ export default function AppsPage({ BASE, stats, prevStats, selectedDate, ignored })()} ); -} +} \ No newline at end of file From 92473e307f13e0689e4d64c903558ad1f040a725 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 15:35:38 +0530 Subject: [PATCH 23/70] fix(SessionTimeline): clamp tooltips, add gap break markers, show category totals MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Tooltip: clamp tipX against containerRef.current.offsetWidth so tooltips near left/right edges never overflow the card - Gap markers: replace invisible dashed lines with visible 💤 Xh break pill labels on the ruler, with dashed vertical lines running through all category rows - Category totals: label column now shows total time per category below the category name (e.g. 💼 productive / 3h 20m) using fmtTime --- frontend/src/pages/SessionTimeline.jsx | 95 +++++++++++++++++++------- 1 file changed, 71 insertions(+), 24 deletions(-) diff --git a/frontend/src/pages/SessionTimeline.jsx b/frontend/src/pages/SessionTimeline.jsx index 803c502..2c6583c 100644 --- a/frontend/src/pages/SessionTimeline.jsx +++ b/frontend/src/pages/SessionTimeline.jsx @@ -4,11 +4,6 @@ import { fmtTime } from "../shared/utils"; import { SectionCard } from "../shared/components"; // ─── SESSION TIMELINE ───────────────────────────────────────────────────────── -// Self-contained session timeline for one day. -// -// Props: -// BASE – API base URL -// date – ISO date string, e.g. "2024-01-15" function Timeline({ BASE, date }) { const [catBlocks, setCatBlocks] = useState({}); const [allCats, setAllCats] = useState([]); @@ -133,28 +128,48 @@ function Timeline({ BASE, date }) { return `${displayH}${m > 0 ? ":" + String(m).padStart(2, "0") : ""}${suffix}`; }; - const jumps = []; + // Gap detection — pairs of [prevHour, nextHour] where time jumps + const gaps = []; for (let i = 1; i < activeHours.length; i++) { - if (activeHours[i] !== activeHours[i - 1] + 1) jumps.push(activeHours[i]); + if (activeHours[i] !== activeHours[i - 1] + 1) { + gaps.push({ + xPct: toX(activeHours[i] * 60), // x position of the gap start + fromHour: activeHours[i - 1], + toHour: activeHours[i], + gapHours: activeHours[i] - activeHours[i - 1], + }); + } } const LABEL_W = 120; + // Category totals for the label column + const catTotals = {}; + for (const cat of allCats) { + catTotals[cat] = (catBlocks[cat] || []).reduce((s, b) => s + b.active, 0); + } + return (
- {/* Tooltip */} + {/* ── Tooltip (clamped to container bounds) ── */} {hovBlock && (() => { const { cat, block, tipX, tipY } = hovBlock; const col = CATEGORY_COLORS[cat] || CATEGORY_COLORS.other; const topApps = Object.entries(block.apps).sort(([, a], [, b]) => b - a).slice(0, 5); + const containerW = containerRef.current?.offsetWidth || 600; + const tooltipW = topApps.length > 0 ? 300 : 220; + // Clamp so tooltip never escapes the card + const clampedX = Math.min(Math.max(tipX, tooltipW / 2 + 4), containerW - tooltipW / 2 - 4); return (
@@ -214,19 +229,43 @@ function Timeline({ BASE, date }) {
)} - {/* Jump markers */} - {jumps.map(h => ( -
+ + {/* ── Gap break markers on ruler ── */} + {gaps.map((gap, gi) => ( +
+ {/* Dashed break line spanning all rows — height set to cover rows below */} +
+ {/* Gap pill label */} +
+ 💤 + + {gap.gapHours}h break + +
+
))}
- {/* Category rows */} + {/* ── Category rows ── */}
{allCats.map(cat => { const col = CATEGORY_COLORS[cat] || CATEGORY_COLORS.other; @@ -237,12 +276,20 @@ function Timeline({ BASE, date }) { }[cat] || "•"; return (
+ {/* Label column — now shows category total time too */}
- - {emoji} {cat} - +
+ + {emoji} {cat} + + + {fmtTime(catTotals[cat] || 0)} + +
+ + {/* Timeline track */}
{blocks.map(block => { const left = toX(block.startMin); @@ -300,4 +347,4 @@ export default function SessionTimeline({ BASE, date }) { ); -} +} \ No newline at end of file From 3e9f7915dd83b1ad1a1fa1eae09e64634be70618 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 15:36:22 +0530 Subject: [PATCH 24/70] fix(UpdateDialog): implement real snooze scheduling for Remind Later -Remind Later now opens an inline SnoozePicker instead of just closing - Four snooze options: 1 hour, 4 hours, Tomorrow, 1 week - Selected snooze writes stasis_remind_after timestamp to localStorage - Confirmation state shown after snooze selection, auto-closes after 1.4s - Back button cancels picker and returns to normal footer - Note: check localStorage stasis_remind_after in update check logic to suppress dialog during snooze window --- frontend/src/shared/UpdateDialog.jsx | 189 ++++++++++++++++++--------- 1 file changed, 127 insertions(+), 62 deletions(-) diff --git a/frontend/src/shared/UpdateDialog.jsx b/frontend/src/shared/UpdateDialog.jsx index 6404769..d681ef1 100644 --- a/frontend/src/shared/UpdateDialog.jsx +++ b/frontend/src/shared/UpdateDialog.jsx @@ -19,6 +19,7 @@ const DIALOG_CSS = ` @keyframes ud-overlay-in { from { opacity: 0; } to { opacity: 1; } } @keyframes ud-modal-in { from { opacity: 0; transform: scale(0.9) translateY(20px); } to { opacity: 1; transform: scale(1) translateY(0); } } @keyframes ud-slide-up { from { opacity: 0; transform: translateY(10px); } to { opacity: 1; transform: translateY(0); } } + @keyframes ud-snooze-in { from { opacity: 0; transform: translateY(6px) scale(0.97); } to { opacity: 1; transform: translateY(0) scale(1); } } .ud-btn { transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1); @@ -29,21 +30,30 @@ const DIALOG_CSS = ` } .ud-btn:hover { filter: brightness(1.1); transform: translateY(-1px); } .ud-btn:active { transform: translateY(0) scale(0.98); } + .ud-btn:disabled { opacity: 0.45; cursor: default; filter: none; transform: none; } + + .ud-snooze-opt { + transition: all 0.15s ease; + cursor: pointer; + border-radius: 8px; + } + .ud-snooze-opt:hover { background: rgba(255,255,255,0.05) !important; } .ud-scroll::-webkit-scrollbar { width: 4px; } .ud-scroll::-webkit-scrollbar-track { background: transparent; } .ud-scroll::-webkit-scrollbar-thumb { background: rgba(255,255,255,0.08); border-radius: 4px; } - - .ud-tag { - display: inline-flex; align-items: center; gap: 4px; - font-size: 10px; font-weight: 700; letter-spacing: 0.05em; - text-transform: uppercase; border-radius: 6px; - padding: 2px 8px; border: 1px solid; - } `; -// ─── HELPERS (Synchronized with UpdatePage) ─────────────────────────────────── +const SNOOZE_OPTIONS = [ + { label: "1 hour", hours: 1, icon: "⏰" }, + { label: "4 hours", hours: 4, icon: "🕓" }, + { label: "Tomorrow", hours: 24, icon: "📅" }, + { label: "1 week", hours: 168, icon: "📆" }, +]; + +const REMIND_KEY = "stasis_remind_after"; +// ─── HELPERS ───────────────────────────────────────────────────────────────── function inferSectionIcon(title) { const t = title.toLowerCase(); if (t.includes("fix") || t.includes("bug")) return "🐛"; @@ -58,7 +68,6 @@ function inferSectionIcon(title) { return "✦"; } -// Parse GitHub markdown release notes into structured sections function parseReleaseBody(body) { if (!body) return []; const lines = body.split("\n"); @@ -66,56 +75,103 @@ function parseReleaseBody(body) { let current = null; const ensureSection = (title = "Changes") => { - if (!current) { - current = { title, icon: inferSectionIcon(title), items: [] }; - } + if (!current) current = { title, icon: inferSectionIcon(title), items: [] }; return current; }; - const pushCurrent = () => { - if (current) { - if (current.items.length > 0 || (current.note && current.note.trim())) { - sections.push(current); - } - current = null; + if (current && (current.items.length > 0 || (current.note && current.note.trim()))) { + sections.push(current); } + current = null; }; for (const raw of lines) { const line = raw.trim(); if (!line) continue; - if (line.startsWith("#")) { pushCurrent(); const title = line.replace(/^#+\s*/, "").trim(); current = { title, icon: inferSectionIcon(title), items: [] }; continue; } - if (line.startsWith("- ") || line.startsWith("* ")) { - const text = line.replace(/^[-*]\s*/, "").trim(); - ensureSection("Changes").items.push(text); + ensureSection("Changes").items.push(line.replace(/^[-*]\s*/, "").trim()); continue; } - - if (line && !line.startsWith("#")) { - const s = ensureSection("General"); - s.note = (s.note || "") + line + " "; - } + const s = ensureSection("General"); + s.note = (s.note || "") + line + " "; } - pushCurrent(); return sections; } +// ─── SNOOZE PICKER ──────────────────────────────────────────────────────────── +function SnoozePicker({ onSnooze, onCancel }) { + return ( +
+
+ Remind me in… +
+
+ {SNOOZE_OPTIONS.map(opt => ( + + ))} +
+ +
+ ); +} + +// ─── UPDATE DIALOG ──────────────────────────────────────────────────────────── export default function UpdateDialog({ updateState, releases, onDownload, onLater }) { const latestVersion = updateState?.latest_version; const currentVersion = updateState?.current_version; + const [showSnooze, setShowSnooze] = useState(false); + const [snoozed, setSnoozed] = useState(false); + const [snoozedLabel, setSnoozedLabel] = useState(""); - // Find the latest release info for the changelog const latestRelease = releases?.find(r => r.tag_name.replace(/^v/, "") === latestVersion?.replace(/^v/, "")); const changelog = latestRelease ? parseReleaseBody(latestRelease.body) : []; + const handleSnooze = (hours) => { + const remindAt = Date.now() + hours * 60 * 60 * 1000; + localStorage.setItem(REMIND_KEY, remindAt.toString()); + const opt = SNOOZE_OPTIONS.find(o => o.hours === hours); + setSnoozedLabel(opt?.label || `${hours}h`); + setSnoozed(true); + // Close after brief confirmation + setTimeout(() => onLater(), 1400); + }; + return (
- {/* Header Section */} + {/* Header */}
- 🚀 -
+ }}>🚀

- Update Available -

+ }}>Update Available
v{currentVersion} → @@ -168,13 +220,11 @@ export default function UpdateDialog({ updateState, releases, onDownload, onLate fontSize: 13, fontWeight: 700, color: C.green, background: "rgba(74,222,128,0.1)", padding: "2px 10px", borderRadius: 20, border: "1px solid rgba(74,222,128,0.2)" - }}> - v{latestVersion} - + }}>v{latestVersion}
- {/* Changelog Content */} + {/* Changelog */}
What's New
- {changelog.length > 0 ? ( changelog.map((section, idx) => (
@@ -212,29 +261,45 @@ export default function UpdateDialog({ updateState, releases, onDownload, onLate )}
- {/* Footer Actions */} -
- -
+ ) : showSnooze ? ( + setShowSnooze(false)} /> + ) : ( + /* Footer Actions */ +
- Download Now - -
+ + +
+ )}
); -} +} \ No newline at end of file From 1508f5ae144c832cd7932cab631e4301e035e19e Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Thu, 12 Mar 2026 15:48:09 +0530 Subject: [PATCH 25/70] perf(ui): comprehensive frontend performance optimizations - React.memo on ScreenTimeCard, ProductivityCard, FocusCard, InputActivityCard - React.memo on AppRow and BrowserRow in AppsPage - Memoize DateNavigator and NoiseOverlay with React.memo - Replace backdrop-filter: blur(20px) with solid rgba backgrounds (GPU savings) - Reduce NoiseOverlay feTurbulence numOctaves from 4 to 2 - Replace all transition: 'all' with specific property transitions - Reduce double drop-shadow to single in CategoryBreakdown donut - Cache BrowserRow site-stats fetch results by date+app key - Fix sparkline footer negative margins (remove width calc + marginLeft) - Shared RAF loop for useCountUp (batches 4+ animations into 1 rAF) - Replace transition: all in UpdateDialog, TrendChip, filter chips, nav buttons --- frontend/src/WellbeingDashboard.jsx | 25 +++++------ frontend/src/pages/AppsPage.jsx | 54 ++++++++++++++---------- frontend/src/pages/CategoryBreakdown.jsx | 2 +- frontend/src/pages/FocusCard.jsx | 19 ++++----- frontend/src/pages/InputActivityCard.jsx | 14 +++--- frontend/src/pages/ProductivityCard.jsx | 17 +++----- frontend/src/pages/ScreenTimeCard.jsx | 17 +++----- frontend/src/shared/UpdateDialog.jsx | 4 +- frontend/src/shared/components.jsx | 8 ++-- frontend/src/shared/hooks.js | 39 ++++++++++++++--- 10 files changed, 112 insertions(+), 87 deletions(-) diff --git a/frontend/src/WellbeingDashboard.jsx b/frontend/src/WellbeingDashboard.jsx index 92e71bc..d2d9021 100644 --- a/frontend/src/WellbeingDashboard.jsx +++ b/frontend/src/WellbeingDashboard.jsx @@ -1,4 +1,4 @@ -import { useState, useEffect, useRef, useCallback, useReducer } from "react"; +import { useState, useEffect, useRef, useCallback, useReducer, memo, useMemo } from "react"; import SettingsPage from "./pages/SettingsPage"; import OverviewPage from "./pages/OverviewPage"; import AppsPage from "./pages/AppsPage"; @@ -52,11 +52,12 @@ function NoiseOverlay() { return ( {/* end center block */} {sparkValues?.length >= 2 && ( diff --git a/frontend/src/pages/ProductivityCard.jsx b/frontend/src/pages/ProductivityCard.jsx index 7e43506..d79f95b 100644 --- a/frontend/src/pages/ProductivityCard.jsx +++ b/frontend/src/pages/ProductivityCard.jsx @@ -1,7 +1,7 @@ import { memo, useState } from "react"; import { interpolateColor } from "../shared/utils"; import { useCountUp } from "../shared/hooks"; -import { SectionCard, RadialProgress, TrendChip } from "../shared/components"; +import { GoalStatusBlock, SectionCard, RadialProgress, TrendChip } from "../shared/components"; import { Sparkline } from "../WellbeingDashboard"; // ─── PRODUCTIVITY CARD ──────────────────────────────────────────────────────── @@ -88,32 +88,13 @@ function ProductivityCardInner({ data, prevWellbeing, showComparison, countKey,
)} - {hasGoal && goalTargetPct > 0 && ( - - )} + 0} + goalMet={goalMet} + goalLabel={`Goal ≥ ${Math.round(goalTargetPct)}%`} + goalDelta={goalMet ? `+${Math.abs(goalDeltaPts)} pt` : `-${Math.abs(goalDeltaPts)} pt`} + onEditGoal={onEditGoal || onSetGoal} + />
{/* end center block */} {sparkValues?.length >= 2 && ( diff --git a/frontend/src/pages/ScreenTimeCard.jsx b/frontend/src/pages/ScreenTimeCard.jsx index 45e0d54..e7aea13 100644 --- a/frontend/src/pages/ScreenTimeCard.jsx +++ b/frontend/src/pages/ScreenTimeCard.jsx @@ -1,7 +1,7 @@ import { memo, useState } from "react"; import { fmtTime } from "../shared/utils"; import { useCountUp } from "../shared/hooks"; -import { SectionCard, TrendChip } from "../shared/components"; +import { GoalStatusBlock, SectionCard, TrendChip } from "../shared/components"; import { Sparkline } from "../WellbeingDashboard"; // ─── SCREEN TIME CARD ───────────────────────────────────────────────────────── @@ -82,34 +82,16 @@ function ScreenTimeCardInner({ data, prevWellbeing, showComparison, countKey, sp
)} - {hasGoal && goalTargetSeconds > 0 && ( - - )} + 0} + goalMet={goalMet} + goalLabel={`Goal ≤ ${fmtTime(goalTargetSeconds)}`} + goalDelta={goalMet ? `${fmtTime(Math.abs(goalDeltaSeconds))} under` : `${fmtTime(Math.abs(goalDeltaSeconds))} over`} + onEditGoal={onEditGoal || onSetGoal} + />
0) ? 8 : 16, + marginTop: 8, display: "flex", gap: 12, }}>
diff --git a/frontend/src/shared/components.jsx b/frontend/src/shared/components.jsx index 28df5b1..ecc0d32 100644 --- a/frontend/src/shared/components.jsx +++ b/frontend/src/shared/components.jsx @@ -221,6 +221,72 @@ export function TrendChip({ current, previous, mode = "time", isPositiveGood = t ); } +// ─── GOAL STATUS BLOCK ────────────────────────────────────────────────────── +export function GoalStatusBlock({ + hasGoal = false, + goalMet = false, + goalLabel = "", + goalDelta = "", + minHeight = 58, + onEditGoal, +}) { + const containerStyle = { + width: "100%", + minHeight, + marginTop: 8, + display: "flex", + alignItems: "stretch", + }; + + if (!hasGoal) { + return ( +
+
+ + Goal Not Set + +
+
+ ); + } + + return ( +
+ +
+ ); +} + // ─── SECTION CARD ───────────────────────────────────────────────────────────── export function SectionCard({ title, children, style = {}, className = "", ...props }) { From 3c4217426be649bf97d58a2d6ceb87eca6d711ce Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Sat, 14 Mar 2026 22:21:55 +0530 Subject: [PATCH 42/70] feat(overview): show 7-day goal streaks on metric cards --- frontend/src/pages/FocusCard.jsx | 4 ++ frontend/src/pages/OverviewPage.jsx | 75 +++++++++++++++++++-- frontend/src/pages/ProductivityCard.jsx | 4 ++ frontend/src/pages/ScreenTimeCard.jsx | 4 ++ frontend/src/shared/components.jsx | 89 +++++++++++++++++++------ 5 files changed, 151 insertions(+), 25 deletions(-) diff --git a/frontend/src/pages/FocusCard.jsx b/frontend/src/pages/FocusCard.jsx index 3c5dc69..a9f49dc 100644 --- a/frontend/src/pages/FocusCard.jsx +++ b/frontend/src/pages/FocusCard.jsx @@ -20,6 +20,8 @@ function FocusCardInner({ const hasGoal = Boolean(goalInfo?.goal); const goal = goalInfo?.goal || null; const goalProgress = goalInfo?.progress || null; + const streak7 = goalInfo?.streak7 || []; + const currentStreak = goalInfo?.currentStreak || 0; const goalTargetScore = goalProgress?.target_value ?? goal?.target_value ?? 0; const goalActualScore = goalProgress?.actual_value ?? data?.focusScore ?? 0; const goalDeltaPts = Math.round(goalActualScore - goalTargetScore); @@ -111,6 +113,8 @@ function FocusCardInner({ goalLabel={`Goal ≥ ${Math.round(goalTargetScore)}`} goalDelta={goalMet ? `+${Math.abs(goalDeltaPts)} pt` : `-${Math.abs(goalDeltaPts)} pt`} onEditGoal={onEditGoal || onSetGoal} + streak7={streak7} + currentStreak={currentStreak} />
{/* end center block */} diff --git a/frontend/src/pages/OverviewPage.jsx b/frontend/src/pages/OverviewPage.jsx index 7419263..21b9fbf 100644 --- a/frontend/src/pages/OverviewPage.jsx +++ b/frontend/src/pages/OverviewPage.jsx @@ -29,6 +29,38 @@ function findBestWindow(hourly) { return { start: bestStart, end: bestStart + 1, score: best }; } +function shiftDate(dateStr, days) { + const d = new Date(dateStr + "T12:00:00"); + d.setDate(d.getDate() + days); + return localYMD(d); +} + +function buildLastNDates(endDate, count) { + const list = []; + for (let i = count - 1; i >= 0; i--) { + list.push(shiftDate(endDate, -i)); + } + return list; +} + +function streakWindowFromLogs(logs = [], endDate) { + const dates = buildLastNDates(endDate, 7); + const byDate = new Map(logs.map((l) => [l.date, Boolean(l.met)])); + return dates.map((d) => { + if (!byDate.has(d)) return null; + return byDate.get(d); + }); +} + +function currentStreakFromWindow(window = []) { + let streak = 0; + for (let i = window.length - 1; i >= 0; i--) { + if (window[i] === true) streak += 1; + else break; + } + return streak; +} + // ─── LIMIT WARNING BANNER ──────────────────────────────────────────────────── export function LimitWarningBanner({ limits, usage, onGoToLimits, selectedDate }) { const today = localYMD(); @@ -351,21 +383,25 @@ export default function OverviewPage({ }) { const [goals, setGoals] = useState([]); const [goalProgress, setGoalProgress] = useState([]); + const [goalHistory, setGoalHistory] = useState({}); const [goalModalOpen, setGoalModalOpen] = useState(false); const [goalModalSeed, setGoalModalSeed] = useState(null); const usage = stats.reduce((a, s) => { a[s.app] = (a[s.app] || 0) + s.active; return a; }, {}); const loadGoals = useCallback(async () => { try { - const [goalsRes, progressRes] = await Promise.all([ + const [goalsRes, progressRes, historyRes] = await Promise.all([ fetch(`${BASE}/api/goals`).then((r) => r.json()), fetch(`${BASE}/api/goals/progress?date=${selectedDate}`).then((r) => r.json()), + fetch(`${BASE}/api/goals/history?days=120`).then((r) => r.json()), ]); setGoals(Array.isArray(goalsRes) ? goalsRes : []); setGoalProgress(Array.isArray(progressRes) ? progressRes : []); + setGoalHistory(historyRes && typeof historyRes === "object" ? historyRes : {}); } catch { setGoals([]); setGoalProgress([]); + setGoalHistory({}); } }, [BASE, selectedDate]); @@ -396,16 +432,32 @@ export default function OverviewPage({ return byId; }, [goalProgress]); + const streakByGoalId = useMemo(() => { + const byId = {}; + const endDate = selectedDate || localYMD(); + for (const [id, logs] of Object.entries(goalHistory || {})) { + const window = streakWindowFromLogs(Array.isArray(logs) ? logs : [], endDate); + byId[id] = { + streak7: window, + currentStreak: currentStreakFromWindow(window), + }; + } + return byId; + }, [goalHistory, selectedDate]); + const cardProps = { prevWellbeing, showComparison, countKey }; if (!data) return null; const screenTimeGoal = goalsByType.daily_screen_time; const screenTimeGoalProgress = screenTimeGoal ? (progressByGoalId[screenTimeGoal.id] || null) : null; + const screenTimeGoalStreak = screenTimeGoal ? (streakByGoalId[String(screenTimeGoal.id)] || null) : null; const productivityGoal = goalsByType.daily_productivity_pct; const productivityGoalProgress = productivityGoal ? (progressByGoalId[productivityGoal.id] || null) : null; + const productivityGoalStreak = productivityGoal ? (streakByGoalId[String(productivityGoal.id)] || null) : null; const focusGoal = goalsByType.daily_focus_score; const focusGoalProgress = focusGoal ? (progressByGoalId[focusGoal.id] || null) : null; + const focusGoalStreak = focusGoal ? (streakByGoalId[String(focusGoal.id)] || null) : null; const openCreateGoal = (goalType) => { const defaultTarget = goalType === "daily_screen_time" ? 7200 : 60; @@ -464,7 +516,12 @@ export default function OverviewPage({ data={data} {...cardProps} sparkValues={sparkSeries?.screenTime} - goalInfo={{ goal: screenTimeGoal, progress: screenTimeGoalProgress }} + goalInfo={{ + goal: screenTimeGoal, + progress: screenTimeGoalProgress, + streak7: screenTimeGoalStreak?.streak7 || [], + currentStreak: screenTimeGoalStreak?.currentStreak || 0, + }} onSetGoal={() => openCreateGoal("daily_screen_time")} onEditGoal={() => openEditGoal(screenTimeGoal)} /> @@ -475,7 +532,12 @@ export default function OverviewPage({ data={data} {...cardProps} sparkValues={sparkSeries?.productivity} - goalInfo={{ goal: productivityGoal, progress: productivityGoalProgress }} + goalInfo={{ + goal: productivityGoal, + progress: productivityGoalProgress, + streak7: productivityGoalStreak?.streak7 || [], + currentStreak: productivityGoalStreak?.currentStreak || 0, + }} onSetGoal={() => openCreateGoal("daily_productivity_pct")} onEditGoal={() => openEditGoal(productivityGoal)} /> @@ -486,7 +548,12 @@ export default function OverviewPage({ data={data} {...cardProps} sparkValues={sparkSeries?.focus} - goalInfo={{ goal: focusGoal, progress: focusGoalProgress }} + goalInfo={{ + goal: focusGoal, + progress: focusGoalProgress, + streak7: focusGoalStreak?.streak7 || [], + currentStreak: focusGoalStreak?.currentStreak || 0, + }} onSetGoal={() => openCreateGoal("daily_focus_score")} onEditGoal={() => openEditGoal(focusGoal)} /> diff --git a/frontend/src/pages/ProductivityCard.jsx b/frontend/src/pages/ProductivityCard.jsx index d79f95b..c2fc17b 100644 --- a/frontend/src/pages/ProductivityCard.jsx +++ b/frontend/src/pages/ProductivityCard.jsx @@ -10,6 +10,8 @@ function ProductivityCardInner({ data, prevWellbeing, showComparison, countKey, const hasGoal = Boolean(goalInfo?.goal); const goal = goalInfo?.goal || null; const goalProgress = goalInfo?.progress || null; + const streak7 = goalInfo?.streak7 || []; + const currentStreak = goalInfo?.currentStreak || 0; const goalTargetPct = goalProgress?.target_value ?? goal?.target_value ?? 0; const goalActualPct = goalProgress?.actual_value ?? data?.productivityPercent ?? 0; const goalDeltaPts = Math.round(goalActualPct - goalTargetPct); @@ -94,6 +96,8 @@ function ProductivityCardInner({ data, prevWellbeing, showComparison, countKey, goalLabel={`Goal ≥ ${Math.round(goalTargetPct)}%`} goalDelta={goalMet ? `+${Math.abs(goalDeltaPts)} pt` : `-${Math.abs(goalDeltaPts)} pt`} onEditGoal={onEditGoal || onSetGoal} + streak7={streak7} + currentStreak={currentStreak} />
{/* end center block */} diff --git a/frontend/src/pages/ScreenTimeCard.jsx b/frontend/src/pages/ScreenTimeCard.jsx index e7aea13..7d5ed5e 100644 --- a/frontend/src/pages/ScreenTimeCard.jsx +++ b/frontend/src/pages/ScreenTimeCard.jsx @@ -10,6 +10,8 @@ function ScreenTimeCardInner({ data, prevWellbeing, showComparison, countKey, sp const hasGoal = Boolean(goalInfo?.goal); const goal = goalInfo?.goal || null; const goalProgress = goalInfo?.progress || null; + const streak7 = goalInfo?.streak7 || []; + const currentStreak = goalInfo?.currentStreak || 0; const goalTargetSeconds = goalProgress?.target_value ?? goal?.target_value ?? 0; const goalActualSeconds = goalProgress?.actual_value ?? data?.totalScreenTime ?? 0; const goalDeltaSeconds = Math.round(goalActualSeconds - goalTargetSeconds); @@ -88,6 +90,8 @@ function ScreenTimeCardInner({ data, prevWellbeing, showComparison, countKey, sp goalLabel={`Goal ≤ ${fmtTime(goalTargetSeconds)}`} goalDelta={goalMet ? `${fmtTime(Math.abs(goalDeltaSeconds))} under` : `${fmtTime(Math.abs(goalDeltaSeconds))} over`} onEditGoal={onEditGoal || onSetGoal} + streak7={streak7} + currentStreak={currentStreak} />
- + +
- - {goalLabel} - - - {goalDelta} - - + gap: 8, + }}> + + 7-Day Streak + +
+ {(Array.isArray(streak7) ? streak7 : []).slice(0, 7).map((s, idx) => { + const dot = s === true ? "#4ade80" : s === false ? "#f87171" : "#334155"; + return ( +
+ ); + })} +
+ 0 ? "#fbbf24" : "#64748b", + fontWeight: 700, + fontFamily: "'DM Mono',monospace", + whiteSpace: "nowrap", + }}> + {currentStreak > 0 ? `${currentStreak}d` : "0d"} + +
+
); } From f795267840f55f88f3db8f37a3de9ccf916a8788 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Sat, 14 Mar 2026 22:25:27 +0530 Subject: [PATCH 43/70] fix(overview): reorder screen-time card sections and compact goal strip --- frontend/src/pages/ScreenTimeCard.jsx | 20 ++++++++++---------- frontend/src/shared/components.jsx | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/frontend/src/pages/ScreenTimeCard.jsx b/frontend/src/pages/ScreenTimeCard.jsx index 7d5ed5e..9c4a6ac 100644 --- a/frontend/src/pages/ScreenTimeCard.jsx +++ b/frontend/src/pages/ScreenTimeCard.jsx @@ -84,16 +84,6 @@ function ScreenTimeCardInner({ data, prevWellbeing, showComparison, countKey, sp
)} - 0} - goalMet={goalMet} - goalLabel={`Goal ≤ ${fmtTime(goalTargetSeconds)}`} - goalDelta={goalMet ? `${fmtTime(Math.abs(goalDeltaSeconds))} under` : `${fmtTime(Math.abs(goalDeltaSeconds))} over`} - onEditGoal={onEditGoal || onSetGoal} - streak7={streak7} - currentStreak={currentStreak} - /> -
0} + goalMet={goalMet} + goalLabel={`Goal ≤ ${fmtTime(goalTargetSeconds)}`} + goalDelta={goalMet ? `${fmtTime(Math.abs(goalDeltaSeconds))} under` : `${fmtTime(Math.abs(goalDeltaSeconds))} over`} + onEditGoal={onEditGoal || onSetGoal} + streak7={streak7} + currentStreak={currentStreak} + /> + {sparkValues?.length >= 2 && (
- + Goal Not Set
@@ -273,7 +273,7 @@ export function GoalStatusBlock({ borderRadius: 10, width: "100%", minHeight, - padding: "6px 10px", + padding: "5px 9px", display: "flex", alignItems: "center", justifyContent: "space-between", @@ -294,13 +294,13 @@ export function GoalStatusBlock({ borderRadius: 9, border: "1px solid rgba(255,255,255,0.06)", background: "rgba(255,255,255,0.02)", - padding: "5px 8px", + padding: "4px 8px", display: "flex", alignItems: "center", justifyContent: "space-between", gap: 8, }}> - + 7-Day Streak
@@ -308,8 +308,8 @@ export function GoalStatusBlock({ const dot = s === true ? "#4ade80" : s === false ? "#f87171" : "#334155"; return (
0 ? "#fbbf24" : "#64748b", fontWeight: 700, fontFamily: "'DM Mono',monospace", From 989d83bbd615e3f906c3fc52b267a87e91c441ba Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Sat, 14 Mar 2026 22:42:41 +0530 Subject: [PATCH 44/70] style(overview): tighten top spacing across metric cards --- frontend/src/pages/FocusCard.jsx | 3 ++- frontend/src/pages/ProductivityCard.jsx | 3 ++- frontend/src/pages/ScreenTimeCard.jsx | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frontend/src/pages/FocusCard.jsx b/frontend/src/pages/FocusCard.jsx index a9f49dc..84c7bcc 100644 --- a/frontend/src/pages/FocusCard.jsx +++ b/frontend/src/pages/FocusCard.jsx @@ -46,6 +46,7 @@ function FocusCardInner({ style={{ display: "flex", flexDirection: "column", flex: 1, + padding: "16px 24px 12px", border: "1px solid rgba(255,255,255,0.04)", borderLeft: `5px solid ${focusColor}`, background: `linear-gradient(135deg,${focusColor}08 0%,rgba(15,18,34,0.7) 60%)`, @@ -122,7 +123,7 @@ function FocusCardInner({
7d trend diff --git a/frontend/src/pages/ProductivityCard.jsx b/frontend/src/pages/ProductivityCard.jsx index c2fc17b..e29861c 100644 --- a/frontend/src/pages/ProductivityCard.jsx +++ b/frontend/src/pages/ProductivityCard.jsx @@ -36,6 +36,7 @@ function ProductivityCardInner({ data, prevWellbeing, showComparison, countKey, style={{ display: "flex", flexDirection: "column", flex: 1, + padding: "16px 24px 12px", border: "1px solid rgba(255,255,255,0.04)", borderLeft: `5px solid ${prodColor}`, background: `linear-gradient(135deg,${prodColor}08 0%,rgba(15,18,34,0.7) 60%)`, @@ -105,7 +106,7 @@ function ProductivityCardInner({ data, prevWellbeing, showComparison, countKey,
7d trend diff --git a/frontend/src/pages/ScreenTimeCard.jsx b/frontend/src/pages/ScreenTimeCard.jsx index 9c4a6ac..d2b44b5 100644 --- a/frontend/src/pages/ScreenTimeCard.jsx +++ b/frontend/src/pages/ScreenTimeCard.jsx @@ -29,6 +29,7 @@ function ScreenTimeCardInner({ data, prevWellbeing, showComparison, countKey, sp style={{ display: "flex", flexDirection: "column", flex: 1, + padding: "16px 24px 12px", border: "1px solid rgba(255,255,255,0.04)", borderLeft: "3px solid #4ade80", background: "linear-gradient(135deg,rgba(74,222,128,0.04) 0%,rgba(15,18,34,0.7) 60%)", @@ -149,7 +150,7 @@ function ScreenTimeCardInner({ data, prevWellbeing, showComparison, countKey, sp
7d trend From 55b19a03e3ce5ba399fcf1f4bf21ca3b262cd74a Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Sat, 14 Mar 2026 22:43:56 +0530 Subject: [PATCH 45/70] refactor(overview): equalize card containers with conditional goal block --- frontend/src/pages/FocusCard.jsx | 2 ++ frontend/src/pages/ProductivityCard.jsx | 2 ++ frontend/src/pages/ScreenTimeCard.jsx | 2 ++ frontend/src/shared/components.jsx | 20 +------------------- 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/frontend/src/pages/FocusCard.jsx b/frontend/src/pages/FocusCard.jsx index 84c7bcc..3d0ebe9 100644 --- a/frontend/src/pages/FocusCard.jsx +++ b/frontend/src/pages/FocusCard.jsx @@ -46,6 +46,8 @@ function FocusCardInner({ style={{ display: "flex", flexDirection: "column", flex: 1, + height: "100%", + minHeight: 470, padding: "16px 24px 12px", border: "1px solid rgba(255,255,255,0.04)", borderLeft: `5px solid ${focusColor}`, diff --git a/frontend/src/pages/ProductivityCard.jsx b/frontend/src/pages/ProductivityCard.jsx index e29861c..eda5dca 100644 --- a/frontend/src/pages/ProductivityCard.jsx +++ b/frontend/src/pages/ProductivityCard.jsx @@ -36,6 +36,8 @@ function ProductivityCardInner({ data, prevWellbeing, showComparison, countKey, style={{ display: "flex", flexDirection: "column", flex: 1, + height: "100%", + minHeight: 470, padding: "16px 24px 12px", border: "1px solid rgba(255,255,255,0.04)", borderLeft: `5px solid ${prodColor}`, diff --git a/frontend/src/pages/ScreenTimeCard.jsx b/frontend/src/pages/ScreenTimeCard.jsx index d2b44b5..58b9680 100644 --- a/frontend/src/pages/ScreenTimeCard.jsx +++ b/frontend/src/pages/ScreenTimeCard.jsx @@ -29,6 +29,8 @@ function ScreenTimeCardInner({ data, prevWellbeing, showComparison, countKey, sp style={{ display: "flex", flexDirection: "column", flex: 1, + height: "100%", + minHeight: 470, padding: "16px 24px 12px", border: "1px solid rgba(255,255,255,0.04)", borderLeft: "3px solid #4ade80", diff --git a/frontend/src/shared/components.jsx b/frontend/src/shared/components.jsx index 389a652..b674263 100644 --- a/frontend/src/shared/components.jsx +++ b/frontend/src/shared/components.jsx @@ -241,25 +241,7 @@ export function GoalStatusBlock({ }; if (!hasGoal) { - return ( -
-
- - Goal Not Set - -
-
- ); + return null; } return ( From 48015f8041c302fae3d6d5d51fad53f4c7231b85 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Sat, 14 Mar 2026 22:53:32 +0530 Subject: [PATCH 46/70] fix(overview): align focus header and relax card heights --- frontend/src/pages/FocusCard.jsx | 79 ++++++++++++------------- frontend/src/pages/ProductivityCard.jsx | 2 - frontend/src/pages/ScreenTimeCard.jsx | 2 - 3 files changed, 39 insertions(+), 44 deletions(-) diff --git a/frontend/src/pages/FocusCard.jsx b/frontend/src/pages/FocusCard.jsx index 3d0ebe9..f7215f6 100644 --- a/frontend/src/pages/FocusCard.jsx +++ b/frontend/src/pages/FocusCard.jsx @@ -46,8 +46,6 @@ function FocusCardInner({ style={{ display: "flex", flexDirection: "column", flex: 1, - height: "100%", - minHeight: 470, padding: "16px 24px 12px", border: "1px solid rgba(255,255,255,0.04)", borderLeft: `5px solid ${focusColor}`, @@ -55,38 +53,38 @@ function FocusCardInner({ animationDelay: "120ms", transition: "border-color 0.6s ease, background 0.6s ease", }} > - {/* ── Center-aligned content block ── */} -
-
-
- Focus -
- {!hasGoal && ( - - )} +
+
+ Focus
+ {!hasGoal && ( + + )} +
+ {/* ── Center-aligned content block ── */} +
{data.deepWorkSeconds ? ( @@ -95,14 +93,6 @@ function FocusCardInner({ deep work
{fmtTimeLong(data.deepWorkSeconds)}
- {showComparison && prevWellbeing?.productivityPercent !== undefined && ( - - )}
) : (
@@ -110,6 +100,15 @@ function FocusCardInner({
)} + {showComparison && prevWellbeing?.focusScore !== undefined && ( + + )} + 0} goalMet={goalMet} diff --git a/frontend/src/pages/ProductivityCard.jsx b/frontend/src/pages/ProductivityCard.jsx index eda5dca..e29861c 100644 --- a/frontend/src/pages/ProductivityCard.jsx +++ b/frontend/src/pages/ProductivityCard.jsx @@ -36,8 +36,6 @@ function ProductivityCardInner({ data, prevWellbeing, showComparison, countKey, style={{ display: "flex", flexDirection: "column", flex: 1, - height: "100%", - minHeight: 470, padding: "16px 24px 12px", border: "1px solid rgba(255,255,255,0.04)", borderLeft: `5px solid ${prodColor}`, diff --git a/frontend/src/pages/ScreenTimeCard.jsx b/frontend/src/pages/ScreenTimeCard.jsx index 58b9680..d2b44b5 100644 --- a/frontend/src/pages/ScreenTimeCard.jsx +++ b/frontend/src/pages/ScreenTimeCard.jsx @@ -29,8 +29,6 @@ function ScreenTimeCardInner({ data, prevWellbeing, showComparison, countKey, sp style={{ display: "flex", flexDirection: "column", flex: 1, - height: "100%", - minHeight: 470, padding: "16px 24px 12px", border: "1px solid rgba(255,255,255,0.04)", borderLeft: "3px solid #4ade80", From e6b09b1e7647749ea345f656370a20a65ea0e479 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Sat, 14 Mar 2026 23:02:36 +0530 Subject: [PATCH 47/70] refactor(overview): add compact no-goal CTA state to metric cards --- frontend/src/pages/FocusCard.jsx | 3 +++ frontend/src/pages/ProductivityCard.jsx | 3 +++ frontend/src/pages/ScreenTimeCard.jsx | 3 +++ frontend/src/shared/components.jsx | 33 ++++++++++++++++++++++++- 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/frontend/src/pages/FocusCard.jsx b/frontend/src/pages/FocusCard.jsx index f7215f6..b5a3351 100644 --- a/frontend/src/pages/FocusCard.jsx +++ b/frontend/src/pages/FocusCard.jsx @@ -117,6 +117,9 @@ function FocusCardInner({ onEditGoal={onEditGoal || onSetGoal} streak7={streak7} currentStreak={currentStreak} + emptyTitle="Set a focus goal" + emptyHint="Track your progress and streaks" + onCreateGoal={onSetGoal} />
{/* end center block */} diff --git a/frontend/src/pages/ProductivityCard.jsx b/frontend/src/pages/ProductivityCard.jsx index e29861c..db57991 100644 --- a/frontend/src/pages/ProductivityCard.jsx +++ b/frontend/src/pages/ProductivityCard.jsx @@ -99,6 +99,9 @@ function ProductivityCardInner({ data, prevWellbeing, showComparison, countKey, onEditGoal={onEditGoal || onSetGoal} streak7={streak7} currentStreak={currentStreak} + emptyTitle="Set a productivity goal" + emptyHint="Track your target and streaks" + onCreateGoal={onSetGoal} />
{/* end center block */} diff --git a/frontend/src/pages/ScreenTimeCard.jsx b/frontend/src/pages/ScreenTimeCard.jsx index d2b44b5..117a984 100644 --- a/frontend/src/pages/ScreenTimeCard.jsx +++ b/frontend/src/pages/ScreenTimeCard.jsx @@ -144,6 +144,9 @@ function ScreenTimeCardInner({ data, prevWellbeing, showComparison, countKey, sp onEditGoal={onEditGoal || onSetGoal} streak7={streak7} currentStreak={currentStreak} + emptyTitle="Set a daily screen goal" + emptyHint="Track over/under time and streaks" + onCreateGoal={onSetGoal} /> {sparkValues?.length >= 2 && ( diff --git a/frontend/src/shared/components.jsx b/frontend/src/shared/components.jsx index b674263..9cfd05e 100644 --- a/frontend/src/shared/components.jsx +++ b/frontend/src/shared/components.jsx @@ -231,6 +231,9 @@ export function GoalStatusBlock({ onEditGoal, streak7 = [], currentStreak = 0, + emptyTitle = "", + emptyHint = "", + onCreateGoal, }) { const containerStyle = { width: "100%", @@ -241,7 +244,35 @@ export function GoalStatusBlock({ }; if (!hasGoal) { - return null; + if (!emptyTitle || !onCreateGoal) return null; + + return ( +
+ +
+ ); } return ( From e35182e2fdf1724cdef0dbd5e770f183ddb817aa Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Sat, 14 Mar 2026 23:03:37 +0530 Subject: [PATCH 48/70] refactor(overview): remove no-goal pills from metric cards --- frontend/src/pages/FocusCard.jsx | 3 --- frontend/src/pages/ProductivityCard.jsx | 3 --- frontend/src/pages/ScreenTimeCard.jsx | 3 --- frontend/src/shared/components.jsx | 33 +------------------------ 4 files changed, 1 insertion(+), 41 deletions(-) diff --git a/frontend/src/pages/FocusCard.jsx b/frontend/src/pages/FocusCard.jsx index b5a3351..f7215f6 100644 --- a/frontend/src/pages/FocusCard.jsx +++ b/frontend/src/pages/FocusCard.jsx @@ -117,9 +117,6 @@ function FocusCardInner({ onEditGoal={onEditGoal || onSetGoal} streak7={streak7} currentStreak={currentStreak} - emptyTitle="Set a focus goal" - emptyHint="Track your progress and streaks" - onCreateGoal={onSetGoal} />
{/* end center block */} diff --git a/frontend/src/pages/ProductivityCard.jsx b/frontend/src/pages/ProductivityCard.jsx index db57991..e29861c 100644 --- a/frontend/src/pages/ProductivityCard.jsx +++ b/frontend/src/pages/ProductivityCard.jsx @@ -99,9 +99,6 @@ function ProductivityCardInner({ data, prevWellbeing, showComparison, countKey, onEditGoal={onEditGoal || onSetGoal} streak7={streak7} currentStreak={currentStreak} - emptyTitle="Set a productivity goal" - emptyHint="Track your target and streaks" - onCreateGoal={onSetGoal} />
{/* end center block */} diff --git a/frontend/src/pages/ScreenTimeCard.jsx b/frontend/src/pages/ScreenTimeCard.jsx index 117a984..d2b44b5 100644 --- a/frontend/src/pages/ScreenTimeCard.jsx +++ b/frontend/src/pages/ScreenTimeCard.jsx @@ -144,9 +144,6 @@ function ScreenTimeCardInner({ data, prevWellbeing, showComparison, countKey, sp onEditGoal={onEditGoal || onSetGoal} streak7={streak7} currentStreak={currentStreak} - emptyTitle="Set a daily screen goal" - emptyHint="Track over/under time and streaks" - onCreateGoal={onSetGoal} /> {sparkValues?.length >= 2 && ( diff --git a/frontend/src/shared/components.jsx b/frontend/src/shared/components.jsx index 9cfd05e..b674263 100644 --- a/frontend/src/shared/components.jsx +++ b/frontend/src/shared/components.jsx @@ -231,9 +231,6 @@ export function GoalStatusBlock({ onEditGoal, streak7 = [], currentStreak = 0, - emptyTitle = "", - emptyHint = "", - onCreateGoal, }) { const containerStyle = { width: "100%", @@ -244,35 +241,7 @@ export function GoalStatusBlock({ }; if (!hasGoal) { - if (!emptyTitle || !onCreateGoal) return null; - - return ( -
- -
- ); + return null; } return ( From 99a3de57a4ecf4e3328af042aeebe8e0d58b86c0 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Sat, 14 Mar 2026 23:12:30 +0530 Subject: [PATCH 49/70] feat(goals): toggle overview goal visibility from goals tab --- frontend/src/pages/FocusCard.jsx | 8 +++- frontend/src/pages/GoalsPage.jsx | 56 ++++++++++++++++++++----- frontend/src/pages/OverviewPage.jsx | 19 ++++++++- frontend/src/pages/ProductivityCard.jsx | 8 +++- frontend/src/pages/ScreenTimeCard.jsx | 8 +++- frontend/src/shared/components.jsx | 33 ++++++++++++++- src/api/settings_routes.py | 5 +++ src/config/settings_manager.py | 1 + 8 files changed, 120 insertions(+), 18 deletions(-) diff --git a/frontend/src/pages/FocusCard.jsx b/frontend/src/pages/FocusCard.jsx index f7215f6..2d55335 100644 --- a/frontend/src/pages/FocusCard.jsx +++ b/frontend/src/pages/FocusCard.jsx @@ -17,6 +17,7 @@ function FocusCardInner({ onEditGoal, }) { const [isHovered, setIsHovered] = useState(false); + const goalUiEnabled = goalInfo?.enabled !== false; const hasGoal = Boolean(goalInfo?.goal); const goal = goalInfo?.goal || null; const goalProgress = goalInfo?.progress || null; @@ -60,7 +61,7 @@ function FocusCardInner({ }}> Focus
- {!hasGoal && ( + {goalUiEnabled && !hasGoal && (
{/* end center block */} diff --git a/frontend/src/pages/GoalsPage.jsx b/frontend/src/pages/GoalsPage.jsx index d25443a..a0cfa9a 100644 --- a/frontend/src/pages/GoalsPage.jsx +++ b/frontend/src/pages/GoalsPage.jsx @@ -386,6 +386,7 @@ export default function GoalsPage({ selectedDate }) { const [editTarget, setEditTarget] = useState(null); const [toast, setToast] = useState(null); const [goalHistory, setGoalHistory] = useState({}); + const [showGoalsInOverview, setShowGoalsInOverview] = useState(true); const toastTimer = useRef(null); const showT = (msg, type = "success") => { @@ -396,18 +397,35 @@ export default function GoalsPage({ selectedDate }) { const fetchAll = useCallback(async () => { try { - const [g, p, h] = await Promise.all([ + const [g, p, h, s] = await Promise.all([ fetch(`${BASE}/api/goals`).then(r => r.json()), fetch(`${BASE}/api/goals/progress?date=${selectedDate}`).then(r => r.json()), fetch(`${BASE}/api/goals/history?days=120`).then(r => r.json()), + fetch(`${BASE}/api/settings`).then(r => r.json()), ]); setGoals(Array.isArray(g) ? g : []); setProgress(Array.isArray(p) ? p : []); setGoalHistory(h && typeof h === "object" ? h : {}); + setShowGoalsInOverview(s?.show_goals_in_overview !== false); } catch { } setLoading(false); }, [selectedDate]); + const updateShowGoalsInOverview = async (value) => { + setShowGoalsInOverview(value); + try { + await fetch(`${BASE}/api/settings/update`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ show_goals_in_overview: value }), + }); + showT(value ? "Goals will show on Overview" : "Goals hidden on Overview", "success"); + } catch { + setShowGoalsInOverview(prev => !value); + showT("Could not update overview goal setting", "warn"); + } + }; + useEffect(() => { fetchAll(); const iv = setInterval(fetchAll, 60000); @@ -466,15 +484,33 @@ export default function GoalsPage({ selectedDate }) {
Goals & Targets
Define what success looks like for your day
- +
+ + + +
{/* Stats */} diff --git a/frontend/src/pages/OverviewPage.jsx b/frontend/src/pages/OverviewPage.jsx index 21b9fbf..1c09331 100644 --- a/frontend/src/pages/OverviewPage.jsx +++ b/frontend/src/pages/OverviewPage.jsx @@ -384,11 +384,25 @@ export default function OverviewPage({ const [goals, setGoals] = useState([]); const [goalProgress, setGoalProgress] = useState([]); const [goalHistory, setGoalHistory] = useState({}); + const [showGoalsInOverview, setShowGoalsInOverview] = useState(true); const [goalModalOpen, setGoalModalOpen] = useState(false); const [goalModalSeed, setGoalModalSeed] = useState(null); const usage = stats.reduce((a, s) => { a[s.app] = (a[s.app] || 0) + s.active; return a; }, {}); + useEffect(() => { + fetch(`${BASE}/api/settings`) + .then((r) => r.json()) + .then((s) => setShowGoalsInOverview(s?.show_goals_in_overview !== false)) + .catch(() => setShowGoalsInOverview(true)); + }, [BASE]); + const loadGoals = useCallback(async () => { + if (!showGoalsInOverview) { + setGoals([]); + setGoalProgress([]); + setGoalHistory({}); + return; + } try { const [goalsRes, progressRes, historyRes] = await Promise.all([ fetch(`${BASE}/api/goals`).then((r) => r.json()), @@ -403,7 +417,7 @@ export default function OverviewPage({ setGoalProgress([]); setGoalHistory({}); } - }, [BASE, selectedDate]); + }, [BASE, selectedDate, showGoalsInOverview]); useEffect(() => { loadGoals(); @@ -517,6 +531,7 @@ export default function OverviewPage({ {...cardProps} sparkValues={sparkSeries?.screenTime} goalInfo={{ + enabled: showGoalsInOverview, goal: screenTimeGoal, progress: screenTimeGoalProgress, streak7: screenTimeGoalStreak?.streak7 || [], @@ -533,6 +548,7 @@ export default function OverviewPage({ {...cardProps} sparkValues={sparkSeries?.productivity} goalInfo={{ + enabled: showGoalsInOverview, goal: productivityGoal, progress: productivityGoalProgress, streak7: productivityGoalStreak?.streak7 || [], @@ -549,6 +565,7 @@ export default function OverviewPage({ {...cardProps} sparkValues={sparkSeries?.focus} goalInfo={{ + enabled: showGoalsInOverview, goal: focusGoal, progress: focusGoalProgress, streak7: focusGoalStreak?.streak7 || [], diff --git a/frontend/src/pages/ProductivityCard.jsx b/frontend/src/pages/ProductivityCard.jsx index e29861c..9b596d6 100644 --- a/frontend/src/pages/ProductivityCard.jsx +++ b/frontend/src/pages/ProductivityCard.jsx @@ -7,6 +7,7 @@ import { Sparkline } from "../WellbeingDashboard"; // ─── PRODUCTIVITY CARD ──────────────────────────────────────────────────────── function ProductivityCardInner({ data, prevWellbeing, showComparison, countKey, sparkValues, sparkColor = "#4ade80", goalInfo, onSetGoal, onEditGoal }) { const [isHovered, setIsHovered] = useState(false); + const goalUiEnabled = goalInfo?.enabled !== false; const hasGoal = Boolean(goalInfo?.goal); const goal = goalInfo?.goal || null; const goalProgress = goalInfo?.progress || null; @@ -50,7 +51,7 @@ function ProductivityCardInner({ data, prevWellbeing, showComparison, countKey, }}> Productivity
- {!hasGoal && ( + {goalUiEnabled && !hasGoal && (
{/* end center block */} diff --git a/frontend/src/pages/ScreenTimeCard.jsx b/frontend/src/pages/ScreenTimeCard.jsx index d2b44b5..92d3008 100644 --- a/frontend/src/pages/ScreenTimeCard.jsx +++ b/frontend/src/pages/ScreenTimeCard.jsx @@ -7,6 +7,7 @@ import { Sparkline } from "../WellbeingDashboard"; // ─── SCREEN TIME CARD ───────────────────────────────────────────────────────── function ScreenTimeCardInner({ data, prevWellbeing, showComparison, countKey, sparkValues, sparkColor = "#60a5fa", goalInfo, onSetGoal, onEditGoal }) { const [isHovered, setIsHovered] = useState(false); + const goalUiEnabled = goalInfo?.enabled !== false; const hasGoal = Boolean(goalInfo?.goal); const goal = goalInfo?.goal || null; const goalProgress = goalInfo?.progress || null; @@ -43,7 +44,7 @@ function ScreenTimeCardInner({ data, prevWellbeing, showComparison, countKey, sp }}> Screen Time
- {!hasGoal && ( + {goalUiEnabled && !hasGoal && ( + + ); } return ( diff --git a/src/api/settings_routes.py b/src/api/settings_routes.py index a8ee592..650c34e 100644 --- a/src/api/settings_routes.py +++ b/src/api/settings_routes.py @@ -12,6 +12,7 @@ def get_settings(): "file_logging_enabled": SettingsManager.get_bool("file_logging_enabled", False), "file_logging_essential_only": SettingsManager.get_bool("file_logging_essential_only", False), "show_yesterday_comparison": SettingsManager.get_bool("show_yesterday_comparison", True), + "show_goals_in_overview": SettingsManager.get_bool("show_goals_in_overview", True), "hardware_acceleration": SettingsManager.get_bool("hardware_acceleration", True), "idle_detection": SettingsManager.get_bool("idle_detection", True), "browser_tracking": SettingsManager.get_bool("browser_tracking", True), @@ -48,6 +49,10 @@ def update_settings(): val = "true" if data["show_yesterday_comparison"] else "false" SettingsManager.set("show_yesterday_comparison", val) + if "show_goals_in_overview" in data: + val = "true" if data["show_goals_in_overview"] else "false" + SettingsManager.set("show_goals_in_overview", val) + if "hardware_acceleration" in data: val = "true" if data["hardware_acceleration"] else "false" SettingsManager.set("hardware_acceleration", val) diff --git a/src/config/settings_manager.py b/src/config/settings_manager.py index f61ae05..77b9f27 100644 --- a/src/config/settings_manager.py +++ b/src/config/settings_manager.py @@ -101,6 +101,7 @@ def initialize_defaults(): "file_logging_enabled": "false", "file_logging_essential_only": "false", "show_yesterday_comparison": "true", + "show_goals_in_overview": "true", "hardware_acceleration": "true", "idle_detection": "true", "browser_tracking": "true", From a502d3862be04f71b8aaff4c0821730b30b17a23 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Sun, 15 Mar 2026 19:38:37 +0530 Subject: [PATCH 50/70] style(goals): use switch toggle for overview goal visibility --- frontend/src/pages/GoalsPage.jsx | 63 ++++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 15 deletions(-) diff --git a/frontend/src/pages/GoalsPage.jsx b/frontend/src/pages/GoalsPage.jsx index a0cfa9a..e23da0c 100644 --- a/frontend/src/pages/GoalsPage.jsx +++ b/frontend/src/pages/GoalsPage.jsx @@ -485,21 +485,54 @@ export default function GoalsPage({ selectedDate }) {
Define what success looks like for your day
- + )} @@ -461,6 +459,10 @@ export default function WellbeingDashboard({ onDisconnect, initialData = null }) .db-scroll-wrapper::-webkit-scrollbar{width:4px;} .db-scroll-wrapper::-webkit-scrollbar-track{background:transparent;} .db-scroll-wrapper::-webkit-scrollbar-thumb{background:rgba(255,255,255,0.08);border-radius:4px;} + @media(prefers-reduced-motion:reduce){ + .orb-float,.orb-float-2{animation:none!important;} + .metric-card,.tab-btn{animation:none!important;transition:none!important;} + } @media(max-width:900px){.grid-4{grid-template-columns:1fr 1fr!important;}.grid-4-sm{grid-template-columns:1fr 1fr!important;}} @media(max-width:600px){ .grid-4{grid-template-columns:1fr!important;} @@ -556,14 +558,12 @@ export default function WellbeingDashboard({ onDisconnect, initialData = null }) ))}
- From 86f4640ac5f46c57b7d585550f70e261df319a36 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Sun, 15 Mar 2026 19:52:59 +0530 Subject: [PATCH 52/70] phase 2: responsive grid cleanup across dashboard pages --- frontend/src/pages/ActivityPage.jsx | 2 +- frontend/src/pages/OverviewPage.jsx | 2 +- frontend/src/pages/WeeklyReportPage.jsx | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/pages/ActivityPage.jsx b/frontend/src/pages/ActivityPage.jsx index 4322e5b..d394e94 100644 --- a/frontend/src/pages/ActivityPage.jsx +++ b/frontend/src/pages/ActivityPage.jsx @@ -37,7 +37,7 @@ export default function ActivityPage({ {/* Stat pills */}
diff --git a/frontend/src/pages/OverviewPage.jsx b/frontend/src/pages/OverviewPage.jsx index f7d75b4..adaacf9 100644 --- a/frontend/src/pages/OverviewPage.jsx +++ b/frontend/src/pages/OverviewPage.jsx @@ -516,7 +516,7 @@ export default function OverviewPage({
{/* Each card gets staggered delay + matching sparkline */}
diff --git a/frontend/src/pages/WeeklyReportPage.jsx b/frontend/src/pages/WeeklyReportPage.jsx index d8bbb6e..a8fbbea 100644 --- a/frontend/src/pages/WeeklyReportPage.jsx +++ b/frontend/src/pages/WeeklyReportPage.jsx @@ -813,7 +813,7 @@ export default function WeeklyReportPage() { ) : ( {compareData?.diff && ( -
+
Screen Δ
{fmtTime(Math.abs(compareData.diff.screen_time_delta || 0))} {compareData.diff.screen_time_delta >= 0 ? "↑" : "↓"}
@@ -853,7 +853,7 @@ export default function WeeklyReportPage() { )} -
+
{/* Daily breakdown — now a real bar chart */} @@ -933,7 +933,7 @@ export default function WeeklyReportPage() { {report.goal_impact_correlation && ( -
+
With Goals Met
{report.goal_impact_correlation.with_goal_met_productivity ?? "—"}%
From bf40f74c7714614815608131883f7d290d3ae98e Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Sun, 15 Mar 2026 19:54:12 +0530 Subject: [PATCH 53/70] phase 3: visibility-aware polling and refresh throttling --- frontend/src/WellbeingDashboard.jsx | 30 +++++++------- frontend/src/pages/LimitsPage.jsx | 11 ++--- frontend/src/pages/UpdatePage.jsx | 11 ++--- frontend/src/shared/hooks.js | 62 +++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 24 deletions(-) diff --git a/frontend/src/WellbeingDashboard.jsx b/frontend/src/WellbeingDashboard.jsx index 754ad2b..20aa48c 100644 --- a/frontend/src/WellbeingDashboard.jsx +++ b/frontend/src/WellbeingDashboard.jsx @@ -9,7 +9,7 @@ import WeeklyReportPage from "./pages/WeeklyReportPage"; import DaySummary from "./pages/DaySummary"; import { Skeleton, SkeletonCard, TabPanel, AppIcon } from "./shared/components"; import { localYMD, yesterday, fmtTime, fmtTimeFull } from "./shared/utils"; -import { useCountUp, useLiveClock } from "./shared/hooks"; +import { useCountUp, useLiveClock, useVisibilityPolling } from "./shared/hooks"; // ─── useReducer — atomic state for all dashboard data ───────────────────────── const initialDashState = { @@ -372,21 +372,23 @@ export default function WellbeingDashboard({ onDisconnect, initialData = null }) } }, [selectedDate, availableDates]); - // Live refresh today - useEffect(() => { + // Live refresh today, throttled while the window is hidden. + useVisibilityPolling(async () => { const today = localYMD(); if (selectedDate !== today) return; - const iv = setInterval(async () => { - try { - delete cache.current[today]; - const entry = await fetchDate(today); - if (selectedDate === today) applyData(entry); - } catch (err) { - if (err instanceof TypeError && onDisconnect) onDisconnect(); - } - }, 60_000); - return () => clearInterval(iv); - }, [selectedDate, fetchDate, applyData]); + try { + delete cache.current[today]; + const entry = await fetchDate(today); + if (selectedDate === today) applyData(entry); + } catch (err) { + if (err instanceof TypeError && onDisconnect) onDisconnect(); + } + }, { + enabled: selectedDate === localYMD(), + visibleIntervalMs: 60_000, + hiddenIntervalMs: 180_000, + immediate: false, + }); // ── Derived ─────────────────────────────────────────────────────────────── const peakHour = hourly.reduce((pi, v, i) => v > hourly[pi] ? i : pi, 0); diff --git a/frontend/src/pages/LimitsPage.jsx b/frontend/src/pages/LimitsPage.jsx index e6b2516..591bbce 100644 --- a/frontend/src/pages/LimitsPage.jsx +++ b/frontend/src/pages/LimitsPage.jsx @@ -1,6 +1,7 @@ import { useState, useEffect, useCallback, useRef } from "react"; import { fmtTime } from "../shared/utils"; import { SectionCard, AppIcon } from "../shared/components"; +import { useVisibilityPolling } from "../shared/hooks"; // ─── STORAGE KEY ───────────────────────────────────────────────────────────── const TEMP_UNBLOCK_KEY = "wellbeing_temp_unblocks"; @@ -991,11 +992,11 @@ export default function LimitsPage({ BASE, stats }) { // eslint-disable-next-line react-hooks/exhaustive-deps }, [BASE]); - useEffect(() => { - fetchAll(); - const iv = setInterval(fetchAll, 30_000); - return () => clearInterval(iv); - }, [fetchAll]); + useVisibilityPolling(fetchAll, { + visibleIntervalMs: 30_000, + hiddenIntervalMs: 120_000, + immediate: true, + }); // ── Optimistic mutations ── const save = async (name, secs) => { diff --git a/frontend/src/pages/UpdatePage.jsx b/frontend/src/pages/UpdatePage.jsx index 6ec70b1..62e8fbc 100644 --- a/frontend/src/pages/UpdatePage.jsx +++ b/frontend/src/pages/UpdatePage.jsx @@ -1,5 +1,6 @@ import { useState, useEffect, useCallback, useRef } from "react"; import { GITHUB_REPO, shouldAutoCheckUpdate, recordUpdateCheck } from "../shared/updateUtils"; +import { useVisibilityPolling } from "../shared/hooks"; // ─── CONSTANTS (mirrors SettingsPage) ──────────────────────────────────────── const BASE_URL = "http://127.0.0.1:7432"; @@ -673,11 +674,11 @@ export default function UpdateSection({ push }) { } catch { } }, []); - useEffect(() => { - fetchUpdateStatus(); - const iv = setInterval(fetchUpdateStatus, 3000); - return () => clearInterval(iv); - }, [fetchUpdateStatus]); + useVisibilityPolling(fetchUpdateStatus, { + visibleIntervalMs: 3000, + hiddenIntervalMs: 15000, + immediate: true, + }); const fetchGithubReleases = useCallback(async () => { setRelError(null); diff --git a/frontend/src/shared/hooks.js b/frontend/src/shared/hooks.js index 25d6b48..3d98818 100644 --- a/frontend/src/shared/hooks.js +++ b/frontend/src/shared/hooks.js @@ -88,3 +88,65 @@ export function useLiveClock(selectedDate) { }, [isToday]); return { elapsed, isToday }; } + +// ─── VISIBILITY-AWARE POLLING ─────────────────────────────────────────────── +// Runs a polling task with one interval when the tab is visible and a slower +// interval (or disabled) when hidden to reduce background churn. +export function useVisibilityPolling(task, { + enabled = true, + visibleIntervalMs, + hiddenIntervalMs = 0, + immediate = true, +} = {}) { + const taskRef = useRef(task); + + useEffect(() => { + taskRef.current = task; + }, [task]); + + useEffect(() => { + if (!enabled || !visibleIntervalMs) return; + + let alive = true; + let timer = null; + + const getDelay = () => ( + document.visibilityState === "visible" ? visibleIntervalMs : hiddenIntervalMs + ); + + const schedule = () => { + if (!alive) return; + const delay = getDelay(); + if (!delay || delay <= 0) return; + timer = setTimeout(run, delay); + }; + + const run = async () => { + if (!alive) return; + try { + await taskRef.current(); + } finally { + schedule(); + } + }; + + const onVisibility = () => { + if (timer) clearTimeout(timer); + timer = null; + schedule(); + }; + + if (immediate) { + run(); + } else { + schedule(); + } + + document.addEventListener("visibilitychange", onVisibility); + return () => { + alive = false; + if (timer) clearTimeout(timer); + document.removeEventListener("visibilitychange", onVisibility); + }; + }, [enabled, visibleIntervalMs, hiddenIntervalMs, immediate]); +} From 1819b4f2d833b0b134179a8863e8d676f187aed3 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Sun, 15 Mar 2026 20:06:55 +0530 Subject: [PATCH 54/70] improve tab switch smoothness and remove empty-state flicker --- frontend/src/WellbeingDashboard.jsx | 111 +++++++++++++--------------- frontend/src/pages/AppsPage.jsx | 19 +---- 2 files changed, 55 insertions(+), 75 deletions(-) diff --git a/frontend/src/WellbeingDashboard.jsx b/frontend/src/WellbeingDashboard.jsx index 20aa48c..dabc6d5 100644 --- a/frontend/src/WellbeingDashboard.jsx +++ b/frontend/src/WellbeingDashboard.jsx @@ -63,29 +63,22 @@ const MemoNoiseOverlay = memo(NoiseOverlay); // ─── ANIMATED TAB PANEL ─────────────────────────────────────────────────────── function AnimatedTabPanel({ active, children }) { - const [rendered, setRendered] = useState(active); - const wasActive = useRef(active); + const [everActive, setEverActive] = useState(active); useEffect(() => { - if (active) { - setRendered(true); - wasActive.current = true; - } else { - // keep rendered briefly so fade-out can play; then unmount - const t = setTimeout(() => { setRendered(false); wasActive.current = false; }, 320); - return () => clearTimeout(t); - } + if (active) setEverActive(true); }, [active]); - if (!rendered) return null; + if (!everActive) return null; return (
{children} @@ -649,49 +642,51 @@ export default function WellbeingDashboard({ onDisconnect, initialData = null })
{/* ── TAB CONTENT with fluid transitions ── */} - - { setActiveTab("insights"); setActiveInsightTab("limits"); }} - onGoToday={() => setSelectedDate(localYMD())} - sparkSeries={sparkSeries} - BASE={BASE} - /> - - - - - - - - - - - - {activeInsightTab === "goals" && ( - - )} - {activeInsightTab === "limits" && ( - - )} - {activeInsightTab === "reports" && ( - - )} - +
+ + { setActiveTab("insights"); setActiveInsightTab("limits"); }} + onGoToday={() => setSelectedDate(localYMD())} + sparkSeries={sparkSeries} + BASE={BASE} + /> + + + + + + + + + + + + {activeInsightTab === "goals" && ( + + )} + {activeInsightTab === "limits" && ( + + )} + {activeInsightTab === "reports" && ( + + )} + +
{/* Footer */}
diff --git a/frontend/src/pages/AppsPage.jsx b/frontend/src/pages/AppsPage.jsx index 173d311..9bd027a 100644 --- a/frontend/src/pages/AppsPage.jsx +++ b/frontend/src/pages/AppsPage.jsx @@ -7,19 +7,13 @@ import { AppIcon, CategoryChip, TrendBadge, SectionCard } from "../shared/compon const AppRow = memo(function AppRow({ app, active, maxActive, main, sub, index, prevActive }) { const pct = maxActive > 0 ? (active / maxActive) * 100 : 0; const col = CATEGORY_COLORS[main] || CATEGORY_COLORS.other; - const [vis, setVis] = useState(false); const [hov, setHov] = useState(false); const trend = trendPct(active, prevActive); - useEffect(() => { - const t = setTimeout(() => setVis(true), 80 + index * 60); - return () => clearTimeout(t); - }, [index]); return (
setHov(true)} onMouseLeave={() => setHov(false)} style={{ display: "flex", alignItems: "center", gap: 12, padding: "10px 8px", borderRadius: 12, - opacity: vis ? 1 : 0, transform: vis ? "translateX(0)" : "translateX(-20px)", - transition: `opacity 0.4s ease ${index * 0.04}s, transform 0.4s ease ${index * 0.04}s, background 0.15s`, + transition: "background 0.15s", background: hov ? "rgba(255, 255, 255, 0.04)" : "transparent" }}> @@ -57,7 +51,6 @@ const BrowserRow = memo(function BrowserRow({ browsers, maxActive, index, BASE, const [expanded, setExpanded] = useState(false); const [sites, setSites] = useState(null); const [loadingSites, setLoadingSites] = useState(false); - const [vis, setVis] = useState(false); const [hov, setHov] = useState(false); const totalActive = browsers.reduce((s, b) => s + b.active, 0); @@ -65,11 +58,6 @@ const BrowserRow = memo(function BrowserRow({ browsers, maxActive, index, BASE, const col = CATEGORY_COLORS.neutral; const trend = trendPct(totalActive, prevActive); - useEffect(() => { - const t = setTimeout(() => setVis(true), 80 + index * 60); - return () => clearTimeout(t); - }, [index]); - const fetchSites = () => { const cacheKey = `${selectedDate}:${browsers[0].app}`; if (_siteStatsCache[cacheKey]) { @@ -100,10 +88,7 @@ const BrowserRow = memo(function BrowserRow({ browsers, maxActive, index, BASE, }; return ( -
+
setHov(true)} From e865dc8a4295dffc668ccfe7ba61912306851237 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Sun, 15 Mar 2026 20:14:25 +0530 Subject: [PATCH 55/70] sync overview goals toggle without page refresh --- frontend/src/pages/GoalsPage.jsx | 4 ++++ frontend/src/pages/OverviewPage.jsx | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/frontend/src/pages/GoalsPage.jsx b/frontend/src/pages/GoalsPage.jsx index e23da0c..857ae29 100644 --- a/frontend/src/pages/GoalsPage.jsx +++ b/frontend/src/pages/GoalsPage.jsx @@ -2,6 +2,8 @@ import { useState, useEffect, useCallback, useRef } from "react"; import { SectionCard, AppIcon } from "../shared/components"; import { fmtTime, localYMD } from "../shared/utils"; +const OVERVIEW_GOALS_VISIBILITY_EVENT = "stasis:overview-goals-visibility"; + const BASE = "http://127.0.0.1:7432"; const GOAL_TYPES = [ @@ -413,6 +415,7 @@ export default function GoalsPage({ selectedDate }) { const updateShowGoalsInOverview = async (value) => { setShowGoalsInOverview(value); + window.dispatchEvent(new CustomEvent(OVERVIEW_GOALS_VISIBILITY_EVENT, { detail: { value } })); try { await fetch(`${BASE}/api/settings/update`, { method: "POST", @@ -422,6 +425,7 @@ export default function GoalsPage({ selectedDate }) { showT(value ? "Goals will show on Overview" : "Goals hidden on Overview", "success"); } catch { setShowGoalsInOverview(prev => !value); + window.dispatchEvent(new CustomEvent(OVERVIEW_GOALS_VISIBILITY_EVENT, { detail: { value: !value } })); showT("Could not update overview goal setting", "warn"); } }; diff --git a/frontend/src/pages/OverviewPage.jsx b/frontend/src/pages/OverviewPage.jsx index adaacf9..273b44b 100644 --- a/frontend/src/pages/OverviewPage.jsx +++ b/frontend/src/pages/OverviewPage.jsx @@ -10,6 +10,8 @@ import InputActivityCard from "./InputActivityCard"; import HourlyActivityPattern from "./HourlyActivityPattern"; import CategoryBreakdown from "./CategoryBreakdown"; +const OVERVIEW_GOALS_VISIBILITY_EVENT = "stasis:overview-goals-visibility"; + // ─── HELPERS ───────────────────────────────────────────────────────────────── function fmt12h(h) { if (h === 0) return "12 AM"; @@ -390,6 +392,15 @@ export default function OverviewPage({ .catch(() => setShowGoalsInOverview(true)); }, [BASE]); + useEffect(() => { + const onVisibilityChanged = (e) => { + const next = e?.detail?.value; + if (typeof next === "boolean") setShowGoalsInOverview(next); + }; + window.addEventListener(OVERVIEW_GOALS_VISIBILITY_EVENT, onVisibilityChanged); + return () => window.removeEventListener(OVERVIEW_GOALS_VISIBILITY_EVENT, onVisibilityChanged); + }, []); + const loadGoals = useCallback(async () => { if (!showGoalsInOverview) { setGoals([]); From 27e2a8896355d7dec1e08795bac001c3d79feb38 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Sun, 15 Mar 2026 20:16:52 +0530 Subject: [PATCH 56/70] add tab prewarm, list windowing, and hover performance cleanup --- frontend/src/WellbeingDashboard.jsx | 50 ++++++++++++++++++--- frontend/src/index.css | 18 ++++++++ frontend/src/pages/AppsPage.jsx | 58 ++++++++++++++++++++---- frontend/src/pages/LimitsPage.jsx | 68 ++++++++++++++++++++++++----- 4 files changed, 169 insertions(+), 25 deletions(-) diff --git a/frontend/src/WellbeingDashboard.jsx b/frontend/src/WellbeingDashboard.jsx index dabc6d5..355fe0a 100644 --- a/frontend/src/WellbeingDashboard.jsx +++ b/frontend/src/WellbeingDashboard.jsx @@ -62,13 +62,17 @@ function NoiseOverlay() { const MemoNoiseOverlay = memo(NoiseOverlay); // ─── ANIMATED TAB PANEL ─────────────────────────────────────────────────────── -function AnimatedTabPanel({ active, children }) { +function AnimatedTabPanel({ active, preload = false, children }) { const [everActive, setEverActive] = useState(active); useEffect(() => { if (active) setEverActive(true); }, [active]); + useEffect(() => { + if (preload) setEverActive(true); + }, [preload]); + if (!everActive) return null; return ( @@ -263,6 +267,7 @@ export default function WellbeingDashboard({ onDisconnect, initialData = null }) const [activeTab, setActiveTab] = useState("overview"); const [activeInsightTab, setActiveInsightTab] = useState("goals"); + const [prewarmTabs, setPrewarmTabs] = useState(false); const [showSettings, setShowSettings] = useState(false); const [selectedDate, setSelectedDate] = useState(localYMD()); const [availableDates, setAvailableDates] = useState([]); @@ -275,6 +280,32 @@ export default function WellbeingDashboard({ onDisconnect, initialData = null }) const scrollRef = useRef(null); const { elapsed, isToday } = useLiveClock(selectedDate); + useEffect(() => { + if (loading || prewarmTabs) return; + + let cancelled = false; + let timeoutId = null; + let idleId = null; + + const warm = () => { + if (!cancelled) setPrewarmTabs(true); + }; + + if (typeof window !== "undefined" && typeof window.requestIdleCallback === "function") { + idleId = window.requestIdleCallback(warm, { timeout: 1200 }); + } else { + timeoutId = setTimeout(warm, 450); + } + + return () => { + cancelled = true; + if (timeoutId) clearTimeout(timeoutId); + if (idleId && typeof window !== "undefined" && typeof window.cancelIdleCallback === "function") { + window.cancelIdleCallback(idleId); + } + }; + }, [loading, prewarmTabs]); + // Scroll to top on date change useEffect(() => { scrollRef.current?.scrollTo({ top: 0, behavior: "smooth" }); @@ -662,11 +693,18 @@ export default function WellbeingDashboard({ onDisconnect, initialData = null }) /> - - + + - + - + {activeInsightTab === "goals" && ( )} {activeInsightTab === "limits" && ( - + )} {activeInsightTab === "reports" && ( diff --git a/frontend/src/index.css b/frontend/src/index.css index 1f54f8c..9983682 100644 --- a/frontend/src/index.css +++ b/frontend/src/index.css @@ -67,6 +67,24 @@ body { background: rgba(255, 255, 255, 0.1) !important; } +.hover-raise-warn { + transition: background var(--motion-fast) var(--ease-standard), transform var(--motion-fast) var(--ease-standard); +} + +.hover-raise-warn:hover { + background: rgba(248, 113, 113, 0.14) !important; + transform: translateY(-1px); +} + +.hover-raise-amber { + transition: background var(--motion-fast) var(--ease-standard), transform var(--motion-fast) var(--ease-standard); +} + +.hover-raise-amber:hover { + background: rgba(251, 191, 36, 0.18) !important; + transform: translateY(-1px); +} + ::-webkit-scrollbar { width: 8px; } diff --git a/frontend/src/pages/AppsPage.jsx b/frontend/src/pages/AppsPage.jsx index 9bd027a..30b395b 100644 --- a/frontend/src/pages/AppsPage.jsx +++ b/frontend/src/pages/AppsPage.jsx @@ -179,9 +179,10 @@ const BrowserRow = memo(function BrowserRow({ browsers, maxActive, index, BASE, }); // ─── APPS PAGE ──────────────────────────────────────────────────────────────── -export default function AppsPage({ BASE, stats, prevStats, selectedDate, ignoredApps }) { +export default function AppsPage({ BASE, stats, prevStats, selectedDate, ignoredApps, isActive = true }) { const [appFilter, setAppFilter] = useState("all"); const [prevFilter, setPrevFilter] = useState("all"); + const [visibleCount, setVisibleCount] = useState(120); const handleFilterChange = (cat) => { setPrevFilter(appFilter); @@ -191,6 +192,21 @@ export default function AppsPage({ BASE, stats, prevStats, selectedDate, ignored const prevMap = prevStats.reduce((a, s) => { a[s.app] = (a[s.app] || 0) + s.active; return a; }, {}); const sorted = [...stats].sort((a, b) => b.active - a.active); + useEffect(() => { + setVisibleCount(120); + }, [selectedDate, appFilter, stats.length]); + + useEffect(() => { + if (!isActive) return; + const onScroll = () => { + if (window.innerHeight + window.scrollY >= document.documentElement.scrollHeight - 520) { + setVisibleCount((c) => c + 80); + } + }; + window.addEventListener("scroll", onScroll, { passive: true }); + return () => window.removeEventListener("scroll", onScroll); + }, [isActive]); + return ( + +${clone.outerHTML} +`; + + const printWin = window.open("", "_blank", "width=900,height=700"); + if (!printWin) { showT("Pop-up blocked — allow pop-ups to export PDF", "warn"); return; } + printWin.document.write(html); + printWin.document.close(); + printWin.focus(); + // Give browser time to render SVGs before triggering print + setTimeout(() => { + printWin.print(); + // Close after print dialog is dismissed (delay so user can save as PDF) + setTimeout(() => printWin.close(), 2000); + }, 600); + showT("Use 'Save as PDF' in the print dialog"); + } catch (err) { + console.error(err); showT("Failed to export PDF", "warn"); } }; @@ -602,9 +699,7 @@ export default function WeeklyReportPage() { const j = await r.json(); setCompareData(j.error ? null : j); if (j.error) showT(j.error, "warn"); - } catch { - showT("Failed to compare weeks", "warn"); - } + } catch { showT("Failed to compare weeks", "warn"); } setCompareLoading(false); }; @@ -620,350 +715,309 @@ export default function WeeklyReportPage() { }; }, [report]); - const navBtn = (enabled) => ({ - width: 34, height: 34, borderRadius: 10, - border: "1px solid rgba(255,255,255,0.08)", - background: enabled ? "rgba(255,255,255,0.04)" : "rgba(255,255,255,0.01)", - color: enabled ? "#94a3b8" : "#2d3748", - cursor: enabled ? "pointer" : "not-allowed", - fontSize: 16, display: "flex", alignItems: "center", justifyContent: "center", - transition: "all 0.18s ease", + const navBtnStyle = (enabled) => ({ + width: 30, height: 30, borderRadius: 8, border: "1px solid rgba(255,255,255,0.08)", + background: enabled ? "rgba(255,255,255,0.04)" : "transparent", + color: enabled ? "#94a3b8" : "#1e293b", cursor: enabled ? "pointer" : "not-allowed", + fontSize: 14, display: "flex", alignItems: "center", justifyContent: "center", + transition: "all 0.15s ease", }); return ( -
+
{/* Toast */} {toast && (
- {toast.type === "warn" ? "⚠️" : "✓"}{toast.msg} + {toast.type === "warn" ? "⚠️" : "✓"}{toast.msg}
)} - {/* Header with navigation */} -
+ {/* ── HEADER ── */} +
-
Weekly Report
-
{fmtWeekRange(week.start, week.end)}
+
Weekly Report
+
{fmtWeekRange(week.start, week.end)}
-
- {/* ← Previous */} - +
+ {/* Week nav */} + - {/* This Week indicator OR jump-back button */} {isCurrentWeek ? ( -
- This Week -
+
THIS WEEK
) : ( - + )} - {/* → Next */} - + + {/* Separator */} +
+ + {/* Compare */}
- + {compareOpen && ( -
-
Compare Two Weeks
+
+
Compare Two Weeks
-
-
Week 1
- - {weekMenuOpen === "a" && ( -
- { setCompareWeekA(value); setWeekMenuOpen(null); }} /> -
- )} -
-
-
Week 2
- - {weekMenuOpen === "b" && ( -
- { setCompareWeekB(value); setWeekMenuOpen(null); }} /> + {["a", "b"].map((slot, si) => { + const curVal = slot === "a" ? compareWeekA : compareWeekB; + const otherVal = slot === "a" ? compareWeekB : compareWeekA; + const setter = slot === "a" ? setCompareWeekA : setCompareWeekB; + return ( +
+
Week {si + 1}
+ + {weekMenuOpen === slot && ( +
+ { setter(v); setWeekMenuOpen(null); }} /> +
+ )}
- )} -
+ ); + })}
)}
+ {/* Export */}
- + {exportOpen && report && ( -
+
{[ - { label: "Download PDF", action: async () => { await exportPdf(); setExportOpen(false); } }, - { label: "Download CSV", action: () => { downloadCsv(); setExportOpen(false); } }, - { label: "Download JSON", action: () => { downloadJson(); setExportOpen(false); } }, - { label: sending ? "Send Telegram (sending...)" : "Send to Telegram", action: async () => { await sendTelegram(); setExportOpen(false); } }, - ].map((item) => ( - ))}
)}
+ + {/* Refresh */} +
- {/* Body */} + {/* ── BODY ── */} {loading ? ( -
- +
+ Generating report…
) : !report ? ( -
-
📊
-
No data for this week
-
Try navigating to a week with activity data
+
+
📊
+
No data for this week
+
Try navigating to a week with activity data
) : ( - - {compareData?.diff && ( -
-
-
Screen Δ
-
{fmtTime(Math.abs(compareData.diff.screen_time_delta || 0))} {compareData.diff.screen_time_delta >= 0 ? "↑" : "↓"}
-
-
-
Avg/Day Δ
-
{fmtTime(Math.abs(compareData.diff.avg_daily_delta || 0))} {compareData.diff.avg_daily_delta >= 0 ? "↑" : "↓"}
-
-
-
Productivity Δ
-
{Math.abs(compareData.diff.productivity_delta || 0)}pt {compareData.diff.productivity_delta >= 0 ? "↑" : "↓"}
-
-
-
Focus Δ
-
{Math.abs(compareData.diff.focus_delta || 0)} {compareData.diff.focus_delta >= 0 ? "↑" : "↓"}
-
-
- )} - - {/* Summary stats */} -
- - - - + + + {/* ── ROW 1: Stat cards ── */} +
+ + + +
- {report.what_changed && report.what_changed.length > 0 && ( - -
- {report.what_changed.map((x, i) => ( -
- {x} -
- ))} + {/* ── Compare deltas (if active) ── */} + {compareData?.diff && ( + x.value === compareWeekB)?.label || "Previous week"}`} titleRight={}> +
+ + + +
- + )} -
- {/* Daily breakdown — now a real bar chart */} - - -
- {report.peak_day && ( - - 📈 Peak: {fmtDateShort(report.peak_day.date)} — {fmtTime(report.peak_day.total_seconds)} - - )} - {report.lightest_day && ( - - 📉 Lightest: {fmtDateShort(report.lightest_day.date)} — {fmtTime(report.lightest_day.total_seconds)} - - )} + {/* ── ROW 2: Daily chart + Categories ── */} +
+ + {report.peak_day && 👑 Peak: {fmtDateShort(report.peak_day.date)} · {fmtTime(report.peak_day.total_seconds)}} + {report.lightest_day && 💤 Lightest: {fmtDateShort(report.lightest_day.date)} · {fmtTime(report.lightest_day.total_seconds)}}
- + }> + + + + + +
+ + {/* ── ROW 3: Top apps + Limits + Goals ── */} +
{/* Top apps */} - -
+ +
{(report.top_apps || []).map((a, i) => ( - + ))}
- - - {/* Category breakdown donut + plain text legend */} - - - {report.category_insights?.length > 0 && ( -
- {report.category_insights.map((txt, i) => ( -
🧠 {txt}
- ))} -
- )} - + {/* Limit discipline */} - {report.limits && (report.limits.total_hits > 0 || report.limits.total_edits > 0) && ( - -
-
-
Total Hits
-
{report.limits.total_hits}
+ {report.limits && (report.limits.total_hits > 0 || report.limits.total_edits > 0) ? ( + +
+
+
Limit Hits
+
{report.limits.total_hits}
-
-
Total Edits
-
{report.limits.total_edits}
+
+
Limit Edits
+
{report.limits.total_edits}
- {(report.limits.per_app || []).map(a => ( - - ))} + {(report.limits.per_app || []).map(a => )} +
+ + ) : ( + +
+ ✅ + No limit hits this week + Great self-discipline!
- + )} - {/* Goals achievement */} - {report.goals && report.goals.length > 0 && ( - -
+ {/* Goals */} + {report.goals && report.goals.length > 0 ? ( + +
{report.goals.map((g, i) => )}
{report.goal_drift_alerts?.length > 0 && ( -
+
{report.goal_drift_alerts.map((a, i) => ( -
+
⚠️ {a.message}
))}
)} - + + ) : ( + +
+ 🎯 + No goals tracked this week +
+ )} +
- {report.goal_impact_correlation && ( - -
-
-
With Goals Met
-
{report.goal_impact_correlation.with_goal_met_productivity ?? "—"}%
+ {/* ── ROW 4: Goal impact + What changed ── */} + {(report.goal_impact_correlation || (report.what_changed && report.what_changed.length > 0)) && ( +
+ {report.goal_impact_correlation && ( + +
+
+
Goals Met
+
{report.goal_impact_correlation.with_goal_met_productivity ?? "—"}%
+
+
+
No Goals
+
{report.goal_impact_correlation.without_goal_met_productivity ?? "—"}%
+
+
+
Delta
+
{report.goal_impact_correlation.delta ?? "—"}pt
+
-
-
Without Goal Met
-
{report.goal_impact_correlation.without_goal_met_productivity ?? "—"}%
-
-
-
Delta
-
{report.goal_impact_correlation.delta ?? "—"}pt
+ {report.goal_impact_correlation.summary &&
{report.goal_impact_correlation.summary}
} + + )} + + {report.what_changed && report.what_changed.length > 0 && ( + +
+ {report.what_changed.map((x, i) => ( +
{x}
+ ))}
-
-
{report.goal_impact_correlation.summary}
- - )} -
+ + )} +
+ )} - {/* Insights */} + {/* ── INSIGHTS (pinned last) ── */} {report.insights && report.insights.length > 0 && (
-
- ✨ - Weekly Insights +
+ ✨ + Weekly Insights + {report.insights.length} observations
-
+
{report.insights.map((txt, i) => )}
)} + + {/* ── Category insights (also at bottom) ── */} + {report.category_insights?.length > 0 && ( +
+
+ 🧩 + Category Insights +
+
+ {report.category_insights.map((txt, i) => ( +
+ 🧠 +

{txt}

+
+ ))} +
+
+ )} + )}
From 854a98c2111a5c62445528c88b05657b5506aab3 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Sun, 15 Mar 2026 22:27:27 +0530 Subject: [PATCH 60/70] feat(notifications): ship Windows Notification Center flow for goals and limits Implement a complete Windows desktop notification pipeline for goal and app-limit events, including backend delivery, runtime triggers, developer diagnostics, and production-safe action routing. Backend and runtime: - Add DesktopNotifier in src/core/desktop_notifications.py using winotify as the single reliable backend. - Add event typing, cooldown dedupe, per-event enable/disable gating, quiet-hours filtering, and limit snooze support. - Add notification history tracking (bounded deque) for diagnostics. - Add notification action URL builder for stasis:// deep links. - Trigger rich app-limit notifications in BlockingService with over-limit details and actions. - Add goal-threshold/goal-achieved notifications with first-check and transition detection. - Start BlockingService unconditionally on startup so goal checks run even without app limits. - Add settings defaults for notifications, event toggles, quiet hours, and snooze timestamp. - Add API support for notification settings read/write plus endpoints for test, test-goal, test-limit, history, and action handling. Windows identity and attribution hardening: - Add startup self-heal for notification identity via Start Menu shortcut + AppUserModelID. - Use branded identity (Stasis: Digital Wellbeing) and set shortcut icon for proper Notification Center attribution. Frontend + Tauri production flow: - Add Developer notification controls in Settings (event toggles, quiet hours, tests, history). - Move test utilities into Developer section and keep Developer at the end of Settings navigation. - Add deep-link bridge from Tauri (stasis-deep-link event) to frontend custom event. - Parse deep-link actions in dashboard to open Goals/Limits and call snooze action API. - Register and clean up stasis:// protocol in NSIS installer hooks so action buttons work in packaged builds. Dependency updates: - Add winotify to requirements.txt for toast delivery. --- frontend/src-tauri/nsis/installer.nsh | 10 +- frontend/src-tauri/src/main.rs | 24 ++- frontend/src/WellbeingDashboard.jsx | 55 ++++++ frontend/src/main.jsx | 14 ++ frontend/src/pages/SettingsPage.jsx | 234 ++++++++++++++++++++++- requirements.txt | 3 +- src/api/settings_routes.py | 107 ++++++++++- src/config/settings_manager.py | 8 + src/core/desktop_notifications.py | 265 ++++++++++++++++++++++++++ src/core/startup.py | 65 ++++++- src/main.py | 24 ++- src/services/blocking_service.py | 166 ++++++++++++++++ 12 files changed, 959 insertions(+), 16 deletions(-) create mode 100644 src/core/desktop_notifications.py diff --git a/frontend/src-tauri/nsis/installer.nsh b/frontend/src-tauri/nsis/installer.nsh index b2db7b3..a19d7ef 100644 --- a/frontend/src-tauri/nsis/installer.nsh +++ b/frontend/src-tauri/nsis/installer.nsh @@ -6,7 +6,11 @@ # ----------------------------- !macro NSIS_HOOK_POSTINSTALL - # Intentionally left empty. Tauri's built-in run checkbox handles this. + # Register stasis:// deep-link protocol for notification action buttons. + WriteRegStr HKCU "Software\Classes\stasis" "" "URL:Stasis Protocol" + WriteRegStr HKCU "Software\Classes\stasis" "URL Protocol" "" + WriteRegStr HKCU "Software\Classes\stasis\DefaultIcon" "" "$INSTDIR\Stasis.exe,0" + WriteRegStr HKCU "Software\Classes\stasis\shell\open\command" "" '"$INSTDIR\Stasis.exe" "%1"' !macroend # ----------------------------- @@ -38,4 +42,8 @@ FunctionEnd !macro NSIS_HOOK_CUSTOM_PAGES Page custom StartupPage StartupPageLeave +!macroend + +!macro NSIS_HOOK_PREUNINSTALL + DeleteRegKey HKCU "Software\Classes\stasis" !macroend \ No newline at end of file diff --git a/frontend/src-tauri/src/main.rs b/frontend/src-tauri/src/main.rs index f34d82b..0ebb361 100644 --- a/frontend/src-tauri/src/main.rs +++ b/frontend/src-tauri/src/main.rs @@ -6,7 +6,7 @@ use std::process::Child; use std::sync::Mutex; use std::sync::atomic::{AtomicBool, Ordering}; -use tauri::{AppHandle, Manager}; +use tauri::{AppHandle, Manager, Emitter}; use tauri::tray::TrayIconBuilder; use tauri::menu::{Menu, MenuItem}; use tauri_plugin_dialog::{MessageDialogBuilder, MessageDialogButtons, DialogExt}; @@ -15,6 +15,16 @@ static SHOULD_EXIT: AtomicBool = AtomicBool::new(false); struct BackendState(Mutex>); +fn extract_deep_link(args: &[String]) -> Option { + args.iter() + .find(|a| a.to_lowercase().starts_with("stasis://")) + .cloned() +} + +fn emit_deep_link(app: &AppHandle, url: &str) { + let _ = app.emit("stasis-deep-link", url.to_string()); +} + fn main() { // Check if hardware acceleration should be disabled if let Ok(local_app_data) = std::env::var("LOCALAPPDATA") { @@ -33,6 +43,12 @@ fn main() { .setup(|app| { start_backend(app.handle()); + // Handle deep-link when app is launched directly via protocol. + let args: Vec = std::env::args().collect(); + if let Some(url) = extract_deep_link(&args) { + emit_deep_link(app.handle(), &url); + } + // -------- Tray Menu -------- let open = MenuItem::with_id(app, "open", "Open Stasis", true, None::<&str>)?; let close = MenuItem::with_id(app, "close", "Close Window", true, None::<&str>)?; @@ -107,7 +123,7 @@ fn main() { // By default, closing the window will now destroy it (freeing RAM). // The RunEvent handler below will prevent the app from exiting. - .plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| { + .plugin(tauri_plugin_single_instance::init(|app, args, _cwd| { if let Some(window) = app.get_webview_window("main") { let _ = window.show(); let _ = window.set_focus(); @@ -124,6 +140,10 @@ fn main() { .decorations(true) .build(); } + + if let Some(url) = extract_deep_link(&args) { + emit_deep_link(app, &url); + } })) .plugin(tauri_plugin_opener::init()) .plugin(tauri_plugin_dialog::init()) diff --git a/frontend/src/WellbeingDashboard.jsx b/frontend/src/WellbeingDashboard.jsx index 678195b..1566b66 100644 --- a/frontend/src/WellbeingDashboard.jsx +++ b/frontend/src/WellbeingDashboard.jsx @@ -280,6 +280,61 @@ export default function WellbeingDashboard({ onDisconnect, initialData = null }) const scrollRef = useRef(null); const { elapsed, isToday } = useLiveClock(selectedDate); + const handleDeepLink = useCallback(async (urlLike) => { + if (!urlLike) return; + let parsed; + try { + parsed = new URL(urlLike); + } catch { + return; + } + + const isStasis = parsed.protocol.toLowerCase() === "stasis:"; + if (!isStasis) return; + + const action = (parsed.searchParams.get("action") || "").toLowerCase(); + if (action === "open-limits") { + setActiveTab("insights"); + setActiveInsightTab("limits"); + return; + } + if (action === "open-goals") { + setActiveTab("insights"); + setActiveInsightTab("goals"); + return; + } + if (action === "snooze-limit") { + const minutes = parsed.searchParams.get("minutes") || "60"; + try { + await fetch(`${BASE}/api/settings/notifications/action/snooze-limit?minutes=${encodeURIComponent(minutes)}`); + } catch { } + return; + } + }, [BASE]); + + useEffect(() => { + try { + const params = new URLSearchParams(window.location.search); + const section = (params.get("section") || "").toLowerCase(); + if (section === "limits") { + setActiveTab("insights"); + setActiveInsightTab("limits"); + } else if (section === "goals") { + setActiveTab("insights"); + setActiveInsightTab("goals"); + } + } catch { } + }, []); + + useEffect(() => { + const onDeepLink = (event) => { + const url = event?.detail?.url; + handleDeepLink(url); + }; + window.addEventListener("stasis:deep-link", onDeepLink); + return () => window.removeEventListener("stasis:deep-link", onDeepLink); + }, [handleDeepLink]); + useEffect(() => { if (loading || prewarmTabs) return; diff --git a/frontend/src/main.jsx b/frontend/src/main.jsx index b9a1a6d..e501926 100644 --- a/frontend/src/main.jsx +++ b/frontend/src/main.jsx @@ -3,6 +3,20 @@ import { createRoot } from 'react-dom/client' import './index.css' import App from './App.jsx' +if (typeof window !== "undefined") { + import("@tauri-apps/api/event") + .then(({ listen }) => { + listen("stasis-deep-link", (event) => { + window.dispatchEvent(new CustomEvent("stasis:deep-link", { + detail: { url: String(event.payload || "") }, + })); + }); + }) + .catch(() => { + // Non-Tauri/browser mode. + }); +} + createRoot(document.getElementById('root')).render( diff --git a/frontend/src/pages/SettingsPage.jsx b/frontend/src/pages/SettingsPage.jsx index c7bdfe9..613652c 100644 --- a/frontend/src/pages/SettingsPage.jsx +++ b/frontend/src/pages/SettingsPage.jsx @@ -812,6 +812,7 @@ function GeneralSection({ push }) { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ + notifications: s.notifications, file_logging_enabled: s.file_logging_enabled, file_logging_essential_only: s.file_logging_essential_only, show_yesterday_comparison: s.show_yesterday_comparison, @@ -1036,6 +1037,234 @@ function GeneralSection({ push }) { ); } +// ═══════════════════════════════════════════════════════════════════════════════ +// DEVELOPER SECTION +// ═══════════════════════════════════════════════════════════════════════════════ +function DeveloperSection({ push }) { + const [testingNotifications, setTestingNotifications] = useState(false); + const [testingGoalNotification, setTestingGoalNotification] = useState(false); + const [testingAppLimitNotification, setTestingAppLimitNotification] = useState(false); + const [history, setHistory] = useState([]); + const [loadingHistory, setLoadingHistory] = useState(true); + const [notifCfg, setNotifCfg] = useState({ + notifications_enable_goal_events: true, + notifications_enable_limit_events: true, + notifications_enable_test_events: true, + notifications_quiet_hours_enabled: false, + notifications_quiet_start: "22:00", + notifications_quiet_end: "07:00", + }); + const [savingNotifCfg, setSavingNotifCfg] = useState(false); + + const loadNotifCfg = useCallback(async () => { + try { + const d = await fetch(`${BASE_URL}/api/settings`).then(r => r.json()); + setNotifCfg(p => ({ ...p, ...d })); + } catch { } + }, []); + + const fetchHistory = useCallback(async () => { + try { + const d = await fetch(`${BASE_URL}/api/settings/notifications/history?limit=20`).then(r => r.json()); + setHistory(Array.isArray(d?.items) ? d.items : []); + } catch { + setHistory([]); + } + setLoadingHistory(false); + }, []); + + useEffect(() => { + fetchHistory(); + loadNotifCfg(); + const iv = setInterval(fetchHistory, 5000); + return () => clearInterval(iv); + }, [fetchHistory, loadNotifCfg]); + + const saveNotifCfg = async (patch) => { + const next = { ...notifCfg, ...patch }; + setNotifCfg(next); + setSavingNotifCfg(true); + try { + await fetch(`${BASE_URL}/api/settings/update`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify(patch), + }); + } catch { + push("Failed to save notification controls", "error"); + loadNotifCfg(); + } + setSavingNotifCfg(false); + }; + + const runTest = async (endpoint, loadingSetter, successLabel, failureLabel) => { + loadingSetter(true); + try { + const r = await fetch(`${BASE_URL}${endpoint}`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + }); + const d = await r.json(); + if (r.ok && d.status === "sent") { + push(`${successLabel} (${d.method || "backend"})`, "success"); + } else { + push(d.reason || d.message || failureLabel, "error"); + } + } catch { + push(failureLabel, "error"); + } + loadingSetter(false); + fetchHistory(); + }; + + return ( +
+ + Delivery Controls + saveNotifCfg({ notifications_enable_goal_events: v })} />} + /> + saveNotifCfg({ notifications_enable_limit_events: v })} />} + /> + saveNotifCfg({ notifications_enable_test_events: v })} />} + /> + saveNotifCfg({ notifications_quiet_hours_enabled: v })} />} + /> + + setNotifCfg(p => ({ ...p, notifications_quiet_start: e.target.value }))} + onBlur={() => saveNotifCfg({ notifications_quiet_start: notifCfg.notifications_quiet_start || "22:00" })} + style={{ width: 70, padding: "6px 8px", borderRadius: 8, border: `1px solid ${C.border}`, background: "rgba(255,255,255,0.05)", color: C.text, fontSize: 12 }} + /> + to + setNotifCfg(p => ({ ...p, notifications_quiet_end: e.target.value }))} + onBlur={() => saveNotifCfg({ notifications_quiet_end: notifCfg.notifications_quiet_end || "07:00" })} + style={{ width: 70, padding: "6px 8px", borderRadius: 8, border: `1px solid ${C.border}`, background: "rgba(255,255,255,0.05)", color: C.text, fontSize: 12 }} + /> +
+ )} + /> + {savingNotifCfg &&
Saving notification controls...
} + + + + Notification Test Tools +
+ runTest( + "/api/settings/notifications/test", + setTestingNotifications, + "General test notification sent", + "General notification test failed" + )} + > + Send General Test + + runTest( + "/api/settings/notifications/test-goal", + setTestingGoalNotification, + "Goal-threshold notification sent", + "Goal-threshold notification test failed" + )} + > + Send Goal Test + + runTest( + "/api/settings/notifications/test-limit", + setTestingAppLimitNotification, + "App-limit notification sent", + "App-limit notification test failed" + )} + > + Send App Limit Test + +
+
+ These controls trigger notification endpoints instantly without waiting for real limit/goal thresholds. +
+ + + + Notification History (Last 20) + {loadingHistory ? ( +
+ + + +
+ ) : history.length === 0 ? ( +
+ No notification events yet. +
+ ) : ( +
+ {history.map((item, idx) => ( +
+
+
+ {item.title} +
+
+ {item.message} +
+
+
+
{item.method || "unknown"}
+
{item.event_type || "general"}
+
{item.source || "runtime"}
+
{timeAgo(item.timestamp) || item.timestamp}
+
+
+ ))} +
+ )} + +
+ ); +} + // ═══════════════════════════════════════════════════════════════════════════════ // TYPED-CONFIRMATION MODAL (for destructive actions) // ═══════════════════════════════════════════════════════════════════════════════ @@ -1487,6 +1716,7 @@ const NAV_ITEMS = [ { id: "security", icon: "🔐", label: "Security", sub: "Access & encryption" }, { id: "updates", icon: "🚀", label: "Updates", sub: "Version & changelog" }, { id: "about", icon: "ℹ️", label: "About", sub: "Privacy & licenses" }, + { id: "developer", icon: "🛠️", label: "Developer", sub: "Diagnostics & logs" }, ]; function SideNav({ active, onChange, tgStatus, tgConfig, updateState }) { @@ -1498,7 +1728,7 @@ function SideNav({ active, onChange, tgStatus, tgConfig, updateState }) { const isAct = active === id; const badge = id === "telegram" && tgSt && tgSt.key !== "running" && tgSt.key !== "disabled"; const updateBadge = id === "updates" && hasUpdate; - const showDivider = idx === 3; // divider before Updates+About + const showDivider = idx === 3; // divider before Updates+About+Developer return (
{showDivider &&
} @@ -1594,6 +1824,7 @@ export default function SettingsPage({ onClose, initialSection = "telegram" }) { security: { label: "Security", sub: "Access control and encryption" }, updates: { label: "Updates", sub: "Version history and changelog" }, about: { label: "About & Privacy", sub: "Version, licenses and data policy" }, + developer: { label: "Developer", sub: "Notification diagnostics and history" }, }; return ( @@ -1656,6 +1887,7 @@ export default function SettingsPage({ onClose, initialSection = "telegram" }) {
{meta[id]?.sub}
{id === "general" && } + {id === "developer" && } {id === "telegram" && } {id === "security" && } {id === "updates" && } diff --git a/requirements.txt b/requirements.txt index b8a1007..29b644a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,5 @@ flask-cors cryptography comtypes packaging -winsdk \ No newline at end of file +winsdk +winotify \ No newline at end of file diff --git a/src/api/settings_routes.py b/src/api/settings_routes.py index 650c34e..f3b2d54 100644 --- a/src/api/settings_routes.py +++ b/src/api/settings_routes.py @@ -4,11 +4,32 @@ from src.api.wellbeing_routes import wellbeing_bp from src.config.settings_manager import SettingsManager from src.config.storage import get_base_dir +from src.core.desktop_notifications import desktop_notifier + + +def _send_test_notification(title: str, message: str, source: str, actions=None): + details = desktop_notifier.notify_test_with_details(title=title, message=message, source=source, actions=actions) + if details["ok"]: + return jsonify({"status": "sent", "method": details["method"]}) + return jsonify({ + "status": "failed", + "method": details["method"], + "message": "Could not send Windows notification", + "reason": details["reason"], + }), 500 @wellbeing_bp.route("/api/settings", methods=["GET"]) def get_settings(): return jsonify({ + "notifications": SettingsManager.get_bool("notifications", False), + "notifications_enable_goal_events": SettingsManager.get_bool("notifications_enable_goal_events", True), + "notifications_enable_limit_events": SettingsManager.get_bool("notifications_enable_limit_events", True), + "notifications_enable_test_events": SettingsManager.get_bool("notifications_enable_test_events", True), + "notifications_quiet_hours_enabled": SettingsManager.get_bool("notifications_quiet_hours_enabled", False), + "notifications_quiet_start": SettingsManager.get("notifications_quiet_start") or "22:00", + "notifications_quiet_end": SettingsManager.get("notifications_quiet_end") or "07:00", + "notifications_limit_snooze_until": SettingsManager.get("notifications_limit_snooze_until") or "", "file_logging_enabled": SettingsManager.get_bool("file_logging_enabled", False), "file_logging_essential_only": SettingsManager.get_bool("file_logging_essential_only", False), "show_yesterday_comparison": SettingsManager.get_bool("show_yesterday_comparison", True), @@ -26,6 +47,31 @@ def update_settings(): data = request.json _file_monitor_changed = False + if "notifications" in data: + val = "true" if data["notifications"] else "false" + SettingsManager.set("notifications", val) + + if "notifications_enable_goal_events" in data: + SettingsManager.set("notifications_enable_goal_events", "true" if data["notifications_enable_goal_events"] else "false") + + if "notifications_enable_limit_events" in data: + SettingsManager.set("notifications_enable_limit_events", "true" if data["notifications_enable_limit_events"] else "false") + + if "notifications_enable_test_events" in data: + SettingsManager.set("notifications_enable_test_events", "true" if data["notifications_enable_test_events"] else "false") + + if "notifications_quiet_hours_enabled" in data: + SettingsManager.set("notifications_quiet_hours_enabled", "true" if data["notifications_quiet_hours_enabled"] else "false") + + if "notifications_quiet_start" in data: + SettingsManager.set("notifications_quiet_start", str(data["notifications_quiet_start"]).strip()) + + if "notifications_quiet_end" in data: + SettingsManager.set("notifications_quiet_end", str(data["notifications_quiet_end"]).strip()) + + if "notifications_limit_snooze_until" in data: + SettingsManager.set("notifications_limit_snooze_until", str(data["notifications_limit_snooze_until"]).strip()) + if "file_logging_enabled" in data: val = "true" if data["file_logging_enabled"] else "false" SettingsManager.set("file_logging_enabled", val) @@ -79,4 +125,63 @@ def update_settings(): val = "standard" SettingsManager.set("weekly_report_verbosity", val) - return jsonify({"status": "updated"}) \ No newline at end of file + return jsonify({"status": "updated"}) + + +@wellbeing_bp.route("/api/settings/notifications/test", methods=["POST"]) +def test_notification(): + return _send_test_notification( + title="Stasis notification test", + message="If you can see this in Windows Notification Center, everything is set.", + source="test-general", + ) + + +@wellbeing_bp.route("/api/settings/notifications/test-goal", methods=["POST"]) +def test_goal_threshold_notification(): + return _send_test_notification( + title="Screen-time goal threshold reached", + message="Test alert: your daily screen-time goal threshold was reached.", + source="test-goal", + actions=[("Open Goals", desktop_notifier.build_action_url("open-goals"))], + ) + + +@wellbeing_bp.route("/api/settings/notifications/test-limit", methods=["POST"]) +def test_app_limit_notification(): + return _send_test_notification( + title="App limit reached", + message="Test alert: Firefox reached its daily app time limit.", + source="test-limit", + actions=[ + ("Open Limits", desktop_notifier.build_action_url("open-limits")), + ("Mute 1h", desktop_notifier.build_action_url("snooze-limit", minutes=60)), + ], + ) + + +@wellbeing_bp.route("/api/settings/notifications/history", methods=["GET"]) +def get_notifications_history(): + limit = request.args.get("limit", 20, type=int) + return jsonify({"items": desktop_notifier.get_history(limit=limit)}) + + +@wellbeing_bp.route("/api/settings/notifications/action/", methods=["GET"]) +def notification_action(action): + app_url = "http://127.0.0.1:5173" + if action == "open-limits": + target = f"{app_url}?section=limits" + body = f"

Opening Limits...

" + return body, 200, {"Content-Type": "text/html; charset=utf-8"} + + if action == "open-goals": + target = f"{app_url}?section=goals" + body = f"

Opening Goals...

" + return body, 200, {"Content-Type": "text/html; charset=utf-8"} + + if action == "snooze-limit": + minutes = request.args.get("minutes", 60, type=int) + desktop_notifier.snooze_limit_notifications(minutes=minutes) + return "

Limit notifications snoozed.

", 200, {"Content-Type": "text/html; charset=utf-8"} + + return "

Unknown action.

", 404, {"Content-Type": "text/html; charset=utf-8"} \ No newline at end of file diff --git a/src/config/settings_manager.py b/src/config/settings_manager.py index 77b9f27..ce24ee8 100644 --- a/src/config/settings_manager.py +++ b/src/config/settings_manager.py @@ -98,6 +98,14 @@ def initialize_defaults(): """) defaults = { + "notifications": "false", + "notifications_enable_goal_events": "true", + "notifications_enable_limit_events": "true", + "notifications_enable_test_events": "true", + "notifications_quiet_hours_enabled": "false", + "notifications_quiet_start": "22:00", + "notifications_quiet_end": "07:00", + "notifications_limit_snooze_until": "", "file_logging_enabled": "false", "file_logging_essential_only": "false", "show_yesterday_comparison": "true", diff --git a/src/core/desktop_notifications.py b/src/core/desktop_notifications.py new file mode 100644 index 0000000..b76a258 --- /dev/null +++ b/src/core/desktop_notifications.py @@ -0,0 +1,265 @@ +import logging +import os +import sys +import threading +import time +import html +from collections import deque +from datetime import datetime, timedelta +from pathlib import Path +from urllib.parse import quote + +from src.config.settings_manager import SettingsManager +from src.core.startup import APP_AUMID + + +class DesktopNotifier: + """Sends Windows toast notifications with lightweight dedupe/cooldown.""" + + APP_ID = APP_AUMID + EVENT_GENERAL = "general" + EVENT_TEST = "test" + EVENT_GOAL = "goal" + EVENT_LIMIT = "limit" + + def __init__(self): + self._lock = threading.Lock() + self._last_sent_by_key = {} + self._history = deque(maxlen=200) + + def is_enabled(self) -> bool: + return SettingsManager.get_bool("notifications", False) + + def notify( + self, + title: str, + message: str, + event_key: str | None = None, + cooldown_seconds: int = 300, + event_type: str = EVENT_GENERAL, + actions: list[tuple[str, str]] | None = None, + launch_url: str | None = None, + ) -> bool: + if not self._can_send(event_type): + return False + + now = time.time() + if event_key: + with self._lock: + last = self._last_sent_by_key.get(event_key) + if last and (now - last) < cooldown_seconds: + return False + + ok, method, reason = self._show_toast_with_details( + title=title, + message=message, + actions=actions, + launch_url=launch_url, + ) + if ok and event_key: + with self._lock: + self._last_sent_by_key[event_key] = now + if ok: + self._record_event( + title=title, + message=message, + method=method, + source="runtime", + event_type=event_type, + ) + else: + logging.getLogger(__name__).warning("Notification send failed (runtime): %s", reason) + return ok + + def notify_test(self, title: str = "Stasis notification test", message: str = "Desktop notifications are working.") -> bool: + ok, method, _ = self._show_toast_with_details(title=title, message=message) + if ok: + self._record_event(title=title, message=message, method=method, source="test", event_type=self.EVENT_TEST) + return ok + + def notify_test_with_details(self, title: str, message: str, source: str = "test", actions: list[tuple[str, str]] | None = None) -> dict: + if not self._can_send(self.EVENT_TEST): + return { + "ok": False, + "methods": [], + "method": "none", + "reason": "test notifications are disabled by settings", + } + + ok, method, reason = self._show_toast_with_details(title=title, message=message, actions=actions) + if ok: + self._record_event(title=title, message=message, method=method, source=source, event_type=self.EVENT_TEST) + return { + "ok": ok, + "methods": [method] if ok else [], + "method": method, + "reason": reason, + } + + def get_history(self, limit: int = 20) -> list[dict]: + lim = max(1, min(int(limit), 100)) + with self._lock: + return list(self._history)[-lim:][::-1] + + def _record_event(self, title: str, message: str, method: str, source: str, event_type: str): + event = { + "timestamp": datetime.now().isoformat(timespec="seconds"), + "title": title, + "message": message, + "method": method, + "source": source, + "event_type": event_type, + } + with self._lock: + self._history.append(event) + + def _can_send(self, event_type: str) -> bool: + if not self.is_enabled(): + return False + + if event_type == self.EVENT_TEST and not SettingsManager.get_bool("notifications_enable_test_events", True): + return False + if event_type == self.EVENT_GOAL and not SettingsManager.get_bool("notifications_enable_goal_events", True): + return False + if event_type == self.EVENT_LIMIT and not SettingsManager.get_bool("notifications_enable_limit_events", True): + return False + + if self._is_quiet_hours_now(): + return False + + if event_type == self.EVENT_LIMIT and self._is_limit_snoozed(): + return False + + return True + + @staticmethod + def _is_quiet_hours_now() -> bool: + if not SettingsManager.get_bool("notifications_quiet_hours_enabled", False): + return False + + start = (SettingsManager.get("notifications_quiet_start") or "22:00").strip() + end = (SettingsManager.get("notifications_quiet_end") or "07:00").strip() + try: + start_h, start_m = [int(x) for x in start.split(":", 1)] + end_h, end_m = [int(x) for x in end.split(":", 1)] + now = datetime.now().time() + start_t = datetime.now().replace(hour=start_h, minute=start_m, second=0, microsecond=0).time() + end_t = datetime.now().replace(hour=end_h, minute=end_m, second=0, microsecond=0).time() + if start_t <= end_t: + return start_t <= now < end_t + return now >= start_t or now < end_t + except Exception: + return False + + @staticmethod + def _is_limit_snoozed() -> bool: + until = SettingsManager.get("notifications_limit_snooze_until") + if not until: + return False + try: + return datetime.now() < datetime.fromisoformat(until) + except Exception: + return False + + @staticmethod + def snooze_limit_notifications(minutes: int = 60): + until = datetime.now() + timedelta(minutes=max(1, int(minutes))) + SettingsManager.set("notifications_limit_snooze_until", until.isoformat(timespec="seconds")) + + @staticmethod + def _show_toast(title: str, message: str) -> bool: + ok, _, _ = DesktopNotifier._show_toast_with_details(title=title, message=message) + return ok + + @staticmethod + def _show_toast_with_details( + title: str, + message: str, + actions: list[tuple[str, str]] | None = None, + launch_url: str | None = None, + ) -> tuple[bool, str, str | None]: + # Single backend by design: winotify (verified reliable in this app context). + return DesktopNotifier._show_toast_winotify(title=title, message=message, actions=actions, launch_url=launch_url) + + @staticmethod + def _show_toast_winotify( + title: str, + message: str, + actions: list[tuple[str, str]] | None = None, + launch_url: str | None = None, + ) -> tuple[bool, str, str | None]: + try: + from winotify import Notification + + icon_path = DesktopNotifier._resolve_icon_path() + icon_uri = Path(icon_path).as_uri() if icon_path else "" + + toast = Notification( + app_id=DesktopNotifier.APP_ID, + title=title, + msg=message, + icon=icon_uri, + launch=DesktopNotifier._xml_attr_escape(launch_url or ""), + ) + if actions: + for label, link in actions[:5]: + toast.add_actions( + label=DesktopNotifier._xml_attr_escape(label), + launch=DesktopNotifier._xml_attr_escape(link), + ) + toast.show() + return True, "winotify", None + except Exception as exc: + logging.getLogger(__name__).warning("winotify toast failed: %s", exc) + return False, "none", f"winotify: {exc}" + + @staticmethod + def _xml_attr_escape(value: str) -> str: + # winotify ultimately renders XML; unescaped '&' in deep-link query strings can break toast rendering. + return html.escape(value or "", quote=True) + + @staticmethod + def _resolve_icon_path() -> str | None: + candidates = [] + + # Dev workspace paths (current repository layout). + repo_root = Path(__file__).resolve().parents[2] + candidates.extend([ + repo_root / "frontend" / "src-tauri" / "icons" / "Square44x44Logo.png", + repo_root / "frontend" / "src-tauri" / "icons" / "Square71x71Logo.png", + repo_root / "frontend" / "src-tauri" / "icons" / "icon.png", + repo_root / "frontend" / "src-tauri" / "icons" / "128x128.png", + repo_root / "frontend" / "src-tauri" / "icons" / "app-icon.png", + repo_root / "frontend" / "src-tauri" / "icons" / "icon.ico", + ]) + + # Packaged/runtime fallback locations. + exe_dir = Path(sys.executable).resolve().parent + candidates.extend([ + exe_dir / "icons" / "icon.ico", + exe_dir / "icons" / "icon.png", + ]) + + meipass = getattr(sys, "_MEIPASS", None) + if meipass: + mdir = Path(meipass) + candidates.extend([ + mdir / "icons" / "icon.ico", + mdir / "icons" / "icon.png", + ]) + + for path in candidates: + if path and path.exists() and path.is_file(): + return os.fspath(path) + return None + + @staticmethod + def build_action_url(action: str, **params) -> str: + query = "&".join(f"{quote(str(k))}={quote(str(v))}" for k, v in params.items()) if params else "" + base = f"stasis://notification?action={quote(action)}" + if query: + return f"{base}&{query}" + return base + + +desktop_notifier = DesktopNotifier() diff --git a/src/core/startup.py b/src/core/startup.py index 7a80624..d4028b0 100644 --- a/src/core/startup.py +++ b/src/core/startup.py @@ -1,5 +1,5 @@ -# startup.py - +import os +from pathlib import Path import winreg from src.utils.logger import setup_logger @@ -7,6 +7,67 @@ RUN_KEY_PATH = r"Software\Microsoft\Windows\CurrentVersion\Run" APP_REG_NAME = "Stasis" +APP_AUMID = "Stasis: Digital Wellbeing" +START_MENU_SHORTCUT_NAME = "Stasis Digital Wellbeing.lnk" + + +def _resolve_icon_path() -> str | None: + repo_root = Path(__file__).resolve().parents[2] + candidates = [ + repo_root / "frontend" / "src-tauri" / "icons" / "icon.ico", + repo_root / "frontend" / "src-tauri" / "icons" / "Square44x44Logo.png", + repo_root / "frontend" / "src-tauri" / "icons" / "Square71x71Logo.png", + repo_root / "frontend" / "src-tauri" / "icons" / "icon.png", + ] + for path in candidates: + if path.exists() and path.is_file(): + return os.fspath(path) + return None + + +def _start_menu_shortcut_path() -> str: + appdata = os.environ.get("APPDATA", "") + programs = Path(appdata) / "Microsoft" / "Windows" / "Start Menu" / "Programs" + return os.fspath(programs / START_MENU_SHORTCUT_NAME) + + +def _set_shortcut_app_id(shortcut_path: str, app_id: str): + from pythoncom import VT_LPWSTR + from win32com.propsys import propsys, pscon + + store = propsys.SHGetPropertyStoreFromParsingName( + shortcut_path, + None, + 2, # GPS_READWRITE + propsys.IID_IPropertyStore, + ) + store.SetValue(pscon.PKEY_AppUserModel_ID, propsys.PROPVARIANTType(app_id, VT_LPWSTR)) + store.Commit() + + +def ensure_notification_identity(exe_path: str, launch_args: str = "", working_dir: str | None = None): + """One-time self-heal for notification attribution (Start Menu shortcut + AUMID).""" + try: + from win32com.client import Dispatch + + shortcut_path = _start_menu_shortcut_path() + os.makedirs(os.path.dirname(shortcut_path), exist_ok=True) + + shell = Dispatch("WScript.Shell") + shortcut = shell.CreateShortcut(shortcut_path) + shortcut.Targetpath = exe_path + shortcut.Arguments = launch_args or "" + shortcut.WorkingDirectory = working_dir or os.path.dirname(exe_path) + icon_path = _resolve_icon_path() + if icon_path: + shortcut.IconLocation = f"{icon_path},0" + shortcut.Description = "Stasis: Digital Wellbeing" + shortcut.Save() + + _set_shortcut_app_id(shortcut_path, APP_AUMID) + logger.info("Notification identity self-heal ensured") + except Exception as e: + logger.warning(f"Notification identity self-heal failed: {e}") def add_to_startup(exe_path: str): diff --git a/src/main.py b/src/main.py index 50c65d4..b983488 100644 --- a/src/main.py +++ b/src/main.py @@ -9,8 +9,8 @@ from src.core.app_controller import AppController from src.core.file_monitor import file_monitor_controller from src.core.single_instance import ensure_single_instance -from src.core.startup import add_to_startup -from src.database.database import init_db, get_all_limits +from src.core.startup import add_to_startup, ensure_notification_identity +from src.database.database import init_db from src.services.blocking_service import BlockingService from src.services.update_manager import UpdateManager from src.utils.logger import setup_logger @@ -94,18 +94,26 @@ def api_server_vessel(): from src.core.settings_cache import settings_cache settings_cache.warm() + # One-time self-heal for Windows notification attribution (shortcut + AUMID). + if os.name == "nt": + if getattr(sys, "frozen", False): + ensure_notification_identity(exe_path=get_executable_path()) + else: + repo_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + ensure_notification_identity( + exe_path=sys.executable, + launch_args="-m src.main", + working_dir=repo_root, + ) + if getattr(sys, "frozen", False): add_to_startup(get_executable_path()) time.sleep(1) # Reduced startup delay blocking_service = BlockingService() - limits = get_all_limits() - if limits: - blocking_service.start() - logger.info("Blocking Service started on startup (limits found)") - else: - logger.info("Blocking Service skipped on startup (no limits found)") + blocking_service.start() + logger.info("Blocking Service started on startup") # Start tracking threads t_api = threading.Thread(target=api_server_vessel, daemon=True, name="APIServerThread") diff --git a/src/services/blocking_service.py b/src/services/blocking_service.py index 079c954..fd98d70 100644 --- a/src/services/blocking_service.py +++ b/src/services/blocking_service.py @@ -4,6 +4,8 @@ from datetime import datetime from src.database.database import get_blocked_app_names +from src.core.desktop_notifications import desktop_notifier +from src.config.ignored_apps_manager import is_ignored LIMIT_CHECK_INTERVAL = 15 PROCESS_CHECK_INTERVAL = 2 @@ -30,6 +32,8 @@ def __init__(self): self.limit_thread = None self.guard_thread = None + self.last_goal_check_ts = 0.0 + self.goal_state = {} self.initialized = True @@ -178,6 +182,24 @@ def _limit_monitor(self): log_limit_event(app_name, "hit", old_value=daily_limit, new_value=usage) except Exception: pass + over_by = max(0, int(usage - daily_limit)) + over_mins = int(round(over_by / 60)) + desktop_notifier.notify( + title="App limit reached", + message=( + f"{app_name}: {int(usage // 60)} min used " + f"(limit {int(daily_limit // 60)} min" + f"{', +' + str(over_mins) + ' min' if over_mins > 0 else ''})." + ), + event_key=f"limit-hit:{today}:{app_name}", + cooldown_seconds=60, + event_type=desktop_notifier.EVENT_LIMIT, + actions=[ + ("Open Limits", desktop_notifier.build_action_url("open-limits")), + ("Mute 1h", desktop_notifier.build_action_url("snooze-limit", minutes=60)), + ], + launch_url=desktop_notifier.build_action_url("open-limits"), + ) else: cursor.execute( """ @@ -192,6 +214,13 @@ def _limit_monitor(self): # Single commit for the entire cycle conn.commit() + + # Evaluate goal thresholds at most once per minute (same DB connection). + now_ts = time.time() + if now_ts - self.last_goal_check_ts >= 60: + self._check_goal_notifications(cursor, today) + self.last_goal_check_ts = now_ts + with self._blocked_apps_lock: self.blocked_apps = new_blocked @@ -205,6 +234,143 @@ def _limit_monitor(self): print("LimitMonitor error:", e) time.sleep(LIMIT_CHECK_INTERVAL) + def _check_goal_notifications(self, cursor, date: str): + cursor.execute( + """ + SELECT id, goal_type, COALESCE(label, ''), target_value, target_unit, direction + FROM goals + WHERE is_active = 1 + """ + ) + goals = cursor.fetchall() + + if not goals: + return + + for goal_id, goal_type, label, target_value, target_unit, direction in goals: + actual = self._compute_goal_actual(cursor, date, goal_type) + threshold_reached = actual >= target_value + + state_key = (goal_id, date) + previous_state = self.goal_state.get(state_key) + self.goal_state[state_key] = threshold_reached + + # Notify on first check if already at/over threshold, or on later transitions. + should_notify = False + if previous_state is None and threshold_reached: + should_notify = True + elif previous_state is not None and previous_state != threshold_reached: + should_notify = True + if not should_notify: + continue + + goal_name = label or goal_type.replace("_", " ").title() + target_str = self._format_target(target_value, target_unit) + + if direction == "under" and threshold_reached: + desktop_notifier.notify( + title="Screen-time goal threshold reached" if goal_type == "daily_screen_time" else "Goal threshold reached", + message=f"{goal_name}: {self._format_target(actual, target_unit)} used (target {target_str}).", + event_key=f"goal-threshold:{goal_id}:{date}", + cooldown_seconds=600, + event_type=desktop_notifier.EVENT_GOAL, + actions=[ + ("Open Goals", desktop_notifier.build_action_url("open-goals")), + ], + launch_url=desktop_notifier.build_action_url("open-goals"), + ) + elif direction != "under" and threshold_reached: + desktop_notifier.notify( + title="Goal achieved", + message=f"{goal_name}: reached {self._format_target(actual, target_unit)} (target {target_str}).", + event_key=f"goal-met:{goal_id}:{date}", + cooldown_seconds=600, + event_type=desktop_notifier.EVENT_GOAL, + actions=[ + ("Open Goals", desktop_notifier.build_action_url("open-goals")), + ], + launch_url=desktop_notifier.build_action_url("open-goals"), + ) + + # Keep only today's state to avoid unbounded growth. + self.goal_state = {k: v for k, v in self.goal_state.items() if k[1] == date} + + @staticmethod + def _compute_goal_actual(cursor, date: str, goal_type: str) -> float: + if goal_type == "daily_screen_time": + cursor.execute( + """ + SELECT app_name, COALESCE(SUM(active_seconds), 0) + FROM daily_stats + WHERE date = ? + GROUP BY app_name + """, + (date,), + ) + return float(sum(active for app_name, active in cursor.fetchall() if not is_ignored(app_name))) + + if goal_type == "daily_productive_time": + cursor.execute( + """ + SELECT app_name, COALESCE(SUM(active_seconds), 0) + FROM daily_stats + WHERE date = ? AND main_category = 'productive' + GROUP BY app_name + """, + (date,), + ) + return float(sum(active for app_name, active in cursor.fetchall() if not is_ignored(app_name))) + + if goal_type == "daily_productivity_pct": + cursor.execute( + """ + SELECT app_name, main_category, COALESCE(SUM(active_seconds), 0) + FROM daily_stats + WHERE date = ? + GROUP BY app_name, main_category + """, + (date,), + ) + total = 0.0 + productive = 0.0 + for app_name, category, active in cursor.fetchall(): + if is_ignored(app_name): + continue + total += float(active or 0) + if category == "productive": + productive += float(active or 0) + if total <= 0: + return 0.0 + return round((productive / total) * 100, 1) + + if goal_type == "daily_focus_score": + try: + cursor.execute( + """ + SELECT focus_score + FROM focus_sessions + WHERE date = ? + ORDER BY id DESC + LIMIT 1 + """, + (date,), + ) + row = cursor.fetchone() + return float(row[0]) if row and row[0] is not None else 0.0 + except Exception: + return 0.0 + + return 0.0 + + @staticmethod + def _format_target(value: float, unit: str) -> str: + if unit == "seconds": + mins = int(round(value / 60)) + return f"{mins} min" + if unit == "percent": + return f"{round(value, 1)}%" + return str(round(value, 1)) + # ─── PROCESS GUARD ──────────────────────────────────────────────────────── def _process_guard(self): """ From f42f7774ca67291aca01f54d97cf6ed878417a90 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Mon, 16 Mar 2026 17:14:44 +0530 Subject: [PATCH 61/70] feat(notifications): add daily digest, context-aware quiet mode, and silent limit actions Improve notification utility and UX by shipping: - End-of-day digest notifications at user-selected time with screen-time vs goal, top distraction, productive ratio, and best streak. - Enhanced app-limit action set: Snooze 15m, Snooze 1h, Extend 10m, Keep blocked. - Context-aware quiet mode for non-critical events (fullscreen/presentation/game/focus context), while critical limit alerts still pass through. - New notification settings keys and API wiring for digest and context quiet controls. - Silent backend handling for backend-only deep-link actions in Tauri, preventing app window focus/open when choosing limit decision actions. - Frontend routing updates for new notification actions and review-day deep link. --- frontend/src-tauri/src/main.rs | 131 ++++++++++++++++++++---- frontend/src/WellbeingDashboard.jsx | 25 +++++ frontend/src/pages/SettingsPage.jsx | 26 +++++ src/api/settings_routes.py | 56 +++++++++- src/config/settings_manager.py | 4 + src/core/desktop_notifications.py | 89 +++++++++++++++- src/services/blocking_service.py | 152 +++++++++++++++++++++++++++- 7 files changed, 457 insertions(+), 26 deletions(-) diff --git a/frontend/src-tauri/src/main.rs b/frontend/src-tauri/src/main.rs index 0ebb361..5f9da94 100644 --- a/frontend/src-tauri/src/main.rs +++ b/frontend/src-tauri/src/main.rs @@ -4,6 +4,8 @@ #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] use std::process::Child; +use std::io::Write; +use std::net::TcpStream; use std::sync::Mutex; use std::sync::atomic::{AtomicBool, Ordering}; use tauri::{AppHandle, Manager, Emitter}; @@ -25,6 +27,74 @@ fn emit_deep_link(app: &AppHandle, url: &str) { let _ = app.emit("stasis-deep-link", url.to_string()); } +fn get_query_param(url: &str, key: &str) -> Option { + let q_start = url.find('?')?; + let query = &url[q_start + 1..]; + for part in query.split('&') { + let mut kv = part.splitn(2, '='); + let k = kv.next().unwrap_or(""); + let v = kv.next().unwrap_or(""); + if k.eq_ignore_ascii_case(key) { + return Some(v.to_string()); + } + } + None +} + +fn deep_link_action(url: &str) -> Option { + get_query_param(url, "action").map(|a| a.to_lowercase()) +} + +fn is_backend_only_action(url: &str) -> bool { + matches!( + deep_link_action(url).as_deref(), + Some("snooze-limit") | Some("extend-limit") | Some("keep-blocked") + ) +} + +fn backend_action_path(url: &str) -> Option { + let action = deep_link_action(url)?; + match action.as_str() { + "snooze-limit" => { + let minutes = get_query_param(url, "minutes").unwrap_or_else(|| "60".to_string()); + Some(format!("/api/settings/notifications/action/snooze-limit?minutes={}", minutes)) + } + "extend-limit" => { + let app = get_query_param(url, "app")?; + let minutes = get_query_param(url, "minutes").unwrap_or_else(|| "10".to_string()); + Some(format!( + "/api/settings/notifications/action/extend-limit?app={}&minutes={}", + app, minutes + )) + } + "keep-blocked" => { + let app = get_query_param(url, "app")?; + Some(format!("/api/settings/notifications/action/keep-blocked?app={}", app)) + } + _ => None, + } +} + +fn call_backend_get(path: &str) -> bool { + let addr = "127.0.0.1:7432"; + let mut stream = match TcpStream::connect(addr) { + Ok(s) => s, + Err(_) => return false, + }; + let req = format!( + "GET {} HTTP/1.1\r\nHost: 127.0.0.1\r\nConnection: close\r\n\r\n", + path + ); + stream.write_all(req.as_bytes()).is_ok() +} + +fn handle_backend_only_action(url: &str) -> bool { + if let Some(path) = backend_action_path(url) { + return call_backend_get(&path); + } + false +} + fn main() { // Check if hardware acceleration should be disabled if let Ok(local_app_data) = std::env::var("LOCALAPPDATA") { @@ -46,7 +116,11 @@ fn main() { // Handle deep-link when app is launched directly via protocol. let args: Vec = std::env::args().collect(); if let Some(url) = extract_deep_link(&args) { - emit_deep_link(app.handle(), &url); + if is_backend_only_action(&url) { + let _ = handle_backend_only_action(&url); + } else { + emit_deep_link(app.handle(), &url); + } } // -------- Tray Menu -------- @@ -124,25 +198,46 @@ fn main() { // The RunEvent handler below will prevent the app from exiting. .plugin(tauri_plugin_single_instance::init(|app, args, _cwd| { - if let Some(window) = app.get_webview_window("main") { - let _ = window.show(); - let _ = window.set_focus(); - } else { - let _ = tauri::WebviewWindowBuilder::new( - app, - "main", - tauri::WebviewUrl::App("index.html".into()), - ) - .title("Stasis") - .inner_size(1100.0, 700.0) - .resizable(true) - .fullscreen(false) - .decorations(true) - .build(); - } - if let Some(url) = extract_deep_link(&args) { + if is_backend_only_action(&url) { + let _ = handle_backend_only_action(&url); + return; + } + + if let Some(window) = app.get_webview_window("main") { + let _ = window.show(); + let _ = window.set_focus(); + } else { + let _ = tauri::WebviewWindowBuilder::new( + app, + "main", + tauri::WebviewUrl::App("index.html".into()), + ) + .title("Stasis") + .inner_size(1100.0, 700.0) + .resizable(true) + .fullscreen(false) + .decorations(true) + .build(); + } emit_deep_link(app, &url); + } else { + if let Some(window) = app.get_webview_window("main") { + let _ = window.show(); + let _ = window.set_focus(); + } else { + let _ = tauri::WebviewWindowBuilder::new( + app, + "main", + tauri::WebviewUrl::App("index.html".into()), + ) + .title("Stasis") + .inner_size(1100.0, 700.0) + .resizable(true) + .fullscreen(false) + .decorations(true) + .build(); + } } })) .plugin(tauri_plugin_opener::init()) diff --git a/frontend/src/WellbeingDashboard.jsx b/frontend/src/WellbeingDashboard.jsx index 1566b66..8eb5d8d 100644 --- a/frontend/src/WellbeingDashboard.jsx +++ b/frontend/src/WellbeingDashboard.jsx @@ -303,6 +303,10 @@ export default function WellbeingDashboard({ onDisconnect, initialData = null }) setActiveInsightTab("goals"); return; } + if (action === "open-review-day") { + setActiveTab("activity"); + return; + } if (action === "snooze-limit") { const minutes = parsed.searchParams.get("minutes") || "60"; try { @@ -310,6 +314,25 @@ export default function WellbeingDashboard({ onDisconnect, initialData = null }) } catch { } return; } + if (action === "extend-limit") { + const app = parsed.searchParams.get("app") || ""; + const minutes = parsed.searchParams.get("minutes") || "10"; + if (!app) return; + try { + await fetch( + `${BASE}/api/settings/notifications/action/extend-limit?app=${encodeURIComponent(app)}&minutes=${encodeURIComponent(minutes)}` + ); + } catch { } + return; + } + if (action === "keep-blocked") { + const app = parsed.searchParams.get("app") || ""; + if (!app) return; + try { + await fetch(`${BASE}/api/settings/notifications/action/keep-blocked?app=${encodeURIComponent(app)}`); + } catch { } + return; + } }, [BASE]); useEffect(() => { @@ -322,6 +345,8 @@ export default function WellbeingDashboard({ onDisconnect, initialData = null }) } else if (section === "goals") { setActiveTab("insights"); setActiveInsightTab("goals"); + } else if (section === "activity") { + setActiveTab("activity"); } } catch { } }, []); diff --git a/frontend/src/pages/SettingsPage.jsx b/frontend/src/pages/SettingsPage.jsx index 613652c..771ac22 100644 --- a/frontend/src/pages/SettingsPage.jsx +++ b/frontend/src/pages/SettingsPage.jsx @@ -1050,9 +1050,12 @@ function DeveloperSection({ push }) { notifications_enable_goal_events: true, notifications_enable_limit_events: true, notifications_enable_test_events: true, + notifications_enable_digest_events: true, notifications_quiet_hours_enabled: false, notifications_quiet_start: "22:00", notifications_quiet_end: "07:00", + notifications_context_quiet_mode_enabled: true, + notifications_daily_digest_time: "21:00", }); const [savingNotifCfg, setSavingNotifCfg] = useState(false); @@ -1136,11 +1139,21 @@ function DeveloperSection({ push }) { desc="Allow manual developer test notifications" control={ saveNotifCfg({ notifications_enable_test_events: v })} />} /> + saveNotifCfg({ notifications_enable_digest_events: v })} />} + /> saveNotifCfg({ notifications_quiet_hours_enabled: v })} />} /> + saveNotifCfg({ notifications_context_quiet_mode_enabled: v })} />} + /> )} /> + setNotifCfg(p => ({ ...p, notifications_daily_digest_time: e.target.value }))} + onBlur={() => saveNotifCfg({ notifications_daily_digest_time: notifCfg.notifications_daily_digest_time || "21:00" })} + style={{ width: 70, padding: "6px 8px", borderRadius: 8, border: `1px solid ${C.border}`, background: "rgba(255,255,255,0.05)", color: C.text, fontSize: 12 }} + /> + )} + /> {savingNotifCfg &&
Saving notification controls...
} diff --git a/src/api/settings_routes.py b/src/api/settings_routes.py index f3b2d54..d66814e 100644 --- a/src/api/settings_routes.py +++ b/src/api/settings_routes.py @@ -26,9 +26,13 @@ def get_settings(): "notifications_enable_goal_events": SettingsManager.get_bool("notifications_enable_goal_events", True), "notifications_enable_limit_events": SettingsManager.get_bool("notifications_enable_limit_events", True), "notifications_enable_test_events": SettingsManager.get_bool("notifications_enable_test_events", True), + "notifications_enable_digest_events": SettingsManager.get_bool("notifications_enable_digest_events", True), "notifications_quiet_hours_enabled": SettingsManager.get_bool("notifications_quiet_hours_enabled", False), "notifications_quiet_start": SettingsManager.get("notifications_quiet_start") or "22:00", "notifications_quiet_end": SettingsManager.get("notifications_quiet_end") or "07:00", + "notifications_context_quiet_mode_enabled": SettingsManager.get_bool("notifications_context_quiet_mode_enabled", True), + "notifications_daily_digest_time": SettingsManager.get("notifications_daily_digest_time") or "21:00", + "notifications_digest_last_sent_date": SettingsManager.get("notifications_digest_last_sent_date") or "", "notifications_limit_snooze_until": SettingsManager.get("notifications_limit_snooze_until") or "", "file_logging_enabled": SettingsManager.get_bool("file_logging_enabled", False), "file_logging_essential_only": SettingsManager.get_bool("file_logging_essential_only", False), @@ -60,6 +64,9 @@ def update_settings(): if "notifications_enable_test_events" in data: SettingsManager.set("notifications_enable_test_events", "true" if data["notifications_enable_test_events"] else "false") + if "notifications_enable_digest_events" in data: + SettingsManager.set("notifications_enable_digest_events", "true" if data["notifications_enable_digest_events"] else "false") + if "notifications_quiet_hours_enabled" in data: SettingsManager.set("notifications_quiet_hours_enabled", "true" if data["notifications_quiet_hours_enabled"] else "false") @@ -69,6 +76,15 @@ def update_settings(): if "notifications_quiet_end" in data: SettingsManager.set("notifications_quiet_end", str(data["notifications_quiet_end"]).strip()) + if "notifications_context_quiet_mode_enabled" in data: + SettingsManager.set("notifications_context_quiet_mode_enabled", "true" if data["notifications_context_quiet_mode_enabled"] else "false") + + if "notifications_daily_digest_time" in data: + SettingsManager.set("notifications_daily_digest_time", str(data["notifications_daily_digest_time"]).strip()) + + if "notifications_digest_last_sent_date" in data: + SettingsManager.set("notifications_digest_last_sent_date", str(data["notifications_digest_last_sent_date"]).strip()) + if "notifications_limit_snooze_until" in data: SettingsManager.set("notifications_limit_snooze_until", str(data["notifications_limit_snooze_until"]).strip()) @@ -151,11 +167,13 @@ def test_goal_threshold_notification(): def test_app_limit_notification(): return _send_test_notification( title="App limit reached", - message="Test alert: Firefox reached its daily app time limit.", + message="Test alert: notepad++ reached its daily app time limit.", source="test-limit", actions=[ - ("Open Limits", desktop_notifier.build_action_url("open-limits")), - ("Mute 1h", desktop_notifier.build_action_url("snooze-limit", minutes=60)), + ("Snooze 15m", desktop_notifier.build_action_url("snooze-limit", minutes=15)), + ("Snooze 1h", desktop_notifier.build_action_url("snooze-limit", minutes=60)), + ("Extend 10m", desktop_notifier.build_action_url("extend-limit", app="notepad++", minutes=10)), + ("Keep blocked", desktop_notifier.build_action_url("keep-blocked", app="notepad++")), ], ) @@ -179,9 +197,41 @@ def notification_action(action): body = f"

Opening Goals...

" return body, 200, {"Content-Type": "text/html; charset=utf-8"} + if action == "open-review-day": + target = f"{app_url}?section=activity" + body = f"

Opening daily review...

" + return body, 200, {"Content-Type": "text/html; charset=utf-8"} + if action == "snooze-limit": minutes = request.args.get("minutes", 60, type=int) desktop_notifier.snooze_limit_notifications(minutes=minutes) return "

Limit notifications snoozed.

", 200, {"Content-Type": "text/html; charset=utf-8"} + if action == "extend-limit": + app_name = (request.args.get("app", "") or "").strip() + minutes = request.args.get("minutes", 10, type=int) + if not app_name: + return "

Missing app.

", 400, {"Content-Type": "text/html; charset=utf-8"} + try: + from src.database.database import set_temporary_unblock + from src.services.blocking_service import BlockingService + set_temporary_unblock(app_name, max(1, minutes)) + BlockingService().force_unblock(app_name) + return f"

Extended {app_name} by {max(1, minutes)} minute(s).

", 200, {"Content-Type": "text/html; charset=utf-8"} + except Exception as exc: + return f"

Failed to extend limit: {exc}

", 500, {"Content-Type": "text/html; charset=utf-8"} + + if action == "keep-blocked": + app_name = (request.args.get("app", "") or "").strip() + if not app_name: + return "

Missing app.

", 400, {"Content-Type": "text/html; charset=utf-8"} + try: + from src.database.database import force_reblock_app + from src.services.blocking_service import BlockingService + force_reblock_app(app_name) + BlockingService().force_reblock(app_name) + return f"

{app_name} remains blocked.

", 200, {"Content-Type": "text/html; charset=utf-8"} + except Exception as exc: + return f"

Failed to keep blocked: {exc}

", 500, {"Content-Type": "text/html; charset=utf-8"} + return "

Unknown action.

", 404, {"Content-Type": "text/html; charset=utf-8"} \ No newline at end of file diff --git a/src/config/settings_manager.py b/src/config/settings_manager.py index ce24ee8..e73a7d8 100644 --- a/src/config/settings_manager.py +++ b/src/config/settings_manager.py @@ -102,9 +102,13 @@ def initialize_defaults(): "notifications_enable_goal_events": "true", "notifications_enable_limit_events": "true", "notifications_enable_test_events": "true", + "notifications_enable_digest_events": "true", "notifications_quiet_hours_enabled": "false", "notifications_quiet_start": "22:00", "notifications_quiet_end": "07:00", + "notifications_context_quiet_mode_enabled": "true", + "notifications_daily_digest_time": "21:00", + "notifications_digest_last_sent_date": "", "notifications_limit_snooze_until": "", "file_logging_enabled": "false", "file_logging_essential_only": "false", diff --git a/src/core/desktop_notifications.py b/src/core/desktop_notifications.py index b76a258..3442831 100644 --- a/src/core/desktop_notifications.py +++ b/src/core/desktop_notifications.py @@ -21,6 +21,7 @@ class DesktopNotifier: EVENT_TEST = "test" EVENT_GOAL = "goal" EVENT_LIMIT = "limit" + EVENT_DIGEST = "digest" def __init__(self): self._lock = threading.Lock() @@ -37,10 +38,11 @@ def notify( event_key: str | None = None, cooldown_seconds: int = 300, event_type: str = EVENT_GENERAL, + priority: str = "normal", actions: list[tuple[str, str]] | None = None, launch_url: str | None = None, ) -> bool: - if not self._can_send(event_type): + if not self._can_send(event_type, priority=priority): return False now = time.time() @@ -78,7 +80,7 @@ def notify_test(self, title: str = "Stasis notification test", message: str = "D return ok def notify_test_with_details(self, title: str, message: str, source: str = "test", actions: list[tuple[str, str]] | None = None) -> dict: - if not self._can_send(self.EVENT_TEST): + if not self._can_send(self.EVENT_TEST, priority="normal"): return { "ok": False, "methods": [], @@ -113,7 +115,7 @@ def _record_event(self, title: str, message: str, method: str, source: str, even with self._lock: self._history.append(event) - def _can_send(self, event_type: str) -> bool: + def _can_send(self, event_type: str, priority: str = "normal") -> bool: if not self.is_enabled(): return False @@ -123,6 +125,8 @@ def _can_send(self, event_type: str) -> bool: return False if event_type == self.EVENT_LIMIT and not SettingsManager.get_bool("notifications_enable_limit_events", True): return False + if event_type == self.EVENT_DIGEST and not SettingsManager.get_bool("notifications_enable_digest_events", True): + return False if self._is_quiet_hours_now(): return False @@ -130,8 +134,87 @@ def _can_send(self, event_type: str) -> bool: if event_type == self.EVENT_LIMIT and self._is_limit_snoozed(): return False + # Context-aware quiet mode suppresses only non-critical notifications. + if str(priority).strip().lower() != "critical" and self._is_context_quiet_now(): + return False + return True + @staticmethod + def _is_context_quiet_now() -> bool: + if not SettingsManager.get_bool("notifications_context_quiet_mode_enabled", True): + return False + + try: + from src.core.activity_logger import get_active_window_info + info = get_active_window_info() or {} + except Exception: + return False + + if not info: + return False + + title = str(info.get("title") or "").lower() + app_name = str(info.get("app_name") or "").lower() + is_fullscreen = bool(info.get("is_fullscreen", False)) + + if is_fullscreen: + return True + + presentation_markers = ( + "presenting", + "presentation", + "slide show", + "slideshow", + "powerpoint", + "meeting is being recorded", + ) + if any(m in title for m in presentation_markers): + return True + + game_markers = ( + "game", + "valorant", + "cs2", + "dota", + "fortnite", + "eldenring", + "gta", + ) + if any(m in app_name for m in game_markers): + return True + + # Best-effort focus-session detection from optional schema variants. + try: + from src.database.database import get_connection + + conn = get_connection() + cursor = conn.cursor() + cursor.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='focus_sessions'") + if cursor.fetchone(): + cursor.execute("PRAGMA table_info(focus_sessions)") + cols = {row[1] for row in cursor.fetchall()} + if "is_active" in cols: + cursor.execute("SELECT 1 FROM focus_sessions WHERE is_active = 1 LIMIT 1") + if cursor.fetchone(): + conn.close() + return True + elif "end_time" in cols: + cursor.execute("SELECT 1 FROM focus_sessions WHERE (end_time IS NULL OR end_time = '') LIMIT 1") + if cursor.fetchone(): + conn.close() + return True + elif "ended_at" in cols: + cursor.execute("SELECT 1 FROM focus_sessions WHERE (ended_at IS NULL OR ended_at = '') LIMIT 1") + if cursor.fetchone(): + conn.close() + return True + conn.close() + except Exception: + pass + + return False + @staticmethod def _is_quiet_hours_now() -> bool: if not SettingsManager.get_bool("notifications_quiet_hours_enabled", False): diff --git a/src/services/blocking_service.py b/src/services/blocking_service.py index fd98d70..22c8ab1 100644 --- a/src/services/blocking_service.py +++ b/src/services/blocking_service.py @@ -6,6 +6,8 @@ from src.database.database import get_blocked_app_names from src.core.desktop_notifications import desktop_notifier from src.config.ignored_apps_manager import is_ignored +from src.config.settings_manager import SettingsManager +from src.config.category_manager import get_category LIMIT_CHECK_INTERVAL = 15 PROCESS_CHECK_INTERVAL = 2 @@ -194,9 +196,12 @@ def _limit_monitor(self): event_key=f"limit-hit:{today}:{app_name}", cooldown_seconds=60, event_type=desktop_notifier.EVENT_LIMIT, + priority="critical", actions=[ - ("Open Limits", desktop_notifier.build_action_url("open-limits")), - ("Mute 1h", desktop_notifier.build_action_url("snooze-limit", minutes=60)), + ("Snooze 15m", desktop_notifier.build_action_url("snooze-limit", minutes=15)), + ("Snooze 1h", desktop_notifier.build_action_url("snooze-limit", minutes=60)), + ("Extend 10m", desktop_notifier.build_action_url("extend-limit", app=app_name, minutes=10)), + ("Keep blocked", desktop_notifier.build_action_url("keep-blocked", app=app_name)), ], launch_url=desktop_notifier.build_action_url("open-limits"), ) @@ -219,6 +224,7 @@ def _limit_monitor(self): now_ts = time.time() if now_ts - self.last_goal_check_ts >= 60: self._check_goal_notifications(cursor, today) + self._check_daily_digest(cursor, now, today) self.last_goal_check_ts = now_ts with self._blocked_apps_lock: @@ -371,6 +377,148 @@ def _format_target(value: float, unit: str) -> str: return f"{round(value, 1)}%" return str(round(value, 1)) + def _check_daily_digest(self, cursor, now: datetime, date: str): + if not SettingsManager.get_bool("notifications_enable_digest_events", True): + return + + digest_time = (SettingsManager.get("notifications_daily_digest_time") or "21:00").strip() + try: + digest_h, digest_m = [int(x) for x in digest_time.split(":", 1)] + except Exception: + digest_h, digest_m = 21, 0 + + if (now.hour, now.minute) < (digest_h, digest_m): + return + + if (SettingsManager.get("notifications_digest_last_sent_date") or "") == date: + return + + summary = self._build_daily_digest_summary(cursor, date) + if not summary: + return + + sent = desktop_notifier.notify( + title="End-of-day summary", + message=summary, + event_key=f"daily-digest:{date}", + cooldown_seconds=3600, + event_type=desktop_notifier.EVENT_DIGEST, + actions=[("Review day", desktop_notifier.build_action_url("open-review-day"))], + launch_url=desktop_notifier.build_action_url("open-review-day"), + ) + if sent: + SettingsManager.set("notifications_digest_last_sent_date", date) + + def _build_daily_digest_summary(self, cursor, date: str) -> str | None: + cursor.execute( + """ + SELECT app_name, main_category, COALESCE(SUM(active_seconds), 0) + FROM daily_stats + WHERE date = ? + GROUP BY app_name, main_category + """, + (date,), + ) + rows = cursor.fetchall() + if not rows: + return None + + total_active = 0.0 + productive = 0.0 + distract_by_app: dict[str, float] = {} + + for app_name, main_category, seconds in rows: + if is_ignored(app_name): + continue + secs = float(seconds or 0) + total_active += secs + if main_category == "productive": + productive += secs + if main_category == "unproductive": + distract_by_app[app_name] = distract_by_app.get(app_name, 0.0) + secs + + if total_active <= 0: + return None + + cursor.execute( + """ + SELECT target_value + FROM goals + WHERE is_active = 1 + AND goal_type = 'daily_screen_time' + ORDER BY updated_at DESC, id DESC + LIMIT 1 + """ + ) + goal_row = cursor.fetchone() + screen_part = f"Screen {self._fmt_secs(total_active)}" + if goal_row and goal_row[0] is not None: + goal_secs = float(goal_row[0]) + delta = total_active - goal_secs + if delta <= 0: + screen_part = f"Screen {self._fmt_secs(total_active)} vs goal {self._fmt_secs(goal_secs)}" + else: + screen_part = ( + f"Screen {self._fmt_secs(total_active)} vs goal {self._fmt_secs(goal_secs)} " + f"(+{self._fmt_secs(delta)})" + ) + + top_distracting = "None" + if distract_by_app: + top_app = max(distract_by_app.items(), key=lambda x: x[1]) + top_distracting = f"{top_app[0].replace('.exe', '')} ({self._fmt_secs(top_app[1])})" + + productive_ratio = round((productive / total_active) * 100, 1) + best_streak = self._compute_best_productive_streak(cursor, date) + + return ( + f"{screen_part}. " + f"Top distraction: {top_distracting}. " + f"Productive ratio: {productive_ratio}%. " + f"Best streak: {self._fmt_secs(best_streak)}." + ) + + @staticmethod + def _fmt_secs(seconds: float) -> str: + total = int(max(0, round(seconds))) + h = total // 3600 + m = (total % 3600) // 60 + if h > 0: + return f"{h}h {m}m" + return f"{m}m" + + @staticmethod + def _compute_best_productive_streak(cursor, date: str) -> float: + cursor.execute( + """ + SELECT app_name, COALESCE(active_seconds, 0) + FROM activity_logs + WHERE timestamp LIKE ? + ORDER BY timestamp ASC + """, + (f"{date}%",), + ) + rows = cursor.fetchall() + if not rows: + return 0.0 + + best = 0.0 + current = 0.0 + for app_name, active_seconds in rows: + if is_ignored(app_name): + continue + main_category, _ = get_category(app_name, None) + secs = float(active_seconds or 0) + if secs <= 0: + secs = 1.0 + if main_category == "productive": + current += secs + if current > best: + best = current + else: + current = 0.0 + return best + # ─── PROCESS GUARD ──────────────────────────────────────────────────────── def _process_guard(self): """ From 5790804223d467d33336d4e89894e03c08e5ba4b Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Mon, 16 Mar 2026 17:18:49 +0530 Subject: [PATCH 62/70] fix(settings): remove blank trailing scroll space across tabs Render only the active settings section so hidden tabs do not inflate container height. This removes empty scroll area in General, Telegram, and other settings tabs. --- frontend/src/pages/SettingsPage.jsx | 33 +++++++++++------------------ 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/frontend/src/pages/SettingsPage.jsx b/frontend/src/pages/SettingsPage.jsx index 771ac22..eeacd1c 100644 --- a/frontend/src/pages/SettingsPage.jsx +++ b/frontend/src/pages/SettingsPage.jsx @@ -1897,29 +1897,20 @@ export default function SettingsPage({ onClose, initialSection = "telegram" }) {
- {/* Single stable scroll container — no remount on tab switch */} + {/* Scroll only active section content to avoid hidden tabs inflating scroll height. */}
- {Object.keys(meta).map(id => ( -
-
-
{meta[id]?.label}
-
{meta[id]?.sub}
-
- {id === "general" && } - {id === "developer" && } - {id === "telegram" && } - {id === "security" && } - {id === "updates" && } - {id === "about" && } +
+
+
{meta[section]?.label}
+
{meta[section]?.sub}
- ))} + {section === "general" && } + {section === "developer" && } + {section === "telegram" && } + {section === "security" && } + {section === "updates" && } + {section === "about" && } +
From 9fd959fc0404ca5ec89e23116ea3a4e555bdb02c Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Mon, 16 Mar 2026 17:27:36 +0530 Subject: [PATCH 63/70] perf(settings): smooth tab transitions without remount jitter Keep settings sections mounted and animate panel transitions while tracking active panel height. This preserves smooth tab switching and avoids blank tail scroll. --- frontend/src/pages/SettingsPage.jsx | 76 ++++++++++++++++++++++++----- 1 file changed, 64 insertions(+), 12 deletions(-) diff --git a/frontend/src/pages/SettingsPage.jsx b/frontend/src/pages/SettingsPage.jsx index eeacd1c..b44e2b3 100644 --- a/frontend/src/pages/SettingsPage.jsx +++ b/frontend/src/pages/SettingsPage.jsx @@ -1821,6 +1821,9 @@ export default function SettingsPage({ onClose, initialSection = "telegram" }) { const [tgStatus, setTgStatus] = useState(null); const [tgConfig, setTgConfig] = useState(null); const [updateState, setUpdateState] = useState(null); + const [mountedSections, setMountedSections] = useState({ [initialSection]: true }); + const [activePanelHeight, setActivePanelHeight] = useState(0); + const panelRefs = useRef({}); const { toasts, push } = useToast(); useEffect(() => { const t = setTimeout(() => setMounted(true), 40); return () => clearTimeout(t); }, []); @@ -1844,6 +1847,33 @@ export default function SettingsPage({ onClose, initialSection = "telegram" }) { useEffect(() => { const h = e => { if (e.key === "Escape") onClose(); }; window.addEventListener("keydown", h); return () => window.removeEventListener("keydown", h); }, [onClose]); + useEffect(() => { + setMountedSections(prev => (prev[section] ? prev : { ...prev, [section]: true })); + }, [section]); + + useEffect(() => { + const el = panelRefs.current[section]; + if (!el) return; + + const updateHeight = () => { + const h = Math.ceil(el.scrollHeight || 0); + if (h > 0) setActivePanelHeight(h); + }; + + updateHeight(); + let ro; + if (typeof ResizeObserver !== "undefined") { + ro = new ResizeObserver(updateHeight); + ro.observe(el); + } + window.addEventListener("resize", updateHeight); + + return () => { + if (ro) ro.disconnect(); + window.removeEventListener("resize", updateHeight); + }; + }, [section, mountedSections]); + const meta = { general: { label: "General", sub: "App behaviour and tracking" }, telegram: { label: "Telegram Integration", sub: "Remote control via Telegram bot" }, @@ -1897,19 +1927,41 @@ export default function SettingsPage({ onClose, initialSection = "telegram" }) {
- {/* Scroll only active section content to avoid hidden tabs inflating scroll height. */} + {/* Keep mounted panels for smooth switching; height tracks active panel to avoid blank tail scroll. */}
-
-
-
{meta[section]?.label}
-
{meta[section]?.sub}
-
- {section === "general" && } - {section === "developer" && } - {section === "telegram" && } - {section === "security" && } - {section === "updates" && } - {section === "about" && } +
+ {Object.keys(meta).map(id => { + if (!mountedSections[id]) return null; + const isActive = id === section; + return ( +
{ panelRefs.current[id] = el; }} + style={{ + position: "absolute", + top: 0, + left: 0, + right: 0, + opacity: isActive ? 1 : 0, + transform: isActive ? "translateY(0)" : "translateY(6px)", + pointerEvents: isActive ? "auto" : "none", + visibility: isActive ? "visible" : "hidden", + transition: "opacity 0.18s ease, transform 0.18s ease", + }} + > +
+
{meta[id]?.label}
+
{meta[id]?.sub}
+
+ {id === "general" && } + {id === "developer" && } + {id === "telegram" && } + {id === "security" && } + {id === "updates" && } + {id === "about" && } +
+ ); + })}
From 1aaa7eeb35d32a149b784cb61aaf0a305c9aec51 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Mon, 16 Mar 2026 17:48:36 +0530 Subject: [PATCH 64/70] docs: refresh README and docs for latest weekly reporting and privacy policy --- README.md | 51 ++++++++++- docs/api-reference.md | 197 ++++++++++++++++++++++++++++++++++++++++ docs/architecture.md | 21 +++-- docs/configuration.md | 15 +++ docs/database.md | 77 +++++++++++++++- docs/developer-guide.md | 8 +- docs/index.md | 5 + docs/privacy-policy.md | 141 ++++++++++++++++++++++++++++ mkdocs.yml | 1 + 9 files changed, 500 insertions(+), 16 deletions(-) create mode 100644 docs/privacy-policy.md diff --git a/README.md b/README.md index 8411659..45fc1bd 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,8 @@ 12. [App Limits & Blocking](#-app-limits--blocking) 13. [Focus Scoring](#-focus-scoring) 14. [Data Retention & Privacy](#-data-retention--privacy) -15. [Ethical & Legal Notice](#-ethical--legal-notice) +15. [Privacy Policy](#-privacy-policy) +16. [Ethical & Legal Notice](#-ethical--legal-notice) --- @@ -40,8 +41,10 @@ - **Real-time screen-time tracking** — knows which app has focus, for how long, and how actively you were using it (keystrokes + mouse clicks). - **Productivity & focus scoring** — a configurable weighted formula rates your day from 0–100, considering deep-work streaks, engagement, and switch penalties. +- **Weekly report studio** — compare weeks, inspect hourly productivity heatmaps, track goals impact, and export/share weekly summaries. - **App limit enforcement** — set daily time budgets per application; Stasis automatically terminates processes once limits are exceeded, with optional temporary unblocks. - **Telegram remote control** — receive boot notifications, take screenshots, lock/shut down your PC, and pull activity logs from anywhere in the world via a private Telegram Bot. +- **Goals + notifications** — define daily targets, track streaks, and receive actionable Windows notifications with snooze/extend actions for limits. - **Optional file system monitoring** — track file creations, modifications, and deletions across all drives. - **Automatic self-updates** — checks GitHub Releases for new versions and installs them silently. @@ -83,11 +86,14 @@ All data is stored locally in a SQLite database at `%LOCALAPPDATA%\Stasis\data\s | Feature | Details | |---|---| | **Daily Dashboard** | Per-app screen time, category breakdown, hourly bar chart, and top-app badge. | +| **Weekly Reports** | Mon-Sun reports with trend cards, app/category insights, goals progress, and week-over-week deltas. | +| **Hourly Activity Heatmap** | 7x24 weekly heatmap showing intensity and productivity mix per hour. | | **60-Day Heatmap** | Calendar view colour-coded by relative usage intensity and productivity percentage. | | **Session Timeline** | Chronological list of every focus window with timestamps, durations, and categories. | | **Focus Score (0–100)** | Weighted formula: deep-work seconds + flow bonus (≥20-min streaks) + engagement score − switch penalty − idle penalty. | | **Productivity %** | Percentage of active time spent in `productive`-category apps, weighted by keystroke intensity. | | **14-Day Weekly Trend** | Line chart of daily screen time and productivity over the past two weeks. | +| **Goals Correlation** | Weekly insight layer showing productivity on goal-met vs non-met days with drift alerts. | | **Website Statistics** | Top domains visited, ranked by time spent, filterable by browser. | | **Sparklines** | Lightweight 7–30-day mini charts for screen time, focus, keystrokes, and clicks. | @@ -131,7 +137,7 @@ Stasis uses a **dual-process architecture**: a Python telemetry engine (compiled │ ┌──────────────────────────────────────────────────────────┐ │ │ │ React 19 Frontend (Vite) │ │ │ │ WellbeingDashboard → Overview / Activity / Apps / │ │ -│ │ Limits / Settings tabs │ │ +│ │ Insights (Goals, Limits, Reports) │ │ │ └─────────────────────┬────────────────────────────────────┘ │ │ │ HTTP localhost:7432 │ └─────────────────────────┼───────────────────────────────────────┘ @@ -371,13 +377,40 @@ The Python backend exposes a local REST API on **`http://127.0.0.1:7432`**. All | Method | Endpoint | Body | Description | |---|---|---|---| -| GET | `/api/settings` | — | Returns `file_logging_enabled`, `essential_only`, `show_yesterday_comparison`, `hardware_acceleration` | +| GET | `/api/settings` | — | Returns tracking, UI, notifications, and weekly-report preference state | | POST | `/api/settings/update` | `{key: value, ...}` | Update one or more settings; notifies FileMonitor of changes instantly | +| POST | `/api/settings/notifications/test` | — | Send a general Windows notification test | +| POST | `/api/settings/notifications/test-goal` | — | Send a goal-threshold notification test | +| POST | `/api/settings/notifications/test-limit` | — | Send an app-limit notification test with actions | +| GET | `/api/settings/notifications/history` | `?limit=20` | Recent in-app notification history | +| GET | `/api/settings/notifications/action/` | query-based | Trigger action handlers (`open-goals`, `snooze-limit`, `extend-limit`, etc.) | | POST | `/api/settings/data-retention` | `{"days": N}` | Set auto-delete threshold (0 = forever) | | POST | `/api/settings/data-retention/cleanup` | — | Trigger immediate cleanup of expired records | | POST | `/api/settings/browser-tracking` | `{"enabled": bool}` | Toggle URL tracking inside browsers | | POST | `/api/settings/idle-detection` | `{"enabled": bool}` | Toggle idle-time subtraction | +### Goals + +| Method | Endpoint | Query/Body | Description | +|---|---|---|---| +| GET | `/api/goals` | — | List configured goals | +| POST | `/api/goals` | goal payload | Create a new goal | +| PUT | `/api/goals/` | partial goal payload | Update target, label, or active state | +| DELETE | `/api/goals/` | — | Delete a goal | +| GET | `/api/goals/progress` | `?date=YYYY-MM-DD` | Daily goal performance snapshot | +| GET | `/api/goals/history` | `?days=30` | Goal trend/history rollup | + +### Weekly Reports + +| Method | Endpoint | Query/Body | Description | +|---|---|---|---| +| GET | `/api/weekly-report` | `?week_of=YYYY-MM-DD&verbosity=compact|standard|detailed` | Full weekly report payload | +| GET | `/api/weekly-report/compare` | `?week_a=YYYY-MM-DD&week_b=YYYY-MM-DD` | Two-week compact comparison with deltas | +| GET | `/api/weekly-report/available-weeks` | — | Available Monday-start week options | +| POST | `/api/weekly-report/send-telegram` | `{"week_of":"YYYY-MM-DD"}` | Send rendered weekly report to Telegram | +| GET | `/api/hourly-activity` | `?week_of=YYYY-MM-DD` | Weekly hourly activity grid used by heatmap | +| GET | `/api/limit-events` | `?start=YYYY-MM-DD&end=YYYY-MM-DD` | Limit-hit/edit event history | + ### App Limits & Blocking | Method | Endpoint | Body | Description | @@ -386,6 +419,7 @@ The Python backend exposes a local REST API on **`http://127.0.0.1:7432`**. All | POST | `/limits/set` | `{"app_name": "...", "daily_limit_seconds": N}` | Create or update a daily limit | | POST | `/limits/toggle` | `{"app_name": "..."}` | Toggle enable/disable for a limit | | POST | `/limits/unblock` | `{"app_name": "...", "minutes": N}` | Temporarily unblock app for N minutes | +| POST | `/limits/reblock` | `{"app_name": "..."}` | Immediately force an app back into blocked state | | POST | `/limits/delete` | `{"app_name": "..."}` | Remove a limit entirely | | GET | `/limits/blocked` | — | Currently blocked apps with `{app_name, blocked_at}` | @@ -647,7 +681,8 @@ All raw values are returned alongside the score so the UI can display a detailed ## 🔒 Data Retention & Privacy -- **All data is local.** The SQLite database lives at `%LOCALAPPDATA%\Stasis\data\stasis.db`. No analytics, crash reports, or telemetry are sent anywhere. +- **Local-first by default.** The SQLite database lives at `%LOCALAPPDATA%\Stasis\data\stasis.db`. +- **Data leaves your device only when you use network features** such as Telegram remote commands/messages and update checks/downloads. - **Telegram credentials are encrypted** with Fernet symmetric encryption (AES-128-CBC for confidentiality, HMAC-SHA256 for authentication). The key is stored at `%LOCALAPPDATA%\Stasis\secret.key`. - **API server is local-only.** Flask binds to `127.0.0.1:7432` — no external access. - **Auto-delete.** Configure a retention period in Settings → Data Retention. The background worker purges records older than the threshold every 6 hours. @@ -655,6 +690,14 @@ All raw values are returned alongside the score so the UI can display a detailed --- +## 📜 Privacy Policy + +- Full policy (repo): `docs/privacy-policy.md` +- Published docs page: https://arshsisodiya.github.io/Stasis/privacy-policy/ +- In-app: Settings → About & Privacy → Privacy + +--- + ## 📦 Download Download the latest installer from the Releases page: diff --git a/docs/api-reference.md b/docs/api-reference.md index a946c6b..14d12f2 100644 --- a/docs/api-reference.md +++ b/docs/api-reference.md @@ -5,6 +5,7 @@ The Python backend exposes a local REST API on **`http://127.0.0.1:7432`**. - All responses are **JSON**. - The optional `?date=YYYY-MM-DD` query parameter selects a historical day; omitting it defaults to **today**. - No authentication is required — the server only accepts connections from `127.0.0.1`. +- The API includes daily analytics, goals, weekly reporting, notifications, limits, Telegram control, and updater endpoints. --- @@ -54,6 +55,14 @@ Daily summary combining per-app screen time, hourly chart, category totals, and --- +### `GET /api/dashboard-bundle` + +Single-request convenience payload used by the frontend for faster first paint. Includes dashboard, wellbeing, focus, hourly, and related slices for the selected date. + +**Query params:** `?date=YYYY-MM-DD` + +--- + ### `GET /api/wellbeing` Productivity percentage and aggregate daily metrics. @@ -262,6 +271,12 @@ Lightweight last-N-days aggregate used for sparkline mini charts. ## System & Apps +### `GET /api/init-bundle` + +Startup helper endpoint returning initial bootstrap data used by the shell. + +--- + ### `GET /api/ignored-apps` List of process names that are excluded from all activity reports. @@ -373,6 +388,47 @@ Enable or disable idle-time subtraction from screen time totals. --- +### `POST /api/settings/notifications/test` + +Sends a generic Windows notification test event. + +--- + +### `POST /api/settings/notifications/test-goal` + +Sends a sample goal-threshold notification. + +--- + +### `POST /api/settings/notifications/test-limit` + +Sends a sample limit notification with actions (snooze/extend/keep blocked). + +--- + +### `GET /api/settings/notifications/history` + +Returns recent in-app notification history. + +**Query params:** `?limit=20` + +--- + +### `GET /api/settings/notifications/action/` + +Action handler endpoint used by Windows notification buttons. + +Supported actions include: + +- `open-limits` +- `open-goals` +- `open-review-day` +- `snooze-limit` +- `extend-limit` +- `keep-blocked` + +--- + ## App Limits & Blocking ### `GET /limits/all` @@ -428,6 +484,17 @@ Sets `unblock_until = now + 30 minutes`. The blocking service respects this unti --- +### `POST /limits/reblock` + +Immediately removes temporary unblock and forces the app back into blocked state. + +**Body** +```json +{ "app_name": "chrome.exe" } +``` + +--- + ### `POST /limits/delete` Remove a limit entirely. @@ -452,6 +519,112 @@ List of currently blocked apps (those over their limit and not temporarily unblo --- +## Goals + +### `GET /api/goals` + +List all configured goals. + +--- + +### `POST /api/goals` + +Create a goal. + +**Body** +```json +{ + "goal_type": "screen_time", + "target_value": 14400, + "target_unit": "seconds", + "direction": "under", + "label": "Daily screen time" +} +``` + +--- + +### `PUT /api/goals/` + +Update goal target/label/active state. + +--- + +### `DELETE /api/goals/` + +Delete a goal and its associated logs. + +--- + +### `GET /api/goals/progress` + +Returns daily progress against all active goals. + +**Query params:** `?date=YYYY-MM-DD` + +--- + +### `GET /api/goals/history` + +Goal trend/history API for recent days. + +**Query params:** `?days=30` + +--- + +## Weekly Reports + +### `GET /api/weekly-report` + +Main weekly report endpoint used by the Reports tab. + +**Query params:** `?week_of=YYYY-MM-DD&verbosity=compact|standard|detailed` + +Returns period summary, daily breakdown, category and app insights, limits, goals, and week trend slices. + +--- + +### `GET /api/weekly-report/compare` + +Compare two weeks and return deltas. + +**Query params:** `?week_a=YYYY-MM-DD&week_b=YYYY-MM-DD` + +--- + +### `GET /api/weekly-report/available-weeks` + +Returns selectable Monday-start week options. + +--- + +### `POST /api/weekly-report/send-telegram` + +Send rendered weekly report to configured Telegram chat. + +**Body** +```json +{ "week_of": "2026-03-09" } +``` + +--- + +### `GET /api/hourly-activity` + +Weekly 7x24 activity grid with productivity percentage per hour bucket. + +**Query params:** `?week_of=YYYY-MM-DD` + +--- + +### `GET /api/limit-events` + +Range query for limit edits/hits used in weekly reporting. + +**Query params:** `?start=YYYY-MM-DD&end=YYYY-MM-DD` + +--- + ## Telegram ### `GET /api/telegram/status` @@ -490,6 +663,30 @@ Combined response of `/api/telegram/status` and `/api/telegram/config`. --- +### `POST /api/telegram/update-permissions` + +Update allowed Telegram command permissions. + +--- + +### `GET /api/dependencies/check` + +Check optional dependency availability for media-related Telegram features. + +--- + +### `GET /api/dependencies/progress` + +Track dependency installation progress. + +--- + +### `POST /api/dependencies/install` + +Trigger dependency installation workflow. + +--- + ### `POST /api/telegram/validate` Validate a bot token against the Telegram API without storing it. diff --git a/docs/architecture.md b/docs/architecture.md index 995ff8f..f87ac21 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -12,7 +12,7 @@ Stasis uses a **dual-process architecture**: a compiled Python telemetry engine │ ┌──────────────────────────────────────────────────────────┐ │ │ │ React 19 Frontend (Vite) │ │ │ │ WellbeingDashboard → Overview / Activity / Apps / │ │ -│ │ Limits / Settings tabs │ │ +│ │ Insights (Goals, Limits, Reports) │ │ │ └─────────────────────┬────────────────────────────────────┘ │ │ │ HTTP localhost:7432 │ └─────────────────────────┼───────────────────────────────────────┘ @@ -62,8 +62,9 @@ The backend is a single compiled `.exe` (PyInstaller) that spawns several daemon | Thread name | Class / function | Restart policy | |---|---|---| | `ActivityLoggerThread` | `start_logging()` in `src/core/activity_logger.py` (external) | Daemon — restarted by watchdog if crashed | -| `APIServerThread` | `APIServer.start()` — Flask/Werkzeug | Daemon | +| `APIServerThread` | `APIServer.start()` — Flask/Werkzeug (threaded) | Daemon | | `DataRetentionThread` | `retention_worker()` | Daemon, sleeps 6 h between runs | +| `WeeklyReportSchedulerThread` | Weekly Telegram report scheduler | Daemon | | `FileMonitorController` | `watchdog.Observer` | Managed separately, starts/stops on settings change | | `BlockingService._limit_monitor` | Checks limits every 15 s | Non-daemon (runs until `.stop()`) | | `BlockingService._process_guard` | Terminates blocked processes every 0.5 s | Non-daemon | @@ -75,12 +76,14 @@ Flask is used with CORS enabled. All routes are registered as **Blueprints** via ``` wellbeing_bp ← activity_routes, dashboard_routes, focus_routes, - limits_routes, settings_routes, telegram_routes, - system_routes, stats_routes, health_routes, - danger_routes, spark_routes, update_routes + limits_routes, goals_routes, report_routes, + settings_routes, system_routes, stats_routes, + health_routes, danger_routes, spark_routes +telegram_bp ← telegram_routes +update_bp ← update_routes ``` -The server binds to `127.0.0.1:7432` using Werkzeug's `make_server` (single-threaded, synchronous). All responses are JSON. +The server binds to `127.0.0.1:7432` using Werkzeug's `make_server(..., threaded=True)`. All responses are JSON. ### Data pipeline @@ -156,8 +159,10 @@ ActivityLogger ─── window focus hook (Win32 GetForegroundWindow) | Overview | `OverviewPage.jsx` | `/api/wellbeing`, `/api/focus`, `/api/daily-stats`, `/api/spark-series` | | Activity | `ActivityPage.jsx` | `/api/sessions`, `/api/hourly-stats`, `/api/site-stats` | | Apps | `AppsPage.jsx` | `/api/daily-stats`, `/api/app-icon/` | -| Limits | `LimitsPage.jsx` | `/limits/all`, `/limits/blocked`, `/api/system/apps` | -| Settings | `SettingsPage.jsx` | `/api/settings`, `/api/telegram/*`, `/api/update/*` | +| Insights → Goals | `GoalsPage.jsx` | `/api/goals`, `/api/goals/progress`, `/api/goals/history` | +| Insights → Limits | `LimitsPage.jsx` | `/limits/all`, `/limits/blocked`, `/api/system/apps`, `/api/limit-events` | +| Insights → Reports | `WeeklyReportPage.jsx` | `/api/weekly-report/*`, `/api/hourly-activity` | +| Settings | `SettingsPage.jsx` | `/api/settings`, `/api/settings/notifications/*`, `/api/telegram/*`, `/api/update/*` | ### Build output diff --git a/docs/configuration.md b/docs/configuration.md index 0d07532..c22d0e0 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -8,15 +8,30 @@ Stasis stores all runtime configuration in the **`settings` table** of the SQLit | Key | Type | Default | UI location | Description | |---|---|---|---|---| +| `notifications` | bool | `false` | Settings → General | Master toggle for desktop notifications. | +| `notifications_enable_goal_events` | bool | `true` | Settings → General | Enable goal-threshold notifications. | +| `notifications_enable_limit_events` | bool | `true` | Settings → General | Enable app-limit notifications. | +| `notifications_enable_test_events` | bool | `true` | Settings → General | Allow test notification actions from settings. | +| `notifications_enable_digest_events` | bool | `true` | Settings → General | Enable daily digest notifications. | +| `notifications_quiet_hours_enabled` | bool | `false` | Settings → General | Silence notifications during configured quiet hours. | +| `notifications_quiet_start` | str | `22:00` | Settings → General | Quiet-hours start time. | +| `notifications_quiet_end` | str | `07:00` | Settings → General | Quiet-hours end time. | +| `notifications_context_quiet_mode_enabled` | bool | `true` | Settings → General | Contextual suppression of noisy events. | +| `notifications_daily_digest_time` | str | `21:00` | Settings → General | Preferred digest delivery time. | +| `notifications_limit_snooze_until` | str | empty | Runtime | Snooze marker for limit notifications. | | `telegram_enabled` | bool | `false` | Settings → Telegram | Whether the Telegram bot service starts on boot. | | `telegram_token` | str (encrypted) | — | Settings → Telegram | Fernet-encrypted Telegram Bot token. | | `telegram_chat_id` | str (encrypted) | — | Settings → Telegram | Fernet-encrypted Telegram Chat ID. | | `file_logging_enabled` | bool | `false` | Settings → File Logging | Enable the watchdog file system monitor. | | `file_logging_essential_only` | bool | `false` | Settings → File Logging | Restrict file events to Documents, Desktop, and Downloads. | | `show_yesterday_comparison` | bool | `true` | Settings → Appearance | Show a yesterday-delta column in the Apps tab. | +| `show_goals_in_overview` | bool | `true` | Settings → Appearance | Show goals status widgets on the overview screen. | | `hardware_acceleration` | bool | `true` | Settings → Appearance | Enable WebView2 GPU acceleration. Disable if you see rendering glitches. | | `browser_tracking` | bool | `true` | Settings → Tracking | Capture the active URL from Chrome/Firefox/Edge/Opera/Brave. | | `idle_detection` | bool | `true` | Settings → Tracking | Subtract idle time (no input for ≥ 2 min) from screen time totals. | +| `weekly_report_telegram` | bool | `false` | Settings → Reports | Auto-send weekly report via Telegram (Sunday scheduler). | +| `weekly_report_verbosity` | str | `standard` | Settings → Reports | Weekly report detail level: `compact`, `standard`, `detailed`. | +| `weekly_report_last_sent_week` | str | empty | Runtime | Internal marker to prevent duplicate weekly sends. | | `data_retention_days` | int | `0` | Settings → Data | Auto-delete activity records older than N days. `0` = keep forever. | --- diff --git a/docs/database.md b/docs/database.md index 86f2c51..49232dd 100644 --- a/docs/database.md +++ b/docs/database.md @@ -131,7 +131,8 @@ CREATE INDEX idx_blocked_app ON blocked_apps(app_name); **Notes:** - Rows are inserted by `BlockingService._limit_monitor()` every 15 s when usage > limit. - Rows are removed by `/limits/unblock` (temporary override) or `/limits/toggle` (disable the limit). -- `BlockingService._process_guard()` reads this table every 0.5 s to find and terminate running blocked processes. +- Current blocked-state source of truth is `app_limits.is_blocked` (`blocked_apps` is maintained as a compatibility/runtime cache). +- `BlockingService._process_guard()` enforces from in-memory blocked snapshots synchronized from `app_limits` state. --- @@ -150,6 +151,21 @@ See [Configuration → Settings reference](configuration.md#settings-reference) --- +### `telegram_settings` + +Separate key-value store dedicated to Telegram configuration. + +```sql +CREATE TABLE IF NOT EXISTS telegram_settings ( + key TEXT PRIMARY KEY, + value TEXT +); +``` + +This table stores Telegram runtime values such as encrypted token/chat ID, enable flag, and recent command metadata. + +--- + ### `file_logs` Optional file system event log. Populated only when `file_logging_enabled = true`. @@ -169,6 +185,61 @@ CREATE TABLE IF NOT EXISTS file_logs ( --- +### `goals` + +Goal definitions used by the Goals and Weekly Reports experiences. + +```sql +CREATE TABLE IF NOT EXISTS goals ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + goal_type TEXT NOT NULL, + label TEXT, + target_value REAL NOT NULL, + target_unit TEXT NOT NULL DEFAULT 'seconds', + direction TEXT NOT NULL DEFAULT 'under', + is_active INTEGER DEFAULT 1, + created_at TEXT, + updated_at TEXT +); +``` + +--- + +### `goal_logs` + +Per-day materialized goal performance snapshots. + +```sql +CREATE TABLE IF NOT EXISTS goal_logs ( + goal_id INTEGER NOT NULL, + date TEXT NOT NULL, + actual_value REAL, + target_value REAL, + met INTEGER DEFAULT 0, + PRIMARY KEY (goal_id, date) +); +``` + +--- + +### `limit_events` + +Audit-style event stream for app-limit hits and edits. + +```sql +CREATE TABLE IF NOT EXISTS limit_events ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + app_name TEXT NOT NULL, + event_type TEXT NOT NULL, + old_value INTEGER, + new_value INTEGER, + timestamp TEXT NOT NULL, + date TEXT NOT NULL +); +``` + +--- + ## Full index summary | Index name | Table | Columns | Purpose | @@ -178,7 +249,11 @@ CREATE TABLE IF NOT EXISTS file_logs ( | `idx_activity_app_date` | `activity_logs` | `app_name, timestamp` | Composite for limit usage checks | | `idx_daily_date` | `daily_stats` | `date` | Dashboard / heatmap date lookups | | `idx_limit_app` | `app_limits` | `app_name` | O(1) limit lookup by app name | +| `idx_limit_blocked` | `app_limits` | `is_blocked` | Fast blocked-limit scans | | `idx_blocked_app` | `blocked_apps` | `app_name` | O(1) blocked-status check | +| `idx_goal_logs_date` | `goal_logs` | `date` | Goal progress history filtering | +| `idx_limit_events_date` | `limit_events` | `date` | Weekly limit-event reporting | +| `idx_limit_events_app` | `limit_events` | `app_name` | Per-app limit event analysis | --- diff --git a/docs/developer-guide.md b/docs/developer-guide.md index c322e3c..e44582b 100644 --- a/docs/developer-guide.md +++ b/docs/developer-guide.md @@ -143,8 +143,10 @@ App.jsx ├── OverviewPage.jsx ← Summary cards + trend chart ├── ActivityPage.jsx ← Session timeline + site stats ├── AppsPage.jsx ← Per-app breakdown with icons - ├── LimitsPage.jsx ← Limit management + blocking UI - └── SettingsPage.jsx ← All configuration panels + ├── GoalsPage.jsx ← Goal definitions and progress + ├── LimitsPage.jsx ← Limit management + blocking UI + ├── WeeklyReportPage.jsx ← Weekly summaries, compare, export + └── SettingsPage.jsx ← All configuration panels ``` ### Shared utilities (`frontend/src/shared/`) @@ -167,7 +169,7 @@ App.jsx 1. Add your route function in the appropriate file under `src/api/` (or create a new one). 2. If creating a new file, register the blueprint in `src/api/api_server.py` → `create_app()`. -3. Decorate your function with `@wellbeing_bp.route("/api/my-endpoint")` (or a new blueprint). +3. Decorate your function with `@wellbeing_bp.route("/api/my-endpoint")` (or use `telegram_bp` / `update_bp` when appropriate). 4. Return `jsonify(your_data)`. --- diff --git a/docs/index.md b/docs/index.md index c60fbbf..9e95e1f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -19,7 +19,9 @@ It runs silently in the background, capturing which app you are using, how activ |---|---| | **Screen-time tracking** | Logs every foreground app with second-granularity, including the active window title and (for browsers) the current URL. | | **Productivity & focus scoring** | A configurable weighted formula rates each day 0–100 using deep-work time, engagement, flow streaks, and switch/idle penalties. | +| **Weekly reporting** | Built-in weekly report experience with per-day breakdown, top apps, category insights, goals impact, and week-over-week comparison. | | **App limit enforcement** | Set per-app daily time budgets. Stasis automatically terminates processes once limits are reached, with optional temporary unblocks. | +| **Goals & coaching signals** | Define goals, track daily progress, review drift alerts, and correlate goal completion with weekly productivity outcomes. | | **Telegram remote control** | Receive boot notifications, capture screenshots, pull activity logs, and lock/shutdown your PC from anywhere. | | **File system monitoring** | Optional background watcher for file create/modify/delete events across all drives. | | **Automatic self-updates** | Checks GitHub Releases and installs new versions in the background. | @@ -42,6 +44,9 @@ It runs silently in the background, capturing which app you are using, how activ - :material-download: **[Installation](installation.md)** Download the installer, system requirements, first-run setup. +- :material-shield-lock: **[Privacy Policy](privacy-policy.md)** + What Stasis collects, when data leaves your device, and your controls. + - :material-cog: **[Configuration](configuration.md)** Settings reference, app categories, ignored processes, startup options. diff --git a/docs/privacy-policy.md b/docs/privacy-policy.md new file mode 100644 index 0000000..267951d --- /dev/null +++ b/docs/privacy-policy.md @@ -0,0 +1,141 @@ +# Stasis Privacy Policy + +Last updated: March 16, 2026 + +This Privacy Policy explains what Stasis collects, where it is stored, when data leaves your device, and how you can control or delete it. + +## 1. Summary + +Stasis is designed to work primarily on-device. Most data is stored locally in a SQLite database on your Windows PC. + +Data leaves your device only when you enable or use internet features such as Telegram remote control and update checks. + +## 2. Data We Collect + +Depending on enabled settings and how you use the app, Stasis may collect: + +### A) Activity and productivity data (local) + +- App/process name (for example: `code.exe`) +- Executable path +- Process ID +- Window title +- Active time and idle time +- Mouse click count +- Keystroke count (count only, not key content) +- Browser URL for supported browsers when browser tracking is enabled + +### B) Analytics and settings data (local) + +- Daily stats and category summaries +- App limits and blocked-app status +- Feature toggles and preferences +- Data retention configuration + +### C) Optional file activity data (local, only if enabled) + +- File event type (`created`, `modified`, `deleted`, `moved`) +- File path + +### D) Optional Telegram integration data + +- Bot token and chat ID (stored encrypted at rest) +- Recent bot command history (last commands metadata) +- Media generated on demand by your command (for example screenshot/webcam capture) before upload to Telegram + +### E) Local application logs + +- Diagnostic logs for reliability and troubleshooting + +## 3. What We Do Not Intentionally Collect + +Stasis does not intentionally collect or transmit: + +- Passwords +- Keystroke content (only aggregate counts are recorded) +- File contents (only file event metadata/path if file logging is enabled) + +## 4. How We Use Data + +We use collected data to: + +- Show screen-time and focus analytics +- Enforce app limits and blocking rules +- Run requested remote actions through Telegram (if enabled) +- Provide diagnostics and improve reliability + +## 5. When Data Leaves Your Device + +Stasis may make network requests in these cases: + +### A) Telegram integration (optional, user-enabled) + +- Calls Telegram Bot API to validate token, poll commands, and send requested messages/media/files. +- Data sent depends on commands you use (for example status text, screenshot, webcam image/video, selected logs). + +### B) Update checks and updates + +- Checks latest release metadata from GitHub API. +- Downloads installer/update package from GitHub release assets when you choose to update. + +### C) Connectivity checks + +- May perform a basic internet reachability check. + +Outside of these scenarios, Stasis is intended to run locally without sending analytics or advertising telemetry. + +## 6. Data Storage and Retention + +- Primary storage: local SQLite database on your device. +- Credentials: Telegram bot token/chat ID are encrypted before storage. +- Retention: you can configure automatic deletion (retention days) or keep data until you clear it. +- Manual deletion: you can clear activity data/reset from app settings and can uninstall the app. + +## 7. Data Sharing + +Stasis does not sell your personal data. + +Stasis does not share your data with third parties for advertising purposes. + +Data is shared with service providers only when required for features you enable, such as Telegram (for bot messaging) and GitHub (for update checks/downloads). + +## 8. Security + +We use reasonable technical measures, including local credential encryption for Telegram secrets and local-only backend binding for app control endpoints. + +No method of storage or transmission is 100% secure. + +## 9. Your Choices and Controls + +You can: + +- Disable browser tracking +- Disable file logging +- Disable Telegram integration +- Adjust retention duration +- Clear data from the app +- Uninstall Stasis + +## 10. Children's Privacy + +Stasis is not directed to children under 13. If you believe data from a child was collected unintentionally, contact us to request removal support. + +## 11. International Data Transfers + +If you use Telegram or GitHub update services, related data may be processed on servers outside your country according to those providers' infrastructure and policies. + +## 12. Changes to This Policy + +We may update this Privacy Policy. We will update the "Last updated" date when changes are made. + +## 13. Contact + +For privacy questions or requests, contact: + +- GitHub Issues: https://github.com/arshsisodiya/Stasis/issues +- Repository: https://github.com/arshsisodiya/Stasis + +You can also review this policy inside the app at **Settings → About & Privacy → Privacy**. + +If you do not agree with this Privacy Policy, do not use the software. + diff --git a/mkdocs.yml b/mkdocs.yml index 6d43451..5e461dc 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -41,6 +41,7 @@ extra_css: nav: - Home: index.md + - Privacy Policy: privacy-policy.md - Installation: installation.md - Configuration: configuration.md - Architecture: architecture.md From ffe7044143d5856567bfc91145a462b349773279 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Mon, 16 Mar 2026 18:08:35 +0530 Subject: [PATCH 65/70] ci: add dev/master pipelines with selective docs build and auto PR/merge flow --- .github/workflows/auto-pr-dev-to-master.yml | 55 +++++++ .github/workflows/automerge-dev-pr.yml | 27 ++++ .github/workflows/ci-dev.yml | 155 +++++++++++++++++++ .github/workflows/ci-master.yml | 158 ++++++++++++++++++++ 4 files changed, 395 insertions(+) create mode 100644 .github/workflows/auto-pr-dev-to-master.yml create mode 100644 .github/workflows/automerge-dev-pr.yml create mode 100644 .github/workflows/ci-dev.yml create mode 100644 .github/workflows/ci-master.yml diff --git a/.github/workflows/auto-pr-dev-to-master.yml b/.github/workflows/auto-pr-dev-to-master.yml new file mode 100644 index 0000000..305227c --- /dev/null +++ b/.github/workflows/auto-pr-dev-to-master.yml @@ -0,0 +1,55 @@ +name: Auto PR - Dev to Master + +on: + push: + branches: + - dev + workflow_dispatch: + +permissions: + contents: read + pull-requests: write + +jobs: + create-or-update-pr: + runs-on: ubuntu-latest + steps: + - name: Ensure PR from dev to master exists + uses: actions/github-script@v7 + with: + script: | + const owner = context.repo.owner; + const repo = context.repo.repo; + const head = `${owner}:dev`; + const base = 'master'; + + const { data: existing } = await github.rest.pulls.list({ + owner, + repo, + state: 'open', + head, + base, + per_page: 1, + }); + + if (existing.length > 0) { + core.info(`Open PR already exists: #${existing[0].number}`); + return; + } + + const { data: pr } = await github.rest.pulls.create({ + owner, + repo, + head: 'dev', + base, + title: 'Sync dev into master', + body: [ + 'Automated PR from dev to master.', + '', + '- Commit history is preserved as-is (no squash/rebase).', + '- Merge should happen only after required CI checks pass.', + ].join('\n'), + maintainer_can_modify: true, + }); + + core.info(`Created PR #${pr.number}: ${pr.html_url}`); diff --git a/.github/workflows/automerge-dev-pr.yml b/.github/workflows/automerge-dev-pr.yml new file mode 100644 index 0000000..6787a50 --- /dev/null +++ b/.github/workflows/automerge-dev-pr.yml @@ -0,0 +1,27 @@ +name: Enable Auto-Merge for Dev PRs + +on: + pull_request_target: + branches: + - master + types: + - opened + - reopened + - synchronize + - ready_for_review + +permissions: + contents: write + pull-requests: write + +jobs: + enable-auto-merge: + if: github.event.pull_request.head.ref == 'dev' && github.event.pull_request.draft == false + runs-on: ubuntu-latest + steps: + - name: Enable auto-merge (merge commit) + uses: peter-evans/enable-pull-request-automerge@v3 + with: + token: ${{ secrets.GITHUB_TOKEN }} + pull-request-number: ${{ github.event.pull_request.number }} + merge-method: merge diff --git a/.github/workflows/ci-dev.yml b/.github/workflows/ci-dev.yml new file mode 100644 index 0000000..e606831 --- /dev/null +++ b/.github/workflows/ci-dev.yml @@ -0,0 +1,155 @@ +name: CI - Dev Branch + +on: + push: + branches: + - dev + workflow_dispatch: + +permissions: + contents: read + +concurrency: + group: ci-dev-${{ github.ref }} + cancel-in-progress: true + +jobs: + changes: + name: Detect changed paths + runs-on: ubuntu-latest + outputs: + docs: ${{ steps.filter.outputs.docs }} + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Path filter + id: filter + uses: dorny/paths-filter@v3 + with: + filters: | + docs: + - docs/** + - mkdocs.yml + - README.md + - index.html + + backend-smoke: + name: Backend smoke checks + runs-on: windows-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup Python + uses: actions/setup-python@v5 + with: + python-version: "3.11" + cache: pip + + - name: Install backend dependencies + run: | + python -m pip install --upgrade pip + python -m pip install -r requirements.txt + + - name: Smoke test health and core API + shell: pwsh + run: | + python - <<'PY' + from src.database.database import init_db + from src.api.api_server import create_app + + init_db() + app = create_app(None) + client = app.test_client() + + health = client.get('/api/health') + assert health.status_code == 200, f"/api/health failed: {health.status_code}" + assert health.get_json().get('status') == 'running', f"Unexpected health payload: {health.get_data(as_text=True)}" + + dates = client.get('/api/available-dates') + assert dates.status_code == 200, f"/api/available-dates failed: {dates.status_code}" + + print('Backend smoke checks passed.') + PY + + - name: Run backend tests if present + shell: pwsh + run: | + $hasTests = $false + if (Test-Path tests) { + $found = Get-ChildItem tests -Recurse -Include "test_*.py","*_test.py" -ErrorAction SilentlyContinue | Select-Object -First 1 + if ($found) { $hasTests = $true } + } + if (-not $hasTests) { + $foundSrc = Get-ChildItem src -Recurse -Include "test_*.py","*_test.py" -ErrorAction SilentlyContinue | Select-Object -First 1 + if ($foundSrc) { $hasTests = $true } + } + + if ($hasTests) { + python -m pip install pytest + python -m pytest -q + } + else { + Write-Host "No backend tests found. Skipping pytest." + } + + frontend-ci: + name: Frontend lint and build + runs-on: windows-latest + defaults: + run: + working-directory: frontend + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup Node + uses: actions/setup-node@v4 + with: + node-version: "20" + cache: npm + cache-dependency-path: frontend/package-lock.json + + - name: Install frontend dependencies + run: npm ci + + - name: Run lint + run: npm run lint + + - name: Build frontend + run: npm run build + + - name: Run frontend tests if script exists + shell: pwsh + run: | + $pkg = Get-Content package.json | ConvertFrom-Json + $hasTestScript = $pkg.scripts.PSObject.Properties.Name -contains "test" + if ($hasTestScript) { + npm test -- --run + } + else { + Write-Host "No frontend test script found. Skipping frontend tests." + } + + docs-build: + name: Docs build (docs changes only) + needs: changes + if: needs.changes.outputs.docs == 'true' + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup Python + uses: actions/setup-python@v5 + with: + python-version: "3.11" + cache: pip + + - name: Install docs dependencies + run: | + python -m pip install --upgrade pip + python -m pip install mkdocs mkdocs-material pymdown-extensions + + - name: Build docs + run: python -m mkdocs build --strict --site-dir site diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml new file mode 100644 index 0000000..6cb4944 --- /dev/null +++ b/.github/workflows/ci-master.yml @@ -0,0 +1,158 @@ +name: CI - Master Gate and Post-Merge + +on: + pull_request: + branches: + - master + push: + branches: + - master + workflow_dispatch: + +permissions: + contents: read + +concurrency: + group: ci-master-${{ github.ref }} + cancel-in-progress: true + +jobs: + changes: + name: Detect changed paths + runs-on: ubuntu-latest + outputs: + docs: ${{ steps.filter.outputs.docs }} + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Path filter + id: filter + uses: dorny/paths-filter@v3 + with: + filters: | + docs: + - docs/** + - mkdocs.yml + - README.md + - index.html + + backend-smoke: + name: Backend smoke checks + runs-on: windows-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup Python + uses: actions/setup-python@v5 + with: + python-version: "3.11" + cache: pip + + - name: Install backend dependencies + run: | + python -m pip install --upgrade pip + python -m pip install -r requirements.txt + + - name: Smoke test health and core API + shell: pwsh + run: | + python - <<'PY' + from src.database.database import init_db + from src.api.api_server import create_app + + init_db() + app = create_app(None) + client = app.test_client() + + health = client.get('/api/health') + assert health.status_code == 200, f"/api/health failed: {health.status_code}" + assert health.get_json().get('status') == 'running', f"Unexpected health payload: {health.get_data(as_text=True)}" + + dates = client.get('/api/available-dates') + assert dates.status_code == 200, f"/api/available-dates failed: {dates.status_code}" + + print('Backend smoke checks passed.') + PY + + - name: Run backend tests if present + shell: pwsh + run: | + $hasTests = $false + if (Test-Path tests) { + $found = Get-ChildItem tests -Recurse -Include "test_*.py","*_test.py" -ErrorAction SilentlyContinue | Select-Object -First 1 + if ($found) { $hasTests = $true } + } + if (-not $hasTests) { + $foundSrc = Get-ChildItem src -Recurse -Include "test_*.py","*_test.py" -ErrorAction SilentlyContinue | Select-Object -First 1 + if ($foundSrc) { $hasTests = $true } + } + + if ($hasTests) { + python -m pip install pytest + python -m pytest -q + } + else { + Write-Host "No backend tests found. Skipping pytest." + } + + frontend-ci: + name: Frontend lint and build + runs-on: windows-latest + defaults: + run: + working-directory: frontend + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup Node + uses: actions/setup-node@v4 + with: + node-version: "20" + cache: npm + cache-dependency-path: frontend/package-lock.json + + - name: Install frontend dependencies + run: npm ci + + - name: Run lint + run: npm run lint + + - name: Build frontend + run: npm run build + + - name: Run frontend tests if script exists + shell: pwsh + run: | + $pkg = Get-Content package.json | ConvertFrom-Json + $hasTestScript = $pkg.scripts.PSObject.Properties.Name -contains "test" + if ($hasTestScript) { + npm test -- --run + } + else { + Write-Host "No frontend test script found. Skipping frontend tests." + } + + docs-build: + name: Docs build (docs changes only) + needs: changes + if: needs.changes.outputs.docs == 'true' + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup Python + uses: actions/setup-python@v5 + with: + python-version: "3.11" + cache: pip + + - name: Install docs dependencies + run: | + python -m pip install --upgrade pip + python -m pip install mkdocs mkdocs-material pymdown-extensions + + - name: Build docs + run: python -m mkdocs build --strict --site-dir site From b8b0fe23f062b22c94e2ea1559e314fd3ec38c93 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Mon, 16 Mar 2026 18:26:23 +0530 Subject: [PATCH 66/70] installer: require privacy acceptance and use local legal docs --- frontend/src-tauri/nsis/installer.nsh | 58 +++++++++++ frontend/src-tauri/nsis/privacy.txt | 137 +++++++++++++++++++------- 2 files changed, 157 insertions(+), 38 deletions(-) diff --git a/frontend/src-tauri/nsis/installer.nsh b/frontend/src-tauri/nsis/installer.nsh index a19d7ef..2ea68c8 100644 --- a/frontend/src-tauri/nsis/installer.nsh +++ b/frontend/src-tauri/nsis/installer.nsh @@ -18,6 +18,63 @@ # ----------------------------- Var /GLOBAL StartupCheckbox +Var /GLOBAL PrivacyConsentCheckbox +Var /GLOBAL ViewLicenseButton +Var /GLOBAL ViewPrivacyButton + +# ----------------------------- +# Privacy Consent Page +# ----------------------------- + +Function OpenLicenseDoc + InitPluginsDir + SetOutPath "$PLUGINSDIR" + File "/oname=license.txt" "${__FILEDIR__}\\license.txt" + ExecShell "open" "$PLUGINSDIR\\license.txt" +FunctionEnd + +Function OpenPrivacyDoc + InitPluginsDir + SetOutPath "$PLUGINSDIR" + File "/oname=privacy.txt" "${__FILEDIR__}\\privacy.txt" + ExecShell "open" "$PLUGINSDIR\\privacy.txt" +FunctionEnd + +Function PrivacyConsentPage + nsDialogs::Create 1018 + Pop $0 + + ${If} $0 == error + Abort + ${EndIf} + + ${NSD_CreateLabel} 20u 10u 280u 16u "Before installing Stasis, please review the legal documents:" + Pop $0 + + ${NSD_CreateButton} 20u 30u 130u 14u "View License" + Pop $ViewLicenseButton + ${NSD_OnClick} $ViewLicenseButton OpenLicenseDoc + + ${NSD_CreateButton} 170u 30u 130u 14u "View Privacy Policy" + Pop $ViewPrivacyButton + ${NSD_OnClick} $ViewPrivacyButton OpenPrivacyDoc + + ${NSD_CreateLabel} 20u 54u 280u 20u "You must accept the Privacy Policy to continue installation." + Pop $0 + + ${NSD_CreateCheckbox} 20u 78u 280u 12u "I have read and accept the Privacy Policy" + Pop $PrivacyConsentCheckbox + + nsDialogs::Show +FunctionEnd + +Function PrivacyConsentPageLeave + ${NSD_GetState} $PrivacyConsentCheckbox $0 + ${If} $0 != ${BST_CHECKED} + MessageBox MB_ICONEXCLAMATION|MB_OK "You must accept the Privacy Policy to proceed." + Abort + ${EndIf} +FunctionEnd # ----------------------------- # Custom Startup Page @@ -41,6 +98,7 @@ Function StartupPageLeave FunctionEnd !macro NSIS_HOOK_CUSTOM_PAGES + Page custom PrivacyConsentPage PrivacyConsentPageLeave Page custom StartupPage StartupPageLeave !macroend diff --git a/frontend/src-tauri/nsis/privacy.txt b/frontend/src-tauri/nsis/privacy.txt index bd0f94e..83036ba 100644 --- a/frontend/src-tauri/nsis/privacy.txt +++ b/frontend/src-tauri/nsis/privacy.txt @@ -1,52 +1,113 @@ -STASIS – DIGITAL WELLBEING FOR WINDOWS +STASIS - DIGITAL WELLBEING FOR WINDOWS PRIVACY POLICY -Last Updated: January 2026 +Last Updated: March 16, 2026 -This Privacy Policy describes how Stasis collects, uses, and protects your information. +This Privacy Policy explains what Stasis collects, where it is stored, when data leaves your device, and how you can control or delete it. -1. INFORMATION WE COLLECT -Stasis may collect: -- Application usage statistics -- System uptime information -- Configuration settings -- Optional Telegram integration data (if enabled) +1) SUMMARY +Stasis is designed to work primarily on-device. Most data is stored locally in a SQLite database on your Windows PC. -Stasis DOES NOT collect: -- Personal files +Data leaves your device only when you enable or use internet features such as Telegram remote control and update checks. + +2) DATA WE COLLECT +Depending on enabled settings and how you use the app, Stasis may collect: + +A. Activity and productivity data (local) +- App/process name (for example: code.exe) +- Executable path +- Process ID +- Window title +- Active time and idle time +- Mouse click count +- Keystroke count (count only, not key content) +- Browser URL for supported browsers when browser tracking is enabled + +B. Analytics and settings data (local) +- Daily stats and category summaries +- App limits and blocked-app status +- Feature toggles and preferences +- Data retention configuration + +C. Optional file activity data (local, only if enabled) +- File event type (created, modified, deleted, moved) +- File path + +D. Optional Telegram integration data +- Bot token and chat ID (stored encrypted at rest) +- Recent bot command history (last commands metadata) +- Media generated on demand by your command (for example screenshot/webcam capture) before upload to Telegram + +E. Local application logs +- Diagnostic logs for reliability and troubleshooting + +3) WHAT WE DO NOT COLLECT +Stasis does not intentionally collect or transmit: - Passwords -- Browsing history -- Keystrokes -- Sensitive personal information +- Keystroke content (only aggregate counts are recorded) +- File contents (only file event metadata/path if file logging is enabled) + +4) HOW WE USE DATA +We use collected data to: +- Show screen-time and focus analytics +- Enforce app limits and blocking rules +- Run requested remote actions through Telegram (if enabled) +- Provide diagnostics and improve reliability + +5) WHEN DATA LEAVES YOUR DEVICE +Stasis may make network requests in these cases: + +A. Telegram integration (optional, user-enabled) +- Calls Telegram Bot API to validate token, poll commands, and send requested messages/media/files. +- Data sent depends on commands you use (for example status text, screenshot, webcam image/video, selected logs). + +B. Update checks and updates +- Checks latest release metadata from GitHub API. +- Downloads installer/update package from GitHub release assets when you choose to update. + +C. Connectivity checks +- May perform a basic internet reachability check. + +Outside of these scenarios, Stasis is intended to run locally without sending analytics or advertising telemetry. + +6) DATA STORAGE AND RETENTION +- Primary storage: local SQLite database on your device. +- Credentials: Telegram bot token/chat ID are encrypted before storage. +- Retention: you can configure automatic deletion (retention days) or keep data until you clear it. +- Manual deletion: you can clear activity data/reset from app settings and can uninstall the app. + +7) DATA SHARING +Stasis does not sell your personal data. + +Stasis does not share your data with third parties for advertising purposes. + +Data is shared with service providers only when required for features you enable, such as Telegram (for bot messaging) and GitHub (for update checks/downloads). -2. HOW INFORMATION IS USED -Collected information is used strictly to: -- Provide digital wellbeing insights -- Enable blocking features -- Generate reports -- Improve performance and reliability +8) SECURITY +We use reasonable technical measures, including local credential encryption for Telegram secrets and local-only backend binding for app control endpoints. -3. DATA STORAGE -All data is stored locally on your device unless you explicitly enable cloud or remote features. +No method of storage or transmission is 100% secure. -4. DATA SHARING -Stasis does not sell, rent, or share personal data with third parties. +9) YOUR CHOICES AND CONTROLS +You can: +- Disable browser tracking +- Disable file logging +- Disable Telegram integration +- Adjust retention duration +- Clear data from the app +- Uninstall Stasis -5. SECURITY -Reasonable technical safeguards are implemented to protect stored data from unauthorized access. +10) CHILDREN'S PRIVACY +Stasis is not directed to children under 13. If you believe data from a child was collected unintentionally, contact us to request removal support. -6. TELEGRAM INTEGRATION -If Telegram integration is enabled: -- Bot token and chat ID are encrypted before storage. -- Messages are sent only to configured accounts. +11) INTERNATIONAL DATA TRANSFERS +If you use Telegram or GitHub update services, related data may be processed on servers outside your country according to those providers' infrastructure and policies. -7. USER CONTROL -You may: -- Disable features at any time -- Clear collected data from within the application -- Uninstall the software to remove local data +12) CHANGES TO THIS POLICY +We may update this Privacy Policy. We will update the "Last Updated" date when changes are made. -8. POLICY CHANGES -This Privacy Policy may be updated from time to time. Continued use of the Software indicates acceptance of updated terms. +13) CONTACT +For privacy questions or requests, contact: +Email: [ADD YOUR SUPPORT EMAIL] -If you do not agree with this Privacy Policy, please do not install or use the Software. \ No newline at end of file +If you do not agree with this Privacy Policy, do not use the software. From 124a23196d9d4a2693587584efce5a1baebb73a7 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Mon, 16 Mar 2026 18:26:43 +0530 Subject: [PATCH 67/70] feat(weekly-report): integrate hourly activity heatmap API Add weekly hourly activity endpoint and wire weekly report heatmap data flow. Includes week-based aggregation for hourly grid with productivity metrics and dominant category support. --- frontend/src/pages/WeeklyReportPage.jsx | 463 +++++++++++++++++++++++- src/api/activity_routes.py | 90 +++++ 2 files changed, 537 insertions(+), 16 deletions(-) diff --git a/frontend/src/pages/WeeklyReportPage.jsx b/frontend/src/pages/WeeklyReportPage.jsx index 4ca3eb1..d16ec59 100644 --- a/frontend/src/pages/WeeklyReportPage.jsx +++ b/frontend/src/pages/WeeklyReportPage.jsx @@ -166,27 +166,45 @@ function CategoryDonut({ categories = [] }) { ); })} - {/* Centre: TOTAL label + time */} - - TOTAL - - - {fmtTime(total)} - - - {/* Hover: show % in centre */} - {hovered && (() => { + {/* Centre labels — idle: TOTAL + time, hover: category name + time + % */} + {!hovered ? ( + <> + + TOTAL + + + {fmtTime(total)} + + + ) : (() => { const cat = categories.find(c => (c.category || "other").toLowerCase() === hovered); if (!cat) return null; const pct = total > 0 ? Math.round((cat.total_seconds / total) * 100) : 0; const color = CATEGORY_COLORS[hovered] || "#64748b"; + const label = (cat.category || "other"); + // Capitalise first letter + const displayLabel = label.charAt(0).toUpperCase() + label.slice(1); return ( - - {pct}% - + <> + {/* Category name */} + + {displayLabel} + + {/* Time */} + + {fmtTime(cat.total_seconds)} + + {/* Percentage */} + + {pct}% + + ); })()} @@ -236,6 +254,392 @@ function CategoryDonut({ categories = [] }) { ); } +// ── Hourly Activity Heatmap ── +// Expects data: { grid: [{date, hour, total_seconds, productive_pct, dominant_category}] } +// dailyBreakdown: [{date, total_seconds, productive_pct}] from report.daily_breakdown + +const HOUR_LABELS_FULL = Array.from({ length: 24 }, (_, h) => { + if (h === 0) return "12 AM"; + if (h === 6) return "6 AM"; + if (h === 12) return "12 PM"; + if (h === 18) return "6 PM"; + return ""; +}); + +function fmtHour(h) { + if (h === 0) return "12 AM"; + if (h < 12) return `${h} AM`; + if (h === 12) return "12 PM"; + return `${h - 12} PM`; +} + +// Derive text insights entirely from the grid data — no extra API call +function deriveHourlyInsights(grid, dates) { + if (!grid || grid.length === 0) return []; + const insights = []; + + // Build hourly totals across the whole week (h → {secs, prodSecs, count}) + const hourTotals = Array.from({ length: 24 }, () => ({ secs: 0, prodSecs: 0, count: 0 })); + // Per-day peak + const dayPeaks = {}; + // Weekday vs weekend splits + let wdSecs = 0, weSecs = 0, wdProdSecs = 0, weProdSecs = 0; + + for (const row of grid) { + const h = row.hour; + const s = row.total_seconds || 0; + const ps = s * ((row.productive_pct || 0) / 100); + hourTotals[h].secs += s; + hourTotals[h].prodSecs += ps; + hourTotals[h].count += 1; + if (!dayPeaks[row.date] || s > dayPeaks[row.date].secs) { + dayPeaks[row.date] = { hour: h, secs: s, cat: row.dominant_category || "" }; + } + // date is YYYY-MM-DD — day-of-week from dates array + const dateIdx = dates.indexOf(row.date); + const isWeekend = dateIdx >= 5; + if (isWeekend) { weSecs += s; weProdSecs += ps; } + else { wdSecs += s; wdProdSecs += ps; } + } + + // 1. Peak week-hour (most total screen time) + const peakH = hourTotals.reduce((best, cur, i) => cur.secs > hourTotals[best].secs ? i : best, 0); + if (hourTotals[peakH].secs > 0) { + insights.push({ + icon: "⏰", + label: "Busiest Hour", + value: fmtHour(peakH), + detail: `avg ${fmtTime(Math.round(hourTotals[peakH].secs / Math.max(hourTotals[peakH].count, 1)))} across active days`, + color: "#60a5fa", + }); + } + + // 2. Best productive window — 3-hour block with highest productive seconds + let bestWindowStart = -1, bestWindowProd = 0; + for (let h = 0; h <= 21; h++) { + const prod = hourTotals[h].prodSecs + hourTotals[h+1].prodSecs + hourTotals[h+2].prodSecs; + if (prod > bestWindowProd) { bestWindowProd = prod; bestWindowStart = h; } + } + if (bestWindowStart >= 0 && bestWindowProd > 60) { + insights.push({ + icon: "🎯", + label: "Focus Window", + value: `${fmtHour(bestWindowStart)} – ${fmtHour(bestWindowStart + 3)}`, + detail: `peak 3-hr productive block`, + color: "#4ade80", + }); + } + + // 3. Earliest active hour (first hour with data on any day) + const earliest = hourTotals.findIndex(h => h.secs > 0); + if (earliest >= 0 && earliest < 8) { + insights.push({ + icon: "🌅", + label: "Early Start", + value: fmtHour(earliest), + detail: "earliest screen activity", + color: "#fbbf24", + }); + } + + // 4. Latest active hour + let latest = -1; + for (let h = 23; h >= 0; h--) { if (hourTotals[h].secs > 0) { latest = h; break; } } + if (latest >= 22) { + insights.push({ + icon: "🌙", + label: "Late Night", + value: fmtHour(latest), + detail: "latest screen activity this week", + color: "#a78bfa", + }); + } + + // 5. Morning vs afternoon vs evening breakdown + const morning = hourTotals.slice(6, 12).reduce((s, h) => s + h.secs, 0); + const afternoon = hourTotals.slice(12, 18).reduce((s, h) => s + h.secs, 0); + const evening = hourTotals.slice(18, 24).reduce((s, h) => s + h.secs, 0); + const total = morning + afternoon + evening; + if (total > 0) { + const dominant = morning >= afternoon && morning >= evening ? "Morning" + : afternoon >= evening ? "Afternoon" : "Evening"; + const domSecs = dominant === "Morning" ? morning : dominant === "Afternoon" ? afternoon : evening; + const domPct = Math.round((domSecs / total) * 100); + insights.push({ + icon: dominant === "Morning" ? "☀️" : dominant === "Afternoon" ? "🌤️" : "🌆", + label: "Peak Period", + value: dominant, + detail: `${domPct}% of daily screen time`, + color: dominant === "Morning" ? "#fbbf24" : dominant === "Afternoon" ? "#60a5fa" : "#a78bfa", + }); + } + + // 6. Weekend vs weekday + if (weSecs > 0 && wdSecs > 0) { + const wdAvg = wdSecs / 5; + const weAvg = weSecs / 2; + const diff = Math.abs(wdAvg - weAvg); + if (diff > 900) { // >15 min difference — worth mentioning + const heavier = wdAvg > weAvg ? "Weekdays" : "Weekends"; + const lighter = wdAvg > weAvg ? "weekends" : "weekdays"; + insights.push({ + icon: "📅", + label: "Work/Rest", + value: `${heavier} heavier`, + detail: `${fmtTime(Math.round(diff))} more/day vs ${lighter}`, + color: "#22d3ee", + }); + } + } + + return insights; +} + +function HourlyHeatmap({ data, weekStart, dailyBreakdown = [] }) { + const [tooltip, setTooltip] = useState(null); + const containerRef = useRef(null); + + const lookup = useMemo(() => { + const map = {}; + if (!data?.grid) return map; + for (const row of data.grid) map[`${row.date}:${row.hour}`] = row; + return map; + }, [data]); + + const dates = useMemo(() => { + return DAY_LABELS.map((_, i) => { + const d = new Date(weekStart + "T12:00:00"); + d.setDate(d.getDate() + i); + return localYMD(d); + }); + }, [weekStart]); + + const maxSecs = useMemo(() => { + let m = 1; + if (!data?.grid) return m; + for (const row of data.grid) if ((row.total_seconds || 0) > m) m = row.total_seconds; + return m; + }, [data]); + + const peakHourByDay = useMemo(() => { + const map = {}; + if (!data?.grid) return map; + for (const row of data.grid) { + const prev = map[row.date]; + if (!prev || row.total_seconds > prev.secs) + map[row.date] = { hour: row.hour, secs: row.total_seconds, domCat: row.dominant_category || "" }; + } + return map; + }, [data]); + + // Derive insights from grid data + const insights = useMemo(() => deriveHourlyInsights(data?.grid || [], dates), [data, dates]); + + function cellColor(secs, dominantCat) { + if (!secs || secs < 30) return "rgba(255,255,255,0.03)"; + const intensity = Math.pow(Math.min(secs / maxSecs, 1), 0.55); + const cat = (dominantCat || "").toLowerCase(); + let r, g, b; + if (cat === "productive") { r = 30; g = 180; b = 100; } + else if (cat === "communication") { r = 50; g = 130; b = 240; } + else if (cat === "browser") { r = 130; g = 90; b = 230; } + else if (cat === "neutral") { r = 200; g = 150; b = 20; } + else if (cat === "entertainment") { r = 220; g = 70; b = 70; } + else if (cat === "unproductive") { r = 200; g = 40; b = 60; } + else if (cat === "system") { r = 20; g = 190; b = 210; } + else { r = 80; g = 100; b = 120; } + return `rgba(${r},${g},${b},${(0.12 + intensity * 0.82).toFixed(2)})`; + } + + function borderColor(secs, dominantCat) { + if (!secs || secs < 30) return "transparent"; + const cat = (dominantCat || "").toLowerCase(); + const m = { + productive: "rgba(74,222,128,0.3)", communication: "rgba(96,165,250,0.3)", + browser: "rgba(167,139,250,0.3)", neutral: "rgba(251,191,36,0.3)", + entertainment: "rgba(248,113,113,0.3)", unproductive: "rgba(251,113,133,0.3)", + system: "rgba(34,211,238,0.3)", + }; + return m[cat] || "rgba(100,116,139,0.2)"; + } + + const CELL_W = 28, CELL_H = 20, GAP = 2; + const DAY_COL_W = 30; + const TT_W = 148, TT_H = 72; + + function handleMouseEnter(e, dayIdx, date, h, secs, prodPct, domCat) { + if (!secs) return; + const cell = e.currentTarget.getBoundingClientRect(); + const container = containerRef.current?.getBoundingClientRect() || { left: 0, top: 0 }; + let left = cell.left - container.left + CELL_W / 2 - TT_W / 2; + let top = cell.top - container.top - TT_H - 6; + const contW = containerRef.current?.offsetWidth || 800; + left = Math.max(0, Math.min(left, contW - TT_W)); + if (top < 0) top = cell.top - container.top + CELL_H + 6; + setTooltip({ day: DAY_LABELS[dayIdx], hour: h, secs, prodPct, domCat, left, top }); + } + + return ( +
+ + {/* ── Hour labels header ── */} +
+
+
+ {HOUR_LABELS_FULL.map((lbl, h) => ( +
+ {lbl && ( + + {lbl} + + )} +
+ ))} +
+
+ + {/* ── Grid rows ── */} +
+ {dates.map((date, dayIdx) => { + const isWeekend = dayIdx >= 5; + const peak = peakHourByDay[date]; + const peakColor = peak ? (CATEGORY_COLORS[(peak.domCat || "").toLowerCase()] || "#64748b") : "#1e293b"; + + return ( +
+
+ {DAY_LABELS[dayIdx]} +
+ + {/* 24 cells — flex:1 each so they fill all available width */} +
+ {Array.from({ length: 24 }, (_, h) => { + const entry = lookup[`${date}:${h}`]; + const secs = entry?.total_seconds || 0; + const prodPct = entry?.productive_pct || 0; + const domCat = entry?.dominant_category || ""; + const isPeak = peak?.hour === h && secs > 0; + + return ( +
handleMouseEnter(e, dayIdx, date, h, secs, prodPct, domCat)} + onMouseLeave={() => setTooltip(null)} + style={{ + flex: 1, height: CELL_H, + marginRight: h < 23 ? GAP : 0, + borderRadius: 3, + background: cellColor(secs, domCat), + border: isPeak ? `1px solid ${peakColor}` : `1px solid ${borderColor(secs, domCat)}`, + boxShadow: isPeak && secs > 0 ? `0 0 4px ${peakColor}55` : "none", + transition: "transform 0.08s", + }} + onMouseOver={e => { if (secs > 0) e.currentTarget.style.transform = "scale(1.35)"; }} + onMouseOut={e => { e.currentTarget.style.transform = "scale(1)"; }} + /> + ); + })} +
+
+ ); + })} +
+ + {/* ── Tooltip ── */} + {tooltip && ( +
+
+ {tooltip.day} · {fmtHour(tooltip.hour)} +
+
+ {fmtTime(tooltip.secs)} +
+
+ {tooltip.domCat && ( + <> +
+ + {tooltip.domCat} + + + )} + {tooltip.prodPct > 0 && ( + = 60 ? "#4ade80" : tooltip.prodPct >= 35 ? "#fbbf24" : "#f87171", marginLeft: tooltip.domCat ? 4 : 0 }}> + · {tooltip.prodPct}% + + )} +
+
+ )} + + {/* ── Insights row ── */} + {insights.length > 0 && ( +
+ {insights.map((ins, i) => ( +
+
+ {ins.icon} + + {ins.label} + +
+
+ {ins.value} +
+
+ {ins.detail} +
+
+ ))} +
+ )} + + {/* ── Legend ── */} +
+ Key: + {Object.entries(CATEGORY_COLORS).map(([cat, color]) => ( +
+
+ {cat} +
+ ))} + · brighter = more time · outlined = peak hour +
+
+ ); +} + // ── Daily bar chart — fixed viewBox SVG, bars evenly distributed ── function DailyBars({ days, animKey }) { const [mounted, setMounted] = useState(false); @@ -554,6 +958,7 @@ export default function WeeklyReportPage() { const [compareData, setCompareData] = useState(null); const [compareLoading, setCompareLoading] = useState(false); const [verbosity, setVerbosity] = useState("standard"); + const [hourlyData, setHourlyData] = useState(null); // 7×24 grid from backend const [toast, setToast] = useState(null); const toastTimer = useRef(null); const reportRef = useRef(null); @@ -591,11 +996,24 @@ export default function WeeklyReportPage() { const fetchReport = useCallback(async () => { setLoading(true); + setHourlyData(null); try { const r = await fetch(`${BASE}/api/weekly-report?week_of=${weekMonday}&verbosity=${verbosity}`); const j = await r.json(); setReport(j.error ? null : j); } catch { setReport(null); } + + // Fetch hourly activity grid — endpoint: /api/hourly-activity?week_of=YYYY-MM-DD + // Expected response: { grid: [ {date, hour, total_seconds, productive_pct}... ] } + // Falls back gracefully to null if endpoint doesn't exist yet + try { + const hr = await fetch(`${BASE}/api/hourly-activity?week_of=${weekMonday}`); + if (hr.ok) { + const hj = await hr.json(); + setHourlyData(hj.error ? null : hj); + } + } catch { /* endpoint not yet available — heatmap will be hidden */ } + setLoading(false); }, [weekMonday, verbosity]); @@ -887,6 +1305,19 @@ export default function WeeklyReportPage() {
+ {/* ── ROW 2b: Hourly Heatmap (only shown if backend returns data) ── */} + {hourlyData?.grid?.length > 0 && ( + hover cell · outlined = peak hour + }> + + + )} + {/* ── ROW 3: Top apps + Limits + Goals ── */}
{/* Top apps */} diff --git a/src/api/activity_routes.py b/src/api/activity_routes.py index ae8dc87..8842cad 100644 --- a/src/api/activity_routes.py +++ b/src/api/activity_routes.py @@ -1,12 +1,24 @@ from flask import jsonify, request from collections import defaultdict from urllib.parse import urlparse +from datetime import datetime, timedelta from src.api.wellbeing_routes import wellbeing_bp, safe, get_selected_date from src.database.database import get_connection +from src.config.category_manager import get_category from src.config.ignored_apps_manager import is_ignored +def _week_bounds(date_str=None): + if date_str: + date_value = datetime.strptime(date_str, "%Y-%m-%d").date() + else: + date_value = datetime.now().date() + monday = date_value - timedelta(days=date_value.weekday()) + sunday = monday + timedelta(days=6) + return monday.isoformat(), sunday.isoformat() + + # ===================================== # Available Dates # ===================================== @@ -251,6 +263,84 @@ def hourly(): conn.close() +@wellbeing_bp.route("/api/hourly-activity") +def weekly_hourly_activity(): + week_of = request.args.get("week_of") + + try: + monday, sunday = _week_bounds(week_of) + except ValueError: + return jsonify({"error": "week_of must be YYYY-MM-DD"}), 400 + + week_end_exclusive = ( + datetime.strptime(sunday, "%Y-%m-%d") + timedelta(days=1) + ).strftime("%Y-%m-%d") + + conn = get_connection() + cursor = conn.cursor() + + try: + cursor.execute(""" + SELECT + substr(timestamp, 1, 10) AS log_date, + strftime('%H', timestamp) AS hour, + app_name, + url, + SUM(active_seconds) AS total_active + FROM activity_logs + WHERE timestamp >= ? + AND timestamp < ? + AND active_seconds > 0 + GROUP BY log_date, hour, app_name, url + ORDER BY log_date ASC, hour ASC + """, (monday, week_end_exclusive)) + + buckets = defaultdict(lambda: {"total_seconds": 0, "productive_seconds": 0, "category_seconds": {}}) + for log_date, hour, app_name, url, total_active in cursor.fetchall(): + if is_ignored(app_name): + continue + + seconds = safe(total_active) + if seconds <= 0: + continue + + main_category, _ = get_category(app_name, url) + # After you compute main_category, track which category dominates the bucket + bucket = buckets[(log_date, int(hour))] + bucket["total_seconds"] += seconds + bucket["category_seconds"][main_category] = bucket["category_seconds"].get(main_category, 0) + seconds + if main_category == "productive": + bucket["productive_seconds"] += seconds + + grid = [] + for (log_date, hour), totals in sorted(buckets.items()): + total_seconds = totals["total_seconds"] + productive_seconds = totals["productive_seconds"] + productive_pct = round((productive_seconds / total_seconds) * 100, 1) if total_seconds > 0 else 0 + + # Pick the category with most seconds in this hour. + dominant_category = max( + totals["category_seconds"], + key=totals["category_seconds"].get, + ) if totals["category_seconds"] else "other" + + grid.append({ + "date": log_date, + "hour": hour, + "total_seconds": total_seconds, + "productive_pct": productive_pct, + "dominant_category": dominant_category, + }) + + return jsonify({ + "week": {"start": monday, "end": sunday}, + "grid": grid, + }) + + finally: + conn.close() + + # ===================================== # Hourly Top Apps # ===================================== From a756bd4b16f1700a0b330ca5183124239dba1fd6 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Mon, 16 Mar 2026 18:27:39 +0530 Subject: [PATCH 68/70] added /site directory --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5647c19..5681bc9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ venv/ .env.* ENV/ .venv/ +site/ # ========================= # PyInstaller / Executables # ========================= From 3d2fd638985e4d7cace9eec79aa4db1fbd352a6a Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Mon, 16 Mar 2026 19:12:46 +0530 Subject: [PATCH 69/70] Fix backend smoke test script for pwsh --- .github/workflows/ci-dev.yml | 4 ++-- .github/workflows/ci-master.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-dev.yml b/.github/workflows/ci-dev.yml index e606831..d32f5d0 100644 --- a/.github/workflows/ci-dev.yml +++ b/.github/workflows/ci-dev.yml @@ -54,7 +54,7 @@ jobs: - name: Smoke test health and core API shell: pwsh run: | - python - <<'PY' + @' from src.database.database import init_db from src.api.api_server import create_app @@ -70,7 +70,7 @@ jobs: assert dates.status_code == 200, f"/api/available-dates failed: {dates.status_code}" print('Backend smoke checks passed.') - PY + '@ | python - - name: Run backend tests if present shell: pwsh diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml index 6cb4944..4388876 100644 --- a/.github/workflows/ci-master.yml +++ b/.github/workflows/ci-master.yml @@ -57,7 +57,7 @@ jobs: - name: Smoke test health and core API shell: pwsh run: | - python - <<'PY' + @' from src.database.database import init_db from src.api.api_server import create_app @@ -73,7 +73,7 @@ jobs: assert dates.status_code == 200, f"/api/available-dates failed: {dates.status_code}" print('Backend smoke checks passed.') - PY + '@ | python - - name: Run backend tests if present shell: pwsh From 477fea3614e3c4d84261d856985562666bb8ffe2 Mon Sep 17 00:00:00 2001 From: arshsisodiya Date: Mon, 16 Mar 2026 19:19:29 +0530 Subject: [PATCH 70/70] fix(frontend): resolve lint errors Clean up unused vars/imports, ignore generated Tauri artifacts in ESLint, and align lint rules with the current frontend codebase. Leaves a small set of non-blocking hook dependency warnings for follow-up. --- frontend/eslint.config.js | 12 +++++++++- frontend/src/WellbeingDashboard.jsx | 4 ++-- frontend/src/pages/ActivityPage.jsx | 5 ----- frontend/src/pages/AppsPage.jsx | 6 ++--- frontend/src/pages/DaySummary.jsx | 18 ++++++++++----- frontend/src/pages/GoalsPage.jsx | 2 +- frontend/src/pages/LoadingScreen.jsx | 1 - frontend/src/pages/OverviewPage.jsx | 3 --- frontend/src/pages/SettingsPage.jsx | 10 ++++----- frontend/src/pages/UpdatePage.jsx | 8 ++----- frontend/src/pages/WeeklyReportPage.jsx | 29 +++++-------------------- frontend/src/shared/UpdateDialog.jsx | 2 +- frontend/src/shared/components.jsx | 2 +- 13 files changed, 42 insertions(+), 60 deletions(-) diff --git a/frontend/eslint.config.js b/frontend/eslint.config.js index 4fa125d..d8a35a6 100644 --- a/frontend/eslint.config.js +++ b/frontend/eslint.config.js @@ -5,7 +5,7 @@ import reactRefresh from 'eslint-plugin-react-refresh' import { defineConfig, globalIgnores } from 'eslint/config' export default defineConfig([ - globalIgnores(['dist']), + globalIgnores(['dist', 'src-tauri/target/**']), { files: ['**/*.{js,jsx}'], extends: [ @@ -23,6 +23,16 @@ export default defineConfig([ }, }, rules: { + // Keep core hooks checks, but disable compiler-specific rules for this codebase. + 'react-hooks/set-state-in-effect': 'off', + 'react-hooks/refs': 'off', + 'react-hooks/purity': 'off', + 'react-hooks/immutability': 'off', + 'react-hooks/use-memo': 'off', + 'react-hooks/static-components': 'off', + 'react-hooks/preserve-manual-memoization': 'off', + 'react-hooks/exhaustive-deps': 'warn', + 'no-empty': ['error', { allowEmptyCatch: true }], 'no-unused-vars': ['error', { varsIgnorePattern: '^[A-Z_]' }], }, }, diff --git a/frontend/src/WellbeingDashboard.jsx b/frontend/src/WellbeingDashboard.jsx index 8eb5d8d..5dcfc54 100644 --- a/frontend/src/WellbeingDashboard.jsx +++ b/frontend/src/WellbeingDashboard.jsx @@ -8,8 +8,8 @@ import GoalsPage from "./pages/GoalsPage"; import WeeklyReportPage from "./pages/WeeklyReportPage"; import DaySummary from "./pages/DaySummary"; import { Skeleton, SkeletonCard, TabPanel, AppIcon } from "./shared/components"; -import { localYMD, yesterday, fmtTime, fmtTimeFull } from "./shared/utils"; -import { useCountUp, useLiveClock, useVisibilityPolling } from "./shared/hooks"; +import { localYMD, fmtTime, fmtTimeFull } from "./shared/utils"; +import { useLiveClock, useVisibilityPolling } from "./shared/hooks"; // ─── useReducer — atomic state for all dashboard data ───────────────────────── const initialDashState = { diff --git a/frontend/src/pages/ActivityPage.jsx b/frontend/src/pages/ActivityPage.jsx index d394e94..cd77572 100644 --- a/frontend/src/pages/ActivityPage.jsx +++ b/frontend/src/pages/ActivityPage.jsx @@ -24,13 +24,8 @@ export default function ActivityPage({ BASE, selectedDate, data, - stats, - prevStats, prevWellbeing, showComparison, - hourly, - peakHour, - countKey, }) { return (
diff --git a/frontend/src/pages/AppsPage.jsx b/frontend/src/pages/AppsPage.jsx index 30b395b..f04627c 100644 --- a/frontend/src/pages/AppsPage.jsx +++ b/frontend/src/pages/AppsPage.jsx @@ -4,7 +4,7 @@ import { fmtTime, trendPct } from "../shared/utils"; import { AppIcon, CategoryChip, TrendBadge, SectionCard } from "../shared/components"; // ─── APP ROW ───────────────────────────────────────────────────────────────── -const AppRow = memo(function AppRow({ app, active, maxActive, main, sub, index, prevActive }) { +const AppRow = memo(function AppRow({ app, active, maxActive, main, sub, prevActive }) { const pct = maxActive > 0 ? (active / maxActive) * 100 : 0; const col = CATEGORY_COLORS[main] || CATEGORY_COLORS.other; const [hov, setHov] = useState(false); @@ -47,7 +47,7 @@ const AppRow = memo(function AppRow({ app, active, maxActive, main, sub, index, const _siteStatsCache = {}; // ─── BROWSER ROW ─────────────────────────────────────────────────────────────── -const BrowserRow = memo(function BrowserRow({ browsers, maxActive, index, BASE, selectedDate, prevActive }) { +const BrowserRow = memo(function BrowserRow({ browsers, maxActive, BASE, selectedDate, prevActive }) { const [expanded, setExpanded] = useState(false); const [sites, setSites] = useState(null); const [loadingSites, setLoadingSites] = useState(false); @@ -181,11 +181,9 @@ const BrowserRow = memo(function BrowserRow({ browsers, maxActive, index, BASE, // ─── APPS PAGE ──────────────────────────────────────────────────────────────── export default function AppsPage({ BASE, stats, prevStats, selectedDate, ignoredApps, isActive = true }) { const [appFilter, setAppFilter] = useState("all"); - const [prevFilter, setPrevFilter] = useState("all"); const [visibleCount, setVisibleCount] = useState(120); const handleFilterChange = (cat) => { - setPrevFilter(appFilter); setAppFilter(cat); }; diff --git a/frontend/src/pages/DaySummary.jsx b/frontend/src/pages/DaySummary.jsx index cc52459..537a54a 100644 --- a/frontend/src/pages/DaySummary.jsx +++ b/frontend/src/pages/DaySummary.jsx @@ -1,4 +1,3 @@ -import { fmtTime } from "../shared/utils"; import { useState, useEffect, useRef, useCallback, useMemo, memo } from "react"; // ─── SHARED STYLES ──────────────────────────────────────────────────────────── @@ -435,7 +434,6 @@ function generateInsights(data, stats, hourly, prevWellbeing, focusData) { const totalSeconds = data.totalScreenTime || 0; const prodPct = data.productivityPercent || 0; - const nb = s => s.replace(/(\d+)\s*([apmAPMhminutesteconds]+)/g, "$1\u00A0$2"); const pick = arr => arr[Math.floor(Math.random() * arr.length)]; // ── 1. Yesterday delta ── @@ -619,14 +617,22 @@ function generateInsights(data, stats, hourly, prevWellbeing, focusData) { export default function DaySummary({ data, stats, hourly, prevWellbeing, focusData, dateKey }) { // dateKey — pass the selected date string (e.g. "2025-01-15") from parent // so all animated children remount and re-animate when the date changes - if (!data || data.totalScreenTime === 0) return null; + const hasData = !!data && data.totalScreenTime > 0; const [insights, setInsights] = useState([]); + const screenMinutes = Math.floor((data?.totalScreenTime || 0) / 60); + const idleMinutes = Math.floor((data?.totalIdleTime || 0) / 60); useEffect(() => { + if (!hasData) { + setInsights([]); + return; + } setInsights(generateInsights(data, stats, hourly, prevWellbeing, focusData)); }, [ + hasData, data?.productivityPercent, + data?.totalScreenTime, stats?.length, prevWellbeing?.productivityPercent, focusData?.score, @@ -635,10 +641,12 @@ export default function DaySummary({ data, stats, hourly, prevWellbeing, focusDa ]); const nudge = useMemo( - () => getNudge(data.totalScreenTime, data.totalIdleTime), - [Math.floor((data.totalScreenTime || 0) / 60), Math.floor((data.totalIdleTime || 0) / 60)] + () => (hasData ? getNudge(data.totalScreenTime, data.totalIdleTime) : null), + [hasData, screenMinutes, idleMinutes, data?.totalScreenTime, data?.totalIdleTime] ); + if (!hasData) return null; + return ( <> diff --git a/frontend/src/pages/GoalsPage.jsx b/frontend/src/pages/GoalsPage.jsx index 857ae29..94ea487 100644 --- a/frontend/src/pages/GoalsPage.jsx +++ b/frontend/src/pages/GoalsPage.jsx @@ -424,7 +424,7 @@ export default function GoalsPage({ selectedDate }) { }); showT(value ? "Goals will show on Overview" : "Goals hidden on Overview", "success"); } catch { - setShowGoalsInOverview(prev => !value); + setShowGoalsInOverview(() => !value); window.dispatchEvent(new CustomEvent(OVERVIEW_GOALS_VISIBILITY_EVENT, { detail: { value: !value } })); showT("Could not update overview goal setting", "warn"); } diff --git a/frontend/src/pages/LoadingScreen.jsx b/frontend/src/pages/LoadingScreen.jsx index 1a4ebfc..fe60073 100644 --- a/frontend/src/pages/LoadingScreen.jsx +++ b/frontend/src/pages/LoadingScreen.jsx @@ -560,7 +560,6 @@ export default function LoadingScreen({ // ── Derived display values ────────────────────────────────────────────────── const isError = phase === "error"; const isReady = phase === "ready"; - const dotColor = isError ? C.red : isReady ? C.green : C.green; const statusColor = isError ? C.red : isReady ? C.green : C.textMuted; const statusText = isError diff --git a/frontend/src/pages/OverviewPage.jsx b/frontend/src/pages/OverviewPage.jsx index c222eb3..f989296 100644 --- a/frontend/src/pages/OverviewPage.jsx +++ b/frontend/src/pages/OverviewPage.jsx @@ -166,8 +166,6 @@ function BestTimeInsight({ hourly, peakHour }) { const peak = fmt12h(peakHour); // Contextual label - const hour = window.start; - const period = hour < 12 ? "morning" : hour < 17 ? "afternoon" : "evening"; const label = `Your sharpest window is ${start}–${end}`; return ( @@ -334,7 +332,6 @@ function QuickGoalModal({ open, initial, onClose, onSave }) { export default function OverviewPage({ data, stats, - prevStats, prevWellbeing, showComparison, limits, diff --git a/frontend/src/pages/SettingsPage.jsx b/frontend/src/pages/SettingsPage.jsx index b44e2b3..4f7ed2f 100644 --- a/frontend/src/pages/SettingsPage.jsx +++ b/frontend/src/pages/SettingsPage.jsx @@ -455,8 +455,6 @@ function TelegramLiveCard({ status, config, onAction, loadingAction, push, onRef const borderColor = st.key === "running" ? "rgba(74,222,128,0.2)" : st.key === "degraded" || st.key === "paused" ? "rgba(251,191,36,0.14)" : C.border; const recentCmds = config?.recent_commands || []; - const lastCmd = recentCmds[0]; - const lastCmdText = lastCmd ? `Last command received: ${timeAgo(lastCmd.timestamp)}` : "No commands yet"; const togglePermission = async (key, val) => { // Specialized logic for webcam @@ -489,7 +487,7 @@ function TelegramLiveCard({ status, config, onAction, loadingAction, push, onRef } else { push(d.error || "Update failed", "error"); } - } catch (e) { push("Network error", "error"); } + } catch { push("Network error", "error"); } setUpdatingPerms(p => ({ ...p, [key]: false })); }; @@ -528,7 +526,7 @@ function TelegramLiveCard({ status, config, onAction, loadingAction, push, onRef push(`Installation failed: ${pd.message}`, "error"); setInstalling(false); } - } catch (e) { + } catch { clearInterval(pollInterval); setInstalling(false); } @@ -537,7 +535,7 @@ function TelegramLiveCard({ status, config, onAction, loadingAction, push, onRef push("Failed to start installation", "error"); setInstalling(false); } - } catch (e) { + } catch { push("Installation failed — check connection", "error"); setInstalling(false); } @@ -1615,7 +1613,7 @@ function SecuritySection({ push }) { // ═══════════════════════════════════════════════════════════════════════════════ // ABOUT SECTION // ═══════════════════════════════════════════════════════════════════════════════ -function AboutSection({ push }) { +function AboutSection() { const [tab, setTab] = useState("about"); const [updateState, setUpdateState] = useState(null); diff --git a/frontend/src/pages/UpdatePage.jsx b/frontend/src/pages/UpdatePage.jsx index 62e8fbc..ae43d90 100644 --- a/frontend/src/pages/UpdatePage.jsx +++ b/frontend/src/pages/UpdatePage.jsx @@ -1,4 +1,4 @@ -import { useState, useEffect, useCallback, useRef } from "react"; +import { useState, useEffect, useCallback } from "react"; import { GITHUB_REPO, shouldAutoCheckUpdate, recordUpdateCheck } from "../shared/updateUtils"; import { useVisibilityPolling } from "../shared/hooks"; @@ -226,7 +226,7 @@ function DownloadProgress({ progress }) { // ─── CURRENT VERSION HERO ──────────────────────────────────────────────────── -function VersionHero({ updateState, onCheck, onInstall, checking, installing }) { +function VersionHero({ updateState, onCheck, onInstall, installing }) { const status = updateState?.status; const current = updateState?.current_version; const latest = updateState?.latest_version; @@ -660,7 +660,6 @@ function UpdateStatsStrip({ updateState, releases }) { // ═══════════════════════════════════════════════════════════════════════════════ export default function UpdateSection({ push }) { const [updateState, setUpdateState] = useState(null); - const [checking, setChecking] = useState(false); const [installing, setInstalling] = useState(false); const [releases, setReleases] = useState(null); const [relError, setRelError] = useState(null); @@ -704,7 +703,6 @@ export default function UpdateSection({ push }) { }, [fetchGithubReleases]); // eslint-disable-line react-hooks/exhaustive-deps const handleCheck = async () => { - setChecking(true); try { await fetch(`${BASE_URL}/api/update/check`, { method: "POST" }); recordUpdateCheck(); // Record manually triggered check too @@ -713,7 +711,6 @@ export default function UpdateSection({ push }) { } catch { push("Failed to reach update server", "error"); } - setChecking(false); }; const handleInstall = async () => { @@ -739,7 +736,6 @@ export default function UpdateSection({ push }) { updateState={updateState} onCheck={handleCheck} onInstall={handleInstall} - checking={checking || updateState?.status === "checking"} installing={installing || updateState?.status === "downloading"} /> : ( diff --git a/frontend/src/pages/WeeklyReportPage.jsx b/frontend/src/pages/WeeklyReportPage.jsx index d16ec59..bc8d9f7 100644 --- a/frontend/src/pages/WeeklyReportPage.jsx +++ b/frontend/src/pages/WeeklyReportPage.jsx @@ -58,25 +58,6 @@ const CATEGORY_COLORS = { system: "#22d3ee", }; -function reportToText(report) { - if (!report) return ""; - const s = report.summary || {}; - const lines = [ - `Weekly Report (${report.period?.start} -> ${report.period?.end})`, - "", `Screen Time: ${fmtTime(s.total_screen_time || 0)}`, - `Avg / Day: ${fmtTime(s.avg_daily || 0)}`, - `Productivity: ${Math.round(s.productivity_pct || 0)}%`, - `Focus Score: ${Math.round(s.avg_focus_score || 0)}`, - "", "Top Apps:", - ...(report.top_apps || []).slice(0, 8).map((a, i) => `${i + 1}. ${(a.app_name || "").replace(".exe", "")} - ${fmtTime(a.total_seconds || 0)}`), - "", "Category Breakdown:", - ...(report.category_breakdown || []).map((c) => `- ${c.category}: ${fmtTime(c.total_seconds || 0)}`), - "", "Insights:", - ...(report.insights || []).map((i) => `- ${i}`), - ]; - return lines.join("\n"); -} - function reportToCsv(report) { if (!report) return ""; const rows = [["date", "total_seconds", "productive_pct"]]; @@ -283,7 +264,7 @@ function deriveHourlyInsights(grid, dates) { // Per-day peak const dayPeaks = {}; // Weekday vs weekend splits - let wdSecs = 0, weSecs = 0, wdProdSecs = 0, weProdSecs = 0; + let wdSecs = 0, weSecs = 0; for (const row of grid) { const h = row.hour; @@ -298,8 +279,8 @@ function deriveHourlyInsights(grid, dates) { // date is YYYY-MM-DD — day-of-week from dates array const dateIdx = dates.indexOf(row.date); const isWeekend = dateIdx >= 5; - if (isWeekend) { weSecs += s; weProdSecs += ps; } - else { wdSecs += s; wdProdSecs += ps; } + if (isWeekend) { weSecs += s; } + else { wdSecs += s; } } // 1. Peak week-hour (most total screen time) @@ -395,7 +376,7 @@ function deriveHourlyInsights(grid, dates) { return insights; } -function HourlyHeatmap({ data, weekStart, dailyBreakdown = [] }) { +function HourlyHeatmap({ data, weekStart }) { const [tooltip, setTooltip] = useState(null); const containerRef = useRef(null); @@ -843,7 +824,7 @@ function InsightCard({ text, index }) { } // ── Top app row ── -function TopApp({ app, seconds, pct, maxSec, rank, trend, deltaPct }) { +function TopApp({ app, seconds, maxSec, rank, trend, deltaPct }) { const rankColor = rank === 1 ? "#fbbf24" : rank <= 3 ? "#a78bfa" : "#475569"; const trendColor = trend === "up" ? "#f87171" : trend === "down" ? "#4ade80" : trend === "new" ? "#22d3ee" : "#64748b"; const trendText = trend === "up" ? `↑${Math.abs(deltaPct || 0)}%` : trend === "down" ? `↓${Math.abs(deltaPct || 0)}%` : trend === "new" ? "new" : "—"; diff --git a/frontend/src/shared/UpdateDialog.jsx b/frontend/src/shared/UpdateDialog.jsx index f2cef85..3a43f2e 100644 --- a/frontend/src/shared/UpdateDialog.jsx +++ b/frontend/src/shared/UpdateDialog.jsx @@ -1,4 +1,4 @@ -import { useState, useEffect } from "react"; +import { useState } from "react"; const C = { bg: "#080b14", diff --git a/frontend/src/shared/components.jsx b/frontend/src/shared/components.jsx index 9cfd05e..26a866f 100644 --- a/frontend/src/shared/components.jsx +++ b/frontend/src/shared/components.jsx @@ -1,6 +1,6 @@ import { useState, useEffect, useRef } from "react"; import { CATEGORY_COLORS, KNOWN_APP_EMOJIS, CATEGORY_EMOJIS } from "./constants"; -import { fmtTime, trendPct, resolveAppIcon, localYMD } from "./utils"; +import { fmtTime, resolveAppIcon, localYMD } from "./utils"; // ─── SKELETON ───────────────────────────────────────────────────────────────── export function Skeleton({ w = "100%", h = 20, r = 8 }) {