Merge pull request #66 from moscowpython/tech/seo_tweaks

Melevir · web-flow · commit 2de9939878c0 · 2023-11-22T09:42:34.000+01:00
Tech/seo tweaks
diff --git a/landing_page/landing_page/settings.py b/landing_page/landing_page/settings.py
@@ -13,12 +13,16 @@
 
 INSTALLED_APPS = [
     'mainpage.apps.MainpageConfig',
+
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django.contrib.sitemaps',
+
+    'memoize',
 ]
 
 MIDDLEWARE = [
diff --git a/landing_page/landing_page/sitemap.py b/landing_page/landing_page/sitemap.py
@@ -0,0 +1,19 @@
+import datetime
+
+from django.contrib.sitemaps import Sitemap
+from django.urls import reverse
+from mainpage.utils.github import fetch_last_commit_date_from_github_repo
+
+
+class LearnSitemap(Sitemap):
+    changefreq = "weekly"
+    priority = 0.5
+
+    def items(self) -> list[str]:
+        return ["index", "index_advanced"]
+
+    def location(self, item: str) -> str:
+        return reverse(item)
+
+    def lastmod(self, obj: str) -> datetime.datetime | None:
+        return fetch_last_commit_date_from_github_repo('moscowpython', 'learnpython')
diff --git a/landing_page/landing_page/urls.py b/landing_page/landing_page/urls.py
@@ -1,7 +1,16 @@
 from django.contrib import admin
+from django.contrib.sitemaps.views import sitemap
 from django.urls import include, path
 
+from landing_page.sitemap import LearnSitemap
+
 urlpatterns = [
     path('', include('mainpage.urls')),
     path('admin/', admin.site.urls),
+    path(
+        "sitemap.xml",
+        sitemap,
+        {"sitemaps": {"static": LearnSitemap}},
+        name="django.contrib.sitemaps.views.sitemap",
+    )
 ]
diff --git a/landing_page/mainpage/templates/mainpage/advanced.html b/landing_page/mainpage/templates/mainpage/advanced.html
@@ -5,6 +5,7 @@
 <html lang="en">
     <head>
         <meta charset="UTF-8">
+        <meta name="description" content="Курс программирования на python 3.11 для тех, кто уже знаком с веб-разработкой на python">
         <meta name="viewport"
               content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
         <meta http-equiv="X-UA-Compatible" content="ie=edge">
diff --git a/landing_page/mainpage/templates/mainpage/index.html b/landing_page/mainpage/templates/mainpage/index.html
@@ -5,6 +5,7 @@
 <html lang="en">
     <head>
         <meta charset="UTF-8">
+        <meta name="description" content="Курс программирования на python 3.11 для любого уровня c упором на практику">
         <meta name="viewport"
               content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
         <meta http-equiv="X-UA-Compatible" content="ie=edge">
diff --git a/landing_page/mainpage/utils/github.py b/landing_page/mainpage/utils/github.py
@@ -0,0 +1,29 @@
+import datetime
+
+import requests
+from memoize import memoize
+
+
+@memoize(timeout=24 * 60 * 60)
+def fetch_last_commit_date_from_github_repo(
+    owner: str,
+    repo_name: str,
+    timeout_msec: int = 500,
+) -> datetime.datetime | None:
+    response = requests.get(
+        f"https://api.github.com/repos/{owner}/{repo_name}/commits",
+        timeout=timeout_msec / 1000,
+    )
+    if not response:
+        return None
+    all_commits = response.json()
+    if not isinstance(all_commits, list) or not all_commits:
+        return None
+    last_commit = all_commits[0]
+    raw_commit_date = last_commit.get("commit", {}).get("author", {}).get("date")
+    try:
+        last_commit_date = datetime.datetime.fromisoformat(raw_commit_date) if raw_commit_date else None
+    except ValueError:
+        last_commit_date = None
+
+    return last_commit_date
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -4,3 +4,4 @@ mypy==1.5.0
 isort==5.12.0
 pytest==7.4.0
 pytest-django==4.5.2
+types-requests==2.31.0.10
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,4 @@
 Django==4.2.4
 Pillow==10.0.0
+requests==2.31.0
+django-memoize==2.3.1
