feat: implement t-1f9RIzd

2 files changed, 272 insertions, 165 deletions

diff --git a/Biz/PodcastItLater/UI.py b/Biz/PodcastItLater/UI.py
index 59de7e5..bdf7a5b 100644
--- a/Biz/PodcastItLater/UI.py
+++ b/Biz/PodcastItLater/UI.py
@@ -399,6 +399,173 @@ class PageLayout(Component[AnyChildren, PageLayoutAttrs]):
         )
 
 
+class AccountPageAttrs(Attrs):
+    """Attributes for AccountPage component."""
+
+    user: dict[str, typing.Any]
+    usage: dict[str, int]
+    limits: dict[str, int | None]
+    portal_url: str | None
+
+
+class AccountPage(Component[AnyChildren, AccountPageAttrs]):
+    """Account management page component."""
+
+    @override
+    def render(self) -> PageLayout:
+        user = self.attrs["user"]
+        usage = self.attrs["usage"]
+        limits = self.attrs["limits"]
+        portal_url = self.attrs["portal_url"]
+
+        plan_tier = user.get("plan_tier", "free")
+        is_paid = plan_tier == "paid"
+        
+        article_limit = limits.get("articles_per_period")
+        article_usage = usage.get("articles", 0)
+        
+        limit_text = "Unlimited" if article_limit is None else str(article_limit)
+        
+        return PageLayout(
+            html.div(
+                html.div(
+                    html.div(
+                        html.div(
+                            html.div(
+                                html.h2(
+                                    html.i(
+                                        classes=[
+                                            "bi",
+                                            "bi-person-circle",
+                                            "me-2"
+                                        ]
+                                    ),
+                                    "My Account",
+                                    classes=["card-title", "mb-4"],
+                                ),
+                                # User Info Section
+                                html.div(
+                                    html.h5("Profile", classes=["mb-3"]),
+                                    html.p(
+                                        html.strong("Email: "),
+                                        user.get("email", ""),
+                                        classes=["mb-2"],
+                                    ),
+                                    html.p(
+                                        html.strong("Member since: "),
+                                        user.get("created_at", "").split("T")[0],
+                                        classes=["mb-4"],
+                                    ),
+                                    classes=["mb-5"],
+                                ),
+                                # Subscription Section
+                                html.div(
+                                    html.h5("Subscription", classes=["mb-3"]),
+                                    html.div(
+                                        html.div(
+                                            html.strong("Current Plan"),
+                                            html.span(
+                                                plan_tier.title(),
+                                                classes=[
+                                                    "badge",
+                                                    "bg-success"
+                                                    if is_paid
+                                                    else "bg-secondary",
+                                                    "ms-2",
+                                                ],
+                                            ),
+                                            classes=[
+                                                "d-flex",
+                                                "align-items-center",
+                                                "mb-3",
+                                            ],
+                                        ),
+                                        # Usage Stats
+                                        html.div(
+                                            html.p(
+                                                "Usage this period:",
+                                                classes=["mb-2", "text-muted"],
+                                            ),
+                                            html.div(
+                                                html.div(
+                                                    f"{article_usage} / {limit_text}",
+                                                    classes=["mb-1"],
+                                                ),
+                                                html.div(
+                                                    html.div(
+                                                        classes=["progress-bar"],
+                                                        role="progressbar",
+                                                        style={
+                                                            "width": f"{min(100, (article_usage / article_limit * 100))}%"
+                                                        } if article_limit else {"width": "0%"},
+                                                    ),
+                                                    classes=["progress", "mb-3"],
+                                                    style={"height": "10px"},
+                                                ) if article_limit else html.div(),
+                                                classes=["mb-3"],
+                                            ),
+                                        ),
+                                        # Actions
+                                        html.div(
+                                            html.form(
+                                                html.button(
+                                                    html.i(classes=["bi", "bi-credit-card", "me-2"]),
+                                                    "Manage Subscription",
+                                                    type="submit",
+                                                    classes=["btn", "btn-outline-primary"],
+                                                ),
+                                                method="post",
+                                                action=portal_url,
+                                            ) if is_paid and portal_url else
+                                            html.a(
+                                                html.i(classes=["bi", "bi-star-fill", "me-2"]),
+                                                "Upgrade to Pro",
+                                                href="/pricing",
+                                                classes=["btn", "btn-primary"],
+                                            ),
+                                            classes=["d-flex", "gap-2"],
+                                        ),
+                                        classes=["card", "card-body", "bg-light"],
+                                    ),
+                                    classes=["mb-5"],
+                                ),
+                                # Logout Section
+                                html.div(
+                                    html.form(
+                                        html.button(
+                                            html.i(
+                                                classes=[
+                                                    "bi",
+                                                    "bi-box-arrow-right",
+                                                    "me-2"
+                                                ]
+                                            ),
+                                            "Log Out",
+                                            type="submit",
+                                            classes=["btn", "btn-outline-danger"],
+                                        ),
+                                        action="/logout",
+                                        method="post",
+                                    ),
+                                    classes=["border-top", "pt-4"],
+                                ),
+                                classes=["card-body", "p-4"],
+                            ),
+                            classes=["card", "shadow-sm"],
+                        ),
+                        classes=["col-lg-8", "mx-auto"],
+                    ),
+                    classes=["row"],
+                ),
+            ),
+            user=user,
+            current_page="account",
+            page_title="Account - PodcastItLater",
+            error=None,
+            meta_tags=[],
+        )
+
+
 class PricingPageAttrs(Attrs):
     """Attributes for PricingPage component."""
 
@@ -414,12 +581,7 @@ class PricingPage(Component[AnyChildren, PricingPageAttrs]):
         current_tier = user.get("plan_tier", "free") if user else "free"
 
         return PageLayout(
-            user=user,
-            current_page="pricing",
-            page_title="Pricing - PodcastItLater",
-            error=None,
-            meta_tags=[],
-            children=[
+            html.div(
                 html.div(
                     html.h2("Simple Pricing", classes=["text-center", "mb-5"]),
                     html.div(
@@ -539,5 +701,10 @@ class PricingPage(Component[AnyChildren, PricingPageAttrs]):
                     ),
                     classes=["container", "py-3"],
                 ),
-            ],
+            ),
+            user=user,
+            current_page="pricing",
+            page_title="Pricing - PodcastItLater",
+            error=None,
+            meta_tags=[],
         )
diff --git a/Biz/PodcastItLater/Web.py b/Biz/PodcastItLater/Web.py
index e80b0b4..b7845b3 100644
--- a/Biz/PodcastItLater/Web.py
+++ b/Biz/PodcastItLater/Web.py
@@ -1004,6 +1004,57 @@ def upgrade(request: Request) -> RedirectResponse:
         return RedirectResponse(url="/pricing?error=checkout_failed")
 
 
+@app.get("/account")
+def account(request: Request) -> UI.AccountPage | RedirectResponse:
+    """Display account management page."""
+    user_id = request.session.get("user_id")
+    if not user_id:
+        return RedirectResponse(url="/?error=login_required")
+
+    user = Core.Database.get_user_by_id(user_id)
+    if not user:
+        request.session.clear()
+        return RedirectResponse(url="/?error=user_not_found")
+
+    # Get usage stats
+    period_start, period_end = Billing.get_period_boundaries(user)
+    usage = Billing.get_usage(user_id, period_start, period_end)
+
+    # Get limits
+    tier = user.get("plan_tier", "free")
+    limits = Billing.TIER_LIMITS.get(tier, Billing.TIER_LIMITS["free"])
+
+    return UI.AccountPage(
+        user=user,
+        usage=usage,
+        limits=limits,
+        portal_url="/billing/portal" if tier == "paid" else None,
+    )
+
+
+@app.post("/logout")
+def logout(request: Request) -> RedirectResponse:
+    """Log out user."""
+    request.session.clear()
+    return RedirectResponse(url="/", status_code=303)
+
+
+@app.post("/billing/portal")
+def billing_portal(request: Request) -> RedirectResponse:
+    """Redirect to Stripe billing portal."""
+    user_id = request.session.get("user_id")
+    if not user_id:
+        return RedirectResponse(url="/?error=login_required")
+
+    try:
+        portal_url = Billing.create_portal_session(user_id, BASE_URL)
+        return RedirectResponse(url=portal_url, status_code=303)
+    except ValueError as e:
+        logger.warning("Failed to create portal session: %s", e)
+        # If user has no customer ID (e.g. free tier), redirect to pricing
+        return RedirectResponse(url="/pricing")
+
+
 def _handle_test_login(email: str, request: Request) -> Response:
     """Handle login in test mode."""
     # Special handling for demo account
@@ -1149,7 +1200,7 @@ def verify_magic_link(request: Request) -> Response:
 
 
 @app.get("/account")
-def account_page(request: Request) -> UI.PageLayout | RedirectResponse:
+def account_page(request: Request) -> UI.AccountPage | RedirectResponse:
     """Account management page."""
     user_id = request.session.get("user_id")
     if not user_id:
@@ -1159,165 +1210,19 @@ def account_page(request: Request) -> UI.PageLayout | RedirectResponse:
     if not user:
         return RedirectResponse(url="/?error=user_not_found")
 
-    # Get subscription details
+    # Get usage stats
+    period_start, period_end = Billing.get_period_boundaries(user)
+    usage = Billing.get_usage(user["id"], period_start, period_end)
+    
+    # Get limits
     tier = user.get("plan_tier", "free")
-    tier_info = Billing.get_tier_info(tier)
-    subscription_status = user.get("subscription_status", "")
-    cancel_at_period_end = user.get("cancel_at_period_end", 0) == 1
-
-    return UI.PageLayout(
-        html.h2(
-            html.i(
-                classes=["bi", "bi-person-circle", "me-2"],
-            ),
-            "Account Management",
-            classes=["mb-4"],
-        ),
-        html.div(
-            html.h4(
-                html.i(classes=["bi", "bi-envelope-fill", "me-2"]),
-                "Account Information",
-                classes=["card-header", "bg-transparent"],
-            ),
-            html.div(
-                html.div(
-                    html.strong("Email: "),
-                    user["email"],
-                    classes=["mb-2"],
-                ),
-                html.div(
-                    html.strong("Account Created: "),
-                    user["created_at"],
-                    classes=["mb-2"],
-                ),
-                classes=["card-body"],
-            ),
-            classes=["card", "mb-4"],
-        ),
-        html.div(
-            html.h4(
-                html.i(
-                    classes=["bi", "bi-credit-card-fill", "me-2"],
-                ),
-                "Subscription",
-                classes=["card-header", "bg-transparent"],
-            ),
-            html.div(
-                html.div(
-                    html.strong("Plan: "),
-                    tier_info["name"],
-                    f" ({tier_info['price']})",
-                    classes=["mb-2"],
-                ),
-                html.div(
-                    html.strong("Status: "),
-                    subscription_status.title()
-                    if subscription_status
-                    else "Active",
-                    classes=["mb-2"],
-                )
-                if tier == "paid"
-                else html.div(),
-                html.div(
-                    html.i(
-                        classes=[
-                            "bi",
-                            "bi-info-circle",
-                            "me-1",
-                        ],
-                    ),
-                    "Your subscription will cancel at the end "
-                    "of the billing period.",
-                    classes=[
-                        "alert",
-                        "alert-warning",
-                        "mt-2",
-                        "mb-2",
-                    ],
-                )
-                if cancel_at_period_end
-                else html.div(),
-                html.div(
-                    html.strong("Features: "),
-                    tier_info["description"],
-                    classes=["mb-3"],
-                ),
-                html.div(
-                    html.a(
-                        html.i(
-                            classes=[
-                                "bi",
-                                "bi-arrow-up-circle",
-                                "me-1",
-                            ],
-                        ),
-                        "Upgrade to Paid Plan",
-                        href="#",
-                        hx_post="/billing/checkout",
-                        hx_vals='{"tier": "paid"}',
-                        classes=[
-                            "btn",
-                            "btn-success",
-                            "me-2",
-                        ],
-                    )
-                    if tier == "free"
-                    else html.form(
-                        html.button(
-                            html.i(
-                                classes=[
-                                    "bi",
-                                    "bi-gear-fill",
-                                    "me-1",
-                                ],
-                            ),
-                            "Manage Subscription",
-                            type="submit",
-                            classes=[
-                                "btn",
-                                "btn-primary",
-                                "me-2",
-                            ],
-                        ),
-                        method="post",
-                        action="/billing/portal",
-                    ),
-                ),
-                classes=["card-body"],
-            ),
-            classes=["card", "mb-4"],
-        ),
-        html.div(
-            html.h4(
-                html.i(classes=["bi", "bi-sliders", "me-2"]),
-                "Actions",
-                classes=["card-header", "bg-transparent"],
-            ),
-            html.div(
-                html.a(
-                    html.i(
-                        classes=[
-                            "bi",
-                            "bi-box-arrow-right",
-                            "me-1",
-                        ],
-                    ),
-                    "Logout",
-                    href="/logout",
-                    classes=[
-                        "btn",
-                        "btn-outline-secondary",
-                        "mb-2",
-                        "me-2",
-                    ],
-                ),
-                classes=["card-body"],
-            ),
-            classes=["card", "mb-4"],
-        ),
+    limits = Billing.TIER_LIMITS.get(tier, Billing.TIER_LIMITS["free"])
+    
+    return UI.AccountPage(
         user=user,
-        current_page="account",
-        error=None,
+        usage=usage,
+        limits=limits,
+        portal_url="/billing/portal" if tier == "paid" else None,
     )
 
 
@@ -3169,7 +3074,11 @@ class TestAccountPage(BaseWebTest):
     """Test account page functionality."""
 
     def setUp(self) -> None:
+<<<<<<< Updated upstream
         """Set up test client with logged-in user."""
+=======
+        """Set up test with user."""
+>>>>>>> Stashed changes
         super().setUp()
         self.user_id, _ = Core.Database.create_user(
             "test@example.com",
@@ -3177,6 +3086,7 @@ class TestAccountPage(BaseWebTest):
         )
         self.client.post("/login", data={"email": "test@example.com"})
 
+<<<<<<< Updated upstream
     def test_account_page_logged_in(self) -> None:
         """Account page should render for logged-in users."""
         response = self.client.get("/account")
@@ -3225,6 +3135,36 @@ class TestAccountPage(BaseWebTest):
                 response.headers["location"],
                 "https://billing.stripe.com/test",
             )
+=======
+    def test_account_page_shows_usage(self) -> None:
+        """Account page should show usage stats."""
+        # Create some usage
+        ep_id = Core.Database.create_episode(
+            title="Test Episode",
+            audio_url="https://example.com/audio.mp3",
+            duration=300,
+            content_length=1000,
+            user_id=self.user_id,
+            author="Test Author",
+            original_url="https://example.com/article",
+            original_url_hash=Core.hash_url("https://example.com/article"),
+        )
+        Core.Database.add_episode_to_user(self.user_id, ep_id)
+
+        response = self.client.get("/account")
+        
+        self.assertEqual(response.status_code, 200)
+        self.assertIn("1 / 10", response.text)  # Usage / Limit for free tier
+        self.assertIn("My Account", response.text)
+        self.assertIn("test@example.com", response.text)
+
+    def test_account_page_login_required(self) -> None:
+        """Should redirect to login if not logged in."""
+        self.client.get("/logout")
+        response = self.client.get("/account", follow_redirects=False)
+        self.assertEqual(response.status_code, 307)
+        self.assertEqual(response.headers["location"], "/?error=login_required")
+>>>>>>> Stashed changes
 
 
 def test() -> None: