diff --git a/worker/src/templates/ads.html b/worker/src/templates/ads.html index 1ec1d93..14871b1 100644 --- a/worker/src/templates/ads.html +++ b/worker/src/templates/ads.html @@ -1,40 +1,65 @@ {% extends "base.html" %} {% block title %}Ads — Willhaben Tracker{% endblock %} -{% block content %} -
-

Recent Ads

-
+{% block title_in_topbar %}Recent Ads{% endblock %} +{% block content %} {% if not error and ads %} -
+
- - + - - - - + + {% for ad in ads %} - - - - - - - + + + + {% endfor %}
TitlePriceAd LocationPostcodeURLPublishedFirst SeenFirst TrackedLink
{{ ad.title[:70] }}{% if ad.title|length > 70 %}…{% endif %}{{ format_price(ad.price) }}{{ ad.location or '—' }}{{ ad.postcode or '—' }}Link{{ ad.published_at.strftime('%Y-%m-%d %H:%M') if ad.published_at else '—' }}{{ ad.first_seen_at.strftime('%Y-%m-%d %H:%M') }} +
+ {{ ad.title }} +
+
+ {{ format_price(ad.price) }} + {% if ad.published_at %} + + + Pub: {{ ad.published_at.strftime('%m/%d %H:%M') }} + + {% endif %} +
+ 		+
+ + {% if ad.postcode %}{{ ad.postcode }} • {% endif %} + {{ ad.location or '—' }} +
+ 		+
+ {{ ad.first_seen_at.strftime('%Y-%m-%d') }} +
+
+ {{ ad.first_seen_at.strftime('%H:%M:%S') }} +
+ 		+ + Open + +
{% elif not error %} -
No ads found.
+
+ +

No ads tracked yet.

+
{% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/worker/src/templates/base.html b/worker/src/templates/base.html index faba196..82a03c3 100644 --- a/worker/src/templates/base.html +++ b/worker/src/templates/base.html @@ -4,128 +4,377 @@ {% block title %}Willhaben Tracker{% endblock %} + + +
- {% if error %} -
{{ error }}
- {% endif %} - {% block content %}{% endblock %} +
+

{% block title_in_topbar %}{% endblock %}

+
+
+ {% if error %} +
+ + {{ error }} +
+ {% endif %} + {% block content %}{% endblock %} +
- \ No newline at end of file + diff --git a/worker/src/templates/dashboard.html b/worker/src/templates/dashboard.html index d7c8bae..05fb9fb 100644 --- a/worker/src/templates/dashboard.html +++ b/worker/src/templates/dashboard.html @@ -1,52 +1,71 @@ {% extends "base.html" %} {% block title %}Dashboard — Willhaben Tracker{% endblock %} +{% block title_in_topbar %}Dashboard{% endblock %} + {% block content %} -
-

Dashboard

+{% if data %} +

Overview

+
+ +
+
Total Keywords
+
{{ data.total_keywords }}
+
+ {{ data.active_keywords }} active +
+
+ +
+
Total Ads Tracked
+
{{ data.total_ads }}
+
Across all time
+
+ +
+
Active Users
+
{{ data.total_users }}
+
Subscribed to updates
+
+ +
+
Notifications Sent
+
{{ data.notifications_sent }}
+
Via Telegram
+
+
-{% if data %} -
-
-
Total Keywords
-
{{ data.total_keywords }}
-
{{ data.active_keywords }} active
-
-
-
Total Ads
-
{{ data.total_ads }}
-
-
-
Active Users
-
{{ data.total_users }}
-
-
-
Notifications Sent
-
{{ data.notifications_sent }}
-
-
-
Queue Pending
-
{{ data.queue_pending }}
-
-
-
Queue Dead
-
{{ data.queue_dead }}
-
-
-
Last Scheduler Run
-
+

System Health

+
+ +
+
Last Scheduler Run
+
{{ data.last_scheduler.strftime('%Y-%m-%d %H:%M:%S') if data.last_scheduler else 'Never' }}
+
Worker polling rhythm
-
-
HTTP Proxy
-
+ +
+
HTTP Proxy
+
{{ 'Enabled' if data.proxy_enabled else 'Disabled' }}
-
- {{ 'Outbound scraping uses the proxy' if data.proxy_enabled else 'Outbound scraping goes direct' }} +
+ {{ 'Outbound scraping uses proxy' if data.proxy_enabled else 'Direct connection' }}
+ +
+
Delivery Queue
+
+ {{ data.queue_pending }} pending +
+
+ {{ data.queue_dead }} dead letters +
+
+
{% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/worker/src/templates/keyword_detail.html b/worker/src/templates/keyword_detail.html index 068e4a6..f0d47f5 100644 --- a/worker/src/templates/keyword_detail.html +++ b/worker/src/templates/keyword_detail.html @@ -1,113 +1,153 @@ {% extends "base.html" %} {% block title %}{{ keyword.keyword }} — Willhaben Tracker{% endblock %} -{% block content %} -
-

{{ keyword.keyword }}

+{% block title_in_topbar %} +
+ {{ keyword.keyword }} + {{ keyword.id[:8] }}
+{% endblock %} +{% block content %} {% if keyword %} -
-
-
Status
+

Configuration

+
+
+
Status
{% if keyword.is_active %} - Active + Active {% else %} - Stopped + Stopped {% endif %}
-
-
Interval
-
{{ keyword.interval_minutes }}m
+ +
+
Polling Interval
+
{{ keyword.interval_minutes }}m
-
-
Subscribers
-
{{ subscriber_count }}
+ +
+
Subscribers
+
{{ subscriber_count }}
+
Users tracking this
-
-
Price Range
-
- {% if keyword.price_min %}€{{ (keyword.price_min / 100)|round(2) }}{% else %}No min{% endif %} - — - {% if keyword.price_max %}€{{ (keyword.price_max / 100)|round(2) }}{% else %}No max{% endif %} + +
+
Price Filters
+
+ {% if keyword.price_min %}€{{ (keyword.price_min / 100)|round(2) }}{% else %}0{% endif %} + to + {% if keyword.price_max %}€{{ (keyword.price_max / 100)|round(2) }}{% else %}Max{% endif %}
-
-
Postcodes
-
- {{ ', '.join(keyword.allowed_postcodes) if keyword.allowed_postcodes else 'All' }} + +
+
Postcodes Filter
+
+ {{ ', '.join(keyword.allowed_postcodes) if keyword.allowed_postcodes else 'Any' }}
-
-
Last Scraped
-
- {{ keyword.last_scraped_at.strftime('%Y-%m-%d %H:%M') if keyword.last_scraped_at else 'Never' }} + +
+
Last Successful Scrape
+
+ {% if keyword.last_scraped_at %} + {{ keyword.last_scraped_at.strftime('%m/%d %H:%M') }} + {% else %} + Never + {% endif %}
-

Recent Ads

+

Recent Matches

{% if ads %} -
+
- - + - - - + {% for ad in ads %} - - - - - - + + + {% endfor %}
TitlePriceAd LocationPostcodeURLPublishedLink
{{ ad.title[:60] }}{% if ad.title|length > 60 %}…{% endif %}{{ format_price(ad.price) }}{{ ad.location or '—' }}{{ ad.postcode or '—' }}Link{{ ad.published_at.strftime('%Y-%m-%d') if ad.published_at else '—' }} +
+ {{ ad.title }} +
+
+ {{ format_price(ad.price) }} + {% if ad.published_at %} + + + {{ ad.published_at.strftime('%m/%d %H:%M') }} + + {% endif %} +
+ 		+
+ + {% if ad.postcode %}{{ ad.postcode }} • {% endif %} + {{ ad.location or '—' }} +
+ 		+ + Open + +
{% else %} -
No ads found for this keyword.
+
+ +

No ads found for this keyword yet.

+
{% endif %} -

Recent Scrape Logs

+

Scrape Telemetry

{% if logs %} -
+
- - - - - + + + + {% for log in logs %} - + - - - + @@ -116,7 +156,10 @@
TimeStatusAds FoundNew AdsErrorExecution TimeResultThroughputDiagnostics
{{ log.scraped_at.strftime('%Y-%m-%d %H:%M:%S') }} +
{{ log.scraped_at.strftime('%Y-%m-%d') }}
+
{{ log.scraped_at.strftime('%H:%M:%S') }}
+ 		{% if log.status == 'success' %} - Success + Success {% elif log.status == 'rate_limited' %} - Rate Limited + Blocked {% else %} - Error + Error {% endif %} {{ log.ads_found }}{{ log.new_ads }} + +
+ {{ log.ads_found }} scanned + {{ log.new_ads }} new +
+ 		{{ log.error_message or '—' }}
{% else %} -
No scrape logs found.
+
+ +

No telemetry recorded yet.

+
{% endif %} {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/worker/src/templates/keywords.html b/worker/src/templates/keywords.html index b68a984..b56bcb0 100644 --- a/worker/src/templates/keywords.html +++ b/worker/src/templates/keywords.html @@ -1,22 +1,17 @@ {% extends "base.html" %} {% block title %}Keywords — Willhaben Tracker{% endblock %} -{% block content %} -
-

Keywords

-
+{% block title_in_topbar %}Keywords{% endblock %} +{% block content %} {% if not error and keywords %} -
+
- - - - + @@ -24,25 +19,41 @@ {% for kw in keywords %} - - + - - - - + + @@ -51,6 +62,9 @@
ID Keyword Status IntervalPrice MinPrice MaxPostcodesFilters Subscribers Last Scraped
{{ kw.id[:8] }}…{{ kw.keyword }} + {{ kw.keyword }} +
{{ kw.id[:8] }}
+ 		{% if kw.is_active %} - Active + Active {% else %} - Stopped + Stopped {% endif %} {{ kw.interval_minutes }}m{{ (kw.price_min / 100)|round(2) if kw.price_min else '—' }}{{ (kw.price_max / 100)|round(2) if kw.price_max else '—' }}{{ ', '.join(kw.allowed_postcodes) if kw.allowed_postcodes else '—' }}{{ kw.subscriber_count }} + {% if kw.price_min or kw.price_max %} +
+ + {{ (kw.price_min / 100)|round(2) if kw.price_min else '0' }} — {{ (kw.price_max / 100)|round(2) if kw.price_max else 'Max' }} +
+ {% endif %} + {% if kw.allowed_postcodes %} +
+ + {{ kw.allowed_postcodes|length }} code(s) +
+ {% endif %} + {% if not kw.price_min and not kw.price_max and not kw.allowed_postcodes %} + None + {% endif %} + 		{{ kw.subscriber_count }} {% if kw.last_scraped_at %} {{ kw.last_scraped_at.strftime('%Y-%m-%d %H:%M') }} {% else %} - Never + Never {% endif %}
{% elif not error %} -
No keywords found.
+
+ +

No keywords are currently being tracked.

+
{% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/worker/src/templates/users.html b/worker/src/templates/users.html index 72b4075..12a4abe 100644 --- a/worker/src/templates/users.html +++ b/worker/src/templates/users.html @@ -1,66 +1,75 @@ {% extends "base.html" %} {% block title %}Users — Willhaben Tracker{% endblock %} -{% block content %} -
-

Users

-
+{% block title_in_topbar %}Registered Users{% endblock %} +{% block content %} {% if not error and users %} -
+
- - - - + - - - + + + {% for user in users %} - - - + - {% endfor %}
Telegram IDUsernameFirst NameAdminUser StatusMute HoursDigest ModeDigest IntervalRoleMute ScheduleDelivery Mode
{{ user.telegram_id }}@{{ user.username }}{% if not user.username %}—{% endif %}{{ user.first_name or '—' }} - {% if user.is_admin %} - Admin - {% else %} - User - {% endif %} +
{{ user.first_name or 'Unknown User' }}
+
+ {% if user.username %}@{{ user.username }} • {% endif %}{{ user.telegram_id }} +
{% if user.is_active %} - Active + Active {% else %} - Inactive + Banned + {% endif %} + + {% if user.is_admin %} + Admin + {% else %} + User {% endif %} {% if user.mute_start and user.mute_end %} - {{ user.mute_start.strftime('%H:%M') }} — {{ user.mute_end.strftime('%H:%M') }} +
+ + {{ user.mute_start.strftime('%H:%M') }} — {{ user.mute_end.strftime('%H:%M') }} +
{% else %} - — + None {% endif %} 		{% if user.digest_mode %} - On +
+ + Digest every {{ user.digest_interval }}m +
{% else %} - Off +
+ + Immediate +
{% endif %} 		{{ user.digest_interval }}m
{% elif not error %} -
No users found.
+
+ +

No users found in the database.

+
{% endif %} -{% endblock %} \ No newline at end of file +{% endblock %}