From f46b1134d6c3892dd4530ead82cf17fc7408a69a Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Wed, 13 Oct 2021 01:28:27 +0800
Subject: [PATCH] ui: highlight rated contest (#233)

---
 packages/ui-default/components/contest/contest.page.styl  | 8 ++++++++
 packages/ui-default/package.json                          | 2 +-
 packages/ui-default/pages/contest.page.ts                 | 6 +-----
 packages/ui-default/templates/contest_main.html           | 5 ++++-
 .../ui-default/templates/partials/homepage/contest.html   | 3 +++
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/packages/ui-default/components/contest/contest.page.styl b/packages/ui-default/components/contest/contest.page.styl
index 7fd9ba71b..edea712a5 100644
--- a/packages/ui-default/components/contest/contest.page.styl
+++ b/packages/ui-default/components/contest/contest.page.styl
@@ -1,5 +1,6 @@
 .contest-type-tag
 .contest-tag
+.contest-tag-rated
   font-size: rem($font-size-small)
   display: inline-block
   line-height: rem(22px)
@@ -11,6 +12,13 @@
     text-decoration: none
     color: #FFF !important
 
+.contest-tag-rated
+  background: orange
+  color: #FFF
+
+  .icon
+    margin-right: rem(5px)
+
 .contest-type-tag
   &, &:visited
     &, .supplementary &
diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json
index 366e099ba..ad58eb76f 100644
--- a/packages/ui-default/package.json
+++ b/packages/ui-default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.25.1",
+  "version": "4.25.2",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",
diff --git a/packages/ui-default/pages/contest.page.ts b/packages/ui-default/pages/contest.page.ts
index 4ef353b0b..d7eb47d75 100644
--- a/packages/ui-default/pages/contest.page.ts
+++ b/packages/ui-default/pages/contest.page.ts
@@ -7,13 +7,9 @@ export default new NamedPage(['contest_detail', 'contest_detail_problem'], () =>
   NProgress.configure({ trickle: false, showSpinner: false, minimum: 0 });
   function updateProgress() {
     const now = Date.now();
-    console.log(now, beginAt, endAt);
     if (beginAt <= now && now <= endAt) NProgress.set((now - beginAt) / (endAt - beginAt));
     else if (now > endAt) NProgress.set(1);
-    else {
-      console.log('set');
-      NProgress.set(0);
-    }
+    else NProgress.set(0);
   }
   NProgress.start();
   updateProgress();
diff --git a/packages/ui-default/templates/contest_main.html b/packages/ui-default/templates/contest_main.html
index 87eaa82e2..fcfcb778c 100644
--- a/packages/ui-default/templates/contest_main.html
+++ b/packages/ui-default/templates/contest_main.html
@@ -94,13 +94,16 @@
                   <li>
                     <a href="?rule={{ tdoc['rule'] }}" class="contest-type-tag"><span class="icon icon-award"></span>{{ model.contest.RULES[tdoc.rule].TEXT }}</a>
                   </li>
+                  {% if tdoc.rated %}
+                    <li class="contest-tag-rated"><span class="icon icon-star"></span>Rated</li>
+                  {% endif %}
                   <li>
                     <span class="icon icon-schedule--fill text-blue"></span> {{ contest.render_duration(tdoc) }} {{ _('hour(s)') }}
                   </li>
                   <li>
                     <span class="icon icon-user--multiple"></span> {{ tdoc['attend']|default(0) }}
                   </li>
-                {% if tsdict[tdoc.docId]['attend'] == 1 %}
+                {% if tsdict[tdoc.docId].attend %}
                   <li class="contest__info-attended">
                     <span class="icon icon-check"></span> {{ _('Attended') }}
                   </li>
diff --git a/packages/ui-default/templates/partials/homepage/contest.html b/packages/ui-default/templates/partials/homepage/contest.html
index 9bb31bd46..8a525b343 100644
--- a/packages/ui-default/templates/partials/homepage/contest.html
+++ b/packages/ui-default/templates/partials/homepage/contest.html
@@ -19,6 +19,9 @@
                 <li>
                   <a href="{{ url('contest_main', query={rule:tdoc.rule}) }}" class="contest-type-tag"><span class="icon icon-award"></span>{{ model.contest.RULES[tdoc.rule].TEXT }}</a>
                 </li>
+                {% if tdoc.rated %}
+                  <li class="contest-tag-rated"><span class="icon icon-star"></span>Rated</li>
+                {% endif %}
                 <li>
                   <span class="icon icon-schedule--fill text-blue"></span> {{ contest.render_duration(tdoc) }} {{ _('hour(s)') }}
                 </li>