Merge

Author: tijptjik

utils/database.py

@@ -14,7 +14,7 @@ def setup_db():
     con = sqlite3.connect('vocably.db')
 
     with con:
-        cur = con.cursor()    
+        cur = con.cursor()
 
         cur.execute("SELECT * FROM sqlite_master WHERE type='table' AND name='Users';")
         rows = cur.fetchall()
@@ -68,7 +68,7 @@ def get_score(email):
     con = sqlite3.connect('vocably.db')
 
     with con:
-        cur = con.cursor()    
+        cur = con.cursor()
         query = 'SELECT score FROM Users WHERE email="'+email+'";'
         cur.execute(query)
         rows = cur.fetchall()
@@ -78,7 +78,7 @@ def store_user_words(email,words):
     con = sqlite3.connect('vocably.db')
 
     with con:
-        cur = con.cursor()    
+        cur = con.cursor()
 
         for word in words:
             query = 'INSERT INTO Vocab VALUES("'
@@ -93,7 +93,7 @@ def wipe_db():
     if not os.path.isfile("vocably.db"):
         print "The database is not there to begin with!"
         return
-    
+
     msg = "Are you 100% sure you want to wipe the database?\n"
     msg += "This will remote all data and is irreversible... (yes/no)\n"
     input_ = raw_input(msg).strip().lower()

utils/vocably.db

@@ -1,7 +1,6 @@
 from bottle import route, run, debug, template, request, static_file, redirect
-from utils import vocably_oauth as oauth, score, definition
-from utils import database as db
 
+from utils import vocably_oauth as oauth, score, definition, database as db
 
 # Landing Page
 @route('/')
@@ -41,6 +40,7 @@ def login_callback():
     else:
         print "Successfully acquired an authentication token"
         oauth.authorize(request.query.code)
+        database.create_user(oauth.user_email(), 0)
         redirect('/emails')
 
 @route('/emails')