Activation Failed
+Sorry, we couldn't activate your account.
+{{ activation_error.message }}
+ {% endcol %} +{% endrow %} +{% endblock %} diff --git a/blango_auth/templates/blango_auth/django_registration/activation_complete.txt b/blango_auth/templates/blango_auth/django_registration/activation_complete.txt new file mode 100644 index 0000000000..0aa403fca1 --- /dev/null +++ b/blango_auth/templates/blango_auth/django_registration/activation_complete.txt @@ -0,0 +1,12 @@ +{% extends "base.html" %} +{% load crispy_forms_tags blog_extras %} +{% block title %}Activation Complete{% endblock %} +{% block content %} +{% row "justify-content-center" %} + {% col "col-md-6" %} +Activation Complete
+Your account is now activated! You can now log in and use Blango.
+ + {% endcol %} +{% endrow %} +{% endblock %} diff --git a/blango_auth/templates/blango_auth/django_registration/activation_email_subject.txt b/blango_auth/templates/blango_auth/django_registration/activation_email_subject.txt new file mode 100644 index 0000000000..28cb171627 --- /dev/null +++ b/blango_auth/templates/blango_auth/django_registration/activation_email_subject.txt @@ -0,0 +1 @@ +Activate your Blango account! You have {{ expiration_days }} days! diff --git a/blango_auth/templates/blango_auth/django_registration/registration_closed.html b/blango_auth/templates/blango_auth/django_registration/registration_closed.html new file mode 100644 index 0000000000..e52f0ee429 --- /dev/null +++ b/blango_auth/templates/blango_auth/django_registration/registration_closed.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} +{% load crispy_forms_tags blog_extras %} +{% block title %}Registration Closed{% endblock %} +{% block content %} +{% row "justify-content-center" %} + {% col "col-md-6" %} +Registration is currently closed
+ {% endcol %} +{% endrow %} +{% endblock %} diff --git a/blango_auth/templates/blango_auth/django_registration/registration_complete.html b/blango_auth/templates/blango_auth/django_registration/registration_complete.html new file mode 100644 index 0000000000..9050bc8b19 --- /dev/null +++ b/blango_auth/templates/blango_auth/django_registration/registration_complete.html @@ -0,0 +1,11 @@ +{% extends "base.html" %} +{% load crispy_forms_tags blog_extras %} +{% block title %}Registration Successful{% endblock %} +{% block content %} +{% row "justify-content-center" %} + {% col "col-md-6" %} +Your registration was successful
+Check your email to validate your account.
+ {% endcol %} +{% endrow %} +{% endblock %} diff --git a/blango_auth/templates/blango_auth/django_registration/registration_form.html b/blango_auth/templates/blango_auth/django_registration/registration_form.html new file mode 100644 index 0000000000..962ef2c759 --- /dev/null +++ b/blango_auth/templates/blango_auth/django_registration/registration_form.html @@ -0,0 +1,11 @@ +{% extends "base.html" %} +{% load crispy_forms_tags blog_extras %} +{% block title %}Register for Blango{% endblock %} +{% block content %} +{% row "justify-content-center" %} + {% col "col-md-6" %} +Register for Blango
+ {% crispy form %} + {% endcol %} +{% endrow %} +{% endblock %} diff --git a/blango_auth/templates/blango_auth/profile.html b/blango_auth/templates/blango_auth/profile.html new file mode 100644 index 0000000000..c5cf4aadb7 --- /dev/null +++ b/blango_auth/templates/blango_auth/profile.html @@ -0,0 +1,11 @@ +{% extends "base.html" %} +{% load blog_extras %} +{% block title %}Blango Profile{% endblock %} +{% block content %} +{% row %} + {% col %} +Logged in as {{ request.user }}.
+ + {% endcol %} +{% endrow %} +{% endblock content %} diff --git a/blango_auth/templates/registration/login.html b/blango_auth/templates/registration/login.html new file mode 100644 index 0000000000..bc845a8814 --- /dev/null +++ b/blango_auth/templates/registration/login.html @@ -0,0 +1,30 @@ +{% extends "base.html" %} +{% load crispy_forms_tags blog_extras %} +{% block title %}Log In to Blango{% endblock %} +{% block content %} + + {% if next %} + {% if user.is_authenticated %} +Your account doesn't have access to this page. To proceed, + please login with an account that has access.
+ {% else %} +Please login to see this page.
+ {% endif %} + {% endif %} + + + + + + + + + +{% endblock %} diff --git a/blango_auth/tests.py b/blango_auth/tests.py new file mode 100644 index 0000000000..7ce503c2dd --- /dev/null +++ b/blango_auth/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/blango_auth/views.py b/blango_auth/views.py new file mode 100644 index 0000000000..84fb12280d --- /dev/null +++ b/blango_auth/views.py @@ -0,0 +1,7 @@ +from django.contrib.auth.decorators import login_required +from django.shortcuts import render + + +@login_required +def profile(request): + return render(request, "blango_auth/profile.html") diff --git a/blog/__init__.py b/blog/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/blog/__pycache__/__init__.cpython-36.pyc b/blog/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000000..f591ca21b5 Binary files /dev/null and b/blog/__pycache__/__init__.cpython-36.pyc differ diff --git a/blog/__pycache__/admin.cpython-36.pyc b/blog/__pycache__/admin.cpython-36.pyc new file mode 100644 index 0000000000..af514f04f9 Binary files /dev/null and b/blog/__pycache__/admin.cpython-36.pyc differ diff --git a/blog/__pycache__/api_urls.cpython-36.pyc b/blog/__pycache__/api_urls.cpython-36.pyc new file mode 100644 index 0000000000..ab3dad7b8e Binary files /dev/null and b/blog/__pycache__/api_urls.cpython-36.pyc differ diff --git a/blog/__pycache__/api_views.cpython-36.pyc b/blog/__pycache__/api_views.cpython-36.pyc new file mode 100644 index 0000000000..1bd581b173 Binary files /dev/null and b/blog/__pycache__/api_views.cpython-36.pyc differ diff --git a/blog/__pycache__/apps.cpython-36.pyc b/blog/__pycache__/apps.cpython-36.pyc new file mode 100644 index 0000000000..48678c5c77 Binary files /dev/null and b/blog/__pycache__/apps.cpython-36.pyc differ diff --git a/blog/__pycache__/models.cpython-36.pyc b/blog/__pycache__/models.cpython-36.pyc new file mode 100644 index 0000000000..db50908f38 Binary files /dev/null and b/blog/__pycache__/models.cpython-36.pyc differ diff --git a/blog/__pycache__/test_post_api.cpython-36.pyc b/blog/__pycache__/test_post_api.cpython-36.pyc new file mode 100644 index 0000000000..1404be17af Binary files /dev/null and b/blog/__pycache__/test_post_api.cpython-36.pyc differ diff --git a/blog/__pycache__/test_tag_api.cpython-36.pyc b/blog/__pycache__/test_tag_api.cpython-36.pyc new file mode 100644 index 0000000000..46e410192e Binary files /dev/null and b/blog/__pycache__/test_tag_api.cpython-36.pyc differ diff --git a/blog/__pycache__/tests.cpython-36.pyc b/blog/__pycache__/tests.cpython-36.pyc new file mode 100644 index 0000000000..429c4b600a Binary files /dev/null and b/blog/__pycache__/tests.cpython-36.pyc differ diff --git a/blog/__pycache__/views.cpython-36.pyc b/blog/__pycache__/views.cpython-36.pyc new file mode 100644 index 0000000000..017151da60 Binary files /dev/null and b/blog/__pycache__/views.cpython-36.pyc differ diff --git a/blog/admin.py b/blog/admin.py new file mode 100644 index 0000000000..02c9b965f8 --- /dev/null +++ b/blog/admin.py @@ -0,0 +1,16 @@ +from django.contrib import admin +from blog.models import Tag, Post, Comment, AuthorProfile + + +# Register your models here. +admin.site.register(Tag) + +class PostAdmin(admin.ModelAdmin): + prepopulated_fields = {"slug": ("title",)} + +admin.site.register(Post, PostAdmin) +admin.site.register(Comment) +admin.site.register(AuthorProfile) + + + diff --git a/blog/api/__init__.py b/blog/api/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/blog/api/__pycache__/__init__.cpython-36.pyc b/blog/api/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000000..f0594d0680 Binary files /dev/null and b/blog/api/__pycache__/__init__.cpython-36.pyc differ diff --git a/blog/api/__pycache__/filters.cpython-36.pyc b/blog/api/__pycache__/filters.cpython-36.pyc new file mode 100644 index 0000000000..ce068c7819 Binary files /dev/null and b/blog/api/__pycache__/filters.cpython-36.pyc differ diff --git a/blog/api/__pycache__/permission.cpython-36.pyc b/blog/api/__pycache__/permission.cpython-36.pyc new file mode 100644 index 0000000000..2820775988 Binary files /dev/null and b/blog/api/__pycache__/permission.cpython-36.pyc differ diff --git a/blog/api/__pycache__/serializers.cpython-36.pyc b/blog/api/__pycache__/serializers.cpython-36.pyc new file mode 100644 index 0000000000..624f160b57 Binary files /dev/null and b/blog/api/__pycache__/serializers.cpython-36.pyc differ diff --git a/blog/api/__pycache__/throttling.cpython-36.pyc b/blog/api/__pycache__/throttling.cpython-36.pyc new file mode 100644 index 0000000000..f1bd8fe3a6 Binary files /dev/null and b/blog/api/__pycache__/throttling.cpython-36.pyc differ diff --git a/blog/api/__pycache__/urls.cpython-36.pyc b/blog/api/__pycache__/urls.cpython-36.pyc new file mode 100644 index 0000000000..1a9fd37916 Binary files /dev/null and b/blog/api/__pycache__/urls.cpython-36.pyc differ diff --git a/blog/api/__pycache__/views.cpython-36.pyc b/blog/api/__pycache__/views.cpython-36.pyc new file mode 100644 index 0000000000..a0b30597eb Binary files /dev/null and b/blog/api/__pycache__/views.cpython-36.pyc differ diff --git a/blog/api/filters.py b/blog/api/filters.py new file mode 100644 index 0000000000..592f87c848 --- /dev/null +++ b/blog/api/filters.py @@ -0,0 +1,31 @@ +from django_filters import rest_framework as filters + +from blog.models import Post + + +class PostFilterSet(filters.FilterSet): + published_from = filters.DateFilter( + field_name="published_at", lookup_expr="gte", label="Published Date From" + ) + published_to = filters.DateFilter( + field_name="published_at", lookup_expr="lte", label="Published Date To" + ) + author_email = filters.CharFilter( + field_name="author__email", + lookup_expr="icontains", + label="Author Email Contains", + ) + summary = filters.CharFilter( + field_name="summary", + lookup_expr="icontains", + label="Summary Contains", + ) + content = filters.CharFilter( + field_name="content", + lookup_expr="icontains", + label="Content Contains", + ) + + class Meta: + model = Post + fields = ["author", "tags"] diff --git a/blog/api/permission.py b/blog/api/permission.py new file mode 100644 index 0000000000..3eab033d21 --- /dev/null +++ b/blog/api/permission.py @@ -0,0 +1,9 @@ +from rest_framework import permissions + + +class AuthorModifyOrReadOnly(permissions.IsAuthenticatedOrReadOnly): + def has_object_permission(self, request, view, obj): + if request.method in permissions.SAFE_METHODS: + return True + + return request.user == obj.author diff --git a/blog/api/serializers.py b/blog/api/serializers.py new file mode 100644 index 0000000000..d35a939516 --- /dev/null +++ b/blog/api/serializers.py @@ -0,0 +1,73 @@ +from rest_framework import serializers +from blog.models import Post, Tag, Comment + +from blango_auth.models import User +from versatileimagefield.serializers import VersatileImageFieldSerializer + + +class PostSerializer(serializers.ModelSerializer): + hero_image = VersatileImageFieldSerializer( + sizes=[ + ("full_size", "url"), + ("thumbnail", "thumbnail__100x100"), + ("square_crop", "crop__200x200"), + ], + read_only=True, + ) + class Meta: + model = Post + #fields = "__all__" + readonly = ["modified_at", "created_at"] + exclude = ["ppoi"] + + + +class UserSerializer(serializers.ModelSerializer): + class Meta: + model = User + fields = ["first_name", "last_name", "email"] + + +class CommentSerializer(serializers.ModelSerializer): + id = serializers.IntegerField(required=False) + creator = UserSerializer(read_only=True) + + class Meta: + model = Comment + fields = ["id", "creator", "content", "modified_at", "created_at"] + readonly = ["modified_at", "created_at"] + +class PostDetailSerializer(PostSerializer): + comments = CommentSerializer(many=True) + + def update(self, instance, validated_data): + comments = validated_data.pop("comments") + + instance = super(PostDetailSerializer, self).update(instance, validated_data) + + for comment_data in comments: + if comment_data.get("id"): + # comment has an ID so was pre-existing + continue + comment = Comment(**comment_data) + comment.creator = self.context["request"].user + comment.content_object = instance + comment.save() + + return instance + + + + +class TagField(serializers.SlugRelatedField): + def to_internal_value(self, data): + try: + return self.get_queryset().get_or_create(value=data.lower())[0] + except (TypeError, ValueError): + self.fail(f"Tag value {data} is invalid") + + +class TagSerializer(serializers.ModelSerializer): + class Meta: + model = Tag + fields = "__all__" diff --git a/blog/api/throttling.py b/blog/api/throttling.py new file mode 100644 index 0000000000..f4eda89760 --- /dev/null +++ b/blog/api/throttling.py @@ -0,0 +1,17 @@ +from rest_framework.throttling import AnonRateThrottle, UserRateThrottle + + +class AnonSustainedThrottle(AnonRateThrottle): + scope = "anon_sustained" + + +class AnonBurstThrottle(AnonRateThrottle): + scope = "anon_burst" + + +class UserSustainedThrottle(UserRateThrottle): + scope = "user_sustained" + + +class UserBurstThrottle(UserRateThrottle): + scope = "user_burst" diff --git a/blog/api/urls.py b/blog/api/urls.py new file mode 100644 index 0000000000..12bc557c89 --- /dev/null +++ b/blog/api/urls.py @@ -0,0 +1,75 @@ +from django.urls import path, include +from rest_framework.urlpatterns import format_suffix_patterns +from rest_framework.authtoken import views +from blog.api.views import PostList, PostDetail, UserDetail +from django.urls import path, include, re_path +from drf_yasg import openapi +from drf_yasg.views import get_schema_view +from rest_framework.routers import DefaultRouter +from blog.api.views import PostList, PostDetail, UserDetail, TagViewSet +from blog.api.views import UserDetail, TagViewSet, PostViewSet +from rest_framework_simplejwt.views import TokenObtainPairView, TokenRefreshView + + +import os + + +router = DefaultRouter() +router.register("tags", TagViewSet) +router.register("posts", PostViewSet) + + +schema_view = get_schema_view( + openapi.Info( + title="Blango API", + default_version="v1", + description="API for Blango Blog", + ), + url=f"https://{os.environ.get('CODIO_HOSTNAME')}-8000.codio.io/api/v1/", + public=True, +) + + +urlpatterns = [ + path("posts/", PostList.as_view(), name="api_post_list"), + path("posts/| Title | +Image | +Tags | +Slug | +Summary | +Link | +
|---|
+
+
+ {% block content %}
+
+ {% endblock %}
+
+
+
+
+
diff --git a/blog/templates/blog/index.html b/blog/templates/blog/index.html
new file mode 100644
index 0000000000..7da2955fd4
--- /dev/null
+++ b/blog/templates/blog/index.html
@@ -0,0 +1,30 @@
+{% extends "base.html" %}
+
+
+
+{% block content %}
+{% load blog_extras %}
+ Blog Posts
+ {% for post in posts %} +
+
+ {% endfor %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/blog/templates/blog/post-table.html b/blog/templates/blog/post-table.html
new file mode 100644
index 0000000000..49e1a3c74d
--- /dev/null
+++ b/blog/templates/blog/post-table.html
@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+{% load static %}
+{% block content %}
+{% block title %}Post Table{% endblock %}
+
+
+ 
+ {% endif %}
+
+
+ {{ post.title }}
+ By {{ post.author|author_details:request.user }} on {{ post.published_at|date:"M, d Y" }} +{{ post.summary }}
++ ({{ post.content|wordcount }} words) + Read More +
+ {% if post.hero_image %} +
+
+
+
+
+
+
+
+
+{% endblock %}
diff --git a/blog/templatetags/__init__.py b/blog/templatetags/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/blog/templatetags/__pycache__/__init__.cpython-36.pyc b/blog/templatetags/__pycache__/__init__.cpython-36.pyc
new file mode 100644
index 0000000000..ef4778ea80
Binary files /dev/null and b/blog/templatetags/__pycache__/__init__.cpython-36.pyc differ
diff --git a/blog/templatetags/__pycache__/blog_extras.cpython-36.pyc b/blog/templatetags/__pycache__/blog_extras.cpython-36.pyc
new file mode 100644
index 0000000000..4bee88e944
Binary files /dev/null and b/blog/templatetags/__pycache__/blog_extras.cpython-36.pyc differ
diff --git a/blog/templatetags/blog_extras.py b/blog/templatetags/blog_extras.py
new file mode 100644
index 0000000000..068c458bbe
--- /dev/null
+++ b/blog/templatetags/blog_extras.py
@@ -0,0 +1,36 @@
+from django import template
+register = template.Library()
+from django.utils.html import format_html
+
+from django.contrib.auth import get_user_model
+user_model = get_user_model()
+import logging
+
+logger = logging.getLogger(__name__)
+
+@register.filter
+def author_details(author, current_user):
+ # logger.debug("Loaded %d recent posts for post %d", len(author), author.id)
+
+ if not isinstance(author, user_model):
+ # return empty string as safe default
+ return ""
+
+ if author == current_user:
+ return format_html("me")
+
+ if author.first_name and author.last_name:
+ name = f"{author.first_name} {author.last_name}"
+ else:
+ name = f"{author.username}"
+
+ if author.email:
+ prefix = format_html('', author.email)
+ suffix = format_html("")
+ else:
+ prefix = ""
+ suffix = ""
+
+ return format_html('{}{}{}', prefix, name, suffix)
+
+
diff --git a/blog/test_post_api.py b/blog/test_post_api.py
new file mode 100644
index 0000000000..79124fa215
--- /dev/null
+++ b/blog/test_post_api.py
@@ -0,0 +1,105 @@
+from datetime import datetime
+
+from django.contrib.auth import get_user_model
+from django.test import TestCase
+from django.utils import timezone
+from pytz import UTC
+from rest_framework.authtoken.models import Token
+from rest_framework.test import APIClient
+
+from blog.models import Post
+
+
+class PostApiTestCase(TestCase):
+
+ def setUp(self):
+ self.u1 = get_user_model().objects.create_user(
+ email="test@example.com", password="password"
+ )
+
+ self.u2 = get_user_model().objects.create_user(
+ email="test2@example.com", password="password2"
+ )
+
+ posts = [
+ Post.objects.create(
+ author=self.u1,
+ published_at=timezone.now(),
+ title="Post 1 Title",
+ slug="post-1-slug",
+ summary="Post 1 Summary",
+ content="Post 1 Content",
+ ),
+ Post.objects.create(
+ author=self.u2,
+ published_at=timezone.now(),
+ title="Post 2 Title",
+ slug="post-2-slug",
+ summary="Post 2 Summary",
+ content="Post 2 Content",
+ ),
+ ]
+
+ # let us look up the post info by ID
+ self.post_lookup = {p.id: p for p in posts}
+
+ # override test client
+ self.client = APIClient()
+ token = Token.objects.create(user=self.u1)
+ self.client.credentials(HTTP_AUTHORIZATION="Token " + token.key)
+
+ def test_post_list(self):
+ resp = self.client.get("/api/v1/posts/")
+ data = resp.json()["results"]
+ self.assertEqual(len(data), 1)
+
+ for post_dict in data:
+ print(post_dict)
+ post_obj = self.post_lookup[post_dict["id"]]
+ self.assertEqual(post_obj.title, post_dict["title"])
+ self.assertEqual(post_obj.slug, post_dict["slug"])
+ self.assertEqual(post_obj.summary, post_dict["summary"])
+ self.assertEqual(post_obj.content, post_dict["content"])
+ self.assertTrue(
+ post_dict["author"].endswith(f"/api/v1/users/{post_obj.author.email}")
+ )
+ self.assertEqual(
+ post_obj.published_at,
+ datetime.strptime(
+ post_dict["published_at"], "%Y-%m-%dT%H:%M:%S.%fZ"
+ ).replace(tzinfo=UTC),
+ )
+
+ def test_unauthenticated_post_create(self):
+ # unset credentials so we are an anonymous user
+ self.client.credentials()
+ post_dict = {
+ "title": "Test Post",
+ "slug": "test-post-3",
+ "summary": "Test Summary",
+ "content": "Test Content",
+ "author": "http://testserver/api/v1/users/test@example.com",
+ "published_at": "2021-01-10T09:00:00Z",
+ }
+ resp = self.client.post("/api/v1/posts/", post_dict)
+ self.assertEqual(resp.status_code, 401)
+ self.assertEqual(Post.objects.all().count(), 1)
+
+ def test_post_create(self):
+ post_dict = {
+ "title": "Test Post",
+ "slug": "test-post-3",
+ "summary": "Test Summary",
+ "content": "Test Content",
+ "author": "http://testserver/api/v1/users/test@example.com",
+ "published_at": "2021-01-10T09:00:00Z",
+ }
+ resp = self.client.post("/api/v1/posts/", post_dict)
+ post_id = resp.json()["id"]
+ post = Post.objects.get(pk=post_id)
+ self.assertEqual(post.title, post_dict["title"])
+ self.assertEqual(post.slug, post_dict["slug"])
+ self.assertEqual(post.summary, post_dict["summary"])
+ self.assertEqual(post.content, post_dict["content"])
+ self.assertEqual(post.author, self.u1)
+ self.assertEqual(post.published_at, datetime(2021, 1, 10, 9, 0, 0, tzinfo=UTC))
diff --git a/blog/test_tag_api.py b/blog/test_tag_api.py
new file mode 100644
index 0000000000..f4f6f3f0f3
--- /dev/null
+++ b/blog/test_tag_api.py
@@ -0,0 +1,46 @@
+from django.test import LiveServerTestCase
+from requests.auth import HTTPBasicAuth
+from rest_framework.test import RequestsClient
+
+from django.contrib.auth import get_user_model
+from blog.models import Tag
+
+
+class TagApiTestCase(LiveServerTestCase):
+ def setUp(self):
+ get_user_model().objects.create_user(
+ email="testuser@example.com", password="password"
+ )
+
+ self.tag_values = {"tag1", "tag2", "tag3", "tag4"}
+ for t in self.tag_values:
+ Tag.objects.create(value=t)
+ self.client = RequestsClient()
+
+ def test_tag_list(self):
+ resp = self.client.get(self.live_server_url + "/api/v1/tags/")
+ self.assertEqual(resp.status_code, 200)
+ data = resp.json()["results"]
+ self.assertEqual(len(data), 4)
+ self.assertEqual(self.tag_values, {t["value"] for t in data})
+
+ def test_tag_create_basic_auth(self):
+ self.client.auth = HTTPBasicAuth("testuser@example.com", "password")
+ resp = self.client.post(
+ self.live_server_url + "/api/v1/tags/", {"value": "tag5"}
+ )
+ self.assertEqual(resp.status_code, 201)
+ self.assertEqual(Tag.objects.all().count(), 5)
+
+ def test_tag_create_token_auth(self):
+ token_resp = self.client.post(
+ self.live_server_url + "/api/v1/token-auth/",
+ {"username": "testuser@example.com", "password": "password"},
+ )
+ self.client.headers["Authorization"] = "Token " + token_resp.json()["token"]
+
+ resp = self.client.post(
+ self.live_server_url + "/api/v1/tags/", {"value": "tag5"}
+ )
+ self.assertEqual(resp.status_code, 201)
+ self.assertEqual(Tag.objects.all().count(), 5)
diff --git a/blog/tests.py b/blog/tests.py
new file mode 100644
index 0000000000..7ce503c2dd
--- /dev/null
+++ b/blog/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/blog/urls.py b/blog/urls.py
new file mode 100644
index 0000000000..4a842e5787
--- /dev/null
+++ b/blog/urls.py
@@ -0,0 +1,7 @@
+# # other imports
+# import blog.views
+
+# urlpatterns = [
+# # other patterns
+# path("", blog.views.index)
+# ]
diff --git a/blog/views.py b/blog/views.py
new file mode 100644
index 0000000000..a3cf2163a6
--- /dev/null
+++ b/blog/views.py
@@ -0,0 +1,55 @@
+from django.shortcuts import render
+# from .models import Post
+from django.utils import timezone
+from blog.models import Post
+
+import logging
+logger = logging.getLogger(__name__)
+from blog.models import Post
+from django.views.decorators.cache import cache_page
+from django.views.decorators.vary import vary_on_headers
+from django.utils import timezone
+from django.urls import reverse
+
+# Create your views here.
+
+# def index(request):
+# return render(request, "blog/index.html")
+# @cache_page(300)
+# @vary_on_headers("Cookie")
+# def index(request):
+# from django.http import HttpResponse
+# return HttpResponse(str(request.user).encode("ascii"))
+# posts = Post.objects.filter(published_at__lte=timezone.now())
+# logger.debug("Got %d posts", len(posts))
+# return render(request, "blog/index.html", {"posts": posts})
+
+
+def index(request):
+ posts = Post.objects.filter(published_at__lte=timezone.now()).select_related("author")
+
+ # posts = (
+ # Post.objects.filter(published_at__lte=timezone.now())
+ # .select_related("author")
+ # .defer("created_at", "modified_at")
+# )
+
+
+
+
+ # logger.debug("Got %d posts", (posts))
+ return render(request, "blog/index.html", {"posts": posts})
+
+
+def get_ip(request):
+ from django.http import HttpResponse
+ return HttpResponse(request.META['REMOTE_ADDR'])
+
+# def post_table(request):
+# return render(request, "blog/post-table.html")
+
+
+def post_table(request):
+ return render(
+ request, "blog/post-table.html", {"post_list_url": reverse("post-list")}
+ )
diff --git a/data.json b/data.json
new file mode 100644
index 0000000000..6fcbb977e4
--- /dev/null
+++ b/data.json
@@ -0,0 +1 @@
+[{"model": "blog.comment", "pk": 1, "fields": {"creator": 1, "content": "What a great post!", "content_type": 8, "object_id": 1, "created_at": "2023-12-26T14:43:20.297Z", "modified_at": "2023-12-26T14:43:20.312Z"}}, {"model": "blog.comment", "pk": 2, "fields": {"creator": 1, "content": "I like myself!", "content_type": 4, "object_id": 1, "created_at": "2023-12-26T14:43:20.297Z", "modified_at": "2023-12-26T14:43:20.312Z"}}, {"model": "blog.comment", "pk": 3, "fields": {"creator": 1, "content": "Thank you for reading my post!", "content_type": 8, "object_id": 1, "created_at": "2024-01-01T13:47:03.001Z", "modified_at": "2024-01-01T13:47:03.001Z"}}, {"model": "blog.comment", "pk": 4, "fields": {"creator": 2, "content": "Thank you for reading my post!", "content_type": 8, "object_id": 2, "created_at": "2024-01-01T13:47:03.001Z", "modified_at": "2024-01-01T13:47:03.001Z"}}, {"model": "blog.tag", "pk": 1, "fields": {"value": "django"}}, {"model": "blog.tag", "pk": 2, "fields": {"value": "example"}}, {"model": "blog.post", "pk": 1, "fields": {"author": 1, "created_at": "2023-12-26T14:47:03.829Z", "modified_at": "2023-12-26T14:47:03.829Z", "title": "title", "slug": "test", "summary": "summary", "content": "content", "published_at": null, "tags": [1, 2]}}, {"model": "blog.post", "pk": 2, "fields": {"author": 2, "created_at": "2023-12-26T14:47:52.578Z", "modified_at": "2023-12-26T14:47:52.578Z", "title": "Thiru", "slug": "Thiru", "summary": "If you don’t already have some test Blog data added, you should log to the Django admin and add a couple of posts, and another user as an extra author. This will come in handy later.", "content": "Provided you’ve done this and have some test data, when you start the Django dev server and navigate to the main page you should see something like this:", "published_at": null, "tags": [1, 2]}}, {"model": "blog.post", "pk": 3, "fields": {"author": 2, "created_at": "2024-01-01T13:48:31.575Z", "modified_at": "2024-01-01T13:48:31.575Z", "title": "title", "slug": "test", "summary": "summary", "content": "content", "published_at": "2024-01-01T13:48:20Z", "tags": [1, 2]}}, {"model": "auth.user", "pk": 1, "fields": {"password": "pbkdf2_sha256$260000$Vb3Nzqn4v5Fh1KC2VbVR6J$J/F+J8DRBt0BgTmbdH8Ah0sVxtny3E0uXRhPHgPjcy8=", "last_login": null, "is_superuser": true, "username": "codio", "first_name": "", "last_name": "", "email": "", "is_staff": true, "is_active": true, "date_joined": "2023-12-22T00:57:16.353Z", "groups": [], "user_permissions": []}}, {"model": "auth.user", "pk": 2, "fields": {"password": "argon2$argon2id$v=19$m=102400,t=2,p=8$OUhTUkNXc0tVZ3Y2bFhlWGJmUm1xMg$UUWqV9jKQG5J0/a41CEIAg", "last_login": "2024-01-01T13:47:51.013Z", "is_superuser": true, "username": "thiru", "first_name": "Thiruvalluvan", "last_name": "Murugesan", "email": "m.thiruvalluvar@gmail.com", "is_staff": true, "is_active": true, "date_joined": "2023-12-22T00:57:50Z", "groups": [], "user_permissions": []}}]
\ No newline at end of file
diff --git a/db.sqlite3 b/db.sqlite3
new file mode 100644
index 0000000000..a3aa0361fd
Binary files /dev/null and b/db.sqlite3 differ
diff --git a/manage.py b/manage.py
index c66b327f71..8fbae3230d 100644
--- a/manage.py
+++ b/manage.py
@@ -7,6 +7,8 @@
def main():
"""Run administrative tasks."""
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'blango.settings')
+ os.environ.setdefault("DJANGO_CONFIGURATION", "Dev")
+
try:
from django.core.management import execute_from_command_line
except ImportError as exc:
diff --git a/media/__sized__/hero_images/data_insights-thumbnail-100x100.png b/media/__sized__/hero_images/data_insights-thumbnail-100x100.png
new file mode 100644
index 0000000000..e39bb9f151
Binary files /dev/null and b/media/__sized__/hero_images/data_insights-thumbnail-100x100.png differ
diff --git a/media/__sized__/hero_images/data_insights-thumbnail-300x300.png b/media/__sized__/hero_images/data_insights-thumbnail-300x300.png
new file mode 100644
index 0000000000..cd25311326
Binary files /dev/null and b/media/__sized__/hero_images/data_insights-thumbnail-300x300.png differ
diff --git a/media/hero_images/data_insights.png b/media/hero_images/data_insights.png
new file mode 100644
index 0000000000..8056834d73
Binary files /dev/null and b/media/hero_images/data_insights.png differ
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000000..93cec39d90
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,55 @@
+argon2-cffi==20.1.0
+asgiref==3.4.1
+asn1crypto==0.24.0
+certifi==2018.1.18
+cffi==1.14.6
+chardet==3.0.4
+confusable-homoglyphs==3.2.0
+crispy-bootstrap5==0.4
+cryptography==3.4.8
+decorator==4.1.2
+defusedxml==0.7.1
+dj-database-url==0.5.0
+Django==3.2.6
+django-allauth==0.45.0
+django-configurations==2.2
+django-crispy-forms==1.12.0
+django-debug-toolbar==3.2.2
+django-registration==3.2
+djangorestframework==3.12.4
+drf-yasg==1.21.7
+idna==2.6
+inflection==0.5.1
+ipython==5.5.0
+ipython_genutils==0.2.0
+keyring==10.6.0
+keyrings.alt==3.0
+netifaces==0.10.4
+oauthlib==3.1.1
+packaging==21.3
+pexpect==4.2.1
+pickleshare==0.7.4
+prompt-toolkit==1.0.15
+pycparser==2.20
+pycrypto==2.6.1
+Pygments==2.2.0
+PyGObject==3.26.1
+PyJWT==2.1.0
+pyparsing==3.1.1
+python-apt==1.6.5+ubuntu0.3
+python3-openid==3.2.0
+pytz==2021.1
+pyxdg==0.25
+PyYAML==6.0.1
+requests==2.18.4
+requests-oauthlib==1.3.0
+SecretStorage==2.3.1
+simplegeneric==0.8.1
+six==1.16.0
+sqlparse==0.4.1
+ssh-import-id==5.7
+traitlets==4.3.2
+typing-extensions==3.10.0.1
+uritemplate==4.1.1
+urllib3==1.22
+wcwidth==0.1.7
+
+
+