Yadciel/Titan
1
0
Fork 0
mirror of https://github.com/TitanEmbeds/Titan.git synced 2025-11-03 23:37:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Token count in menu

Browse Source
This commit is contained in:
Jeremy Zhang
2017-08-14 05:43:25 +00:00
parent 0d87e11e3e
commit fc05f3dda2
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webapp/titanembeds/blueprints/user/user.py
View File

@@ -41,6 +41,9 @@ def callback():
session['username'] = user['username'] session['username'] = user['username']
session['discriminator'] = user['discriminator'] session['discriminator'] = user['discriminator']
session['avatar'] = generate_avatar_url(user['id'], user['avatar']) session['avatar'] = generate_avatar_url(user['id'], user['avatar'])
session["tokens"] = get_titan_token(session["user_id"])
if session["tokens"] == -1:
session["tokens"] = 0
if session["redirect"]: if session["redirect"]:
redir = session["redirect"] redir = session["redirect"]
session['redirect'] = None session['redirect'] = None
@@ -72,10 +75,7 @@ def dashboard():
css_list = None css_list = None
if cosmetics and cosmetics.css: if cosmetics and cosmetics.css:
css_list = db.session.query(UserCSS).filter(UserCSS.user_id == session['user_id']).all() css_list = db.session.query(UserCSS).filter(UserCSS.user_id == session['user_id']).all()
tokens = get_titan_token(session["user_id"]) return render_template("dashboard.html.j2", servers=guilds, icon_generate=generate_guild_icon_url, cosmetics=cosmetics, css_list=css_list)
if tokens == -1:
tokens = 0
return render_template("dashboard.html.j2", servers=guilds, icon_generate=generate_guild_icon_url, cosmetics=cosmetics, css_list=css_list, tokens=tokens)
@user.route("/custom_css/new", methods=["GET"]) @user.route("/custom_css/new", methods=["GET"])
@discord_users_only() @discord_users_only()
@@ -383,6 +383,7 @@ def donate_confirm():
tokens = int(amount * 100) tokens = int(amount * 100)
action = "PAYPAL {}".format(trans_id) action = "PAYPAL {}".format(trans_id)
set_titan_token(session["user_id"], tokens, action) set_titan_token(session["user_id"], tokens, action)
session["tokens"] = get_titan_token(session["user_id"])
return redirect(url_for('user.donate_thanks', transaction=trans_id)) return redirect(url_for('user.donate_thanks', transaction=trans_id))
else: else:
return redirect(url_for('index')) return redirect(url_for('index'))

2
webapp/titanembeds/templates/dashboard.html.j2
View File

@@ -68,7 +68,7 @@
<div class="card-panel indigo lighten-5 z-depth-3 hoverable black-text"> <div class="card-panel indigo lighten-5 z-depth-3 hoverable black-text">
<h4>Donations!</h4> <h4>Donations!</h4>
<p class="flow-text">Would you like to support the Titan Embeds project?</p> <p class="flow-text">Would you like to support the Titan Embeds project?</p>
<p>You currently have <strong>{{ tokens }}</strong> Titan Tokens.</p> <p>You currently have <strong>{{ session["tokens"] }}</strong> Titan Tokens.</p>
<a class="waves-effect waves-light btn" href="{{ url_for('user.donate_get') }}">Donate!!</a> <a class="waves-effect waves-light btn" href="{{ url_for('user.donate_get') }}">Donate!!</a>
</div> </div>
</div> </div>

2
webapp/titanembeds/templates/site_layout.html.j2
View File

@@ -28,6 +28,8 @@
{% if session['unauthenticated'] is defined and not session['unauthenticated'] %} {% if session['unauthenticated'] is defined and not session['unauthenticated'] %}
<ul id="menu_dropdown" class="dropdown-content"> <ul id="menu_dropdown" class="dropdown-content">
<li><a href="{{ url_for('user.dashboard') }}">Dashboard</a></li> <li><a href="{{ url_for('user.dashboard') }}">Dashboard</a></li>
<li class="divider"></li>
<li><a href="{{ url_for('user.donate_get') }}"><i class="material-icons">monetization_on</i></nbr>{{ session["tokens"] }}</a></li>
{% if session['user_id'] is defined and session['user_id'] in devs %} {% if session['user_id'] is defined and session['user_id'] in devs %}
<li class="divider"></li> <li class="divider"></li>
<li><a href="{{ url_for('admin.index') }}">Admin</a></li> <li><a href="{{ url_for('admin.index') }}">Admin</a></li>