From fe7d319dfa915c240be29ae3f754ec8a2829f604 Mon Sep 17 00:00:00 2001
From: Socks <me@sockspls.com>
Date: Mon, 26 Mar 2018 17:27:19 +0100
Subject: [PATCH] Show saved alert on saving settings

---
 Tweeder.py              | 18 ++++++++++++------
 templates/settings.html | 26 ++++++++++++++++++++++----
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/Tweeder.py b/Tweeder.py
index f7d464a..11b9116 100644
--- a/Tweeder.py
+++ b/Tweeder.py
@@ -119,16 +119,16 @@ def global_timeline():
 
 @app.route('/settings', methods=['GET', 'POST'])
 def user_settings():
+    if 'username' in session.keys():
+        logged_in = accounts.account_details(session['username'])['displayname']
+        account = accounts.account_details(session['username'])
+    else: redirect(url_for('login'))
     if request.method == "GET":
-        if 'username' in session.keys():
-            logged_in = accounts.account_details(session['username'])['displayname']
-            account = accounts.account_details(session['username'])
             return render_template('settings.html',
                                    title="Settings",
                                    logged_in=logged_in,
                                    account=account,
                                    theme=accounts.get_theme(session['username'].lower()))
-        else:
             return redirect(url_for('login'))
     elif request.method == "POST":
         print(request.files)
@@ -144,13 +144,19 @@ def user_settings():
             profile_pic = files.upload_file(request.files['profile_pic'])
             updated_profile['profile_pic'] = profile_pic
         else:
-            if accounts.account_details(session['username'].lower())['profile']['profile_pic']:
+            if 'profile_pic' in accounts.account_details(session['username'].lower())['profile'].keys():
                 profile_pic = accounts.account_details(session['username'].lower())['profile']['profile_pic']
                 updated_profile['profile_pic'] = profile_pic
         accounts.set_theme(session['username'].lower(), request.form['theme'])
         username = session['username']
         accounts.update_profile(username, updated_profile)
-        return redirect(request.referrer)
+        account = accounts.account_details(session['username'])
+        return render_template('settings.html',
+                               title="Settings",
+                               saved=True,
+                               logged_in=logged_in,
+                               account=account,
+                               theme=accounts.get_theme(session['username'].lower()))
 
 
 @app.route("/delete/<post_id>", methods=['GET'])
diff --git a/templates/settings.html b/templates/settings.html
index 452e0d3..c22b239 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -2,6 +2,12 @@
 {% block nav_settings %}active{% endblock %}
 {% block content %}
     <div class="container">
+        {% if saved %}
+            <div class="alert alert-success alert-dismissable fade show">
+                <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
+                <b>Success!</b> Your settings have been saved
+            </div>
+        {% endif %}
         <h1>Settings for {{ logged_in }}</h1><hr />
         <form method="POST" action="/settings" class="col-lg-6" enctype="multipart/form-data">
             <div class="form-group">
@@ -28,13 +34,25 @@
                     <input type="text" name="location" class="form-control" placeholder="Location" aria-describedby="basic-addon1" value="{{ account.profile.location }}">
                 </div>
 
-                <div class="input-group mb-3">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text" id="basic-addon1"><i class="far fa-fw fa-transgender-alt"></i></span>
+                <div class="form-group row">
+                    <label for="colFormLabel" class="col-sm-2 col-form-label col-form-label">Gender</label>
+                    <div class="col-sm-10">
+                        <div class="custom-control custom-radio custom-control-inline mt-2">
+                            <input type="radio" id="genderInline1" name="gender" value="Male" class="custom-control-input" {% if account.profile.gender=="Male" %}checked{% endif %}>
+                            <label class="custom-control-label" for="genderInline1">Male</label>
+                        </div>
+                        <div class="custom-control custom-radio custom-control-inline mt-2">
+                            <input type="radio" id="genderInline2" name="gender" value="Female" class="custom-control-input" {% if account.profile.gender=="Female" %}checked{% endif %}>
+                            <label class="custom-control-label" for="genderInline2">Female</label>
+                        </div>
+                        <div class="custom-control custom-radio custom-control-inline mt-2">
+                            <input type="radio" id="genderInline3" name="gender" class="custom-control-input" {% if account.profile.gender!="Female" and account.profile.gender!="Male" %}checked{% endif %}>
+                            <label class="custom-control-label" for="genderInline3">Other</label>
+                        </div>
                     </div>
-                    <input type="text" name="gender" class="form-control" placeholder="Gender" aria-describedby="basic-addon1" value="{{ account.profile.gender }}">
                 </div>
 
+
                 <h2>Site Theme</h2>
 
                 <div class="input-group mb-3">