新增新浪微博登录和全文搜索

Author: yangxueguang

accounts/admin.py

@@ -1,3 +1,5 @@
 from django.contrib import admin
+from .models import BlogUser
 
 # Register your models here.
+admin.site.register(BlogUser)

blog/search_indexes.py

@@ -0,0 +1,13 @@
+from haystack import indexes
+from .models import Article
+
+
+class ArticleIndex(indexes.SearchIndex, indexes.Indexable):
+    text = indexes.CharField(document=True, use_template=True)
+    created_time = indexes.DateTimeField(model_attr='created_time')
+
+    def get_model(self):
+        return Article
+
+    def index_queryset(self, using=None):
+        return self.get_model().objects.filter(status='p')

blog/static/blog/css/comment.css

@@ -73,6 +73,23 @@
     display: none;
 }
 
+.comment-panel .like-form {
+    display: inline-block;
+    margin: 0;
+    padding: 0;
+}
+
+.comment-panel .like-form button {
+    background: none;
+    border: none;
+    margin-right: 10px;
+    font-size: 16px;
+}
+
+.comment-panel .like-form button i {
+    margin: 0;
+}
+
 input[name='honeypot'] {
     display: none;
 }

blog/static/blog/js/blog.js

@@ -25,7 +25,7 @@ $(
     }),
 
     $('.comment-panel .ion-chatbox-working').click(function () {
-        $(this).parent().siblings('.inner-panel , form').slideToggle(400);
+        $(this).parent().siblings('.inner-panel , .comment-form').slideToggle(400);
         $(this).parent().siblings(':last').children(':button').click(function () {
             $(this).parent().parent().children('.inner-panel , form').slideUp(400);
         });

blog/templates/blog/comment.html

@@ -33,11 +33,9 @@ <h1 class="entry-title">{{ article.title }}</h1>
                             {{ article.body|markdown }}
                         </div>
                     </article>
-                    {% if user.is_authenticated %}
-                        {% render_comment_form for article %}
-                    {% else %}
-                        <div>登录后评论</div>
-                    {% endif %}
+
+                    {% render_comment_form for article %}
+
 
                     {% render_comment_list for article %}
                 </main>

blog/templates/blog/detail.html

@@ -0,0 +1,2 @@
+{{ object.title }}
+{{ object.body }}

blog/templates/search/indexes/blog/article_text.txt

@@ -0,0 +1,44 @@
+{% extends 'base.html' %}
+
+{% block content %}
+    <h2>Search</h2>
+
+    <form method="get" action=".">
+        <table>
+            {{ form.as_table }}
+            <tr>
+                <td>&nbsp;</td>
+                <td>
+                    <input type="submit" value="Search">
+                </td>
+            </tr>
+        </table>
+
+        {% if query %}
+            <h3>Results</h3>
+
+            {% for result in page.object_list %}
+                <p>
+                    <a href="{{ result.object.get_absolute_url }}">{{ result.object.title }}</a>
+                </p>
+                <p>{{ result.created_time }}</p>
+                <p>{{ result.object.abstract }}</p>
+            {% empty %}
+                <p>No results found.</p>
+            {% endfor %}
+
+            {% if page.has_previous or page.has_next %}
+                <div>
+                    {% if page.has_previous %}
+                        <a href="?q={{ query }}&amp;page={{ page.previous_page_number }}">{% endif %}&laquo; Previous
+                    {% if page.has_previous %}</a>{% endif %}
+                    |
+                    {% if page.has_next %}<a href="?q={{ query }}&amp;page={{ page.next_page_number }}">{% endif %}
+                    Next &raquo;{% if page.has_next %}</a>{% endif %}
+                </div>
+            {% endif %}
+        {% else %}
+            {# Show some example queries to run, maybe query syntax, something else? #}
+        {% endif %}
+    </form>
+{% endblock %}

blog/templates/search/search.html

@@ -13,6 +13,7 @@ class IndexView(ListView):
     template_name = "blog/index.html"
 
     def get_queryset(self):
+        print(self.request.session.items())
         return Article.objects.filter(status='p')
 
 

blog/views.py

@@ -39,10 +39,12 @@
     'markdown_deux',
     'django_comments',
     'notifications',
+    'haystack',
     'likes',
     'blog',
     'comments',
     'accounts',
+    'social_login',
 ]
 
 SITE_ID = 1
@@ -76,6 +78,7 @@
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
                 'blog.context_processors.sidebar',  # for sidebar information
+                'social_login.context_processors.social_sites',  # for social login
             ],
         },
     },
@@ -157,3 +160,28 @@
 ]
 
 LOGIN_URL = '/login/'
+
+MEDIA_ROOT = 'media/'
+MEDIA_URL = '/media/'
+
+# social user settings
+SOCIALOAUTH_SITES = (
+    ('weibo', 'socialoauth.sites.weibo.Weibo', '新浪微博',
+     {
+         'redirect_uri': 'http://zmrenwu.pythonanywhere.com',
+         'client_id': '3072222160',
+         'client_secret': '9b06ed28d7598a91ee72bc38e4f067b2',
+     }
+     ),
+)
+SOCIAL_LOGIN_ERROR_REDIRECT_URL = 'errors/'
+
+# haystack
+HAYSTACK_CONNECTIONS = {
+    'default': {
+        'ENGINE': 'whoosh_cn_backend.WhooshEngine',
+        'PATH': os.path.join(BASE_DIR, 'whoosh_index'),
+    },
+}
+# 自动更新索引
+HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor'