From 4c535a956e8a6d5bb9c0b124f4180fcf9d0275e9 Mon Sep 17 00:00:00 2001 From: Jayaram R Pai Date: Sun, 6 Jul 2014 23:10:02 +0530 Subject: added comments app --- .gitignore | 4 + PythonTBC/settings.py | 4 +- PythonTBC/urls.py | 1 + comments/__init__.py | 0 comments/forms.py | 24 ++++++ comments/models.py | 18 +++++ comments/templates/comments/comment_base.html | 17 ++++ comments/templates/comments/get_comments.html | 45 +++++++++++ comments/templates/comments/new_comment.html | 17 ++++ comments/templates/comments/new_reply.html | 13 +++ comments/tests.py | 16 ++++ comments/urls.py | 7 ++ comments/views.py | 111 ++++++++++++++++++++++++++ tbc/static/css/comments.css | 24 ++++++ 14 files changed, 300 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 comments/__init__.py create mode 100644 comments/forms.py create mode 100644 comments/models.py create mode 100644 comments/templates/comments/comment_base.html create mode 100644 comments/templates/comments/get_comments.html create mode 100644 comments/templates/comments/new_comment.html create mode 100644 comments/templates/comments/new_reply.html create mode 100644 comments/tests.py create mode 100644 comments/urls.py create mode 100644 comments/views.py create mode 100644 tbc/static/css/comments.css diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a0b4bb3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*~ +*.pyc +local.py +uploads/ diff --git a/PythonTBC/settings.py b/PythonTBC/settings.py index 51f4364..e2cafba 100644 --- a/PythonTBC/settings.py +++ b/PythonTBC/settings.py @@ -119,7 +119,8 @@ TEMPLATE_DIRS = ( # Always use forward slashes, even on Windows. # Don't forget to use absolute paths, not relative paths. join(PROJDIR, '../tbc/templates'), - join(PROJDIR, '../tbc/static/uploads') + join(PROJDIR, '../tbc/static/uploads'), + join(PROJDIR, '../comments/templates') ) INSTALLED_APPS = ( 'django.contrib.auth', @@ -133,6 +134,7 @@ INSTALLED_APPS = ( # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', 'tbc', + 'comments', ) SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer' diff --git a/PythonTBC/urls.py b/PythonTBC/urls.py index 7664952..d75e545 100644 --- a/PythonTBC/urls.py +++ b/PythonTBC/urls.py @@ -14,5 +14,6 @@ urlpatterns = patterns('', # Uncomment the next line to enable the admin: url(r'^admin/', include(admin.site.urls)), + url(r'^comments/', include('comments.urls')), url(r'^', include('tbc.urls', namespace='tbc')), ) diff --git a/comments/__init__.py b/comments/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/comments/forms.py b/comments/forms.py new file mode 100644 index 0000000..a5fb326 --- /dev/null +++ b/comments/forms.py @@ -0,0 +1,24 @@ +from django import forms + +class CommentForm(forms.Form): + book = forms.CharField(widget=forms.HiddenInput()) + chapter = forms.CharField(widget=forms.HiddenInput()) + example = forms.CharField(widget=forms.HiddenInput()) + page = forms.CharField(widget=forms.HiddenInput()) + title = forms.CharField() + body = forms.CharField(widget=forms.Textarea) + + def clean(self): + cleaned_data = self.cleaned_data + if cleaned_data.get('title', None) is None: + raise forms.ValidationError('Title cannot be empty.') + if cleaned_data.get('body', None) is None: + raise forms.ValidationError('Description cannot be empty.') + return cleaned_data + +class ReplyForm(forms.Form): + comment_id = forms.CharField(widget=forms.HiddenInput()) + body = forms.CharField(widget=forms.Textarea) + + def clean(self): + return self.cleaned_data diff --git a/comments/models.py b/comments/models.py new file mode 100644 index 0000000..390b274 --- /dev/null +++ b/comments/models.py @@ -0,0 +1,18 @@ +from django.db import models + +class Comment(models.Model): + title = models.CharField(max_length=200) + body = models.TextField() + book = models.CharField(max_length=200) + chapter = models.CharField(max_length=10) + example = models.CharField(max_length=10) + page = models.CharField(max_length=10) + date_created = models.DateTimeField(auto_now_add=True) + date_modified = models.DateTimeField(auto_now=True) + +class Reply(models.Model): + comment = models.ForeignKey(Comment) + body = models.CharField(max_length=200) + date_created = models.DateTimeField(auto_now_add=True) + date_modified = models.DateTimeField(auto_now=True) + diff --git a/comments/templates/comments/comment_base.html b/comments/templates/comments/comment_base.html new file mode 100644 index 0000000..c3a2a7b --- /dev/null +++ b/comments/templates/comments/comment_base.html @@ -0,0 +1,17 @@ +{% load static %} + + + + + + + + +
+ {% block content %} + {% endblock %} +
+ + + + diff --git a/comments/templates/comments/get_comments.html b/comments/templates/comments/get_comments.html new file mode 100644 index 0000000..571f815 --- /dev/null +++ b/comments/templates/comments/get_comments.html @@ -0,0 +1,45 @@ +{% extends 'comments/comment_base.html' %} +{% block content %} + +{% if comments %} +
Recent comments
+ + + New comment + +
+
+ {% for comment in comments %} +
+
+ + #{{ forloop.counter }} {{ comment.title }} + +
+
+
+
+ {{ comment.body }} +
+
+ {% if comment.reply_set.all %} +
Recent replies
+ {% endif %} + {% for reply in comment.reply_set.all %} +
+

{{ reply.body }}

+
+ {% endfor %} + + Reply +
+
+
+
+ {% endfor %} +
+{% else %} +
+

No comments for this example...

+ Create a new comment +
+{% endif %} +{% endblock %} diff --git a/comments/templates/comments/new_comment.html b/comments/templates/comments/new_comment.html new file mode 100644 index 0000000..fa0c333 --- /dev/null +++ b/comments/templates/comments/new_comment.html @@ -0,0 +1,17 @@ +{% extends 'comments/comment_base.html' %} +{% block content %} +
+
New comment form
+
{% csrf_token %} + {{ form.errors }} + {{ form.book }} + {{ form.chapter }} + {{ form.example }} + {{ form.page }} + {{ form.title }}
+ {{ form.body }}
+ + Cancel +
+
+{% endblock %} diff --git a/comments/templates/comments/new_reply.html b/comments/templates/comments/new_reply.html new file mode 100644 index 0000000..71532c8 --- /dev/null +++ b/comments/templates/comments/new_reply.html @@ -0,0 +1,13 @@ +{% extends 'comments/comment_base.html' %} +{% block content %} +
+
New reply form
+
{% csrf_token %} + {{ form.errors }} + {{ form.comment_id }} + {{ form.body }}
+ + Cancel +
+
+{% endblock %} diff --git a/comments/tests.py b/comments/tests.py new file mode 100644 index 0000000..501deb7 --- /dev/null +++ b/comments/tests.py @@ -0,0 +1,16 @@ +""" +This file demonstrates writing tests using the unittest module. These will pass +when you run "manage.py test". + +Replace this with more appropriate tests for your application. +""" + +from django.test import TestCase + + +class SimpleTest(TestCase): + def test_basic_addition(self): + """ + Tests that 1 + 1 always equals 2. + """ + self.assertEqual(1 + 1, 2) diff --git a/comments/urls.py b/comments/urls.py new file mode 100644 index 0000000..c3a609a --- /dev/null +++ b/comments/urls.py @@ -0,0 +1,7 @@ +from django.conf.urls import patterns, include, url + +urlpatterns = patterns('', + url(r'^new/$', 'comments.views.new_comment', name='new_comment'), + url(r'^get/$', 'comments.views.get_comments', name='new_comment'), + url(r'^new-reply/$', 'comments.views.new_reply', name='new_reply'), +) diff --git a/comments/views.py b/comments/views.py new file mode 100644 index 0000000..be9d522 --- /dev/null +++ b/comments/views.py @@ -0,0 +1,111 @@ +import json + +from django.http import HttpResponse, HttpResponseRedirect +from django.shortcuts import render +from django.core.context_processors import csrf +from django.views.decorators.csrf import csrf_exempt + +from comments.forms import CommentForm, ReplyForm +from comments.models import Comment, Reply + +def get_comments(request): + # retriving comment parameters + book = request.GET.get('book', '') + chapter = request.GET.get('chapter', '') + example = request.GET.get('example', '') + page = request.GET.get('page', '') + comments = Comment.objects.filter(book=book).filter(chapter=chapter).filter(example=example) + context = { + 'comments': comments, + 'book': book, + 'chapter': chapter, + 'example': example, + 'page': page + } + return render(request, "comments/get_comments.html", context) + +def new_comment(request): + # saving the poted comment + if request.method == 'POST': + form = CommentForm(request.POST) + if form.is_valid(): + comment = Comment() + comment.book = form.cleaned_data.get("book") + comment.chapter = form.cleaned_data.get("chapter") + comment.example = form.cleaned_data.get("example") + comment.page = form.cleaned_data.get("page") + comment.title = form.cleaned_data.get("title") + comment.body = form.cleaned_data.get("body") + comment.save() + return HttpResponseRedirect( + '/comments/get/?book={0}&chapter={1}&example={2}&page={3}'.format( + comment.book, comment.chapter, comment.example, comment.page + ) + ) + else: + book = request.POST.get('book', '') + chapter = request.POST.get('chapter', '') + example = request.POST.get('example', '') + page = request.POST.get('page', '') + return HttpResponseRedirect( + '/comments/new/?book={0}&chapter={1}&example={2}&page={3}'.format( + book, chapter, example, page + ) + ) + + # retriving comment parameters + book = request.GET.get('book', '') + chapter = request.GET.get('chapter', '') + example = request.GET.get('example', '') + page = request.GET.get('page', '') + initial_values = { + 'book': book, + 'chapter': chapter, + 'example': example, + 'page': page + } + form = CommentForm(initial = initial_values) + context = { + 'form': form, + 'book': book, + 'chapter': chapter, + 'example': example, + 'page': page + } + context.update(csrf(request)) + return render(request, 'comments/new_comment.html', context) + +def new_reply(request): + if request.method == 'POST': + form = ReplyForm(request.POST) + if form.is_valid(): + comment_id = form.cleaned_data.get('comment_id') + comment = Comment.objects.get(id=comment_id) + reply = Reply() + reply.comment = comment + reply.body = form.cleaned_data.get('body') + reply.save() + return HttpResponseRedirect( + '/comments/get/?book={0}&chapter={1}&example={2}&page={3}'.format( + comment.book, comment.chapter, comment.example, comment.page + ) + ) + else: + comment_id = request.POST.get('comment_id', '') + return HttpResponseRedirect( + '/comments/new-reply/?comment_id={0}'.format( + comment_id + ) + ) + comment_id = request.GET.get('comment_id', '') + comment = Comment.objects.get(id=comment_id) + initial_values = { + 'comment_id': comment_id + } + form = ReplyForm(initial = initial_values) + context = { + 'form': form, + 'comment': comment + } + return render(request, 'comments/new_reply.html', context) + diff --git a/tbc/static/css/comments.css b/tbc/static/css/comments.css new file mode 100644 index 0000000..dc8abf3 --- /dev/null +++ b/tbc/static/css/comments.css @@ -0,0 +1,24 @@ +#content-wrapper { + max-width: 97%; +} +.accordion-inner { + background: #f5f5f5; +} +#new-comment-form input[type=text], +#new-comment-form textarea, +#new-reply-form textarea { + width: 80%; +} +#new-comment-form textarea, +#new-reply-form textarea { + height: 100px; +} +.replies { + margin-left: 15px; +} +.replies .reply { + padding: 3px; + margin: 5px 0; + background: #ffffff; + border-left: 2px solid #1dccaa; +} -- cgit