Merge branch 'main' into feat/add-task-to-project

Resolve conflict in static/app.js: keep linkify on task names and tag pill (tagNameForTask / .t-tag).

Made-with: Cursor

Author: felipedfe

.github/workflows/fly-deploy.yml

@@ -0,0 +1,5 @@
+.PHONY: dev
+
+dev:
+	@lsof -ti:8000 | xargs kill -9 2>/dev/null || true
+	uvicorn app:app --reload

Makefile

@@ -221,6 +221,39 @@ Later items can be marked as done. Each later item shows a green ✓ button (to
 | `GET` | `/done?offset=0&limit=50` | Paginated list of done items |
 | `GET` | `/done/stats` | Stats: `this_week`, `this_month`, `avg_per_week` |
 
+## Shared profile
+
+Logged-in users can share a read-only view of their tasks, history, done list, and monthly report with anyone via a unique link.
+
+**How it works**
+
+1. Click "share live view" in the top bar (next to the theme toggle). A popover opens with an Enable/Disable toggle.
+2. Click "Enable" to generate a share link. The link appears in the popover with a "Copy" button.
+3. The link looks like `https://doingit.online/shared/<uuid>`. Anyone who opens it sees the user's live tasks, history, done list, and monthly report — all read-only, no login required. The shared view polls every 5 seconds for live updates.
+4. Click "Disable" to revoke the share token. Existing links stop working.
+5. Viewers who are not logged in see a prominent call-to-action banner at the top inviting them to try Doing It.
+6. All interactive elements (search, session controls, delete buttons, later input) are hidden in shared view. Data is fetched from public `/shared/{token}/*` endpoints that require no authentication.
+
+**API endpoints**
+
+| Method | Path | Description |
+|--------|------|-------------|
+| `GET` | `/share/status` | Check if sharing is enabled and get token (auth required) |
+| `POST` | `/share/enable` | Generate or return existing share token (auth required) |
+| `POST` | `/share/disable` | Revoke share token (auth required) |
+| `GET` | `/shared/{token}/data` | Public: tasks, later items, theme, projects |
+| `GET` | `/shared/{token}/done` | Public: paginated done items |
+| `GET` | `/shared/{token}/done/stats` | Public: done stats and sparkline |
+| `GET` | `/shared/{token}/report/monthly` | Public: 30-day time report |
+
+## Task ordering
+
+Today's tasks are ordered by most recently finished session. When you stop a running task, it stays at the top of the list. Running tasks always appear first, followed by tasks sorted by their latest completed session timestamp (descending). This means the task you just worked on is always easy to find.
+
+## Later list drag-and-drop
+
+Later (to-do) items can be reordered by dragging. Hover over an item to reveal the drag handle on the left (same position as the shortcut numbers in the task list). Drag an item up or down to change its position. New items are added at the top of the list.
+
 ## Data
 
 All task data is stored per-user in a Postgres database. Locally this is the `tt` database on your Postgres.app instance. In production it's the Fly.io Postgres cluster attached to the app.

README.md

@@ -108,6 +108,7 @@ def init_db():
                     cur.execute("ALTER TABLE users ADD COLUMN IF NOT EXISTS trial_started_at TIMESTAMPTZ")
                     cur.execute("ALTER TABLE users ADD COLUMN IF NOT EXISTS is_comped BOOLEAN DEFAULT FALSE")
                     cur.execute("ALTER TABLE users ADD COLUMN IF NOT EXISTS theme TEXT")
+                    cur.execute("ALTER TABLE users ADD COLUMN IF NOT EXISTS share_token TEXT UNIQUE")
 
                     # ── New normalized tables ────────────────────────────────
                     cur.execute("""
@@ -242,6 +243,14 @@ def make_token(user_id: int) -> str:
     return jwt.encode({"sub": str(user_id), "exp": expire}, SECRET_KEY, algorithm=ALGORITHM)
 
 
+def user_id_from_share_token(token: str, db) -> int:
+    db.execute("SELECT id FROM users WHERE share_token = %s", (token,))
+    row = db.fetchone()
+    if not row:
+        raise HTTPException(status_code=404, detail="Shared profile not found")
+    return row["id"]
+
+
 class AuthRequest(BaseModel):
     email: str
     password: str
@@ -394,11 +403,7 @@ def merge_projects_from_blob(tasks: list, blob_json: str | None) -> tuple[list,
     return tasks, projects
 
 
-@app.get("/data")
-def get_data(
-    user_id: Annotated[int, Depends(current_user_id)],
-    db: Annotated[psycopg2.extensions.cursor, Depends(get_db)],
-):
+def _fetch_data(user_id: int, db):
     db.execute("""
         SELECT
             t.id,
@@ -436,7 +441,15 @@ def get_data(
     blob_json = blob_row["tasks_json"] if blob_row else None
     tasks, projects = merge_projects_from_blob(tasks, blob_json)
 
-    return JSONResponse({"tasks": tasks, "later": later, "theme": theme, "projects": projects})
+    return {"tasks": tasks, "later": later, "theme": theme, "projects": projects}
+
+
+@app.get("/data")
+def get_data(
+    user_id: Annotated[int, Depends(current_user_id)],
+    db: Annotated[psycopg2.extensions.cursor, Depends(get_db)],
+):
+    return JSONResponse(_fetch_data(user_id, db))
 
 
 @app.post("/data", status_code=204)
@@ -557,13 +570,7 @@ def mark_done(
     return {"ok": True}
 
 
-@app.get("/done")
-def get_done(
-    user_id: Annotated[int, Depends(current_user_id)],
-    db: Annotated[psycopg2.extensions.cursor, Depends(get_db)],
-    offset: int = 0,
-    limit: int = 50,
-):
+def _fetch_done(user_id: int, db, offset: int = 0, limit: int = 50):
     limit = min(limit, 100)
     db.execute(
         "SELECT id, text, done_at FROM done_items "
@@ -579,11 +586,17 @@ def get_done(
     return {"items": items, "total": total}
 
 
-@app.get("/done/stats")
-def done_stats(
+@app.get("/done")
+def get_done(
     user_id: Annotated[int, Depends(current_user_id)],
     db: Annotated[psycopg2.extensions.cursor, Depends(get_db)],
+    offset: int = 0,
+    limit: int = 50,
 ):
+    return _fetch_done(user_id, db, offset, limit)
+
+
+def _fetch_done_stats(user_id: int, db):
     # Done this week (Monday-based)
     db.execute("""
         SELECT COUNT(*) AS cnt FROM done_items
@@ -598,21 +611,152 @@ def done_stats(
     """, (user_id,))
     this_month = db.fetchone()["cnt"]
 
-    # Average per week over last 10 weeks
+    # Weeks since signup (capped at 10)
     db.execute("""
-        SELECT COUNT(*) AS cnt FROM done_items
-        WHERE user_id = %s AND done_at >= NOW() - INTERVAL '10 weeks'
+        SELECT GREATEST(1, LEAST(10,
+            CEIL(EXTRACT(EPOCH FROM NOW() - created_at) / (7*86400))
+        ))::int AS weeks
+        FROM users WHERE id = %s
     """, (user_id,))
-    total_10w = db.fetchone()["cnt"]
-    avg_per_week = round(total_10w / 10, 1)
+    max_weeks = db.fetchone()["weeks"]
+
+    # Weekly counts for sparkline (most recent max_weeks, oldest first)
+    db.execute("""
+        SELECT date_trunc('week', done_at) AS wk, COUNT(*) AS cnt
+        FROM done_items
+        WHERE user_id = %s AND done_at >= NOW() - make_interval(weeks => %s)
+        GROUP BY wk ORDER BY wk
+    """, (user_id, max_weeks))
+    rows = {r["wk"]: r["cnt"] for r in db.fetchall()}
+
+    # Build array of counts per week (oldest first)
+    from datetime import timedelta
+    now_trunc = db.execute("SELECT date_trunc('week', NOW()) AS wk")
+    current_wk = db.fetchone()["wk"]
+    weekly = []
+    for i in range(max_weeks - 1, -1, -1):
+        wk = current_wk - timedelta(weeks=i)
+        weekly.append(rows.get(wk, 0))
+
+    # Average per week over last 4 weeks (or fewer if signed up recently)
+    avg_weeks = min(4, max_weeks)
+    avg_total = sum(weekly[-avg_weeks:])
+    avg_per_week = round(avg_total / avg_weeks, 1)
 
     return {
-        "this_week": this_week,
         "this_month": this_month,
+        "this_week": this_week,
         "avg_per_week": avg_per_week,
+        "avg_weeks": avg_weeks,
+        "weekly": weekly,
     }
 
 
+@app.get("/done/stats")
+def done_stats(
+    user_id: Annotated[int, Depends(current_user_id)],
+    db: Annotated[psycopg2.extensions.cursor, Depends(get_db)],
+):
+    return _fetch_done_stats(user_id, db)
+
+
+def _fetch_monthly_report(user_id: int, db):
+    thirty_days_ago_ms = int((time.time() - 30 * 86400) * 1000)
+    db.execute("""
+        SELECT t.name,
+               SUM(s.end_ts - s.start_ts) AS total_ms,
+               COUNT(*) AS session_count
+        FROM sessions s
+        JOIN tasks t ON t.id = s.task_id AND t.user_id = s.user_id
+        WHERE s.user_id = %s
+          AND s.start_ts >= %s
+          AND s.end_ts IS NOT NULL
+        GROUP BY t.name
+        ORDER BY total_ms DESC
+    """, (user_id, thirty_days_ago_ms))
+    tasks = [
+        {"name": r["name"], "total_ms": int(r["total_ms"]), "session_count": r["session_count"]}
+        for r in db.fetchall()
+    ]
+    total_ms = sum(t["total_ms"] for t in tasks)
+    period_start = datetime.fromtimestamp(thirty_days_ago_ms / 1000, tz=timezone.utc).strftime("%Y-%m-%d")
+    period_end = datetime.now(timezone.utc).strftime("%Y-%m-%d")
+    return {"tasks": tasks, "total_ms": total_ms, "period_start": period_start, "period_end": period_end}
+
+
+@app.get("/report/monthly")
+def monthly_report(
+    user_id: Annotated[int, Depends(current_user_id)],
+    db: Annotated[psycopg2.extensions.cursor, Depends(get_db)],
+):
+    return _fetch_monthly_report(user_id, db)
+
+
+# ── Share endpoints ──────────────────────────────────────────────────────────
+
+@app.get("/share/status")
+def share_status(
+    user_id: Annotated[int, Depends(current_user_id)],
+    db: Annotated[psycopg2.extensions.cursor, Depends(get_db)],
+):
+    db.execute("SELECT share_token FROM users WHERE id = %s", (user_id,))
+    row = db.fetchone()
+    token = row["share_token"] if row else None
+    return {"enabled": bool(token), "share_token": token}
+
+
+@app.post("/share/enable")
+def share_enable(
+    user_id: Annotated[int, Depends(current_user_id)],
+    db: Annotated[psycopg2.extensions.cursor, Depends(get_db)],
+):
+    db.execute("SELECT share_token FROM users WHERE id = %s", (user_id,))
+    row = db.fetchone()
+    if row and row["share_token"]:
+        return {"share_token": row["share_token"]}
+    token = str(uuid_mod.uuid4())
+    db.execute("UPDATE users SET share_token = %s WHERE id = %s", (token, user_id))
+    return {"share_token": token}
+
+
+@app.post("/share/disable")
+def share_disable(
+    user_id: Annotated[int, Depends(current_user_id)],
+    db: Annotated[psycopg2.extensions.cursor, Depends(get_db)],
+):
+    db.execute("UPDATE users SET share_token = NULL WHERE id = %s", (user_id,))
+    return {"ok": True}
+
+
+@app.get("/shared/{token}/data")
+def shared_get_data(token: str, db: Annotated[psycopg2.extensions.cursor, Depends(get_db)]):
+    uid = user_id_from_share_token(token, db)
+    return JSONResponse(_fetch_data(uid, db))
+
+
+@app.get("/shared/{token}/done")
+def shared_get_done(
+    token: str,
+    db: Annotated[psycopg2.extensions.cursor, Depends(get_db)],
+    offset: int = 0,
+    limit: int = 50,
+):
+    uid = user_id_from_share_token(token, db)
+    return _fetch_done(uid, db, offset, limit)
+
+
+@app.get("/shared/{token}/done/stats")
+def shared_done_stats(token: str, db: Annotated[psycopg2.extensions.cursor, Depends(get_db)]):
+    uid = user_id_from_share_token(token, db)
+    return _fetch_done_stats(uid, db)
+
+
+@app.get("/shared/{token}/report/monthly")
+def shared_monthly_report(token: str, db: Annotated[psycopg2.extensions.cursor, Depends(get_db)]):
+    uid = user_id_from_share_token(token, db)
+    return _fetch_monthly_report(uid, db)
+
+
 def count_today_sessions(user_id: int, db) -> int:
     today = datetime.now(timezone.utc).strftime("%Y-%m-%d")
     db.execute("""
@@ -777,11 +921,31 @@ def favicon_local():
     return FileResponse("favicon-local.png", media_type="image/png")
 
 
+@app.get("/shared/{token}")
+def shared_root(token: str):
+    return FileResponse("index.html")
+
+
+@app.get("/shared/{token}/done-list")
+def shared_done_page(token: str):
+    return FileResponse("index.html")
+
+
+@app.get("/shared/{token}/report")
+def shared_report_page(token: str):
+    return FileResponse("index.html")
+
+
 @app.get("/done-list")
 def done_page():
     return FileResponse("index.html")
 
 
+@app.get("/report")
+def report_page():
+    return FileResponse("index.html")
+
+
 @app.get("/")
 def root():
     return FileResponse("index.html")

app.py

@@ -96,8 +96,23 @@
 <div id="app">
 
   <div class="theme-bar">
+    <button class="header-share-live" id="header-share" style="display:none" title="Share a live URL so others can follow your progress in real time">share live view</button>
+    <span class="header-sep theme-bar-sep" id="theme-bar-sep" style="display:none">/</span>
+    <button class="header-logout-btn" id="header-logout" style="display:none">logout</button>
+    <span class="header-sep theme-bar-sep" id="theme-bar-sep2" style="display:none">/</span>
+    <button class="header-signin-btn" id="header-signin" style="display:none">sign in</button>
     <button class="header-theme" id="theme-toggle" title="Toggle theme"></button>
   </div>
+  <div class="share-popover" id="share-popover" style="display:none">
+    <div class="share-popover-row">
+      <span class="share-popover-label">Live sharing</span>
+      <button class="share-popover-toggle" id="share-toggle">Enable</button>
+    </div>
+    <div class="share-popover-link-row" id="share-link-row" style="display:none">
+      <input class="share-popover-url" id="share-url" readonly>
+      <button class="share-popover-copy" id="share-copy">Copy</button>
+    </div>
+  </div>
 
   <div class="header">
     <span class="header-logo">Doing It</span>
@@ -108,8 +123,6 @@
     <button class="header-pomodoro" id="header-pomodoro" title="Toggle pomodoro">🍅</button>
     <input class="header-pomodoro-mins" id="header-pomodoro-mins" type="number" min="1" max="60" value="25" title="Pomodoro minutes">
     <span class="header-sep">/</span>
-    <button class="header-logout" id="header-signin" style="display:none">sign in</button>
-    <button class="header-logout" id="header-logout" style="display:none">logout</button>
     <button class="header-logout header-upgrade" id="header-upgrade" style="display:none">upgrade: it’s $1.49 a month…</button>
     <button class="header-logout header-manage" id="header-manage" style="display:none">pro ✓</button>
     <span class="header-vip" id="header-vip" style="display:none">♛ vip</span>
@@ -145,12 +158,13 @@
   <ul id="task-list"></ul>
 
   <div id="history"></div>
+  <a id="report-link" class="report-link" href="/report">Monthly report →</a>
 
   <section id="later">
     <div id="later-header">later</div>
     <input id="later-input" type="text" placeholder="something for later… (Shift+N)" autocomplete="off">
     <ul id="later-list"></ul>
-    <a id="later-done-link" href="/done-list">See all Done</a>
+    <a id="later-done-link" href="/done-list">See all done →</a>
   </section>
 
 </div>