Entire application

hackrsource/MOC/MOC/settings.py

@@ -119,3 +119,4 @@
 # https://docs.djangoproject.com/en/1.10/howto/static-files/
 
 STATIC_URL = '/static/'
+ADMINS = []

hackrsource/MOC/MOC/urls.py

@@ -15,12 +15,20 @@
 """
 from django.conf.urls import url
 from django.contrib import admin
+
 from newsapp import views
 
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
-    url(r'^$', views.home, name="home"),
-    url(r'^bookmark$',views.bookmark, name="bookmark"),
-    url(r'^unbookmark$',views.unbookmark, name="unbookmark"),
+    url(r'^password_reset/$', views.password_reset, name="password_reset"),
+    url(r'^delete_comment/$', views.delete_comment, name="delete_comment"),
+    url(r'^$', views.user_login, name="user_login"),
+    url(r'^register/$', views.registeration, name="registeration"),
+    url(r'^home/$', views.home, name="home"),
+    url(r'^logout/$', views.user_logout, name="user_logout"),
+    url(r'^bookmark/$',views.bookmark, name="bookmark"),
+    url(r'^unbookmark/$',views.unbookmark, name="unbookmark"),
     url(r'^profile/$', views.profile, name="profile"),
+    url(r'^like/$', views.like, name="like"),
+    url(r'^unlike/$', views.unlike, name="unlike"),
 ]

hackrsource/MOC/newsapp/forms.py

@@ -0,0 +1,27 @@
+from django import forms
+
+
+class LoginForm(forms.Form):
+    user = forms.CharField(max_length=30, required=True, label="Username")
+    password = forms.CharField(max_length=30, required=True, label="Password")
+    user.widget = forms.TextInput(attrs={"class": "form-control", "name": "username", "id": "username"})
+    password.widget = forms.PasswordInput(attrs={"class": "form-control", "name": "password", "id": "password"})
+
+
+class RegisterationForm(forms.Form):
+    user = forms.CharField(max_length=30, required=True, label="Username")
+    password = forms.CharField(max_length=30, required=True, label="Password")
+    email = forms.EmailField(required=True, label="Email ID")
+    user.widget = forms.TextInput(attrs={"class": "form-control", "name": "username", "id": "username"})
+    password.widget = forms.PasswordInput(attrs={"class": "form-control", "name": "password", "id": "password"})
+    email.widget = forms.EmailInput(attrs={"class": "form-control", "name": "email", "id": "email"})
+
+
+class PasswordReset(forms.Form):
+    email = forms.EmailField(required=True, label="Email ID")
+    email.widget = forms.EmailInput(attrs={"class": "form-control", "name": "email", "id": "email"})
+
+
+class Comment(forms.Form):
+    comment = forms.CharField(required=True, max_length=200)
+    comment.widget = forms.TextInput(attrs={"class": "form-control", "name": "comment", "placeholder":"Enter your comment"})

hackrsource/MOC/newsapp/migrations/0007_auto_20170616_1207.py

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.1 on 2017-06-16 12:07
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('newsapp', '0006_auto_20170613_1354'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='newsarticle',
+            name='author',
+            field=models.CharField(blank=True, default='', max_length=30),
+        ),
+        migrations.AlterField(
+            model_name='newsarticle',
+            name='description',
+            field=models.CharField(blank=True, default='', max_length=250),
+        ),
+        migrations.AlterField(
+            model_name='newsarticle',
+            name='published_at',
+            field=models.DateField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='newsarticle',
+            name='title',
+            field=models.CharField(blank=True, default='', max_length=100),
+        ),
+        migrations.AlterField(
+            model_name='newsarticle',
+            name='url',
+            field=models.CharField(blank=True, default='', max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='newsarticle',
+            name='url_to_image',
+            field=models.CharField(blank=True, default='', max_length=80),
+        ),
+    ]

hackrsource/MOC/newsapp/migrations/0008_newslike_liked_at.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.2 on 2017-06-20 10:48
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('newsapp', '0007_auto_20170616_1207'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='newslike',
+            name='liked_at',
+            field=models.DateField(default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+    ]

hackrsource/MOC/newsapp/migrations/0009_remove_newslike_like.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.2 on 2017-06-20 11:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('newsapp', '0008_newslike_liked_at'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='newslike',
+            name='like',
+        ),
+    ]

hackrsource/MOC/newsapp/migrations/0010_auto_20170624_1242.py

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.2 on 2017-06-24 12:42
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('newsapp', '0009_remove_newslike_like'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='newsbookmark',
+            name='article',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='article_bookmark', to='newsapp.NewsArticle'),
+        ),
+        migrations.AlterField(
+            model_name='newsbookmark',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user_bookmark', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='newscomment',
+            name='article',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='article_comments', to='newsapp.NewsArticle'),
+        ),
+        migrations.AlterField(
+            model_name='newscomment',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user_comments', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='newslike',
+            name='article',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='article_likes', to='newsapp.NewsArticle'),
+        ),
+        migrations.AlterField(
+            model_name='newslike',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user_likes', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterUniqueTogether(
+            name='newscomment',
+            unique_together=set([]),
+        ),
+    ]

hackrsource/MOC/newsapp/models.py

@@ -9,54 +9,50 @@
 
 class NewsArticle(models.Model):
     article_id = models.AutoField(primary_key=True)
-    author = models.CharField(max_length=30, null=True)
-    title = models.CharField(max_length=100, null=True)
-    description = models.CharField(max_length=250, null=True)
-    url = models.CharField(max_length=50, null=True)
-    url_to_image = models.CharField(max_length=80, null=True)
-    published_at = models.DateField(null=True)
+    author = models.CharField(max_length=30, blank=True, default="")
+    title = models.CharField(max_length=100, blank=True, default="")
+    description = models.CharField(max_length=250, blank=True, default="")
+    url = models.CharField(max_length=50, blank=True, default="")
+    url_to_image = models.CharField(max_length=80, blank=True, default="")
+    published_at = models.DateField(blank=True, null=True)
     source = models.CharField(max_length=30, default="")
 
-    def __str__(self):
+    def __unicode__(self):
         return str(self.article_id)
 
 
 class NewsComment(models.Model):
     comment_id = models.AutoField(primary_key=True)
     comment = models.CharField(max_length=200)
-    user = models.ForeignKey(User, on_delete=models.CASCADE)
-    article = models.ForeignKey(NewsArticle, on_delete=models.CASCADE)
+    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="user_comments")
+    article = models.ForeignKey(NewsArticle, on_delete=models.CASCADE, related_name="article_comments")
     commented_at = models.DateField()
 
-    def __str__(self):
+    def __unicode__(self):
         return str(self.comment_id)
 
-    class Meta:
-        unique_together = ('user', 'article',)
-
 
 class NewsBookmark(models.Model):
     bookmark_id = models.AutoField(primary_key=True)
-    user = models.ForeignKey(User, on_delete=models.CASCADE)
-    article = models.ForeignKey(NewsArticle, on_delete=models.CASCADE)
+    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="user_bookmark")
+    article = models.ForeignKey(NewsArticle, on_delete=models.CASCADE, related_name="article_bookmark")
     bookmarked_at = models.DateField()
 
-    def __str__(self):
-        return str(self.bookmark_id)
-
     class Meta:
         unique_together = ('user', 'article',)
 
+    def __unicode__(self):
+        return str(self.bookmark_id)
+
 
 class NewsLike(models.Model):
     like_id = models.AutoField(primary_key=True)
-    like = models.IntegerField()
-    user = models.ForeignKey(User, on_delete=models.CASCADE)
-    article = models.ForeignKey(NewsArticle, on_delete=models.CASCADE)
-    liked_at = models.DateField
-
-    def __str__(self):
-        return str(self.like_id)
+    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="user_likes")
+    article = models.ForeignKey(NewsArticle, on_delete=models.CASCADE, related_name="article_likes")
+    liked_at = models.DateField()
 
     class Meta:
         unique_together = ('user', 'article',)
+
+    def __unicode__(self):
+        return str(self.like_id)

hackrsource/MOC/newsapp/static/newsapp/content/dashboard.css

@@ -1,3 +1,8 @@
 .article-image .article-header {
 	padding: 10px;
+}
+
+.comment{
+    margin-bottom:5px;
+
 }