diff --git a/Tweeder.py b/Tweeder.py index bc5e655..26f8589 100644 --- a/Tweeder.py +++ b/Tweeder.py @@ -68,7 +68,7 @@ def profile(name=None): posts = list(timeline.user_posts_by_username(name)) return render_template('profile.html', user=accounts.account_details(name), - logged_in=logged_in, darktheme=accounts.get_dark_theme(logged_in), + logged_in=logged_in, theme=accounts.get_theme(logged_in), following=accounts.is_following(logged_in, name), posts=posts) @@ -108,7 +108,10 @@ def user_settings(): if 'username' in session.keys(): logged_in = accounts.account_details(session['username'])['displayname'] account = accounts.account_details(session['username']) - return render_template('settings.html', logged_in=logged_in, account=account) + return render_template('settings.html', + logged_in=logged_in, + account=account, + theme=accounts.get_theme(session['username'].lower())) else: return redirect(url_for('login')) elif request.method == "POST": @@ -119,10 +122,12 @@ def user_settings(): 'gender': request.form['gender'], 'location': request.form['location'] } - darktheme = request.form['darktheme'] + if request.form['theme'] == "darkly": + accounts.set_theme(session['username'].lower(), "darkly") + elif request.form['theme'] == "default": + accounts.set_theme(session['username'].lower(), "default") username = session['username'] accounts.update_profile(username, profile) - accounts.set_dark_theme(username, darktheme) return redirect(url_for('profile')) diff --git a/backend/accounts.py b/backend/accounts.py index cb59477..d0f1530 100644 --- a/backend/accounts.py +++ b/backend/accounts.py @@ -5,14 +5,14 @@ client = MongoClient() accounts_db = client.tweeder.accounts -def get_dark_theme(username): +def get_theme(username): username = username.lower() - return accounts_db.find_one({"username": username})['darktheme'] + return accounts_db.find_one({"username": username})['theme'] -def set_dark_theme(username, value): +def set_theme(username, value): username = username.lower() - accounts_db.update_one({'username': username}, {"$set": {"darktheme": value}}) + accounts_db.update_one({'username': username}, {"$set": {"theme": value}}) def get_display_name(username): diff --git a/static/dark.css b/static/darkly.css similarity index 100% rename from static/dark.css rename to static/darkly.css diff --git a/templates/layout.html b/templates/layout.html index 3ef8823..ec56df1 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -6,7 +6,7 @@ - {% if darktheme %}{% endif %} + {% if theme=="darkly" %}{% endif %} {{ title }} - Tweeder diff --git a/templates/settings.html b/templates/settings.html index bad9f4c..de590e2 100644 --- a/templates/settings.html +++ b/templates/settings.html @@ -27,12 +27,18 @@ -
-
- - -
-
+

Site Theme

+ +
+
+ + +
+
+ + +
+