ticketfrei
/
ticketfrei
10
1
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity

removed debug messages, small layout changes

This commit is contained in:
b3yond 2018-03-17 15:57:56 +01:00
parent 0e0e81845e
commit be9e7a70bf
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/website.py
View File

@ -116,8 +116,6 @@ def confirm_account(encoded_jwt):
with open(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "blacklists", "nbg_blacklist"), with open(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "blacklists", "nbg_blacklist"),
"r") as f: "r") as f:
default_blacklist = f.read() default_blacklist = f.read()
print(default_goodlist) # debug
print(default_blacklist) # debug
db.cur.execute("INSERT INTO trigger_bad(user_id, words) VALUES(?, ?);", (get_user_id(email), default_blacklist)) db.cur.execute("INSERT INTO trigger_bad(user_id, words) VALUES(?, ?);", (get_user_id(email), default_blacklist))
db.conn.commit() db.conn.commit()
bottle.response.set_cookie("account", email, secret, path="/") bottle.response.set_cookie("account", email, secret, path="/")
@ -132,7 +130,6 @@ def manage_bot():
:return: If it returns something, it just refreshes the page. :return: If it returns something, it just refreshes the page.
""" """
email = bottle.request.get_cookie("account", secret=secret) email = bottle.request.get_cookie("account", secret=secret)
print(email) # debug
if email is not None: if email is not None:
user_id = get_user_id(email) user_id = get_user_id(email)
# get Enable Status from db # get Enable Status from db
@ -151,7 +148,6 @@ def manage_bot():
# Deliver goodlist with a Cookie # Deliver goodlist with a Cookie
print("setting goodlist cookies?") print("setting goodlist cookies?")
resp.set_cookie("goodlist", words, path="/settings") resp.set_cookie("goodlist", words, path="/settings")
print(words) # debug
# Get blacklist from db # Get blacklist from db
db.cur.execute("SELECT words FROM trigger_bad WHERE user_id=?;", (user_id,)) db.cur.execute("SELECT words FROM trigger_bad WHERE user_id=?;", (user_id,))
@ -159,7 +155,6 @@ def manage_bot():
# Deliver badlist with a Cookie # Deliver badlist with a Cookie
print("setting blacklist cookies?") print("setting blacklist cookies?")
resp.set_cookie("blacklist", words, path="/settings") resp.set_cookie("blacklist", words, path="/settings")
print(words) # debug
return resp return resp
else: else:

1
static/css/style.css
View File

@ -81,6 +81,7 @@ input[type=text], input[type=password] {
.footer { .footer {
padding: 2em; padding: 2em;
bottom: 0; bottom: 0;
background-color: #fff;
float: center; float: center;
width: 540px; width: 540px;
height: 30px; height: 30px;

18
static/index.html
View File

@ -20,14 +20,12 @@
<label><b>Password</b></label> <label><b>Password</b></label>
<input type="password" placeholder="Enter Password" name="psw" required> <input type="password" placeholder="Enter Password" name="psw" required>
<span style="float:left;">
<input type="checkbox" checked="checked"> Remember me
</span>
<span style="float:center"> <span style="float:center">
<button type="submit">Login</button> <button type="submit">Login</button>
<span class="psw" style="float: right;"> </span>
Forgot <a href="#">password?</a> <br>
</span> <span class="psw" style="float: right;">
Forgot <a href="#">password?</a>
</span> </span>
</div> </div>
</form> </form>
@ -58,6 +56,8 @@
software like Aldus PageMaker including versions of Lorem software like Aldus PageMaker including versions of Lorem
Ipsum.</p> Ipsum.</p>
<a href="static/register.html"><button>Register</button></a> <a href="static/register.html"><button>Register</button></a>
<br>
&nbsp;
<h2>Our Mission</h2> <h2>Our Mission</h2>
<p>Contrary to popular belief, Lorem Ipsum is not simply random <p>Contrary to popular belief, Lorem Ipsum is not simply random
text. It has roots in a piece of classical Latin literature text. It has roots in a piece of classical Latin literature
@ -73,9 +73,9 @@
popular during the Renaissance. The first line of Lorem popular during the Renaissance. The first line of Lorem
Ipsum, "Lorem ipsum dolor sit amet..", comes from a line Ipsum, "Lorem ipsum dolor sit amet..", comes from a line
in section 1.10.32.</p> in section 1.10.32.</p>
<br> <br>
</div> </div>
<div class=footer> <div class=footer>
Contribute on <a href="https://github.com/b3yond/ticketfrei">GitHub!</a> Contribute on <a href="https://github.com/b3yond/ticketfrei">GitHub!</a>
</div> </div>
</div> </div>