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

6 years ago · f4315a87f4
parent 8c8ad5af86 71a0c04247
commit f4315a87f4
7 changed files with 39 additions and 26 deletions
--- a/README.md
+++ b/README.md
@ -11,4 +11,4 @@ This requires a flowroute account. It uses google to authenticate. But I might a
 App runs via the following command.
 > gunicorn3 app:app

-This will run and listen to as a daemon.
+This will run and listen on a port, probably port 8000 as its default as a daemon.
--- a/app_settings.py
+++ b/app_settings.py
@ -34,8 +34,11 @@ def appsettings():
        return flask.render_template('error.html', denymsg = 'You are not currently logged in.', loggedin = False)

    rows = appdb.getDIDsbyAccount(userid)
-    dbEmail = appdb.getInfobyEmail(user_info['email'])
+    accountInfo = appdb.getInfobyEmail(user_info['email'])
+    # userDBInfo.getInfobyE
+    pprint.pprint(accountInfo)
    return flask.render_template('settings.html',
                                user_info = user_info,
+                                account_info = accountInfo,
                                dids = rows,
                                loggedin = True)
--- a/static/main.css
+++ b/static/main.css
@ -60,3 +60,8 @@ a:disabled {color: #9BB291;}
    font-size:2em;
    color: #B0C592;
 }
+
+#navblock {
+  background-color: #2D3F3E;
+  font-size: 2em;
+}
--- a/templates/about.html
+++ b/templates/about.html
@ -6,6 +6,7 @@
  });
 </script>
 </head>
+
 <body>
  <h1>About TheWords!</h1>
  <div id='about'>
@ -23,4 +24,5 @@
  </div>
  {% include 'include/footer.html' %}
 </body>
+
 </html>
--- a/templates/settings.html
+++ b/templates/settings.html
@ -1,5 +1,5 @@
 {% include 'include/header.html' %}
-    <title> {{ name }}'s Settings </title>
+    <title> {{ account_info.1 }}'s Settings </title>
    <script type="text/javascript">
    $("document").ready(function() {

@ -7,13 +7,16 @@
    </script>
 </head>
 <body>
-<h1>Settings for {{ user_info['name'] }}!</h1>
+<h1>Settings for {{ account_info.1 }}!</h1>

 <div id='body'>
    <div id='accountInfoBlock'>
-        <div class='namefield'>Name: <input type='text' id='email' value='{{ user_info['name'] }}' /></div>
-        <div class='emailfield'>Email: {{ user_info['email'] }}</div>
-
+        <div class='uid'>User ID: {{ account_info.0 }}</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>
+        <div class='largeField'><h3>Google Info</h3></div>
+        <div class='googleID'>Google ID: {{ user_info.id }}</div>
    </div>
 Your active DIDs: (Click number to access messaging)
 <ul>