diff --git a/ads/models.py b/ads/models.py index f7f8cf904..e90285cee 100644 --- a/ads/models.py +++ b/ads/models.py @@ -90,7 +90,7 @@ class AdTagSettings(ClusterableModel, BaseSetting): ), MultiFieldPanel( [ - InlinePanel("home_sidebar_placements", label="Home sidebar placement tags"), + InlinePanel("home_sidebar_placements", label="Sidebar placement tags"), ], heading="Sidebar Placement Tags" ), diff --git a/ads/templatetags/ubyssey_ad_filters.py b/ads/templatetags/ubyssey_ad_filters.py index 2d06390f5..7e0c08c6a 100644 --- a/ads/templatetags/ubyssey_ad_filters.py +++ b/ads/templatetags/ubyssey_ad_filters.py @@ -23,7 +23,8 @@ def inject_ads(value, is_mobile): is_mobile = True # Break down content into paragraphs - paragraphs = value.split("

") + soup = BeautifulSoup(value, 'html.parser') + paragraphs = soup.select(".article-content > p") if PARAGRAPHS_PER_AD < len(paragraphs): # If the article is somehow too short for even one ad, it doesn't get any x = range(0, len(paragraphs), PARAGRAPHS_PER_AD) @@ -44,11 +45,9 @@ def inject_ads(value, is_mobile): 'size' : size, } ad_string = render_to_string('ads/advertisement_inline.html', context=ad_context) - paragraphs[n] = ad_string + paragraphs[n] + paragraphs[n].insert_after(BeautifulSoup(ad_string, 'html.parser')) - # Assemble our text back with injected HTML - value = "

".join(paragraphs) - return value + return soup.prettify() @register.filter(name='specify_homepage_sidebar_ads') @stringfilter diff --git a/ads/templatetags/ubyssey_ad_tags.py b/ads/templatetags/ubyssey_ad_tags.py index 8ef5840f7..71c6a15a4 100644 --- a/ads/templatetags/ubyssey_ad_tags.py +++ b/ads/templatetags/ubyssey_ad_tags.py @@ -30,12 +30,12 @@ def gpt_define_tag(slug, is_mobile=False) -> dict: 'skyscraper' : '[[300, 250], [300, 600]]', 'banner': '[468, 60]', 'leaderboard': '[[728, 90], [970, 90]]', - 'mobile-leaderboard': '[300, 50]' + 'mobile-leaderboard': '[320, 50]' } if is_mobile and "Intra_Article" in ad_slot.dfp: return { 'div_id' : ad_slot.div_id, - 'dfs' : ad_slot.dfs, + 'dfp' : ad_slot.dfp, 'size' : SIZES['mobile-leaderboard'], } else: diff --git a/archive/migrations/0002_sectionpageorderables.py b/archive/migrations/0002_sectionpageorderables.py new file mode 100644 index 000000000..3c7813d07 --- /dev/null +++ b/archive/migrations/0002_sectionpageorderables.py @@ -0,0 +1,29 @@ +# Generated by Django 3.2.11 on 2023-07-11 11:26 + +from django.db import migrations, models +import django.db.models.deletion +import modelcluster.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtailcore', '0066_collection_management_permissions'), + ('archive', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='SectionPageOrderables', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), + ('page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='sections_filters', to='archive.archivepage')), + ('section_filter', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailcore.page', verbose_name='Page Link')), + ], + options={ + 'ordering': ['sort_order'], + 'abstract': False, + }, + ), + ] diff --git a/archive/migrations/0003_auto_20230711_2106.py b/archive/migrations/0003_auto_20230711_2106.py new file mode 100644 index 000000000..50f981218 --- /dev/null +++ b/archive/migrations/0003_auto_20230711_2106.py @@ -0,0 +1,35 @@ +# Generated by Django 3.2.11 on 2023-07-12 04:06 + +from django.db import migrations, models +import django.db.models.deletion +import modelcluster.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtailcore', '0066_collection_management_permissions'), + ('section', '0003_sectionpage_use_parent_colour'), + ('archive', '0002_sectionpageorderables'), + ] + + operations = [ + migrations.AlterField( + model_name='sectionpageorderables', + name='section_filter', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailcore.page', verbose_name='Section Page'), + ), + migrations.CreateModel( + name='MagazineOrderables', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), + ('magazine_filter', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='section.categorysnippet', verbose_name='Magazine')), + ('page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='magazines_filters', to='archive.archivepage')), + ], + options={ + 'ordering': ['sort_order'], + 'abstract': False, + }, + ), + ] diff --git a/archive/migrations/0004_spooforderables.py b/archive/migrations/0004_spooforderables.py new file mode 100644 index 000000000..75d0baa57 --- /dev/null +++ b/archive/migrations/0004_spooforderables.py @@ -0,0 +1,29 @@ +# Generated by Django 3.2.11 on 2023-07-12 04:48 + +from django.db import migrations, models +import django.db.models.deletion +import modelcluster.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('section', '0003_sectionpage_use_parent_colour'), + ('archive', '0003_auto_20230711_2106'), + ] + + operations = [ + migrations.CreateModel( + name='SpoofOrderables', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), + ('page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='spoofs_filters', to='archive.archivepage')), + ('spoof_filter', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='section.categorysnippet', verbose_name='Spoof')), + ], + options={ + 'ordering': ['sort_order'], + 'abstract': False, + }, + ), + ] diff --git a/archive/models.py b/archive/models.py index d40308451..b409e718a 100644 --- a/archive/models.py +++ b/archive/models.py @@ -1,19 +1,122 @@ from django.db import models from django_user_agents.utils import get_user_agent from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator +from django.shortcuts import render +from specialfeaturelanding.models import SpecialLandingPage +from section.models import SectionablePage, CategorySnippet from article.models import ArticlePage +from modelcluster.fields import ParentalKey + from section.models import SectionPage -from wagtail.core.models import Page +from wagtail.core.models import Page, Orderable +from wagtail.snippets.edit_handlers import SnippetChooserPanel +from wagtail.admin.edit_handlers import MultiFieldPanel, InlinePanel, HelpPanel, PageChooserPanel + +from wagtail.contrib.routable_page.models import RoutablePageMixin, route +from videos.models import VideosPage, VideoSnippet + +class SectionPageOrderables(Orderable): + page = ParentalKey("archive.ArchivePage", on_delete=models.CASCADE, related_name="sections_filters") + + section_filter = models.ForeignKey( + 'wagtailcore.Page', + null=True, + blank=True, + on_delete=models.SET_NULL, + related_name='+', + verbose_name="Section Page" + ) + + panels = [ + MultiFieldPanel( + [ + PageChooserPanel('section_filter', 'section.SectionPage'), + ], + heading="Section Pages", + ), + ] + + +class MagazineOrderables(Orderable): + page = ParentalKey("archive.ArchivePage", on_delete=models.CASCADE, related_name="magazines_filters") + + magazine_filter = models.ForeignKey( + 'section.CategorySnippet', + null=True, + blank=True, + on_delete=models.SET_NULL, + related_name='+', + verbose_name="Magazine" + ) + + panels = [ + MultiFieldPanel( + [ + SnippetChooserPanel('magazine_filter'), + ], + heading="Magazine", + ), + ] + +class SpoofOrderables(Orderable): + page = ParentalKey("archive.ArchivePage", on_delete=models.CASCADE, related_name="spoofs_filters") + + spoof_filter = models.ForeignKey( + 'section.CategorySnippet', + null=True, + blank=True, + on_delete=models.SET_NULL, + related_name='+', + verbose_name="Spoof" + ) + + panels = [ + MultiFieldPanel( + [ + SnippetChooserPanel('spoof_filter'), + ], + heading="Spoof", + ), + ] -class ArchivePage(Page): + +class ArchivePage(RoutablePageMixin, Page): template = "archive/archive_page.html" parent_page_types = [ 'home.HomePage', ] max_count_per_parent = 1 - + + + content_panels = Page.content_panels + [ + MultiFieldPanel( + [ + HelpPanel("List all the pages you want to have in the section filter"), + InlinePanel('sections_filters', min_num=1, label="Section"), + ], + heading="Section Filters", + classname="collapsible", + ), + MultiFieldPanel( + [ + HelpPanel("List all the category snippets you want to have in the magazine filter"), + InlinePanel('magazines_filters', min_num=1, label="Magazines"), + ], + heading="Magazine Filters", + classname="collapsible", + ), + MultiFieldPanel( + [ + HelpPanel("List all the category snippets you want to have in the spoof filter"), + InlinePanel('spoofs_filters', min_num=1, label="Spoofs"), + ], + heading="Spoof Filters", + classname="collapsible", + ), + ] + def __get_years(self): """ Returns: @@ -39,37 +142,34 @@ def __parse_int_or_none(self, maybe_int): except (TypeError, ValueError): return None - def get_context(self, request, *args, **kwargs): - context = super().get_context(request, *args, **kwargs) - # Getting information from the HTTP request + def get_context(self, request, video_section): + # Get queries and context + context = super().get_context(request) search_query = request.GET.get("q") - page = request.GET.get("page") order = request.GET.get("order") - section_slug = request.GET.get('section') self.year = self.__parse_int_or_none(request.GET.get('year')) - if order == 'oldest': - article_order = "explicit_published_at" - else: - article_order = "-explicit_published_at" - context["order"] = order - - # Get and trim the queryset of articles - if section_slug: - articles = ArticlePage.objects.from_section(section_slug=section_slug).live().public().order_by(article_order) - else: - articles = ArticlePage.objects.live().public().order_by(article_order) - if self.year: - articles = articles.filter(explicit_published_at__year=str(self.year)) + + # Set context + context['video_section'] = video_section + context['sections'] = self.sections_filters.all() + context['order'] = order + context['year'] = self.year + context['years'] = self.__get_years() + context['q'] = search_query + context['meta'] = { 'title': 'Archive' } - # If there's a search query, then we run the search on the articles LAST. - # Once we hit thes earch then we can't run .filter(...) on the results as if it were a queryset - if search_query: - context["search_query"] = search_query - articles = articles.search(search_query) + return context + + def get_paginated_articles(self, context, objects, video_section, request): + page = request.GET.get("page") - # Paginate all posts by 15 per page - paginator = Paginator(articles, per_page=15) + if video_section == False: + # Paginate all posts by 15 per page + paginator = Paginator(objects, per_page=15) + else: + # Paginate all posts by 15 per page + paginator = Paginator(objects, per_page=5) try: # If the page exists and the ?page=x is an int paginated_articles = paginator.page(page) @@ -83,14 +183,183 @@ def get_context(self, request, *args, **kwargs): paginated_articles = paginator.page(paginator.num_pages) context["page_obj"] = paginated_articles #this object is often called page_obj in Django docs. Careful, because but Page means something else in Wagtail + - # set context - context['sections'] = SectionPage.objects.live() - context['section_slug'] = section_slug - context['order'] = order - context['year'] = self.year - context['years'] = self.__get_years() - context['q'] = search_query - context['meta'] = { 'title': 'Archive' } + return context + + def get_order_objects(self, order, objects, videos_section): + if videos_section == False: + if order == 'oldest': + article_order = "explicit_published_at" + else: + article_order = "-explicit_published_at" + + return objects.order_by(article_order) + else: + if order == 'oldest': + videos_order = "created_at" + else: + videos_order = "-created_at" + + return objects.order_by(videos_order) + + + def get_year_objects(self, objects, videos_section): + if videos_section == False: + return objects.filter(explicit_published_at__year=str(self.year)) + else: + return objects.filter(created_at__gte=str(self.year) + "-01-01", created_at__lte = str(self.year + 1) + "-12-31") + + def get_search_objects(self, search_query, objects, video_section): + + # If there's a search query, then we run the search on the articles LAST. + # Once we hit thes earch then we can't run .filter(...) on the results as if it were a queryset + if video_section == False: + return objects.search(search_query) + else: + return objects.filter(title=search_query) + + def get_category(self): + return CategorySnippet.objects.all() + categories = property(fget=get_category) + + @route(r'^$', name='general_view') + def get_archive_general_articles(self, request): + video_section = False + context = self.get_context(request, video_section) + context["section_slug"] = "All" + search_query = context["q"] + + articles = ArticlePage.objects.live().public() + + if context["order"]: + articles = self.get_order_objects(context["order"], articles, video_section) - return context \ No newline at end of file + if self.year: + articles = self.get_year_objects(articles, video_section) + + # The larger issue is that the search query in general search will always prioritize articles over videos. If users what to find videos then they have to select the videos section then search + if search_query: + videos = VideoSnippet.objects.all() + articles = self.get_search_objects(search_query, articles, video_section) + videos = self.get_search_objects(search_query, videos, True) + + if len(articles) < 1 and len(videos) > 0: + video_section = True + context = self.get_paginated_articles(context, videos, video_section, request) + context["video_section"] = True + else: + context = self.get_paginated_articles(context, articles, video_section, request) + else: + context = self.get_paginated_articles(context, articles, video_section, request) + + + return render(request, "archive/archive_page.html", context) + + @route(r'^section/(?P[-\w]+)/$', name='section_view') + @route(r'^magazines/$', name='magazines_general_view') + def get_section_articles(self, request, sections_slug="magazine"): + video_section = False + context = self.get_context(request, video_section) + context['section_slug'] = sections_slug + + search_query = context["q"] + + articles = ArticlePage.objects.from_section(section_slug=sections_slug).live().public() + + if context["order"]: + articles = self.get_order_objects(context["order"], articles, video_section) + + if self.year: + articles = self.get_year_objects(articles, video_section) + + if search_query: + articles = self.get_search_objects(search_query, articles, video_section) + + context = self.get_paginated_articles(context, articles, video_section, request) + + return render(request, "archive/archive_page.html", context) + + @route(r'^videos/$', name="videos_view") + def get_videos(self, request, *args, **kwargs): + video_section = True + context = self.get_context(request, video_section) + + search_query = context["q"] + + videos = VideoSnippet.objects.all() + + if context["order"]: + videos = self.get_order_objects(context["order"], videos, video_section) + + if self.year: + videos = self.get_year_objects(videos, video_section) + + if search_query: + videos = self.get_search_objects(search_query, videos, video_section) + + + context = self.get_paginated_articles(context, videos, video_section, request) + + return render(request, "archive/archive_page.html", context) + + + @route(r'^magazines/(?P[-\w]+)/$', name="magazines_view") + def get_magazine_articles(self, request, magazine_slug): + video_section = False + context = self.get_context(request, video_section) + context['magazine_slug'] = magazine_slug + + search_query = context["q"] + + + if len(SpecialLandingPage.objects.filter(category__slug=magazine_slug)) > 0: + articles = ArticlePage.objects.from_magazine_special_section(section_slug=magazine_slug) + else: + articles = ArticlePage.objects.live().public().filter(category__slug=magazine_slug) + + if context["order"]: + articles = self.get_order_objects(context["order"], articles, video_section) + + if self.year: + articles = self.get_year_objects(articles, video_section) + + if search_query: + articles = self.get_search_objects(search_query, articles, video_section) + + context = self.get_paginated_articles(context, articles, video_section, request) + + return render(request, "archive/archive_page.html", context) + + @route(r'^spoofs/(?P[-\w]+)/$', name="spoofs_view") + @route(r'^spoofs/$', name="spoofs_general_view") + def get_spoof_articles(self, request, spoof_slug="All Spoofs"): + video_section = False + context = self.get_context(request, video_section) + context['spoof_slug'] = spoof_slug + + search_query = context["q"] + + if spoof_slug == "All Spoofs": + articles = ArticlePage.objects.none() + + for iter in self.spoofs_filters.all(): + sections = SectionPage.objects.filter(categories__slug=iter.spoof_filter.slug).live().public() + articles = articles | ArticlePage.objects.from_section(section_slug=sections[0].slug).live().public() + else: + sections = SectionPage.objects.filter(categories__slug=spoof_slug).live().public() + articles = ArticlePage.objects.from_section(section_slug=sections[0].slug).live().public() + + if context["order"]: + articles = self.get_order_objects(context["order"], articles, video_section) + + if self.year: + articles = self.get_year_objects(articles, video_section) + + if search_query: + articles = self.get_search_objects(search_query, articles, video_section) + + + context = self.get_paginated_articles(context, articles, video_section, request) + + return render(request, "archive/archive_page.html", context) \ No newline at end of file diff --git a/archive/templates/archive/archive_page.html b/archive/templates/archive/archive_page.html index c62e67d54..46592e6d8 100644 --- a/archive/templates/archive/archive_page.html +++ b/archive/templates/archive/archive_page.html @@ -3,6 +3,7 @@ {% block header %} {% include 'navigation/headers/topbar.html' %} {% include 'navigation/headers/mobile.html' %} +{% load archive_tags %} {% endblock %} {% block content %} @@ -10,11 +11,17 @@
-

Search the archive

+

Search the Archive

+
+ For all Ubyssey's print issues +
+ {% include 'archive/objects/archive.html' %}
-{% endblock %} \ No newline at end of file +{% endblock %} + + diff --git a/archive/templates/archive/objects/archive.html b/archive/templates/archive/objects/archive.html index 1d3b8c0bd..4136818a0 100644 --- a/archive/templates/archive/objects/archive.html +++ b/archive/templates/archive/objects/archive.html @@ -1,172 +1,30 @@ +{% load wagtailroutablepage_tags %} {% load archive_tags %} +{% load wagtailimages_tags %} -
+
+
+ + +
+
-
-
- - -
-
+
- {% if sections or years %} -
- -
-

Year

- -
- -
-

Section

- -
- -
- {% endif %} - -
-
- - {% if years %} -
- - - {% if year %}{{ year }}{% else %}All years{% endif %} - - - -
-
-
-
-

Filter by year:

-
- -
-
-
    -
  • - All -
    • - {% for y in years %} -
  • - {{ y }} -
    • - {% endfor %} -
-
-
-
- -
- {% endif %} - - {% if sections %} -
- - - {% comment %} NTS ugly placeholder {% endcomment %} - {% if section_slug %}{{ section_slug }}{% else %}All sections{% endif %} - - - -
-
-
-
-

Filter by section:

-
- -
-
-
    -
  • - All -
    • - {% for section in sections %} -
  • - {{ section }} -
    • - {% endfor %} -
-
-
-
- -
- {% endif %} - -
- - - {{ order|title }} - - - -
-
-
-
-

Order by:

-
- -
-
- -
-
-
- -
-
+ {% include 'archive/objects/archive_filter.html' %} +

{% if page_obj %} {{ page_obj.paginator.count }} RESULTS {% else %}NO RESULTS{% endif %} {% if q %} FOR "{{ q }}"{% endif %}

- + {{ order|title }} @@ -184,7 +42,11 @@

{% if page_obj|length > 0 %}
{% for object in page_obj %} - {% include 'archive/objects/article_list.html' with article=object %} + {% if video_section == False or video_section == None %} + {% include 'archive/objects/article_list.html' with article=object %} + {% else %} + {% include 'videos/stream_blocks/video.html' with video=object %} + {% endif %} {% endfor %}
diff --git a/archive/templates/archive/objects/archive_filter.html b/archive/templates/archive/objects/archive_filter.html new file mode 100644 index 000000000..1fee4288b --- /dev/null +++ b/archive/templates/archive/objects/archive_filter.html @@ -0,0 +1,206 @@ +{% load wagtailroutablepage_tags %} +{% load archive_tags %} +{% load humanize %} +{% load static %} +{% load wagtailcore_tags %} +{% load wagtailimages_tags %} +{% load wagtailuserbar %} +{% load ubyssey_ad_tags %} + +{% if sections or years %} +
+ +
+

Year

+
    + {% for y in years %} + {% if y == year %} +
  • + {{ y }} +
    • + {% endif %} + {% endfor %} +
  • + All years +
    • + {% for y in years %} + {% if y != year %} +
  • + {{ y }} +
    • + {% endif %} + {% endfor %} +
+
+ +
+

Section

+ + +

Magazines

+ + +

Spoofs

+ +
+ +
+{% endif %} + +
+
+ + {% if years %} +
+ + + {% if year %}{{ year }}{% else %}All years{% endif %} + + + +
+
+
+
+

Filter by year:

+ + + +
+
    +
  • + All +
    • + {% for y in years %} +
  • + {{ y }} +
    • + {% endfor %} +
+
+
+ +
+ {% endif %} + + {% if sections %} +
+ + + {% if section_slug %}{{ section_slug }}{% else %}All sections{% endif %} + + + +
+
+
+
+

Filter by section:

+ + + +
+ +
+
+
+ {% endif %} +
\ No newline at end of file diff --git a/archive/templates/archive/objects/gallery.html b/archive/templates/archive/objects/gallery.html new file mode 100644 index 000000000..c7734dc47 --- /dev/null +++ b/archive/templates/archive/objects/gallery.html @@ -0,0 +1,190 @@ +{% load archive_tags %} +{% load wagtailimages_tags %} + +
+ +
+
+ + +
+
+ +
+ + {% if sections or years %} +
+ +
+

Year

+ +
+ +
+

Section

+ +
+ +
+ {% endif %} + +
+
+ + {% if years %} +
+ + + {% if year %}{{ year }}{% else %}All years{% endif %} + + + +
+
+
+
+

Filter by year:

+
+ +
+
+
    +
  • + All +
    • + {% for y in years %} +
  • + {{ y }} +
    • + {% endfor %} +
+
+
+
+ +
+ {% endif %} + + {% if sections %} +
+ + + {% comment %} NTS ugly placeholder {% endcomment %} + {% if section_slug %}{{ section_slug }}{% else %}All sections{% endif %} + + + +
+
+
+
+

Filter by section:

+
+ +
+
+
    +
  • + All +
    • + {% for section in sections %} +
  • + {{ section }} +
    • + {% endfor %} +
+
+
+
+ +
+ {% endif %} +
+ +
+

+ {% if page_obj %} {{ page_obj.paginator.count }} RESULTS {% else %}NO RESULTS{% endif %} + {% if q %} FOR "{{ q }}"{% endif %} +

+
+ + {{ order|title }} + + + +
+
+ + {% if page_obj|length > 0 %} +
+ {% for object in page_obj %} + {% include 'archive/objects/gallery_item.html' with image=object %} + {% endfor %} +
+ +
+ {% if page_obj.has_previous %} + + + Previous + + {% endif %} + + + Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }} + + + {% if page_obj.has_next %} + + Next + + + {% endif %} +
+ + {% else %} +
No content found 😔
+ {% endif %} + +
+ +
+ +
\ No newline at end of file diff --git a/archive/templates/archive/objects/gallery_item.html b/archive/templates/archive/objects/gallery_item.html new file mode 100644 index 000000000..10f0403c3 --- /dev/null +++ b/archive/templates/archive/objects/gallery_item.html @@ -0,0 +1,18 @@ +{% load wagtailimages_tags %} + +{% image image height-300 as img%} +{% image image height-600 as big%} + +
+ +
+ + +
+
+
+ +
+
+ +
\ No newline at end of file diff --git a/archive/templatetags/archive_tags.py b/archive/templatetags/archive_tags.py index 299872258..f8b256c88 100644 --- a/archive/templatetags/archive_tags.py +++ b/archive/templatetags/archive_tags.py @@ -1,4 +1,7 @@ from django import template +from infinitefeed.views import getArticles +from django.template.defaultfilters import stringfilter + register = template.Library() @@ -17,8 +20,25 @@ def modify_query_string(context, field, value): dict_[field] = value return dict_.urlencode() +@register.filter +def query_string(request): + fullurl = request.get_full_path() + + fullurllst = fullurl.split("?") + if "?" in fullurl: + parameters = "?" + fullurllst[1] + else: + parameters = "" + + return parameters + +@register.filter +def replace(slug): + return str(slug).replace("-", " ") + @register.simple_tag(takes_context = True) def remove_field_from_query_string(context, field): dict_ = context['request'].GET.copy() dict_.pop(field, None) #Deletes the field if it exists, does nothing if it doesn't. Prevents KeyError - return dict_.urlencode() \ No newline at end of file + return dict_.urlencode() + diff --git a/archive/views.py b/archive/views.py deleted file mode 100644 index 91ea44a21..000000000 --- a/archive/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/article/blocks.py b/article/blocks.py new file mode 100644 index 000000000..2279daa05 --- /dev/null +++ b/article/blocks.py @@ -0,0 +1,118 @@ +from wagtail.core import blocks +from wagtail.core.blocks import field_block +from images import blocks as image_blocks +from videos import blocks as video_blocks +from wagtail.documents.blocks import DocumentChooserBlock + +class PullQuoteBlock(blocks.StructBlock): + content = blocks.CharBlock(required=True) + source = blocks.CharBlock(required=False) + audio = DocumentChooserBlock(required=False, help_text="optional, must be mp3 format") + + class Meta: + template = 'article/stream_blocks/quote.html', + icon = "openquote" + +class HeaderMenuBlock(blocks.StructBlock): + + list = blocks.ListBlock( + blocks.StructBlock( + [ + ('title', blocks.CharBlock()), + ('id',blocks.CharBlock(help_text="Intended to be shared with a header so that this button will send the user to the section of the page with said header")), + ('colour',blocks.CharBlock(default='0071c9')), + ], + label = "Page Link", + ) + ) + + class Meta: + template = 'article/stream_blocks/pageLink.html', + icon = "table" + +class HeaderLinkBlock(blocks.StructBlock): + title = blocks.CharBlock() + id = blocks.CharBlock(help_text="Intended to be shared with a page link button so that clicking the button will scroll the user to this header") + + class Meta: + template = 'article/stream_blocks/header.html', + icon = "title" + +class ChooseSideBlock(blocks.ChoiceBlock): + choices=[('left', 'Left'),('right', 'Right'),] + required=True + +class ChooseViewBlock(blocks.StructBlock): + view = blocks.ChoiceBlock( + choices=[('vs-side-by-side', 'Side By Side'),('vs-over-image', 'Text Over Image'),], + default=('vs-over-image', 'Text Over Image'), + required=True + ) + + class Meta: + template = "article/stream_blocks/ve_switch_view.html", + icon = "view" + +class GapBlock(blocks.StructBlock): + id = blocks.CharBlock(required=False) + height = blocks.IntegerBlock(required=True, default=0, min_value=0) + + class Meta: + template = 'article/stream_blocks/ve_gap.html', + icon = "arrows-up-down" + +class VisualEssayBlock(blocks.StructBlock): + view = ChooseViewBlock() + content = blocks.StreamBlock([ + ('rich_text', blocks.StructBlock( + [ + ('block', blocks.RichTextBlock( + label="Rich Text Block", + help_text = "Write your article contents here. See documentation: https://docs.wagtail.io/en/latest/editor_manual/new_pages/creating_body_content.html#rich-text-fields" + )), + ('side',ChooseSideBlock(default=("right", "Right"))), + ], icon = "doc-full" + )), + ('image', blocks.StructBlock( + [ + ('block', image_blocks.ImageBlock()), + ('side',ChooseSideBlock(default=("left", "Left"))), + ], icon = "image" + )), + ('video', blocks.StructBlock( + [ + ('block', video_blocks.OneOffVideoBlock( + label = "Credited/Captioned One-Off Video", + help_text = "Use this to credit or caption videos that will only be associated with this current article, rather than entered into our video library. You can also embed videos in a Rich Text Block." + )), + ('side',ChooseSideBlock(default=("left", "Left"))), + ], icon = "media" + )), + ('raw_html', blocks.StructBlock( + [ + ('block', blocks.RawHTMLBlock( + label = "Raw HTML Block", + help_text = "WARNING: DO NOT use this unless you really know what you're doing!" + )), + ('side',ChooseSideBlock(default=("left", "Left"))), + ], icon = "code" + )), + ('quote', blocks.StructBlock( + [ + ('block', PullQuoteBlock()), + ('side',ChooseSideBlock(default=("left", "Left"))), + ], icon = "openquote" + )), + ('header_link', blocks.StructBlock( + [ + ('block', HeaderLinkBlock()), + ('side',ChooseSideBlock(default=("right", "Right"))), + ], icon = "title" + )), + ('gap', GapBlock()), + ('switch_view', ChooseViewBlock()), + ]) + + class Meta: + template = 'article/stream_blocks/visual-essay.html', + icon = "form" \ No newline at end of file diff --git a/article/migrations/0019_alter_articlepage_content.py b/article/migrations/0019_alter_articlepage_content.py index b94c8c0b9..2f946dab0 100644 --- a/article/migrations/0019_alter_articlepage_content.py +++ b/article/migrations/0019_alter_articlepage_content.py @@ -21,4 +21,4 @@ class Migration(migrations.Migration): name='content', field=wagtail.core.fields.StreamField([('richtext', wagtail.core.blocks.RichTextBlock(help_text='Write your article contents here. See documentation: https://docs.wagtail.io/en/latest/editor_manual/new_pages/creating_body_content.html#rich-text-fields', label='Rich Text Block')), ('plaintext', wagtail.core.blocks.TextBlock(help_text='Warning: Rich Text Blocks preferred! Plain text primarily exists for importing old Dispatch text.', label='Plain Text Block')), ('dropcap', wagtail.core.blocks.TextBlock(help_text='DO NOT USE - Legacy block. Create a block where special dropcap styling with be applied to the first letter and the first letter only.\n\nThe contents of this block will be enclosed in a

...

element, allowing its targetting for styling.\n\nNo RichText allowed.', label='Dropcap Block', template='article/stream_blocks/dropcap.html')), ('video', wagtail.core.blocks.StructBlock([('video_embed', wagtail.embeds.blocks.EmbedBlock(blank=False, null=False)), ('title', wagtail.core.blocks.CharBlock(max_length=255, required=False)), ('caption', wagtail.core.blocks.CharBlock(max_length=255, required=False)), ('credit', wagtail.core.blocks.CharBlock(max_length=255, required=False))], help_text='Use this to credit or caption videos that will only be associated with this current article, rather than entered into our video library. You can also embed videos in a Rich Text Block.', label='Credited/Captioned One-Off Video')), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=True)), ('style', wagtail.core.blocks.ChoiceBlock(choices=[('default', 'Default'), ('left', 'Left'), ('right', 'Right')])), ('width', wagtail.core.blocks.ChoiceBlock(choices=[('full', 'Full'), ('small', 'Small'), ('medium', 'Medium'), ('large', 'Large')])), ('caption', wagtail.core.blocks.CharBlock(max_length=255, required=False)), ('credit', wagtail.core.blocks.CharBlock(max_length=255, required=False))])), ('raw_html', wagtail.core.blocks.RawHTMLBlock(help_text="WARNING: DO NOT use this unless you really know what you're doing!", label='Raw HTML Block')), ('quote', wagtail.core.blocks.StructBlock([('content', wagtail.core.blocks.CharBlock(required=False)), ('source', wagtail.core.blocks.CharBlock(required=False))], icon='openquote', label='Pull Quote', template='article/stream_blocks/quote.html')), ('gallery', wagtail.snippets.blocks.SnippetChooserBlock(target_model=images.models.GallerySnippet, template='article/stream_blocks/gallery.html'))], blank=True, null=True), ), - ] + ] \ No newline at end of file diff --git a/article/migrations/0020_alter_articlepage_content.py b/article/migrations/0020_alter_articlepage_content.py new file mode 100644 index 000000000..880f080e2 --- /dev/null +++ b/article/migrations/0020_alter_articlepage_content.py @@ -0,0 +1,25 @@ +# Generated by Django 3.2.11 on 2023-08-04 17:18 + +from django.db import migrations +import images.models +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.documents.blocks +import wagtail.embeds.blocks +import wagtail.images.blocks +import wagtail.snippets.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('article', '0019_alter_articlepage_content'), + ] + + operations = [ + migrations.AlterField( + model_name='articlepage', + name='content', + field=wagtail.core.fields.StreamField([('richtext', wagtail.core.blocks.RichTextBlock(help_text='Write your article contents here. See documentation: https://docs.wagtail.io/en/latest/editor_manual/new_pages/creating_body_content.html#rich-text-fields', label='Rich Text Block')), ('plaintext', wagtail.core.blocks.TextBlock(help_text='Warning: Rich Text Blocks preferred! Plain text primarily exists for importing old Dispatch text.', label='Plain Text Block')), ('dropcap', wagtail.core.blocks.TextBlock(help_text='DO NOT USE - Legacy block. Create a block where special dropcap styling with be applied to the first letter and the first letter only.\n\nThe contents of this block will be enclosed in a

...

element, allowing its targetting for styling.\n\nNo RichText allowed.', label='Dropcap Block', template='article/stream_blocks/dropcap.html')), ('video', wagtail.core.blocks.StructBlock([('video_embed', wagtail.embeds.blocks.EmbedBlock(blank=False, null=False)), ('title', wagtail.core.blocks.CharBlock(max_length=255, required=False)), ('caption', wagtail.core.blocks.CharBlock(max_length=255, required=False)), ('credit', wagtail.core.blocks.CharBlock(max_length=255, required=False))], help_text='Use this to credit or caption videos that will only be associated with this current article, rather than entered into our video library. You can also embed videos in a Rich Text Block.', label='Credited/Captioned One-Off Video')), ('image', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=True)), ('style', wagtail.core.blocks.ChoiceBlock(choices=[('default', 'Default'), ('left', 'Left'), ('right', 'Right')])), ('width', wagtail.core.blocks.ChoiceBlock(choices=[('full', 'Full'), ('small', 'Small'), ('medium', 'Medium'), ('large', 'Large')])), ('caption', wagtail.core.blocks.CharBlock(max_length=255, required=False)), ('credit', wagtail.core.blocks.CharBlock(max_length=255, required=False))])), ('raw_html', wagtail.core.blocks.RawHTMLBlock(help_text="WARNING: DO NOT use this unless you really know what you're doing!", label='Raw HTML Block')), ('quote', wagtail.core.blocks.StructBlock([('content', wagtail.core.blocks.CharBlock(required=True)), ('source', wagtail.core.blocks.CharBlock(required=False)), ('audio', wagtail.documents.blocks.DocumentChooserBlock(help_text='optional, must be mp3 format', required=False))])), ('gallery', wagtail.snippets.blocks.SnippetChooserBlock(target_model=images.models.GallerySnippet, template='article/stream_blocks/gallery.html')), ('header_link', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock()), ('id', wagtail.core.blocks.CharBlock(help_text='Intended to be shared with a page link button so that clicking the button will scroll the user to this header'))])), ('header_menu', wagtail.core.blocks.StructBlock([('list', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock()), ('id', wagtail.core.blocks.CharBlock(help_text='Intended to be shared with a header so that this button will send the user to the section of the page with said header')), ('colour', wagtail.core.blocks.CharBlock(default='0071c9'))], label='Page Link')))])), ('visual_essay', wagtail.core.blocks.StructBlock([('view', wagtail.core.blocks.StructBlock([('view', wagtail.core.blocks.ChoiceBlock(choices=[('vs-side-by-side', 'Side By Side'), ('vs-over-image', 'Text Over Image')]))])), ('content', wagtail.core.blocks.StreamBlock([('rich_text', wagtail.core.blocks.StructBlock([('block', wagtail.core.blocks.RichTextBlock(help_text='Write your article contents here. See documentation: https://docs.wagtail.io/en/latest/editor_manual/new_pages/creating_body_content.html#rich-text-fields', label='Rich Text Block')), ('side', wagtail.core.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')]))], icon='doc-full')), ('image', wagtail.core.blocks.StructBlock([('block', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=True)), ('style', wagtail.core.blocks.ChoiceBlock(choices=[('default', 'Default'), ('left', 'Left'), ('right', 'Right')])), ('width', wagtail.core.blocks.ChoiceBlock(choices=[('full', 'Full'), ('small', 'Small'), ('medium', 'Medium'), ('large', 'Large')])), ('caption', wagtail.core.blocks.CharBlock(max_length=255, required=False)), ('credit', wagtail.core.blocks.CharBlock(max_length=255, required=False))])), ('side', wagtail.core.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')]))], icon='image')), ('video', wagtail.core.blocks.StructBlock([('block', wagtail.core.blocks.StructBlock([('video_embed', wagtail.embeds.blocks.EmbedBlock(blank=False, null=False)), ('title', wagtail.core.blocks.CharBlock(max_length=255, required=False)), ('caption', wagtail.core.blocks.CharBlock(max_length=255, required=False)), ('credit', wagtail.core.blocks.CharBlock(max_length=255, required=False))], help_text='Use this to credit or caption videos that will only be associated with this current article, rather than entered into our video library. You can also embed videos in a Rich Text Block.', label='Credited/Captioned One-Off Video')), ('side', wagtail.core.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')]))], icon='media')), ('raw_html', wagtail.core.blocks.StructBlock([('block', wagtail.core.blocks.RawHTMLBlock(help_text="WARNING: DO NOT use this unless you really know what you're doing!", label='Raw HTML Block')), ('side', wagtail.core.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')]))], icon='code')), ('quote', wagtail.core.blocks.StructBlock([('block', wagtail.core.blocks.StructBlock([('content', wagtail.core.blocks.CharBlock(required=True)), ('source', wagtail.core.blocks.CharBlock(required=False)), ('audio', wagtail.documents.blocks.DocumentChooserBlock(help_text='optional, must be mp3 format', required=False))])), ('side', wagtail.core.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')]))], icon='openquote')), ('header_link', wagtail.core.blocks.StructBlock([('block', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock()), ('id', wagtail.core.blocks.CharBlock(help_text='Intended to be shared with a page link button so that clicking the button will scroll the user to this header'))])), ('side', wagtail.core.blocks.ChoiceBlock(choices=[('left', 'Left'), ('right', 'Right')]))], icon='title')), ('gap', wagtail.core.blocks.StructBlock([('id', wagtail.core.blocks.CharBlock(required=False)), ('height', wagtail.core.blocks.IntegerBlock(default=0, min_value=0, required=True))])), ('switch_view', wagtail.core.blocks.StructBlock([('view', wagtail.core.blocks.ChoiceBlock(choices=[('vs-side-by-side', 'Side By Side'), ('vs-over-image', 'Text Over Image')]))]))]))]))], blank=True, null=True), + ), + ] diff --git a/article/models.py b/article/models.py index 36487601c..4fcb5e67b 100644 --- a/article/models.py +++ b/article/models.py @@ -12,6 +12,7 @@ from django.db import models from django.db.models import fields from django.db.models.fields import CharField +from django.shortcuts import render from django.db.models.query import QuerySet from django.forms.widgets import Select, Widget from django.utils import timezone @@ -30,6 +31,8 @@ from taggit.models import TaggedItemBase from videos import blocks as video_blocks +from wagtail.contrib.routable_page.models import RoutablePageMixin, route +from article import blocks as article_blocks from wagtail.admin.edit_handlers import ( # Panels @@ -49,6 +52,7 @@ from wagtail.core.fields import StreamField from wagtail.core.models import Page, PageManager, Orderable from wagtail.documents.models import Document +from wagtail.documents.blocks import DocumentChooserBlock from wagtail.documents.edit_handlers import DocumentChooserPanel from wagtail.images.edit_handlers import ImageChooserPanel from wagtail.search import index @@ -61,6 +65,9 @@ from wagtailmodelchooser.edit_handlers import ModelChooserPanel +from wagtail_color_panel.fields import ColorField +from wagtail_color_panel.edit_handlers import NativeColorPanel + UBYSSEY_FOUNDING_DATE = datetime.date(1918,10,17) @@ -145,6 +152,7 @@ class Meta: verbose_name = "Series of Articles" verbose_name_plural = "Series of Articles" + #-----Orderable models----- class ArticleAuthorsOrderable(Orderable): """ @@ -232,6 +240,7 @@ class ConnectedArticleOrderable(Orderable): FieldPanel('article_description') ] + class SeriesOrderable(Orderable): """ Represents a single article in a series of articles. Associated with ArticleSeriesSnippet @@ -422,19 +431,31 @@ class ArticlePageManager(PageManager): def from_section(self, section_slug='', section_root=None) -> QuerySet: from .models import ArticlePage from section.models import SectionPage + if section_slug: try: - new_section_root = SectionPage.objects.get(slug=section_slug) - except Page.DoesNotExist: - new_section_root = None - if new_section_root: - section_root = new_section_root + section_root = SectionPage.objects.get(slug=section_slug) + articles = self.live().public().descendant_of(section_root).exact_type(ArticlePage) + except SectionPage.DoesNotExist: + articles = SectionPage.objects.none() - return self.live().public().descendant_of(section_root).exact_type(ArticlePage) #.order_by('-last_modified_at') + return articles + + def from_magazine_special_section(self, section_slug='', section_root=None) -> QuerySet: + from .models import ArticlePage + from specialfeaturelanding.models import SpecialLandingPage + if section_slug: + try: + section_root = SpecialLandingPage.objects.get(category__slug=section_slug) + articles = self.live().public().descendant_of(section_root).exact_type(ArticlePage) + except SpecialLandingPage.DoesNotExist: + articles = SpecialLandingPage.objects.none() + return articles + #-----Page models----- -class ArticlePage(SectionablePage, UbysseyMenuMixin): +class ArticlePage(RoutablePageMixin, SectionablePage, UbysseyMenuMixin): #-----Django/Wagtail settings etc----- objects = ArticlePageManager() @@ -455,7 +476,7 @@ class ArticlePage(SectionablePage, UbysseyMenuMixin): label="Rich Text Block", help_text = "Write your article contents here. See documentation: https://docs.wagtail.io/en/latest/editor_manual/new_pages/creating_body_content.html#rich-text-fields" )), - ('plaintext',blocks.TextBlock( + ('plaintext', blocks.TextBlock( label="Plain Text Block", help_text = "Warning: Rich Text Blocks preferred! Plain text primarily exists for importing old Dispatch text." )), @@ -474,19 +495,14 @@ class ArticlePage(SectionablePage, UbysseyMenuMixin): label = "Raw HTML Block", help_text = "WARNING: DO NOT use this unless you really know what you're doing!" )), - ('quote', blocks.StructBlock( - [ - ('content',blocks.CharBlock(required=False)), - ('source',blocks.CharBlock(required=False)), - ], - label = "Pull Quote", - template = 'article/stream_blocks/quote.html', - icon = "openquote", - )), + ('quote', article_blocks.PullQuoteBlock()), ('gallery', SnippetChooserBlock( target_model = GallerySnippet, template = 'article/stream_blocks/gallery.html', )), + ('header_link', article_blocks.HeaderLinkBlock()), + ('header_menu', article_blocks.HeaderMenuBlock()), + ('visual_essay', article_blocks.VisualEssayBlock()), ], null=True, blank=True, @@ -571,6 +587,7 @@ class ArticlePage(SectionablePage, UbysseyMenuMixin): on_delete=models.SET_NULL, ) + #-----Hidden stuff: editors don't get to modify these, but they may be programatically changed----- legacy_template = models.CharField( @@ -683,6 +700,8 @@ def get_template(self, request): return "article/article_page_guide_2022.html" elif self.layout == 'magazine-2023': return "article/article_page_magazine_2023.html" + elif self.layout == 'visual-essay': + return "article/article_page_visual_essay.html" return "article/article_page.html" @@ -797,6 +816,7 @@ def get_template(self, request): ('guide-2020', 'Guide (2020 style - currently broken, last checked 2022/09)'), ('guide-2022', 'Guide (2022 style)'), ('magazine-2023', 'Magazine (2023 style)'), + ('visual-essay', 'Visual Essay'), ], ), ), @@ -850,7 +870,7 @@ def get_template(self, request): ], heading="Connected or Related Article Links (Non-Series)", classname="collapsible collapsed", - ), # Connected or Related Article Links (Non-Series) + ), # Connected or Related Article Links (Non-Series) ] # fw_article_panels customization_panels = [ HelpPanel( @@ -930,7 +950,7 @@ def get_context(self, request, *args, **kwargs): context['prev'] = self.get_prev_sibling() context['next'] = self.get_next_sibling() - + if self.current_section == 'guide': # Desired behaviour for guide articles is to always have two adjacent articles. Therefore we create an "infinite loop" if not context['prev']: @@ -943,6 +963,8 @@ def get_context(self, request, *args, **kwargs): if context['next']: context['next'] = context['next'].specific + context["suggested"] = self.get_suggested() + return context @@ -1027,6 +1049,44 @@ def get_authors_with_roles(self) -> str: return authors_with_roles authors_with_roles = property(fget=get_authors_with_roles) + def get_category_articles(self, order='-explicit_published_at') -> QuerySet: + """ + Returns a list of articles within the Article's category + """ + category_articles = ArticlePage.objects.live().public().filter(category=self.category).not_page(self).order_by(order) + + return category_articles + + def get_section_articles(self, order='-explicit_published_at') -> QuerySet: + """ + Returns a list of articles within the Article's section + """ + + section_articles = ArticlePage.objects.live().public().descendant_of(self.get_parent()).not_page(self).order_by(order) + + return section_articles + + def get_suggested(self, number_suggested=6): + """ + Defines the title and articles in the suggested box + """ + + category_articles = self.get_category_articles() + section_articles = self.get_section_articles() + + if self.category == None or len(category_articles) == 0: + suggested = {} + suggested['title'] = "From " + self.get_parent().title + suggested['articles'] = section_articles[:number_suggested] + elif len(section_articles) > 0: + suggested = {} + suggested['title'] = "From " + self.get_parent().title + " - " + self.category.title + suggested['articles'] = category_articles[:number_suggested] + else: + suggested = False + + return suggested + @property def published_at(self): if self.explicit_published_at: diff --git a/article/templates/article/article_like_special_page.html b/article/templates/article/article_like_special_page.html index 6fd8da56b..5ba329a10 100644 --- a/article/templates/article/article_like_special_page.html +++ b/article/templates/article/article_like_special_page.html @@ -16,19 +16,18 @@

{{ page.title }}

- {% include "article/objects/author_bio.html" %}
{% for block in self.content %} - {% include_block block %} + {% include_block block with id=block.id %} {% endfor %}
diff --git a/article/templates/article/article_page.html b/article/templates/article/article_page.html index a4000a1cd..baeee7d83 100644 --- a/article/templates/article/article_page.html +++ b/article/templates/article/article_page.html @@ -14,18 +14,18 @@ {% endblock %} {% block header %} - {% include 'navigation/headers/topbar.html' %} {% include 'navigation/headers/mobile.html' %} + {% block banner_ad %} + + {% for orderable in settings.ads.AdTagSettings.article_header_placements.all %} + {% gpt_placement_tag orderable.ad_slot %} + {% endfor %} + {% endblock %} + {% include 'navigation/headers/topbar.html' %} {% endblock %} {% block content %}
- {% block banner_ad %} - - {% for orderable in settings.ads.AdTagSettings.article_header_placements.all %} - {% gpt_placement_tag orderable.ad_slot %} - {% endfor %} - {% endblock %}
{% for block in self.content %} - {% include_block block %} + {% include_block block with id=block.id %} {% endfor %}

diff --git a/article/templates/article/article_page_guide_2022.html b/article/templates/article/article_page_guide_2022.html index 6c89a20e8..0ac7011a5 100644 --- a/article/templates/article/article_page_guide_2022.html +++ b/article/templates/article/article_page_guide_2022.html @@ -72,12 +72,15 @@ {{ featured_image_object.credit }} {% endif %}
{% endcomment %} +
+ {% include 'article/objects/darkmode_button.html' with id="guide-2022"%} +
{% comment %} {% endcomment %} {% for block in self.content %} - {% include_block block %} + {% include_block block with id=block.id %} {% endfor %}
diff --git a/article/templates/article/article_page_magazine_2023.html b/article/templates/article/article_page_magazine_2023.html index 6dbdab565..8d4ac3dcf 100644 --- a/article/templates/article/article_page_magazine_2023.html +++ b/article/templates/article/article_page_magazine_2023.html @@ -104,7 +104,7 @@ {% include 'objects/advertisement.html' with size='box' name='Box_A' id=3 article=article.id %}
{% endcomment %} {% for block in self.content %} - {% include_block block %} + {% include_block block with id=block.id %} {% endfor %}
diff --git a/article/templates/article/article_page_visual_essay.html b/article/templates/article/article_page_visual_essay.html new file mode 100644 index 000000000..7c6375e1a --- /dev/null +++ b/article/templates/article/article_page_visual_essay.html @@ -0,0 +1,120 @@ +{% extends 'article/article_page.html' %} +{% load static %} +{% load dispatch_tags %} +{% load wagtailimages_tags %} + +{% block head_scripts %} + + + +{% endblock %} + +{% block header %} + {% include 'navigation/headers/visual-essay-header.html' %} +{% endblock %} + + +{% block specific_article_class %} + c-article--fw-story +{% endblock %} +{% block banner %} +
+ {% if self.show_timeline%} +
+ {% endif %} + {% if self.header_layout == 'right-image' %} +
+
+ {% include 'article/objects/fw_article_headline_container.html' %} +
+
+
+ {% include 'article/objects/fw_article_featured_media.html' %} +
+
+
+ {% elif self.header_layout == 'top-image' %} +
+
+ {% include 'article/objects/fw_article_featured_media.html' %} +
+
+ {% include 'article/objects/fw_article_headline_container.html' %} +
+
+ {% elif self.header_layout == 'banner-image' %} + {% with self.featured_media.first as featured_image_object %} + + + {% endwith %} + {% endif %} +
+{% endblock %} +{% block right_column_class %} + fw-story u-container-max +{% endblock %} + +{% if self.header_layout == 'banner-image' %} + {% block banner_ad %}{% endblock %} +{% endif %} + +{% block pre-content %} +{% endblock %} + +{% block right-column %} +
+
+ {% zone 'article-sidebar' %} + {% if explicit is not True %} + {% if self.minutes_to_read >= 3 %} + {% include 'objects/advertisement.html' with size='skyscraper' name='Box_A' id=3 article=article.id %} + {% include 'objects/advertisement.html' with size='box' name='Box_B' id=4 article=article.id %} + {% else %} + {% include 'objects/advertisement.html' with size='box' name='Box_A' id=3 article=article.id %} + {% endif %} + {% else %} + {% include 'objects/replacement.html' with size='box' %} + {% endif %} +
+
+{% endblock %} + +{% block suggested_articles %} +{% if suggested %} + {% include 'article/objects/suggested_articles_fw.html' with title=suggested.title articles=suggested.articles %} +{% endif %} +{% endblock %} + +{% block scripts %} + {% if self.show_timeline%} + + {% endif %} + {% endblock %} \ No newline at end of file diff --git a/article/templates/article/objects/author_pinned.html b/article/templates/article/objects/author_pinned.html new file mode 100644 index 000000000..c6c7e3670 --- /dev/null +++ b/article/templates/article/objects/author_pinned.html @@ -0,0 +1,31 @@ +{% load dispatch_filters %} +{% load wagtailcore_tags %} +{% load wagtailimages_tags %} +{% load humanize %} + + \ No newline at end of file diff --git a/article/templates/article/objects/blog_column.html b/article/templates/article/objects/blog_column.html index 59d694d8c..c8ddbf9d5 100644 --- a/article/templates/article/objects/blog_column.html +++ b/article/templates/article/objects/blog_column.html @@ -1,3 +1,5 @@ +{% load articletags %} + {% comment %} This template is for the columns for the blog section on the home page under the digital prints section {% endcomment %} @@ -8,7 +10,7 @@ {% load wagtailcore_tags %} {% load wagtailimages_tags %} {% load video_filters %} -
+
{% if article.featured_media.first %} diff --git a/article/templates/article/objects/cover_story.html b/article/templates/article/objects/cover_story.html new file mode 100644 index 000000000..0b4a07c20 --- /dev/null +++ b/article/templates/article/objects/cover_story.html @@ -0,0 +1,34 @@ +{% load humanize %} +{% load dispatch_filters %} +{% load wagtailcore_tags %} +{% load wagtailimages_tags %} +{% load articletags %} + + \ No newline at end of file diff --git a/article/templates/article/objects/darkmode_button.html b/article/templates/article/objects/darkmode_button.html index 6a8af07fb..720c4fc51 100644 --- a/article/templates/article/objects/darkmode_button.html +++ b/article/templates/article/objects/darkmode_button.html @@ -1,12 +1,10 @@ - - + + \ No newline at end of file diff --git a/article/templates/article/stream_blocks/quote.html b/article/templates/article/stream_blocks/quote.html index 6c7cb2d76..4c8c0d66b 100644 --- a/article/templates/article/stream_blocks/quote.html +++ b/article/templates/article/stream_blocks/quote.html @@ -1,4 +1,19 @@ +{% if self.audio %} + +{% endif %} +

{{ self.content }}

- {% if self.source %}

— {{ self.source }}

{% endif %} +

+ {% if self.audio %} + + + {% if self.source %}Listen to {{ self.source }}{% endif %} + + {% elif self.source %} + Listen to {{ self.source }} + {% endif %} +

\ No newline at end of file diff --git a/article/templates/article/stream_blocks/ve_gap.html b/article/templates/article/stream_blocks/ve_gap.html new file mode 100644 index 000000000..1e8364b40 --- /dev/null +++ b/article/templates/article/stream_blocks/ve_gap.html @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/article/templates/article/stream_blocks/ve_switch_view.html b/article/templates/article/stream_blocks/ve_switch_view.html new file mode 100644 index 000000000..bacbaff64 --- /dev/null +++ b/article/templates/article/stream_blocks/ve_switch_view.html @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/article/templates/article/stream_blocks/visual-essay.html b/article/templates/article/stream_blocks/visual-essay.html new file mode 100644 index 000000000..9b6d3ace2 --- /dev/null +++ b/article/templates/article/stream_blocks/visual-essay.html @@ -0,0 +1,46 @@ +{% load wagtailcore_tags %} +{% load wagtailimages_tags %} +{% load static %} + +
+ +
+ {% for block in self.content %} + {% if block.value.side == "left" %} +
+ {% if block.block_type == 'image' %} + {% if block.value.block.caption or block.value.block.credit %} +
+ {% if block.value.block.caption %}{{ block.value.block.caption|safe }}{% endif %} + {% if block.value.block.credit %}{{ block.value.block.credit }}{% endif %} +
+ {% endif %} + {% image block.value.block.image original as bg %} +
+ {% else %} + {% include_block block.value.block with id=block.id %} + {% endif %} +
+ {% endif %} + {% endfor %} +
+
+ {% for block in self.content %} + {% if block.block_type == 'gap' or block.block_type == 'switch_view' %} + {% include_block block with id=block.id %} + {% elif block.value.side == "right" %} + {% if block.block_type == 'raw_html' %} + {% include_block block.value.block with id=block.id %} + {% else %} +
+ {% include_block block.value.block with id=block.id %} +
+ {% endif %} + {% else %} +
+ {% endif %} + {% endfor %} +
+
+ + \ No newline at end of file diff --git a/article/templatetags/article_display.py b/article/templatetags/article_display.py new file mode 100644 index 000000000..ca2e0b931 --- /dev/null +++ b/article/templatetags/article_display.py @@ -0,0 +1,22 @@ +from django import template + +register = template.Library() + +@register.filter +def modulo(num, val): + return num % val + +@register.filter +def indexing_from(lst, start): + return lst[start:] + +@register.filter +def split(value, num): + result = [] + i = 0 + while i < len(value): + result.append(value[i:i+num]) + i = i + num + return result + + \ No newline at end of file diff --git a/article/templatetags/articletags.py b/article/templatetags/articletags.py new file mode 100644 index 000000000..b08e76464 --- /dev/null +++ b/article/templatetags/articletags.py @@ -0,0 +1,32 @@ +from django import template +from django.template.defaultfilters import stringfilter +from django.template.loader import render_to_string +from section.models import SectionPage + +register = template.Library() + +@register.filter(name='get_label') +def get_label(value): + if value.get_parent().get_specific().label_svg == None: + return False + else: + return value.get_parent().get_specific().label_svg.url + +@register.filter(name='get_colour') +def get_colour(value): + pageColour = value.colour + if value.use_parent_colour: + if value.get_parent() is not None: + parent_page = value.get_parent().specific + if hasattr(parent_page,'colour'): + pageColour = value.colour = parent_page.colour + + return pageColour + +@register.filter(name='get_section_link') +def get_section_link(value): + return value.get_parent().url + +@register.filter(name='get_section_title') +def get_section_title(value): + return value.get_parent().title \ No newline at end of file diff --git a/article/templatetags/visual_essay.py b/article/templatetags/visual_essay.py new file mode 100644 index 000000000..9b79cf873 --- /dev/null +++ b/article/templatetags/visual_essay.py @@ -0,0 +1,10 @@ +from django import template + +register = template.Library() + +@register.filter(name="get_first_image") +def get_first_image(blocks): + for i in range(len(blocks)): + if blocks[i].block_type == "image": + return i + return None \ No newline at end of file diff --git a/authors/migrations/0006_authorpage_links.py b/authors/migrations/0006_authorpage_links.py new file mode 100644 index 000000000..ff825cf57 --- /dev/null +++ b/authors/migrations/0006_authorpage_links.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.11 on 2023-05-17 03:58 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('authors', '0005_alter_authorpage_ubyssey_role'), + ] + + operations = [ + migrations.AddField( + model_name='authorpage', + name='links', + field=wagtail.core.fields.StreamField([('url', wagtail.core.blocks.URLBlock(label='Url'))], blank=True), + ), + ] diff --git a/authors/migrations/0007_authorpage_linkicons.py b/authors/migrations/0007_authorpage_linkicons.py new file mode 100644 index 000000000..12bf54c5e --- /dev/null +++ b/authors/migrations/0007_authorpage_linkicons.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.11 on 2023-05-30 23:47 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('authors', '0006_authorpage_links'), + ] + + operations = [ + migrations.AddField( + model_name='authorpage', + name='linkIcons', + field=wagtail.core.fields.StreamField([('raw_html', wagtail.core.blocks.RawHTMLBlock())], blank=True), + ), + ] diff --git a/authors/migrations/0008_alter_authorpage_linkicons.py b/authors/migrations/0008_alter_authorpage_linkicons.py new file mode 100644 index 000000000..d15921447 --- /dev/null +++ b/authors/migrations/0008_alter_authorpage_linkicons.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.11 on 2023-05-31 00:17 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('authors', '0007_authorpage_linkicons'), + ] + + operations = [ + migrations.AlterField( + model_name='authorpage', + name='linkIcons', + field=wagtail.core.fields.StreamField([('richtext', wagtail.core.blocks.RichTextBlock())], blank=True), + ), + ] diff --git a/authors/migrations/0009_alter_authorpage_linkicons.py b/authors/migrations/0009_alter_authorpage_linkicons.py new file mode 100644 index 000000000..65c3da7e6 --- /dev/null +++ b/authors/migrations/0009_alter_authorpage_linkicons.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.11 on 2023-05-31 00:24 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('authors', '0008_alter_authorpage_linkicons'), + ] + + operations = [ + migrations.AlterField( + model_name='authorpage', + name='linkIcons', + field=wagtail.core.fields.StreamField([('raw_html', wagtail.core.blocks.RawHTMLBlock())], blank=True), + ), + ] diff --git a/authors/migrations/0010_pinnedarticlesorderable.py b/authors/migrations/0010_pinnedarticlesorderable.py new file mode 100644 index 000000000..80ec0df33 --- /dev/null +++ b/authors/migrations/0010_pinnedarticlesorderable.py @@ -0,0 +1,29 @@ +# Generated by Django 3.2.11 on 2023-05-31 20:34 + +from django.db import migrations, models +import django.db.models.deletion +import modelcluster.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('article', '0018_articlepage_noindex'), + ('authors', '0009_alter_authorpage_linkicons'), + ] + + operations = [ + migrations.CreateModel( + name='PinnedArticlesOrderable', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), + ('article', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='pinned_articles', to='article.articlepage')), + ('author_page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='pinned_articles', to='authors.authorpage')), + ], + options={ + 'ordering': ['sort_order'], + 'abstract': False, + }, + ), + ] diff --git a/authors/migrations/0011_authorpage_main_media_type.py b/authors/migrations/0011_authorpage_main_media_type.py new file mode 100644 index 000000000..f68ca3f9c --- /dev/null +++ b/authors/migrations/0011_authorpage_main_media_type.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.11 on 2023-06-02 02:27 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('authors', '0010_pinnedarticlesorderable'), + ] + + operations = [ + migrations.AddField( + model_name='authorpage', + name='main_media_type', + field=models.CharField(blank=True, choices=[('stories', 'Stories'), ('photos', 'Photos'), ('videos', 'Videos')], default='stories', max_length=20), + ), + ] diff --git a/authors/migrations/0012_alter_authorpage_main_media_type.py b/authors/migrations/0012_alter_authorpage_main_media_type.py new file mode 100644 index 000000000..f98f7750b --- /dev/null +++ b/authors/migrations/0012_alter_authorpage_main_media_type.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.11 on 2023-06-02 02:35 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('authors', '0011_authorpage_main_media_type'), + ] + + operations = [ + migrations.AlterField( + model_name='authorpage', + name='main_media_type', + field=models.CharField(choices=[('stories', 'Stories'), ('photos', 'Photos'), ('videos', 'Videos')], default='stories', max_length=20), + ), + ] diff --git a/authors/migrations/0014_merge_20230718_1044.py b/authors/migrations/0014_merge_20230718_1044.py new file mode 100644 index 000000000..fc3f42692 --- /dev/null +++ b/authors/migrations/0014_merge_20230718_1044.py @@ -0,0 +1,14 @@ +# Generated by Django 3.2.11 on 2023-07-18 17:44 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('authors', '0012_alter_authorpage_main_media_type'), + ('authors', '0013_auto_20230704_0459'), + ] + + operations = [ + ] diff --git a/authors/migrations/0015_alter_authorpage_main_media_type.py b/authors/migrations/0015_alter_authorpage_main_media_type.py new file mode 100644 index 000000000..d9d8f66c5 --- /dev/null +++ b/authors/migrations/0015_alter_authorpage_main_media_type.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.11 on 2023-07-29 06:49 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('authors', '0014_merge_20230718_1044'), + ] + + operations = [ + migrations.AlterField( + model_name='authorpage', + name='main_media_type', + field=models.CharField(choices=[('articles', 'Articles'), ('photos', 'Photos'), ('videos', 'Videos')], default='stories', max_length=20), + ), + ] diff --git a/authors/migrations/0016_alter_authorpage_main_media_type.py b/authors/migrations/0016_alter_authorpage_main_media_type.py new file mode 100644 index 000000000..d92a469f8 --- /dev/null +++ b/authors/migrations/0016_alter_authorpage_main_media_type.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.11 on 2023-08-03 07:14 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('authors', '0015_alter_authorpage_main_media_type'), + ] + + operations = [ + migrations.AlterField( + model_name='authorpage', + name='main_media_type', + field=models.CharField(choices=[('articles', 'Articles'), ('photos', 'Photos'), ('videos', 'Videos')], default='articles', max_length=20), + ), + ] diff --git a/authors/models.py b/authors/models.py index 7eee77b3d..68de1c90b 100644 --- a/authors/models.py +++ b/authors/models.py @@ -21,11 +21,15 @@ from wagtail.core import blocks from wagtail.core.fields import StreamField -from wagtail.core.models import Page +from wagtail.core.models import Page, Orderable from wagtail.search import index from wagtail.images.edit_handlers import ImageChooserPanel - - +from modelcluster.fields import ParentalKey +from wagtail.contrib.routable_page.models import RoutablePageMixin, route +from django.shortcuts import render +from images.models import UbysseyImage +from django import forms +from videos.models import VideoSnippet class AllAuthorsPage(Page): subpage_types = [ @@ -39,7 +43,27 @@ class Meta: verbose_name = "Author Management" verbose_name_plural = "Author Management Pages" -class AuthorPage(Page): +class PinnedArticlesOrderable(Orderable): + author_page = ParentalKey( + "authors.AuthorPage", + related_name="pinned_articles", + ) + article = models.ForeignKey( + 'article.ArticlePage', + on_delete=models.CASCADE, + related_name="pinned_articles", + ) + + panels = [ + MultiFieldPanel( + [ + PageChooserPanel('article'), + ], + heading="Article" + ), + ] + +class AuthorPage(RoutablePageMixin, Page): template = "authors/author_page.html" @@ -103,6 +127,18 @@ class AuthorPage(Page): ) + + CHOICES = [("articles", "Articles"), ("photos", "Photos"), ("videos", "Videos")] + main_media_type = models.CharField( + choices=CHOICES, + default='articles', + max_length=20, + blank=False, + null=False,) + + linkIcons = StreamField([('raw_html', blocks.RawHTMLBlock()),], blank=True) + links = StreamField([('url', blocks.URLBlock(label="Url")),], blank=True) + # For editting in wagtail: content_panels = [ # title not present, title should NOT be directly editable @@ -119,8 +155,9 @@ class AuthorPage(Page): FieldPanel("ubyssey_role"), StreamFieldPanel("bio_description"), StreamFieldPanel("short_bio_description"), - FieldPanel("facebook_url"), - FieldPanel("twitter_url"), + FieldPanel("main_media_type"), + StreamFieldPanel("links"), + InlinePanel("pinned_articles", label="Pinned articles") ], heading="Optional Stuff", ), @@ -132,27 +169,41 @@ class AuthorPage(Page): index.SearchField('description'), ] - def get_context(self, request, *args, **kwargs): - context = super().get_context(request, *args, **kwargs) - + def organize_media(self, media_type, request, context): search_query = request.GET.get("q") page = request.GET.get("page") order = request.GET.get("order") - if order == 'oldest': - article_order = "explicit_published_at" - else: - article_order = "-explicit_published_at" - context["order"] = order + if media_type == "articles": + if order == 'oldest': + article_order = "explicit_published_at" + else: + article_order = "-explicit_published_at" + authors_media = ArticlePage.objects.live().public().filter(article_authors__author=self).order_by(article_order) + elif media_type == "photos": + if order == 'oldest': + article_order = "updated_at" + else: + article_order = "-updated_at" + authors_media = UbysseyImage.objects.filter(author=self).order_by(article_order) + elif media_type == "videos": + if order == 'oldest': + article_order = "updated_at" + else: + article_order = "-updated_at" + authors_media = VideoSnippet.objects.filter(video_authors__author=self).order_by(article_order) - # Hit the db - authors_articles = ArticlePage.objects.live().public().filter(article_authors__author=self).order_by(article_order) if search_query: - context["search_query"] = search_query - authors_articles = authors_articles.search(search_query) + if media_type == "videos": + #from wagtail.search.backends import get_search_backend + #s = get_search_backend() + #authors_media = s.search(search_query, authors_media) + authors_media = authors_media.filter(title=search_query) + else: + authors_media = authors_media.search(search_query) # Paginate all posts by 15 per page - paginator = Paginator(authors_articles, per_page=15) + paginator = Paginator(authors_media, per_page=15) try: # If the page exists and the ?page=x is an int paginated_articles = paginator.page(page) @@ -160,16 +211,83 @@ def get_context(self, request, *args, **kwargs): except PageNotAnInteger: # If the ?page=x is not an int; show the first page paginated_articles = paginator.page(1) + context["current_page"] = 1 except EmptyPage: # If the ?page=x is out of range (too high most likely) # Then return the last page paginated_articles = paginator.page(paginator.num_pages) + context["current_page"] = paginator.num_pages + + context["paginated_articles"] = paginated_articles + + return context + + def get_context(self, request, *args, **kwargs): + context = super().get_context(request, *args, **kwargs) + + media_types = [] + if VideoSnippet.objects.all().count() > 0: + media_types.append("videos") + if UbysseyImage.objects.all().count() > 0: + media_types.append("photos") + if ArticlePage.objects.live().public().all().count() > 0: + media_types.append("articles") + + context["media_types"] = media_types + context["media_type"] = self.main_media_type - context["paginated_articles"] = paginated_articles #this object is often called page_obj in Django docs, but Page means something else in Wagtail + context = self.organize_media(self.main_media_type, request, context) return context - + def save(self, *args, **kwargs): + import requests + from urllib.parse import urlparse + from django.utils.safestring import mark_safe + + domainToIcon = {'www.tumblr.com': 'fa-tumblr', + 'www.instagram.com': 'fa-instagram', + 'twitter.com': 'fa-twitter', + 'www.facebook.com': 'fa-facebook', + 'www.youtube.com': 'fa-youtube-play', + 'www.tiktok.com': 'fa-tiktok', + 'www.linkedin.com': 'fa-linkedin', + 'www.reddit.com': 'fa-reddit'} + + for i in range(len(self.linkIcons)): + del self.linkIcons[-1] + + for link in self.links: + url = link.value + domain = urlparse(url).netloc + extra = "" + if domain in domainToIcon: + if domain == "www.linkedin.com": + username = self.full_name + else: + icon = domainToIcon[domain] + if url[-1] == "/": + url = url[0:-1] + username = url.split("/")[-1] + username = username.replace("@","") + else: + icon = "fa-globe" + try: + json = requests.get(urlparse(url).scheme + "://" + domain + "/api/v2/instance").json() + if 'source_url' in json: + if json['source_url']=='https://github.com/mastodon/mastodon': + icon = "fa-brands fa-mastodon" + extra = "rel='me'" + username = url.split("/")[-1] + username = username.replace("@","") + except: + icon = "fa-globe" + username = domain + + self.linkIcons.append(('raw_html', ' '+username+'')) + + return super().save(*args, **kwargs) + def clean(self): """Override the values of title and slug before saving.""" # The odd pattern used here was taken from: https://stackoverflow.com/questions/48625770/wagtail-page-title-overwriting @@ -179,9 +297,52 @@ def clean(self): self.title = self.full_name # self.slug = slugify(self.full_name) # slug MUST be unique & slug-formatted + def __str__(self): return self.full_name class Meta: verbose_name = "Author" - verbose_name_plural = "Authors" \ No newline at end of file + verbose_name_plural = "Authors" + + @route(r'^articles/$') + def stories_page(self, request, *args, **kwargs): + """ + View function for author's stories + """ + + context = self.get_context(request, *args, **kwargs) + + context["media_type"] = "articles" + + context = self.organize_media("articles", request, context) + + return render(request, self.template, context) + + @route(r'^photos/$') + def photos_page(self, request, *args, **kwargs): + """ + View function for author's photos + """ + + context = self.get_context(request, *args, **kwargs) + + context["media_type"] = "photos" + + context = self.organize_media("photos", request, context) + + return render(request, self.template, context) + + @route(r'^videos/$') + def videos_page(self, request, *args, **kwargs): + """ + View function for author's videos + """ + + context = self.get_context(request, *args, **kwargs) + + context["media_type"] = "videos" + + context = self.organize_media("videos", request, context) + + return render(request, self.template, context) \ No newline at end of file diff --git a/authors/templates/authors/author_page.html b/authors/templates/authors/author_page.html index 475afc1b8..b6f7bd49a 100644 --- a/authors/templates/authors/author_page.html +++ b/authors/templates/authors/author_page.html @@ -2,39 +2,67 @@ {% load static %} {% load wagtailcore_tags %} {% load wagtailimages_tags %} - -{% block content %} +{% load authors_tags %} {% block header %} {% include 'navigation/headers/topbar.html' %} {% include 'navigation/headers/mobile.html' %} {% endblock %} +{% block content %}
-
+
{% if self.image %} -
- {% image self.image fill-150x200 %} - -
+ {% image self.image width-350 as pfp %} +
{% endif %} -
-

{{ self.title }} - {% if self.facebook_url %} - {% endif %} - {% if self.twitter_url %} {% endif %} -

- {% if self.title %}

{{ self.title }}

{% endif %} - {% if self.bio_description %}

{{ self.bio_description|safe }}

{% endif %} +
+

{{ self.title }}

+

{{self.ubyssey_role}}

+ {% if self.bio_description %}

{{ self.bio_description|safe }}

{% endif %} +

+ + {% for icon in self.linkIcons %} + {{icon}} + {% endfor %} +

- {% include 'archive/objects/archive.html' with page_obj=paginated_articles %} + {% if self.pinned_articles.count > 0 and current_page == 1 %} +

Pinned

+
+ {% for article in self.pinned_articles.all %} +
+ {% include 'article/objects/author_pinned.html' with article=article.article %} +
+ {% endfor %} +
+ {% endif %} + +
+ {% if "articles" in media_types %} +

Articles

+ {% endif %} + {% if "photos" in media_types %} +

Photos

+ {% endif %} + {% if "videos" in media_types %} +

Videos

+ {% endif %} +
+

Latest {{media_type}} from {{self.title}}

+ + {% if media_type == "articles" %} + {% include 'archive/objects/archive.html' with page_obj=paginated_articles %} + {% elif media_type == "photos" %} + {% include 'archive/objects/gallery.html' with page_obj=paginated_articles %} + {% elif media_type == "videos" %} + {% include 'archive/objects/archive.html' with page_obj=paginated_articles video_section=true%} + {% endif %}
{% endblock %} \ No newline at end of file diff --git a/authors/templatetags/authors_tags.py b/authors/templatetags/authors_tags.py new file mode 100644 index 000000000..f6e6e0a96 --- /dev/null +++ b/authors/templatetags/authors_tags.py @@ -0,0 +1,38 @@ +from django import template +import requests +from urllib.parse import urlparse +from django.utils.safestring import mark_safe + +register = template.Library() + +@register.filter(name='get_link_icon') +def get_link_icon(url): + domain = urlparse(url).netloc + domainToIcon = {'www.tumblr.com': 'fa-tumblr', + 'www.instagram.com': 'fa-instagram', + 'twitter.com': 'fa-twitter', + 'www.facebook.com': 'fa-facebook', + 'www.youtube.com': 'fa-youtube-play', + 'www.tiktok.com': 'fa-tiktok', + 'www.linkedin.com': 'fa-linkedin', + 'www.reddit.com': 'fa-reddit'} + extra = "" + if domain in domainToIcon: + icon = domainToIcon[domain] + username = url.split("/")[-1] + username = username.replace("@","") + else: + icon = "fa-globe" + try: + json = requests.get(urlparse(url).scheme + "://" + domain + "/api/v2/instance").json() + if 'source_url' in json: + if json['source_url']=='https://github.com/mastodon/mastodon': + icon = "fa-mastodon" + extra = "rel='me'" + username = url.split("/")[-1] + username = username.replace("@","") + except: + icon = "fa-globe" + username = domain + + return mark_safe(' '+username+'') diff --git a/config/context_processors.py b/config/context_processors.py new file mode 100644 index 000000000..7d2f5bcc8 --- /dev/null +++ b/config/context_processors.py @@ -0,0 +1,6 @@ +def get_light_mode(request): + mode = request.COOKIES.get('lightMode') + if mode == "dark": + return {"mode": "dark"} + else: + return {"mode": "light"} \ No newline at end of file diff --git a/config/settings/base.py b/config/settings/base.py index cace7c891..ea6b6f842 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -160,10 +160,10 @@ 'images', 'videos', 'ads', - 'sporttourney', 'specialfeaturelanding', 'navigation', 'dashboard', + 'infinitefeed', 'newsletter.apps.NewsletterConfig', 'magazine.apps.MagazineConfig', @@ -263,6 +263,8 @@ }, ] +TEMPLATES[0]['OPTIONS']['context_processors'].append("config.context_processors.get_light_mode") + # REST framework settings REST_FRAMEWORK = { 'DEFAULT_PERMISSION_CLASSES': ( @@ -324,6 +326,13 @@ WAGTAILIMAGES_IMAGE_MODEL = 'images.UbysseyImage' +WAGTAILIMAGES_FORMAT_CONVERSIONS = { + 'png': 'webp', + 'jpeg': 'webp', + 'bmp': 'webp', + 'webp': 'webp', +} + # wagtailmenus settings WAGTAILMENUS_ACTIVE_CLASS = 'current' # used for css in e.g. navigation/header.html WAGTAILMENUS_ACTIVE_ANCESTOR_CLASS = 'current' diff --git a/dashboard/wagtail_hooks.py b/dashboard/wagtail_hooks.py index 0462b1481..f2872f324 100644 --- a/dashboard/wagtail_hooks.py +++ b/dashboard/wagtail_hooks.py @@ -138,4 +138,52 @@ def register_righttext_feature(features): features.register_converter_rule("contentstate", feature_name, db_conversion) # Step 6, This is optional. - features.default_features.append(feature_name) \ No newline at end of file + features.default_features.append(feature_name) + +# 1. Use the register_rich_text_features hook. +@hooks.register('register_rich_text_features') +def register_redacted_feature(features): + """ + Registering the `mark` feature, which uses the `MARK` Draft.js inline style type, + and is stored as HTML with a `` tag. + """ + feature_name = 'redacted' + type_ = 'REDACTED' + tag = "span" # This tag is currently + + # 2. Configure how Draftail handles the feature in its toolbar. + control = { + 'type': type_, + 'label': 'â–®', + 'description': 'Redacted', + # This isn’t even required – Draftail has predefined styles for MARK. + 'style': { + 'background-color': 'currentcolor', + }, + } + + # 3. Call register_editor_plugin to register the configuration for Draftail. + features.register_editor_plugin( + 'draftail', feature_name, draftail_features.InlineStyleFeature(control) + ) + + # 4.configure the content transform from the DB to the editor and back. + db_conversion = { + 'from_database_format': {tag: InlineStyleElementHandler(type_)}, + 'to_database_format': {'style_map': { + type_: { + "element": tag, + "props": { + "class": "d-block redacted" + } + } + } + }, + } + + # 5. Call register_converter_rule to register the content transformation conversion. + features.register_converter_rule('contentstate', feature_name, db_conversion) + + # 6. (optional) Add the feature to the default features list to make it available + # on rich text fields that do not specify an explicit 'features' list + features.default_features.append('redacted') \ No newline at end of file diff --git a/home/blocks.py b/home/blocks.py index f4ad48d8f..637b442a6 100644 --- a/home/blocks.py +++ b/home/blocks.py @@ -3,6 +3,7 @@ """ from ads.models import HomeSidebarPlacementOrderable from article.models import ArticlePage +from section.models import CategorySnippet from django import forms from django.db.models import Q @@ -11,6 +12,7 @@ from wagtail.core import blocks from wagtail.core.blocks import field_block +from wagtail.snippets.blocks import SnippetChooserBlock from wagtail.images.blocks import ImageChooserBlock from wagtailmodelchooser.blocks import ModelChooserBlock @@ -29,10 +31,10 @@ class HomepageFeaturedSectionBlock(blocks.StructBlock): layout = blocks.ChoiceBlock( choices=[ - ('news', '\"News Section" Style'), + ('bulleted', '\"Bulleted Section" Style'), ('featured', '\"Featured Section\" Style'), ], - default='news', + default='bulleted', required=True, ) @@ -109,6 +111,22 @@ class Meta: verbose_name = "Sidebar Print Issues Block" verbose_name_plural = "Sidebar Print Issues Blocks" +class SidebarCategoryBlock(blocks.StructBlock): + title = blocks.CharBlock( + required=True, + max_length=255, + ) + category = SnippetChooserBlock(CategorySnippet) + + def get_context(self, value, parent_context=None): + context = super().get_context(value, parent_context=parent_context) + context['title'] = value['title'] + context['category'] = value['title'] + context['articles'] = ArticlePage.objects.live().public().filter(category=value['category']).order_by('-explicit_published_at') + return context + class Meta: + template = "infinitefeed/sidebar/sidebar_section_block.html" + class SidebarSectionBlock(blocks.StructBlock): title = blocks.CharBlock( required=True, @@ -152,4 +170,15 @@ class SidebarFlexStreamBlock(blocks.StructBlock): class Meta: template = "home/stream_blocks/sidebar_flex_stream_block.html" verbose_name = "Sidebar Stream Flex Block" - verbose_name_plural = "Sidebar Stream Flex Blocks" \ No newline at end of file + verbose_name_plural = "Sidebar Stream Flex Blocks" + +class LinkStreamBlock(blocks.StructBlock): + title = blocks.CharBlock( + required=True, + max_length=255, + ) + url = blocks.URLBlock(required=False) + description = blocks.TextBlock(required=False) + + class Meta: + template = "home/stream_blocks/link.html" \ No newline at end of file diff --git a/home/migrations/0013_homepage_cover_story.py b/home/migrations/0013_homepage_cover_story.py new file mode 100644 index 000000000..66f235ca5 --- /dev/null +++ b/home/migrations/0013_homepage_cover_story.py @@ -0,0 +1,21 @@ +# Generated by Django 3.2.11 on 2023-05-19 09:05 + +from django.db import migrations +import django.db.models.deletion +import modelcluster.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('article', '0018_articlepage_noindex'), + ('home', '0012_alter_homepage_sidebar_stream'), + ] + + operations = [ + migrations.AddField( + model_name='homepage', + name='cover_story', + field=modelcluster.fields.ParentalKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='cover_story', to='article.articlepage'), + ), + ] diff --git a/home/migrations/0014_auto_20230519_0232.py b/home/migrations/0014_auto_20230519_0232.py new file mode 100644 index 000000000..db7a280cb --- /dev/null +++ b/home/migrations/0014_auto_20230519_0232.py @@ -0,0 +1,37 @@ +# Generated by Django 3.2.11 on 2023-05-19 09:32 + +from django.db import migrations, models +import django.db.models.deletion +import modelcluster.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('article', '0018_articlepage_noindex'), + ('home', '0013_homepage_cover_story'), + ] + + operations = [ + migrations.RemoveField( + model_name='homepage', + name='above_cut_stream', + ), + migrations.RemoveField( + model_name='homepage', + name='sections_stream', + ), + migrations.CreateModel( + name='TopArticlesOrderable', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), + ('article', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='top_articles', to='article.articlepage')), + ('home_page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='top_articles', to='home.homepage')), + ], + options={ + 'ordering': ['sort_order'], + 'abstract': False, + }, + ), + ] diff --git a/home/migrations/0015_homepage_links.py b/home/migrations/0015_homepage_links.py new file mode 100644 index 000000000..93d0f38fe --- /dev/null +++ b/home/migrations/0015_homepage_links.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.11 on 2023-05-23 20:56 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('home', '0014_auto_20230519_0232'), + ] + + operations = [ + migrations.AddField( + model_name='homepage', + name='links', + field=wagtail.core.fields.StreamField([('link', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(max_length=255, required=True)), ('url', wagtail.core.blocks.URLBlock(required=False)), ('description', wagtail.core.blocks.TextBlock(required=False))]))], blank=True, null=True), + ), + ] diff --git a/home/migrations/0016_homepage_tagline.py b/home/migrations/0016_homepage_tagline.py new file mode 100644 index 000000000..1538c140a --- /dev/null +++ b/home/migrations/0016_homepage_tagline.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.11 on 2023-06-19 10:09 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('home', '0015_homepage_links'), + ] + + operations = [ + migrations.AddField( + model_name='homepage', + name='tagline', + field=models.CharField(blank=True, max_length=50, null=True), + ), + ] diff --git a/home/migrations/0017_homepage_tagline_url.py b/home/migrations/0017_homepage_tagline_url.py new file mode 100644 index 000000000..f0dcfd21b --- /dev/null +++ b/home/migrations/0017_homepage_tagline_url.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.11 on 2023-06-20 15:50 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('home', '0016_homepage_tagline'), + ] + + operations = [ + migrations.AddField( + model_name='homepage', + name='tagline_url', + field=models.URLField(blank=True, null=True), + ), + ] diff --git a/home/migrations/0018_alter_homepage_cover_story.py b/home/migrations/0018_alter_homepage_cover_story.py new file mode 100644 index 000000000..1948ddc63 --- /dev/null +++ b/home/migrations/0018_alter_homepage_cover_story.py @@ -0,0 +1,21 @@ +# Generated by Django 3.2.11 on 2023-06-27 02:32 + +from django.db import migrations +import django.db.models.deletion +import modelcluster.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('article', '0019_alter_articlepage_content'), + ('home', '0017_homepage_tagline_url'), + ] + + operations = [ + migrations.AlterField( + model_name='homepage', + name='cover_story', + field=modelcluster.fields.ParentalKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='cover_story', to='article.articlepage'), + ), + ] diff --git a/home/migrations/0019_homepage_sections_stream.py b/home/migrations/0019_homepage_sections_stream.py new file mode 100644 index 000000000..ab3b6f95b --- /dev/null +++ b/home/migrations/0019_homepage_sections_stream.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.11 on 2023-07-18 18:39 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('home', '0018_alter_homepage_cover_story'), + ] + + operations = [ + migrations.AddField( + model_name='homepage', + name='sections_stream', + field=wagtail.core.fields.StreamField([('home_page_section_block', wagtail.core.blocks.StructBlock([('section', wagtail.core.blocks.PageChooserBlock(page_type=['section.SectionPage'])), ('layout', wagtail.core.blocks.ChoiceBlock(choices=[('news', '"News Section" Style'), ('featured', '"Featured Section" Style')]))]))], blank=True, null=True), + ), + ] diff --git a/home/migrations/0020_alter_homepage_sections_stream.py b/home/migrations/0020_alter_homepage_sections_stream.py new file mode 100644 index 000000000..7cd3c1faf --- /dev/null +++ b/home/migrations/0020_alter_homepage_sections_stream.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.11 on 2023-07-18 20:06 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('home', '0019_homepage_sections_stream'), + ] + + operations = [ + migrations.AlterField( + model_name='homepage', + name='sections_stream', + field=wagtail.core.fields.StreamField([('home_page_section_block', wagtail.core.blocks.StructBlock([('section', wagtail.core.blocks.PageChooserBlock(page_type=['section.SectionPage'])), ('layout', wagtail.core.blocks.ChoiceBlock(choices=[('bulleted', '"Bulleted Section" Style'), ('featured', '"Featured Section" Style')]))]))], blank=True, null=True), + ), + ] diff --git a/home/migrations/0021_alter_homepage_sidebar_stream.py b/home/migrations/0021_alter_homepage_sidebar_stream.py new file mode 100644 index 000000000..29e6b716c --- /dev/null +++ b/home/migrations/0021_alter_homepage_sidebar_stream.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.11 on 2023-08-03 14:12 + +from django.db import migrations +import section.models +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks +import wagtail.snippets.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('home', '0020_alter_homepage_sections_stream'), + ] + + operations = [ + migrations.AlterField( + model_name='homepage', + name='sidebar_stream', + field=wagtail.core.fields.StreamField([('sidebar_advertisement_block', wagtail.core.blocks.StructBlock([])), ('sidebar_issues_block', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(max_length=255, required=True)), ('issues', wagtail.core.blocks.StreamBlock([('issue', wagtail.core.blocks.StructBlock([('date', wagtail.core.blocks.DateBlock(required=True)), ('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('show_image', wagtail.core.blocks.BooleanBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=True))]))]))])), ('sidebar_category_block', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(max_length=255, required=True)), ('category', wagtail.snippets.blocks.SnippetChooserBlock(section.models.CategorySnippet))])), ('sidebar_section_block', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(max_length=255, required=True)), ('section', wagtail.core.blocks.PageChooserBlock(page_type=['section.SectionPage']))])), ('sidebar_flex_stream_block', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(max_length=255, required=True)), ('stream', wagtail.core.blocks.StreamBlock([('image_link', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=True)), ('link', wagtail.core.blocks.URLBlock(required=False))]))]))]))], blank=True, null=True), + ), + ] diff --git a/home/models.py b/home/models.py index 92e57b8ce..884e2b298 100644 --- a/home/models.py +++ b/home/models.py @@ -6,13 +6,35 @@ from django.utils import timezone from ads.models import AdSlot -from wagtail.admin.edit_handlers import FieldPanel, StreamFieldPanel -from wagtail.core.models import Page +from wagtail.admin.edit_handlers import FieldPanel, StreamFieldPanel, PageChooserPanel, MultiFieldPanel, InlinePanel +from wagtail.core.models import Page, Orderable from wagtail.core.fields import StreamField from wagtailmodelchooser.edit_handlers import ModelChooserPanel +from modelcluster.fields import ParentalKey +from infinitefeed import blocks as infinitefeedblocks # Create your models here. +class TopArticlesOrderable(Orderable): + home_page = ParentalKey( + "home.HomePage", + related_name="top_articles", + ) + article = models.ForeignKey( + 'article.ArticlePage', + on_delete=models.CASCADE, + related_name="top_articles", + ) + + panels = [ + MultiFieldPanel( + [ + PageChooserPanel('article'), + ], + heading="Article" + ), + ] + class HomePage(Page): show_in_menus_default = True template = "home/home_page.html" @@ -28,9 +50,27 @@ class HomePage(Page): 'archive.ArchivePage', ] - above_cut_stream = StreamField( + tagline = models.CharField( + blank=True, + null=True, + max_length=50) + + tagline_url = models.URLField( + blank=True, + null=True + ) + + cover_story = ParentalKey( + "article.ArticlePage", + related_name = "cover_story", + null=True, + blank=True, + on_delete=models.SET_NULL + ) + + links = StreamField( [ - ("above_cut_block", homeblocks.AboveCutBlock()) + ("link", homeblocks.LinkStreamBlock()), ], null=True, blank=True, @@ -45,14 +85,15 @@ class HomePage(Page): ) sidebar_stream = StreamField( - [ - ("sidebar_advertisement_block", homeblocks.SidebarAdvertisementBlock()), - ("sidebar_issues_block", homeblocks.SidebarIssuesBlock()), - ("sidebar_section_block", homeblocks.SidebarSectionBlock()), - ("sidebar_flex_stream_block", homeblocks.SidebarFlexStreamBlock()), - ], - null=True, - blank=True, + [ + ("sidebar_advertisement_block", infinitefeedblocks.SidebarAdvertisementBlock()), + ("sidebar_issues_block", infinitefeedblocks.SidebarIssuesBlock()), + ("sidebar_category_block", homeblocks.SidebarCategoryBlock()), + ("sidebar_section_block", infinitefeedblocks.SidebarSectionBlock()), + ("sidebar_flex_stream_block", infinitefeedblocks.SidebarFlexStreamBlock()), + ], + null=True, + blank=True, ) # home_leaderboard_ad_slot = models.ForeignKey( @@ -85,15 +126,38 @@ class HomePage(Page): # ) content_panels = Page.content_panels + [ - StreamFieldPanel("above_cut_stream", heading="\"Above the Cut\" Content"), - StreamFieldPanel("sections_stream", heading="Sections"), + MultiFieldPanel( + [ + FieldPanel("tagline"), + FieldPanel("tagline_url"), + ], + heading="Tagline" + ), + PageChooserPanel("cover_story"), + MultiFieldPanel( + [ + InlinePanel("top_articles"), + ], + heading="Top articles" + ), + StreamFieldPanel("links", heading="Links"), StreamFieldPanel("sidebar_stream", heading="Sidebar"), + StreamFieldPanel("sections_stream", heading="Sections"), # ModelChooserPanel('home_leaderboard_ad_slot'), # ModelChooserPanel('home_mobile_leaderboard_ad_slot'), # ModelChooserPanel('home_sidebar_ad_slot1'), # ModelChooserPanel('home_sidebar_ad_slot2'), ] - + + def get_context(self, request, *args, **kwargs): + context = super().get_context(request, *args, **kwargs) + context["filters"] = {} + return context + + def getTopArticles(self): + return self.top_articles.all() + top_articles_list = property(fget=getTopArticles) + def get_all_section_slug(self): allsection_slug = [] diff --git a/home/templates/home/home_page.html b/home/templates/home/home_page.html index 8b8f779c9..4caf897cf 100644 --- a/home/templates/home/home_page.html +++ b/home/templates/home/home_page.html @@ -13,22 +13,20 @@ {% endblock %} {% block header %} -{% include 'navigation/headers/main.html' %} {% include 'navigation/headers/mobile.html' with class='homepage' %} -{% endblock %} -{% block content %} -{% filter specify_homepage_sidebar_ads:request %} {% for orderable in settings.ads.AdTagSettings.home_header_placements.all %} {% gpt_placement_tag orderable.ad_slot %} {% endfor %} +{% include 'navigation/headers/main.html' with tagline=self.tagline tagline_url=self.tagline_url %} +{% endblock %} +{% block content %} +{% filter specify_homepage_sidebar_ads:request %} -
- - +
{% comment %} breaking_news_article is passed through from context and it contains all of the breaking articles from each section {% endcomment %} @@ -41,29 +39,71 @@

BREAKING: {{ article.title|safe }}

Additional fields/blocks will go here to alert students to some special events {% endcomment %} - - {% for block in self.above_cut_stream %} - {% include_block block %} - {% endfor %} +
+ {% if self.cover_story %} + {% include "article/objects/cover_story.html" with article=self.cover_story%} + {% endif %} +
+ {% now "d N, Y" as date %} + {% now "l" as dayOfWeek %} + {% include 'home/objects/home_heading-box.html' with styling='lightmode' title="Top Stories" text=date textBold=dayOfWeek %} + + {% for article in self.top_articles_list %} + {% include "article/objects/top_article.html" with article=article.article count=forloop.counter %} + {% endfor %} +
+
- -
-
+
+ {% if self.links %} +
+
    + {%for link in self.links%} + {% include_block link%} + {%endfor%} +
+
+
+
+
+ {% else %} +
+ {% endif %} +
+ +
+ +
+
+
+ {% include 'home/objects/home_heading-box.html' with id="feed-box-label" styling='c-home-bannerbox sticky' title='Sections' text='Most Recent' textId='timeBox' %} + +
{% for block in self.sections_stream %} {% include_block block %} {% endfor %} +
- + {% include 'infinitefeed/objects/infinitefeed-sidebar.html' with id="sidebar" sidebar_stream=self.sidebar_stream %} +
-
-
+ + + {% comment %} +
+
+ {% include 'home/objects/home_heading-box.html' with id="feed-box-label" styling='darkmode c-home-bannerbox sticky' title='Infinite feed' textBold='Today' textId='timeBox' %} + {% include 'infinitefeed/infinitefeed.html' with filters=filters label="True" inactive="True" %} +
+ + {% include 'infinitefeed/objects/infinitefeed-sidebar.html' with id="sidebar" sidebar_stream=self.sidebar_stream %} +
-
+ + + {% endcomment %} +
{% endfilter %} {% endblock %} diff --git a/home/templates/home/objects/home_heading-box.html b/home/templates/home/objects/home_heading-box.html new file mode 100644 index 000000000..e9e37d3cc --- /dev/null +++ b/home/templates/home/objects/home_heading-box.html @@ -0,0 +1,8 @@ +
+
+

{{title}}

+
+
+

{% if text %} {{text}}{% endif %}{% if textBold %}  {{textBold}}{% endif %}

+
+
\ No newline at end of file diff --git a/home/templates/home/stream_blocks/link.html b/home/templates/home/stream_blocks/link.html new file mode 100644 index 000000000..5b4119b6d --- /dev/null +++ b/home/templates/home/stream_blocks/link.html @@ -0,0 +1,11 @@ +
  • + {% if self.url %} + {{self.title}} + {% else %} + {{self.title}} + {% endif %} + + {% if self.description %} + {{self.description}} + {% endif %} +
    • \ No newline at end of file diff --git a/home/templates/home/stream_blocks/section_block.html b/home/templates/home/stream_blocks/section_block.html index 28458edef..abe6607ef 100644 --- a/home/templates/home/stream_blocks/section_block.html +++ b/home/templates/home/stream_blocks/section_block.html @@ -8,10 +8,17 @@ See https://github.com/wagtail/wagtail/issues/6053 {% endcomment %} +{% load wagtailcore_tags %} -{% if layout == 'news' %} -{% include "home/stream_blocks/section_news.html" %} -{% else %} -{% include "home/stream_blocks/section_non_news.html" %} -{% endif %} \ No newline at end of file +
    +

    + {{ section|title }} +

    + + {% if layout == 'bulleted' %} + {% include "section/objects/section_bulleted.html" %} + {% else %} + {% include 'section/objects/section_featured.html' with featured_articles=articles %} + {% endif %} +
    \ No newline at end of file diff --git a/home/templates/home/stream_blocks/section_news.html b/home/templates/home/stream_blocks/section_news.html deleted file mode 100644 index 9d66067c7..000000000 --- a/home/templates/home/stream_blocks/section_news.html +++ /dev/null @@ -1,34 +0,0 @@ -{% load humanize %} -{% load wagtailcore_tags %} - -

    {{ section|title }}

    -
    -
    - {% with articles.0 as article %} - {% if article %} - {% include 'article/objects/default.html' with article=article padded=True %} - {% endif %} - {% endwith %} -
    -
    -
    - {% with articles.1 as article %} - {% if article %} - {% include 'article/objects/default.html' with article=article hide_image=True padded=True %} - {% endif %} - {% endwith %} - {% with articles.2 as article %} - {% if article %} - {% include 'article/objects/default.html' with article=article hide_image=True padded=True %} - {% endif %} - {% endwith %} -
    -
      - {% with articles.3 as article %} - {% if article %} -
    • {% include 'article/objects/bullet.html' with article=article %}
      • - {% endif %} - {% endwith %} -
    -
    -
    \ No newline at end of file diff --git a/home/templates/home/stream_blocks/section_non_news.html b/home/templates/home/stream_blocks/section_non_news.html deleted file mode 100644 index a9bd9b16f..000000000 --- a/home/templates/home/stream_blocks/section_non_news.html +++ /dev/null @@ -1,6 +0,0 @@ -{% load humanize %} -{% load wagtailcore_tags %} -

    {{ section|title }}

    -
    - {% include 'section/objects/section_featured.html' with featured_articles=articles %} -
    \ No newline at end of file diff --git a/home/templates/home/stream_blocks/sidebar_single_issue_block.html b/home/templates/home/stream_blocks/sidebar_single_issue_block.html deleted file mode 100644 index f34ff0d12..000000000 --- a/home/templates/home/stream_blocks/sidebar_single_issue_block.html +++ /dev/null @@ -1,2 +0,0 @@ -{% load wagtailimages_tags %} -
    {{ self.date }}{% if self.show_image and self.image %}{% image self.image width-320 %}{% endif %}
    diff --git a/images/models.py b/images/models.py index b0a950731..30f909f11 100644 --- a/images/models.py +++ b/images/models.py @@ -15,7 +15,7 @@ from wagtail.images.models import Image, AbstractImage, AbstractRendition from wagtail.images.edit_handlers import ImageChooserPanel from wagtail.snippets.models import register_snippet - +from wagtail.search import index #-----Custom Image Model----- @@ -69,6 +69,10 @@ class UbysseyImage(AbstractImage): 'legacy_authors', ) + search_fields = AbstractImage.search_fields + [ + index.FilterField('author_id'), + ] + def get_upload_to(self, filename): """ Overrides original. Only difference is in folder_name diff --git a/sporttourney/__init__.py b/infinitefeed/__init__.py similarity index 100% rename from sporttourney/__init__.py rename to infinitefeed/__init__.py diff --git a/infinitefeed/apps.py b/infinitefeed/apps.py new file mode 100644 index 000000000..8e1e5214d --- /dev/null +++ b/infinitefeed/apps.py @@ -0,0 +1,4 @@ +from django.apps import AppConfig + +class InfinitefeedConfig(AppConfig): + name = 'infinitefeed' diff --git a/infinitefeed/blocks.py b/infinitefeed/blocks.py new file mode 100644 index 000000000..a16e3395c --- /dev/null +++ b/infinitefeed/blocks.py @@ -0,0 +1,84 @@ +from wagtail.core import blocks +from wagtail.core.blocks import field_block +from wagtail.core.fields import StreamField +from wagtail.images.blocks import ImageChooserBlock + +class SidebarAdvertisementBlock(blocks.StructBlock): + # Inserts of the recurring ad pattern for home page side bar + # Use in conjunction with specify_homepage_sidebar_ads to cause a specific ad to be placed in the divs provided by this block + class Meta: + template = "infinitefeed/sidebar/sidebar_advertisement_block.html" + +class SinglePrintIssueBlock(blocks.StructBlock): + date = blocks.DateBlock(required=True) + image = ImageChooserBlock(required=False) + show_image = blocks.BooleanBlock(required=False) + link = blocks.URLBlock(required=True) + class Meta: + template = "infinitefeed/sidebar/sidebar_single_issue_block.html" + verbose_name = "Print Issue" + verbose_name_plural = "Print Issues" + +class SidebarIssuesStream(blocks.StreamBlock): + """ + Stream to be used by the SidebarIssueBlock. Each entity in the stream represents a single print issue. + """ + issue = SinglePrintIssueBlock() + +class SidebarIssuesBlock(blocks.StructBlock): + """ + Place this on the home page to create a place for print issues to be displayed on the homepage. + + Consists of a title block (self explanatory) and a stream block (which contains the issues to be displayed) + """ + title = blocks.CharBlock(required=True, max_length=255) + issues = SidebarIssuesStream() + class Meta: + template = "infinitefeed/sidebar/sidebar_issues_block.html" + verbose_name = "Sidebar Print Issues Block" + verbose_name_plural = "Sidebar Print Issues Blocks" + +class SidebarSectionBlock(blocks.StructBlock): + title = blocks.CharBlock( + required=True, + max_length=255, + ) + section = field_block.PageChooserBlock( + page_type='section.SectionPage' + ) + def get_context(self, value, parent_context=None): + context = super().get_context(value, parent_context=parent_context) + context['title'] = value['title'] + context['section'] = value['section'] + context['articles'] = context['section'].get_featured_articles() + return context + class Meta: + template = "infinitefeed/sidebar/sidebar_section_block.html" + +class SidebarImageLinkBlock(blocks.StructBlock): + image = ImageChooserBlock(required=True) + link = blocks.URLBlock(required=False) + class Meta: + template = "infinitefeed/sidebar/sidebar_image_link_block.html" + verbose_name = "Sidebar Image with Optional Link" + verbose_name_plural = "Sidebar Images with Optional Link" + +class SidebarFlexStream(blocks.StreamBlock): + """ + Stream to be used by various things, similar to SidebarIssuesBlock except more "miscellaneous" + """ + image_link = SidebarImageLinkBlock() + +class SidebarFlexStreamBlock(blocks.StructBlock): + + title = blocks.CharBlock( + required=True, + max_length=255, + ) + + stream = SidebarFlexStream() + + class Meta: + template = "infinitefeed/sidebar/sidebar_flex_stream_block.html" + verbose_name = "Sidebar Stream Flex Block" + verbose_name_plural = "Sidebar Stream Flex Blocks" \ No newline at end of file diff --git a/infinitefeed/models.py b/infinitefeed/models.py new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/infinitefeed/models.py @@ -0,0 +1 @@ + diff --git a/infinitefeed/templates/infinitefeed/infinitefeed.html b/infinitefeed/templates/infinitefeed/infinitefeed.html new file mode 100644 index 000000000..6e417c3cb --- /dev/null +++ b/infinitefeed/templates/infinitefeed/infinitefeed.html @@ -0,0 +1,35 @@ +{% load infinitefeed_tags %} +{% load static %} + +
    + {% if label %} + {% for article in filters|preload_articles:"15" %} + {% include 'article/objects/infinitefeed_item.html' with label=label article=article %} + {% endfor %} + {% else %} + {% for article in filters|preload_articles:"15" %} + {% include 'article/objects/infinitefeed_item.html' with article=article %} + {% endfor %} + {% endif %} +
    + + +
    + +
    \ No newline at end of file diff --git a/infinitefeed/templates/infinitefeed/objects/infinitefeed-sidebar.html b/infinitefeed/templates/infinitefeed/objects/infinitefeed-sidebar.html new file mode 100644 index 000000000..debcec333 --- /dev/null +++ b/infinitefeed/templates/infinitefeed/objects/infinitefeed-sidebar.html @@ -0,0 +1,16 @@ +{% load humanize %} +{% load static %} +{% load wagtailcore_tags %} +{% load wagtailimages_tags %} +{% load wagtailuserbar %} + +
    + {% for block in sidebar_stream %} +
    +
    + {% include_block block %} +
    +
    +
    + {% endfor %} +
    \ No newline at end of file diff --git a/home/templates/home/stream_blocks/sidebar_advertisement_block.html b/infinitefeed/templates/infinitefeed/sidebar/sidebar_advertisement_block.html similarity index 100% rename from home/templates/home/stream_blocks/sidebar_advertisement_block.html rename to infinitefeed/templates/infinitefeed/sidebar/sidebar_advertisement_block.html diff --git a/home/templates/home/stream_blocks/sidebar_flex_stream_block.html b/infinitefeed/templates/infinitefeed/sidebar/sidebar_flex_stream_block.html similarity index 100% rename from home/templates/home/stream_blocks/sidebar_flex_stream_block.html rename to infinitefeed/templates/infinitefeed/sidebar/sidebar_flex_stream_block.html diff --git a/home/templates/home/stream_blocks/sidebar_image_link_block.html b/infinitefeed/templates/infinitefeed/sidebar/sidebar_image_link_block.html similarity index 100% rename from home/templates/home/stream_blocks/sidebar_image_link_block.html rename to infinitefeed/templates/infinitefeed/sidebar/sidebar_image_link_block.html diff --git a/home/templates/home/stream_blocks/sidebar_issues_block.html b/infinitefeed/templates/infinitefeed/sidebar/sidebar_issues_block.html similarity index 77% rename from home/templates/home/stream_blocks/sidebar_issues_block.html rename to infinitefeed/templates/infinitefeed/sidebar/sidebar_issues_block.html index bf52a81b3..1733b79bd 100644 --- a/home/templates/home/stream_blocks/sidebar_issues_block.html +++ b/infinitefeed/templates/infinitefeed/sidebar/sidebar_issues_block.html @@ -1,10 +1,10 @@ {% load wagtailcore_tags %} -
    +

    {{ self.title }}

    -
    +
      {% for issue in self.issues %} {% include_block issue with iteration=forloop.counter %} {% endfor %} -
    +
    \ No newline at end of file diff --git a/home/templates/home/stream_blocks/sidebar_section_block.html b/infinitefeed/templates/infinitefeed/sidebar/sidebar_section_block.html similarity index 71% rename from home/templates/home/stream_blocks/sidebar_section_block.html rename to infinitefeed/templates/infinitefeed/sidebar/sidebar_section_block.html index 8b919c9cb..fb80c9fd7 100644 --- a/home/templates/home/stream_blocks/sidebar_section_block.html +++ b/infinitefeed/templates/infinitefeed/sidebar/sidebar_section_block.html @@ -1,9 +1,9 @@
    -

    {{ title }}

    +

    {{ title }}

      {% for article in articles %}
    • - {% include 'article/objects/blog_column.html' with article=article padded=True %} + {% include 'article/objects/blog_column.html' with article=article %}
      • {% endfor %}
    diff --git a/infinitefeed/templates/infinitefeed/sidebar/sidebar_single_issue_block.html b/infinitefeed/templates/infinitefeed/sidebar/sidebar_single_issue_block.html new file mode 100644 index 000000000..218e0615c --- /dev/null +++ b/infinitefeed/templates/infinitefeed/sidebar/sidebar_single_issue_block.html @@ -0,0 +1,10 @@ +{% load wagtailimages_tags %} +
  • + +

    {{ self.date }}

    + {% if self.show_image and self.image %} + {% image self.image width-350 as mag %} + + {% endif %} +     +
    • diff --git a/infinitefeed/templatetags/infinitefeed_tags.py b/infinitefeed/templatetags/infinitefeed_tags.py new file mode 100644 index 000000000..71ac40bb6 --- /dev/null +++ b/infinitefeed/templatetags/infinitefeed_tags.py @@ -0,0 +1,9 @@ +from django import template +from infinitefeed.views import getArticles +from django.template.defaultfilters import stringfilter + +register = template.Library() + +@register.filter(name='preload_articles') +def preload_articles(value, number): + return getArticles(value,0,int(number)) \ No newline at end of file diff --git a/infinitefeed/views.py b/infinitefeed/views.py new file mode 100644 index 000000000..ffac2e8cf --- /dev/null +++ b/infinitefeed/views.py @@ -0,0 +1,59 @@ +from django.shortcuts import render + +from article.models import ArticlePage +from django.http import HttpResponse +from django.core import serializers +import json +from django.template import loader +from section.models import SectionPage +from django.http import JsonResponse + +def getArticles(filters, start, number): + + if "section" in filters: + if filters["section"] == "home": + return ArticlePage.objects.live().public().order_by('-explicit_published_at')[int(start):int(start)+int(number)] + else: + section = SectionPage.objects.get(slug=filters["section"]) + articles = ArticlePage.objects.live().public().descendant_of(section).order_by('-explicit_published_at') + else: + articles = ArticlePage.objects.live().public().order_by('-explicit_published_at') + + if "category" in filters: + articles = articles.filter(category__slug=filters["category"]) + + if "search_query" in filters: + return articles.search(filters["search_query"])[int(start):int(start)+int(number)] + else: + return articles.order_by('-explicit_published_at')[int(start):int(start)+int(number)] + +def infinitefeed(request): + if request.method == 'GET': + start = request.GET['start'] + number = request.GET['number'] + + filters = {} + + if "section" in request.GET: + filters["section"] = request.GET['section'] + if "category" in request.GET: + filters["category"] = request.GET['category'] + if "search_query" in request.GET: + filters["search_query"] = request.GET['search_query'] + + articles = getArticles(filters, start, number) + + if len(articles) == 0: + return HttpResponse("End of feed") + else: + articleHtml = [] + for article in articles: + data = {'article': article} + if "label" in request.GET: + data["label"] = True + articleHtml.append(loader.render_to_string("article/objects/infinitefeed_item.html", data)) + + articleHtml_json = json.dumps(articleHtml) + return HttpResponse(articleHtml_json, content_type ="application/json") + else: + return HttpResponse("Request method is not a GET") \ No newline at end of file diff --git a/navigation/templates/navigation/headers/main.html b/navigation/templates/navigation/headers/main.html index 80d6fae79..8c6f3d7ac 100644 --- a/navigation/templates/navigation/headers/main.html +++ b/navigation/templates/navigation/headers/main.html @@ -2,22 +2,31 @@ {% load menu_tags %}
    - -
    +
    -
    UBC’s student newspaper since 1918
    +
    + {% if tagline_url %} + {% if tagline %}{{tagline}}{% else %}!{% endif %} + {% else %} + {% if tagline %}{{tagline}}{% endif %} + {% endif %} +
    - + +
    {% comment %}
    {% endcomment %} - - + + + + + {% include 'article/objects/darkmode_button.html' with id="main"%} {% comment %} {% endcomment %}
    diff --git a/navigation/templates/navigation/headers/mobile.html b/navigation/templates/navigation/headers/mobile.html index 024ba6342..066bc28a9 100644 --- a/navigation/templates/navigation/headers/mobile.html +++ b/navigation/templates/navigation/headers/mobile.html @@ -3,31 +3,37 @@ {% load menu_tags %}
    - - +
    + + + +
    + {% comment %} {% endcomment %}
    -
    - - - +
    \ No newline at end of file diff --git a/navigation/templates/navigation/headers/topbar.html b/navigation/templates/navigation/headers/topbar.html index 18a1070ff..91e51991c 100644 --- a/navigation/templates/navigation/headers/topbar.html +++ b/navigation/templates/navigation/headers/topbar.html @@ -14,6 +14,9 @@ +
    + {% include 'article/objects/darkmode_button.html' with id="topbar" %} +
    {% comment %} {% endcomment %}
    diff --git a/navigation/templates/navigation/headers/visual-essay-header.html b/navigation/templates/navigation/headers/visual-essay-header.html new file mode 100644 index 000000000..84d00010b --- /dev/null +++ b/navigation/templates/navigation/headers/visual-essay-header.html @@ -0,0 +1,18 @@ +{% load static %} +{% load menu_tags %} + +
    +
    +
    + + + + +
    + +
    +
    diff --git a/section/migrations/0004_sectionpage_banner.py b/section/migrations/0004_sectionpage_banner.py new file mode 100644 index 000000000..a7bb556ae --- /dev/null +++ b/section/migrations/0004_sectionpage_banner.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.11 on 2023-05-20 05:06 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('images', '0003_ubysseyimage_legacy_pk'), + ('section', '0003_sectionpage_use_parent_colour'), + ] + + operations = [ + migrations.AddField( + model_name='sectionpage', + name='banner', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='banner', to='images.ubysseyimage'), + ), + ] diff --git a/section/migrations/0005_sectionpage_description.py b/section/migrations/0005_sectionpage_description.py new file mode 100644 index 000000000..548e686c7 --- /dev/null +++ b/section/migrations/0005_sectionpage_description.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.11 on 2023-05-20 06:13 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('section', '0004_sectionpage_banner'), + ] + + operations = [ + migrations.AddField( + model_name='sectionpage', + name='description', + field=models.TextField(blank=True, default=''), + ), + ] diff --git a/section/migrations/0006_sectionpage_color.py b/section/migrations/0006_sectionpage_color.py new file mode 100644 index 000000000..f37fed911 --- /dev/null +++ b/section/migrations/0006_sectionpage_color.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.11 on 2023-05-23 22:21 + +from django.db import migrations +import wagtail_color_panel.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('section', '0005_sectionpage_description'), + ] + + operations = [ + migrations.AddField( + model_name='sectionpage', + name='color', + field=wagtail_color_panel.fields.ColorField(blank=True, max_length=7), + ), + ] diff --git a/section/migrations/0007_alter_sectionpage_color.py b/section/migrations/0007_alter_sectionpage_color.py new file mode 100644 index 000000000..2054d3f87 --- /dev/null +++ b/section/migrations/0007_alter_sectionpage_color.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.11 on 2023-05-23 22:22 + +from django.db import migrations +import wagtail_color_panel.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('section', '0006_sectionpage_color'), + ] + + operations = [ + migrations.AlterField( + model_name='sectionpage', + name='color', + field=wagtail_color_panel.fields.ColorField(default='#0071c9', max_length=7), + ), + ] diff --git a/section/migrations/0008_auto_20230523_1530.py b/section/migrations/0008_auto_20230523_1530.py new file mode 100644 index 000000000..82e4c6211 --- /dev/null +++ b/section/migrations/0008_auto_20230523_1530.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.11 on 2023-05-23 22:30 + +from django.db import migrations +import wagtail_color_panel.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('section', '0007_alter_sectionpage_color'), + ] + + operations = [ + migrations.RemoveField( + model_name='sectionpage', + name='color', + ), + migrations.AlterField( + model_name='sectionpage', + name='colour', + field=wagtail_color_panel.fields.ColorField(default='#0071c9', max_length=7), + ), + ] diff --git a/section/migrations/0009_alter_sectionpage_colour.py b/section/migrations/0009_alter_sectionpage_colour.py new file mode 100644 index 000000000..af1625a12 --- /dev/null +++ b/section/migrations/0009_alter_sectionpage_colour.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.11 on 2023-05-23 22:48 + +from django.db import migrations +import wagtail_color_panel.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('section', '0008_auto_20230523_1530'), + ] + + operations = [ + migrations.AlterField( + model_name='sectionpage', + name='colour', + field=wagtail_color_panel.fields.ColorField(default='#3490d6', max_length=7), + ), + ] diff --git a/section/migrations/0010_sectionpage_label_svg.py b/section/migrations/0010_sectionpage_label_svg.py new file mode 100644 index 000000000..a9c3990c6 --- /dev/null +++ b/section/migrations/0010_sectionpage_label_svg.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.11 on 2023-05-24 01:30 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtaildocs', '0012_uploadeddocument'), + ('section', '0009_alter_sectionpage_colour'), + ] + + operations = [ + migrations.AddField( + model_name='sectionpage', + name='label_svg', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtaildocs.document'), + ), + ] diff --git a/section/migrations/0011_categorysnippet_banner.py b/section/migrations/0011_categorysnippet_banner.py new file mode 100644 index 000000000..9ea4083d8 --- /dev/null +++ b/section/migrations/0011_categorysnippet_banner.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.11 on 2023-05-25 01:42 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('images', '0003_ubysseyimage_legacy_pk'), + ('section', '0010_sectionpage_label_svg'), + ] + + operations = [ + migrations.AddField( + model_name='categorysnippet', + name='banner', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='categoryBanner', to='images.ubysseyimage'), + ), + ] diff --git a/section/migrations/0012_sectionpage_sidebar_stream.py b/section/migrations/0012_sectionpage_sidebar_stream.py new file mode 100644 index 000000000..8bd3969d2 --- /dev/null +++ b/section/migrations/0012_sectionpage_sidebar_stream.py @@ -0,0 +1,21 @@ +# Generated by Django 3.2.11 on 2023-05-25 04:16 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('section', '0011_categorysnippet_banner'), + ] + + operations = [ + migrations.AddField( + model_name='sectionpage', + name='sidebar_stream', + field=wagtail.core.fields.StreamField([('sidebar_advertisement_block', wagtail.core.blocks.StructBlock([])), ('sidebar_issues_block', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(max_length=255, required=True)), ('issues', wagtail.core.blocks.StreamBlock([('issue', wagtail.core.blocks.StructBlock([('date', wagtail.core.blocks.DateBlock(required=True)), ('image', wagtail.images.blocks.ImageChooserBlock(required=False)), ('show_image', wagtail.core.blocks.BooleanBlock(required=False)), ('link', wagtail.core.blocks.URLBlock(required=True))]))]))])), ('sidebar_section_block', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(max_length=255, required=True)), ('section', wagtail.core.blocks.PageChooserBlock(page_type=['section.SectionPage']))])), ('sidebar_flex_stream_block', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(max_length=255, required=True)), ('stream', wagtail.core.blocks.StreamBlock([('image_link', wagtail.core.blocks.StructBlock([('image', wagtail.images.blocks.ImageChooserBlock(required=True)), ('link', wagtail.core.blocks.URLBlock(required=False))]))]))]))], blank=True, null=True), + ), + ] diff --git a/section/models.py b/section/models.py index 53c941b9f..aff383c67 100644 --- a/section/models.py +++ b/section/models.py @@ -13,8 +13,9 @@ from modelcluster.models import ClusterableModel from modelcluster.fields import ParentalKey - -from wagtail.admin.edit_handlers import FieldPanel, InlinePanel, MultiFieldPanel, PageChooserPanel +from wagtail.images.edit_handlers import ImageChooserPanel +from wagtail.admin.edit_handlers import FieldPanel, InlinePanel, MultiFieldPanel, PageChooserPanel, StreamFieldPanel +from wagtail.core.fields import StreamField from wagtail.core import models as wagtail_core_models from wagtail.core.models import Page from wagtail.contrib.routable_page.models import route, RoutablePageMixin @@ -22,6 +23,14 @@ from wagtail.snippets.edit_handlers import SnippetChooserPanel from wagtail.snippets.models import register_snippet +from wagtail_color_panel.fields import ColorField +from wagtail_color_panel.edit_handlers import NativeColorPanel + +from wagtail.documents.models import Document +from wagtail.documents.edit_handlers import DocumentChooserPanel + +from home import blocks as homeblocks +from infinitefeed import blocks as infinitefeedblocks #-----Snippet models----- @register_snippet @@ -45,6 +54,15 @@ class CategorySnippet(index.Indexed, ClusterableModel): blank=True, default='', ) + + banner = models.ForeignKey( + "images.UbysseyImage", + null=True, + blank=True, + on_delete=models.SET_NULL, + related_name='categoryBanner', + ) + # authors = ManyToManyField('Author', related_name='subsection_authors') is_active = BooleanField( # legacy field default=False @@ -67,6 +85,12 @@ class CategorySnippet(index.Indexed, ClusterableModel): ], heading="Essentials" ), + MultiFieldPanel( + [ + ImageChooserPanel("banner"), + ], + heading="Banner", + ), MultiFieldPanel( [ InlinePanel("category_authors"), @@ -130,13 +154,71 @@ class SectionPage(RoutablePageMixin, SectionablePage): show_in_menus_default = True + banner = models.ForeignKey( + "images.UbysseyImage", + null=True, + blank=True, + on_delete=models.SET_NULL, + related_name='banner', + ) + + description = models.TextField( + # Was called "snippet" in Dispatch - do not want to reuse this work, so we call it 'lede' instead + null=False, + blank=True, + default='', + ) + + label_svg = models.ForeignKey( + 'wagtaildocs.Document', + null=True, + blank=True, + on_delete=models.SET_NULL, + related_name='+' + ) + + sidebar_stream = StreamField( + [ + ("sidebar_advertisement_block", infinitefeedblocks.SidebarAdvertisementBlock()), + ("sidebar_issues_block", infinitefeedblocks.SidebarIssuesBlock()), + ("sidebar_section_block", infinitefeedblocks.SidebarSectionBlock()), + ("sidebar_flex_stream_block", infinitefeedblocks.SidebarFlexStreamBlock()), + ], + null=True, + blank=True, + ) + content_panels = wagtail_core_models.Page.content_panels + [ + MultiFieldPanel( + [ + ImageChooserPanel("banner"), + ], + heading="Banner", + ), + MultiFieldPanel( + [ + FieldPanel("description"), + ], + heading="Description", + ), + MultiFieldPanel( + [ + DocumentChooserPanel('label_svg'), + ], + heading="Label svg" + ), MultiFieldPanel( [ InlinePanel("category_menu"), ], heading="Category Menu", ), + MultiFieldPanel( + [ + StreamFieldPanel("sidebar_stream"), + ], + heading="Sidebar" + ) ] def get_context(self, request, *args, **kwargs): @@ -151,15 +233,31 @@ def get_context(self, request, *args, **kwargs): article_order = "-explicit_published_at" context["order"] = order + context["all_categories"] = CategorySnippet.objects.all().filter(section_page=self) + all_articles = self.get_section_articles(order=article_order) + context["filters"] = {"section": self.current_section} if 'category_slug' in kwargs: all_articles = all_articles.filter(category__slug=kwargs['category_slug']) + context["category"] = kwargs['category_slug'] + context["filters"]["category"] = kwargs['category_slug'] + category = CategorySnippet.objects.get(slug=kwargs['category_slug']) + context["title"] = category.title + context["description"] = category.description + if category.banner: + context["banner"] = category.banner + else: + context["title"] = self.title + context["description"] = self.description + if self.banner: + context["banner"] = self.banner context["featured_articles"] = self.get_featured_articles() if search_query: context["search_query"] = search_query all_articles = all_articles.search(search_query) + context["filters"]["search_query"] = search_query # Paginate all posts by 15 per page paginator = Paginator(all_articles, per_page=15) diff --git a/section/templates/section/objects/section_bulleted.html b/section/templates/section/objects/section_bulleted.html new file mode 100644 index 000000000..03ae42a8a --- /dev/null +++ b/section/templates/section/objects/section_bulleted.html @@ -0,0 +1,24 @@ +{% load humanize %} +{% load wagtailcore_tags %} + +
    + {% if articles.0 %} + {% include 'article/objects/infinitefeed_item.html' with article=articles.0 padded=True %} + {% endif %} +
    +
    +
      + {% for article in articles %} + {% if forloop.counter != 1 %} +
    • {% include 'article/objects/bullet.html' with article=article %}
      • + {% endif %} + {% endfor %} +
    • +
      +

      + See more +

      +
    + + + \ No newline at end of file diff --git a/section/templates/section/objects/section_featured.html b/section/templates/section/objects/section_featured.html index 683e8e625..ebe357801 100644 --- a/section/templates/section/objects/section_featured.html +++ b/section/templates/section/objects/section_featured.html @@ -2,16 +2,22 @@ Arguments: featured_articles a list of article pages Used in both section pages and homepage {% endcomment %} -{% for article in featured_articles %} - {% if forloop.counter == 1 %} - {% include 'article/objects/featured.html' with article=article %} - {% else %} - {% if forloop.counter == 2 %} -
    +{% load wagtailcore_tags %} + +{% include 'article/objects/infinitefeed_item.html' with article=featured_articles.first %} + +
    + {% for article in featured_articles %} + {% if forloop.counter != 1 %} + {% include 'article/objects/blog_column.html' with article=article%} {% endif %} - {% include 'article/objects/column.html' with article=article%} - {% if forloop.last %} -
    - {% endif %} - {% endif %} -{% endfor %} + {% endfor %} + +
    +
    +

    + See More +

    +
    +
    +
    diff --git a/section/templates/section/section_page.html b/section/templates/section/section_page.html index 6532edbe6..d0bbc4fe9 100644 --- a/section/templates/section/section_page.html +++ b/section/templates/section/section_page.html @@ -5,6 +5,7 @@ {% load wagtailimages_tags %} {% load wagtailuserbar %} {% load ubyssey_ad_tags %} +{% load ubyssey_ad_filters %} {% block head_scripts %} @@ -14,67 +15,92 @@ {% endblock %} {% block header %} - {% include 'navigation/headers/topbar.html' %} {% include 'navigation/headers/mobile.html' %} + + {% for orderable in settings.ads.AdTagSettings.section_header_placements.all %} + {% gpt_placement_tag orderable.ad_slot %} + {% endfor %} + {% include 'navigation/headers/topbar.html' %} {% endblock %} {% block content %}
    - - {% for orderable in settings.ads.AdTagSettings.section_header_placements.all %} - {% gpt_placement_tag orderable.ad_slot %} - {% endfor %} -
    -
    -

    {{ self.title }}

    -
    - {% comment %} CATEGORY MENU {% endcomment %} - {% if self.category_menu.count %} -
    - + +
    + + {% if banner %} + {% image banner width-700 as banner_image %} + + {%else%} +
    +

    {{title}}

    {% endif %} - {% comment %} - featured_articles is added to context by SectionPage - by default it containes the most recent 4 articles - {% endcomment %} -
    - {% include 'article/objects/featured.html' with article=featured_articles.first %} -
    - {% for article in featured_articles %} - {% if forloop.counter0 != 0 %} - {% include 'article/objects/column.html' with article=article %} - {% endif %} - {% endfor %} -
    - {% comment %} +
    +
    +
    +

    {{description}}  {% if not category %}{% endif%}

    + + {% if self.category_menu.count %} +
    +

    Featured Categories: 

    + +
    + {% endif %} + +
    +
    +
    + + +
    +
    + +
    + +

    Categories

    +     - #TODO furthur discussion about featured subsection +
    +
    +
    + + + +

    Series

    +

    {{self.title}}{% if self.description %} - {{self.description}}{% endif %}

    +
      + {% for category in all_categories %} +
    • {{ category.title }}{% if category.description %} — {{ category.description }}{% endif %}
      • + {% endfor %} +
    +
    +
    - {% endcomment %} +
    +
    +
    + {% include 'infinitefeed/infinitefeed.html' with filters=filters %} +
    + {% include 'infinitefeed/objects/infinitefeed-sidebar.html' with styling="c-section__sidebar" id="sidebar" sidebar_stream=self.sidebar_stream %} +
    - - {% comment %} - DESIGN NOTE: - The below will be turned into _blocks_, - allowing editors to have user to have some level of control - {% endcomment %} - - -

    Archive

    - {% include 'ubyssey/archive.html' with paginated_articles=paginated_articles%} - -
    {% endblock %} diff --git a/specialfeaturelanding/migrations/0020_speciallandingpage_category.py b/specialfeaturelanding/migrations/0020_speciallandingpage_category.py new file mode 100644 index 000000000..88d60b67b --- /dev/null +++ b/specialfeaturelanding/migrations/0020_speciallandingpage_category.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.11 on 2023-07-12 03:07 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('section', '0003_sectionpage_use_parent_colour'), + ('specialfeaturelanding', '0019_alter_speciallandingpage_editorial_stream'), + ] + + operations = [ + migrations.AddField( + model_name='speciallandingpage', + name='category', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='section.categorysnippet'), + ), + ] diff --git a/specialfeaturelanding/models.py b/specialfeaturelanding/models.py index 3bb5c6a6d..a85a6ba35 100644 --- a/specialfeaturelanding/models.py +++ b/specialfeaturelanding/models.py @@ -24,6 +24,7 @@ from wagtail.core.models import Page, Orderable from wagtail.core.fields import StreamField from wagtail.images.blocks import ImageChooserBlock +from wagtail.snippets.edit_handlers import SnippetChooserPanel from wagtailmenus.models import FlatMenu from wagtailmodelchooser.edit_handlers import ModelChooserPanel @@ -39,6 +40,14 @@ class SpecialLandingPage(SectionablePage, UbysseyMenuMixin): # template = "specialfeaturelanding/landing_page_guide_2022_style.html" use_default_template = models.BooleanField(default=True) + + category = models.ForeignKey( + "section.CategorySnippet", + blank=True, + null=True, + on_delete=models.SET_NULL, + ) + layout = models.CharField( null=False, blank=False, @@ -164,6 +173,13 @@ def get_template(self, request): ], heading="Feature Credits", classname="collapsible", + ), + MultiFieldPanel( + [ + SnippetChooserPanel("category"), + ], + heading="Categories", + classname="collapsible", ), MultiFieldPanel( [ diff --git a/sporttourney/admin.py b/sporttourney/admin.py deleted file mode 100644 index 8c38f3f3d..000000000 --- a/sporttourney/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/sporttourney/apps.py b/sporttourney/apps.py deleted file mode 100644 index bf46119ad..000000000 --- a/sporttourney/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class SporttourneyConfig(AppConfig): - name = 'sporttourney' diff --git a/sporttourney/migrations/0001_initial.py b/sporttourney/migrations/0001_initial.py deleted file mode 100644 index bd0362d77..000000000 --- a/sporttourney/migrations/0001_initial.py +++ /dev/null @@ -1,54 +0,0 @@ -# Generated by Django 3.1.12 on 2021-07-09 10:44 - -from django.db import migrations, models -import django.db.models.deletion -import django_extensions.db.fields -import modelcluster.fields -import ubyssey.validators - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('wagtailimages', '0023_add_choose_permissions'), - ] - - operations = [ - migrations.CreateModel( - name='SportsTournamentSnippet', - fields=[ - ('tournament_name', models.TextField(default='tournament')), - ('slug', django_extensions.db.fields.AutoSlugField(blank=True, editable=False, populate_from='tournament_name', primary_key=True, serialize=False, unique=True)), - ], - options={ - 'verbose_name': 'Sports Tournament', - 'verbose_name_plural': 'Sports Tournaments', - }, - ), - migrations.CreateModel( - name='SportsTeamOrderable', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), - ('team_name', models.TextField(default='')), - ('team_color', models.CharField(default='#FF0000', max_length=7, validators=[ubyssey.validators.validate_colour_hex])), - ('team_logo', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image')), - ('tournament', modelcluster.fields.ParentalKey(default='', on_delete=django.db.models.deletion.CASCADE, related_name='tournament_team', to='sporttourney.sportstournamentsnippet')), - ], - options={ - 'ordering': ['sort_order'], - 'abstract': False, - }, - ), - migrations.CreateModel( - name='SportsPlayerProfile', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('full_name', models.CharField(max_length=255)), - ('profile_text', models.CharField(blank=True, max_length=1500)), - ('player_photo', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image')), - ], - ), - ] diff --git a/sporttourney/migrations/__init__.py b/sporttourney/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/sporttourney/models.py b/sporttourney/models.py deleted file mode 100644 index 03ed3c394..000000000 --- a/sporttourney/models.py +++ /dev/null @@ -1,130 +0,0 @@ -from django.db import models -from django_extensions.db.fields import AutoSlugField -from modelcluster.fields import ParentalKey -from modelcluster.models import ClusterableModel -from ubyssey.validators import validate_colour_hex -from wagtail.admin.edit_handlers import FieldPanel, InlinePanel, MultiFieldPanel -from wagtail.core.models import Orderable -from wagtail.images.edit_handlers import ImageChooserPanel -from wagtail.snippets.models import register_snippet - -@register_snippet -class SportsTournamentSnippet(ClusterableModel): - tournament_name = models.TextField( - blank=False, - null=False, - default='tournament' - ) - slug = AutoSlugField( - populate_from="tournament_name", - editable=True, - primary_key=True, - unique=True, - blank=False, - null=False, - ) - - panels = [ - MultiFieldPanel( - [ - FieldPanel('tournament_name'), - FieldPanel('slug'), - ], - heading="Tournament Information" - ), - MultiFieldPanel( - [ - InlinePanel("tournament_team", min_num=1, max_num=20, label="Tournament Team"), - ], - heading="Tournament Teams" - ), - ] - - def __str__(self): - return self.tournament_name - - class Meta: - verbose_name = "Sports Tournament" - verbose_name_plural = "Sports Tournaments" - -class SportsTeamOrderable(Orderable): - """ - Based on individual team nodes - """ - team_name = models.TextField( - blank=False, - null=False, - default='', - ) - ## we probably need to install https://pypi.org/project/django-colorfield/ for a more robust version of this - team_color = models.CharField( - blank=False, - null=False, - max_length=7, - default='#FF0000', - validators=[ - validate_colour_hex, - ], - ) - team_logo = models.ForeignKey( - "wagtailimages.Image", - on_delete=models.SET_NULL, - null=True, - blank=True, - related_name="+", - ) - tournament = ParentalKey( - "SportsTournamentSnippet", - default='', - related_name="tournament_team", - ) - - # TODO: representation of location and of stats - panels = [ - MultiFieldPanel( - [ - FieldPanel('team_name'), - FieldPanel('team_color'), - ImageChooserPanel('team_logo'), - ], - heading="Team Information" - ), - # MultiFieldPanel( - # [ - # InlinePanel("player_to_watch", max_num=1, label="Player to watch"), - # ], - # heading="Player to Watch" - # ), - ] - -class SportsPlayerProfile(models.Model): - full_name = models.CharField( - max_length=255, - blank=False, - null=False, - ) - profile_text = models.CharField( - max_length=1500, - blank=True, - null=False, - ) - player_photo = models.ForeignKey( - "wagtailimages.Image", - on_delete=models.SET_NULL, - null=True, - blank=True, - related_name="+", - ) - # players_team = models.ForeignKey( - # "SportsTeamOrderable", - # related_name="player_to_watch", - # on_delete=models.CASCADE, - # ) - panels = [ - FieldPanel('full_name'), - FieldPanel('profile_text'), - ImageChooserPanel('player_photo'), - ] - - def __str__(self): - return self.full_name diff --git a/sporttourney/tests.py b/sporttourney/tests.py deleted file mode 100644 index 7ce503c2d..000000000 --- a/sporttourney/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/sporttourney/views.py b/sporttourney/views.py deleted file mode 100644 index 91ea44a21..000000000 --- a/sporttourney/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/ubyssey/static_src/src/fonts/Mercury Text G2 Bold.otf b/ubyssey/static_src/src/fonts/Mercury Text G2 Bold.otf new file mode 100644 index 000000000..e8458efbf Binary files /dev/null and b/ubyssey/static_src/src/fonts/Mercury Text G2 Bold.otf differ diff --git a/ubyssey/static_src/src/js/advertise.js b/ubyssey/static_src/src/js/advertise.js deleted file mode 100644 index f887e9cc4..000000000 --- a/ubyssey/static_src/src/js/advertise.js +++ /dev/null @@ -1,74 +0,0 @@ -// Scripts for the /advertise/ page -// Bundled as 'a.js' to prevent AdBlocker blocking. - -$(function() { - // Navigation links smooth scrolling - $('a[href*=\\#]').on('click', function(e) { - $('html,body').animate({ scrollTop: $(this.hash).offset().top }, 500); - }); - - $('.o-placements--web .o-placements__placement').click(function() { - $('.o-placements--web .o-placements__placement').removeClass('o-placements__placement--active'); - $(this).addClass('o-placements__placement--active'); - $('.o-placements--web .o-placements__demo__inner img').css('top', $(this).data('offset')); - - }); - - $('.o-placements--print .o-placements__placement--demo').click(function() { - $('.o-placements--print .o-placements__placement').removeClass('o-placements__placement--active'); - $(this).addClass('o-placements__placement--active'); - $('.o-placements--print .o-placements__demo').attr('data-demo', $(this).data('demo')); - }); - - $('.o-placements--guide .o-placements__placement--demo').click(function() { - $('.o-placements--guide .o-placements__placement').removeClass('o-placements__placement--active'); - $(this).addClass('o-placements__placement--active'); - $('.o-placements--guide .o-placements__demo').attr('data-demo', $(this).data('demo')); - }); - - // Open modal - $('.c-production-schedule__view').click(function() { - $('.c-production-schedule__modal').show(); - }) - - // Close modal - $('.c-production-schedule__modal__close').click(function() { - $('.c-production-schedule__modal').hide(); - }); - - $('.c-production-schedule__modal').click(function() { - $('.c-production-schedule__modal').hide(); - }); - - $('.c-production-schedule__modal img').click(function(e) { - e.stopPropagation() - }); - - $('.c-web-slider__point > div').click(function(e) { - var offset = $(this).offset().left - $('.c-web-slider').offset().left; - var content = $(this).data('content'); - var cost = $(this).data('cost'); - slideTo(offset, content, cost); - }); - - function slideTo(offset, content, cost) { - var tooltipWidth = $('.c-web-slider__tooltip').outerWidth(); - var maxOffset = $('.c-web-slider').width() - tooltipWidth; - - offset = Math.max(0, offset - 25); - - $('.c-web-slider__tooltip').css('margin-left', Math.min(offset, maxOffset)); - - var offsetPercent = 8; - - if (offset > maxOffset) { - var offsetDif = offset - maxOffset + 35; - offsetPercent = offsetDif / tooltipWidth * 100; - offsetPercent = Math.min(92, offsetPercent); - } - - $('.c-web-slider__tooltip__arrow').css('left', offsetPercent + '%'); - $('.c-web-slider__tooltip__content').html(content); - $('.c-web-slider__tooltip__cost').text(cost); - } -}); diff --git a/ubyssey/static_src/src/js/advertise_new.js b/ubyssey/static_src/src/js/advertise_new.js index ca462c64d..68e6c752b 100644 --- a/ubyssey/static_src/src/js/advertise_new.js +++ b/ubyssey/static_src/src/js/advertise_new.js @@ -1,5 +1,5 @@ // Scripts for the /advertise/ page -// Bundled as 'a.js' to prevent AdBlocker blocking. +// Bundled as 'a_new.js' to prevent AdBlocker blocking. $(function() { // Navigation links smooth scrolling diff --git a/ubyssey/static_src/src/js/article.jsx b/ubyssey/static_src/src/js/article.jsx index 567d0143b..787ab0748 100644 --- a/ubyssey/static_src/src/js/article.jsx +++ b/ubyssey/static_src/src/js/article.jsx @@ -1,13 +1,9 @@ import React from 'react' import ReactDOM from 'react-dom' -import './modules/Youtube' -import { ArticlesSuggested } from './components/Article' -import { Poll } from './components/Poll' import Search from './components/Search.jsx'; import { AdblockSplash, CookieDisclaimer } from './components/Cookies' import { Galleries } from './components/Gallery' -import Timeline from './components/Timeline.jsx' -import Episode from './components/Podcast/Episode.jsx' + window.articleHeader = false; @@ -16,12 +12,7 @@ const BOX_HEIGHT = 274 const SKYSCRAPER_HEIGHT = 624 $(function () { - $('.c-widget-poll').each(function () { - ReactDOM.render( - , - $(this).get(0) - ) - }) + ReactDOM.render( , document.getElementById('adblock-splash') @@ -30,28 +21,8 @@ $(function () { , document.getElementById('cookie-disclaimer') ) - $('.c-timeline').each(function () { - ReactDOM.render( - , - $(this).get(0) - ) - }) - - $('.c-podcast-episode').each(function () { - ReactDOM.render( - , - $(this).get(0) - ) - }) + + }); if ($('main.article').length) { @@ -181,18 +152,6 @@ if ($('main.article').length) { articleAds() - if (document.getElementById('article-list') !== null) { - const articleList = ReactDOM.render( - , - document.getElementById('article-list') - ); - } - const gatherImages = (gallery) => { var selector, trigger; diff --git a/ubyssey/static_src/src/js/components/Article/ArticlesSuggested.jsx b/ubyssey/static_src/src/js/components/Article/ArticlesSuggested.jsx deleted file mode 100644 index 7597af99f..000000000 --- a/ubyssey/static_src/src/js/components/Article/ArticlesSuggested.jsx +++ /dev/null @@ -1,69 +0,0 @@ - -import React from 'react' -import { ArticlePreview } from './' -import DispatchAPI from '../../api/dispatch' - -class ArticlesSuggested extends React.Component{ - constructor(props) { - super(props) - - var articles = props.articles - articles.unshift(props.currentArticle.id) - - this.articlesTable = {}; - this.articlesTable[this.props.currentArticle.id] = 0; - - this.state = { - articles: [props.currentArticle], - loading: false - } - } - - componentDidMount() { - for (let id of this.props.articles) { - this.getArticle(id) - } - } - - getArticle(id) { - DispatchAPI.articles.rendered(id) - .then((response) => { - const articles = [...this.state.articles, response] - this.setState({articles}) - }) - } - - render() { - const articles = this.state.articles.map((article, index) => { - // only show 3 suggested articles - if (index !== 0 && article.headline !== this.props.currentArticle.headline) { - let featuredImage = article.featured_image - if(featuredImage) { - featuredImage = featuredImage.image.url - } - - return ( - - ) - } - }); - - return ( -
    -

    Suggested Articles

    -
    - {articles.filter((article) => {if (article) {return article}}).slice(0, 3)} -
    -
    - ); - } -} - -export default ArticlesSuggested; diff --git a/ubyssey/static_src/src/js/components/Article/index.js b/ubyssey/static_src/src/js/components/Article/index.js index a1db4f77a..122e66ef0 100644 --- a/ubyssey/static_src/src/js/components/Article/index.js +++ b/ubyssey/static_src/src/js/components/Article/index.js @@ -1,7 +1,6 @@ import Article from './Article.jsx' import ArticlePreview from './ArticlePreview.jsx' import ArticleHeader from './ArticleHeader.jsx' -import ArticlesSuggested from './ArticlesSuggested.jsx' export { Article as Article, diff --git a/ubyssey/static_src/src/js/components/Podcast/Episode.jsx b/ubyssey/static_src/src/js/components/Podcast/Episode.jsx deleted file mode 100644 index 30b056d2f..000000000 --- a/ubyssey/static_src/src/js/components/Podcast/Episode.jsx +++ /dev/null @@ -1,60 +0,0 @@ -import React from 'react' - -class Episode extends React.Component { - constructor(props) { - super(props); - this.state = { - open: window.location ? window.location.hash.includes(props.id) : false, - cacheData: window.location ? window.location.hash.includes(props.id) : false, - maxHeight: 10000 - } - } - - handleClick() { - this.setState(prevstate => ({ - open: !prevstate.open, - cacheData: true, - maxHeight: document.getElementById(this.props.id).clientHeight - })) - } - - render() { - const {description, file, image, publishedAt, id, title} = this.props - const openStyle = this.state.open ? {maxHeight: this.state.maxHeight} : {maxHeight: '150px'} - return ( -
    - -
    -
    -

    this.handleClick()}>{title}

    -

    {publishedAt}

    -
    -
    -

    - {description} -

    -
    -
    -
    -
    - {this.state.cacheData && - - }{ !this.state.cacheData && - - } -
    -
    -
    -
    this.handleClick()}> - Show {this.state.open ? 'Less' : 'More'} -
    -
    - ) - } -} - -export default Episode diff --git a/ubyssey/static_src/src/js/components/Poll/Poll.jsx b/ubyssey/static_src/src/js/components/Poll/Poll.jsx deleted file mode 100644 index 8bdf57191..000000000 --- a/ubyssey/static_src/src/js/components/Poll/Poll.jsx +++ /dev/null @@ -1,238 +0,0 @@ -import React from 'react' -import DispatchAPI from '../../api/dispatch' - -import Cookies from 'js-cookie' -import PollAnswer from './PollAnswer.jsx' - -const COLOR_OPACITY = .8 - -class Poll extends React.Component { - constructor(props) { - super(props); - this.state = { - answers: [], - answerIds: [], - votes: [], - checkedAnswers: [], - hasVoted: false, - pollQuestion: '', - loading: true, - totalVotes: 0, - showResults: false, - pollOpen: true, - } - } - - getCookieName() { - return 'poll_id_' + String(this.props.id) - } - - getCookie(field) { - let cookie = Cookies.get(this.getCookieName()) - if (typeof cookie === 'string' && cookie !== '') { - cookie = JSON.parse(cookie) - if (field) { - return cookie[field] - } - return cookie - } - return cookie - } - - setCookie(voteId, answerId, init) { - if (this.state.pollOpen || init) { - Cookies.set( - this.getCookieName(), - {poll_id: this.props.id, vote_id: voteId, answer_id: answerId}, - { path: '/' } - ) - } - } - - componentDidMount() { - const answerId = Number(this.getCookie('answer_id')) - this.update(answerId) - } - - update(answerId) { - DispatchAPI.polls.get(this.props.id) - .then ((response)=> { - let answers = [] - let votes = [] - let answerIds = [] - let voteId = this.getCookie('vote_id') - - let checkedAnswers = this.state.checkedAnswers || [] - let hasVoted = this.state.hasVoted - - for (let answer of response.answers) { - answers.push(answer['name']) - votes.push(answer['vote_count']) - answerIds.push(answer['id']) - } - - if (answerId) { - checkedAnswers = this.state.checkedAnswers.concat(this.state.answerIds.indexOf (answerId)) - hasVoted = true - } - - let totalVotes = response.total_votes - this.setState({ - answers: answers, - answerIds: answerIds, - votes: votes, - voteId: voteId, - pollQuestion: response.question, - loading: false, - totalVotes: totalVotes, - showResults: response.show_results, - pollOpen: response.is_open, - checkedAnswers: checkedAnswers, - hasVoted: hasVoted - }) - }) - } - - changeAnswers(e, index) { - if (!this.state.hasVoted) { - let deselect = false - let newCheckedAnswers = this.state.checkedAnswers - - if (this.state.checkedAnswers.includes(index)) { - newCheckedAnswers.splice(this.state.checkedAnswers.indexOf (index), 1) - deselect = true - } - - if (!this.props.many) { - newCheckedAnswers = [] - newCheckedAnswers.push(index) - } - - else if (this.props.many) { - newCheckedAnswers.push(index) - } - - this.setState({ - checkedAnswers: newCheckedAnswers, - hasVoted: true - }, () => { - if (!deselect) { - this.vote(); - } - }) - } - } - - vote() { - for (let index of this.state.checkedAnswers) { - const payload = { - poll_id: this.props.id, - vote_id: this.state.voteId, - answer_id: this.state.answerIds[this.state.checkedAnswers[0]] - } - DispatchAPI.polls.vote(this.props.id, payload).then (response => { - this.setCookie(response.id, this.state.answerIds[index]) - this.update() - }) - } - } - - getPollResult(index) { - if (this.state.showResults) { - let width = 0 - - if (this.state.totalVotes !== 0) { - width = String((100*this.state.votes[index]/this.state.totalVotes).toFixed(0)) + '%' - } - - return width - } - } - - renderPollClosed() { - return ( -
    -
    -
    -

    This poll is currently closed

     -
    -
    - ) - } - - renderLoadingPoll() { - return ( - - ) - } - - renderShowResults(totalVotes) { - return ( -
    -
    Total Votes: {totalVotes}
    - -
    - ) - } - - renderNoResults() { - return ( -
    -
    -
    -

    Thank you for your opinion

    -

    Poll results hidden from public

    -
    -
    - ) - } - - render() { - const {answers, checkedAnswers, hasVoted, pollQuestion, many, - loading, totalVotes, showResults, pollOpen} = this.state - - const pollResult = hasVoted ? 'poll-results' : 'poll-voting' - const buttonStyle = hasVoted ? 'poll-button-voted': 'poll-button-no-vote' - const showResult = showResults ? (hasVoted ? COLOR_OPACITY : 0) : 0 - const notShowResult = showResults ? (hasVoted ? 0 : COLOR_OPACITY) : COLOR_OPACITY - - return ( -
    - {!loading && -
    -
    -

    {pollQuestion}

    -
    - {answers.map((answer, index) =>{ - let isSelected = checkedAnswers.includes(index) ? 'poll-selected' : 'poll-not-selected' - let buttonSelected = checkedAnswers.includes(index) ? 'poll-button-selected' : 'poll-button-not-selected' - let answerPercentage = this.getPollResult(index) - return ( - this.changeAnswers(e, index)} - /> - ) - })} - -
    - { !pollOpen && this.renderPollClosed() } - { (pollOpen && hasVoted && !showResults) && this.renderNoResults() } -
    - } - { (pollOpen && hasVoted && showResults) && this.renderShowResults(totalVotes) } - - { loading && this.renderLoadingPoll() } -
    - ) - } -} - -export default Poll diff --git a/ubyssey/static_src/src/js/components/Poll/PollAnswer.jsx b/ubyssey/static_src/src/js/components/Poll/PollAnswer.jsx deleted file mode 100644 index 99298aac0..000000000 --- a/ubyssey/static_src/src/js/components/Poll/PollAnswer.jsx +++ /dev/null @@ -1,43 +0,0 @@ -import React from 'react'; - -const COLOR_OPACITY = .8 - -const PollAnswer = (props) => { - const { index, answer, hasVoted, showResults, checkedAnswers, answerPercentage } = props - const buttonStyle = hasVoted ? 'poll-button-voted': 'poll-button-no-vote' - const showResult = showResults ? (hasVoted ? COLOR_OPACITY : 0) : 0 - const notShowResult = showResults ? (hasVoted ? 0 : COLOR_OPACITY) : COLOR_OPACITY - let isSelected = checkedAnswers.includes(index) ? 'poll-selected' : 'poll-not-selected' - let buttonSelected = checkedAnswers.includes(index) ? 'poll-button-selected' : 'poll-button-not-selected' - return( - - ) -} - -export default PollAnswer; diff --git a/ubyssey/static_src/src/js/components/Poll/index.js b/ubyssey/static_src/src/js/components/Poll/index.js deleted file mode 100644 index 9a5d6bc98..000000000 --- a/ubyssey/static_src/src/js/components/Poll/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default as Poll } from './Poll.jsx'; \ No newline at end of file diff --git a/ubyssey/static_src/src/js/darkmode.js b/ubyssey/static_src/src/js/darkmode.js index 81babb126..e0112629c 100644 --- a/ubyssey/static_src/src/js/darkmode.js +++ b/ubyssey/static_src/src/js/darkmode.js @@ -4,20 +4,15 @@ // Investigate how to implement the dark mode to the system prefers-color-scheme instead of using darkMode variable $( document ).ready(function() { - storedMode = localStorage.getItem("darkMode"); - - if (storedMode == null) { - console.log("Hello ", storedMode); - localStorage.setItem("darkMode", window.matchMedia('(prefers-color-scheme: dark)').matches - ? 'dark' - : 'light'); - document.getElementsByTagName('meta')["color-scheme"].content = window.matchMedia('(prefers-color-scheme: dark)').matches + storedMode = getCookie("lightMode"); + if (storedMode == "") { + var colorScheme = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'; - - } else { - document.getElementsByTagName('meta')["color-scheme"].content = storedMode; + setDarkMode(colorScheme); + + } else { setDarkMode(storedMode); } @@ -29,50 +24,25 @@ function getDarkMode() { - return document.getElementsByTagName('meta')["color-scheme"].content + return getCookie("lightMode"); } function setDarkMode(mode) { + document.getElementsByTagName('meta')["color-scheme"].content = mode; if (mode == "light") { // nav bar var r = document.querySelector(':root'); document.firstElementChild.setAttribute("color-css-theme", "light"); - r.style.setProperty('--background-nav', 'rgba(255, 255, 255, 0.99)'); - r.style.setProperty('--background', 'rgba(255, 255, 255, 0.99)'); - r.style.setProperty('--nav-mobile-background-barely-transparent', 'rgba(249, 249, 249, 0.99)'); - r.style.setProperty('--nav-h3-color', '#5D5D5D'); - r.style.setProperty('--nav-span-color', '#33331E'); - r.style.setProperty('--nav-headline-h1', '#373737'); - r.style.setProperty('--authors-title-bio', '#1B1B1B'); - r.style.setProperty('--three-bar-logo-color', '#303030'); - r.style.setProperty('--text_color', '#000000'); - - - $('.light-logo').show(); - $('.dark-logo').hide(); - - + r.classList.replace('darkmode', 'lightmode'); } else if (mode == "dark") { // nav ba var r = document.querySelector(':root'); document.firstElementChild.setAttribute("color-css-theme", "dark"); - r.style.setProperty('--background-nav', '#031723'); - r.style.setProperty('--background', '#031621'); - r.style.setProperty('--nav-mobile-background-barely-transparent', '#031723'); - r.style.setProperty('--nav-h3-color', '#EFEFEF'); - r.style.setProperty('--nav-span-color', '#EFEFEF'); - r.style.setProperty('--nav-headline-h1', '#5D5D5D'); - r.style.setProperty('--authors-title-bio', '#D8D8D8'); - r.style.setProperty('--three-bar-logo-color', '#EFEFEF'); - r.style.setProperty('--text_color', '#D9D9D9'); - - $('.light-logo').hide(); - $('.dark-logo').show(); - - + r.classList.replace('lightmode', 'darkmode'); } + document.cookie = "lightMode="+mode+ "; path=/;"; } function DarkModeToggle() { @@ -88,8 +58,6 @@ function DarkModeToggle() { setDarkMode(mode) - localStorage.setItem("darkMode", mode); - } else if (mode == "light") { document.getElementsByTagName('meta')["color-scheme"].content = "dark"; @@ -97,7 +65,22 @@ function DarkModeToggle() { mode = "dark" setDarkMode(mode) - localStorage.setItem("darkMode", mode); } }); -} \ No newline at end of file +} + +function getCookie(cname) { + let name = cname + "="; + let decodedCookie = decodeURIComponent(document.cookie); + let ca = decodedCookie.split(';'); + for(let i = 0; i , - $(this).get(0) - ) - }) - - -}) \ No newline at end of file diff --git a/ubyssey/static_src/src/js/home.js b/ubyssey/static_src/src/js/home.js new file mode 100644 index 000000000..61381404f --- /dev/null +++ b/ubyssey/static_src/src/js/home.js @@ -0,0 +1,62 @@ +function initializeSeemore() { + $('#seemore').click(function (e) { + e.preventDefault(); + openFeed(); + }); +} + +initializeSeemore(); + +function openFeed() { + document.getElementById("feed-section").classList.remove("home_infinitefeed_cutoff"); + document.getElementById("feed-shadow").remove(); + + document.getElementById("loader").removeAttribute("inactive"); +} +function closeFeed() { + var shadow = document.createElement("div"); + shadow.id = "feed-shadow"; + shadow.classList.add("home_infinitefeed_cutoff_shadow"); + + var seemore = document.createElement("a"); + seemore.id = "seemore"; + seemore.href = "#"; + seemore.classList.add("home_infinitefeed_cutoff_seemore"); + seemore.innerHTML = "See more"; + + shadow.appendChild(seemore); + document.getElementById("feed-section").appendChild(shadow); + + initializeSeemore(); + + document.getElementById("feed-section").classList.add("home_infinitefeed_cutoff"); + document.getElementById("loader").setAttribute("inactive", "True"); +} + +updateTimeBox = setInterval( + function() { + var feed = document.getElementById("feed"); + if(document.documentElement.scrollTop > document.getElementById("feed-section").offsetTop) { + var scroll = document.documentElement.scrollTop - document.getElementById("feed-section").offsetTop; + for(let i=0; i scroll && article.offsetTop < scroll + 500) { + document.getElementById("timeBox").innerHTML = "" + article.getAttribute("time") + ""; + break; + } + } + } + } else { + if (document.getElementById("timeBox").innerHTML != "Today") { + document.getElementById("timeBox").innerHTML = "Today"; + } + if(document.documentElement.scrollTop < 100) { + if (loader.hasAttribute("end") == false) { + if (document.getElementById("feed-section").classList.contains("home_infinitefeed_cutoff") == false) { + closeFeed(); + } + } + } + } + }, 100); \ No newline at end of file diff --git a/ubyssey/static_src/src/js/infinitefeed.js b/ubyssey/static_src/src/js/infinitefeed.js new file mode 100644 index 000000000..c2470f1af --- /dev/null +++ b/ubyssey/static_src/src/js/infinitefeed.js @@ -0,0 +1,72 @@ + +var loader = document.getElementById("loader"); +var feed = document.getElementById("feed"); + +var data = {}; + +function getData(attribute) { + if (feed.getAttribute(attribute) != null) { + data[attribute] = feed.getAttribute(attribute); + } +} + +getData("section"); +getData("category"); +getData("search_query"); +getData("label"); + +function getArticles() { + loader.setAttribute("inactive", "True"); + loader.classList.remove("hide"); + data["start"] = loader.getAttribute("start"); + data["number"] = loader.getAttribute("number"); + + $.ajax({ + type:"GET", + url: "/infinitefeed", + data:data, + success: function(data) + { + recievedata(data); + } + }) +} + +function recievedata(data) { + var loader = document.getElementById("loader"); + var feed = document.getElementById("feed"); + if(data == "End of feed") { + loader.setAttribute("inactive", "True"); + loader.setAttribute("end", "True"); + var congratz = document.createElement("p"); + congratz.innerHTML = "You reached the end! 🥳"; + loader.replaceChildren(congratz); + } else { + console.log("epic"); + for (let i=0; i loader.offsetTop - document.body.offsetHeight){ + getArticles(); + loader.setAttribute("start", String(parseInt(loader.getAttribute("start"))+ parseInt(loader.getAttribute("number")))); + } + } +} + +window.onscroll = function() { + loadArticles(); +} \ No newline at end of file diff --git a/ubyssey/static_src/src/js/main.js b/ubyssey/static_src/src/js/main.js index f8808997b..29b82f6e2 100644 --- a/ubyssey/static_src/src/js/main.js +++ b/ubyssey/static_src/src/js/main.js @@ -3,13 +3,22 @@ import upcomingEvents from './widgets/upcoming-events'; (function () { + moveModals(); + initializeModals(); + closeModal(); + + archiveMobileDropDown(); initializeSearchFormActions(); initializeSocialMediaActions(); + initializeAudioQuote() + + initializeFilterDropdown(); + ubysseyHeaderMobilePopUp(); ubysseyHeaderMagazineDropDown(); ubysseyHeaderCultureDropDown(); - archiveMobileDropDown(); + //initializeGallery() if ($('.js-article').length) { mp.pageView('article', $('.js-article'), 1) @@ -147,6 +156,7 @@ function archiveMobileDropDown() { $('.js-dropdown-container').click(function (e) { e.preventDefault(); + closeModal(); var dropdown = $(this).parent(); dropdown.fadeOut(DROPDOWN_FADE_TIME); enableScroll(); @@ -173,40 +183,36 @@ function archiveMobileDropDown() { }); } -function ubysseyHeaderMobilePopUp() { - $('a.menu').click(function (e) { + +function initializeModals() { + let DROPDOWN_FADE_TIME = 100; + var modal = document.getElementById("modal"); + + $('.open-modal > a').click(function (e) { e.preventDefault(); - if ($('nav.mobile').is(':visible')) { - $('nav.mobile').hide(); + var modalLink = $(this).parent().find('.openModal')[0]; + var modalIndex = parseInt(modalLink.getAttribute("modal")); + if (modal.style.display == "block") { + closeModal(); + modal.children[modalIndex].classList.add("hide"); + modal.children[modalIndex].classList.remove("show"); $(this).removeClass('active'); } else { - if ($('#search-form').is(':visible')) { - $('#search-form').hide(); - $('a.search').removeClass('active'); - } - $('nav.mobile').show(); + modal.children[modalIndex].classList.remove("hide"); + modal.children[modalIndex].classList.add("show"); + openModal(); $(this).addClass('active'); } + return false; }); -} -//Pending deletion -function initializeSearch() { - $('.dropdown > a').click(function (e) { + $('a.close-modal').click(function (e) { e.preventDefault(); - var dropdown = $(this).parent().find('.list'); - if (dropdown.is(':visible')) { - dropdown.hide(); - } else { - dropdown.show(); - } - return false; + closeModal(); }); - - - } + function initializeSearchFormActions() { $(document).on('click', 'a.search', function (e) { e.preventDefault(); @@ -279,3 +285,100 @@ function initializeSocialMediaActions() { } + +function initializeAudioQuote() { + $(document).on('click', 'a.playAudioQuote', function (e) { + e.preventDefault(); + + var id = this.getAttribute("audio"); + + var sound = document.getElementById(id); + if (sound.paused) { + sound.play(); + + var icon = document.getElementById("icon-" + id); + var frames = ["fa-volume-off", "fa-volume-low", "fa-volume-high"]; + + var animateIcon = setInterval(function () { + + for (let i=0; i < frames.length; i++) { + if (icon.classList.contains(frames[i])) { + icon.classList.toggle(frames[i]); + if (i == frames.length - 1 ) { + icon.classList.toggle(frames[0]); + } else { + icon.classList.toggle(frames[i+1]); + } + break; + } + } + + if (sound.paused) { + icon.classList.remove("fa-volume-low"); + icon.classList.remove("fa-volume-high"); + icon.classList.add("fa-volume-off"); + clearInterval(animateIcon); + } + + }, 200); + } else { + sound.pause(); + sound.currentTime = 0; + } + + }); +} +function closeModal() { + var modal = document.getElementById("modal"); + modal.style.display = 'none'; + + var content = document.getElementById("content-wrapper"); + content.removeAttribute("tabindex"); + content.removeAttribute("readonly"); + content.removeAttribute("aria-hidden"); + content.removeAttribute("inert"); + + for (let i=0; i < modal.children.length; i++) { + modal.children[i].classList.remove("show"); + modal.children[i].classList.add("hide"); + } + + $('body').removeClass('u-no-scroll'); +} + +function openModal() { + var modal = document.getElementById("modal"); + modal.style.display = 'block'; + + var content = document.getElementById("content-wrapper"); + content.setAttribute("tabindex", "-1"); + content.setAttribute("readonly", ""); + content.setAttribute("aria-hidden", "true"); + content.setAttribute("inert", ""); + + $('body').addClass('u-no-scroll'); +} + +function moveModals() { + var modalBlocks = document.getElementsByClassName("add-to-modal"); + var modal = document.getElementById("modal"); + + for (let i=0; i < modalBlocks.length; i++) { + //modalBlocks[i].remove(); + var div = document.createElement("div"); + div.classList.add("openModal"); + div.setAttribute("modal", i); + + modalBlocks[i].insertAdjacentElement("beforebegin", div); + modal.appendChild(modalBlocks[i]); + } +} + +function initializeFilterDropdown() { + $(document).on('click', 'a.filterDropdown', function (e) { + e.preventDefault(); + this.parentElement.nextElementSibling.classList.toggle('hide_filter'); + this.children[0].classList.toggle("fa-caret-down"); + this.children[0].classList.toggle("fa-caret-up"); + }); +} \ No newline at end of file diff --git a/ubyssey/static_src/src/js/modules/Youtube.js b/ubyssey/static_src/src/js/modules/Youtube.js index 864f5143a..31ca6df85 100644 --- a/ubyssey/static_src/src/js/modules/Youtube.js +++ b/ubyssey/static_src/src/js/modules/Youtube.js @@ -1,4 +1,4 @@ -export function YoutubePlayer(element) { +function YoutubePlayer(element) { const node = $(element); let playerReady = false; let userReady = false; @@ -23,16 +23,18 @@ export function YoutubePlayer(element) { playerReady = true; } } - + console.log("Youtube"); $(element).find('.js-video-launch').click(function(){ $(this).hide(); $(`#video-${node.data('id')}`).show(); + console.log(playerReady); if (playerReady){ player.playVideo(); } else { userReady = true; } }); + } // 2. This code loads the IFrame Player API code asynchronously. @@ -42,6 +44,7 @@ tag.src = 'https://www.youtube.com/iframe_api'; let firstScriptTag = document.getElementsByTagName('script')[0]; firstScriptTag.parentNode.insertBefore(tag, firstScriptTag); +console.log(firstScriptTag); // 3. This function creates an

    {{item.featured_media.first.credit}}

    -

    {% endif %}

    {{item.lede}}

    \ No newline at end of file diff --git a/ubyssey/templates/ubyssey/archive.html b/ubyssey/templates/ubyssey/archive.html index 4f65c886c..f84b8e6d0 100644 --- a/ubyssey/templates/ubyssey/archive.html +++ b/ubyssey/templates/ubyssey/archive.html @@ -13,41 +13,14 @@
    -
    -
    - - {{ order|title }} - - -
    -
    -
    -
    -

    Order by:

    -
    - -
    -
    - -
    -
    -
    -
    -
    +

    {% if paginated_articles %} {{ paginated_articles.paginator.count }} RESULTS {% else %}NO RESULTS{% endif %} {% if search_query %} FOR "{{ search_query }}"{% endif %}

    - + {{ order|title }} diff --git a/ubyssey/templates/ubyssey/base.html b/ubyssey/templates/ubyssey/base.html index ebd7747ff..d7d026451 100644 --- a/ubyssey/templates/ubyssey/base.html +++ b/ubyssey/templates/ubyssey/base.html @@ -2,7 +2,7 @@ {% load wagtailuserbar %} {% load dispatch_tags %} - + @@ -11,7 +11,8 @@ - + + {% include 'ubyssey/meta_tags.html' %} {% block stylesheet %} @@ -57,14 +58,6 @@ node.parentNode.insertBefore(gads, node); })(); // invoke the function - {% comment %} Below script generated by Mailchimp Integrations. It enables Mailchimp popup functionality - {% endcomment %} - {% block head_scripts %} {% endblock %} @@ -129,13 +122,18 @@ }(document, 'script', 'twitter-wjs')); -
    +
    + {% block header %} {% endblock %} + +
    @@ -215,7 +213,7 @@ mixpanel.init("4941b226d03a988d5f2bc8fea8e0e70d"); - + {% comment %} {% endcomment %} diff --git a/ubyssey/urls.py b/ubyssey/urls.py index 5c5ee7554..77b555b4b 100644 --- a/ubyssey/urls.py +++ b/ubyssey/urls.py @@ -14,6 +14,7 @@ from ubyssey.views.advertise import AdvertiseTheme from ubyssey.views.magazine import magazine, MagazineLandingView, MagazineArticleView +from infinitefeed.views import infinitefeed from ubyssey.zones import * from ubyssey.widgets import * @@ -34,6 +35,12 @@ urlpatterns = [] +settings.WAGTAILIMAGES_FORMAT_CONVERSIONS = { + 'jpeg': 'webp', + 'png': 'webp', + 'webp': 'webp', +} + if settings.DEBUG: import debug_toolbar urlpatterns += [ @@ -71,6 +78,7 @@ # Wagtail re_path(r'^admin/', include(wagtailadmin_urls)), re_path(r'^documents/', include(wagtaildocs_urls)), + re_path(r'^infinitefeed/$', infinitefeed, name='infinitefeed'), re_path(r'^rss/$', FrontpageFeed(), name='frontpage-feed'), re_path(r'^rss/(?P[-\w]+)/$', SectionFeed(), name='section-feed'), re_path(r'^authors/(?P[-\w]+)/rss/$', AuthorFeed(), name='author-feed'), diff --git a/ubyssey/views/feed.py b/ubyssey/views/feed.py index 9b4e331bc..ee31d346a 100644 --- a/ubyssey/views/feed.py +++ b/ubyssey/views/feed.py @@ -138,7 +138,7 @@ def title(self, author): return 'Stories from %s at The Ubyssey' % author.full_name def description(self, author): - return author.description + return author.bio_description def link(self, author): return author.get_full_url() diff --git a/videos/models.py b/videos/models.py index 63eb2efd5..40c9dec7b 100644 --- a/videos/models.py +++ b/videos/models.py @@ -18,6 +18,8 @@ from wagtail.admin.edit_handlers import FieldPanel, InlinePanel, MultiFieldPanel, PageChooserPanel from wagtail.core.models import Orderable, Page from wagtail.snippets.models import register_snippet +from wagtail.search import index + #-----Taggit stuff----- @@ -84,12 +86,14 @@ def get_context(self, request, *args, **kwargs): context["paginated_videos"] = paginated_videos return context + + # @route('^archive/videos$') #-----Snippet models----- @register_snippet -class VideoSnippet(ClusterableModel): +class VideoSnippet(index.Indexed, ClusterableModel): title = models.CharField( max_length=255, @@ -180,7 +184,17 @@ def get_authors_with_urls(self) -> str: heading="Tags" ), ] - + #-----Search fields etc----- + #See https://docs.wagtail.org/en/stable/topics/search/indexing.html + search_fields = [ + index.SearchField('title'), + index.SearchField('slug'), + + index.FilterField('video_authors'), + index.FilterField('tags'), + index.FilterField('slug'), + index.FilterField('created_at'), + ] class Meta: verbose_name = "Video" verbose_name_plural = "Videos" diff --git a/videos/templates/videos/stream_blocks/one_off_video.html b/videos/templates/videos/stream_blocks/one_off_video.html index 7b8f86cfd..d7378e114 100644 --- a/videos/templates/videos/stream_blocks/one_off_video.html +++ b/videos/templates/videos/stream_blocks/one_off_video.html @@ -9,6 +9,9 @@ credit {% endcomment%} {% load video_filters %} +{% load static %} + +
    diff --git a/videos/templates/videos/stream_blocks/video.html b/videos/templates/videos/stream_blocks/video.html new file mode 100644 index 000000000..e11e5e9e4 --- /dev/null +++ b/videos/templates/videos/stream_blocks/video.html @@ -0,0 +1,27 @@ +{% load dispatch_filters %} +
    +
    +

    {{video.title|safe}}

    +
    + +
    + Loading Video... + +
    +
    Credits: {{ video.get_authors_string|safe }}
    + +
    +{% comment %}

    + + {{ video_placement.video.text }} + +

    {% endcomment %} +{% comment %}
  • + {% include "videos/video_snippet.html" %} +
    • {% endcomment %} \ No newline at end of file diff --git a/videos/templates/videos/videos_page.html b/videos/templates/videos/videos_page.html index 9f0eb35c3..c9fc99de4 100644 --- a/videos/templates/videos/videos_page.html +++ b/videos/templates/videos/videos_page.html @@ -14,7 +14,7 @@
    {% include 'objects/advertisement.html' with size='leaderboard' name='Leaderboard' id=1 %} {% include 'objects/advertisement.html' with size='mobile-leaderboard' name='Mobile_Leaderboard' id=5 %} -
    +

    Videos

    @@ -34,35 +34,9 @@

    Videos

    {% endif %}
    -
    +
    {% for video in paginated_videos %} - {% load dispatch_filters %} -
    -
    -

    {{video.title|safe}}

    -
    - -
    - Loading Video... - -
    -
    Credits: {{ video.get_authors_string|safe }}
    - -
    - {% comment %}

    - - {{ video_placement.video.text }} - -

    {% endcomment %} - {% comment %}
  • - {% include "videos/video_snippet.html" %} -
    • {% endcomment %} + {% include 'videos/stream_blocks/video.html' with video=video %} {% endfor %}