diff --git a/packages/ui-default/components/contest/contest.page.styl b/packages/ui-default/components/contest/contest.page.styl index 7fd9ba71..edea712a 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 366e099b..ad58eb76 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 ", "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 4ef353b0..d7eb47d7 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 87eaa82e..fcfcb778 100644 --- a/packages/ui-default/templates/contest_main.html +++ b/packages/ui-default/templates/contest_main.html @@ -94,13 +94,16 @@
  • {{ model.contest.RULES[tdoc.rule].TEXT }}
  • + {% if tdoc.rated %} +
  • Rated
  • + {% endif %}
  • {{ contest.render_duration(tdoc) }} {{ _('hour(s)') }}
  • {{ tdoc['attend']|default(0) }}
  • - {% if tsdict[tdoc.docId]['attend'] == 1 %} + {% if tsdict[tdoc.docId].attend %}
  • {{ _('Attended') }}
  • diff --git a/packages/ui-default/templates/partials/homepage/contest.html b/packages/ui-default/templates/partials/homepage/contest.html index 9bb31bd4..8a525b34 100644 --- a/packages/ui-default/templates/partials/homepage/contest.html +++ b/packages/ui-default/templates/partials/homepage/contest.html @@ -19,6 +19,9 @@
  • {{ model.contest.RULES[tdoc.rule].TEXT }}
  • + {% if tdoc.rated %} +
  • Rated
  • + {% endif %}
  • {{ contest.render_duration(tdoc) }} {{ _('hour(s)') }}