Adds 2024 base templates (#3789)

* Adds 2024 base templates

* Removes methodology for no
* Add 2024 base template files
* Updated link of last chapter to 2022 instead of 2023
* Does not update stats or dates

* Update stats

* Update year

* Teamplate cleanup

* Better previous year handling

* Clean up

* More cleanup

---------

Co-authored-by: Barry Pollard <barrypollard@google.com>

Author: SaptakS

src/config/2024.json

@@ -1,8 +1,8 @@
 {
   "settings": [
     {
-      "is_live": false,
-      "supported_languages": ["en"],
+      "is_live": true,
+      "supported_languages": ["en","es","fr","hi","it","ja","nl","pt","ru","tr","uk","zh-CN","zh-TW"],
       "ebook_languages": []
     }
   ],

src/server/config.py

@@ -90,6 +90,9 @@ def update_config():
             elif ".json" in file:
                 config_files.append(file[0:4])
 
+    # Sort the config files so read in year order
+    config_files.sort()
+
     for year in config_files:
         config_filename = "config/%s.json" % year
         with open(config_filename, "r") as config_file:

src/server/helpers.py

@@ -15,10 +15,24 @@
 import logging
 
 
+# This gets the previous year as can no longer assume it's this year -1 as
+# skip some years (e.g. 2024)
+def get_previous_year(year):
+    if year in SUPPORTED_YEARS:
+        year_index = SUPPORTED_YEARS.index(year)
+        if year_index > 0:
+            return SUPPORTED_YEARS[year_index - 1]
+        else:
+            return None  # No previous year if it's the first one
+    else:
+        return None  # Return None if the year is not in the list
+
+
 def render_template(template, *args, **kwargs):
     # If the year has already been set (e.g. for error pages) then use that
     # Otherwise the requested year, otherwise the default year
     year = kwargs.get("year", request.view_args.get("year", DEFAULT_YEAR))
+    previous_year = get_previous_year(year)
     config = kwargs.get("config", get_config(year))
 
     # If the lang has already been set (e.g. for error pages) then use that
@@ -79,6 +93,7 @@ def render_template(template, *args, **kwargs):
 
     kwargs.update(
         year=year,
+        previous_year=previous_year,
         lang=lang,
         language=language,
         supported_languages=template_supported_languages,

src/server/tests/helpers_test.py

@@ -10,6 +10,7 @@
     convert_old_image_path,
     add_footnote_links,
     year_live,
+    get_previous_year,
     strip_accents,
     accentless_sort,
     render_template,
@@ -283,6 +284,22 @@ def test_year_live_2020():
     assert year_live("2020") is True
 
 
+def test_previous_year_2018():
+    assert get_previous_year("2018") is None
+
+
+def test_previous_year_2019():
+    assert get_previous_year("2019") is None
+
+
+def test_previous_year_2022():
+    assert get_previous_year("2022") == "2021"
+
+
+def test_previous_year_2024():
+    assert get_previous_year("2024") == "2022"
+
+
 def test_strip_accents_fr_edition():
     assert strip_accents("Édition") == "Edition"
 

src/templates/base/index.html

@@ -61,7 +61,7 @@ <h2>{{ self.intro_sub_title() }}</h2>
         {{ self.start_exploring() }}
       </a>
       {% else %}
-      <a href="{{ url_for('table_of_contents', year=year|int -1, lang=lang) }}" class="btn">
+      <a href="{{ url_for('table_of_contents', year=previous_year, lang=lang) }}" class="btn">
         {{ self.read_last_years_almanac() }}
       </a>
       {% endif %}
@@ -147,7 +147,7 @@ <h3>{{ localizedChapterTitles[featured_chapter] }}</h3>
         {{ read_chapter(localizedChapterTitles[featured_chapter]) }}
       </a>
       {% else %}
-      <a href="{{ url_for('chapter', year=year|int -1, chapter=featured_chapter, lang=lang) }}" class="btn">
+      <a href="{{ url_for('chapter', year=previous_year, chapter=featured_chapter, lang=lang) }}" class="btn">
         {{ read_last_years_chapter(localizedChapterTitles[featured_chapter]) }}
       </a>
       {% endif %}
@@ -161,10 +161,10 @@ <h3>{{ localizedChapterTitles[featured_chapter] }}</h3>
     {% include "en/%s/featured_chapters.html" % year %}
     {% endif %}
   {% else %}
-    {% if featured_chapters_exists(lang, year|int -1) %}
-    {% include "%s/%s/featured_chapters.html" % (lang, year|int -1) %}
-    {% elif featured_chapters_exists('en', year|int -1) %}
-    {% include "en/%s/featured_chapters.html" % (year|int -1) %}
+    {% if featured_chapters_exists(lang, previous_year) %}
+    {% include "%s/%s/featured_chapters.html" % (lang, previous_year) %}
+    {% elif featured_chapters_exists('en', previous_year) %}
+    {% include "en/%s/featured_chapters.html" % previous_year %}
     {% endif %}
   {% endif %}
   {% endblock %}

src/templates/en/2024/base.html

@@ -0,0 +1,10 @@
+{% extends "%s/base.html" % lang %}
+
+{% block methodology_stat_1 %}16.9M{% endblock %}
+{% block methodology_stat_2 %}82.61 TB{% endblock %}
+{% block total_websites %}nearly 17 million{% endblock %}
+{% block dataset %}June 2024{% endblock %}
+
+{% block foreword %}
+{# TODO #}
+{% endblock %}

src/templates/en/2024/contributors.html

@@ -0,0 +1,11 @@
+{% extends "base/contributors.html" %}
+
+{% block title %}{{ year }} Contributors | The Web Almanac by HTTP Archive{% endblock %}
+
+{% block description %}The {{ config.contributors.items() | length }} people who contributed to the {{ year }} Web Almanac as Analysts, Authors, Designers, Developers, Editors, Leaders, Reviewers and Translators.{% endblock %}
+
+{% block filter_by_team %}Filter by team: <span id="filtered-contributors">{{ self.contributors() }}</span><span id="contributors-total-text" class="hidden"> of <span id="contributors-total">{{ config.contributors.items() | length }}</span></span> contributors.{% endblock %}
+{% block filter_by %}Filter by{% endblock %}
+
+{% block join_the_team_title%}Join the Web Almanac team{% endblock %}
+{% block join_the_team_text%}Join the team!{% endblock %}

src/templates/en/2024/index.html

@@ -0,0 +1,6 @@
+{% extends "base/index.html" %}
+
+{% block title %}The {{ year }} Web Almanac{% endblock %}
+{% block description %}The Web Almanac is an annual state of the web report combining the expertise of the web community with the data and trends of the HTTP Archive.{% endblock %}
+
+{% block twitter_image_alt %}The {{ year }} Web Almanac{% endblock %}

src/templates/en/2024/table_of_contents.html

@@ -0,0 +1,7 @@
+{% extends "base/table_of_contents.html" %}
+
+{% block title %}Table of Contents | Web Almanac {{ year }}{% endblock %}
+
+{% block description %}Table of Contents for the {{ year }} Web Almanac, listing each section: Page Contents, User Experience, Content Publishing, Content Distribution.{% endblock %}
+
+{% block twitter_image_alt %}{{ year }} Web Almanac methodology{% endblock %}

src/templates/en/base.html

@@ -24,7 +24,7 @@
 </p>
 {% endblock %}
 
-{% block read_last_years_almanac %}Read the {{ year | int - 1 }} Web Almanac{% endblock %}
+{% block read_last_years_almanac %}Read the {{ previous_year }} Web Almanac{% endblock %}
 
 {% block http_archive_link %}HTTP Archive home{% endblock %}
 
@@ -124,14 +124,14 @@
 {% block rss_feed %}RSS Feed{% endblock %}
 
 {% block featured_chapter %}Featured Chapter{% endblock %}
-{% block featured_chapter_last_year %}Featured Chapter<br>from the {{ year|int -1 }} Web Almanac{% endblock %}
+{% block featured_chapter_last_year %}Featured Chapter<br>from the {{ previous_year }} Web Almanac{% endblock %}
 
 {# Check if read_chapter already defined in child template as macros can't be overridden #}
 {% if not read_chapter %}
 {% macro read_chapter(chapter) %}Read the <span class="featured-chapter-name">{{ chapter }}</span> chapter{% endmacro %}
 {% endif %}
 {% if not read_last_years_chapter %}
-{% macro read_last_years_chapter(chapter) %}Read the {{ year|int-1 }} <span class="featured-chapter-name">{{ chapter }}</span> chapter{% endmacro %}
+{% macro read_last_years_chapter(chapter) %}Read the {{ previous_year }} <span class="featured-chapter-name">{{ chapter }}</span> chapter{% endmacro %}
 {% endif %}
 
 {% block contributors_description %}