Skip to content
Snippets Groups Projects
Commit 51e46ea2 authored by Mansoor Saleem's avatar Mansoor Saleem
Browse files

Comment section added

parent d53dc6e3
No related branches found
No related tags found
No related merge requests found
Pipeline #3147 canceled
Showing
with 22 additions and 38 deletions
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
...@@ -12,7 +12,3 @@ ...@@ -12,7 +12,3 @@
</form> </form>
<p>Not got an account? <a href="{% url 'accounts:signup' %}">Sign Up</a></p> <p>Not got an account? <a href="{% url 'accounts:signup' %}">Sign Up</a></p>
{% endblock %} {% endblock %}
#5 in the accounts url i want to use login url
...@@ -2,11 +2,9 @@ ...@@ -2,11 +2,9 @@
{% block content %} {% block content %}
<h1>Signup</h1> <h1>Signup</h1>
<form class="site-form" action="/accounts/signup/" method="post"> <form class="site-form" action="{% url 'accounts:signup' %}" method="post">
{% csrf_token %} {% csrf_token %}
{{ form }} {{ form }}
<input type="submit" value="Signup"> <input type="submit" value="Signup">
</form> </form>
{% endblock %} {% endblock %}
\ No newline at end of file
#6 is the security csrf_token which server gets and knows that data is comming from your application
...@@ -7,4 +7,4 @@ urlpatterns = [ ...@@ -7,4 +7,4 @@ urlpatterns = [
url(r'^signup/$', views.signup_view, name="signup"), url(r'^signup/$', views.signup_view, name="signup"),
url(r'^login/$', views.login_view, name="login"), url(r'^login/$', views.login_view, name="login"),
url(r'^logout/$', views.logout_view, name="logout"), url(r'^logout/$', views.logout_view, name="logout"),
] ]
\ No newline at end of file
...@@ -21,7 +21,10 @@ def login_view(request): ...@@ -21,7 +21,10 @@ def login_view(request):
# log the user in # log the user in
user = form.get_user() user = form.get_user()
login(request, user) login(request, user)
return redirect('articles:list') if 'next' in request.POST:
return redirect(request.POST.get('next'))
else:
return redirect('articles:list')
else: else:
form = AuthenticationForm() form = AuthenticationForm()
return render(request, 'accounts/login.html', { 'form': form }) return render(request, 'accounts/login.html', { 'form': form })
...@@ -29,10 +32,4 @@ def login_view(request): ...@@ -29,10 +32,4 @@ def login_view(request):
def logout_view(request): def logout_view(request):
if request.method == 'POST': if request.method == 'POST':
logout(request) logout(request)
return redirect('articles:list') return redirect('articles:list')
\ No newline at end of file
#user is varialbe in 22 which is going to retrieve the info of the user trying to login
#on 10 and 21 we are not logging in the users but redirecting them
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
from django.contrib import admin from django.contrib import admin
from .models import Article, Comment from .models import Article, Comment
class ArticleAdmin(admin.ModelAdmin): admin.site.register(Article)
list_display = ('title', 'author') admin.site.register(Comment)
search_fields = ('title', 'content')
prepopulated_fields = {'slug': ('title',)}
admin.site.register(Article, ArticleAdmin)
class CommentAdmin(admin.ModelAdmin):
list_display = ('user', 'email', 'approved')
admin.site.register(Comment, CommentAdmin)
# Register your models here.
from django import forms from django import forms
from .models import Article from . import models
from .models import Article, Comment
from django.contrib.auth.models import User
class CreateArticle(forms.ModelForm): class CreateArticle(forms.ModelForm):
class Meta: class Meta:
model = Article model = models.Article
fields = ['title', 'body', 'slug', 'thumb'] fields = ['title', 'body', 'slug', 'thumb',]
class CommentForm(forms.ModelForm):
class Meta:
model = Comment
fields = ('content',)
\ No newline at end of file
# Generated by Django 2.2.1 on 2019-05-12 11:25 # Generated by Django 2.2 on 2019-05-19 12:29
from django.db import migrations, models from django.db import migrations, models
...@@ -15,7 +15,7 @@ class Migration(migrations.Migration): ...@@ -15,7 +15,7 @@ class Migration(migrations.Migration):
name='Article', name='Article',
fields=[ fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=30)), ('title', models.CharField(max_length=100)),
('slug', models.SlugField()), ('slug', models.SlugField()),
('body', models.TextField()), ('body', models.TextField()),
('date', models.DateTimeField(auto_now_add=True)), ('date', models.DateTimeField(auto_now_add=True)),
......
# Generated by Django 2.2.1 on 2019-05-18 23:16 # Generated by Django 2.2 on 2019-06-02 10:59
from django.db import migrations, models from django.db import migrations, models
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment