diff --git a/dojo_plugin/api/v1/scoreboard.py b/dojo_plugin/api/v1/scoreboard.py index 8b7fdd75a..da2f64864 100644 --- a/dojo_plugin/api/v1/scoreboard.py +++ b/dojo_plugin/api/v1/scoreboard.py @@ -25,11 +25,19 @@ SCOREBOARD_CACHE_TIMEOUT_SECONDS = 60 * 60 * 2 # two hours make to cache all scoreboards scoreboard_namespace = Namespace("scoreboard") +def get_schools(): + return ["arizona", "asu", "baylor", "byu", "ucf", "uc", + "colorado", "uh", "iastate", "ku", "ksu", "okstate", "tcu", "ttu", "utah", "wvu"] + def email_symbol_asset(email): - if email.endswith("@asu.edu"): - group = "fork.png" - elif ".edu" in email.split("@")[1]: - group = "student.png" + domain = email.split("@")[1] + if domain.endswith(".edu"): + school = domain[:-len(".edu")] + schools = get_schools() + if school in schools: + group = f"schools/{school}.png" + else: + group = "student.png" else: group = "hacker.png" return url_for("views.themes", path=f"img/dojo/{group}") diff --git a/dojo_theme/static/css/custom.css b/dojo_theme/static/css/custom.css index 56216d377..a90d0ed60 100644 --- a/dojo_theme/static/css/custom.css +++ b/dojo_theme/static/css/custom.css @@ -371,7 +371,9 @@ p[data-hide="true"] { .scoreboard-symbol { margin: auto; + width: 3em; height: 3em; + object-fit: contain; filter: drop-shadow(0px 0px 3px white); } diff --git a/dojo_theme/static/img/dojo/schools/arizona.png b/dojo_theme/static/img/dojo/schools/arizona.png new file mode 100644 index 000000000..c372e8621 Binary files /dev/null and b/dojo_theme/static/img/dojo/schools/arizona.png differ diff --git a/dojo_theme/static/img/dojo/fork.png b/dojo_theme/static/img/dojo/schools/asu.png similarity index 100% rename from dojo_theme/static/img/dojo/fork.png rename to dojo_theme/static/img/dojo/schools/asu.png diff --git a/dojo_theme/static/img/dojo/schools/baylor.png b/dojo_theme/static/img/dojo/schools/baylor.png new file mode 100644 index 000000000..2f26e6cf4 Binary files /dev/null and b/dojo_theme/static/img/dojo/schools/baylor.png differ diff --git a/dojo_theme/static/img/dojo/schools/byu.png b/dojo_theme/static/img/dojo/schools/byu.png new file mode 100644 index 000000000..da869334f Binary files /dev/null and b/dojo_theme/static/img/dojo/schools/byu.png differ diff --git a/dojo_theme/static/img/dojo/schools/colorado.png b/dojo_theme/static/img/dojo/schools/colorado.png new file mode 100644 index 000000000..506660e21 Binary files /dev/null and b/dojo_theme/static/img/dojo/schools/colorado.png differ diff --git a/dojo_theme/static/img/dojo/schools/iastate.png b/dojo_theme/static/img/dojo/schools/iastate.png new file mode 100644 index 000000000..8870a14f2 Binary files /dev/null and b/dojo_theme/static/img/dojo/schools/iastate.png differ diff --git a/dojo_theme/static/img/dojo/schools/ksu.png b/dojo_theme/static/img/dojo/schools/ksu.png new file mode 100644 index 000000000..3c9cc7436 Binary files /dev/null and b/dojo_theme/static/img/dojo/schools/ksu.png differ diff --git a/dojo_theme/static/img/dojo/schools/ku.png b/dojo_theme/static/img/dojo/schools/ku.png new file mode 100644 index 000000000..90bce117a Binary files /dev/null and b/dojo_theme/static/img/dojo/schools/ku.png differ diff --git a/dojo_theme/static/img/dojo/schools/okstate.png b/dojo_theme/static/img/dojo/schools/okstate.png new file mode 100644 index 000000000..8ea2cfbad Binary files /dev/null and b/dojo_theme/static/img/dojo/schools/okstate.png differ diff --git a/dojo_theme/static/img/dojo/schools/tcu.png b/dojo_theme/static/img/dojo/schools/tcu.png new file mode 100644 index 000000000..646b771cc Binary files /dev/null and b/dojo_theme/static/img/dojo/schools/tcu.png differ diff --git a/dojo_theme/static/img/dojo/schools/ttu.png b/dojo_theme/static/img/dojo/schools/ttu.png new file mode 100644 index 000000000..84a71ea44 Binary files /dev/null and b/dojo_theme/static/img/dojo/schools/ttu.png differ diff --git a/dojo_theme/static/img/dojo/schools/uc.png b/dojo_theme/static/img/dojo/schools/uc.png new file mode 100644 index 000000000..2e96c7e63 Binary files /dev/null and b/dojo_theme/static/img/dojo/schools/uc.png differ diff --git a/dojo_theme/static/img/dojo/schools/ucf.png b/dojo_theme/static/img/dojo/schools/ucf.png new file mode 100644 index 000000000..b349d913a Binary files /dev/null and b/dojo_theme/static/img/dojo/schools/ucf.png differ diff --git a/dojo_theme/static/img/dojo/schools/uh.png b/dojo_theme/static/img/dojo/schools/uh.png new file mode 100644 index 000000000..b2511fae3 --- /dev/null +++ b/dojo_theme/static/img/dojo/schools/uh.png @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/dojo_theme/static/img/dojo/schools/utah.png b/dojo_theme/static/img/dojo/schools/utah.png new file mode 100644 index 000000000..212f0be42 Binary files /dev/null and b/dojo_theme/static/img/dojo/schools/utah.png differ diff --git a/dojo_theme/static/img/dojo/schools/wvu.png b/dojo_theme/static/img/dojo/schools/wvu.png new file mode 100644 index 000000000..15dade856 --- /dev/null +++ b/dojo_theme/static/img/dojo/schools/wvu.png @@ -0,0 +1,3 @@ + + + \ No newline at end of file