Add redirect to about.readthedocs.com for logged out users

readthedocs/core/views/__init__.py

@@ -13,7 +13,6 @@
 from django.views.generic import TemplateView, View
 
 from readthedocs.core.mixins import CDNCacheControlMixin, PrivateViewMixin
-from readthedocs.projects.models import Project
 
 log = structlog.get_logger(__name__)
 
@@ -45,15 +44,26 @@ class HomepageView(TemplateView):
     template_name = 'homepage.html'
 
     def get(self, request, *args, **kwargs):
+        # Redirect to login page for new dashboard
         if settings.RTD_EXT_THEME_ENABLED:
             return redirect(reverse("account_login"))
-        return super().get(request, *args, **kwargs)
 
-    def get_context_data(self, **kwargs):
-        """Add latest builds and featured projects."""
-        context = super().get_context_data(**kwargs)
-        context['featured_list'] = Project.objects.filter(featured=True)
-        return context
+        # Redirect to user dashboard for logged in users
+        if request.user.is_authenticated:
+            return redirect("projects_dashboard")
+
+        # Redirect to ``about.`` in production
+        if not settings.DEBUG:
+            query_string = "?ref=dotorg-homepage"
+            if request.META["QUERY_STRING"]:
+                # Small hack to not append `&` to URLs without a query_string
+                query_string += "&" + request.META["QUERY_STRING"]
+            return redirect(
+                f"https://about.readthedocs.com{query_string}", permanent=False
+            )
+
+        # Show the homepage for local dev
+        return super().get(request, *args, **kwargs)
 
 
 class SupportView(PrivateViewMixin, TemplateView):

readthedocs/rtd_tests/tests/test_privacy.py

@@ -70,7 +70,7 @@ def _create_kong(
 
     def test_private_repo(self):
         """Check that private projects don't show up in: builds, downloads,
-        detail, homepage
+        detail
 
         """
         self._create_kong('private', 'private')
@@ -88,8 +88,6 @@ def test_private_repo(self):
         self.assertEqual(r.status_code, 200)
 
         self.client.login(username='tester', password='test')
-        r = self.client.get('/')
-        self.assertNotContains(r, 'Django Kong')
         r = self.client.get('/projects/django-kong/')
         self.assertEqual(r.status_code, 404)
         r = self.client.get('/projects/django-kong/builds/')

readthedocs/rtd_tests/tests/test_views.py

@@ -3,7 +3,6 @@
 from urllib.parse import urlsplit
 
 from django.contrib.auth.models import User
-from django.core.cache import cache
 from django.test import TestCase, override_settings
 from django.urls import reverse
 from django.utils import timezone
@@ -437,22 +436,3 @@ def test_generated_csv_data(self):
             self.assertEqual(body[0][0], 'Created Date')
             self.assertEqual(body[1][1], 'advertising')
             self.assertEqual(body[-1][1], 'hello world')
-
-
-class TestHomepageCache(TestCase):
-
-    def setUp(self):
-        cache.clear()
-
-    def tearDown(self):
-        cache.clear()
-
-    def test_homepage_queries(self):
-        with self.assertNumQueries(1):
-            r = self.client.get('/')
-            self.assertEqual(r.status_code, 200)
-
-        # Cache
-        with self.assertNumQueries(0):
-            r = self.client.get('/')
-            self.assertEqual(r.status_code, 200)

readthedocs/templates/homepage.html

@@ -116,24 +116,6 @@ <h3>{% trans "Multiple versions" %}</h3>
     {% include "core/widesearchbar.html" with form_action=search_form_action %}
   </section>
 
-  {% get_current_language as language %}
-  {% cache 600 homepage_featured_list language %}
-  {% if featured_list %}
-    <!-- BEGIN projects list -->
-    <section>
-      <h3>{% trans "Featured Projects" %}</h3>
-      <div class="module-list">
-        <div class="module-list-wrapper">
-          <ul style="margin-bottom: 0">
-            {% include "core/project_list_featured.html" %}
-          </ul>
-        </div>
-      </div>
-    </section>
-    <!-- END projects list -->
-  {% endif %}
-  {% endcache %}
-
   <section>
     <h2>{% trans 'About Read the Docs' %}</h2>