diff --git a/app.py b/app.py index 50f9c8e..42084cf 100644 --- a/app.py +++ b/app.py @@ -37,7 +37,7 @@ else: def index(): #This is the root index. If not logged in it displays homepage.html if not google_auth.is_logged_in(): - return flask.render_template('homepage.html', denymsg = loginMsg, loggedin = False) + return flask.render_template('homepage.html', loggedin = False) user_info = google_auth.get_user_info() indbRes = appdb.isUserinDB(user_info['id']) @@ -46,11 +46,11 @@ def index(): pprint.pprint(indbRes) refreshtoken = google_auth.getRefreshToken() if not refreshtoken: - return "Error with your refresh token" + return flask.render_template('error.html', denymsg = 'Error with your refresh token.', loggedin = False) userid = appdb.getUserIDfromGoogleID(user_info['id']) if not userid: - return 'You are not currently logged in.' + return flask.render_template('error.html', denymsg = 'You are not currently logged in.', loggedin = False) rows = appdb.getDIDsbyAccount(userid) return flask.render_template('index.html', diff --git a/app_settings.py b/app_settings.py index 9b0fa2b..aa551cc 100644 --- a/app_settings.py +++ b/app_settings.py @@ -23,11 +23,12 @@ else: @app.route('/settings') def appsettings(): if not google_auth.is_logged_in(): - return flask.render_template('deny.html', denymsg = 'You are not authorized to be here', loggedin = False) + 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() + if not refreshtoken: - return flask.render_template('error.html', denymsg = 'Error with your refresh token', loggedin = False) + return flask.render_template('error.html', denymsg = 'Error with your refresh token.', loggedin = False) userid = appdb.getUserIDfromGoogleID(user_info['id']) if not userid: return flask.render_template('error.html', denymsg = 'You are not currently logged in.', loggedin = False) @@ -35,7 +36,6 @@ def appsettings(): rows = appdb.getDIDsbyAccount(userid) dbEmail = appdb.getInfobyEmail(user_info['email']) return flask.render_template('settings.html', - name = user_info['name'], - email = user_info['email'], + user_info = user_info, dids = rows, loggedin = True) diff --git a/static/main.css b/static/main.css index d8b1b67..cfeaa57 100644 --- a/static/main.css +++ b/static/main.css @@ -36,7 +36,7 @@ a:disabled {color: #9BB291;} border: dotted; border-color: #AF3E4D; padding: 1em; - + } #chat-director { @@ -54,9 +54,9 @@ a:disabled {color: #9BB291;} } #right-side { float: right; - text-align: right; + text-align: right; } .smsbody { font-size:2em; color: #B0C592; -} \ No newline at end of file +} diff --git a/templates/about.html b/templates/about.html index e8340a8..4b3187f 100644 --- a/templates/about.html +++ b/templates/about.html @@ -8,8 +8,18 @@

About TheWords!

-
+

We're all about getting thewords out and allowing us to communicate securely to friends and loved ones.

+

This site is still under active development and subject to change. For those who are interested in helping + with development or testing hit me up on my GitHub sms-proj Page.

+

We aim to take bitcoin and other crypto currencies to allow people to use SMS at home on their computer or on the go as + a backup on their phone or tablet.

+
+ {% include 'include/footer.html' %} diff --git a/templates/deny.html b/templates/deny.html index f3521f6..2c8ca80 100644 --- a/templates/deny.html +++ b/templates/deny.html @@ -9,5 +9,4 @@

503 Denied.

{{ denymsg }}

-

Please login at The Login Page

{% include 'include/footer.html' %} diff --git a/templates/homepage.html b/templates/homepage.html index bec0e70..946963f 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -14,8 +14,8 @@ $("document").ready(function() {

Right now we are not even in beta, and the service isn't ready for the world yet. At least until we get some more testers.

This site, in the end, will allow users to send text messages to the US for a low monthly fee. - This allows businesses or end users who want privacy or a business sms number - to do just that, send and receive messages.

+ This allows businesses or end users who want privacy minded or a business sms number that + allows you to stay in touch with your customers by providing SMS and eventually MMS support.