Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The homepage bugs have been resolved #128

Merged
merged 2 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified newsaggregator/core/__pycache__/__init__.cpython-312.pyc
Binary file not shown.
Binary file modified newsaggregator/core/__pycache__/admin.cpython-312.pyc
Binary file not shown.
Binary file modified newsaggregator/core/__pycache__/apps.cpython-312.pyc
Binary file not shown.
Binary file modified newsaggregator/core/__pycache__/models.cpython-312.pyc
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified newsaggregator/db.sqlite3
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified newsaggregator/newsaggregator/__pycache__/urls.cpython-312.pyc
Binary file not shown.
Binary file modified newsaggregator/newsaggregator/__pycache__/wsgi.cpython-312.pyc
Binary file not shown.
10 changes: 8 additions & 2 deletions newsaggregator/templates/components/news.html
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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">
Expand All @@ -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">
Expand Down
7 changes: 3 additions & 4 deletions newsaggregator/templates/core/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand All @@ -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 %}
Binary file modified newsaggregator/userauths/__pycache__/__init__.cpython-312.pyc
Binary file not shown.
Binary file modified newsaggregator/userauths/__pycache__/admin.cpython-312.pyc
Binary file not shown.
Binary file modified newsaggregator/userauths/__pycache__/apps.cpython-312.pyc
Binary file not shown.
Binary file modified newsaggregator/userauths/__pycache__/forms.cpython-312.pyc
Binary file not shown.
Binary file modified newsaggregator/userauths/__pycache__/models.cpython-312.pyc
Binary file not shown.
Binary file modified newsaggregator/userauths/__pycache__/urls.cpython-312.pyc
Binary file not shown.
Binary file modified newsaggregator/userauths/__pycache__/views.cpython-312.pyc
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading