From 307b8f8ddea30cb44ad02170b40dd3c0d1d3d6c3 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Thu, 9 Jul 2020 04:10:09 +0100 Subject: Add reviews Fixes #173 --- app/templates/macros/reviews.html | 117 +++++++++++++++++++++++++ app/templates/packages/review_create_edit.html | 45 ++++++++++ app/templates/packages/view.html | 10 +++ app/templates/threads/view.html | 19 ++-- 4 files changed, 186 insertions(+), 5 deletions(-) create mode 100644 app/templates/macros/reviews.html create mode 100644 app/templates/packages/review_create_edit.html (limited to 'app/templates') diff --git a/app/templates/macros/reviews.html b/app/templates/macros/reviews.html new file mode 100644 index 0000000..fc6673e --- /dev/null +++ b/app/templates/macros/reviews.html @@ -0,0 +1,117 @@ +{% macro render_reviews(reviews) -%} + +{% endmacro %} + + +{% macro render_review_form(package, current_user) -%} +
+
+ {{ _("Review") }} +
+
+ +

+ {{ _("Do you recommend this %(type)s?", type=package.type.value | lower) }} +

+ +
+ + +
+ +

+ {{ _("Why or why not? Try to be constructive") }} +

+ +
+ + +
+ +
+ +
+
+{% endmacro %} + + +{% macro render_review_preview(package, current_user) -%} + +
+
+ {{ _("Review") }} +
+
+

+ {{ _("Do you recommend this %(type)s?", type=package.type.value | lower) }} +

+ + {% set review_url = url_for('packages.review', author=package.author.username, name=package.name) %} + + +
+
+{% endmacro %} diff --git a/app/templates/packages/review_create_edit.html b/app/templates/packages/review_create_edit.html new file mode 100644 index 0000000..2f475cd --- /dev/null +++ b/app/templates/packages/review_create_edit.html @@ -0,0 +1,45 @@ +{% extends "base.html" %} + +{% block title %} + {{ _("Review") }} +{% endblock %} + +{% block content %} + +

{{ _("Review") }}

+ +{% from "macros/forms.html" import render_field, render_submit_field, render_radio_field %} +
+ {{ form.hidden_tag() }} +
+
+ +
+
+
+
+ {{ current_user.display_name }} + +
+
+

+ {{ _("Do you recommend this %(type)s?", type=package.type.value | lower) }} +

+ {{ render_radio_field(form.recommends) }} + +

+ {{ _("Why or why not? Try to be constructive") }} +

+ + {{ render_field(form.title) }} + {{ render_field(form.comment, label="", class_="m-0", fieldclass="form-control markdown") }}
+ {{ render_submit_field(form.submit) }} +
+
+
+
+ +
+ + +{% endblock %} diff --git a/app/templates/packages/view.html b/app/templates/packages/view.html index cd7ba9d..3a8084d 100644 --- a/app/templates/packages/view.html +++ b/app/templates/packages/view.html @@ -459,6 +459,16 @@
+

Ratings and Reviews

+ + {% from "macros/reviews.html" import render_reviews, render_review_form, render_review_preview %} + {% if current_user.is_authenticated %} + {{ render_review_form(package, current_user) }} + {% else %} + {{ render_review_preview(package) }} + {% endif %} + {{ render_reviews(package.reviews) }} + {# {% if current_user.is_authenticated or requests %}

Edit Requests

diff --git a/app/templates/threads/view.html b/app/templates/threads/view.html index 13097fe..b91f866 100644 --- a/app/templates/threads/view.html +++ b/app/templates/threads/view.html @@ -19,12 +19,21 @@ Threads {% endif %} {% endif %} -

{% if thread.private %}🔒 {% endif %}{{ thread.title }}

- - {% if thread.package or current_user.is_authenticated %} - {% if thread.package %} -

Package: {{ thread.package.title }}

+

+ {% if thread.review %} + {% if thread.review.recommends %} + + {% else %} + + {% endif %} {% endif %} + {% if thread.private %}🔒 {% endif %}{{ thread.title }} +

+ + {% if thread.package %} +

+ Package: {{ thread.package.title }} +

{% endif %} {% if thread.private %} -- cgit v1.2.3