Integrate activity into django

Use templates for static content, including new basic front page. Also remove unnecessary auth processor. Related to coala#27
jayvdb · Dec 10, 2017 · 6a835c9 · 6a835c9
1 parent 66b7505
commit 6a835c9
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,4 @@ after_success:
   - python activity/scraper.py
   - python manage.py collectstatic --noinput
   - python manage.py distill-local public --force
-  - mkdir public/activity
-  - cp activity/index.html public/activity/
   - ./.ci/deploy.sh
diff --git a/community/settings.py b/community/settings.py
@@ -50,13 +50,14 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        'DIRS': [
+            os.path.join(BASE_DIR, 'templates'),
+        ],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
                 'django.template.context_processors.debug',
                 'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
             ],
         },

diff --git a/community/urls.py b/community/urls.py
@@ -5,7 +5,9 @@
 from django_distill import distill_url
 from django.conf.urls.static import static
 from django.conf import settings
-from gci.views import index
+from django.views.generic import TemplateView
+
+from gci.views import index as gci_index
 
 
 def get_index():
@@ -16,9 +18,21 @@ def get_index():
 
 urlpatterns = [
     distill_url(
-        r'^$', index,
-        name='community-gci',
+        r'^$', TemplateView.as_view(template_name='index.html'),
+        name='index',
         distill_func=get_index,
         distill_file='index.html',
     ),
+    distill_url(
+        r'activity/', TemplateView.as_view(template_name='activity.html'),
+        name='activity',
+        distill_func=get_index,
+        distill_file='activity/index.html',
+    ),
+    distill_url(
+        r'gci/', gci_index,
+        name='community-gci',
+        distill_func=get_index,
+        distill_file='gci/index.html',
+    ),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/activity/index.html → templates/activity.html b/activity/index.html → templates/activity.html
diff --git a/templates/index.html b/templates/index.html
@@ -0,0 +1,7 @@
+<title>Community website</title>
+<body>
+<ul>
+    <li><a href="/gci/">Google Code-in</a>
+    <li><a href="/activity/">GitHub activity</a>
+</ul>
+</body>