Merge pull request #107 from python-cn/react

plim -> jinja2

Author: mozillazg

firefly/app.py

@@ -1,19 +1,19 @@
-from __future__ import absolute_import
 # coding=utf-8
+from __future__ import absolute_import
 import os
 
-from flask import Flask, g, request
-from flask_mako import render_template
+from flask import Flask, g, request, send_from_directory
 from flask_security import MongoEngineUserDatastore
 from flask_social_blueprint.core import SocialBlueprint
+from flask_wtf.csrf import CsrfProtect
 
 from firefly import config as _config
 from firefly.ext import (
-    api, babel, cache, db, login_manager, mail, mako,
-    redis_store, security
+    api, babel, cache, db, login_manager, mail, redis_store, security
 )
 from firefly.models.user import User, SocialConnection, Role
 from firefly.utils import send_mail
+from firefly.libs.template import render_template
 
 
 def create_app(config):
@@ -34,18 +34,24 @@ def create_app(config):
     cache.init_app(app)
     db.init_app(app)
     mail.init_app(app)
-    mako.init_app(app)
     redis_store.init_app(app)
+    CsrfProtect(app)
 
     register_auth(app)
     register_hooks(app)
+    register_static(app)
     register_blueprints(app)
     configure_error_handles(app)
     plug_to_db(db)
 
     return app
 
 
+def register_static(app):
+    app.route('/static/<path:filename>')(
+        lambda filename: send_from_directory('static', filename))
+
+
 def register_auth(app):
     def load_user(user_id):
         return User.objects(_id=user_id)
@@ -57,7 +63,6 @@ def load_user(user_id):
     # Setup Flask-Security
     security.init_app(app, MongoEngineUserDatastore(db, User, Role))
     state = app.extensions['security']
-    state.render_template = render_template
     state.send_mail_task(send_mail)
     app.extensions['security'] = state
 
@@ -68,16 +73,16 @@ def configure_error_handles(app):
 
     @app.errorhandler(403)
     def forbidden_page(error):
-        return render_template('403.html')
+        return render_template('403.html'), 403
 
     @app.errorhandler(404)
     def not_found_page(error):
-        return render_template('404.html')
+        return render_template('404.html'), 404
 
 
 def register_blueprints(app):
-    from firefly.views import (home, post, category, api, keyboard, user)
-    for i in (home, post, category, api, keyboard, user):
+    from firefly.views import (home, post, category, api, keyboard, user, auth)
+    for i in (home, post, category, api, keyboard, user, auth):
         app.register_blueprint(i.bp)
 
 
@@ -92,6 +97,13 @@ def get_locale():
     def before_request():
         g.locale = get_locale()
 
+    @app.context_processor
+    def inject_builtin():
+        return {
+            'hasattr': hasattr,
+            'len': len
+        }
+
 
 def plug_to_db(db):
     from firefly.models.utils import dict_filter

firefly/config.py

@@ -4,17 +4,11 @@
 '''
 from __future__ import print_function
 from __future__ import absolute_import
-from plim import preprocessor
 
 SECRET_KEY = 'you need modify this into local_settings.py'
 
 DEBUG = False
 
-# plim
-MAKO_DEFAULT_FILTERS = ['decode.utf_8', 'h']
-MAKO_PREPROCESSOR = preprocessor
-MAKO_TRANSLATE_EXCEPTIONS = False
-
 MAX_CONTENT_LENGTH = 16 * 1024 * 1024
 
 # available languages

firefly/ext.py

@@ -1,11 +1,10 @@
-from __future__ import absolute_import
 # coding=utf-8
+from __future__ import absolute_import
 from flask import current_app
 from flask_babel import Babel
 from flask_cache import Cache
 from flask_login import LoginManager
 from flask_mail import Mail
-from flask_mako import MakoTemplates
 from flask_mongoengine import MongoEngine
 from flask_redis import FlaskRedis
 from flask_restful import Api
@@ -18,7 +17,6 @@
 db = MongoEngine()
 login_manager = LoginManager()
 mail = Mail()
-mako = MakoTemplates()
 redis_store = FlaskRedis()
 security = Security()
 

firefly/libs/template.py

@@ -0,0 +1,13 @@
+# coding=utf-8
+from flask import render_template as _render_template
+
+from flask_login import current_user
+from flask_security.utils import url_for_security
+
+
+def render_template(template_name_or_list, **context):
+    context.update({
+        'current_user': current_user,
+        'url_for_security': url_for_security
+    })
+    return _render_template(template_name_or_list, **context)

firefly/models/topic.py

@@ -109,3 +109,29 @@ def post_type(self):
 
     def get_replies(self):
         return Comment.objects.filter(ref_id=self.id)
+
+
+def get_all_posts():
+    posts = Post.objects.all()
+    for post in posts:
+        yield get_post(post)
+
+
+def get_post(post):
+    id = post.id
+    # author = post.author
+    category = post.category
+    category_name = ''
+    category_slug = ''
+    category_color = '#999'
+    if category is not None:
+        category_name = category.name
+        category_slug = category.slug
+        category_color = category.color
+    title = post.title
+    replies = len(post.comments)
+    views = post.views
+    created_at = post.created_at
+    activity = post.recent_activity_time
+    return (post, id, category, category_name, category_slug, category_color,
+            title, replies, views, created_at, activity)

firefly/static/Gruntfile.js

@@ -3,57 +3,67 @@
 module.exports = function (grunt) {
 
     grunt.initConfig({
-        //    autoprefixer: {
-        //      dist: {
-        //        files: {
-        //          'stylesheets/style.css': 'stylesheets/_style.css'
-        //        }
-        //      }
-        //    },
-        watch: {
-            sass: {
-                files: "stylesheets/scss/{,*/}*.scss",
-                tasks: ["sass_globbing", "sass"]
-            },
-            css: {
-                files: 'stylesheets/*.css',
-                options: {
-                    livereload: true
-                }
-            },
-            html: {
-                files: '../templates/**/*.html',
-                options: {
-                    livereload: true
-                }
+      react: {
+        dynamic_mappings: {
+          files: [
+            {
+              expand: true,
+              cwd: 'javascripts/src/',
+              src: ['*.jsx'],
+              dest: 'javascripts',
+              ext: '.js'
             }
+          ]
+        }
+      },
+      watch: {
+        sass: {
+          files: "stylesheets/scss/{,*/}*.scss",
+          tasks: ["sass_globbing", "sass"]
         },
-        sass_globbing: {
-            sass: {
-                files: {
-                    'stylesheets/scss/common.scss': 'stylesheets/scss/common/*.scss',
-                    'stylesheets/scss/topic.scss': 'stylesheets/scss/topic/*.scss',
-                    'stylesheets/scss/home.scss': 'stylesheets/scss/home/*.scss',
-                },
-                options: {
-                    useSingleQuoates: false
-                }
-            }
+        css: {
+          files: 'stylesheets/*.css',
+          options: {
+            livereload: true
+          }
+        },
+        html: {
+          files: '../templates/**/*.html',
+          options: {
+            livereload: true
+          }
         },
+        react: {
+          files: 'javascripts/src/*.jsx',
+          tasks: ['react']
+        }
+      },
+      sass_globbing: {
         sass: {
-            dev: {
-                files: {
-                    'stylesheets/index.css': 'stylesheets/scss/index.scss',
-                    'stylesheets/post.css': 'stylesheets/scss/post.scss',
-                }
-            }
+          files: {
+            'stylesheets/scss/common.scss': 'stylesheets/scss/common/*.scss',
+            'stylesheets/scss/topic.scss': 'stylesheets/scss/topic/*.scss',
+            'stylesheets/scss/home.scss': 'stylesheets/scss/home/*.scss',
+          },
+          options: {
+            useSingleQuoates: false
+          }
+        }
+      },
+      sass: {
+        dev: {
+          files: {
+            'stylesheets/index.css': 'stylesheets/scss/index.scss',
+            'stylesheets/post.css': 'stylesheets/scss/post.scss',
+          }
         }
+      }
     });
 
-    grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.loadNpmTasks('grunt-contrib-sass');
-    grunt.loadNpmTasks('grunt-sass-globbing');
-    //    grunt.loadNpmTasks('grunt-autoprefixer');
+  grunt.loadNpmTasks('grunt-contrib-watch');
+  grunt.loadNpmTasks('grunt-contrib-sass');
+  grunt.loadNpmTasks('grunt-sass-globbing');
+  grunt.loadNpmTasks('grunt-react');
 
-    grunt.registerTask('default', ['sass_globbing', 'sass', 'watch']);
+  grunt.registerTask('default', ['sass_globbing', 'sass', 'watch', 'react']);
 };

firefly/static/javascripts/libs/react-0.13.0.min.js

@@ -20,6 +20,7 @@
     "grunt-contrib-sass": "^0.9.2",
     "grunt-contrib-uglify": "^0.8.1",
     "grunt-contrib-watch": "^0.6.1",
+    "grunt-react": "^0.12.2",
     "grunt-sass-globbing": "^1.2.0"
   }
 }

firefly/static/package.json

@@ -1 +1 @@
-h1 对不起，您没有权限访问这个页面
+<h1>对不起，您没有权限访问这个页面</h1>

firefly/templates/403.html

@@ -1 +1 @@
-h1 这里没有你要找的内容
+<h1>这里没有你要找的内容</h1>