Merge pull request #128 from Varsha010101/main

The homepage bugs have been resolved
SiddharthBahuguna · Jun 5, 2024 · 92454ad · 92454ad
2 parents 7700982 + acd90c3
commit 92454ad
Show file tree

Hide file tree

Showing 24 changed files with 11 additions and 6 deletions.
diff --git a/newsaggregator/core/__pycache__/__init__.cpython-312.pyc b/newsaggregator/core/__pycache__/__init__.cpython-312.pyc
diff --git a/newsaggregator/core/__pycache__/admin.cpython-312.pyc b/newsaggregator/core/__pycache__/admin.cpython-312.pyc
diff --git a/newsaggregator/core/__pycache__/apps.cpython-312.pyc b/newsaggregator/core/__pycache__/apps.cpython-312.pyc
diff --git a/newsaggregator/core/__pycache__/models.cpython-312.pyc b/newsaggregator/core/__pycache__/models.cpython-312.pyc
diff --git a/newsaggregator/core/migrations/__pycache__/0001_initial.cpython-312.pyc b/newsaggregator/core/migrations/__pycache__/0001_initial.cpython-312.pyc
diff --git a/newsaggregator/core/migrations/__pycache__/0002_contact.cpython-312.pyc b/newsaggregator/core/migrations/__pycache__/0002_contact.cpython-312.pyc
diff --git a/...s/__pycache__/0003_headline_average_rating_headline_rating_count_and_more.cpython-312.pyc b/...s/__pycache__/0003_headline_average_rating_headline_rating_count_and_more.cpython-312.pyc
diff --git a/newsaggregator/core/migrations/__pycache__/__init__.cpython-312.pyc b/newsaggregator/core/migrations/__pycache__/__init__.cpython-312.pyc
diff --git a/newsaggregator/db.sqlite3 b/newsaggregator/db.sqlite3
diff --git a/newsaggregator/newsaggregator/__pycache__/__init__.cpython-312.pyc b/newsaggregator/newsaggregator/__pycache__/__init__.cpython-312.pyc
diff --git a/newsaggregator/newsaggregator/__pycache__/settings.cpython-312.pyc b/newsaggregator/newsaggregator/__pycache__/settings.cpython-312.pyc
diff --git a/newsaggregator/newsaggregator/__pycache__/urls.cpython-312.pyc b/newsaggregator/newsaggregator/__pycache__/urls.cpython-312.pyc
diff --git a/newsaggregator/newsaggregator/__pycache__/wsgi.cpython-312.pyc b/newsaggregator/newsaggregator/__pycache__/wsgi.cpython-312.pyc
diff --git a/newsaggregator/templates/components/news.html b/newsaggregator/templates/components/news.html
@@ -5,8 +5,14 @@
 <div class="container">
     {% include 'components/swiperjs.html' %}
 
+     <!-- Display a welcome message for authenticated users -->
+     <div class="alert alert-success" role="alert">
+        <p>Welcome back, {{ request.user.username }}! Enjoy your bookmarks.</p>
+    </div>
     <div class="row mt-2 p-2">
+
         {% for record in object_list %}
+
         <div class="col-12 col-md-6 col-lg-4 mb-4 newscard">
             <div class="card h-100">
                 <img style="max-height: 11em;" class="card-img-top" src="{{ record.image }}" alt="News Image" loading="lazy">
@@ -154,7 +160,7 @@
             </style>
 
 
-    <!-- News Modal -->
+    <!-- <!-- News Modal 
     <div class="modal fade" id="newsModal" tabindex="-1" aria-labelledby="newsModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-dialog-centered modal-lg">
             <div class="modal-content">
@@ -169,7 +175,7 @@ <h5 class="modal-title" id="newsModalLabel">News Article</h5>
                 </div>
             </div>
         </div>
-    </div>
+    </div> -->
 
     <!-- Report Modal -->
     <div class="modal fade" id="reportModal" tabindex="-1" aria-labelledby="reportModalLabel" aria-hidden="true">

diff --git a/newsaggregator/templates/core/index.html b/newsaggregator/templates/core/index.html
@@ -12,8 +12,10 @@
 <!-- Define the index block -->
 {% block index %}
     <!-- Include the news component -->
+
     {% include 'components/news.html' %}
 
+
     <!-- Check if the user is not authenticated -->
     {% if not request.user.is_authenticated %}
         <!-- Display a message encouraging the user to register -->
@@ -27,9 +29,6 @@
             </div>
         </div>
     {% else %}
-        <!-- Display a welcome message for authenticated users -->
-        <div class="alert alert-success" role="alert">
-            <p>Welcome back, {{ request.user.username }}! Enjoy your bookmarks.</p>
-        </div>
+
     {% endif %}
 {% endblock index %}
diff --git a/newsaggregator/userauths/__pycache__/__init__.cpython-312.pyc b/newsaggregator/userauths/__pycache__/__init__.cpython-312.pyc
diff --git a/newsaggregator/userauths/__pycache__/admin.cpython-312.pyc b/newsaggregator/userauths/__pycache__/admin.cpython-312.pyc
diff --git a/newsaggregator/userauths/__pycache__/apps.cpython-312.pyc b/newsaggregator/userauths/__pycache__/apps.cpython-312.pyc
diff --git a/newsaggregator/userauths/__pycache__/forms.cpython-312.pyc b/newsaggregator/userauths/__pycache__/forms.cpython-312.pyc
diff --git a/newsaggregator/userauths/__pycache__/models.cpython-312.pyc b/newsaggregator/userauths/__pycache__/models.cpython-312.pyc
diff --git a/newsaggregator/userauths/__pycache__/urls.cpython-312.pyc b/newsaggregator/userauths/__pycache__/urls.cpython-312.pyc
diff --git a/newsaggregator/userauths/__pycache__/views.cpython-312.pyc b/newsaggregator/userauths/__pycache__/views.cpython-312.pyc
diff --git a/newsaggregator/userauths/migrations/__pycache__/0001_initial.cpython-312.pyc b/newsaggregator/userauths/migrations/__pycache__/0001_initial.cpython-312.pyc
diff --git a/newsaggregator/userauths/migrations/__pycache__/__init__.cpython-312.pyc b/newsaggregator/userauths/migrations/__pycache__/__init__.cpython-312.pyc