diff --git a/smsproj.py b/smsproj.py index 7db718c..3fbec42 100644 --- a/smsproj.py +++ b/smsproj.py @@ -280,11 +280,7 @@ def testAjax(): @app.route('/inbox') def inbox(): - if app_auth.is_logged_in(): - loggedin = True - else: - loggedin = False - return flask.render_template('inbox.html', loggedin=loggedin) + return short_render('inbox.html') @app.route('/getInbox', methods=['GET']) @@ -322,46 +318,39 @@ def returnInbox(): def launchPage(): if app_debug == '1': pprint.pprint(flask.session) - if app_auth.is_logged_in(): - loggedin = True - else: - loggedin = False - if app_debug == '1': pprint.pprint(loggedin) pprint.pprint("loggedin") - return flask.render_template('launch.html', loggedin=loggedin) + return short_render('launch.html') @app.route('/pp') def PrivacyPolicy(): if app_debug == '1': pprint.pprint(flask.session) - if app_auth.is_logged_in(): - loggedin = True - else: - loggedin = False - return flask.render_template('pp.html', loggedin=loggedin) + return short_render('pp.html') @app.route('/tos') def tos(): - if app_auth.is_logged_in(): - loggedin = True - else: - loggedin = False - return flask.render_template('tos.html', loggedin=loggedin) + return short_render('tos.html') @app.route('/about') def about(): + return short_render('about.html') + +@app.route('/matrix') +def matrix_info(): + return short_render('matrix.html') + +def short_render(template_file): if app_auth.is_logged_in(): loggedin = True else: loggedin = False - return flask.render_template('about.html', loggedin=loggedin) - + return flask.render_template(template_file, loggedin=loggedin) if __name__ == '__main__': #app.run(host="0.0.0.0", port=int("8890")) diff --git a/static/main.css b/static/main.css index f5d33a9..e0b1585 100644 --- a/static/main.css +++ b/static/main.css @@ -1,6 +1,6 @@ body { - background-color: #CDB4DB; - color: #000; + background-color: #1D2F2E; + color: #fff; } /************ * 1D2F2E @@ -10,10 +10,10 @@ body { * AF3E4D ************/ -a {color: #138;} -a:visited {color: #238;} -a:hover, a:active {color: #34;} -a:disabled {color: #9BB291;} +a {color: #ACF39D;} +a:visited {color: #B0C592;} +a:hover, a:active {color: #AF3E4D;} +a:disabled {color: #A97C73;} .ts { @@ -72,7 +72,7 @@ a:disabled {color: #9BB291;} #bodypane { float: left; width: 80%; - background-color: #CDB4DB; + background-color: #1D2F2E; } #footer { align-content: center; @@ -80,7 +80,7 @@ a:disabled {color: #9BB291;} width: 100%; } #navblock { - background-color: #CDB4DB; + background-color: #2E413F; width: 15%; float: left; margin:5px 10px 20px 20px; diff --git a/templates/homepage.html b/templates/homepage.html index 851e604..800787b 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -10,25 +10,19 @@ $("document").ready(function() {

TheWords.faith Home Page

TheWords.Faith Alpha Logo
-

TheWords.faith is a communications site and integrated into our Matrix server.

-

You can connect to the matrix home server with any standard matrix client by setting your homeserver to thewords.faith. - TheWords.faith matrix server should support email verification as well as VoIP and Video calls.

-

Any Matrix compattable client will work. Our offical one is at app.thewords.faith however are several other web clients such as, Element Web, - Schildi Chat Web, Cinny or my favorite fluffychat.im. For native apps I suggest - SchildiChat for your phone or desktop. - Or my favorite for smaller screens, fluffychat.im for android/ios.

-

For a list of all the clients available check out matrix clients.

+

TheWords.faith is a communications site and integrated into our Matrix service.

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 minded or a business sms number that allows you to stay in touch with your customers by providing SMS and eventually MMS support.

-

This is a public service. There are no logs stored only encrypted datasets. Please be respectful to everyone and their equipment as this is provided as a public service.

-