Merge pull request #65 from anurag6569201/main

paginator and bookmark #47 and #57

newsaggregator/core/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
-from news.models import Headline
+from core.models import Headline,Bookmark
 
-admin.site.register(Headline)
+admin.site.register(Headline)
+admin.site.register(Bookmark)

newsaggregator/core/migrations/0001_initial.py

@@ -0,0 +1,34 @@
+# Generated by Django 5.0.6 on 2024-05-21 11:05
+
+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='Headline',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=200)),
+                ('image', models.URLField(blank=True, null=True)),
+                ('url', models.TextField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Bookmark',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('headline', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.headline')),
+            ],
+        ),
+    ]

newsaggregator/core/models.py

@@ -1,3 +1,16 @@
 from django.db import models
+from django.conf import settings
 
-# Create your models here.
+class Headline(models.Model):
+  title = models.CharField(max_length=200)#title char(200)
+  image = models.URLField(null=True, blank=True)#image
+  url = models.TextField()
+  def __str__(self):
+    return self.title
+
+class Bookmark(models.Model):
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
+    headline = models.ForeignKey(Headline, on_delete=models.CASCADE)
+
+    def __str__(self):
+        return f"{self.user} - {self.headline.title}"

newsaggregator/core/urls.py

@@ -10,4 +10,9 @@
     path('advertise/',views.advertise,name='advertise'),
     path('privacy/',views.privacy,name='privacy'),
     path('scrape/<str:name>', views.scrape, name="scrape"),
+
+    # bookmarking
+    path('bookmark/<int:headline_id>/', views.bookmark_article, name='bookmark_article'),
+    path('bookmarks/', views.view_bookmarks, name='view_bookmarks'),
+    path('remove_bookmark/<int:headline_id>/', views.remove_bookmark, name='remove_bookmark'),
 ]

newsaggregator/core/views.py

@@ -1,19 +1,28 @@
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.http import HttpResponse
+from django.http import HttpResponse, JsonResponse
 from django.shortcuts import render
 
 from django.shortcuts import render
 import requests
 from django.shortcuts import render, redirect
 from bs4 import BeautifulSoup as BSoup
-from news.models import Headline
+from core.models import Headline
 
 from datetime import datetime
 from core.forms import ContactForm
 from django.template.loader import render_to_string
 from django.core.mail import send_mail
-# Create your views here.
+
+
+from django.contrib.auth.decorators import login_required
+from django.shortcuts import render, redirect, get_object_or_404
+from core.models import Headline, Bookmark
+from django.contrib import messages
+from django.views.decorators.csrf import csrf_exempt
+
+
+from django.core.paginator import Paginator,PageNotAnInteger,EmptyPage
 #view for scraping new
 
 def scrape(request, name):
@@ -51,21 +60,35 @@ def scrape(request, name):
 
 @login_required(login_url='userauths:sign-in')
 def news_list(request):
-    # Fetch all headlines
-    headlines = Headline.objects.all()[::-1]  # store records in reverse order
+    # Fetch all headlines in reverse order
+    headlines = Headline.objects.all().order_by('-id')
     swiper = Headline.objects.all()[:4]
-    
+
     # Get the list of bookmarked headline IDs for the current user
-    user_bookmarked_headline_ids = request.user.bookmark_set.values_list('headline_id', flat=True)
+    user_bookmarked_headline_ids = []
+    if request.user.is_authenticated:
+        user_bookmarked_headline_ids = request.user.bookmark_set.values_list('headline_id', flat=True)
+
+    # Pagination logic
+    page = request.GET.get('page', 1)
+    num_of_items = 9
+    paginator = Paginator(headlines, num_of_items)
 
+    try:
+        headlines_obj = paginator.page(page)
+    except PageNotAnInteger:
+        headlines_obj = paginator.page(1)
+    except EmptyPage:
+        headlines_obj = paginator.page(paginator.num_pages)
+
     context = {
-        "object_list": headlines,
+        "object_list": headlines_obj,
+        "paginator": paginator,
         'swiper': swiper,
         'user_bookmarked_headline_ids': user_bookmarked_headline_ids,
     }
     return render(request, "core/index.html", context)
 
-
 @login_required(login_url='userauths:sign-in')
 def index(request):
     Headline.objects.all().delete()
@@ -156,4 +179,30 @@ def privacy(request):
     return render(request, "core/privacy.html", context)
 
 
+@login_required
+def view_bookmarks(request):
+     # Get the list of bookmarked headline IDs for the current user
+    user_bookmarked_headline_ids = request.user.bookmark_set.values_list('headline_id', flat=True)
+    bookmarks = Bookmark.objects.filter(user=request.user).select_related('headline')
+    context = {
+        'bookmarks': bookmarks,
+        'user_bookmarked_headline_ids': user_bookmarked_headline_ids,
+    }
+    return render(request, 'core/bookmarks.html', context)
 
+@csrf_exempt
+@login_required(login_url='userauths:sign-in')
+def bookmark_article(request, headline_id):
+    if request.method == 'POST':
+        headline = get_object_or_404(Headline, id=headline_id)
+        Bookmark.objects.get_or_create(user=request.user, headline=headline)
+        return JsonResponse({'status': 'success'})
+    return JsonResponse({'status': 'error', 'message': 'Invalid request'}, status=400)
+
+@csrf_exempt
+@login_required(login_url='userauths:sign-in')
+def remove_bookmark(request, headline_id):
+    if request.method == 'POST':
+        Bookmark.objects.filter(user=request.user, headline_id=headline_id).delete()
+        return JsonResponse({'status': 'success'})
+    return JsonResponse({'status': 'error', 'message': 'Invalid request'}, status=400)