Skip to content

Commit a16d059

Browse files
rrmerugurrmerugu
authored
Merge pull request #9 from djsbalakrishnan/dhiraj
Changes made regarding documentation and naming convention
2 parents 7a23631 + 5a7fca9 commit a16d059

File tree

8 files changed

+302
-146
lines changed

8 files changed

+302
-146
lines changed

Diff for: ‎hackrsource/MOC/db.sqlite3

24 KB
Binary file not shown.

Diff for: ‎hackrsource/MOC/newsapp/migrations/0006_auto_20170613_1354.py

+87
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
# -*- coding: utf-8 -*-
2+
# Generated by Django 1.10.1 on 2017-06-13 13:54
3+
from __future__ import unicode_literals
4+
5+
from django.db import migrations, models
6+
import django.db.models.deletion
7+
8+
9+
class Migration(migrations.Migration):
10+
11+
dependencies = [
12+
('newsapp', '0005_auto_20170609_1520'),
13+
]
14+
15+
operations = [
16+
migrations.RenameModel(
17+
old_name='tbl_MST_NewsArticle',
18+
new_name='NewsArticle',
19+
),
20+
migrations.RenameModel(
21+
old_name='tbl_TRN_NewsBookmark',
22+
new_name='NewsBookmark',
23+
),
24+
migrations.RenameModel(
25+
old_name='tbl_TRN_NewsComment',
26+
new_name='NewsComment',
27+
),
28+
migrations.RenameModel(
29+
old_name='tbl_TRN_NewsLike',
30+
new_name='NewsLike',
31+
),
32+
migrations.RenameField(
33+
model_name='newsarticle',
34+
old_name='articleId',
35+
new_name='article_id',
36+
),
37+
migrations.RenameField(
38+
model_name='newsarticle',
39+
old_name='publishedAt',
40+
new_name='published_at',
41+
),
42+
migrations.RenameField(
43+
model_name='newsarticle',
44+
old_name='urlToImage',
45+
new_name='url_to_image',
46+
),
47+
migrations.RenameField(
48+
model_name='newsbookmark',
49+
old_name='bookmarkId',
50+
new_name='bookmark_id',
51+
),
52+
migrations.RenameField(
53+
model_name='newsbookmark',
54+
old_name='bookmarkedAt',
55+
new_name='bookmarked_at',
56+
),
57+
migrations.RenameField(
58+
model_name='newscomment',
59+
old_name='commentId',
60+
new_name='comment_id',
61+
),
62+
migrations.RenameField(
63+
model_name='newscomment',
64+
old_name='commentedAt',
65+
new_name='commented_at',
66+
),
67+
migrations.RenameField(
68+
model_name='newslike',
69+
old_name='likeId',
70+
new_name='like_id',
71+
),
72+
migrations.AlterField(
73+
model_name='newsbookmark',
74+
name='article',
75+
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='newsapp.NewsArticle', to_field='article_id'),
76+
),
77+
migrations.AlterField(
78+
model_name='newscomment',
79+
name='article',
80+
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='newsapp.NewsArticle', to_field='article_id'),
81+
),
82+
migrations.AlterField(
83+
model_name='newslike',
84+
name='article',
85+
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='newsapp.NewsArticle', to_field='article_id'),
86+
),
87+
]

Diff for: ‎hackrsource/MOC/newsapp/models.py

+55-53
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,62 @@
11
from __future__ import unicode_literals
2-
from django.contrib.auth.models import User
3-
from django.utils.encoding import python_2_unicode_compatible
42

3+
from django.contrib.auth.models import User
54
from django.db import models
65

6+
77
# Create your models here.
88
# will be using users class inbuilt in django
99

10-
class tbl_MST_NewsArticle(models.Model):
11-
articleId = models.AutoField(primary_key=True)
12-
author = models.CharField(max_length = 30, null=True)
13-
title = models.CharField(max_length = 100, null=True)
14-
description = models.CharField(max_length = 250, null=True)
15-
url = models.CharField(max_length = 50, null=True)
16-
urlToImage = models.CharField(max_length = 80, null=True)
17-
publishedAt = models.DateField(null=True)
18-
source = models.CharField(max_length = 30, default="")
19-
20-
def __str__(self):
21-
return str(self.articleId)
22-
23-
24-
class tbl_TRN_NewsComment(models.Model):
25-
commentId = models.AutoField(primary_key = True)
26-
comment = models.CharField(max_length = 200)
27-
user = models.ForeignKey(User, on_delete=models.CASCADE)
28-
article = models.ForeignKey(tbl_MST_NewsArticle, on_delete=models.CASCADE)
29-
commentedAt = models.DateField()
30-
31-
def __str__(self):
32-
return str(self.commentId)
33-
34-
class Meta:
35-
unique_together = ('user', 'article',)
36-
37-
class tbl_TRN_NewsBookmark(models.Model):
38-
bookmarkId = models.AutoField(primary_key = True)
39-
user = models.ForeignKey(User, on_delete=models.CASCADE)
40-
article = models.ForeignKey(tbl_MST_NewsArticle, on_delete=models.CASCADE)
41-
bookmarkedAt = models.DateField()
42-
43-
def __str__(self):
44-
return str(self.bookmarkId)
45-
46-
class Meta:
47-
unique_together = ('user', 'article',)
48-
49-
class tbl_TRN_NewsLike(models.Model):
50-
likeId = models.AutoField(primary_key = True)
51-
like = models.IntegerField()
52-
user = models.ForeignKey(User, on_delete=models.CASCADE)
53-
article = models.ForeignKey(tbl_MST_NewsArticle, on_delete=models.CASCADE)
54-
likedAt = models.DateField
55-
56-
def __str__(self):
57-
return str(self.likeId)
58-
59-
class Meta:
60-
unique_together = ('user', 'article',)
10+
class NewsArticle(models.Model):
11+
article_id = models.AutoField(primary_key=True)
12+
author = models.CharField(max_length=30, null=True)
13+
title = models.CharField(max_length=100, null=True)
14+
description = models.CharField(max_length=250, null=True)
15+
url = models.CharField(max_length=50, null=True)
16+
url_to_image = models.CharField(max_length=80, null=True)
17+
published_at = models.DateField(null=True)
18+
source = models.CharField(max_length=30, default="")
19+
20+
def __str__(self):
21+
return str(self.article_id)
22+
23+
24+
class NewsComment(models.Model):
25+
comment_id = models.AutoField(primary_key=True)
26+
comment = models.CharField(max_length=200)
27+
user = models.ForeignKey(User, on_delete=models.CASCADE)
28+
article = models.ForeignKey(NewsArticle, on_delete=models.CASCADE)
29+
commented_at = models.DateField()
30+
31+
def __str__(self):
32+
return str(self.comment_id)
33+
34+
class Meta:
35+
unique_together = ('user', 'article',)
36+
37+
38+
class NewsBookmark(models.Model):
39+
bookmark_id = models.AutoField(primary_key=True)
40+
user = models.ForeignKey(User, on_delete=models.CASCADE)
41+
article = models.ForeignKey(NewsArticle, on_delete=models.CASCADE)
42+
bookmarked_at = models.DateField()
43+
44+
def __str__(self):
45+
return str(self.bookmark_id)
46+
47+
class Meta:
48+
unique_together = ('user', 'article',)
49+
50+
51+
class NewsLike(models.Model):
52+
like_id = models.AutoField(primary_key=True)
53+
like = models.IntegerField()
54+
user = models.ForeignKey(User, on_delete=models.CASCADE)
55+
article = models.ForeignKey(NewsArticle, on_delete=models.CASCADE)
56+
liked_at = models.DateField
57+
58+
def __str__(self):
59+
return str(self.like_id)
60+
61+
class Meta:
62+
unique_together = ('user', 'article',)

Diff for: ‎hackrsource/MOC/newsapp/templates/newsapp/home.html

+18-5
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,28 @@ <h2 class="article-header text-center"> {{ values.1 }} </h2>
1616
</div>
1717
<div class="panel-footer">
1818
<div class="row">
19-
<div class="col-md-6">
19+
<div class="col-md-3">
2020
<p class="article-author">
2121
<b>Published by : </b>{{values.0}}
2222
</p> <br>
2323
</div>
24-
<div col-md-6>
25-
<button class="btn btn-default" onclick="bookmark({{id}})">
26-
Bookmark
27-
</button>
24+
<div class="col-md-9" >
25+
<div class="col-md-3">
26+
<button class="btn btn-primary" onclick="like({{id}})">
27+
Like
28+
</button>
29+
</div>
30+
<div class="col-md-3">
31+
<button class="btn btn-danger" onclick="unlike({{id}})">
32+
Unlike
33+
</button>
34+
</div>
35+
<div class="col-md-3">
36+
<button class="btn btn-default" onclick="bookmark({{id}})">
37+
Bookmark
38+
</button>
39+
</div>
40+
2841
</div>
2942
</div>
3043
</div>

Diff for: ‎hackrsource/MOC/newsapp/templates/newsapp/profile.html

+22-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="container" style="padding-top:50px">
55
<div id="post-list" class="container" style="padding-top:20px">
66
{% for id, values in result.items %}
7-
<div class="row">
7+
<div class="row" id="article-{{id}}">
88
<div class="col-md-offset-3 col-md-6">
99
<div class="panel panel-default">
1010
<div class="panel-header">
@@ -15,15 +15,28 @@ <h2 class="article-header text-center"> {{ values.1 }} </h2>
1515
</div>
1616
<div class="panel-footer">
1717
<div class="row">
18-
<div class="col-md-6">
18+
<div class="col-md-3">
1919
<p class="article-author">
2020
<b>Published by : </b>{{values.0}}
2121
</p> <br>
2222
</div>
23-
<div col-md-6>
24-
<button class="btn btn-default" onclick="unbookmark({{id}})">
25-
Remove Bookmark
26-
</button>
23+
<div class="col-md-9">
24+
<div class="col-md-3">
25+
<button class="btn btn-primary" onclick="like({{id}})">
26+
Like
27+
</button>
28+
</div>
29+
<div class="col-md-3">
30+
<button class="btn btn-danger" onclick="unlike({{id}})">
31+
Unlike
32+
</button>
33+
</div>
34+
<div class="col-md-3">
35+
<button class="btn btn-default" onclick="unbookmark({{id}})">
36+
Remove Bookmark
37+
</button>
38+
</div>
39+
2740
</div>
2841
</div>
2942
</div>
@@ -44,9 +57,11 @@ <h2 class="article-header text-center"> {{ values.1 }} </h2>
4457
url:"/unbookmark",
4558
data:{id:articleId},
4659
success: function(data) {
47-
alert(data);
60+
id = "#article-" + articleId;
61+
$(id).remove();
4862
},
4963
});
5064
}
65+
5166
</script>
5267
{% endblock %}

0 commit comments

Comments
 (0)