Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into training-maintainer

Browse Source
This commit is contained in:
panda authored and GitHub committed 2023-07-10 01:09:19 +08:00
2 parents 24f31ccc38 f8f4038547
commit 3876d4c5e7
14 files changed
+69 -53
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/ui-default/package.json
+19 -19
View File
@@ -1,6 +1,6 @@
{
"name": "@hydrooj/ui-default",
"version": "4.48.20",
"version": "4.48.21",
"author": "undefined <i@undefined.moe>",
"license": "AGPL-3.0",
"main": "index.ts",
@@ -14,16 +14,16 @@
"cli": false
},
"devDependencies": {
"@blueprintjs/core": "^4.20.1",
"@blueprintjs/popover2": "^1.14.9",
"@fontsource/dm-mono": "^5.0.3",
"@fontsource/fira-code": "^5.0.3",
"@fontsource/inconsolata": "^5.0.3",
"@fontsource/jetbrains-mono": "^5.0.3",
"@fontsource/pt-mono": "^5.0.3",
"@fontsource/roboto-mono": "^5.0.3",
"@fontsource/source-code-pro": "^5.0.3",
"@fontsource/ubuntu-mono": "^5.0.3",
"@blueprintjs/core": "^4.20.2",
"@blueprintjs/popover2": "^1.14.11",
"@fontsource/dm-mono": "^5.0.5",
"@fontsource/fira-code": "^5.0.5",
"@fontsource/inconsolata": "^5.0.5",
"@fontsource/jetbrains-mono": "^5.0.5",
"@fontsource/pt-mono": "^5.0.5",
"@fontsource/roboto-mono": "^5.0.5",
"@fontsource/source-code-pro": "^5.0.5",
"@fontsource/ubuntu-mono": "^5.0.5",
"@hydrooj/utils": "workspace:*",
"@simplewebauthn/browser": "^7.2.0",
"@svgr/webpack": "^8.0.1",
@@ -33,22 +33,22 @@
"@types/katex": "^0.16.0",
"@types/markdown-it": "^12.2.3",
"@types/pickadate": "^3.5.32",
"@types/qrcode": "^1.5.0",
"@types/react": "^18.2.13",
"@types/qrcode": "^1.5.1",
"@types/react": "^18.2.14",
"@types/react-dom": "^18.2.6",
"@types/redux-logger": "^3.0.9",
"@types/serviceworker": "^0.0.68",
"@types/sharedworker": "^0.0.97",
"@types/serviceworker": "^0.0.69",
"@types/sharedworker": "^0.0.98",
"@types/webpack-env": "^1.18.1",
"@vscode/codicons": "^0.0.33",
"ajv": "^8.12.0",
"allotment": "^1.19.0",
"autoprefixer": "^10.4.14",
"browser-update": "^3.3.44",
"chalk": "^5.2.0",
"chalk": "^5.3.0",
"classnames": "^2.3.2",
"clipboard": "^2.0.11",
"cordis": "^2.8.0",
"cordis": "^2.8.2",
"diff": "^5.1.0",
"diff-dom": "^5.0.4",
"echarts": "^5.4.2",
@@ -96,7 +96,7 @@
"redux-promise-middleware": "^6.1.3",
"redux-thunk": "^2.4.2",
"rupture": "^0.7.1",
"schemastery": "^3.10.0",
"schemastery": "^3.10.1",
"slideout": "^1.0.1",
"sticky-kit": "^1.1.3",
"tether": "1.4.7",
@@ -114,7 +114,7 @@
"fs-extra": "^11.1.1",
"js-yaml": "^4.1.0",
"jsesc": "^3.0.2",
"katex": "^0.16.7",
"katex": "^0.16.8",
"lodash": "^4.17.21",
"markdown-it": "^13.0.1",
"markdown-it-anchor": "^8.6.7",
packages/ui-default/templates/training_main.html
+3 -2
View File
@@ -59,15 +59,16 @@
</div>
<div class="section__body">
<ol class="my secondary training__list">
{%- for tsdoc in tsdict -%}
{%- for tid, tsdoc in tsdict -%}
{% if tsdoc['enroll'] %}
{% set progress = (100 * (tsdoc['donePids']|length) / (model.training.getPids(tdict[tsdoc['docId']].dag)|length))|round|int %}
<li class="training__item"><div class="media">
<div class="media__left">
<span class="icon training-status--icon {% if tsdoc['done'] %}done{% else %}progress{% endif %}"></span>
</div>
<div class="media__body">
<h1 class="training__title"><a href="{{ url('training_detail', tid=tsdoc.docId) }}" data-emoji-enabled>{{ tdict[tsdoc['docId']]['title'] }}</a></h1>
<div class="supplementary training__progress"><div class="training__progress-bar"><div class="training__progress-track" style="width:{{ (100 * tsdoc['donePids']|length / model.training.getPids(tdict[tsdoc['docId']].dag)|length)|round|int }}%;"></div></div> {{ _('Complete') }} {{ (100 * tsdoc['donePids']|length / handler.getPids(tdict[tsdoc.docId].dag)|length)|round|int }}%</div>
<div class="supplementary training__progress"><div class="training__progress-bar"><div class="training__progress-track" style="width:{{ progress }}%;"></div></div> {{ _('Complete') }} {{ progress }}%</div>
</div>
</div></li>
{% endif %}