PULL

.gitignore

@@ -1,3 +1,13 @@
+.DS_Store
+
+scripts/
+
+# The local config  file should be specific to the machine running the app.
+local_config.py
 *.pyc
-# The settings.cfg file should be specific to the machine running the app.
-settings.cfg
+
+app.wsgi
+runserver.py
+
+*.log
+application.log

departmentArray.py

@@ -17,7 +17,8 @@ def combineShortAndLong(depts_list):
 	for dept in depts_list:
 		short_name = dept[0]
 		long_name = dept[1]
-		combined_list.append(short_name + "-" + long_name)
+		combined_list.append(short_name.lower() + "-" + long_name.lower())
+		print combined_list
 	return combined_list
 
 ##

runserver.py

@@ -11,4 +11,4 @@
 
 from study_buddy import app
 print "Starting server..."
-app.run(debug=True)
+app.run(debug=True)

study_buddy/__init__.py

@@ -1,72 +1,60 @@
-from flask import Flask
-from flask.ext.sqlalchemy import SQLAlchemy
-from flask.ext.security import Security, SQLAlchemyUserDatastore
-from flask.ext.social import Social, SQLAlchemyConnectionDatastore, \
-	 login_failed
-from mongokit import *
-from models import *
+from flask import Flask, render_template, request, session, abort
 
-app = Flask(__name__)
+# from flask.ext.wtf.csrf import CsrfProtect
+from flask.ext.assets import Environment, Bundle
+from flask.ext.mail import Mail, Message
 
-# TODO: move all configs into external file.
-app.config['SOCIAL_FACEBOOK'] = {
-    'consumer_key': '804807199563793',
-    'consumer_secret': 'e7d68bbbd3b828743dc3d6fff7cc9406'
-}
+from itsdangerous import URLSafeTimedSerializer
+from inflection import titleize
 
-app.config['SOCIAL_GOOGLE'] = {
-    'consumer_key': '967982158206-146hbl8954b0oa45e71ii9efuuaj4fj0.apps.googleusercontent.com',
-    'consumer_secret': 'JFYgnNsq8FR6qfjSC-uDHFEl'
-}
+import os, binascii, logging, sys
 
-app.config['SECURITY_POST_LOGIN'] = '/profile'
+logging.basicConfig(level=logging.DEBUG,
+                    streamHandler=sys.stderr,
+                    format='[%(levelname)s] <%(asctime)s> %(message)s') 
 
-##
-# STAGE FOR DELETE
-#################################################
-app.config.update(
-    SECRET_KEY='Tieng3us3Xie5meiyae6iKKHVUIUDF',
-    GOOGLE_LOGIN_CLIENT_ID='1002179078501-mdq5hvm940d0hbuhqltr0o1qhsr7sduc.apps.googleusercontent.com',
-    GOOGLE_LOGIN_CLIENT_SECRET='O1kpQ8Is9s2pD3eOpxRfh-7x',
-    GOOGLE_LOGIN_REDIRECT_URI='http://127.0.0.1:5000/oauth2callback',
-)
-#################################################
+app = Flask(__name__)
 
-db = SQLAlchemy(app)
+app.config.from_object('study_buddy.base_config')
+app.config.from_object('study_buddy.local_config')
 
-connection = Connection()
-connection.register([StudySession])
-mongo_db = connection.succor
+APP_ROOT = os.path.dirname(os.path.abspath(__file__))
 
-print "Running app..."
+def output_time(result):
+    format = "%a, %-d at %-I:%M %p"
+    return result.strftime(format)	
 
-from . import views, models
+def generate_csrf_token():
+    if '_csrf_token' not in session:
+        session['_csrf_token'] = binascii.hexlify(os.urandom(24))
+    return session['_csrf_token']		
 
-# security_ds = SQLAlchemyUserDatastore(db, models.User, models.Role)
-# social_ds = SQLAlchemyConnectionDatastore(db, models.Connection)
+# assets = Environment(app)
+# scss = Bundle('', filters='pyscss', output='all.css')
+# assets.register('scss_all', scss)
 
-# app.security = Security(app, security_ds)
-# app.social = Social(app, social_ds)
+# csrf = CsrfProtect()
+# csrf.init_app(app)
 
-# class SocialLoginError(Exception):
-#     def __init__(self, provider):
-#         self.provider = provider
+ts = URLSafeTimedSerializer(app.config["SECRET_KEY"])
+
+mail = Mail(app)
+
+print "Running app..."
+app.jinja_env.globals.update(output_time=output_time)
+app.jinja_env.globals.update(titleize=titleize)
+app.jinja_env.globals['csrf_token'] = generate_csrf_token
 
-# @app.before_first_request
-# def before_first_request():
-#     try:
-#         models.db.create_all()
-#     except Exception, e:
-#         app.logger.error(str(e))
+from study_buddy import views, models
 
-# @login_failed.connect_via(app)
-# def on_login_failed(sender, provider, oauth_response):
-#     app.logger.debug('Social Login Failed via %s; '
-#                      '&oauth_response=%s' % (provider.name, oauth_response))
+@app.errorhandler(404)
+def page_not_found(e):
+	return render_template('404.html'), 404
 
-#     # Save the oauth response in the session so we can make the connection
-#     # later after the user possibly registers
-#     session['failed_login_connection'] = \
-#         get_connection_values_from_oauth_response(provider, oauth_response)
+@app.before_request
+def csrf_protect():
+    if request.method == "POST":
+        token = session.pop('_csrf_token', None)
+        if not token or token != request.form.get('_csrf_token'):
+            abort(403)
 
-#     raise SocialLoginError(provider)

study_buddy/backup/department_names.json

@@ -0,0 +1 @@
+{department_name:"Computer Science",school:"Wesleyan University",names:"[comp, compsci, computer]"}

study_buddy/backup/slangscommand

@@ -0,0 +1,4 @@
+#mongoimport --db succor --collection slangs --type json --file backup/department_names.json --jsonArray
+#Copy paste this command after running mongod on the terminal and adding to the
+# file department_names located in backup folder. MAKE SURE TO COPY THE FORMAT or else 
+# it won't import

study_buddy/base_config.py

@@ -0,0 +1,10 @@
+SECURITY_POST_LOGIN = '/profile'
+
+MAIL_SERVER = 'smtp.gmail.com'
+MAIL_PORT = 587
+MAIL_USE_TLS = True
+MAIL_USE_SSL = False
+ADMINS = ['succorapp@gmail.com']
+
+DB_HOST = 'localhost'
+DB_PORT = 27017

study_buddy/forms.py

@@ -1,35 +1,101 @@
-from flask import current_app
 from flask.ext.wtf import Form
-from wtforms import TextField, PasswordField, ValidationError
-from wtforms.validators import Required, Email, Length, Regexp, EqualTo
-
-class UniqueUser(object):
-    def __init__(self, message="User exists"):
-        self.message = message
-
-    def __call__(self, form, field):
-        if current_app.security.datastore.find_user(email=field.data):
-            raise ValidationError(self.message)
-
-
-validators = {
-    'email': [
-        Required(),
-        Email(),
-        UniqueUser(message='Email address is associated with '
-                           'an existing account')
-    ],
-    'password': [
-        Required(),
-        Length(min=6, max=50),
-        EqualTo('confirm', message='Passwords must match'),
-        Regexp(r'[A-Za-z0-9@#$%^&+=]',
-               message='Password contains invalid characters')
-    ]
-}
-
-
-class RegisterForm(Form):
-    email = TextField('Email', validators['email'])
-    password = PasswordField('Password', validators['password'], )
+from wtforms import TextField, PasswordField, ValidationError, BooleanField, IntegerField, DateTimeField, HiddenField, validators
+from init_db import mongo_db
+from werkzeug.security import check_password_hash
+import re
+
+class EmailForm(Form):
+    email = TextField('Email', validators = [validators.Email(), validators.Required()])
+
+    def validate_email(self, field):
+        if self.get_user() is None:
+            raise validators.ValidationError('There is no account with this email')
+
+    def get_user(self):
+        return mongo_db.users.User.find_one({'email' : self.email.data})
+
+
+class PasswordForm(Form):
+    password = PasswordField('New Password', validators = [validators.Required()])
+
+class GroupForm(Form):
+    email = TextField('Contact')
+    department = TextField('Department', [
+        validators.Required()
+    ])
+    course_no = IntegerField('Course Number', [
+        validators.Required(),
+    ])
+    datetime = DateTimeField('Date and time', format="%Y/%m/%d %H:%M")
+    where = TextField('Where', [
+        validators.Required()
+    ])
+    assignment = TextField('Assignment', [
+        validators.Required()
+    ])
+
+    school = TextField('School')
+    details = TextField('Details')
+    geo_location = HiddenField()
+    #all_nighter=BooleanField('All nighter')
+
+    def validate_course_no(self, field):
+        if not self.course_no.data < 1000 or len(str(self.course_no.data)) != 3:
+            raise validators.ValidationError('Please enter a 3 digit course number')
+
+    def validate_email(self, field):
+        if self.email.data and '.edu' not in self.email.data:
+            raise validators.ValidationError('Please use a .edu email')
+
+class EditUserForm(Form):
+    first_name = TextField('First Name', [
+        #validators.Regexp(r'^[A-Za-z0-9.]+$', message= u'That\'s not a valid first name'), 
+        validators.Required()
+        ])
+    last_name = TextField('Last Name', [ 
+        validators.Required()
+    ])
+    course = TextField('Class')
+
+
+class LoginForm(Form):
+    email = TextField('Email', [
+        validators.Required()
+    ])
+
+    password = PasswordField('Password')
+
+    remember = BooleanField('Remember me')
+
+    def validate_password(self, field):
+        user = self.get_user()
+
+        if user is None:
+            raise validators.ValidationError('Email does not exist')
+
+        if not check_password_hash(user.password, self.password.data):
+            raise validators.ValidationError('Invalid password')
+
+    def get_user(self):
+        return mongo_db.users.User.find_one({'email' : self.email.data})
+
+
+class RegistrationForm(Form):
+    email = TextField('Email', [
+        validators.Required(),
+        validators.length(min=6, max=50),
+        validators.Email()
+    ])
+
+    def validate_email(self, field):
+        if '.edu' not in self.email.data:
+            raise validators.ValidationError('Please use a .edu email')
+
+        if mongo_db.users.User.find({'email' : self.email.data}).count() > 0:
+            raise validators.ValidationError('Account with that email already exists')
+
+    password = PasswordField('Password', [
+        validators.Required(),
+        validators.EqualTo('confirm', message='Passwords must match')
+    ])
     confirm = PasswordField('Confirm Password')