Merge branch 'master' of https://github.com/hailey/sms-proj

app.py

@@ -25,6 +25,7 @@ app.secret_key = config.get("auth","FN_FLASK_SECRET_KEY")
 app.register_blueprint(google_auth.app)
 app.register_blueprint(callback_sms.app)
 app.register_blueprint(app_settings.app)
+app.register_blueprint(app_auth.app)
 
 loginMsg = "You are not logged in."
 

app_auth.py

@@ -8,6 +8,8 @@ config.read('config.ini')
 app_debug = config.get("app","debug")
 app_salt = config.get("auth","FN_FLASK_SECRET_KEY")
 
+app = flask.Blueprint('app_auth', __name__)
+
 def is_logged_in():
     if google_auth.is_logged_in():
         return True

app_settings.py

@@ -7,7 +7,7 @@ import pprint
 import configparser
 import flask
 
-import appdb
+import appdb, app_auth
 import google_auth
 
 config = configparser.ConfigParser()
@@ -22,7 +22,7 @@ else:
 
 @app.route('/settings')
 def appsettings():
-    if not google_auth.is_logged_in():
+    if not app_auth.is_logged_in():
         return flask.render_template('deny.html', denymsg = "I don't know who you are so I can't help you with your user settings. :(", loggedin = False)
     user_info = google_auth.get_user_info()
     refreshtoken = google_auth.getRefreshToken()

templates/settings.html

@@ -2,8 +2,10 @@
     <title> {{ account_info.1 }}'s Settings </title>
     <script type="text/javascript">
     $("document").ready(function() {
-
-      });
+        $( "#submitpw" ).click(function() {
+          alert("HIII")
+        });
+    });
     </script>
 </head>
 {% include 'include/navblock.html' %}
@@ -12,6 +14,7 @@
 <div id='body'>
     <div id='accountInfoBlock'>
         <div class='uid'>User ID: {{ account_info.0 }}</div>
+        <div class='uid'>User Name: {{ account_info['username'] }}</div>
         <div class='namefield'>Name: <input type='text' id='email' value='{{ account_info.1 }}' /></div>
         <div class='emailfield'>Email: {{ account_info.2 }}</div>
         <div class='creationTime'>Account created on {{ account_info.6 }}</div>
@@ -22,7 +25,8 @@
       <div class='largeField'><h3>Local Password</h3></div>
       <div class='passwd'>Password: <input type='password' id='passwdone' /></div>
       <div class='passwd'>Confirm: <input type='password' id='passwdtwo' /></div>
-      <div class='submitpw'><input type='button' value='Update Password' /></div>
+      <div class='submitpw'><input type='button' id="submitpw" value="Update Password" /></div>
+      <div id='status'></div>
     </div>
 Your active DIDs: (Click number to access messaging)
 <ul>