Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Python replace ranking page #177

Open
wants to merge 3 commits into
base: python
Choose a base branch
from
Open

WIP: Python replace ranking page #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
547a84f
WIP: Replace contest page
mugi-tea Mar 10, 2024
a3c1e88
Fix miss variable names and descriptions
kotarot Apr 3, 2024
c74c5f9
Season ranking page python replace
mugi-tea Jun 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions src/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,41 @@ def regulations():
firebaseapp_contest_senderid=FIREBASEAPP_CONTEST_SENDERID,
)

@app.route("/contest/<cid>")
def contest(cid):
return render_template(
"contest.html",
cid=cid,
contest_description=CONTEST_DESCRIPTION,
contest_name=CONTEST_NAME,
contest_url=CONTEST_URL,
firebaseapp_contest=FIREBASEAPP_CONTEST,
firebaseapp_contest_apikey=FIREBASEAPP_CONTEST_APIKEY,
firebaseapp_contest_senderid=FIREBASEAPP_CONTEST_SENDERID,
firebaseapp_wca=FIREBASEAPP_WCA,
firebaseapp_wca_apikey=FIREBASEAPP_WCA_APIKEY,
firebaseapp_wca_senderid=FIREBASEAPP_WCA_SENDERID,
)

########################################
# Ranking
########################################
@app.route("/ranking/<sid>")
def ranking(sid):
return render_template(
"ranking.html",
sid=sid,
contest_description=CONTEST_DESCRIPTION,
contest_name=CONTEST_NAME,
contest_url=CONTEST_URL,
firebaseapp_contest=FIREBASEAPP_CONTEST,
firebaseapp_contest_apikey=FIREBASEAPP_CONTEST_APIKEY,
firebaseapp_contest_senderid=FIREBASEAPP_CONTEST_SENDERID,
firebaseapp_wca=FIREBASEAPP_WCA,
firebaseapp_wca_apikey=FIREBASEAPP_WCA_APIKEY,
firebaseapp_wca_senderid=FIREBASEAPP_WCA_SENDERID,
)


########################################
# Release Notes
Expand Down
4 changes: 2 additions & 2 deletions src/templates/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[% set title = "About" %]
[# set page_url = contest_url + '/about' #]
[% set page_url = contest_url + 'about' %]

<!DOCTYPE html>
<html lang="ja" ng-app="contestApp">
Expand All @@ -8,7 +8,7 @@
[[ header.print(title=title, description=contest_description, sitename=contest_name, contest_url=contest_url, page_url=page_url) ]]

[% import "components/basejs.html" as basejs %]
[[ basejs.print(firebaseapp_contest, firebaseapp_contest_apikey, firebaseapp_contest_messagingsenderid) ]]
[[ basejs.print(firebaseapp_contest, firebaseapp_contest_apikey, firebaseapp_contest_senderid) ]]

[% import "components/authjs.html" as authjs %]
[[ authjs.print(redirect_login="", redirect_logout="", check_first=True) ]]
Expand Down
2 changes: 1 addition & 1 deletion src/templates/components/authjs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
[# Issue #32 凍結してたら強制ログアウトする #]
if ($scope.userData.isSuspended || $scope.userData.isDeleted) {
Auth.$signOut();
location.href = '@routes.HomeController.index?logout=1';
location.href = '[[ url_for("index") ]]?logout=1';
}
$scope.authLoaded = true;
});
Expand Down
4 changes: 2 additions & 2 deletions src/templates/components/basejs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[% macro print(firebaseapp_contest, firebaseapp_contest_apikey, firebaseapp_contest_messagingsenderid, firebaseapp_wca='') -%]
[% macro print(firebaseapp_contest, firebaseapp_contest_apikey, firebaseapp_contest_senderid, firebaseapp_wca='') -%]

<script>
window.TriboxContest = {};
Expand Down Expand Up @@ -219,7 +219,7 @@
databaseURL: "https://[[ firebaseapp_contest ]].firebaseio.com",
projectId: "[[ firebaseapp_contest ]]",
storageBucket: "[[ firebaseapp_contest ]].appspot.com",
messagingSenderId: "[[ firebaseapp_contest_messagingsenderid ]]"
messagingSenderId: "[[ firebaseapp_contest_senderid ]]"
};
firebase.initializeApp(config);
var contestRef = firebase.database().ref();
Expand Down
Loading