Merge git://github.com/zsloan/genenetwork into flask

1 files changed, 4 insertions, 32 deletions

diff --git a/wqflask/secure_server.py b/wqflask/secure_server.py
index 5448dbeb..3487f35b 100644
--- a/wqflask/secure_server.py
+++ b/wqflask/secure_server.py
@@ -3,42 +3,14 @@ from __future__ import print_function, division, absolute_import
 from wqflask import app
 
 from flask import Flask, render_template
-from flask.ext.sqlalchemy import SQLAlchemy
-from flask.ext.security import Security, SQLAlchemyUserDatastore, UserMixin, RoleMixin
 
 
-# Create database connection object
-db = SQLAlchemy(app)
+# Setup mail
+from flask.ext.mail import Mail
+mail = Mail(app)
 
-# Define models
-roles_users = db.Table('roles_users',
-        db.Column('user_id', db.Integer(), db.ForeignKey('user.id')),
-        db.Column('role_id', db.Integer(), db.ForeignKey('role.id')))
 
-class Role(db.Model, RoleMixin):
-    id = db.Column(db.Integer(), primary_key=True)
-    name = db.Column(db.String(80), unique=True)
-    description = db.Column(db.String(255))
-
-class User(db.Model, UserMixin):
-    id = db.Column(db.Integer(), primary_key=True)
-    email = db.Column(db.String(255), unique=True)
-    password = db.Column(db.String(255))
-    active = db.Column(db.Boolean())
-    confirmed_at = db.Column(db.DateTime())
-    
-    last_login_at = db.Column(db.DateTime())
-    current_login_at = db.Column(db.DateTime())
-    last_login_ip_= db.Column(db.String(39))
-    current_login_ip = db.Column(db.String(39))
-    login_count = db.Column(db.Integer())
-    
-    roles = db.relationship('Role', secondary=roles_users,
-                            backref=db.backref('users', lazy='dynamic'))
-
-# Setup Flask-Security
-user_datastore = SQLAlchemyUserDatastore(db, User, Role)
-security = Security(app, user_datastore)
+from wqflask.model import *
 
 # Create a user to test with
 ##@app.before_first_request