From 20fe82405c14cb805b4b42ab0a3480602e869d38 Mon Sep 17 00:00:00 2001 From: irenecancode <196759302+irenecancode@users.noreply.github.com> Date: Thu, 9 Jul 2026 14:47:13 -0700 Subject: [PATCH] feat: display timestamps on feed and details page --- siteapps/socialmedia/web_views.py | 6 ++- siteapps/templates/socialmedia/feed.html | 40 +++++++++++++++---- .../templates/socialmedia/post_detail.html | 14 +++++-- 3 files changed, 47 insertions(+), 13 deletions(-) diff --git a/siteapps/socialmedia/web_views.py b/siteapps/socialmedia/web_views.py index 711a372..017acbf 100644 --- a/siteapps/socialmedia/web_views.py +++ b/siteapps/socialmedia/web_views.py @@ -6,6 +6,7 @@ from django.http import JsonResponse from django.shortcuts import redirect, render from django.urls import reverse +from django.utils.dateparse import parse_datetime from siteapps.users.api_client import BackendAPIClient @@ -45,7 +46,8 @@ def _normalize_post(post): post["media_url"] = media.get("url") post["is_video"] = media.get("is_video", False) post["user_name"] = post.get("created_by") - post["created"] = post.get("encounter_datetime") + created_raw = post.get("created") + post["created"] = parse_datetime(created_raw) if created_raw else None additional = post.get("additional_info") or {} post["camera_model"] = additional.get("camera_model") post["iucn_habitat_lvl1"] = additional.get("iucn_habitat_lvl1_name") @@ -674,7 +676,7 @@ def load_more_posts(request): "media_url": media_url, "is_video": is_video, "user_name": post.get("created_by"), - "created": post.get("encounter_datetime"), + "created": post.get("created"), "geocoded_location": post.get("geocoded_location"), "likes_count": post.get("likes_count", 0), "comments_count": post.get("comments_count", 0), diff --git a/siteapps/templates/socialmedia/feed.html b/siteapps/templates/socialmedia/feed.html index 0d46936..d642aef 100644 --- a/siteapps/templates/socialmedia/feed.html +++ b/siteapps/templates/socialmedia/feed.html @@ -1,5 +1,6 @@ {% extends "_base.html" %} {% load static %} +{% load humanize %} {% block title %} Wildlife Feed - WildeBackyard {% endblock title %} @@ -337,10 +338,13 @@

{% endif %}
{{ post.title }}
+

+ + {{ post.created|date:"M j, Y, g:i A" }} + ({{ post.created|naturaltime }}) +

{{ post.user_name|default:"Anonymous" }} - • - {{ post.created|date:"M d, Y" }}

{% if post.body %}

{{ post.body|truncatewords:30 }}

{% endif %} {% if post.geocoded_location %} @@ -408,11 +412,30 @@
{{ post.title }}
return div.innerHTML; } -function formatDate(dateString) { +function formatRelativeTime(dateString) { + if (!dateString) return ''; + const date = new Date(dateString); + if (isNaN(date.getTime())) return ''; + const seconds = Math.floor((Date.now() - date.getTime()) / 1000); + if (seconds < 60) return 'just now'; + const minutes = Math.floor(seconds / 60); + if (minutes < 60) return `${minutes} minute${minutes !== 1 ? 's' : ''} ago`; + const hours = Math.floor(minutes / 60); + if (hours < 24) return `${hours} hour${hours !== 1 ? 's' : ''} ago`; + const days = Math.floor(hours / 24); + if (days < 30) return `${days} day${days !== 1 ? 's' : ''} ago`; + const months = Math.floor(days / 30); + if (months < 12) return `${months} month${months !== 1 ? 's' : ''} ago`; + const years = Math.floor(days / 365); + return `${years} year${years !== 1 ? 's' : ''} ago`; +} + +function formatAbsoluteDateTime(dateString) { if (!dateString) return ''; const date = new Date(dateString); - const options = { year: 'numeric', month: 'short', day: 'numeric' }; - return date.toLocaleDateString('en-US', options); + if (isNaN(date.getTime())) return ''; + const options = { year: 'numeric', month: 'short', day: 'numeric', hour: 'numeric', minute: '2-digit' }; + return date.toLocaleString('en-US', options); } function truncateWords(text, wordLimit) { @@ -474,10 +497,13 @@
{{ post.title }}
${mediaHtml}
${escapeHtml(post.title)}
+

+ + ${formatAbsoluteDateTime(post.created)} + (${formatRelativeTime(post.created)}) +

${escapeHtml(post.user_name || 'Anonymous')} - • - ${formatDate(post.created)}

${bodyHtml} ${locationHtml} diff --git a/siteapps/templates/socialmedia/post_detail.html b/siteapps/templates/socialmedia/post_detail.html index 539bb61..3619618 100644 --- a/siteapps/templates/socialmedia/post_detail.html +++ b/siteapps/templates/socialmedia/post_detail.html @@ -1,5 +1,6 @@ {% extends "_base.html" %} {% load static %} +{% load humanize %} {% block title %} {{ post.title }} - WildeBackyard {% endblock title %} @@ -69,10 +70,15 @@

{{ post.title }}

-
- {{ post.user_name|default:"Anonymous" }} - • - {{ post.created|date:"F d, Y \a\t g:i A" }} +
+
+ + {{ post.created|date:"F j, Y, g:i A" }} + ({{ post.created|naturaltime }}) +
+
+ {{ post.user_name|default:"Anonymous" }} +
{% if user.is_authenticated %}