From 71a0c042477ee8edc2254bef3b7258ad0a6a4e75 Mon Sep 17 00:00:00 2001 From: Hailey Date: Thu, 10 Oct 2019 22:27:41 -0700 Subject: [PATCH] Templating and formatting. --- README.md | 2 +- app.py | 2 +- app_settings.py | 5 ++++- static/main.css | 5 +++++ templates/about.html | 34 ++++++++++++++++++---------------- templates/deny.html | 2 +- templates/settings.html | 13 ++++++++----- templates/tos.html | 4 ++-- 8 files changed, 40 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index a40876b..cea892f 100644 --- 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. diff --git a/app.py b/app.py index f67708e..42084cf 100644 --- a/app.py +++ b/app.py @@ -160,7 +160,7 @@ def testAjax(): @app.route('/launch') def launchPage(): - return flask.render_template_string('launch.html') + return flask.render_template('launch.html') @app.route('/pp') def PrivacyPolicy(): diff --git a/app_settings.py b/app_settings.py index aa551cc..75a2904 100644 --- 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) diff --git a/static/main.css b/static/main.css index cfeaa57..5d77ef6 100644 --- 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; +} diff --git a/templates/about.html b/templates/about.html index 4b3187f..6c9b70a 100644 --- a/templates/about.html +++ b/templates/about.html @@ -1,26 +1,28 @@ - {% include 'include/header.html' %} - About Thewords.faith - + }); + + -

About TheWords!

-
+

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' %} +
+ + {% include 'include/footer.html' %} + diff --git a/templates/deny.html b/templates/deny.html index 2c8ca80..4226318 100644 --- a/templates/deny.html +++ b/templates/deny.html @@ -1,4 +1,4 @@ - {% include 'include/header.html' %} +{% include 'include/header.html' %} 503 Denied -

Settings for {{ user_info['name'] }}!

+

Settings for {{ account_info.1 }}!

-
Name:
-
Email: {{ user_info['email'] }}
- +
User ID: {{ account_info.0 }}
+
Name:
+
Email: {{ account_info.2 }}
+
Account created on {{ account_info.6 }}
+

Google Info

+
Google ID: {{ user_info.id }}
Your active DIDs: (Click number to access messaging)