all features OK, cleaned up (flake8) code except migrations files
This commit is contained in:
@@ -1,9 +0,0 @@
|
||||
{% extends 'base.html' %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<div class="d-flex align-items-center justify-content-center">
|
||||
<p> Suppression effectuée </p>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
@@ -1,23 +1,50 @@
|
||||
{% extends 'base.html' %}
|
||||
{% load reviews_extras %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<div class="container">
|
||||
|
||||
<div class="row">
|
||||
<div class="d-flex justify-content-center mt-5">
|
||||
<h2> FLux </h2>
|
||||
<h2> Bienvenue {{ request.user }}</h2>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
{% for ticket in tickets %}
|
||||
{% include 'reviews/ticket_detail.html' %}
|
||||
<div class="col-3 align-self-end">
|
||||
<a href="{% url 'review-ticket' ticket.id %}" type="button" class="btn btn-primary">Créer une critique</a>
|
||||
|
||||
<div class="row d-flex justify-content-center mt-4 mb-3">
|
||||
<div class="col-3 d-flex justify-content-center">
|
||||
<a href="{% url 'ticket-add' %}" type="button" class="btn btn-primary">Demander une critique</a>
|
||||
</div>
|
||||
<div class="col-3 d-flex justify-content-center">
|
||||
<a href="{% url 'review-add' %}" type="button" class="btn btn-primary">Créer une critique</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
{% for post in posts %}
|
||||
{% if post.content_type == 'TICKET' %}
|
||||
<div class="row border border-2 border-secondary-subtle my-3">
|
||||
{% include 'reviews/ticket_detail.html' with ticket=post %}
|
||||
<div class="col-6 d-flex justify-content-end mb-2">
|
||||
{% if not post.review %}
|
||||
<div class="col-4 align-self-end">
|
||||
<a href="{% url 'review-ticket' post.id %}" type="button" class="btn btn-primary">Créer une critique</a>
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="col-6 align-self-end">
|
||||
<i>{% display_owner post.review.user %} créé une critique, le {{ post.time_created|date:"d M Y"}}</i>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% elif post.content_type == 'REVIEW' %}
|
||||
<div class="row border border-2 border-secondary-subtle my-3">
|
||||
{% include 'reviews/review_detail.html' with review=post %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
{% for ticket in tickets %}
|
||||
{% include 'reviews/ticket_detail.html' %}
|
||||
<div class="col-6 d-flex justify-content-end mb-2">
|
||||
{% if ticket.review is not True %}
|
||||
{% if not ticket.review %}
|
||||
<div class="col-4 align-self-end">
|
||||
<a href="{% url 'review-ticket' ticket.id %}" type="button" class="btn btn-primary">Créer une critique</a>
|
||||
</div>
|
||||
@@ -30,5 +30,4 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -2,45 +2,41 @@
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
|
||||
<div class="row">
|
||||
<div class="d-flex justify-content-center mt-5">
|
||||
<h2> Posts </h2>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row d-flex justify-content-center mt-4 mb-3">
|
||||
{% for ticket in tickets %}
|
||||
{% include 'reviews/ticket_detail.html' %}
|
||||
|
||||
<div class="col-4 d-flex justify-content-end mb-2">
|
||||
{% if perms.reviews.change_ticket %}
|
||||
<div class="col-3 align-self-end">
|
||||
<a href="{% url 'ticket-update' ticket.id %}" type="button" class="btn btn-primary">Modifier</a>
|
||||
</div>
|
||||
<div class="col-3 align-self-end">
|
||||
<a href="{% url 'ticket-delete' ticket.id %}" type="button" class="btn btn-danger">Supprimer</a>
|
||||
</div>
|
||||
{% for ticket in tickets %}
|
||||
<div class="row border border-2 border-secondary-subtle my-3">
|
||||
{% include 'reviews/ticket_detail.html' %}
|
||||
<div class="col d-flex justify-content-end mb-2">
|
||||
<div class="d-flex align-self-end m-2">
|
||||
<a href="{% url 'ticket-update' ticket.id %}" type="button" class="btn btn-primary">Modifier</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
|
||||
{% for review in reviews %}
|
||||
{% include 'reviews/review_detail.html' %}
|
||||
<div class="col d-flex justify-content-end mb-2">
|
||||
{% if perms.reviews.change_ticket %}
|
||||
<div class="d-flex align-self-end m-2">
|
||||
<a href="{% url 'review-update' review.id %}" type="button" class="btn btn-primary">Modifier</a>
|
||||
</div>
|
||||
<div class="d-flex align-self-end m-2">
|
||||
<a href="{% url 'review-delete' review.id %}" type="button" class="btn btn-danger">Supprimer</a>
|
||||
</div>
|
||||
<div class="d-flex align-self-end m-2">
|
||||
<a href="{% url 'ticket-delete' ticket.id %}" type="button" class="btn btn-danger">Supprimer</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
{% for review in reviews %}
|
||||
<div class="row border border-2 border-secondary-subtle my-3">
|
||||
{% include 'reviews/review_detail.html' %}
|
||||
<div class="col d-flex justify-content-end mb-2">
|
||||
<div class="d-flex align-self-end m-2">
|
||||
<a href="{% url 'review-update' review.id %}" type="button" class="btn btn-primary">Modifier</a>
|
||||
</div>
|
||||
<div class="d-flex align-self-end m-2">
|
||||
<a href="{% url 'review-delete' review.id %}" type="button" class="btn btn-danger">Supprimer</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,18 +1,19 @@
|
||||
<div class="row border border-2 border-secondary-subtle my-3">
|
||||
{% load reviews_extras %}
|
||||
|
||||
<div class="row">
|
||||
<div class="col-8 mb-4">
|
||||
{% if request.user == review.user %}
|
||||
vous avez publié une critique
|
||||
{% else %}
|
||||
{{ review.user }} a publié une critique
|
||||
{% endif %}
|
||||
{% display_owner review.user %} publié une critique
|
||||
</div>
|
||||
|
||||
<div class="col-4 d-flex justify-content-end">
|
||||
{{ review.time_created }}
|
||||
</div>
|
||||
|
||||
<span style="font-size: 22px">{{ review.headline }} - {{ review.rating }} ★ </span>
|
||||
<p> {{ review.comment }} </p>
|
||||
<div class="d-flex justify-content-center border border-3 mb-3">
|
||||
{% include 'reviews/ticket_detail.html' with ticket=review.ticket %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row d-flex justify-content-center">
|
||||
<span style="font-size: 22px" class="mb-3">{{ review.headline }} - {{ review.rating|rating_stars }}</span>
|
||||
<p> {{ review.comment }} </p>
|
||||
<div class="col-10 border border-2 border-secondary-subtle mb-3">
|
||||
{% include 'reviews/ticket_detail.html' with ticket=review.ticket %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
<form method='post' enctype='multipart/form-data'>
|
||||
{% csrf_token %}
|
||||
{{ review_form.headline }}
|
||||
{% for radio in review_form.rating %}
|
||||
<div class="radio">
|
||||
{{ radio }}
|
||||
</div>
|
||||
{% endfor %}
|
||||
</form>
|
||||
|
||||
@@ -11,7 +11,9 @@
|
||||
<div class="row border border-3 border-secondary-subtle">
|
||||
<p>Vous êtes en train de répondre à </p>
|
||||
<div class="col d-flex justify-content-center mb-2">
|
||||
{% include 'reviews/ticket_detail.html' %}</div>
|
||||
<div class="row border border-2 border-secondary-subtle my-3">
|
||||
{% include 'reviews/ticket_detail.html' %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -3,21 +3,22 @@
|
||||
{% block content %}
|
||||
|
||||
<div class="container">
|
||||
<div class="row mt-4">
|
||||
<div class="row my-4">
|
||||
<div class="d-flex justify-content-center">
|
||||
<h2>Modifier votre critique</h2>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row border border-3">
|
||||
<div class="col-8">
|
||||
<p>Vous êtes en train de poster en réponse à</p>
|
||||
</div>
|
||||
<div class="d-flex justify-content-center">
|
||||
{% include 'reviews/ticket_detail.html' with ticket=review.ticket %}
|
||||
</div>
|
||||
|
||||
<div class="row d-flex justify-content-center">
|
||||
<div class="col-10 border border-2 border-secondary-subtle mb-3">
|
||||
{% include 'reviews/ticket_detail.html' with ticket=review.ticket %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row border border-3 p-2">
|
||||
<div class="col-3">
|
||||
<p>Critique</p>
|
||||
@@ -35,6 +36,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,12 +1,55 @@
|
||||
{% extends 'base.html' %}
|
||||
{% block nav %}
|
||||
<nav>
|
||||
<a href="{% url 'flux' %}">Flux</a>
|
||||
<a href="{% url 'posts' %}">Posts</a>
|
||||
<a href="{% url 'subscribed' %}">Abonnements</a>
|
||||
<a href="{% url 'logout' %}">Se déconnecter</a>
|
||||
</nav>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h2> Subscribed </h2>
|
||||
|
||||
<div class="container text-center">
|
||||
<div class="row d-flex justify-content-center">
|
||||
<div class="d-flex justify-content-center my-5">
|
||||
<h2> Suivre d'autres utilisateurs </h2>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<form method="post">
|
||||
{% csrf_token %}
|
||||
<div class="form-group">
|
||||
{{ user_form }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<button type="submit" class="btn btn-primary">Envoyer</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="row d-flex justify-content-end">
|
||||
<div class="d-flex justify-content-center mt-5">
|
||||
<h2> Abonnements </h2>
|
||||
</div>
|
||||
|
||||
{% for user in followed %}
|
||||
<div class="col-6 border border-2 m-1">
|
||||
{{ user.followed_user }}
|
||||
</div>
|
||||
<div class="col-3 m-1">
|
||||
<a href="{% url 'unsubscribe' user.followed_user.id %}" type="button" class="btn btn-primary">Se désabonner</a>
|
||||
</div>
|
||||
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
<div class="row d-flex justify-content-center">
|
||||
<div class="d-flex justify-content-center mt-5">
|
||||
<h2> Abonnés </h2>
|
||||
</div>
|
||||
{% for user in following %}
|
||||
<div class="col-6 border border-2 m-1">
|
||||
{{ user.user }}
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,12 +1,16 @@
|
||||
{% extends 'base.html' %}
|
||||
|
||||
{% block content %}
|
||||
<div class="d-flex justify-content-center align-self-center">
|
||||
<form method="post">
|
||||
{% csrf_token %}
|
||||
<p> Êtes vous sûr de vouloir supprimer {{ ticket.title }} ? </p>
|
||||
<button type="submit" class="btn btn-warning">Supprimer</button>
|
||||
</form>
|
||||
|
||||
<div class="container text-center" style="height: 100vh">
|
||||
<div class="row h-100 align-items-center">
|
||||
<form method="post">
|
||||
{% csrf_token %}
|
||||
<p> Êtes vous sûr de vouloir supprimer la demande "{{ ticket.title }}" ? </p>
|
||||
<button type="submit" class="btn btn-warning">Supprimer</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
<div class="row border border-2 border-secondary-subtle my-3">
|
||||
{% load reviews_extras %}
|
||||
|
||||
<div class="row">
|
||||
<div class="col-8 mb-4">
|
||||
{% if request.user == ticket.user %}
|
||||
<strong>vous</strong> avez demandé une critique
|
||||
{% else %}
|
||||
<strong>{{ ticket.user }}</strong> a demandé une critique
|
||||
{% endif %}
|
||||
{% display_owner ticket.user %} publié une demande
|
||||
</div>
|
||||
<div class="col-4 d-flex justify-content-end">
|
||||
{{ ticket.time_created }}
|
||||
</div>
|
||||
<p><strong> {{ ticket.title }} </strong></p>
|
||||
<p> {{ ticket.desc }} </p>
|
||||
<div class="col-3 mb-2">
|
||||
<img src="{{ ticket.image.url }}" class="img" style="width: 200px; height: auto" alt="Couverture de {{ ticket.title }}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p><strong> {{ ticket.title }} </strong></p>
|
||||
<p> {{ ticket.desc }} </p>
|
||||
|
||||
<div class="col-3 mb-2">
|
||||
<img src="{{ ticket.image.url }}" class="img" alt="Couverture de {{ ticket.title }}">
|
||||
</div>
|
||||
@@ -1,28 +0,0 @@
|
||||
<div class="row border border-2 border-secondary-subtle my-3">
|
||||
<div class="col-8">
|
||||
{% if request.user == ticket.user %}
|
||||
vous avez demandé une critique
|
||||
{% else %}
|
||||
{{ ticket.user }} a demandé une critique
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="col-4 d-flex justify-content-end">
|
||||
{{ ticket.time_created }}
|
||||
</div>
|
||||
<p> {{ ticket.title }} </p>
|
||||
<p> {{ ticket.body }} </p>
|
||||
<div class="col-3 mb-2">
|
||||
<img src="{{ ticket.image.url }}" class="img" style="width: 200px; height: auto" alt="Couverture de {{ ticket.title }}">
|
||||
</div>
|
||||
<div class="col-4 d-flex justify-content-end mb-2">
|
||||
{% if request.user == ticket.user %}
|
||||
<div class="col-3 align-self-end">
|
||||
<a href="{% url 'ticket-update' ticket.id %}" type="button" class="btn btn-primary">Modifier</a>
|
||||
</div>
|
||||
<div class="col-3 align-self-end">
|
||||
<a href="{% url 'ticket-delete' ticket.id %}" type="button" class="btn btn-danger">Supprimer</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
14
LITReview/reviews/templates/reviews/unsubscribe.html
Normal file
14
LITReview/reviews/templates/reviews/unsubscribe.html
Normal file
@@ -0,0 +1,14 @@
|
||||
{% extends 'base.html' %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<div class="container text-center" style="height: 100vh">
|
||||
<div class="row h-100 align-items-center">
|
||||
<form method="post">
|
||||
{% csrf_token %}
|
||||
<p> Êtes vous sûr de vouloir vous désabonner de {{ followed.followed_user }} ? </p>
|
||||
<button type="submit" class="btn btn-warning">Confirmer</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user