ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-27 13:34:28 +00:00
Code Activity

some web stuff

Browse source
This commit is contained in:
Steffo 2018-05-07 12:51:24 +02:00
parent bb9341d845
commit de76a6cef7
7 changed files with 143 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
db.py
View file

@ -1,7 +1,7 @@
import datetime import datetime
from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import sessionmaker, relationship from sqlalchemy.orm import sessionmaker, relationship
from sqlalchemy import Column, BigInteger, Integer, String, DateTime, ForeignKey, Float, Enum, create_engine, UniqueConstraint, PrimaryKeyConstraint, Boolean, or_ from sqlalchemy import Column, BigInteger, Integer, String, DateTime, ForeignKey, Float, Enum, create_engine, UniqueConstraint, PrimaryKeyConstraint, Boolean, or_, LargeBinary
import requests import requests
from errors import RequestError, NotFoundError, AlreadyExistingError from errors import RequestError, NotFoundError, AlreadyExistingError
import re import re
@ -25,6 +25,8 @@ class Royal(Base):
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)
username = Column(String, unique=True, nullable=False) username = Column(String, unique=True, nullable=False)
password = Column(LargeBinary)
fiorygi = Column(Integer, default=0)
@staticmethod @staticmethod
def create(session: Session, username: str): def create(session: Session, username: str):

1
requirements.txt
View file

@ -8,3 +8,4 @@ psycopg2
PyNaCl PyNaCl
async_timeout async_timeout
raven raven
bcrypt

9
static/nryg.css Normal file
View file

@ -0,0 +1,9 @@
body {
font-family: sans-serif;
color: #a0ccff;
background-color: #0d193b;
}
h1, h2, h3, h4, h5, h6 {
color: #fff;
}

13
templates/base.html Normal file
View file

@ -0,0 +1,13 @@
<!DOCTYPE html>
<html lang="it">
<head>
<meta charset="UTF-8">
<title>{% block pagetitle %}{% endblock %} - Royal Games</title>
{% block prehead %}{% endblock %}
<link href="{{ url_for('static', filename='nryg.css') }}" rel="stylesheet">
{% block posthead %}{% endblock %}
</head>
<body>
{% block body %}{% endblock %}
</body>
</html>

22
templates/login.html Normal file
View file

@ -0,0 +1,22 @@
{% extends 'base.html' %}
{% block pagetitle %}
Royal Games
{% endblock %}
{% block body %}
<h1>
Login
</h1>
<form action="{{ url_for('page_loggedin') }}" method="POST">
<label>
Username
<input name="username" type="text">
</label>
<label>
Password
<input name="password" type="password">
</label>
<input type="submit" value="Login">
</form>
{% endblock %}

20
templates/password.html Normal file
View file

@ -0,0 +1,20 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Login</title>
</head>
<body>
<form action="{{ url_for('page_password') }}" method="POST">
<label>
Old password
<input name="old" type="password">
</label>
<label>
New password
<input name="new" type="password">
</label>
<input type="submit">
</form>
</body>
</html>

91
webserver.py
View file

@ -1,12 +1,20 @@
from flask import Flask, render_template from flask import Flask, render_template, request, abort, redirect, url_for
from db import Session, Royal, Steam, RocketLeague, Dota, Osu, Overwatch, LeagueOfLegends, Diario, Telegram, PlayedMusic, Discord from flask import session as fl_session
from sqlalchemy import func import db
from sqlalchemy import func, alias
import bcrypt
import configparser
app = Flask(__name__) app = Flask(__name__)
app.jinja_env.trim_blocks = True app.jinja_env.trim_blocks = True
app.jinja_env.lstrip_blocks = True app.jinja_env.lstrip_blocks = True
config = configparser.ConfigParser()
config.read("config.ini")
app.secret_key = config["Flask"]["secret_key"]
@app.route("/") @app.route("/")
def page_index(): def page_index():
@ -15,33 +23,82 @@ def page_index():
@app.route("/diario") @app.route("/diario")
def page_diario(): def page_diario():
session = Session() db_session = db.Session()
diario_data = session.query(Diario).outerjoin((Telegram, Diario.author), aliased=True).outerjoin(Royal, aliased=True).outerjoin((Telegram, Diario.saver), aliased=True).outerjoin(Royal, aliased=True).all() diario_data = db_session.query(db.Diario).outerjoin((db.Telegram, db.Diario.author), aliased=True).outerjoin(db.Royal, aliased=True).outerjoin((db.Telegram, db.Diario.saver), aliased=True).outerjoin(db.Royal, aliased=True).all()
session.close() db_session.close()
return render_template("diario.html", diario_data=diario_data) return render_template("diario.html", diario_data=diario_data)
@app.route("/leaderboards") @app.route("/leaderboards")
def page_leaderboards(): def page_leaderboards():
session = Session() db_session = db.Session()
dota_data = session.query(Dota).join(Steam).join(Royal).order_by(Dota.rank_tier).all() dota_data = db_session.query(db.Dota).join(db.Steam).join(db.Royal).order_by(db.Dota.rank_tier).all()
rl_data = session.query(RocketLeague).join(Steam).join(Royal).order_by(RocketLeague.doubles_mmr).all() rl_data = db_session.query(db.RocketLeague).join(db.Steam).join(db.Royal).order_by(db.RocketLeague.doubles_mmr).all()
ow_data = session.query(Overwatch).join(Royal).order_by(Overwatch.rank).all() ow_data = db_session.query(db.Overwatch).join(db.Royal).order_by(db.Overwatch.rank).all()
osu_data = session.query(Osu).join(Royal).order_by(Osu.std_pp).all() osu_data = db_session.query(db.Osu).join(db.Royal).order_by(db.Osu.std_pp).all()
lol_data = session.query(LeagueOfLegends).join(Royal).order_by(LeagueOfLegends.summoner_name).all() lol_data = db_session.query(db.LeagueOfLegends).join(db.Royal).order_by(db.LeagueOfLegends.summoner_name).all()
session.close() db_session.close()
return render_template("leaderboards.html", dota_data=dota_data, rl_data=rl_data, ow_data=ow_data, osu_data=osu_data, lol_data=lol_data) return render_template("leaderboards.html", dota_data=dota_data, rl_data=rl_data, ow_data=ow_data, osu_data=osu_data, lol_data=lol_data)
@app.route("/music") @app.route("/music")
def page_music(): def page_music():
session = Session() db_session = db.Session()
music_counts = session.query(PlayedMusic.filename, func.count(PlayedMusic.filename)).group_by(PlayedMusic.filename).all() music_counts = db_session.query(db.PlayedMusic.filename, alias(func.count(db.PlayedMusic.filename), "count")).order_by("count").group_by(db.PlayedMusic.filename).all()
music_last = session.query(PlayedMusic).join(Discord).join(Royal).order_by(PlayedMusic.id.desc()).limit(50).all() music_last = db_session.query(db.PlayedMusic).join(db.Discord).join(db.Royal).order_by(db.PlayedMusic.id.desc()).limit(50).all()
session.close() db_session.close()
return render_template("music.html", music_counts=music_counts, music_last=music_last) return render_template("music.html", music_counts=music_counts, music_last=music_last)
@app.route("/login")
def page_login():
return render_template("login.html")
@app.route("/loggedin", methods=["GET", "POST"])
def page_loggedin():
if request.method == "GET":
username = fl_session.get("username")
if username is None:
return "Not logged in"
else:
return username
elif request.method == "POST":
username = request.form["username"]
password = request.form["password"]
db_session = db.Session()
user = db_session.query(db.Royal).filter_by(username=username).one_or_none()
db_session.close()
if bcrypt.checkpw(bytes(password, encoding="utf8"), user.password):
fl_session["username"] = username
return username
else:
abort(403)
return
@app.route("/password", methods=["GET", "POST"])
def page_password():
username = fl_session.get("username")
if request.method == "GET":
if username is None:
abort(403)
return
return render_template("password.html")
elif request.method == "POST":
old_password = request.form["old"]
new_password = request.form["new"]
db_session = db.Session()
user = db_session.query(db.Royal).filter_by(username=username).one_or_none()
if bcrypt.checkpw(bytes(old_password, encoding="utf8"), user.password):
user.password = bcrypt.hashpw(bytes(new_password, encoding="utf8"), bcrypt.gensalt())
db_session.commit()
db_session.close()
return "Password changed"
else:
db_session.close()
abort(403)
if __name__ == "__main__": if __name__ == "__main__":
try: try:
app.run(host="0.0.0.0", port=1234) app.run(host="0.0.0.0", port=1234)