Logged in as {{ request.user }}.
+ +{% endcol %} +{% endrow %} +{% endblock content %} \ No newline at end of file diff --git a/blango_auth/templates/registration/login.html b/blango_auth/templates/registration/login.html new file mode 100644 index 0000000000..2b2f392f9f --- /dev/null +++ b/blango_auth/templates/registration/login.html @@ -0,0 +1,31 @@ +{% extends "base.html" %} +{% load crispy_forms_tags blog_extras %} +{% block title %}Log In to Blango{% endblock %} +{% block content %} +{% row "justify-content-center" %} +{% col "col-md-6" %} +{% 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 %} +{% endcol %} +{% endrow %} +{% row "justify-content-center" %} +{% col "col-md-6" %} + + +{% endcol %} +{% endrow %} +{% endblock %} \ No newline at end of file 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..36a76d2034 --- /dev/null +++ b/blango_auth/views.py @@ -0,0 +1,10 @@ +from django.shortcuts import render + +# Create your views here. +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-311.pyc b/blog/__pycache__/__init__.cpython-311.pyc new file mode 100644 index 0000000000..b4f9abca7f Binary files /dev/null and b/blog/__pycache__/__init__.cpython-311.pyc differ diff --git a/blog/__pycache__/admin.cpython-311.pyc b/blog/__pycache__/admin.cpython-311.pyc new file mode 100644 index 0000000000..11db98946e Binary files /dev/null and b/blog/__pycache__/admin.cpython-311.pyc differ diff --git a/blog/__pycache__/apps.cpython-311.pyc b/blog/__pycache__/apps.cpython-311.pyc new file mode 100644 index 0000000000..b452d18c5c Binary files /dev/null and b/blog/__pycache__/apps.cpython-311.pyc differ diff --git a/blog/__pycache__/forms.cpython-311.pyc b/blog/__pycache__/forms.cpython-311.pyc new file mode 100644 index 0000000000..4c1ed74350 Binary files /dev/null and b/blog/__pycache__/forms.cpython-311.pyc differ diff --git a/blog/__pycache__/models.cpython-311.pyc b/blog/__pycache__/models.cpython-311.pyc new file mode 100644 index 0000000000..4bcf19d77a Binary files /dev/null and b/blog/__pycache__/models.cpython-311.pyc differ diff --git a/blog/__pycache__/views.cpython-311.pyc b/blog/__pycache__/views.cpython-311.pyc new file mode 100644 index 0000000000..79071ce1c3 Binary files /dev/null and b/blog/__pycache__/views.cpython-311.pyc differ diff --git a/blog/admin.py b/blog/admin.py new file mode 100644 index 0000000000..c7631bbbf1 --- /dev/null +++ b/blog/admin.py @@ -0,0 +1,20 @@ +from django.contrib import admin + +# Register your models here. + + +from blog.models import Tag, Post, Comment, AuthorProfile + +class PostAdmin(admin.ModelAdmin): + prepopulated_fields = {"slug": ("title",)} + list_display = ('slug', 'published_at') + + + +admin.site.register(Tag) +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-311.pyc b/blog/api/__pycache__/__init__.cpython-311.pyc new file mode 100644 index 0000000000..bd8186ba5e Binary files /dev/null and b/blog/api/__pycache__/__init__.cpython-311.pyc differ diff --git a/blog/api/__pycache__/filters.cpython-311.pyc b/blog/api/__pycache__/filters.cpython-311.pyc new file mode 100644 index 0000000000..974a585a06 Binary files /dev/null and b/blog/api/__pycache__/filters.cpython-311.pyc differ diff --git a/blog/api/__pycache__/permissions.cpython-311.pyc b/blog/api/__pycache__/permissions.cpython-311.pyc new file mode 100644 index 0000000000..302f1d162a Binary files /dev/null and b/blog/api/__pycache__/permissions.cpython-311.pyc differ diff --git a/blog/api/__pycache__/serializers.cpython-311.pyc b/blog/api/__pycache__/serializers.cpython-311.pyc new file mode 100644 index 0000000000..f9b3342d7d Binary files /dev/null and b/blog/api/__pycache__/serializers.cpython-311.pyc differ diff --git a/blog/api/__pycache__/throttling.cpython-311.pyc b/blog/api/__pycache__/throttling.cpython-311.pyc new file mode 100644 index 0000000000..312a27eac7 Binary files /dev/null and b/blog/api/__pycache__/throttling.cpython-311.pyc differ diff --git a/blog/api/__pycache__/urls.cpython-311.pyc b/blog/api/__pycache__/urls.cpython-311.pyc new file mode 100644 index 0000000000..93656a421a Binary files /dev/null and b/blog/api/__pycache__/urls.cpython-311.pyc differ diff --git a/blog/api/__pycache__/views.cpython-311.pyc b/blog/api/__pycache__/views.cpython-311.pyc new file mode 100644 index 0000000000..6b75e86f46 Binary files /dev/null and b/blog/api/__pycache__/views.cpython-311.pyc differ diff --git a/blog/api/filters.py b/blog/api/filters.py new file mode 100644 index 0000000000..e55c6af26b --- /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/permissions.py b/blog/api/permissions.py new file mode 100644 index 0000000000..606cba90f1 --- /dev/null +++ b/blog/api/permissions.py @@ -0,0 +1,13 @@ +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 + +class IsAdminUserForObject(permissions.IsAdminUser): + def has_object_permission(self, request, view, obj): + return bool(request.user and request.user.is_staff) diff --git a/blog/api/serializers.py b/blog/api/serializers.py new file mode 100644 index 0000000000..5e5fa98d8e --- /dev/null +++ b/blog/api/serializers.py @@ -0,0 +1,99 @@ +from rest_framework import serializers +from blog.models import Post, Tag, Comment + +from blango_auth.models import User +from versatileimagefield.serializers import VersatileImageFieldSerializer + + + +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 PostSerializer(serializers.ModelSerializer): + tags = serializers.SlugRelatedField( + slug_field="value", many=True, queryset=Tag.objects.all() + ) + + author = serializers.HyperlinkedRelatedField( + queryset=User.objects.all(), view_name="api_user_detail", lookup_field="email" + ) + + hero_image = VersatileImageFieldSerializer( + sizes=[ + ("full_size", "url"), + ("thumbnail", "thumbnail__100x100"), + ], + read_only=True, + ) + + + class Meta: + model = Post + #fields = "__all__" + exclude = ["ppoi"] + + readonly = ["modified_at", "created_at"] + + + +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__" + + + +class PostDetailSerializer(PostSerializer): + comments = CommentSerializer(many=True) + + hero_image = VersatileImageFieldSerializer(sizes=[ + ("full_size", "url"), + ("thumbnail", "thumbnail__100x100"), + ("square_crop", "crop__200x200"), + ], + read_only=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 \ No newline at end of file diff --git a/blog/api/throttling.py b/blog/api/throttling.py new file mode 100644 index 0000000000..41baa64d6e --- /dev/null +++ b/blog/api/throttling.py @@ -0,0 +1,18 @@ +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" \ No newline at end of file diff --git a/blog/api/urls.py b/blog/api/urls.py new file mode 100644 index 0000000000..0cb862ea2c --- /dev/null +++ b/blog/api/urls.py @@ -0,0 +1,68 @@ +from django.urls import path, include, re_path +from drf_yasg import openapi +from drf_yasg.views import get_schema_view +import os + +from rest_framework.routers import DefaultRouter + +from rest_framework.urlpatterns import format_suffix_patterns +from rest_framework.authtoken import views + +#adding JWT imports +from rest_framework_simplejwt.views import TokenObtainPairView, TokenRefreshView + + + + +#from blog.api.views import PostList, PostDetail, UserDetail, TagViewSet +from blog.api.views import UserDetail, TagViewSet, PostViewSet + + + +router = DefaultRouter() +router.register("tags", TagViewSet) +router.register("posts", PostViewSet) + + +urlpatterns = [ + #path("posts/", PostList.as_view(), name="api_post_list"), + #path("posts/Content of Test Post
\r\nthis is text
", "tags": [1, 2]}}, {"model": "blog.post", "pk": 2, "fields": {"author": 1, "created_at": "2024-04-27T08:47:42.299Z", "modified_at": "2024-04-27T08:47:42.299Z", "published_at": "2024-04-27T08:46:32Z", "title": "Post 2", "slug": "post-2", "summary": "this is summary of post 2", "content": "THIS IS POST 2
\r\nthis is post 2 text
", "tags": [1, 2]}}, {"model": "blog.post", "pk": 3, "fields": {"author": 1, "created_at": "2024-04-27T08:49:33.124Z", "modified_at": "2024-04-27T08:49:33.124Z", "published_at": "2024-04-23T08:48:00Z", "title": "Post 3", "slug": "post-3", "summary": "Post 3 dated 23rd", "content": "title of post 3
\r\njlsjafkjsjsjsaiuroalaahhaofzoaujvahvahoao
", "tags": [1, 2]}}, {"model": "blango_auth.Userr", "pk": 1, "fields": {"password": "pbkdf2_sha256$720000$f9fIrc28qkOJIh8JDDNUBq$eRdASO3rp/4JnBGbKSeES1SqN2aDU4aUXOzOtQ+u3zo=", "last_login": "2024-04-25T20:15:49.518Z", "is_superuser": true, "username": "codio", "first_name": "", "last_name": "", "email": "", "is_staff": true, "is_active": true, "date_joined": "2024-04-25T20:09:08.771Z", "groups": [], "user_permissions": []}}] \ No newline at end of file diff --git a/blog/forms.py b/blog/forms.py new file mode 100644 index 0000000000..96ec088576 --- /dev/null +++ b/blog/forms.py @@ -0,0 +1,17 @@ +from django import forms +from crispy_forms.layout import Submit +from crispy_forms.helper import FormHelper + + +from blog.models import Comment + + +class CommentForm(forms.ModelForm): + class Meta: + model = Comment + fields = ["content"] + + def __init__(self, *args, **kwargs): + super(CommentForm, self).__init__(*args, **kwargs) + self.helper = FormHelper() + self.helper.add_input(Submit('submit', 'Submit')) diff --git a/blog/migrations/0001_initial.py b/blog/migrations/0001_initial.py new file mode 100644 index 0000000000..0a6ab378d8 --- /dev/null +++ b/blog/migrations/0001_initial.py @@ -0,0 +1,39 @@ +# Generated by Django 5.0.4 on 2024-04-25 20:12 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Tag', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('value', models.TextField(max_length=100)), + ], + ), + migrations.CreateModel( + name='Post', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('modified_at', models.DateTimeField(auto_now=True)), + ('published_at', models.DateTimeField(blank=True, null=True)), + ('title', models.TextField(max_length=100)), + ('slug', models.SlugField()), + ('summary', models.TextField(max_length=500)), + ('content', models.TextField()), + ('author', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), + ('tags', models.ManyToManyField(related_name='posts', to='blog.tag')), + ], + ), + ] diff --git a/blog/migrations/0002_comment.py b/blog/migrations/0002_comment.py new file mode 100644 index 0000000000..948f72985b --- /dev/null +++ b/blog/migrations/0002_comment.py @@ -0,0 +1,29 @@ +# Generated by Django 5.0.4 on 2024-04-27 07:59 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('blog', '0001_initial'), + ('contenttypes', '0002_remove_content_type_name'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Comment', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('content', models.TextField()), + ('object_id', models.PositiveIntegerField()), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('modified_at', models.DateTimeField(auto_now=True)), + ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')), + ('creator', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + ] diff --git a/blog/migrations/0003_alter_tag_options_alter_comment_created_at_and_more.py b/blog/migrations/0003_alter_tag_options_alter_comment_created_at_and_more.py new file mode 100644 index 0000000000..d653109b1f --- /dev/null +++ b/blog/migrations/0003_alter_tag_options_alter_comment_created_at_and_more.py @@ -0,0 +1,48 @@ +# Generated by Django 5.0.4 on 2024-05-25 08:00 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('blog', '0002_comment'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.AlterModelOptions( + name='tag', + options={'ordering': ['value']}, + ), + migrations.AlterField( + model_name='comment', + name='created_at', + field=models.DateTimeField(auto_now_add=True, db_index=True), + ), + migrations.AlterField( + model_name='comment', + name='object_id', + field=models.PositiveIntegerField(db_index=True), + ), + migrations.AlterField( + model_name='post', + name='published_at', + field=models.DateTimeField(blank=True, db_index=True, null=True), + ), + migrations.AlterField( + model_name='tag', + name='value', + field=models.TextField(max_length=100, unique=True), + ), + migrations.CreateModel( + name='AuthorProfile', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('bio', models.TextField()), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='profile', to=settings.AUTH_USER_MODEL)), + ], + ), + ] diff --git a/blog/migrations/0004_post_hero_image_post_ppoi.py b/blog/migrations/0004_post_hero_image_post_ppoi.py new file mode 100644 index 0000000000..2264cd4536 --- /dev/null +++ b/blog/migrations/0004_post_hero_image_post_ppoi.py @@ -0,0 +1,24 @@ +# Generated by Django 5.0.4 on 2024-05-26 15:02 + +import versatileimagefield.fields +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('blog', '0003_alter_tag_options_alter_comment_created_at_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='post', + name='hero_image', + field=versatileimagefield.fields.VersatileImageField(blank=True, null=True, upload_to='hero_images'), + ), + migrations.AddField( + model_name='post', + name='ppoi', + field=versatileimagefield.fields.PPOIField(blank=True, default='0.5x0.5', editable=False, max_length=20, null=True), + ), + ] diff --git a/blog/migrations/__init__.py b/blog/migrations/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/blog/migrations/__pycache__/0001_initial.cpython-311.pyc b/blog/migrations/__pycache__/0001_initial.cpython-311.pyc new file mode 100644 index 0000000000..a06868eb6c Binary files /dev/null and b/blog/migrations/__pycache__/0001_initial.cpython-311.pyc differ diff --git a/blog/migrations/__pycache__/0002_comment.cpython-311.pyc b/blog/migrations/__pycache__/0002_comment.cpython-311.pyc new file mode 100644 index 0000000000..d4d38a0248 Binary files /dev/null and b/blog/migrations/__pycache__/0002_comment.cpython-311.pyc differ diff --git a/blog/migrations/__pycache__/0003_alter_tag_options_alter_comment_created_at_and_more.cpython-311.pyc b/blog/migrations/__pycache__/0003_alter_tag_options_alter_comment_created_at_and_more.cpython-311.pyc new file mode 100644 index 0000000000..77ed6504a8 Binary files /dev/null and b/blog/migrations/__pycache__/0003_alter_tag_options_alter_comment_created_at_and_more.cpython-311.pyc differ diff --git a/blog/migrations/__pycache__/0004_post_hero_image_post_ppoi.cpython-311.pyc b/blog/migrations/__pycache__/0004_post_hero_image_post_ppoi.cpython-311.pyc new file mode 100644 index 0000000000..7b8466c31b Binary files /dev/null and b/blog/migrations/__pycache__/0004_post_hero_image_post_ppoi.cpython-311.pyc differ diff --git a/blog/migrations/__pycache__/__init__.cpython-311.pyc b/blog/migrations/__pycache__/__init__.cpython-311.pyc new file mode 100644 index 0000000000..1e0378c9ab Binary files /dev/null and b/blog/migrations/__pycache__/__init__.cpython-311.pyc differ diff --git a/blog/models.py b/blog/models.py new file mode 100644 index 0000000000..477782627b --- /dev/null +++ b/blog/models.py @@ -0,0 +1,59 @@ +from django.db import models +from django.conf import settings +from django.contrib.contenttypes.fields import GenericRelation, GenericForeignKey +from django.contrib.contenttypes.models import ContentType + +#versatile immage +from versatileimagefield.fields import VersatileImageField, PPOIField + + + + +class Tag(models.Model): + value = models.TextField(max_length=100, unique=True) + + class Meta: + ordering = ["value"] + + def __str__(self): + return self.value + + + +class Comment(models.Model): + creator = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE) + content = models.TextField() + content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) + object_id = models.PositiveIntegerField(db_index=True) + content_object = GenericForeignKey("content_type", "object_id") + created_at = models.DateTimeField(auto_now_add=True, db_index=True) + modified_at = models.DateTimeField(auto_now=True) + + +class Post(models.Model): + author = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT) + created_at = models.DateTimeField(auto_now_add=True) + modified_at = models.DateTimeField(auto_now=True) + published_at = models.DateTimeField(blank=True, null=True, db_index=True) + title = models.TextField(max_length=100) + slug = models.SlugField() + summary = models.TextField(max_length=500) + content = models.TextField() + tags = models.ManyToManyField(Tag, related_name="posts") + comments = GenericRelation(Comment) + hero_image = VersatileImageField(upload_to="hero_images", ppoi_field="ppoi", null=True, blank=True) + ppoi = PPOIField(null=True, blank=True) + + + def __str__(self): + return self.title + + + +class AuthorProfile(models.Model): + user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="profile") + bio = models.TextField() + + def __str__(self): + return f"{self.__class__.__name__} object for {self.user}" + diff --git a/blog/static/blog/blog copy.js b/blog/static/blog/blog copy.js new file mode 100644 index 0000000000..cbe2fddb79 --- /dev/null +++ b/blog/static/blog/blog copy.js @@ -0,0 +1,232 @@ + + +//REACTJS CODE STARTS HERE +class ClickButton extends React.Component { + state = { + wasClicked: false + } + + handleClick () { + this.setState( + {wasClicked: true} + ) + } + + + +//this is JSX + render () { + let buttonText + + if (this.state.wasClicked) + buttonText = 'Clicked!' + else + buttonText = 'Click Me' + + return + } +//end JSX + + + /* + render () { + let buttonText + + if (this.state.wasClicked) + buttonText = 'Clicked!' + else + buttonText = 'Click Me' + return React.createElement( + 'button', + { + className: 'btn btn-primary mt-2', + onClick: () => { + this.handleClick() + } + }, + buttonText + ) + }*/ + +} + +//mount the reactjs code to the html +const domContainer = document.getElementById('react_root') +ReactDOM.render( + React.createElement(ClickButton), + domContainer +) + + +//REACTJS ENDS HERE + + + +/* + // CONSOLE JAVASCRIPT - BACKEND ONLY STARTS HERE + +function resolvedCallback(data) { + console.log('Resolved with data ' + data) +} + +function rejectedCallback(message) { + console.log('Rejected with message ' + message) +} + +const lazyAdd = function (a, b) { + const doAdd = (resolve, reject) => { + if (typeof a !== "number" || typeof b !== "number") { + reject("a and b must both be numbers") + } else { + const sum = a + b + resolve(sum) + } + } + + return new Promise(doAdd) +} + +const p = lazyAdd(3, 4) +p.then(resolvedCallback, rejectedCallback) + +lazyAdd("nan", "alsonan").then(resolvedCallback, rejectedCallback) + + + + + + +const theNumber = 1 +let yourName = 'Ben' + +if (theNumber === 1) { + let yourName = 'Leo' + alert(yourName) +} + +alert(yourName) + + +console.time('myTimer') +console.count('counter1') +console.log('A normal log message') +console.warn('Warning: something bad might happen') +console.error('Something bad did happen!') +console.count('counter1') +console.log('All the things above took this long to happen:') +console.timeEnd('myTimer') + + + +function sayHello(yourName) { + if (yourName === undefined) { + console.log('Hello, no name') + } else { + console.log('Hello, ' + yourName) + } +} + +const yourName = 'Your Name' // Put your name here + +console.log('Before setTimeout') + +setTimeout(() => { + sayHello(yourName) + }, 2000 +) + +console.log('After setTimeout') + + + +for(let i = 0; i < 10; i += 1) { + console.log('for loop i: ' + i) +} + +let j = 0 +while(j < 10) { + console.log('while loop j: ' + j) + j += 1 +} + +let k = 10 + +do { + console.log('do while k: ' + k) +} while(k < 10) + +const numbers = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + +numbers.forEach((value => { + console.log('For each value ' + value) +})) + +const doubled = numbers.map(value => value * 2) + +console.log('Here are the doubled numbers') + +console.log(doubled) + + + +class Greeter { + constructor (name) { + this.name = name + } + + getGreeting () { + if (this.name === undefined) { + return 'Hello, no name' + } + + return 'Hello, ' + this.name + } + + showGreeting (greetingMessage) { + console.log(greetingMessage) + } + + greet () { + this.showGreeting(this.getGreeting()) + } +} + +const g = new Greeter('Patchy') // Put your name here if you like +g.greet() + + + +class DelayedGreeter extends Greeter { + delay = 2000 + + constructor (name, delay) { + super(name) + if (delay !== undefined) { + this.delay = delay + } + } + + greet () { + setTimeout( + () => { + this.showGreeting(this.getGreeting()) + }, this.delay + ) + } +} + +const dg2 = new DelayedGreeter('Patso 2 Seconds') +dg2.greet() + +const dg1 = new DelayedGreeter('Patchu 1 Second', 1000) +dg1.greet() +*/ \ No newline at end of file diff --git a/blog/static/blog/blog.js b/blog/static/blog/blog.js new file mode 100644 index 0000000000..5e9b8a233b --- /dev/null +++ b/blog/static/blog/blog.js @@ -0,0 +1,150 @@ +/*this is the fetch and react hooks + +['/api/v1/posts/', '/', '/abadurl/'].forEach(url => { + fetch(url).then(response => { + if (response.status !== 200) { + throw new Error('Invalid status from server: ' + response.statusText) + } + + return response.json() + }).then(data => { + // do something with data, for example + console.log(data) + }).catch(e => { + console.error(e) + }) +}) + +*/ + + + +//this is the post-table code, do not remove +//this is the post-table code, do not remove + +class PostRow extends React.Component { + render () { + const post = this.props.post + + let thumbnail + + if (post.hero_image.thumbnail) { + thumbnail =| Title | +Image | +Tags | +Slug | +Summary | +Link | +
|---|
')
+
+
+@register.simple_tag
+def endrow():
+ return format_html("
")
+
+@register.simple_tag
+def row(extra_classes=""):
+ return format_html('', extra_classes)
+
+@register.simple_tag
+def col(extra_classes=""):
+ return format_html('{% block title %}Welcome to Blango{% endblock %}
+
+
+
+
+ 
+ {% endcol %}
+ {% endrow %}
+{% endif %}
+{% endrow %}
+
+
+{% row %}
+
', extra_classes)
+
+@register.simple_tag
+def endcol():
+ return format_html("
")
+
+@register.inclusion_tag("blog/post-list.html")
+def recent_posts(post):
+ posts = Post.objects.exclude(pk=post.pk)[:5]
+ return {"title": "Recent Posts", "posts": posts}
+
+
+
+
+
+
+
diff --git a/blog/test_post_api.py b/blog/test_post_api.py
new file mode 100644
index 0000000000..1ee04a21d7
--- /dev/null
+++ b/blog/test_post_api.py
@@ -0,0 +1,114 @@
+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/")
+
+ #added to list results in json response for pagination
+ data = resp.json()["results"]
+
+ self.assertEqual(len(data), 2)
+
+ for post_dict in data:
+ 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(), 2)
+
+ 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..3d54b40ad2
--- /dev/null
+++ b/blog/test_tag_api.py
@@ -0,0 +1,49 @@
+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)
+
+ #updated resonse Json to return results
+ 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/views.py b/blog/views.py
new file mode 100644
index 0000000000..849117a80f
--- /dev/null
+++ b/blog/views.py
@@ -0,0 +1,53 @@
+from django.utils import timezone
+from blog.models import Post, Comment
+from django.shortcuts import render, get_object_or_404
+from django.shortcuts import redirect
+from blog.forms import CommentForm
+
+from django.urls import reverse
+
+# Create your views here.
+def index(request):
+ posts = Post.objects.filter(published_at__lte=timezone.now())
+ '''
+ DATABASE QUERY OPTIMISATION...USE ONLY IF A PERMANENT QUERY SET
+ #.select_related("author")
+ #.defer("created_at", "modified_at")
+ #or the oppossite use
+ #.only("title", "summary", "content", "author", "published_at", "slug")
+ '''
+
+ return render(request, "blog/index.html", {"posts": posts})
+
+
+def post_detail(request, slug):
+ post = get_object_or_404(Post, slug=slug)
+
+ if request.user.is_active:
+ if request.method == "POST":
+ comment_form = CommentForm(request.POST)
+
+ if comment_form.is_valid():
+ comment = comment_form.save(commit=False)
+ comment.content_object = post
+ comment.creator = request.user
+ comment.save()
+ return redirect(request.path_info)
+ else:
+ comment_form = CommentForm()
+ else:
+ comment_form = None
+
+ #return render(request, "blog/post-detail.html", {"post": post})
+
+ return render(request, "blog/post-detail.html", {"post": post, "comment_form": comment_form}
+)
+
+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", {"post_list_url": reverse("post-list")}
+ )
diff --git a/db.sqlite3 b/db.sqlite3
new file mode 100644
index 0000000000..dcbc819ab1
Binary files /dev/null and b/db.sqlite3 differ
diff --git a/manage.py b/manage.py
index c66b327f71..9d249659c7 100644
--- a/manage.py
+++ b/manage.py
@@ -7,8 +7,12 @@
def main():
"""Run administrative tasks."""
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'blango.settings')
+ os.environ.setdefault("DJANGO_CONFIGURATION", "Dev") #--added to read configurations
+
try:
- from django.core.management import execute_from_command_line
+ #from django.core.management import execute_from_command_line
+ from configurations.management import execute_from_command_line
+
except ImportError as exc:
raise ImportError(
"Couldn't import Django. Are you sure it's installed and "
@@ -20,3 +24,4 @@ def main():
if __name__ == '__main__':
main()
+
diff --git a/templates/base.html b/templates/base.html
new file mode 100644
index 0000000000..0e8bd41381
--- /dev/null
+++ b/templates/base.html
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+ Hello World
+ + + + + {% block content %} + + {% endblock %} + + + + + + + + \ No newline at end of file diff --git a/templates/blog/index.html b/templates/blog/index.html new file mode 100644 index 0000000000..6076722d7d --- /dev/null +++ b/templates/blog/index.html @@ -0,0 +1,29 @@ +{% extends "base.html" %} +{% load blog_extras %} +{% block content %} +Blog Posts
+ + +{% for post in posts %} + +{% row "border-bottom" %} +
+ 
+ {% endif %}
+
+
+ {% include "blog/post-byline.html" %}
+
+{% endrow %}
+
+{% endfor %}
+{% endblock %}
+
+
+
diff --git a/templates/blog/post-byline.html b/templates/blog/post-byline.html
new file mode 100644
index 0000000000..c440349856
--- /dev/null
+++ b/templates/blog/post-byline.html
@@ -0,0 +1,2 @@
+{% load blog_extras %}
+By {% author_details_tag %} on {{post.published_at|date:"M, d Y" }}
\ No newline at end of file
diff --git a/templates/blog/post-comments.html b/templates/blog/post-comments.html
new file mode 100644
index 0000000000..17840deb3d
--- /dev/null
+++ b/templates/blog/post-comments.html
@@ -0,0 +1,33 @@
+{% load blog_extras crispy_forms_tags %}
+
+{{ post.title }}
+ + {% if post.hero_image %} +{{ post.summary }}
+({{ post.content|wordcount }} words)Read More +
+Comments
+ +{% for comment in post.comments.all %} +{% row "border-top pt-2" %} + {% col %} +Posted by {{ comment.creator }} at {{ comment.created_at|date:"M, d Y h:i" }}
+ {% endcol %} +{% endrow %} +{% row "border-bottom" %} + {% col %} +{{ comment.content }}
+ {% endcol %} +{% endrow %} +{% empty %} + {% row "border-top border-bottom" %} + {% col %} +No comments.
+ {% endcol %} + {% endrow %} +{% endfor %} + +{% if request.user.is_active %} +{% row "mt-4" %} + {% col %} +Add Comment
+ + {% crispy comment_form %} + + {% endcol %} +{% endrow %} +{% endif %} \ No newline at end of file diff --git a/templates/blog/post-detail.html b/templates/blog/post-detail.html new file mode 100644 index 0000000000..ca12a3424b --- /dev/null +++ b/templates/blog/post-detail.html @@ -0,0 +1,49 @@ +{% extends "base.html" %} +{% load blog_extras %} +{% block content %} + + +{{ post.title }}
+ +{% row %} +
+ {% include "blog/post-byline.html" %}
+
+{% endrow %}
+
+{% row %}
+{% if post.hero_image %}
+ {% row %}
+ {% col %}
+ {{ post.content|safe }}
+
+{% endrow %}
+
+{% if post.author.profile %}
+{% row %}
+{% col %}
+About the author
+{{ post.author.profile.bio }}
+{% endcol %} +{% endrow %} +{% endif %} + +{% include "blog/post-comments.html" %} + + +{% row %} +{% col %} + {% recent_posts post %} +{% endcol %} +{% endrow %} + + +{% endblock %} \ No newline at end of file diff --git a/templates/blog/post-list.html b/templates/blog/post-list.html new file mode 100644 index 0000000000..5343856bb4 --- /dev/null +++ b/templates/blog/post-list.html @@ -0,0 +1,6 @@ +{{ title }}
+-
+ {% for post in posts %}
+
- Read More + {% endfor %} +
+
+
+
+
+
+
+
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/rest_framework/api.html b/templates/rest_framework/api.html
new file mode 100644
index 0000000000..54cb7bc898
--- /dev/null
+++ b/templates/rest_framework/api.html
@@ -0,0 +1,19 @@
+{% extends "rest_framework/base.html" %}
+{% block title %}{% if name %}{{ name }} – {% endif %} Blango REST API{% endblock %}
+
+
+{% block branding %}
+
+ Blango REST API
+
+{% endblock %}
+
+
+{% block style %}
+ {{ block.super }}
+
+{% endblock %}
\ No newline at end of file
+
+
+