Merge branch 'master' into custom_select

Author: sbue

.codeclimate.yml

@@ -1,7 +1,7 @@
 ---
 engines:
   csslint:
-    enabled: true
+    enabled: false
   duplication:
     enabled: true
     config:
@@ -24,3 +24,7 @@ ratings:
   - "**.py"
 exclude_paths:
 - app/static/*
+checks:
+  argument-count:
+    config:
+      threshold: 6

.gitignore

@@ -5,11 +5,12 @@ webassets-external/
 *.pyo
 env
 venv
-.env
+*.env
 env*
 dist
 *.egg
 *.egg-info
 *.sqlite
 .idea
 dump.rdb
+.vscode/

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

README.md

@@ -1,8 +1,9 @@
-# flask-base 
-[![Circle CI](https://circleci.com/gh/hack4impact/flask-base.svg?style=svg)](https://circleci.com/gh/hack4impact/flask-base) [![Stories in Ready](https://badge.waffle.io/hack4impact/flask-base.png?label=ready&title=Ready)](https://waffle.io/hack4impact/flask-base) 
-[![Code Climate](https://codeclimate.com/github/hack4impact/flask-base/badges/gpa.svg)](https://codeclimate.com/github/hack4impact/flask-base/coverage) 
+# flask-base
+[![Circle CI](https://circleci.com/gh/hack4impact/flask-base.svg?style=svg)](https://circleci.com/gh/hack4impact/flask-base) [![Stories in Ready](https://badge.waffle.io/hack4impact/flask-base.png?label=ready&title=Ready)](https://waffle.io/hack4impact/flask-base)
+[![Code Climate](https://codeclimate.com/github/hack4impact/flask-base/badges/gpa.svg)](https://codeclimate.com/github/hack4impact/flask-base/coverage)
 [![Issue Count](https://codeclimate.com/github/hack4impact/flask-base/badges/issue_count.svg)](https://codeclimate.com/github/hack4impact/flask-base) ![python3.x](https://img.shields.io/badge/python-3.x-brightgreen.svg)  ![python2.x](https://img.shields.io/badge/python-2.x-yellow.svg)
-<img src="readme_media/[email protected]" width="400"/>
+
+![flask-base](readme_media/logo.png)
 
 A Flask application template with the boilerplate code already done for you.
 
@@ -19,22 +20,22 @@ A Flask application template with the boilerplate code already done for you.
 * Flask-Mail for sending emails
 * gzip compression
 * Redis Queue for handling asynchronous tasks
-* ZXCVBN password strength checker  
+* ZXCVBN password strength checker
 * CKEditor for editing pages
 
 ## Demos
 
 Home Page:
 
-![home](readme_media/home.gif "home") 
+![home](readme_media/home.gif "home")
 
 Registering User:
 
 ![registering](readme_media/register.gif "register")
 
 Admin Editing Page:
 
-![edit page](readme_media/editpage.gif "editpage") 
+![edit page](readme_media/editpage.gif "editpage")
 
 Admin Editing Users:
 
@@ -72,10 +73,12 @@ Note: if you are using a python2.x version, point the -p value towards your pyth
 $ xcode-select --install
 ```
 
-##### Add Environment Variables 
+##### Add Environment Variables
 
-Create a file called `config.env` that contains environment variables in the following syntax: `ENVIRONMENT_VARIABLE=value`. For example,
-the mailing environment variables can be set as the following. We recommend using Sendgrid for a mailing SMTP server. But anything else will work as well.
+Create a file called `config.env` that contains environment variables in the following syntax: `ENVIRONMENT_VARIABLE=value`.
+You may also wrap values in double quotes like `ENVIRONMENT_VARIABLE="value with spaces"`.
+For example, the mailing environment variables can be set as the following.
+We recommend using Sendgrid for a mailing SMTP server, but anything else will work as well.
 
 ```
 MAIL_USERNAME=SendgridUsername
@@ -90,7 +93,7 @@ Other Key value pairs:
 * `DATABASE_URL`: set to a postgresql database url (default is `data-dev.sqlite`)
 * `REDISTOGO_URL`: set to Redis To Go URL or any redis server url (default is `http://localhost:6379`)
 * `RAYGUN_APIKEY`: api key for raygun (default is `None`)
-* `FLASK_CONFIG`: can be `development`, `production`, `default`, `heroku`, `unix`, or `testing`. Most of the time you will use `development` or `production`. 
+* `FLASK_CONFIG`: can be `development`, `production`, `default`, `heroku`, `unix`, or `testing`. Most of the time you will use `development` or `production`.
 
 
 **Note: do not include the `config.env` file in any commits. This should remain private.**
@@ -181,9 +184,9 @@ Contributions are welcome! Check out our [Waffle board](https://waffle.io/hack4i
 
 ## Documentation Changes
 
-To make changes to the documentation refer to the [Mkdocs documentation](http://www.mkdocs.org/#installation) for setup. 
+To make changes to the documentation refer to the [Mkdocs documentation](http://www.mkdocs.org/#installation) for setup.
 
-To create a new documentation page, add a file to the `docs/` directory and edit `mkdocs.yml` to reference the file. 
+To create a new documentation page, add a file to the `docs/` directory and edit `mkdocs.yml` to reference the file.
 
 When the new files are merged into `master` and pushed to github. Run `mkdocs gh-deploy` to update the online documentation.
 

app.json

@@ -6,7 +6,7 @@
   },
   "env": {
     "FLASK_CONFIG": {
-      "required": true
+      "value": "production"
     },
     "SECRET_KEY": {
       "generator": "secret"
@@ -19,6 +19,12 @@
     }
   },
   "formation": {
+    "web": {
+      "quantity": 1
+    },
+    "worker": {
+      "quantity": 1
+    }
   },
   "addons": [
     "heroku-postgresql",

app/account/forms.py

@@ -11,37 +11,46 @@
 
 class LoginForm(Form):
     email = EmailField(
-        'Email', validators=[InputRequired(), Length(1, 64), Email()])
+        'Email', validators=[InputRequired(),
+                             Length(1, 64),
+                             Email()])
     password = PasswordField('Password', validators=[InputRequired()])
     remember_me = BooleanField('Keep me logged in')
     submit = SubmitField('Log in')
 
 
 class RegistrationForm(Form):
     first_name = StringField(
-        'First name', validators=[InputRequired(), Length(1, 64)])
+        'First name', validators=[InputRequired(),
+                                  Length(1, 64)])
     last_name = StringField(
-        'Last name', validators=[InputRequired(), Length(1, 64)])
+        'Last name', validators=[InputRequired(),
+                                 Length(1, 64)])
     email = EmailField(
-        'Email', validators=[InputRequired(), Length(1, 64), Email()])
+        'Email', validators=[InputRequired(),
+                             Length(1, 64),
+                             Email()])
     password = PasswordField(
         'Password',
         validators=[
-            InputRequired(), EqualTo('password2', 'Passwords must match')
+            InputRequired(),
+            EqualTo('password2', 'Passwords must match')
         ])
     password2 = PasswordField('Confirm password', validators=[InputRequired()])
     submit = SubmitField('Register')
 
     def validate_email(self, field):
         if User.query.filter_by(email=field.data).first():
             raise ValidationError('Email already registered. (Did you mean to '
-                                  '<a href="{}">log in</a> instead?)'
-                                  .format(url_for('account.login')))
+                                  '<a href="{}">log in</a> instead?)'.format(
+                                      url_for('account.login')))
 
 
 class RequestResetPasswordForm(Form):
     email = EmailField(
-        'Email', validators=[InputRequired(), Length(1, 64), Email()])
+        'Email', validators=[InputRequired(),
+                             Length(1, 64),
+                             Email()])
     submit = SubmitField('Reset password')
 
     # We don't validate the email address so we don't confirm to attackers
@@ -50,11 +59,14 @@ class RequestResetPasswordForm(Form):
 
 class ResetPasswordForm(Form):
     email = EmailField(
-        'Email', validators=[InputRequired(), Length(1, 64), Email()])
+        'Email', validators=[InputRequired(),
+                             Length(1, 64),
+                             Email()])
     new_password = PasswordField(
         'New password',
         validators=[
-            InputRequired(), EqualTo('new_password2', 'Passwords must match.')
+            InputRequired(),
+            EqualTo('new_password2', 'Passwords must match.')
         ])
     new_password2 = PasswordField(
         'Confirm new password', validators=[InputRequired()])
@@ -69,7 +81,8 @@ class CreatePasswordForm(Form):
     password = PasswordField(
         'Password',
         validators=[
-            InputRequired(), EqualTo('password2', 'Passwords must match.')
+            InputRequired(),
+            EqualTo('password2', 'Passwords must match.')
         ])
     password2 = PasswordField(
         'Confirm new password', validators=[InputRequired()])
@@ -81,7 +94,8 @@ class ChangePasswordForm(Form):
     new_password = PasswordField(
         'New password',
         validators=[
-            InputRequired(), EqualTo('new_password2', 'Passwords must match.')
+            InputRequired(),
+            EqualTo('new_password2', 'Passwords must match.')
         ])
     new_password2 = PasswordField(
         'Confirm new password', validators=[InputRequired()])
@@ -90,7 +104,9 @@ class ChangePasswordForm(Form):
 
 class ChangeEmailForm(Form):
     email = EmailField(
-        'New email', validators=[InputRequired(), Length(1, 64), Email()])
+        'New email', validators=[InputRequired(),
+                                 Length(1, 64),
+                                 Email()])
     password = PasswordField('Password', validators=[InputRequired()])
     submit = SubmitField('Update email')
 

app/account/views.py

@@ -1,6 +1,5 @@
 from flask import flash, redirect, render_template, request, url_for
-from flask_login import (current_user, login_required, login_user,
-                         logout_user)
+from flask_login import current_user, login_required, login_user, logout_user
 from flask_rq import get_queue
 
 from . import account
@@ -91,8 +90,8 @@ def reset_password_request():
                 user=user,
                 reset_link=reset_link,
                 next=request.args.get('next'))
-        flash('A password reset link has been sent to {}.'
-              .format(form.email.data), 'warning')
+        flash('A password reset link has been sent to {}.'.format(
+            form.email.data), 'warning')
         return redirect(url_for('account.login'))
     return render_template('account/reset_password.html', form=form)
 

app/admin/forms.py

@@ -11,7 +11,9 @@
 
 class ChangeUserEmailForm(Form):
     email = EmailField(
-        'New email', validators=[InputRequired(), Length(1, 64), Email()])
+        'New email', validators=[InputRequired(),
+                                 Length(1, 64),
+                                 Email()])
     submit = SubmitField('Update email')
 
     def validate_email(self, field):
@@ -35,11 +37,15 @@ class InviteUserForm(Form):
         get_label='name',
         query_factory=lambda: db.session.query(Role).order_by('permissions'))
     first_name = StringField(
-        'First name', validators=[InputRequired(), Length(1, 64)])
+        'First name', validators=[InputRequired(),
+                                  Length(1, 64)])
     last_name = StringField(
-        'Last name', validators=[InputRequired(), Length(1, 64)])
+        'Last name', validators=[InputRequired(),
+                                 Length(1, 64)])
     email = EmailField(
-        'Email', validators=[InputRequired(), Length(1, 64), Email()])
+        'Email', validators=[InputRequired(),
+                             Length(1, 64),
+                             Email()])
     submit = SubmitField('Invite')
 
     def validate_email(self, field):
@@ -51,7 +57,8 @@ class NewUserForm(InviteUserForm):
     password = PasswordField(
         'Password',
         validators=[
-            InputRequired(), EqualTo('password2', 'Passwords must match.')
+            InputRequired(),
+            EqualTo('password2', 'Passwords must match.')
         ])
     password2 = PasswordField('Confirm password', validators=[InputRequired()])
 

app/admin/views.py

@@ -1,14 +1,14 @@
-from flask import abort, flash, redirect, render_template, url_for, request
+from flask import abort, flash, redirect, render_template, request, url_for
 from flask_login import current_user, login_required
 from flask_rq import get_queue
 
-from .forms import (ChangeAccountTypeForm, ChangeUserEmailForm, InviteUserForm,
-                    NewUserForm)
 from . import admin
 from .. import db
 from ..decorators import admin_required
 from ..email import send_email
-from ..models import Role, User, EditableHTML
+from ..models import EditableHTML, Role, User
+from .forms import (ChangeAccountTypeForm, ChangeUserEmailForm, InviteUserForm,
+                    NewUserForm)
 
 
 @admin.route('/')
@@ -65,7 +65,8 @@ def invite_user():
             subject='You Are Invited To Join',
             template='account/email/invite',
             user=user,
-            invite_link=invite_link, )
+            invite_link=invite_link,
+        )
         flash('User {} successfully invited'.format(user.full_name()),
               'form-success')
     return render_template('admin/new_user.html', form=form)
@@ -107,8 +108,8 @@ def change_user_email(user_id):
         user.email = form.email.data
         db.session.add(user)
         db.session.commit()
-        flash('Email for user {} successfully changed to {}.'
-              .format(user.full_name(), user.email), 'form-success')
+        flash('Email for user {} successfully changed to {}.'.format(
+            user.full_name(), user.email), 'form-success')
     return render_template('admin/manage_user.html', user=user, form=form)
 
 
@@ -131,8 +132,8 @@ def change_account_type(user_id):
         user.role = form.role.data
         db.session.add(user)
         db.session.commit()
-        flash('Role for user {} successfully changed to {}.'
-              .format(user.full_name(), user.role.name), 'form-success')
+        flash('Role for user {} successfully changed to {}.'.format(
+            user.full_name(), user.role.name), 'form-success')
     return render_template('admin/manage_user.html', user=user, form=form)