Yadciel/Titan
1
0
Fork 0
mirror of https://github.com/TitanEmbeds/Titan.git synced 2024-12-24 14:07:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed EmojiParser and edited about.html.j2 template

Browse Source 
Fixed api.py

Updated about.html.j2
This commit is contained in:
JustMaffie 2017-05-29 00:01:04 +02:00 committed by Jeremy Zhang
parent 187ae6809f
commit 6d3cc6f01a
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/titanembeds/blueprints/api/api.py
View File

@ -1,6 +1,6 @@
from titanembeds.database import db, Guilds, UnauthenticatedUsers, UnauthenticatedBans, AuthenticatedUsers, KeyValueProperties, GuildMembers, Messages, get_channel_messages, list_all_guild_members
from titanembeds.decorators import valid_session_required, discord_users_only
from titamembeds.EmojiParser import parseEmoji
from titanembeds.EmojiParser import parseEmoji
from titanembeds.utils import check_guild_existance, guild_query_unauth_users_bool, get_client_ipaddr, discord_api, rate_limiter, channel_ratelimit_key, guild_ratelimit_key
from titanembeds.oauth import user_has_permission, generate_avatar_url, check_user_can_administrate_guild
from flask import Blueprint, abort, jsonify, session, request

BIN
webapp/titanembeds/static/img/people/iammaffie.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 94 KiB

20
webapp/titanembeds/templates/about.html.j2
View File

@ -76,7 +76,22 @@ etc.</p>
<div class="col s10">
<h5 class="black-text card-title">EndenDragon</h5>
<p class="black-text flow-text">Project Lead</p>
<!--<p class="black-text">The one who started this project. How was Titan born? No one is for sure. But the legends say that the place he worked at (BronyTV) decided to ditch IRC for Discord, and Titan was the product of this chaos.</p>-->
<p class="black-text">The one who started this project. How was Titan born? No one is for sure. But the legends say that the place he worked at (BronyTV) decided to ditch IRC for Discord, and Titan was the product of this chaos.</p>
</div>
</div>
</div>
</div>
<div class="col s12 m6">
<div class="card-panel indigo lighten-5 z-depth-1 no-height-padding">
<div class="row valign-wrapper">
<div class="col s2">
<img src="{{ url_for('static', filename='img/people/iammaffie.png') }}" alt="iAmMaffie" class="circle responsive-img">
</div>
<div class="col s10">
<h5 class="black-text card-title">iAmMaffie_</h5>
<p class="black-text flow-text">Developer</p>
<p class="black-text">A mysterious guy, he helped out Titan with his Python coding skills, he helped primarely with the Emoji parsers and the Discord Bot commands system.</p>
</div>
</div>
</div>
@ -91,6 +106,7 @@ etc.</p>
<div class="col s10">
<h5 class="black-text card-title">Riva</h5>
<p class="black-text flow-text">Bot Hosting</p>
<p class="black-text">This guy hosts our lovely bot, without him titan would probably not exist.</p>-->
</div>
</div>
</div>
@ -105,6 +121,7 @@ etc.</p>
<div class="col s10">
<h5 class="black-text card-title">.JS</h5><!-- Yes this dot is intentional -->
<p class="black-text flow-text">Embed Theme Architect</p>
<p class="black-text">.JS didn't make the designs in JavaScript, he helped out Titan with his CSS skillz.</p>-->
</div>
</div>
</div>
@ -119,6 +136,7 @@ etc.</p>
<div class="col s10">
<h5 class="black-text card-title">Semic</h5>
<p class="black-text flow-text">Logo/Asset Designer</p>
<p class="black-text">Semic made most of our graphics such as the Logo and moooooore.</p>-->
</div>
</div>
</div>