Merge pull request #141 from anurag6569201/main

updated fixes #140

newsaggregator/core/views.py

@@ -84,7 +84,7 @@ def news_list(request):
     return render(request, "core/index.html", context)
 
 
-# @custom_login_required
+@custom_login_required
 def index(request):
     Headline.objects.all().delete()
     session = requests.Session()

newsaggregator/static/assets/js/preloader.js

@@ -6,5 +6,5 @@ window.addEventListener('load', function() {
     setTimeout(() => {
         preloader.style.display = 'none';
         mainContent.style.display = 'flex';
-    }, 2000); // Adjust the delay time (in milliseconds) as needed
+    }, 100); // Adjust the delay time (in milliseconds) as needed
 });

newsaggregator/templates/components/navbar.html

@@ -2,10 +2,12 @@
 <nav class="navbar">
     <a href="{% url 'core:index' %}">
         <span class="logo-light">
-            <span class="logo-container"><img src="{% static './assets/images/news.png' %}" alt="logo" width="70" />Onion News</span>
+            <span class="logo-container"><img src="{% static './assets/images/news.png' %}" alt="logo"
+                    width="70" />Onion News</span>
         </span>
         <span class="logo-dark">
-            <span class="logo-container"><img src="{% static './assets/images/news.png' %}" alt="logo" width="70" />Onion News</span>
+            <span class="logo-container"><img src="{% static './assets/images/news.png' %}" alt="logo"
+                    width="70" />Onion News</span>
         </span>
     </a>
     <div class="btn-group">
@@ -22,29 +24,29 @@
     <div class="flex-wrapper">
         <ul class="desktop-nav">
             <!-- Start of list item for Home link -->
-<li>
-    <!-- Link to the Home page. The URL is generated using Django's url template tag, which takes the name of a view function or a URL pattern name. -->
-    <a href="{% url 'core:index' %}" class="nav-link">Home</a>
-</li>
+            <li {% if not request.user.is_authenticated %} style="pointer-events: none;" {% endif %}>
+                <!-- Link to the Home page. The URL is generated using Django's url template tag, which takes the name of a view function or a URL pattern name. -->
+                <a {% if request.user.is_authenticated %} href="{% url 'core:index' %}" {% endif %} class="nav-link">Home</a>
+            </li>
 
-<!-- Start of list item for My Bookmarks link -->
-<li class="nav-item">
-    <!-- Link to the My Bookmarks page. The URL is generated using Django's url template tag. -->
-    <a href="{% url 'core:view_bookmarks' %}" class="nav-link">My Bookmarks</a>
-</li>
+            <!-- Start of list item for My Bookmarks link -->
+            <li {% if not request.user.is_authenticated %} style="pointer-events: none;" {% endif %}>
+                <!-- Link to the My Bookmarks page. The URL is generated using Django's url template tag. -->
+                <a {% if request.user.is_authenticated %} href="{% url 'core:view_bookmarks' %}" {% endif %} class="nav-link">My Bookmarks</a>
+            </li>
 
-<!-- Start of list item for About Us link -->
-<li>
-    <!-- Link to the About Us page. The URL is generated using Django's url template tag. -->
-    <a href="{% url 'core:about' %}" class="nav-link">About Us</a>
-</li>
+            <!-- Start of list item for About Us link -->
+            <li>
+                <!-- Link to the About Us page. The URL is generated using Django's url template tag. -->
+                <a href="{% url 'core:about' %}" class="nav-link">About Us</a>
+            </li>
 
-<!-- Start of list item for Contact link -->
-<li>
-    <!-- Link to the Contact page. The URL is generated using Django's url template tag. -->
-    <a href="{% url 'core:contact' %}" class="nav-link">Contact</a>
-</li>
-<li>
+            <!-- Start of list item for Contact link -->
+            <li>
+                <!-- Link to the Contact page. The URL is generated using Django's url template tag. -->
+                <a href="{% url 'core:contact' %}" class="nav-link">Contact</a>
+            </li>
+            <li>
                 {% if not request.user.is_authenticated %}
                 <a href="{% url 'userauths:sign-up' %}" class="nav-link">Sign-in/Sign-up</a>
                 {% else %}
@@ -103,4 +105,4 @@
             </ul>
         </div>
     </div>
-</nav>
+</nav>

newsaggregator/templates/userauths/sign-in.html

@@ -1,4 +1,4 @@
-{% extends '/base.html' %}
+{% extends 'core/base.html' %}
 {% load static %}
 
 {% block authentication %}