Tag management validation,

posts - differentiate and hide pending on index,
UI fixes + tag rendering in "places",
post - show rating,
minor cleanups

yadc/assets/css/default.scss

@@ -49,6 +49,11 @@
             margin-bottom: 10px;
         }
 
+        h3 {
+            margin: 0;
+            margin-bottom: .5em;
+        }
+
         article.tags, article.post-edit {
             @include media($bp-tablet) {
                 .tag-container /*:not(.suggest-dropdown)*/ {
@@ -141,6 +146,9 @@
                 position: relative;
                 margin: $figure-margin;
 
+                &[data-status="pending"] {
+                    border: 4px solid #0044ff;
+                }
 
                 img {
                     display: block;

yadc/bp/post.py

@@ -51,6 +51,8 @@ def posts(page):
             posts_query = posts_query.filter(~Post.id.in_(subquery))
         if f_tags:
             posts_query = posts_query.filter(Tag.content.in_(f_tags)).having(func.count(Post.id)==len(f_tags))
+    if current_user.is_anonymous or not current_user.is_moderator:
+        posts_query = posts_query.filter_by(status=POST_STATUS.active)
     posts_query = posts_query.filter(Post.rating.in_(m_ratings)).order_by(Post.created.desc())
 
     posts = posts_query.paginate(page, current_app.config.get('POSTS_PER_PAGE'))
@@ -58,6 +60,7 @@ def posts(page):
     return render_template(
         'post/index.html',
         posts=posts,
+        # posts=[p for p in posts if p.status is POST_STATUS.active] if current_user.is_anonymous or not current_user.is_moderator else posts,
         tags=tags,
         sel_tags=[tag for tag in tags if tag.content in f_tags] or Tag.query.filter(Tag.content.in_(f_tags))
     )

yadc/bp/user.py

@@ -35,7 +35,7 @@ def settings():
         pass_form=ChangePassForm(),
         mail_form=ChangeMailForm(),
         rating_form=ChangeUserRatingForm(rating=current_user.rating.name),
-        tags_form=ChangeTagBlacklistForm(tags=' '.join(t.content for t in current_user.tag_blacklist)),
+        tags_form=ChangeTagBlacklistForm(tags=' '.join(t.content for t in current_user.tag_blacklist)), tags_form_tags=current_user.tag_blacklist,
         delete_form=DeleteUserDataForm()
     )
 

yadc/forms.py

@@ -1,6 +1,6 @@
 from wtforms import Form
 from wtforms import StringField, PasswordField, BooleanField, SubmitField, FileField, MultipleFileField, ValidationError, RadioField, TextAreaField, HiddenField, SelectField, IntegerField
-from wtforms.validators import DataRequired, InputRequired, Email, EqualTo, AnyOf, optional, StopValidation, URL
+from wtforms.validators import DataRequired, InputRequired, Email, EqualTo, AnyOf, optional, StopValidation, URL, Regexp
 
 from werkzeug.utils import cached_property
 
@@ -8,7 +8,7 @@ from flask import current_app, flash
 from flask_wtf.csrf import _FlaskFormCSRF
 
 from yadc.models import USER_STATUS, OP_LEVEL, RATING, POST_STATUS, TAG_CATEGORY
-from yadc.models import User, Post
+from yadc.models import User, Post, Tag
 
 class CSRFForm(Form):
     class Meta:
@@ -179,10 +179,16 @@ class PostForm(EditForm):
     approve = SubmitField('Approve')
 
 class TagForm(EditForm):
-    content = StringField('Content', validators=[validate_create_required], render_kw=dict(autocomplete='off'))
+    content = StringField('Content', validators=[optional(), validate_create_required, Regexp('^[a-zA-Z0-9\-\_\ ]+$')], render_kw=dict(autocomplete='off'))
     category = SelectField('Category',
         choices=[(e.name, e.name.capitalize()) for e in TAG_CATEGORY],
-        validators=[optional()])
+        validators=[optional()]
+    )
+    
+    def validate_content(form, field):
+        if form.create.data and Tag.query.filter_by(content=field.data).first():
+            raise ValidationError('Tag already exists.')
+
 
 # Creation/editing only through post page
 class CommentForm(EditForm):

yadc/templates/_includes.html

@@ -61,7 +61,7 @@
 </article>
 {% endmacro %}
 
-{% macro render_tag_input(input_field, param_dict={}) %}
+{% macro render_tag_input(input_field, sel_tags=[], param_dict={}) %}
 <div class="tag-input"{% for key,value in param_dict.items() %} data-{{key}}="{{value}}"{% endfor %}>
     <div class="tag-suggester" data-inputname="{{ input_field.name }}">
         {#<input type="text" name="tags" autocomplete="off" value="{{ request.args.get('tags') }}">#}
@@ -69,6 +69,18 @@
         <div class="tag-container suggest-dropdown"></div>
     </div>
 
-    <div class="tag-container tags-selected"></div>
+    <div class="tag-container tags-selected">
+        {% for tag in sel_tags %}
+        <a class="tagselected" data-tagname="{{ tag.content }}" data-tagcat="{{ tag.category.name }}">
+            <span class="tag-icon">
+                <span class="fa fa-tag"></span>
+            </span>
+            <span class="content">{{ tag.content_deser }}</span>
+            <span class="tag-right">
+                <span class="fa fa-close close"></span>
+            </span>
+        </a>
+        {% endfor %}
+    </div>
 </div>
 {% endmacro %}

yadc/templates/post/index.html

@@ -6,24 +6,17 @@
 {% block main_content %}
 <section class="post-list">
     <div class="posts">
+        {% if posts.items %}
         {% for post in posts.items %}
-        <figure style="{{ post.flex }}">
+        <figure style="{{ post.flex }}" data-status="{{ post.status.name }}">
             <a href="{{ url_for('post.post_show', id=post.id) }}">
-                <img src="{{ post.url(path=post.file_uri, endpoint='thumb_smol') }}" srcset="{{ post.url(path=post.file_uri, endpoint='thumb_smol') }} 512w, {{ post.url(path=post.file_uri, endpoint='thumb_big') }} 800w" alt="">  <!--sizes="(min-width: 513px) 1000w" -->
+                <img src="{{ post.url(path=post.file_uri, endpoint='thumb_smol') }}" srcset="{{ post.url(path=post.file_uri, endpoint='thumb_smol') }} 512w, {{ post.url(path=post.file_uri, endpoint='thumb_big') }} 800w" alt="">
             </a>
         </figure>
         {% endfor %}
-        
+        {% else %}
-        <!-- <figure style="flex: 307.87 1 307.87px;">
+        <h4 style="margin-left: 2em;">Ooops. No content matching your filters.</h4>
-            <a href="#">
+        {% endif %}
-                <img src="/static/ryuzu/916993.png" alt="">
-            </a>
-            <div class="thumb-info">
-                <span>RyuZU²</span>
-                <span>1920x1080</span>
-                <span>1.5M</span>
-            </div>
-        </figure> -->
     </div>
     {{ render_pagination('post.posts', posts) }}
 </section>

yadc/templates/post/post.html

@@ -3,8 +3,6 @@
 
 {% block sidebar %}
 <article class="post-desc">
-    <!-- <h4>Description</h4> -->
-    <!-- <img src="/static/profile.jpg" alt=""> -->
     <div class="id">Id: {{ post.id }}</div>
     <div class="author">Author: {{ post.author.username or "Deleted Account" }}</div>
 
@@ -14,7 +12,11 @@
     <div class="status">Status: {{ post.status.name.capitalize() }}</div>
     {% endif %}
 
+    <div class="rating">Rating: {{ post.rating.name.capitalize() }}</div>
     <div class="time">Posted: {{ post.natural_created() }}</div>
+    {#{% if post.created != post.updated %}
+    <div class="time">Last edited: {{ post.updated.date() }}</div>
+    {% endif %}#}
     <div class="source">Source: <a href="{{ post.source }}">{{ post.source }}</a></div>
     <div class="size">File size: {{ post.filesize_human }}</div>
     <div class="resolution">Image res: {{ post.image_resolution }}</div>
@@ -75,46 +77,6 @@
 <section class="comments">
     <h3>Comments</h3>
     <div class="comment-container">
-        {#<article class="comment editingable">
-            <form action="{{ url_for('post.comment') }}" method="post">
-                {{ comment.editform.csrf_token }}
-                {{ comment.editform.id() }}
-                <div class="comment-head">
-                    <h4>{{ comment.user.username or "Deleted account" }}</h4>
-                    <span class="controls">
-                        {% if current_user.is_moderator %}
-                        {% if not comment.deleted %}
-                        <a class="control-moderate"><label>ban{{ comment.editform.ban(style="display: none;") }}</label></a>
-                        {% else %}
-                        <a class="control-moderate"><label>unban{{ comment.editform.unban(style="display: none;") }}</label></a>
-                        {% endif %}
-                        {% endif %}
-                        {% if comment.is_author %}
-                        <noscript class="jsoff-hide"></noscript>
-                        <a class="notedit control-edit"><label>edit</label></a>
-                        <a class="edit control-edit"><label>cancel</label></a>
-                        {% endif %}
-                    </span>
-                </div>
-
-                <div class="comment-editform baseform">
-                    {% if not comment.deleted or comment.is_author or current_user.is_moderator %}
-                    <p class="comment-content notedit">{{ comment.content }}</p>
-                    {% endif %}
-                    {% if comment.deleted %}
-                    <p class="deleted">[Comment banned]</p>
-                    {% endif %}
-
-                    {% if comment.is_author %}
-                    <noscript class="jsoff-show"></noscript>
-                    {{ comment.editform.content(class="edit") }}
-                    {{ comment.editform.edit(class="edit") }}
-                    {{ comment.editform.delete(class="edit") }}
-                    {% endif %}
-                </div>
-            </form>
-        </article>#}
-
         {% for comment in comments %}
         {{ render_comment(comment, comment.editform) }}
         {% endfor %}

yadc/templates/post/upload.html

@@ -7,14 +7,12 @@
     <form action="" method="post" enctype="multipart/form-data">
         {{ form.csrf_token }}
         <div class="">
-            {#{{ form.post_img.label }}#}
             {{ form.post_img() }}
         </div>
 
         {{ form.sauce() }}
 
         {{ render_tag_input(form.tags) }}
-        <!-- {{ form.tags(placeholder="Tags") }} -->
 
         <div>
             {{ form.rating.label }}

yadc/templates/user/profile.html

@@ -17,8 +17,8 @@
     <div class="statistics">
         <h3>Statistics</h3>
         <div class="posts">Uploaded posts: {{ post_count }}</div>
+        {% if user.is_moderator %}<div class="approves">Approved posts: {{ approved_count }}</div>{% endif %}
         <div class="comments">Posted comments: {{ comment_count }}</div>
-        {% if user.is_moderator %}<div class="approves">Approved comments: {{ approved_count }}</div>{% endif %}
     </div>
 
     {% if user.tag_blacklist %}
@@ -33,10 +33,8 @@
                     </span>
                     <span class="content">{{ tag.content_deser }}</span>
                     <span class="tag-right">
-                        <span class="fa fa-plus plus"></span>
                         {#<span class="fa fa-close close"></span>#}
                     </span>
-                    {#<span class="post_ids">{{ tag.post_ids }}</span>#}
                 </a>
                 {% endfor %}
             </div>

yadc/templates/user/settings.html

@@ -54,7 +54,7 @@
         <form action="{{ url_for('user.change_tagblacklist') }}" method="post">
             {{ tags_form.csrf_token }}
 
-            {{ render_tag_input(tags_form.tags) }}
+            {{ render_tag_input(tags_form.tags, tags_form_tags) }}
 
             {{ tags_form.tags_submit() }}
         </form>