add-unitTest

app/main/views.py

@@ -2,13 +2,13 @@ import os
 from datetime import datetime
 from operator import or_
 from flask import render_template, redirect, url_for, flash, request, \
-    current_app, make_response
+    current_app, make_response, jsonify
 from flask_login import login_required, current_user
 from sqlalchemy.sql.functions import func
 from werkzeug.utils import secure_filename
 from . import main
 from .forms import UploadPhotoForm, CommentForm, PostMdForm
-from .. import db
+from .. import db, csrf
 from ..models import Permission, User, Post, Comment, Notification, Like, Transaction, Activity, Collect, Want
 from ..decorators import permission_required
 
@@ -61,7 +61,8 @@ def index_transaction():
             li_num = db.session.query(func.count(Want.wanter_id)).filter_by(wanted_Activity_id=item.id).scalar()
             item.important = li_num
         hot_activity = li.order_by(Activity.important.desc())
-        return render_template('index/index_transactions.html', transactions=transactions, posts5=hot, hot_activity=hot_activity)
+        return render_template('index/index_transactions.html', transactions=transactions, posts5=hot,
+                               hot_activity=hot_activity)
     else:
         inf = request.form["search"]
         return redirect(url_for('.query', content=inf))
@@ -91,7 +92,8 @@ def index_activity():
             li_num = db.session.query(func.count(Want.wanter_id)).filter_by(wanted_Activity_id=item.id).scalar()
             item.important = li_num
         hot_activity = li.order_by(Activity.important.desc())
-        return render_template('index/index_activities.html', activities=activities,  posts5=hot, hot_activity=hot_activity)
+        return render_template('index/index_activities.html', activities=activities, posts5=hot,
+                               hot_activity=hot_activity)
     else:
         inf = request.form["search"]
         return redirect(url_for('.query', content=inf))
@@ -268,7 +270,8 @@ def query_transaction():
             page, per_page=current_app.config['FLASKY_FOLLOWERS_PER_PAGE'],
             error_out=False)
         query = pagination.items
-        return render_template('querytransaction.html', query=query, title="Result of query", pagination=pagination, inf=inf)
+        return render_template('querytransaction.html', query=query, title="Result of query", pagination=pagination,
+                               inf=inf)
 
 
 @main.route('/user/<username>')
@@ -279,13 +282,14 @@ def user(username):
     wanting = user.wanted_Activity
 
     posts = user.posts.order_by(Post.timestamp.desc())
-    liking_posts = [{'post': item.liked_post, 'timestamp': item.timestamp} for item in liking.order_by(Like.timestamp.desc())]
+    liking_posts = [{'post': item.liked_post, 'timestamp': item.timestamp} for item in
+                    liking.order_by(Like.timestamp.desc())]
     transactions = user.transactions.order_by(Transaction.timestamp.desc())
     activities = user.activities.order_by(Activity.timestamp.desc())
     collects = collecting.order_by(Collect.timestamp.desc())
     wants = wanting.order_by(Want.timestamp.desc())
     return render_template('user.html', user=user, posts=posts, liking_posts=liking_posts, activities=activities,
-                           transactionsInProfile=transactions, collects=collects, wants=wants,)
+                           transactionsInProfile=transactions, collects=collects, wants=wants, )
 
 
 @main.route('/notification')
@@ -505,6 +509,30 @@ def like(post_id):
     return redirect(url_for('.index', id=post_id))
 
 
+@main.route('/AJAXlike/<post_id>',methods=['POST'], strict_slashes=False)
+@login_required
+@csrf.exempt
+@permission_required(Permission.FOLLOW)
+def AJAXlike(post_id):
+    post = Post.query.filter_by(id=post_id).first()
+
+    if post is not None:
+        if(current_user.is_liking(post)):
+            current_user.dislike(post)
+            post.dislike(current_user)
+            db.session.commit()
+            return jsonify({'code': 200, 'like': False, 'num':post.liker.count()})
+        else:
+            current_user.like(post)
+            post.like(current_user)
+            post.recent_activity = datetime.utcnow()
+            db.session.commit()
+            return jsonify({'code': 200, 'like': True, 'num':post.liker.count()})
+
+
+
+
+
 @main.route('/likeinpost/<post_id>')
 @login_required
 @permission_required(Permission.FOLLOW)

app/templates/Posts/_posts.html

@@ -70,17 +70,58 @@
                         </a>
 
                 {#            喜欢#}
-                    {% if not current_user.is_liking(post) %}
-                        <a class="icon-btn" style="float:right; margin-right: 15px" href="{{ url_for('.like', post_id=post.id) }}#{{ post.id }}">
+{#                    {% if not current_user.is_liking(post) %}#}
+{#                        <a class="icon-btn" style="float:right; margin-right: 15px" href="{{ url_for('.like', post_id=post.id) }}#{{ post.id }}">#}
+{#                            <span class="glyphicon glyphicon-heart-empty"></span>#}
+{#                            <span>{{ post.liker.count() }} likes</span>#}
+{#                        </a>#}
+                        <a class="icon-btn" style="float:right; margin-right: 15px" href="javascript:void (0);" onclick="{
+                            var csrftoken = $('meta[name=csrf-token]').attr('content');
+                            var _this=this;
+                            var span1=this.childNodes[1];
+                            var span2=this.childNodes[3];
+                            {#console.log(this.childNodes[3]);#}
+                            {#console.log(this.childElementCount);#}
+                                var sendData={
+                                  'csrf_token':csrftoken
+                              };
+
+                            $.ajax({
+                                url: '{{ url_for('.AJAXlike', post_id=post.id) }}',
+                                type: 'POST',
+                                {#dataType: 'json',#}
+                                {#contentType: 'application/json',#}
+                                {#data: JSON.stringify(sendData),#}
+
+                                success: function(result) {
+                                    console.log(result);
+                                    if(result.like){
+                                        span1.setAttribute('class', 'glyphicon glyphicon-heart');
+                                    }else{
+                                        span1.setAttribute('class', 'glyphicon glyphicon-heart-empty');
+                                }
+                                    span2.innerText=result.num+' likes';
+                                    {#span1.setAttribute('href', '{{ url_for('.dislike', post_id=post.id) }}');#}
+                                },
+                                error:function(msg){
+                                     console.log(msg);
+                                }
+                                })
+                        }">
+                            {% if not current_user.is_liking(post) %}
                             <span class="glyphicon glyphicon-heart-empty"></span>
-                            <span>{{ post.liker.count() }} likes</span>
-                        </a>
-                    {% else %}
-                        <a class="icon-btn" style="float:right; margin-right: 15px" href="{{ url_for('.dislike', post_id=post.id) }}#{{ post.id }}">
+                            {% else %}
                             <span class="glyphicon glyphicon-heart"></span>
+                            {% endif %}
                             <span>{{ post.liker.count() }} likes</span>
+
                         </a>
-                    {% endif %}
+{#                    {% else %}#}
+{#                        <a class="icon-btn" style="float:right; margin-right: 15px" href="{{ url_for('.dislike', post_id=post.id) }}#{{ post.id }}">#}
+{#                            <span class="glyphicon glyphicon-heart"></span>#}
+{#                            <span>{{ post.liker.count() }} likes</span>#}
+{#                        </a>#}
+{#                    {% endif %}#}
                 </div>
           </div>
     </div>

app/templates/Posts/_postsInProfile.html

@@ -24,11 +24,17 @@
                             {{ moment(post.timestamp).fromNow() }}
                         </span>
                         {% if current_user == post.author %}
+
                             {#            删除#}
                                 <a class="icon-btn" href="{{ url_for('main.delete_post_inProfile', post_id=post.id)}}">
                                     <span class="glyphicon glyphicon-trash"></span>
                                     <span>delete</span>
                                 </a>
+                            {# 修改 #}
+                            <a class="icon-btn" href="#">
+                            <span class="glyphicon glyphicon-pencil"></span>
+                            <span>modification</span>
+                            </a>
                         {% endif %}
                     </div>
                 </div>

app/templates/base.html

@@ -14,6 +14,18 @@
         background-color: #f5f5f5;
     }
 </style>
+    <meta name="csrf-token" content="{{ csrf_token() }}">
+{#    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>#}
+{#    <script>#}
+        {#var csrftoken = $('meta[name=csrf-token]').attr('content');#}
+        {#$.ajaxSetup({#}
+        {#    beforeSend: function(xhr, settings) {#}
+        {#        if (!/^(GET|HEAD|OPTIONS|TRACE)$/i.test(settings.type) && !this.crossDomain) {#}
+        {#            xhr.setRequestHeader('X-CSRFToken', csrftoken)#}
+        {#        }#}
+        {#    }#}
+        {#})#}
+{#    </script>#}
 {% endblock %}
 
 

app/templates/index/index_activities.html

@@ -9,6 +9,8 @@
     <link href="{{ url_for('static',filename='home.css') }}" rel="stylesheet">
     <link href="{{ url_for('static',filename='posts.css') }}" rel="stylesheet">
     <link href="{{ url_for('static',filename='interact.css') }}" rel="stylesheet">
+
+
 {% endblock %}