Topic landing tod

django_topics/admin.py

@@ -1,6 +1,5 @@
 from django.contrib import admin, messages
-from django.utils.html import format_html
-from django_topics.models import Topic, TopicPool, TopicOfTheDayEnglish, TopicOfTheDayHebrew, SeasonalTopicEnglish, SeasonalTopicHebrew
+from django_topics.models import Topic, TopicPool, FeaturedTopicEnglish, FeaturedTopicHebrew, SeasonalTopicEnglish, SeasonalTopicHebrew
 from django_topics.models.pool import PoolType
 
 
@@ -102,7 +101,7 @@ def sefaria_link(self, obj):
     sefaria_link.short_description = "Sefaria Link"
 
 
-class TopicOfTheDayAdmin(admin.ModelAdmin):
+class FeaturedTopicAdmin(admin.ModelAdmin):
     exclude = ("lang",)  # not for manual editing
     list_display = ('start_date', 'topic')
     list_filter = ('start_date',)
@@ -123,16 +122,16 @@ def formfield_for_foreignkey(self, db_field, request, **kwargs):
         return super().formfield_for_foreignkey(db_field, request, **kwargs)
 
 
-@admin.register(TopicOfTheDayEnglish)
-class TopicOfTheDayAdminEnglish(TopicOfTheDayAdmin):
+@admin.register(FeaturedTopicEnglish)
+class FeaturedTopicAdminEnglish(FeaturedTopicAdmin):
 
     def get_queryset(self, request):
         qs = super().get_queryset(request)
         return qs.filter(lang="en")
 
 
-@admin.register(TopicOfTheDayHebrew)
-class TopicOfTheDayAdminHebrew(TopicOfTheDayAdmin):
+@admin.register(FeaturedTopicHebrew)
+class FeaturedTopicAdminHebrew(FeaturedTopicAdmin):
 
     def get_queryset(self, request):
         qs = super().get_queryset(request)

django_topics/migrations/0008_auto_20241217_0702.py

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2024-12-17 11:02
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_topics', '0007_auto_20241127_0034'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='TopicOfTheDayEnglish',
+        ),
+        migrations.DeleteModel(
+            name='TopicOfTheDayHebrew',
+        ),
+        migrations.CreateModel(
+            name='FeaturedTopicEnglish',
+            fields=[
+            ],
+            options={
+                'verbose_name': 'Landing Page - Featured Topic (EN)',
+                'verbose_name_plural': 'Landing Page - Featured Topic (EN)',
+                'proxy': True,
+                'indexes': [],
+            },
+            bases=('django_topics.topicoftheday',),
+        ),
+        migrations.CreateModel(
+            name='FeaturedTopicHebrew',
+            fields=[
+            ],
+            options={
+                'verbose_name': 'Landing Page - Featured Topic (HE)',
+                'verbose_name_plural': 'Landing Page - Featured Topic (HE)',
+                'proxy': True,
+                'indexes': [],
+            },
+            bases=('django_topics.topicoftheday',),
+        ),
+        migrations.AlterModelOptions(
+            name='topicoftheday',
+            options={'verbose_name': 'Landing Page - Featured Topic', 'verbose_name_plural': 'Landing Page - Featured Topic'},
+        ),
+    ]

django_topics/models/__init__.py

@@ -1,4 +1,4 @@
 from .topic import Topic
 from .pool import TopicPool, PoolType
-from .topic_of_the_day import TopicOfTheDay, TopicOfTheDayEnglish, TopicOfTheDayHebrew
+from .featured_topic import TopicOfTheDay, FeaturedTopicEnglish, FeaturedTopicHebrew
 from .seasonal_topic import SeasonalTopic, SeasonalTopicEnglish, SeasonalTopicHebrew

django_topics/models/featured_topic.py

@@ -0,0 +1,62 @@
+from django.db import models
+from datetime import datetime
+from django.utils.timezone import now
+from django_topics.models import Topic
+
+
+class FeaturedTopicManager(models.Manager):
+
+    def get_featured_topic(self, lang: str, date: datetime = None) -> 'TopicOfTheDay':
+        """
+        Return featured topic for given date or closest date that is less than or equal to given date
+        @param lang: language code, "en" or "he"
+        @param date: datetime object
+        @return:
+        """
+        date = date or now().date()
+        return (
+            self.filter(start_date__lte=date, lang=lang)
+            .order_by('-start_date')
+            .first()
+        )
+
+
+class TopicOfTheDay(models.Model):
+    topic = models.ForeignKey(
+        Topic,
+        on_delete=models.CASCADE,
+        related_name='topic_of_the_day'
+    )
+    start_date = models.DateField()
+    lang = models.CharField(max_length=2, choices=[('en', 'English'), ('he', 'Hebrew')])
+    objects = FeaturedTopicManager()
+
+    class Meta:
+        unique_together = ('topic', 'start_date')
+        verbose_name = "Landing Page - Featured Topic"
+        verbose_name_plural = "Landing Page - Featured Topic"
+
+    def __str__(self):
+        return f"{self.topic.slug} ({self.start_date})"
+
+
+class FeaturedTopicEnglish(TopicOfTheDay):
+    class Meta:
+        proxy = True
+        verbose_name = "Landing Page - Featured Topic (EN)"
+        verbose_name_plural = "Landing Page - Featured Topic (EN)"
+
+    def save(self, *args, **kwargs):
+        self.lang = "en"
+        super().save(*args, **kwargs)
+
+
+class FeaturedTopicHebrew(TopicOfTheDay):
+    class Meta:
+        proxy = True
+        verbose_name = "Landing Page - Featured Topic (HE)"
+        verbose_name_plural = "Landing Page - Featured Topic (HE)"
+
+    def save(self, *args, **kwargs):
+        self.lang = "he"
+        super().save(*args, **kwargs)

django_topics/models/tests/featured_topic_test.py

@@ -0,0 +1,47 @@
+import pytest
+from datetime import date
+from django_topics.models import TopicOfTheDay, Topic
+
+
+@pytest.fixture
+def topic(db):
+    """Fixture to create a Topic instance."""
+    return Topic.objects.create(slug="test-topic")
+
+
+@pytest.fixture
+def featured_topics(db, topic):
+    """Fixture to create TopicOfTheDay instances."""
+    topics = [
+        TopicOfTheDay.objects.create(topic=topic, start_date=date(2024, 11, 26), lang="en"),
+        TopicOfTheDay.objects.create(topic=topic, start_date=date(2024, 11, 25), lang="en"),
+        TopicOfTheDay.objects.create(topic=topic, start_date=date(2024, 11, 24), lang="en"),
+    ]
+    return topics
+
+
+@pytest.mark.django_db
+def test_get_featured_topic_with_exact_date_db(featured_topics):
+    """Test for exact match."""
+    result = TopicOfTheDay.objects.get_featured_topic(lang="en", date=date(2024, 11, 26))
+
+    assert result.start_date == date(2024, 11, 26)
+    assert result.lang == "en"
+
+
+@pytest.mark.django_db
+def test_get_featured_topic_with_closest_date_db(featured_topics):
+    """Test for the closest date less than or equal to the given date."""
+    result = TopicOfTheDay.objects.get_featured_topic(lang="en", date=date(2024, 11, 27))
+
+    assert result.start_date == date(2024, 11, 26)
+    assert result.lang == "en"
+
+
+@pytest.mark.django_db
+def test_get_featured_topic_with_no_matching_date_db(db, topic):
+    """Test when there is no matching date."""
+    TopicOfTheDay.objects.create(topic=topic, start_date=date(2024, 11, 20), lang="en")
+    result = TopicOfTheDay.objects.get_featured_topic(lang="en", date=date(2024, 11, 19))
+
+    assert result is None

reader/views.py

@@ -3250,6 +3250,19 @@ def topic_pool_api(request, pool_name):
     return jsonResponse(response, callback=request.GET.get("callback", None))
 
 
+@catch_error_as_json
+def featured_topic_api(request):
+    from django_topics.models import TopicOfTheDay
+
+    lang = request.GET.get("lang")
+    featured_topic = TopicOfTheDay.objects.get_featured_topic(lang)
+    if not featured_topic:
+        return jsonResponse({'error': f'No featured topic found for lang "{lang}"'}, status=404)
+    mongo_topic = Topic.init(featured_topic.topic.slug)
+    response = {'topic': mongo_topic.contents(), 'date': featured_topic.start_date.isoformat()}
+    return jsonResponse(response)
+
+
 @staff_member_required
 def reorder_topics(request):
     topics = json.loads(request.POST["json"]).get("topics", [])

requirements.txt

@@ -52,7 +52,7 @@ pillow==8.0.1; sys_platform == 'linux'
 psycopg2==2.8.6 #for dev: psycopg2-binary==2.8.6
 py2-py3-django-email-as-username==1.7.1
 pymongo==3.12.*
-pytest==7.0.0
+pytest~=7.4.4
 python-bidi
 pytz
 pyyaml==6.0.1
@@ -71,6 +71,7 @@ unidecode==1.1.1
 user-agents==2.2.0
 pytest-django==4.9.*
 
+
 #opentelemetry-distro
 #opentelemetry-exporter-otlp
 #opentelemetry-propagator-b3

sefaria/urls.py

@@ -268,6 +268,7 @@
     url(r'^api/topics-graph/(?P<topic>.+)$', reader_views.topic_graph_api),
     url(r'^_api/topics/seasonal-topic/?$', reader_views.seasonal_topic_api),
     url(r'^api/topics/pools/(?P<pool_name>.+)$', reader_views.topic_pool_api),
+    url(r'^_api/topics/featured-topic/?$', reader_views.featured_topic_api),
     url(r'^api/ref-topic-links/bulk$', reader_views.topic_ref_bulk_api),
     url(r'^api/ref-topic-links/(?P<tref>.+)$', reader_views.topic_ref_api),
     url(r'^api/v2/topics/(?P<topic>.+)$', reader_views.topics_api, {'v2': True}),

static/css/s2.css

@@ -121,6 +121,7 @@ a, a:hover {
   --highlight-blue: #DDEEFF;
   --highlight-blue-light: #F0F7FF;
   --beit-midrash-grey: #333333;
+  --darkest-grey: #333333;
   --dark-grey: #666666;
   --medium-grey: #999999;
   --light-grey: #CCCCCC;
@@ -4959,11 +4960,57 @@ body .ui-autocomplete.dictionary-toc-autocomplete .ui-menu-item a.ui-state-focus
     padding: 0;
     visibility: hidden;
 }
-
 .topic-landing-search-container .readerNavMenuSearchButton{
   top: 6px;
   padding-inline-start: 11px;
 }
+.featuredTopic {
+  display: flex;
+  flex-direction: column;
+  margin-top: 68px;
+}
+.featuredTopicContent {
+  display: flex;
+  flex-direction: row;
+}
+.featuredTopicImgWrapper {
+  width: 239px;
+  height: 100%;
+}
+.featuredTopicContent img {
+  object-fit: contain;
+}
+.featuredTopicContent h3 {
+  font-size: var(--serif-h3-font-size);
+  text-transform: none;
+  margin: 0 0 15px 0;
+}
+.featuredTopicText {
+  flex: 1;
+}
+.featuredTopicText .int-en,
+.featuredTopicText .int-he {
+  display: flex;
+  flex-direction: column;
+  color: var(--dark-grey);
+  margin-inline-start: 30px;
+}
+.featuedTopicText h3 {
+  text-transform: none;
+  margin: 0 0 15px 0;
+}
+.featuedTopicGoToLink {
+  margin-top: 25px;
+}
+.featuredTopicText .topicDescription {
+  font-size: var(--sans-serif-small-font-size);
+}
+.featuredTopic h1 {
+  font-size: var(--sans-serif-h2-font-size);
+  border-bottom: 1px solid #ccc;
+  width: fit-content;
+  padding-bottom: 10px;
+}
 .topic-landing-upper-rainbow{
   margin-top: 88px;
   margin-bottom: 43px;

static/js/Misc.jsx

@@ -3034,18 +3034,20 @@ const Autocompleter = ({getSuggestions, showSuggestionsOnSelect, inputPlaceholde
 }
 
 const getImgAltText = (caption) => {
-return Sefaria._v(caption) || Sefaria._('Illustrative image');
+  return (caption && Sefaria._v(caption)) || Sefaria._('Illustrative image');
 }
 const ImageWithCaption = ({photoLink, caption }) => {
   return (
     <div>
-        <img className="imageWithCaptionPhoto" src={photoLink} alt={getImgAltText(caption)}/>
+        <ImageWithAltText photoLink={photoLink} altText={caption} />
         <div className="imageCaption">
           <InterfaceText text={caption} />
         </div>
       </div>);
 }
 
+const ImageWithAltText = ({photoLink, altText}) => (<img className="imageWithCaptionPhoto" src={photoLink} alt={getImgAltText(altText)}/>);
+
 const AppStoreButton = ({ platform, href, altText }) => {
   const isIOS = platform === 'ios';
   const aClasses = classNames({button: 1, small: 1, white: 1, appButton: 1, ios: isIOS});
@@ -3241,6 +3243,7 @@ export {
   TitleVariants,
   OnInView,
   ImageWithCaption,
+  ImageWithAltText,
   handleAnalyticsOnMarkdown,
   LangSelectInterface,
   PencilSourceEditor,