delayed add url and search

This commit is contained in:
2022-11-14 20:03:13 +03:00
parent 9904586ea0
commit dddbb034e5
14 changed files with 198 additions and 61 deletions

View File

@ -2,54 +2,57 @@
{% block content %}
<div class="post-preview">
{% if urls|length > 0 %}
{% for url in urls %}
{% if data|length > 0 %}
{% for d in data %}
<!-- Post preview-->
<div class="post-preview">
<div class="d-flex justify-content-between">
<div class="p-2">
<a href="{% url 'reader' url.id %}">
<h2 class="post-title">{{ url.title }}</h2>
<a href="{% url 'reader' d.url.id %}">
<h2 class="post-title">{% if d.title %}{{ d.title }}{% else %}Без заголовка{% endif %}</h2>
</a>
</div>
<div class="p-2">
<a href="/delete/{{ url.id }}"><span class="fa-regular fa-trash-can"></span></a>
<a href="/delete/{{ d.url.id }}"><span class="fa-regular fa-trash-can"></span></a>
</div>
</div>
{% if url.content %}
{% if d.short %}
<p class="post-meta">
{{ url.content }}
{{ d.short }}
</p>
{% endif %}
<p class="post-meta">
<a href="{{ url.url }}">
{{ url.url }}
<a href="{{ d.url.url }}">
{{ d.url.url }}
</a>
</p>
</div>
<!-- Divider-->
<hr class="my-4" />
{% endfor %}
{% if data.number %}
<div class="pagination container row justify-content-end">
<div></div>
<div class="step-links col-auto">
{% if urls.has_previous %}
{% if data.has_previous %}
<a href="?page=1">&laquo;</a>
<a href="?page={{ urls.previous_page_number }}">&lsaquo;</a>
<a href="?page={{ data.previous_page_number }}">&lsaquo;</a>
{% endif %}
<span class="current">
страница {{ urls.number }} из {{ urls.paginator.num_pages }}
страница {{ data.number }} из {{ data.paginator.num_pages }}
</span>
{% if urls.has_next %}
<a href="?page={{ urls.next_page_number }}">&rsaquo;</a>
<a href="?page={{ urls.paginator.num_pages }}">&raquo;</a>
{% if data.has_next %}
<a href="?page={{ data.next_page_number }}">&rsaquo;</a>
<a href="?page={{ data.paginator.num_pages }}">&raquo;</a>
{% endif %}
</div>
</div>
{% endif %}
{% else %}
<h2 class="post-title">У вас нет ссылок в архиве</h2>
{% endif %}
</div>
{% endblock %}
{% endblock %}

View File

@ -57,6 +57,7 @@
<li class="nav-item"><a class="nav-link px-lg-3 py-3 py-lg-4" href="{% url 'about' %}">О нас</a></li>
<li class="nav-item"><a class="nav-link px-lg-3 py-3 py-lg-4" href="{% url 'profile' %}">Профиль</a></li>
<li class="nav-item"><a class="nav-link px-lg-3 py-3 py-lg-4" href="{% url 'archive' %}">Архив</a></li>
<li class="nav-item"><a class="nav-link px-lg-3 py-3 py-lg-4" href="{% url 'search' %}">Поиск</a></li>
<li class="nav-item"><a class="nav-link px-lg-3 py-3 py-lg-4" href="{% url 'logout' %}">Выйти</a></li>
{% else %}
<li class="nav-item"><a class="nav-link px-lg-3 py-3 py-lg-4" href="{% url 'signup' %}">Регистрация</a></li>

View File

@ -1,27 +1,27 @@
{% extends 'base.html' %}
{% block content %}
{% if user.is_authenticated and urls|length > 0 %}
{% for url in urls %}
{% if user.is_authenticated and data|length > 0 %}
{% for d in data %}
<!-- Post preview-->
<div class="post-preview">
<div class="d-flex justify-content-between">
<div class="p-2">
<a href="{% url 'reader' url.id %}">
<h2 class="post-title">{{ url.title }}</h2>
<a href="{% url 'reader' d.url_id %}">
<h2 class="post-title">{% if d.title %}{{ d.title }}{% else %}Без заголовка{% endif %}</h2>
</a>
</div>
<div class="p-2">
<a href="{% url 'archive_url' url.id %}"><span class="fa-regular fa-square-check"></span></a>
<a href="{% url 'archive_url' d.url_id %}"><span class="fa-regular fa-square-check"></span></a>
</div>
</div>
{% if url.content %}
{% if d.short %}
<p class="post-meta">
{{ url.content }}
{{ d.short }}
</p>
{% endif %}
<p class="post-meta">
{{ url.url|urlizetrunc:70 }}
{{ d.url.url|urlizetrunc:70 }}
</p>
</div>
<!-- Divider-->

View File

@ -0,0 +1,58 @@
{% extends 'base.html' %}
{% block title %}Поиск{% endblock %}
{% block content %}
<form action="{% url 'search' %}" method="post">
{% csrf_token %}
<input type="text" name="search" placeholder="Что ищем?">
<input type="submit" value="Искать" />
</form>
<br />
{% for d in data %}
<!-- Post preview-->
<div class="post-preview">
<div class="d-flex justify-content-between">
<div class="p-2">
<a href="{% url 'reader' d.url.id %}">
<h2 class="post-title">{{ d.title }}</h2>
</a>
</div>
<div class="p-2">
<a href="{% url 'archive_url' d.url.id %}"><span class="fa-regular fa-square-check"></span></a>
</div>
</div>
{% if d.short %}
<p class="post-meta">
{{ d.short }}
</p>
{% endif %}
<p class="post-meta">
{{ d.url.url|urlizetrunc:70 }}
</p>
</div>
<!-- Divider-->
<hr class="my-4" />
{% endfor %}
{% if data.number %}
<div class="pagination container row justify-content-end">
<div></div>
<div class="step-links col-auto">
{% if data.has_previous %}
<a href="?page=1">&laquo;</a>
<a href="?page={{ data.previous_page_number }}">&lsaquo;</a>
{% endif %}
<span class="current">
страница {{ data.number }} из {{ data.paginator.num_pages }}
</span>
{% if data.has_next %}
<a href="?page={{ data.next_page_number }}">&rsaquo;</a>
<a href="?page={{ data.paginator.num_pages }}">&raquo;</a>
{% endif %}
</div>
</div>
{% endif %}
{% endblock %}