Restore the main-site homepage at root

Closes #95

Author: alexeygrigorev

_docs/adoption/course-platform/integration-patches.md

@@ -7,7 +7,11 @@ Copied CMP files remain byte-identical to the pinned source. Integration is conf
   roots out of autoformat/static-style rewrites while explicitly checking target-owned integration
   shims; copied behavior is instead guarded by checksums and its unchanged characterization suite;
 - `website/settings/base.py` and `website/settings/test.py`: adopted apps, middleware/context processor, CustomUser identity, compatibility/provider defaults, dedicated copied-template directory, and test-safe behavior;
-- `website/urls.py`: source-compatible HTML, account, API, cadmin, admin/loginas routes alongside the unified scaffold routes;
+- `website/urls.py`: source-compatible HTML, account, API, cadmin, admin/loginas routes alongside
+  the unified scaffold routes; issue #95 restores the main-site root, moves global course discovery
+  to `/courses/`, exposes the complete copied URLconf under the explicit `courses` namespace, and
+  retains global non-empty legacy course reversals/inbound paths without modifying the copied
+  URLconf or its outbound-link behavior;
 - `website/admin_api_urls.py`: target-owned compatibility shim preserving the scaffold's
   namespaced `/api/v1/admin/health` route while the adopted compatibility API remains at `/api/`;
 - `website/admin_api_views.py`: target-owned compatibility shim preserving the scaffold's

core/static/core/site.css

@@ -8,15 +8,37 @@
 * { box-sizing: border-box; }
 body { margin: 0; min-height: 100vh; display: flex; flex-direction: column; }
 a { color: #0b5fff; }
-.site-header, footer { display: flex; align-items: center; justify-content: space-between; padding: 1.25rem clamp(1rem, 5vw, 5rem); background: #fff; }
+.skip-link { position: fixed; top: .5rem; left: .5rem; z-index: 10; padding: .75rem 1rem; border-radius: .45rem; background: #17223b; color: #fff; transform: translateY(-150%); }
+.skip-link:focus { transform: translateY(0); }
+.site-header, .site-footer { display: flex; align-items: center; justify-content: space-between; gap: 1.5rem; padding: 1.25rem clamp(1rem, 5vw, 5rem); background: #fff; }
 .site-header { border-bottom: 1px solid #dce2ee; }
 .brand { color: #17223b; font-weight: 750; text-decoration: none; font-size: 1.15rem; }
-main { width: min(72rem, 100%); margin: 0 auto; padding: clamp(2rem, 8vw, 7rem) clamp(1rem, 5vw, 5rem); flex: 1; }
-.hero { max-width: 48rem; }
+.primary-navigation, .site-footer nav { display: flex; flex-wrap: wrap; align-items: center; justify-content: flex-end; gap: .45rem 1.2rem; }
+.primary-navigation a, .site-footer a { color: #36415a; font-weight: 650; text-decoration: none; }
+.primary-navigation a:hover, .site-footer a:hover { color: #0b5fff; text-decoration: underline; text-underline-offset: .25rem; }
+main { width: min(76rem, 100%); margin: 0 auto; padding: clamp(2.5rem, 7vw, 6.5rem) clamp(1rem, 5vw, 5rem); flex: 1; }
+.hero { max-width: 64rem; }
 .eyebrow { color: #0b5fff; font-size: .82rem; font-weight: 700; letter-spacing: .08em; text-transform: uppercase; }
 h1 { margin: .4rem 0 1rem; font-size: clamp(2.35rem, 8vw, 5.5rem); line-height: .98; letter-spacing: -.045em; }
+.hero h2 { max-width: 54rem; margin: 0; color: #293650; font-size: clamp(1.35rem, 3vw, 2.15rem); font-weight: 600; line-height: 1.25; letter-spacing: -.025em; }
 .lede { max-width: 42rem; font-size: clamp(1.15rem, 2vw, 1.45rem); line-height: 1.6; color: #44516a; }
-.foundation-note { display: inline-block; margin-top: 1.5rem; padding: .75rem 1rem; border-radius: .6rem; background: #e8efff; }
+.hero-actions { display: flex; flex-wrap: wrap; gap: .75rem; margin-top: 2rem; }
+.button { display: inline-flex; align-items: center; justify-content: center; min-height: 3rem; padding: .75rem 1.1rem; border: 1px solid #0b5fff; border-radius: .5rem; font-weight: 750; text-decoration: none; }
+.button.primary { background: #0b5fff; color: #fff; }
+.button.secondary { background: #fff; color: #0b5fff; }
+.value-grid { display: grid; grid-template-columns: repeat(3, 1fr); gap: 1rem; margin-top: clamp(3.5rem, 8vw, 7rem); }
+.value-grid article { min-height: 15rem; padding: clamp(1.25rem, 3vw, 2rem); border: 1px solid #dce2ee; border-radius: 1rem; background: #fff; box-shadow: 0 .75rem 2.25rem rgba(23, 34, 59, .06); }
+.value-grid h3 { margin: 2.5rem 0 .75rem; font-size: 1.35rem; }
+.value-grid article p:last-child { color: #526078; line-height: 1.65; }
+.card-number { margin: 0; color: #0b5fff; font-size: .8rem; font-weight: 800; letter-spacing: .08em; }
+.explore-section { margin-top: clamp(4rem, 8vw, 7rem); padding-top: clamp(2rem, 5vw, 4rem); border-top: 1px solid #dce2ee; }
+.section-heading { max-width: 44rem; }
+.section-heading h2 { margin: .5rem 0 0; font-size: clamp(1.8rem, 4vw, 3.2rem); line-height: 1.1; letter-spacing: -.035em; }
+.explore-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: .75rem; margin-top: 2rem; }
+.explore-grid a { display: grid; gap: .35rem; padding: 1.15rem 1.25rem; border: 1px solid #dce2ee; border-radius: .7rem; background: #fff; color: #17223b; text-decoration: none; }
+.explore-grid a:hover { border-color: #0b5fff; box-shadow: 0 .4rem 1.4rem rgba(11, 95, 255, .1); }
+.explore-grid strong { color: #0b5fff; font-size: 1.05rem; }
+.explore-grid span { color: #526078; line-height: 1.5; }
 .panel { padding: clamp(1.5rem, 5vw, 3rem); border: 1px solid #dce2ee; border-radius: 1rem; background: #fff; box-shadow: 0 1rem 3rem rgba(23, 34, 59, .08); }
 .panel.narrow { max-width: 32rem; margin: 0 auto; }
 .panel h1 { font-size: clamp(2rem, 6vw, 3.5rem); }
@@ -31,7 +53,7 @@ button.secondary { color: #17223b; background: #e8edf5; }
 .status-grid div { padding: 1rem; border-radius: .65rem; background: #f5f7fb; }
 .status-grid dt { color: #65708a; font-size: .85rem; }
 .status-grid dd { margin: .25rem 0 0; font-weight: 750; }
-footer { color: #65708a; border-top: 1px solid #dce2ee; }
+.site-footer { color: #65708a; border-top: 1px solid #dce2ee; }
 .studio-navigation { display: flex; flex-wrap: wrap; gap: .75rem; margin: 1rem 0 2rem; }
 .studio-navigation a { padding: .6rem .8rem; border-radius: .45rem; background: #e8efff; font-weight: 700; }
 .audit-filters { grid-template-columns: repeat(auto-fit, minmax(10rem, 1fr)); align-items: end; }
@@ -51,6 +73,14 @@ footer { color: #65708a; border-top: 1px solid #dce2ee; }
 .one-time-secret code { display: block; margin: 1rem 0; padding: .8rem; border-radius: .45rem; background: #17223b; color: #fff; overflow-wrap: anywhere; }
 
 @media (max-width: 36rem) {
-  .site-header { align-items: flex-start; gap: 1rem; }
+  .site-header, .site-footer { align-items: flex-start; flex-direction: column; }
+  .primary-navigation, .site-footer nav { justify-content: flex-start; }
   main { padding-top: 3.5rem; }
+  .value-grid, .explore-grid { grid-template-columns: 1fr; }
+}
+
+@media (min-width: 36.01rem) and (max-width: 56rem) {
+  .site-header { align-items: flex-start; }
+  .value-grid { grid-template-columns: 1fr; }
+  .value-grid article { min-height: auto; }
 }

core/tests/test_course_platform_adoption.py

@@ -5,7 +5,7 @@
 from django.apps import apps
 from django.core.management import get_commands, load_command_class
 from django.test import SimpleTestCase
-from django.urls import resolve
+from django.urls import resolve, reverse
 
 from scripts.render_course_platform_inventory import (
     SOURCE_APP_LABELS,
@@ -109,7 +109,10 @@ def test_every_adopted_route_resolves_through_the_unified_urlconf(self):
         self.assertEqual(len(routes), 89)
         for route in routes:
             with self.subTest(route=route.route, name=route.name):
-                match = resolve(route.example_path())
+                example_path = route.example_path()
+                if route.surface == "Public courses" and route.name == "course_list":
+                    example_path = reverse("course_list")
+                match = resolve(example_path)
                 self.assertEqual(match.url_name, route.name or None)
                 callback_name = f"{match.func.__module__}.{match.func.__name__}"
                 self.assertEqual(callback_name, route.callback)

core/tests/test_deployment_release.py

@@ -1061,13 +1061,24 @@ def test_http_smoke_checks_safe_404_and_writes_only_redacted_evidence(self) -> N
             Response(
                 200,
                 noindex,
-                b"Learn data skills. For free. Together."
-                b'<link rel="stylesheet" href="/static/courses.fixture.css">',
+                b"<title>Welcome to DataTalks.Club</title>"
+                b"The place to talk about data"
+                b"Global online community of data science professionals, ML engineers, "
+                b"and AI practitioners"
+                b'<link rel="canonical" href="https://datatalks.club/">'
+                b'<link rel="stylesheet" href="/static/core.fixture.css">',
             ),
             Response(
                 200,
                 noindex,
-                b'Foundation page<link rel="canonical" href="https://datatalks.club/">',
+                b"The place to talk about data"
+                b'<link rel="canonical" href="https://datatalks.club/">',
+            ),
+            Response(
+                200,
+                noindex,
+                b"Learn data skills. For free. Together."
+                b'<link rel="stylesheet" href="/static/courses.fixture.css">',
             ),
             Response(
                 302,
@@ -1111,7 +1122,7 @@ def test_http_smoke_checks_safe_404_and_writes_only_redacted_evidence(self) -> N
                     "/__dtc_deployed_smoke_missing__",
                     "/robots.txt",
                     "/sitemap.xml",
-                    "/static/courses.fixture.css",
+                    "/static/core.fixture.css",
                 ],
             )
             persisted = path.read_text()
@@ -1120,6 +1131,38 @@ def test_http_smoke_checks_safe_404_and_writes_only_redacted_evidence(self) -> N
             for forbidden in ("cookie", "authorization", "set-cookie", "response_body"):
                 self.assertNotIn(forbidden, persisted.lower())
 
+        invalid_surface_responses = (
+            (
+                2,
+                Response(
+                    200,
+                    noindex,
+                    b"Learn data skills. For free. Together."
+                    b'<link rel="stylesheet" href="/static/core.fixture.css">',
+                ),
+                "home page lacks expected content",
+            ),
+            (
+                4,
+                Response(
+                    200,
+                    noindex,
+                    b"The place to talk about data"
+                    b'<link rel="stylesheet" href="/static/courses.fixture.css">',
+                ),
+                "course discovery lacks expected content",
+            ),
+        )
+        for response_index, invalid_response, error_message in invalid_surface_responses:
+            with self.subTest(error_message=error_message):
+                invalid_responses = [*responses]
+                invalid_responses[response_index] = invalid_response
+                with (
+                    patch("deploy.smoke._request", side_effect=invalid_responses),
+                    self.assertRaisesMessage(ReleaseContractError, error_message),
+                ):
+                    run_http_smoke("https://web.dtcdev.click", SHA_A)
+
         invalid_admin_responses = (
             (
                 Response(
@@ -1149,7 +1192,7 @@ def test_http_smoke_checks_safe_404_and_writes_only_redacted_evidence(self) -> N
         for admin_response, error_message in invalid_admin_responses:
             with self.subTest(error_message=error_message):
                 invalid_responses = [*responses]
-                invalid_responses[6] = admin_response
+                invalid_responses[7] = admin_response
                 with (
                     patch("deploy.smoke._request", side_effect=invalid_responses),
                     self.assertRaisesMessage(ReleaseContractError, error_message),

core/tests/test_homepage.py

@@ -0,0 +1,85 @@
+from django.test import TestCase
+from django.urls import resolve, reverse
+
+from core import views as core_views
+from courses.models.course import Course
+from courses.views import course_list
+
+
+class MainHomepageRoutingTests(TestCase):
+    def test_root_and_unified_alias_use_the_distinct_main_site_shell(self) -> None:
+        self.assertEqual(reverse("home"), "/")
+        self.assertEqual(reverse("unified-home"), "/unified/")
+        self.assertIs(resolve("/").func, core_views.home)
+
+        for path in (reverse("home"), reverse("unified-home")):
+            with self.subTest(path=path):
+                response = self.client.get(path)
+                self.assertEqual(response.status_code, 200)
+                self.assertEqual(response.headers["X-Robots-Tag"], "noindex, nofollow")
+                self.assertContains(response, "<title>Welcome to DataTalks.Club</title>")
+                self.assertContains(response, "The place to talk about data")
+                self.assertContains(
+                    response,
+                    "Global online community of data science professionals, ML engineers, "
+                    "and AI practitioners",
+                )
+                self.assertContains(
+                    response,
+                    '<link rel="canonical" href="https://datatalks.club/">',
+                    count=1,
+                )
+                self.assertContains(response, "/static/core/site.css")
+                self.assertNotContains(response, "Learn data skills. For free. Together.")
+                self.assertNotContains(response, "cdn.tailwindcss.com")
+                self.assertNotContains(response, "googletagmanager")
+                self.assertNotContains(response, "google-analytics")
+
+    def test_main_navigation_uses_working_transitional_destinations(self) -> None:
+        response = self.client.get(reverse("home"))
+
+        for destination in (
+            "https://datatalks.club/articles.html",
+            "https://datatalks.club/slack.html",
+            "https://datatalks.club/events.html",
+            "https://datatalks.club/podcast.html",
+            "https://datatalks.club/podwiki/",
+            "https://datatalks.club/books.html",
+            reverse("course_list"),
+        ):
+            with self.subTest(destination=destination):
+                self.assertContains(response, f'href="{destination}"')
+
+    def test_course_discovery_moves_forward_under_courses_namespace(self) -> None:
+        self.assertEqual(reverse("course_list"), "/courses/")
+        self.assertIs(resolve("/courses/").func, course_list.course_list)
+
+        response = self.client.get(reverse("course_list"))
+
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Learn data skills. For free. Together.")
+        self.assertNotContains(response, "The place to talk about data")
+        self.assertNotContains(response, 'rel="canonical"')
+
+    def test_nonempty_legacy_course_path_remains_an_inbound_alias(self) -> None:
+        course = Course.objects.create(
+            title="Compatibility course",
+            slug="compatibility-course",
+            description="Legacy inbound routing fixture",
+            visible=True,
+        )
+        forward_path = reverse("courses:course", kwargs={"course_slug": course.slug})
+        legacy_path = reverse("course", kwargs={"course_slug": course.slug})
+
+        self.assertEqual(forward_path, "/courses/compatibility-course/")
+        self.assertEqual(legacy_path, "/compatibility-course/")
+        self.assertEqual(self.client.get(forward_path).status_code, 200)
+        self.assertEqual(self.client.get(legacy_path).status_code, 200)
+
+    def test_unknown_legacy_shaped_path_is_a_real_404(self) -> None:
+        response = self.client.get("/not-a-course/")
+
+        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.headers["X-Robots-Tag"], "noindex, nofollow")
+        self.assertNotContains(response, "Traceback", status_code=404)
+        self.assertNotContains(response, 'rel="canonical"', status_code=404)

deploy/smoke.py

@@ -127,11 +127,18 @@ def run_http_smoke(
     _assert_status(home, 200, "/")
     _assert_noindex(home, "/")
     html = home.body.decode("utf-8")
-    for expected in ("Learn data skills. For free. Together.",):
+    for expected in (
+        "Welcome to DataTalks.Club",
+        "The place to talk about data",
+        "Global online community of data science professionals, ML engineers, and AI practitioners",
+    ):
         if expected not in html:
             raise ReleaseContractError(f"home page lacks expected content: {expected}")
-    if 'rel="canonical"' in html:
-        raise ReleaseContractError("adopted course discovery has a guessed canonical")
+    canonical = '<link rel="canonical" href="https://datatalks.club/">'
+    if html.count(canonical) != 1 or html.count('rel="canonical"') != 1:
+        raise ReleaseContractError("home page production canonical differs")
+    if "Learn data skills. For free. Together." in html:
+        raise ReleaseContractError("home page regressed to adopted course discovery")
     lowered = html.lower()
     if "traceback" in lowered or "page not found" in lowered or "debug=true" in lowered:
         raise ReleaseContractError("home page contains debug or 404 output")
@@ -145,9 +152,21 @@ def run_http_smoke(
     _assert_status(mapped, 200, "/unified/")
     _assert_noindex(mapped, "/unified/")
     mapped_html = mapped.body.decode("utf-8")
-    canonical = '<link rel="canonical" href="https://datatalks.club/">'
     if mapped_html.count(canonical) != 1 or mapped_html.count('rel="canonical"') != 1:
         raise ReleaseContractError("explicit production canonical differs")
+    if "The place to talk about data" not in mapped_html:
+        raise ReleaseContractError("unified compatibility page lacks the main-site identity")
+
+    courses = _request(origin, "/courses/")
+    _assert_status(courses, 200, "/courses/")
+    _assert_noindex(courses, "/courses/")
+    courses_html = courses.body.decode("utf-8")
+    if "Learn data skills. For free. Together." not in courses_html:
+        raise ReleaseContractError("course discovery lacks expected content")
+    if "The place to talk about data" in courses_html:
+        raise ReleaseContractError("course discovery regressed to the main-site home")
+    if 'rel="canonical"' in courses_html:
+        raise ReleaseContractError("adopted course discovery has a guessed canonical")
 
     studio = _request(origin, "/studio/")
     if studio.status not in {301, 302, 303, 307, 308}:
@@ -232,13 +251,26 @@ def run_http_smoke(
                 "database": True,
                 "migrations": True,
             },
-            {"path": "/", "status": 200, "noindex": True, "canonical_absent": True},
+            {
+                "path": "/",
+                "status": 200,
+                "noindex": True,
+                "main_site_identity": True,
+                "explicit_canonical": True,
+            },
             {
                 "path": "/unified/",
                 "status": 200,
                 "noindex": True,
                 "explicit_canonical": True,
             },
+            {
+                "path": "/courses/",
+                "status": 200,
+                "noindex": True,
+                "course_discovery": True,
+                "canonical_absent": True,
+            },
             {
                 "path": "/studio/",
                 "status": studio.status,