kwankaho/artemis
1
0
Fork 0
forked from Dniel97/artemis
Code Pull Requests Activity

port frontend changes from different project

Browse Source
This commit is contained in:
Hay1tsme 2024-01-09 15:54:34 -05:00
parent e27ac4b81f
commit 9dab26b122
31 changed files with 1062 additions and 574 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/app.py
View File

@ -76,10 +76,12 @@ if not cfg.billing.standalone:
Route("/request/", billing.handle_billing_request, methods=["POST"]), Route("/request/", billing.handle_billing_request, methods=["POST"]),
] ]
if not cfg.frontend.standalone: if not cfg.frontend.standalone and cfg.frontend.secret:
frontend = FrontendServlet(cfg, cfg_dir) frontend = FrontendServlet(cfg, cfg_dir)
route_lst += frontend.get_routes() route_lst += frontend.get_routes()
else: else:
if not cfg.frontend.secret:
logger.error("Frontend secret not specified, cannot start frontend!")
route_lst.append(Route("/", dummy_rt)) route_lst.append(Route("/", dummy_rt))
route_lst.append(Route("/robots.txt", FrontendServlet.robots)) route_lst.append(Route("/robots.txt", FrontendServlet.robots))

2
core/config.py
View File

@ -212,7 +212,7 @@ class FrontendConfig:
@property @property
def secret(self) -> str: def secret(self) -> str:
CoreConfig.get_config_field( return CoreConfig.get_config_field(
self.__config, "core", "frontend", "secret", default="" self.__config, "core", "frontend", "secret", default=""
) )

6
core/data/schema/card.py
View File

@ -58,7 +58,7 @@ class CardData(BaseData):
""" """
Given a 20 digit access code as a string, get the user id associated with that card Given a 20 digit access code as a string, get the user id associated with that card
""" """
card = self.get_card_by_access_code(access_code) card = await self.get_card_by_access_code(access_code)
if card is None: if card is None:
return None return None
@ -68,7 +68,7 @@ class CardData(BaseData):
""" """
Given a 20 digit access code as a string, check if the card is banned Given a 20 digit access code as a string, check if the card is banned
""" """
card = self.get_card_by_access_code(access_code) card = await self.get_card_by_access_code(access_code)
if card is None: if card is None:
return None return None
if card["is_banned"]: if card["is_banned"]:
@ -78,7 +78,7 @@ class CardData(BaseData):
""" """
Given a 20 digit access code as a string, check if the card is locked Given a 20 digit access code as a string, check if the card is locked
""" """
card = self.get_card_by_access_code(access_code) card = await self.get_card_by_access_code(access_code)
if card is None: if card is None:
return None return None
if card["is_locked"]: if card["is_locked"]:

4
core/data/schema/user.py
View File

@ -64,8 +64,8 @@ class UserData(BaseData):
return False return False
return result.fetchone() return result.fetchone()
def check_password(self, user_id: int, passwd: bytes = None) -> bool: async def check_password(self, user_id: int, passwd: bytes = None) -> bool:
usr = self.get_user(user_id) usr = await self.get_user(user_id)
if usr is None: if usr is None:
return False return False

866
core/frontend.py
View File

File diff suppressed because it is too large Load Diff

4
core/frontend/arcade/index.jinja
View File

@ -1,4 +0,0 @@
{% extends "core/frontend/index.jinja" %}
{% block content %}
<h1>{{ arcade.name }}</h1>
{% endblock content %}

5
core/frontend/machine/index.jinja
View File

@ -1,5 +0,0 @@
{% extends "core/frontend/index.jinja" %}
{% block content %}
{% include "core/frontend/widgets/err_banner.jinja" %}
<h1>Machine Management</h1>
{% endblock content %}

103
core/frontend/sys/index.jinja
View File

@ -1,103 +0,0 @@
{% extends "core/frontend/index.jinja" %}
{% block content %}
<h1>System Management</h1>
<div class="row" id="rowForm">
{% if sesh.permissions >= 2 %}
<div class="col-sm-6" style="max-width: 25%;">
<form id="usrLookup" name="usrLookup" action="/sys/lookup.user" class="form-inline">
<h3>User Search</h3>
<div class="form-group">
<label for="usrId">User ID</label>
<input type="number" class="form-control" id="usrId" name="usrId">
</div>
OR
<div class="form-group">
<label for="usrName">Username</label>
<input type="text" class="form-control" id="usrName" name="usrName">
</div>
OR
<div class="form-group">
<label for="usrEmail">Email address</label>
<input type="email" class="form-control" id="usrEmail" name="usrEmail" aria-describedby="emailHelp">
</div>
<br />
<button type="submit" class="btn btn-primary">Search</button>
</form>
</div>
{% endif %}
{% if sesh.permissions >= 4 %}
<div class="col-sm-6" style="max-width: 25%;">
<form id="arcadeLookup" name="arcadeLookup" action="/sys/lookup.arcade" class="form-inline" >
<h3>Arcade Search</h3>
<div class="form-group">
<label for="arcadeId">Arcade ID</label>
<input type="number" class="form-control" id="arcadeId" name="arcadeId">
</div>
OR
<div class="form-group">
<label for="arcadeName">Arcade Name</label>
<input type="text" class="form-control" id="arcadeName" name="arcadeName">
</div>
OR
<div class="form-group">
<label for="arcadeUser">Owner User ID</label>
<input type="number" class="form-control" id="arcadeUser" name="arcadeUser">
</div>
OR
<div class="form-group">
<label for="arcadeIp">Assigned IP Address</label>
<input type="text" class="form-control" id="arcadeIp" name="arcadeIp">
</div>
<br />
<button type="submit" class="btn btn-primary">Search</button>
</form>
</div>
<div class="col-sm-6" style="max-width: 25%;">
<form id="cabLookup" name="cabLookup" action="/sys/lookup.cab" class="form-inline" >
<h3>Machine Search</h3>
<div class="form-group">
<label for="cabId">Machine ID</label>
<input type="number" class="form-control" id="cabId" name="cabId">
</div>
OR
<div class="form-group">
<label for="cabSerial">Machine Serial</label>
<input type="text" class="form-control" id="cabSerial" name="cabSerial">
</div>
OR
<div class="form-group">
<label for="cabAcId">Arcade ID</label>
<input type="number" class="form-control" id="cabAcId" name="cabAcId">
</div>
<br />
<button type="submit" class="btn btn-primary">Search</button>
</form>
</div>
{% endif %}
</div>
<div class="row" id="rowResult" style="margin: 10px;">
{% if sesh.permissions >= 2 %}
<div id="userSearchResult" class="col-sm-6" style="max-width: 25%;">
{% for usr in usrlist %}
<a href=/user/{{ usr.id }}><pre>{{ usr.id }} | {{ usr.username if usr.username != None else "<i>No Name Set</i>"}}</pre></a>
{% endfor %}
</div>
{% endif %}
{% if sesh.permissions >= 4 %}
<div id="arcadeSearchResult" class="col-sm-6" style="max-width: 25%;">
{% for ac in aclist %}
<pre><a href=/arcade/{{ ac.id }}>{{ ac.id }} | {{ ac.name if ac.name != None else "<i>No Name Set</i>" }} | {{ ac.ip if ac.ip != None else "<i>No IP Assigned</i>"}}</pre></a>
{% endfor %}
</div
><div id="cabSearchResult" class="col-sm-6" style="max-width: 25%;">
{% for cab in cablist %}
<a href=/cab/{{ cab.id }}><pre>{{ cab.id }} | {{ cab.game if cab.game != None else "<i>ANY </i>" }} | {{ cab.serial }}</pre></a>
{% endfor %}
</div>
{% endif %}
</div>
<div class="row" id="rowAdd">
</div>
{% endblock content %}

41
core/frontend/user/index.jinja
View File

@ -1,41 +0,0 @@
{% extends "core/frontend/index.jinja" %}
{% block content %}
<h1>Management for {{ username }}</h1>
<h2>Cards <button class="btn btn-success" data-bs-toggle="modal" data-bs-target="#card_add">Add</button></h2>
<ul style="font-size: 20px;">
{% for c in cards %}
<li>{{ c.access_code }}: {{ c.status }}&nbsp;{% if c.status == 'Active'%}<button class="btn-warning btn">Lock</button>{% elif c.status == 'Locked' %}<button class="btn-warning btn">Unlock</button>{% endif %}&nbsp;<button class="btn-danger btn">Delete</button></li>
{% endfor %}
</ul>
{% if arcades is defined %}
<h2>Arcades</h2>
<ul style="font-size: 20px;">
{% for a in arcades %}
<li><a href=/arcade/{{ a.id }}>{{ a.name }}</a></li>
{% endfor %}
</ul>
{% endif %}
<div class="modal fade" id="card_add" tabindex="-1" aria-labelledby="card_add_label" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h1 class="modal-title fs-5" id="card_add_label">Add Card</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
HOW TO:<br>
Scan your card on any networked game and press the "View Access Code" button (varies by game) and enter the 20 digit code below.<br>
!!FOR AMUSEIC CARDS: DO NOT ENTER THE CODE SHOWN ON THE BACK OF THE CARD ITSELF OR IT WILL NOT WORK!!
<p /><label for="card_add_frm_access_code">Access Code:&nbsp;</label><input id="card_add_frm_access_code" maxlength="20" type="text" required>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary">Add</button>
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
{% endblock content %}

18
core/frontend/widgets/err_banner.jinja
View File

@ -1,18 +0,0 @@
{% if error > 0 %}
<div class="err-banner">
<h3>Error</h3>
{% if error == 1 %}
Card not registered, or wrong password
{% elif error == 2 %}
Missing or malformed access code
{% elif error == 3 %}
Failed to create user
{% elif error == 4 %}
Arcade not found
{% elif error == 5 %}
Machine not found
{% else %}
An unknown error occoured
{% endif %}
</div>
{% endif %}

4
core/templates/arcade/index.jinja Normal file
View File

@ -0,0 +1,4 @@
{% extends "core/templates/index.jinja" %}
{% block content %}
<h1>{{ arcade.name }}</h1>
{% endblock content %}

2
core/frontend/gate/create.jinja → core/templates/gate/create.jinja
View File

@ -1,4 +1,4 @@
{% extends "core/frontend/index.jinja" %} {% extends "core/templates/index.jinja" %}
{% block content %} {% block content %}
<h1>Create User</h1> <h1>Create User</h1>
<form id="create" style="max-width: 240px; min-width: 10%;" action="/gate/gate.create" method="post"> <form id="create" style="max-width: 240px; min-width: 10%;" action="/gate/gate.create" method="post">

4
core/frontend/gate/gate.jinja → core/templates/gate/gate.jinja
View File

@ -1,7 +1,7 @@
{% extends "core/frontend/index.jinja" %} {% extends "core/templates/index.jinja" %}
{% block content %} {% block content %}
<h1>Gate</h1> <h1>Gate</h1>
{% include "core/frontend/widgets/err_banner.jinja" %} {% include "core/templates/widgets/err_banner.jinja" %}
<style> <style>
/* Chrome, Safari, Edge, Opera */ /* Chrome, Safari, Edge, Opera */
input::-webkit-outer-spin-button, input::-webkit-outer-spin-button,

2
core/frontend/index.jinja → core/templates/index.jinja
View File

@ -84,7 +84,7 @@
</style> </style>
</head> </head>
<body> <body>
{% include "core/frontend/widgets/topbar.jinja" %} {% include "core/templates/widgets/topbar.jinja" %}
{% block content %} {% block content %}
<h1>{{ server_name }}</h1> <h1>{{ server_name }}</h1>
{% endblock content %} {% endblock content %}

5
core/templates/machine/index.jinja Normal file
View File

@ -0,0 +1,5 @@
{% extends "core/templates/index.jinja" %}
{% block content %}
{% include "core/templates/widgets/err_banner.jinja" %}
<h1>Machine Management</h1>
{% endblock content %}

69
core/templates/sys/index.jinja Normal file
View File

@ -0,0 +1,69 @@
{% extends "core/templates/index.jinja" %}
{% block content %}
<h1>System Management</h1>
{% if error is defined %}
{% include "core/templates/widgets/err_banner.jinja" %}
{% endif %}
<div class="row" id="rowForm">
{% if "{:08b}".format(sesh.permissions)[6] == "1" %}
<div class="col-sm-6" style="max-width: 25%;">
<form id="usrLookup" name="usrLookup" action="/sys/lookup.user" class="form-inline">
<h3>User Search</h3>
<div class="form-group">
<label for="usrId">User ID</label>
<input type="number" class="form-control" id="usrId" name="usrId">
</div>
OR
<div class="form-group">
<label for="usrName">Username</label>
<input type="text" class="form-control" id="usrName" name="usrName">
</div>
OR
<div class="form-group">
<label for="usrEmail">Email address</label>
<input type="email" class="form-control" id="usrEmail" name="usrEmail" aria-describedby="emailHelp">
</div>
<br />
<button type="submit" class="btn btn-primary">Search</button>
</form>
</div>
{% endif %}
{% if "{:08b}".format(sesh.permissions)[5] == "1" %}
<div class="col-sm-6" style="max-width: 25%;">
<form id="shopLookup" name="shopLookup" action="/sys/lookup.shop" class="form-inline">
<h3>Shop search</h3>
<div class="form-group">
<label for="shopId">Shop ID</label>
<input type="number" class="form-control" id="shopId" name="shopId">
</div>
OR
<div class="form-group">
<label for="serialNum">Serial Number</label>
<input type="text" class="form-control" id="serialNum" name="serialNum" maxlength="12">
</div>
<br />
<button type="submit" class="btn btn-primary">Search</button>
</form>
</div>
{% endif %}
</div>
<div class="row" id="rowResult" style="margin: 10px;">
{% if "{:08b}".format(sesh.permissions)[6] == "1" %}
<div id="userSearchResult" class="col-sm-6" style="max-width: 25%;">
{% for usr in usrlist %}
<a href=/user/{{ usr.id }}><pre>{{ usr.username if usr.username is not none else "<i>No Name Set</i>"}}</pre></a>
{% endfor %}
</div>
{% endif %}
{% if "{:08b}".format(sesh.permissions)[5] == "1" %}
<div id="shopSearchResult" class="col-sm-6" style="max-width: 25%;">
{% for shop in shoplist %}
<a href="/shop/{{ shop.id }}"><pre>{{ shop.name if shop.name else "<i>No Name Set</i>"}}</pre></a>
{% endfor %}
</div>
{% endif %}
</div>
<div class="row" id="rowAdd">
</div>
{% endblock content %}

175
core/templates/user/index.jinja Normal file
View File

@ -0,0 +1,175 @@
{% extends "core/templates/index.jinja" %}
{% block content %}
<script type="text/javascript">
function toggle_new_name_form() {
let frm = document.getElementById("new_name_form");
let btn = document.getElementById("btn_toggle_form");
if (frm.style['display'] != "") {
frm.style['display'] = "";
frm.style['max-height'] = "";
btn.innerText = "Cancel";
} else {
frm.style['display'] = "none";
frm.style['max-height'] = "0px";
btn.innerText = "Edit";
}
}
function toggle_add_card_form() {
let btn = document.getElementById("btn_add_card");
let dv = document.getElementById("add_card_container")
if (dv.style['display'] != "") {
btn.innerText = "Cancel";
dv.style['display'] = "";
} else {
btn.innerText = "Add";
dv.style['display'] = "none";
}
}
function prep_edit_form(access_code, chip_id, idm, card_type, u_memo) {
ac = document.getElementById("card_edit_frm_access_code");
cid = document.getElementById("card_edit_frm_chip_id");
fidm = document.getElementById("card_edit_frm_idm");
memo = document.getElementById("card_edit_frm_memo");
if (chip_id == "None" || chip_id == undefined) {
chip_id = ""
}
if (idm == "None" || idm == undefined) {
idm = ""
}
if (u_memo == "None" || u_memo == undefined) {
u_memo = ""
}
ac.value = access_code;
cid.value = chip_id;
fidm.value = idm;
memo.value = u_memo;
if (card_type == "AmusementIC") {
cid.disabled = true;
fidm.disabled = false;
} else {
cid.disabled = false;
fidm.disabled = true;
}
}
</script>
<h1>Management for {{ username }}&nbsp;<button onclick="toggle_new_name_form()" class="btn btn-secondary" id="btn_toggle_form">Edit</button></h1>
{% if error is defined %}
{% include "core/templates/widgets/err_banner.jinja" %}
{% endif %}
{% if success is defined and success == 2 %}
<div style="background-color: #00AA00; padding: 20px; margin-bottom: 10px; width: 15%;">
Update successful
</div>
{% endif %}
<form style="max-width: 33%; display: none; max-height: 0px;" action="/user/update.name" method="post" id="new_name_form">
<div class="mb-3">
<label for="new_name" class="form-label">New Nickname</label>
<input type="text" class="form-control" id="new_name" name="new_name" aria-describedby="new_name_help">
<div id="new_name_help" class="form-text">Must be 10 characters or less</div>
</div>
<button type="submit" class="btn btn-primary">Submit</button>
</form>
<p></p>
<h2>Cards <button class="btn btn-success" id="btn_add_card" onclick="toggle_add_card_form()">Add</button></h2>
{% if success is defined and success == 3 %}
<div style="background-color: #00AA00; padding: 20px; margin-bottom: 10px; width: 15%;">
Card added successfully
</div>
{% endif %}
<div id="add_card_container" style="display: none; max-width: 33%;">
<form action="/user/add.card" method="post", id="frm_add_card">
<label class="form-label" for="card_add_frm_access_code">Access Code:</label>
<input class="form-control" name="add_access_code" id="card_add_frm_access_code" maxlength="20" type="text" required aria-describedby="ac_help">
<div id="ac_help" class="form-text">20 digit code on the back of the card.</div>
<button type="submit" class="btn btn-primary">Add</button>
</form>
<br>
</div>
<ul style="font-size: 20px;">
{% for c in cards %}
<li>{{ c.access_code }} ({{ c.type}}): {{ c.status }}&nbsp;<button onclick="prep_edit_form('{{ c.access_code }}', '{{ c.chip_id}}', '{{ c.idm }}', '{{ c.type }}', '{{ c.memo }}')" data-bs-toggle="modal" data-bs-target="#card_edit" class="btn btn-secondary" id="btn_edit_card_{{ c.access_code }}">Edit</button>&nbsp;{% if c.status == 'Active'%}<button class="btn-warning btn">Lock</button>{% elif c.status == 'Locked' %}<button class="btn-warning btn">Unlock</button>{% endif %}&nbsp;<button class="btn-danger btn">Delete</button></li>
{% endfor %}
</ul>
<h2>Reset Password</h2>
{% if success is defined and success == 1 %}
<div style="background-color: #00AA00; padding: 20px; margin-bottom: 10px; width: 15%;">
Update successful
</div>
{% endif %}
<form style="max-width: 33%;" action="/user/update.pw" method="post">
<div class="mb-3">
<label for="current_pw" class="form-label">Current Password</label>
<input type="password" class="form-control" id="current_pw" name="current_pw">
</div>
<div class="mb-3">
<label for="password1" class="form-label">New Password</label>
<input type="password" class="form-control" id="password1" name="password1" aria-describedby="password_help">
<div id="password_help" class="form-text">Password must be at least 10 characters long, contain an upper and lowercase character, number, and special character</div>
</div>
<div class="mb-3">
<label for="password2" class="form-label">Retype New Password</label>
<input type="password" class="form-control" id="password2" name="password2">
</div>
<button type="submit" class="btn btn-primary">Submit</button>
</form>
{% if arcades is defined and arcades|length > 0 %}
<h2>Arcades</h2>
<ul>
{% for a in arcades %}
<li><h3>{{ a.name }}</h3>
{% if a.machines|length > 0 %}
<table>
<tr><th>Serial</th><th>Game</th><th>Last Seen</th></tr>
{% for m in a.machines %}
<tr><td>{{ m.serial }}</td><td>{{ m.game }}</td><td>{{ m.last_seen }}</td></tr>
{% endfor %}
</table>
{% endif %}
</li>
{% endfor %}
</ul>
{% endif %}
<div class="modal fade" id="card_edit" tabindex="-1" aria-labelledby="card_edit_label" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h1 class="modal-title fs-5" id="card_edit_label">Edit Card</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<form action="/user/edit.card" method="post", id="frm_edit_card">
<label class="form-label" for="card_edit_frm_access_code">Access Code:</label>
<input class="form-control" readonly name="add_access_code" id="card_edit_frm_access_code" maxlength="20" type="text" required aria-describedby="ac_help">
<div id="ac_help" class="form-text">20 digit code on the back of the card. If this is incorrect, contact a sysadmin.</div>
<label class="form-label" for="card_edit_frm_memo" id="card_edit_frm_memo_lbl">Memo:</label>
<input class="form-control" aria-describedby="memo_help" name="add_memo" id="card_edit_frm_memo" maxlength="16" type="text">
<div id="memo_help" class="form-text">Must be 16 characters or less.</div>
<label class="form-label" for="card_edit_frm_idm" id="card_edit_frm_idm_lbl">FeliCa IDm:</label>
<input class="form-control" aria-describedby="idm_help" name="add_felica_idm" id="card_edit_frm_idm" maxlength="16" type="text">
<div id="idm_help" class="form-text">8 bytes that uniquly idenfites a FeliCa card. Obtained by reading the card with an NFC reader.</div>
<label class="form-label" for="card_edit_frm_chip_id" id="card_edit_frm_chip_id_lbl">Mifare UID:</label>
<input class="form-control" aria-describedby="chip_id_help" name="add_mifare_chip_id" id="card_edit_frm_chip_id" maxlength="8" type="text">
<div id="chip_id_help" class="form-text">4 byte integer that uniquly identifies a Mifare card. Obtained by reading the card with an NFC reader.</div>
</form>
</div>
<div class="modal-footer">
<button type="submit" class="btn btn-primary" form="frm_edit_card">Edit</button>
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
{% endblock content %}

29
core/templates/widgets/err_banner.jinja Normal file
View File

@ -0,0 +1,29 @@
{% if error > 0 %}
<div class="err-banner">
<h3>Error</h3>
{% if error == 1 %}
Card not registered, or wrong password
{% elif error == 2 %}
Missing or malformed access code
{% elif error == 3 %}
Failed to create user
{% elif error == 4 %}
Required field not filled or invalid
{% elif error == 5 %}
Incorrect old password
{% elif error == 6 %}
Passwords don't match
{% elif error == 7 %}
New password not acceptable
{% elif error == 8 %}
New Nickname too long
{% elif error == 9 %}
You must be logged in to preform this action
New Nickname too long
{% elif error == 10 %}
Invalid serial number
{% else %}
An unknown error occoured
{% endif %}
</div>
{% endif %}

13
core/frontend/widgets/topbar.jinja → core/templates/widgets/topbar.jinja
View File

@ -3,19 +3,20 @@
</div> </div>
<div style="background: #333; color: #f9f9f9; width: 80%; height: 50px; line-height: 50px; padding-left: 10px; float: left;"> <div style="background: #333; color: #f9f9f9; width: 80%; height: 50px; line-height: 50px; padding-left: 10px; float: left;">
<a href=/><button class="btn btn-primary">Home</button></a>&nbsp; <a href=/><button class="btn btn-primary">Home</button></a>&nbsp;
{% for game in game_list %} {% for game, data in game_list|items %}
<a href=/game/{{ game.url }}><button class="btn btn-success">{{ game.name }}</button></a>&nbsp; <a href=/game{{ data.url }}/><button class="btn btn-success">{{ game }}</button></a>&nbsp;
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
<div style="background: #333; color: #f9f9f9; width: 10%; height: 50px; line-height: 50px; text-align: center; float: left;"> <div style="background: #333; color: #f9f9f9; width: 10%; height: 50px; line-height: 50px; text-align: center; float: left;">
{% if sesh is defined and sesh["permissions"] >= 2 %} {% if sesh is defined and sesh["permissions"] >= 2 %}
<a href="/sys"><button class="btn btn-primary">System</button></a> <a href="/sys/"><button class="btn btn-primary">System</button></a>
{% endif %} {% endif %}
{% if sesh is defined and sesh["userId"] > 0 %} {% if sesh is defined and sesh["user_id"] > 0 %}
<a href="/user"><button class="btn btn-primary">Account</button></a> <a href="/user/"><button class="btn btn-primary">Account</button></a>
<a href="/user/logout"><button class="btn btn-danger">Logout</button></a>
{% else %} {% else %}
<a href="/gate"><button class="btn btn-primary">Gate</button></a> <a href="/gate/"><button class="btn btn-primary">Gate</button></a>
{% endif %} {% endif %}
</div> </div>

48
titles/idac/frontend.py
View File

@ -1,12 +1,13 @@
import json import json
from typing import List
from starlette.routing import Route
from starlette.responses import Response, RedirectResponse
import yaml import yaml
import jinja2 import jinja2
from os import path from os import path
from twisted.web.util import redirectTo
from starlette.requests import Request from starlette.requests import Request
from twisted.web.server import Session
from core.frontend import FE_Base, IUserSession from core.frontend import FE_Base, UserSession
from core.config import CoreConfig from core.config import CoreConfig
from titles.idac.database import IDACData from titles.idac.database import IDACData
from titles.idac.schema.profile import * from titles.idac.schema.profile import *
@ -26,7 +27,8 @@ class IDACFrontend(FE_Base):
self.game_cfg.update( self.game_cfg.update(
yaml.safe_load(open(f"{cfg_dir}/{IDACConstants.CONFIG_NAME}")) yaml.safe_load(open(f"{cfg_dir}/{IDACConstants.CONFIG_NAME}"))
) )
self.nav_name = "頭文字D THE ARCADE" #self.nav_name = "頭文字D THE ARCADE"
self.nav_name = "IDAC"
# TODO: Add version list # TODO: Add version list
self.version = IDACConstants.VER_IDAC_SEASON_2 self.version = IDACConstants.VER_IDAC_SEASON_2
@ -36,6 +38,11 @@ class IDACFrontend(FE_Base):
25: "full_tune_tickets", 25: "full_tune_tickets",
34: "full_tune_fragments", 34: "full_tune_fragments",
} }
def get_routes(self) -> List[Route]:
return [
Route("/", self.render_GET)
]
async def generate_all_tables_json(self, user_id: int): async def generate_all_tables_json(self, user_id: int):
json_export = {} json_export = {}
@ -87,35 +94,32 @@ class IDACFrontend(FE_Base):
return json.dumps(json_export, indent=4, default=str, ensure_ascii=False) return json.dumps(json_export, indent=4, default=str, ensure_ascii=False)
async def render_GET(self, request: Request) -> bytes: async def render_GET(self, request: Request) -> bytes:
uri: str = request.uri.decode() uri: str = request.url.path
template = self.environment.get_template( template = self.environment.get_template(
"titles/idac/frontend/idac_index.jinja" "titles/idac/templates/idac_index.jinja"
) )
sesh: Session = request.getSession() usr_sesh = self.validate_session(request)
usr_sesh = IUserSession(sesh) if not usr_sesh:
user_id = usr_sesh.userId usr_sesh = UserSession()
user_id = usr_sesh.user_id
# user_id = usr_sesh.user_id # user_id = usr_sesh.user_id
# profile export # profile export
if uri.startswith("/game/idac/export"): if uri.startswith("/game/idac/export"):
if user_id == 0: if user_id == 0:
return redirectTo(b"/game/idac", request) return RedirectResponse(b"/game/idac", request)
# set the file name, content type and size to download the json # set the file name, content type and size to download the json
content = await self.generate_all_tables_json(user_id).encode("utf-8") content = await self.generate_all_tables_json(user_id).encode("utf-8")
request.responseHeaders.addRawHeader(
b"content-type", b"application/octet-stream"
)
request.responseHeaders.addRawHeader(
b"content-disposition", b"attachment; filename=idac_profile.json"
)
request.responseHeaders.addRawHeader(
b"content-length", str(len(content)).encode("utf-8")
)
self.logger.info(f"User {user_id} exported their IDAC data") self.logger.info(f"User {user_id} exported their IDAC data")
return content return Response(
content,
200,
{'content-disposition': 'attachment; filename=idac_profile.json'},
"application/octet-stream"
)
profile_data, tickets, rank = None, None, None profile_data, tickets, rank = None, None, None
if user_id > 0: if user_id > 0:
@ -128,7 +132,7 @@ class IDACFrontend(FE_Base):
for ticket in ticket_data for ticket in ticket_data
} }
return template.render( return Response(template.render(
title=f"{self.core_config.server.name} | {self.nav_name}", title=f"{self.core_config.server.name} | {self.nav_name}",
game_list=self.environment.globals["game_list"], game_list=self.environment.globals["game_list"],
profile=profile_data, profile=profile_data,
@ -136,4 +140,4 @@ class IDACFrontend(FE_Base):
rank=rank, rank=rank,
sesh=vars(usr_sesh), sesh=vars(usr_sesh),
active_page="idac", active_page="idac",
).encode("utf-16") ))

6
titles/idac/frontend/idac_index.jinja → titles/idac/templates/idac_index.jinja
View File

@ -1,8 +1,8 @@
{% extends "core/frontend/index.jinja" %} {% extends "core/templates/index.jinja" %}
{% block content %} {% block content %}
<h1 class="mb-3">頭文字D THE ARCADE</h1> <h1 class="mb-3">頭文字D THE ARCADE</h1>
{% if sesh is defined and sesh["userId"] > 0 %} {% if sesh is defined and sesh["user_id"] > 0 %}
<div class="card mb-3"> <div class="card mb-3">
<div class="card-body"> <div class="card-body">
<div class="card-title"> <div class="card-title">
@ -128,7 +128,7 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
{% include "titles/idac/frontend/js/idac_scripts.js" %} {% include "titles/idac/templates/js/idac_scripts.js" %}
</script> </script>
{% endblock content %} {% endblock content %}

0
titles/idac/frontend/js/idac_scripts.js → titles/idac/templates/js/idac_scripts.js
View File

54
titles/ongeki/frontend.py
View File

@ -1,11 +1,14 @@
from typing import List
from starlette.routing import Route
import yaml import yaml
import jinja2 import jinja2
from starlette.requests import Request from starlette.requests import Request
from starlette.responses import Response, RedirectResponse
from os import path from os import path
from twisted.web.util import redirectTo from twisted.web.util import redirectTo
from twisted.web.server import Session from twisted.web.server import Session
from core.frontend import FE_Base, IUserSession from core.frontend import FE_Base, UserSession
from core.config import CoreConfig from core.config import CoreConfig
from titles.ongeki.config import OngekiConfig from titles.ongeki.config import OngekiConfig
@ -27,24 +30,31 @@ class OngekiFrontend(FE_Base):
) )
self.nav_name = "O.N.G.E.K.I." self.nav_name = "O.N.G.E.K.I."
self.version_list = OngekiConstants.VERSION_NAMES self.version_list = OngekiConstants.VERSION_NAMES
def get_routes(self) -> List[Route]:
return [
Route("/", self.render_GET)
]
async def render_GET(self, request: Request) -> bytes: async def render_GET(self, request: Request) -> bytes:
template = self.environment.get_template( template = self.environment.get_template(
"titles/ongeki/frontend/ongeki_index.jinja" "titles/ongeki/templates/ongeki_index.jinja"
) )
sesh: Session = request.getSession() usr_sesh = self.validate_session(request)
usr_sesh = IUserSession(sesh) if not usr_sesh:
usr_sesh = UserSession()
self.version = usr_sesh.ongeki_version self.version = usr_sesh.ongeki_version
if getattr(usr_sesh, "userId", 0) != 0: if getattr(usr_sesh, "userId", 0) != 0:
profile_data =self.data.profile.get_profile_data(usr_sesh.userId, self.version) profile_data =self.data.profile.get_profile_data(usr_sesh.user_id, self.version)
rival_list = await self.data.profile.get_rivals(usr_sesh.userId) rival_list = await self.data.profile.get_rivals(usr_sesh.user_id)
rival_data = { rival_data = {
"userRivalList": rival_list, "userRivalList": rival_list,
"userId": usr_sesh.userId "userId": usr_sesh.user_id
} }
rival_info = OngekiBase.handle_get_user_rival_data_api_request(self, rival_data) rival_info = OngekiBase.handle_get_user_rival_data_api_request(self, rival_data)
return template.render( return Response(template.render(
data=self.data.profile, data=self.data.profile,
title=f"{self.core_config.server.name} | {self.nav_name}", title=f"{self.core_config.server.name} | {self.nav_name}",
game_list=self.environment.globals["game_list"], game_list=self.environment.globals["game_list"],
@ -54,34 +64,36 @@ class OngekiFrontend(FE_Base):
version_list=self.version_list, version_list=self.version_list,
version=self.version, version=self.version,
sesh=vars(usr_sesh) sesh=vars(usr_sesh)
).encode("utf-16") ))
else: else:
return redirectTo(b"/gate/", request) return RedirectResponse("/gate/", 303)
async def render_POST(self, request: Request): async def render_POST(self, request: Request):
uri = request.uri.decode() uri = request.uri.decode()
sesh: Session = request.getSession() usr_sesh = self.validate_session(request)
usr_sesh = IUserSession(sesh) if not usr_sesh:
if hasattr(usr_sesh, "userId"): usr_sesh = UserSession()
if usr_sesh.user_id > 0:
if uri == "/game/ongeki/rival.add": if uri == "/game/ongeki/rival.add":
rival_id = request.args[b"rivalUserId"][0].decode() rival_id = request.args[b"rivalUserId"][0].decode()
await self.data.profile.put_rival(usr_sesh.userId, rival_id) await self.data.profile.put_rival(usr_sesh.user_id, rival_id)
# self.logger.info(f"{usr_sesh.userId} added a rival") # self.logger.info(f"{usr_sesh.user_id} added a rival")
return redirectTo(b"/game/ongeki/", request) return RedirectResponse(b"/game/ongeki/", 303)
elif uri == "/game/ongeki/rival.delete": elif uri == "/game/ongeki/rival.delete":
rival_id = request.args[b"rivalUserId"][0].decode() rival_id = request.args[b"rivalUserId"][0].decode()
await self.data.profile.delete_rival(usr_sesh.userId, rival_id) await self.data.profile.delete_rival(usr_sesh.user_id, rival_id)
# self.logger.info(f"{response}") # self.logger.info(f"{response}")
return redirectTo(b"/game/ongeki/", request) return RedirectResponse(b"/game/ongeki/", 303)
elif uri == "/game/ongeki/version.change": elif uri == "/game/ongeki/version.change":
ongeki_version=request.args[b"version"][0].decode() ongeki_version=request.args[b"version"][0].decode()
if(ongeki_version.isdigit()): if(ongeki_version.isdigit()):
usr_sesh.ongeki_version=int(ongeki_version) usr_sesh.ongeki_version=int(ongeki_version)
return redirectTo(b"/game/ongeki/", request) return RedirectResponse("/game/ongeki/", 303)
else: else:
return b"Something went wrong" Response("Something went wrong", status_code=500)
else: else:
return b"User is not logged in" return RedirectResponse("/gate/", 303)

0
titles/ongeki/frontend/js/ongeki_scripts.js → titles/ongeki/templates/js/ongeki_scripts.js
View File

6
titles/ongeki/frontend/ongeki_index.jinja → titles/ongeki/templates/ongeki_index.jinja
View File

@ -1,7 +1,7 @@
{% extends "core/frontend/index.jinja" %} {% extends "core/templates/index.jinja" %}
{% block content %} {% block content %}
{% if sesh is defined and sesh["userId"] > 0 %} {% if sesh is defined and sesh["user_id"] > 0 %}
<br> <br>
<br> <br>
<br> <br>
@ -75,7 +75,7 @@
</div> </div>
<script> <script>
{% include 'titles/ongeki/frontend/js/ongeki_scripts.js' %} {% include 'titles/ongeki/templates/js/ongeki_scripts.js' %}
</script> </script>
{% else %} {% else %}
<h2>Not Currently Logged In</h2> <h2>Not Currently Logged In</h2>

80
titles/pokken/frontend.py
View File

@ -1,10 +1,12 @@
import yaml import yaml
import jinja2 import jinja2
from typing import List
from starlette.requests import Request from starlette.requests import Request
from starlette.responses import Response, RedirectResponse
from starlette.routing import Route
from os import path from os import path
from twisted.web.server import Session
from core.frontend import FE_Base, IUserSession from core.frontend import FE_Base, UserSession
from core.config import CoreConfig from core.config import CoreConfig
from .database import PokkenData from .database import PokkenData
from .config import PokkenConfig from .config import PokkenConfig
@ -12,6 +14,8 @@ from .const import PokkenConstants
class PokkenFrontend(FE_Base): class PokkenFrontend(FE_Base):
SN_PREFIX = PokkenConstants.SERIAL_IDENT
NETID_PREFIX = PokkenConstants.NETID_PREFIX
def __init__( def __init__(
self, cfg: CoreConfig, environment: jinja2.Environment, cfg_dir: str self, cfg: CoreConfig, environment: jinja2.Environment, cfg_dir: str
) -> None: ) -> None:
@ -23,17 +27,75 @@ class PokkenFrontend(FE_Base):
yaml.safe_load(open(f"{cfg_dir}/{PokkenConstants.CONFIG_NAME}")) yaml.safe_load(open(f"{cfg_dir}/{PokkenConstants.CONFIG_NAME}"))
) )
self.nav_name = "Pokken" self.nav_name = "Pokken"
def get_routes(self) -> List[Route]:
return [
Route("/", self.render_GET, methods=['GET']),
Route("/update.name", self.change_name, methods=['POST']),
]
def render_GET(self, request: Request) -> bytes: async def render_GET(self, request: Request) -> Response:
template = self.environment.get_template( template = self.environment.get_template(
"titles/pokken/frontend/pokken_index.jinja" "titles/pokken/templates/pokken_index.jinja"
) )
pf = None
usr_sesh = self.validate_session(request)
if not usr_sesh:
usr_sesh = UserSession()
else:
profile = await self.data.profile.get_profile(usr_sesh.user_id)
if profile is not None and profile['trainer_name']:
pf = profile._asdict()
if "e" in request.query_params:
try:
err = int(request.query_params.get("e", 0))
except Exception:
err = 0
sesh: Session = request.getSession() else:
usr_sesh = IUserSession(sesh) err = 0
if "s" in request.query_params:
try:
succ = int(request.query_params.get("s", 0))
except Exception:
succ = 0
return template.render( else:
succ = 0
return Response(template.render(
title=f"{self.core_config.server.name} | {self.nav_name}", title=f"{self.core_config.server.name} | {self.nav_name}",
game_list=self.environment.globals["game_list"], game_list=self.environment.globals["game_list"],
sesh=vars(usr_sesh) sesh=vars(usr_sesh),
).encode("utf-16") profile=pf,
error=err,
success=succ
))
async def change_name(self, request: Request) -> RedirectResponse:
usr_sesh = self.validate_session(request)
if not usr_sesh:
return RedirectResponse("/game/pokken/?e=9", 303)
frm = await request.form()
new_name = frm.get("new_name")
gender = frm.get("new_gender", 1)
if len(new_name) > 14:
return RedirectResponse("/game/pokken/?e=8", 303)
if not gender.isdigit():
return RedirectResponse("/game/pokken/?e=4", 303)
gender = int(gender)
if gender != 1 and gender != 2:
return RedirectResponse("/game/pokken/?e=4", 303) # no code for this yet, whatever
await self.data.profile.set_profile_name(usr_sesh.user_id, new_name, gender)
return RedirectResponse("/game/pokken/?s=1", 303)

4
titles/pokken/frontend/pokken_index.jinja
View File

@ -1,4 +0,0 @@
{% extends "core/frontend/index.jinja" %}
{% block content %}
<h1>Pokken</h1>
{% endblock content %}

48
titles/pokken/templates/pokken_index.jinja Normal file
View File

@ -0,0 +1,48 @@
{% extends "core/templates/index.jinja" %}
{% block content %}
<h1>Pokken</h1>
{% if profile is defined and profile is not none and profile.id > 0 %}
<script type="text/javascript">
function toggle_new_name_form() {
let frm = document.getElementById("new_name_form");
let btn = document.getElementById("btn_toggle_form");
if (frm.style['display'] != "") {
frm.style['display'] = "";
frm.style['max-height'] = "";
btn.innerText = "Cancel";
} else {
frm.style['display'] = "none";
frm.style['max-height'] = "0px";
btn.innerText = "Edit";
}
}
</script>
<h3>Profile for {{ profile.trainer_name }}&nbsp;<button onclick="toggle_new_name_form()" class="btn btn-secondary" id="btn_toggle_form">Edit</button></h3>
{% if error is defined %}
{% include "core/templates/widgets/err_banner.jinja" %}
{% endif %}
{% if success is defined and success == 1 %}
<div style="background-color: #00AA00; padding: 20px; margin-bottom: 10px; width: 15%;">
Update successful
</div>
{% endif %}
<form style="max-width: 33%; display: none; max-height: 0px;" action="/game/pokken/update.name" method="post" id="new_name_form">
<div class="mb-3">
<label for="new_name" class="form-label">New Trainer Name</label>
<input type="text" class="form-control" id="new_name" name="new_name" aria-describedby="new_name_help" maxlength="14">
<div id="new_name_help" class="form-text">Must be 14 characters or less</div>
<br>
<input type="radio" id="new_gender_male" name="new_gender" value="1" {% if profile.avatar_gender is none or profile.avatar_gender == 1 %}checked{% endif %}>
<label for="new_gender_male">Male</label>
<input type="radio" id="new_gender_female" name="new_gender" value="2" {% if profile.avatar_gender == 2 %}checked{% endif %}>
<label for="new_gender_male">Female</label>
</div>
<button type="submit" class="btn btn-primary">Submit</button>
</form>
{% elif sesh is defined and sesh is not none and sesh.user_id > 0 %}
No profile information found for this account.
{% else %}
Login to view profile information.
{% endif %}
{% endblock content %}

26
titles/wacca/frontend.py
View File

@ -1,10 +1,12 @@
from typing import List
from starlette.routing import Route
from starlette.requests import Request
from starlette.responses import Response
from os import path
import yaml import yaml
import jinja2 import jinja2
from starlette.requests import Request
from os import path
from twisted.web.server import Session
from core.frontend import FE_Base, IUserSession from core.frontend import FE_Base, UserSession
from core.config import CoreConfig from core.config import CoreConfig
from titles.wacca.database import WaccaData from titles.wacca.database import WaccaData
from titles.wacca.config import WaccaConfig from titles.wacca.config import WaccaConfig
@ -24,15 +26,21 @@ class WaccaFrontend(FE_Base):
) )
self.nav_name = "Wacca" self.nav_name = "Wacca"
def get_routes(self) -> List[Route]:
return [
Route("/", self.render_GET, methods=['GET'])
]
async def render_GET(self, request: Request) -> bytes: async def render_GET(self, request: Request) -> bytes:
template = self.environment.get_template( template = self.environment.get_template(
"titles/wacca/frontend/wacca_index.jinja" "titles/wacca/templates/wacca_index.jinja"
) )
sesh: Session = request.getSession() usr_sesh = self.validate_session(request)
usr_sesh = IUserSession(sesh) if not usr_sesh:
usr_sesh = UserSession()
return template.render( return Response(template.render(
title=f"{self.core_config.server.name} | {self.nav_name}", title=f"{self.core_config.server.name} | {self.nav_name}",
game_list=self.environment.globals["game_list"], game_list=self.environment.globals["game_list"],
sesh=vars(usr_sesh) sesh=vars(usr_sesh)
).encode("utf-16") ))

4
titles/wacca/frontend/wacca_index.jinja
View File

@ -1,4 +0,0 @@
{% extends "core/frontend/index.jinja" %}
{% block content %}
<h1>Wacca</h1>
{% endblock content %}

4
titles/wacca/templates/wacca_index.jinja Normal file
View File

@ -0,0 +1,4 @@
{% extends "core/templates/index.jinja" %}
{% block content %}
<h1>Wacca</h1>
{% endblock content %}