Merge pull request #28 from lt94/dev

v0.2.0

Author: LeetaoGoooo

admin.py

@@ -4,8 +4,9 @@
 from flask_login import current_user
 from flask import redirect, url_for, request, flash, current_app, jsonify
 from app.models import Post, Tag, Comment, User, History, MessageBoard, FriendLink
-from flask_admin.form import Select2Widget
+from flask_admin.form.upload import ImageUploadField,FileUploadField
 import os
+import imghdr
 
 class PeachView(ModelView):
 
@@ -46,6 +47,24 @@ class PeachPostView(ModelView):
     edit_template = 'admin/model/peach-post-edit.html'
     column_searchable_list = ['title']
     column_exclude_list = ['content']
+    column_labels = dict(cover='Cover')
+    column_default_sort = ('create_at', True)
+
+    def picture_validation(form, field):
+        if field.data:
+            filename = field.data.filename
+            if not imghdr.what(field.data):
+                flash('上传的不是图片!')
+                return False
+            path = f'{os.getcwd()}/app/static/covers'    
+            os.makedirs(path,exist_ok=True)
+            field.data.save(f'{path}/{filename}')
+            field.data = f'covers/{filename}'
+            return True
+        return False
+
+    form_overrides = dict(cover=FileUploadField)
+    form_args = dict(cover=dict(label="封面",validators=[picture_validation]))
 
     def __init__(self, model, session, **kwargs):
         self.model = model
@@ -88,9 +107,9 @@ def export_content_to_md(self, post):
             f.write(export_post_data)
         return True
 
-    def after_model_change(self, form, model, is_created):
-        # TODO after add post generate the match post.md
-        pass
+    def on_model_change(self, form, model, is_created):
+        model.cover = form.cover.data
+        
 
     def after_model_delete(self, model):
         # TODO after delete post, delete the match post.md
@@ -108,6 +127,23 @@ def can_delete(self):
     def can_edit(self):
         return current_user.is_authenticated and current_user.level == 1
 
+class PeachCommentView(PeachView):
+    column_filters = ['is_read']
+    column_default_sort = ('comment_time', True)
+
+
+    def __init__(self, model, session, **kwargs):
+        self.session = session
+        super(PeachView, self).__init__(model, session, **kwargs)    
+
+    @action("read", 'readAll', 'Are you sure make all comments read')
+    def make_all_read(self, ids):
+        for id in ids:
+            comment = Comment.query.filter_by(id=id).first()
+            comment.is_read = 1
+        self.session.commit()
+        
+
 class PeachAdminIndexView(AdminIndexView):
 
     @expose('/')
@@ -122,7 +158,7 @@ class PeachAdmin:
 
     __slots__ = ['admin']   
 
-    def __init__(self, name="Peach-Blog", template_mode="bootstrap3"):
+    def __init__(self, name="Peach-Blog Management", template_mode="bootstrap3"):
         self.admin = Admin(name=name, template_mode=template_mode,
                            index_view=PeachAdminIndexView(), base_template='admin/peach-base.html')
 
@@ -134,7 +170,7 @@ def init_app(self, app, db):
             Post, db.session, endpoint='PeachPost'))
         self.admin.add_view(PeachView(Tag, db.session, endpoint='PeachTag'))
         self.admin.add_view(
-            PeachView(Comment, db.session, endpoint='PeachComment'))
+            PeachCommentView(Comment, db.session, endpoint='PeachComment'))
         self.admin.add_view(
             PeachView(History, db.session, endpoint='PeachHistory'))
         self.admin.add_view(

app/__init__.py

@@ -24,7 +24,7 @@
 hexo = Hexo()
 
 from admin import PeachAdmin
-admin = PeachAdmin(name="PeachBlog", template_mode="bootstrap3")
+admin = PeachAdmin(name="Management", template_mode="bootstrap3")
 
 
 def create_app(config_name):

app/api_v1_0/dashboard.py

@@ -98,8 +98,12 @@ def get_sum_device_visit_chart():
         sum_device_visit_data_list.append(temp_dict)
     return sum_device_visit_data_list
 
+def get_unread_comments():
+    rows = Comment.query.filter_by(is_read=0).all()
+    return len(rows)
+
 
 @api.route("/dashboard", methods=["GET"])
 def dashboard():
     # https://github.com/pallets/flask/issues/835
-    return jsonify({"comment_count": get_comment_count(), "message_board_count": get_message_board_count(), "today_visit_count": get_today_visit_count(), "sum_visit_count": get_sum_visit_count(), "today_visit_chart": get_today_visit_chart(), "top_ten_posts": get_top_ten_posts(), "sum_seven_day_visit_chart": get_sum_seven_day_visit_chart(), "sum_device_visit": get_sum_device_visit_chart()})
+    return jsonify({"comment_count": get_comment_count(), "message_board_count": get_message_board_count(), "today_visit_count": get_today_visit_count(), "sum_visit_count": get_sum_visit_count(), "today_visit_chart": get_today_visit_chart(), "top_ten_posts": get_top_ten_posts(), "sum_seven_day_visit_chart": get_sum_seven_day_visit_chart(), "sum_device_visit": get_sum_device_visit_chart(),"unread_comments":get_unread_comments()})

app/main/forms.py

@@ -4,10 +4,9 @@
 
 
 class CommentForm(FlaskForm):
-    user_name = StringField('*用户名', validators=[DataRequired()])
-    email = StringField(
-        '*邮箱', validators=[DataRequired(), Email(message="请确保邮箱有效,以确保可以收到回复")])
-    website = StringField('网址')
-    comment = TextAreaField('*评论', validators=[DataRequired()])
+    user_name = StringField('用户名', validators=[DataRequired()],render_kw={"class_":"form-control","placeholder":"昵称(必填)"})
+    email = StringField('邮箱', validators=[DataRequired(), Email(message="请确保邮箱有效,以确保可以收到回复")],render_kw={"class_":"form-control","type":"email","placeholder":"邮箱(必填)"})
+    website = StringField('网址',render_kw={"class_":"form-control","placeholder":"网址"})
+    comment = TextAreaField('', validators=[DataRequired()],render_kw={"class_":"form-control","rows":"3"})
     parent_id = HiddenField()
     submit = SubmitField("评论")

app/main/views.py

@@ -61,17 +61,10 @@ def post(title):
                 if regx_user is not None:
                     comment = Comment(post_id=id, user_name=form.user_name.data, email=form.email.data, website=form.website.data,
                             comment=form.comment.data, platform=platform, browser=browser, comment_time=datetime.now(),parent=comment_parent)
-                    msg = "回复成功!"
                     send_email(comment_parent.email,'评论回复','mail/comment',comment=comment,post=post)
-
+        msg = "回复成功!"
         db.session.add(comment)
-        try:
-            db.session.commit()
-            flash("评论成功!")
-        except Exception as e:
-            db.session.rollback()
-            print(e)
-            flash("数据库提交失败!")
+        db.session.commit()
         flash(msg)
         return redirect(url_for('main.post', title=title))
 
@@ -95,20 +88,21 @@ def post(title):
     return render_template('post.html', current_user=current_user, post=post, comments=comments, form=form, pagination=pagination, title=title)
 
 
-@main.route("/timeline")
+@main.route("/archives")
 def timeline():
     page = request.args.get('page', 1, type=int)
     pagination = Post.query.order_by(Post.create_at.desc()).paginate(
         page, per_page=current_app.config['FLASK_PER_PAGE'], error_out=True)
     posts = pagination.items
     post_dict = group_posts_by_date(posts)
-    return render_template("timeline.html", current_user=current_user, post_dict=post_dict, pagination=pagination)
+    posts_all = Post.query.all()
+    return render_template("archives.html", current_user=current_user, total_count=len(posts_all),post_dict=post_dict, pagination=pagination)
 
 
 def group_posts_by_date(posts):
     post_dict = OrderedDict()
     for post in posts:
-        year_month = post.create_at.strftime("%Y-%m")
+        year_month = post.create_at.strftime("%Y")
         if post_dict.get(year_month, None) is None:
             post_dict[year_month] = [post]
         else:

app/models.py

@@ -55,8 +55,10 @@ class Post(db.Model):
     content = db.Column(db.Text)
     create_at = db.Column(db.Date(), default=datetime.datetime.today)
     last_update = db.Column(db.DateTime(), default=datetime.datetime.now)
+    cover = db.Column(db.String(200))
     postviews = db.relationship('PostView', backref='postviews', lazy='joined')
     comments = db.relationship('Comment', backref='comments', lazy='joined')
+    historys = db.relationship('History', backref='post', lazy='dynamic', cascade='all, delete-orphan', passive_deletes = True)
 
     def __repr__(self):
         return self.title
@@ -82,6 +84,7 @@ class Comment(db.Model):
     comment_time = db.Column(db.DateTime(), default=datetime.datetime.now())
     platform = db.Column(db.String(50))
     browser = db.Column(db.String(100))
+    is_read = db.Column(db.Boolean,default=False)
     parent_id = db.Column(db.Integer, db.ForeignKey('comments.id'))
     replies = db.relationship('Comment', backref=db.backref("parent", remote_side=[id]), lazy='dynamic')
 
@@ -103,7 +106,7 @@ class History(db.Model):
     __tablename__ = 'history'
     id = db.Column(db.Integer, primary_key=True)
     ip = db.Column(db.String(128))
-    post_id = db.Column(db.Integer,db.ForeignKey('posts.id'))
+    post_id = db.Column(db.Integer,db.ForeignKey('posts.id',ondelete='CASCADE'))
     platform = db.Column(db.String(50))
     browser = db.Column(db.String(100))
     visit_time = db.Column(db.DateTime(), default=datetime.datetime.now())