From e1ef875a3684fa097a18b7e2f6f47546140fe0d1 Mon Sep 17 00:00:00 2001 From: kezhang <91486896+Wotagei@users.noreply.github.com> Date: Fri, 8 Sep 2023 18:17:45 +0800 Subject: [PATCH 1/4] Add User studo style and Add empty state icon (#34) * Modify contest detail style * Add User studo style and Add empty state icon --- .../components/signin/signin_dialog.page.styl | 12 ++++++++++ packages/ui-default/locales/zh.yaml | 6 +++++ packages/ui-default/misc/empty_state.svg | 9 ++++++++ packages/ui-default/misc/nothing.styl | 5 +++-- packages/ui-default/templates/user_sudo.html | 22 +++++++++---------- 5 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 packages/ui-default/misc/empty_state.svg diff --git a/packages/ui-default/components/signin/signin_dialog.page.styl b/packages/ui-default/components/signin/signin_dialog.page.styl index a2b1d47..4db597e 100644 --- a/packages/ui-default/components/signin/signin_dialog.page.styl +++ b/packages/ui-default/components/signin/signin_dialog.page.styl @@ -26,6 +26,18 @@ $signin_dialog_expand_h = 30px border: 1px solid #DDD // box-shadow: 0 0 30px rgba(#000, 0.6) +.user_sudo_main + background: #FFF + width: 25em + // padding: rem($signin_form_gap_v $signin_form_gap_h) + padding-bottom: 2em + // margin-right: rem($signin_form_width - $signin_dialog_expand_h) + position: relative + z-index: 2 + border-radius: 22px + border: 1px solid #DDD + // box-shadow: 0 0 30px rgba(#000, 0.6) + .dialog--signin__side position: absolute right: 0 diff --git a/packages/ui-default/locales/zh.yaml b/packages/ui-default/locales/zh.yaml index 8277731..60d150d 100644 --- a/packages/ui-default/locales/zh.yaml +++ b/packages/ui-default/locales/zh.yaml @@ -102,6 +102,7 @@ Attend Contest: 参加比赛 Attend contests: 参加比赛 Attended: 已参加 Attendee Manage: 参赛者管理 +After you've performed a sudo-protected action, you'll only be asked to re-authenticate again after a few hours of inactivity. : 在您执行了受sudo保护的操作后，只有在几个小时不活动后，才会要求您再次进行身份验证。 Authenticator: 认证器 Authenticators: 认证器 author: 作者 @@ -167,6 +168,8 @@ Compilers' Version and Parameters: 编译器版本及参数 Complete: 完成 Completed: 已完成 Config: 配置 +Confirm: 确认 +Confirm Access: 确认访问 Confirm deleting the selected roles?: 您确定删除所选角色吗？ Confirm deleting this comment? Its replies will be deleted as well.: 确认删除这个评论吗？回复会被同时删除。 Confirm deleting this reply?: 确认删除这个回复吗？ @@ -845,6 +848,7 @@ SuperUser: 超级管理员 SuperUser's Password: 超级管理员的密码 Support: 支持 Switch account: 切换账户 +sudo mode: sudo 模式 Tags: 标签 Task Settings: 任务设置 tasks_list: 任务列表 @@ -888,6 +892,7 @@ Time Extension: 延期 Time: 时间 timeago_locale: zh_CN Timezone: 时区 +Tip: 提示 title: 标题 Title: 标题 To get a better editing experience, with code highlighting and test runs, please go back to the problem detail page and use 'Open Scratchpad' button.: 为了获得更好的编辑体验，包括代码高亮和测试运行功能，请返回题目详情页面并点击“进入在线编程模式”按钮。 @@ -1010,6 +1015,7 @@ Write Your Solution: 发表您的题解 Year: 年 You are currently in legacy mode. Some additional features will be unavailable. We strongly recommend switching to standard mode on a modern browser.: 您当前处于兼容模式。某些功能在此模式下不可用。我们强烈建议在现代浏览器上切换为标准模式以获得更好的体验。 You are not allowed to join the domain. The link is either invalid or expired.: 您无法加入该网站，链接无效或已过期。 +You are entering: 您正在进入 You can also upload your avatar to Gravatar and it will be automatically updated here.: 你也可以将头像上传到 Gravatar，本站的头像将自动更新。 You can create your own training plans and share them with others.: 您可以创建您自己的训练计划并且与他人分享。 You cannot submit for this problem because the contest is ended. You can click "Open in Problem Set" to view this problem in normal mode.: 该比赛已结束，您无法在比赛模式下递交该题目。您可以点击“在题库中打开”以普通模式查看和递交本题。 diff --git a/packages/ui-default/misc/empty_state.svg b/packages/ui-default/misc/empty_state.svg new file mode 100644 index 0000000..4e3e7c8 --- /dev/null +++ b/packages/ui-default/misc/empty_state.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/packages/ui-default/misc/nothing.styl b/packages/ui-default/misc/nothing.styl index e75004b..e667bfc 100644 --- a/packages/ui-default/misc/nothing.styl +++ b/packages/ui-default/misc/nothing.styl @@ -8,6 +8,7 @@ padding: rem(20px 0) .nothing-icon - background: url(./puzzled_twd2.svg) no-repeat center center - height: 184px + height: 180px; + background: url('./empty_state.svg') no-repeat center center; + background-size: contain; margin-bottom: rem(20px) diff --git a/packages/ui-default/templates/user_sudo.html b/packages/ui-default/templates/user_sudo.html index 100bb3e..6b8d22c 100644 --- a/packages/ui-default/templates/user_sudo.html +++ b/packages/ui-default/templates/user_sudo.html @@ -1,8 +1,8 @@ {% extends "layout/immersive.html" %} {% block content %} -
-
-

{{ _('Confirm Access') }}

+
+
+

{{ _('Confirm Access') }}

{% if UserContext.authn %}
@@ -19,27 +19,27 @@

{{ _('Confirm Access') }}

{% endif %}
-
- +
-
-

Tip: You are entering sudo mode.

-

After you've performed a sudo-protected action, you'll only be asked to re-authenticate again after a few hours of inactivity.

+
+

{{_('Tip')}}: {{_('You are entering')}} {{_('sudo mode')}}

+

{{_("After you've performed a sudo-protected action, you'll only be asked to re-authenticate again after a few hours of inactivity.")}}

{% if UserContext.authn or UserContext.tfa %}
-
+

{{ _('Or use other methods:') }}

    {% if UserContext.authn %}
  1. {{ _('Use Authenticator') }}
    2. {% endif %} From fa6bf5b9409cd366004c1ca0e04afdd97536aa02 Mon Sep 17 00:00:00 2001 From: Levy Lv <120114434+Lvw666@users.noreply.github.com> Date: Sat, 9 Sep 2023 00:23:30 +0800 Subject: [PATCH 2/4] Fix navBar style (#35) --- packages/hydrooj/locales/zh.yaml | 2 +- packages/ui-default/components/navigation/navigation.page.styl | 3 +-- packages/ui-default/templates/main.html | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/hydrooj/locales/zh.yaml b/packages/hydrooj/locales/zh.yaml index 39dd5be..7282ce7 100644 --- a/packages/hydrooj/locales/zh.yaml +++ b/packages/hydrooj/locales/zh.yaml @@ -381,7 +381,7 @@ hour(s): 小时 If enabled, source code will be emailed to you after the submission is accepted.: 如果启用，在您通过题目后，源代码会以 Email 的形式发送给您。 If left blank, the built-in template of the corresponding language will be used.: 若留空，则将使用对应语言的内置代码模板。 Images: 图片 -Import From Hydro: 从 U+ 导入 +Import From Hydro: 从 Kathy 导入 Import from: 导入自 Import Problem: 导入题目 Import User: 导入用户 diff --git a/packages/ui-default/components/navigation/navigation.page.styl b/packages/ui-default/components/navigation/navigation.page.styl index 2bbc27f..1a252f6 100644 --- a/packages/ui-default/components/navigation/navigation.page.styl +++ b/packages/ui-default/components/navigation/navigation.page.styl @@ -233,11 +233,10 @@ // border-top: 1px solid #666 .dashboard - position: absolute display: flex justify-content: space-between align-items: center - right: 376px + margin-left: 220px .nav-flex display: flex diff --git a/packages/ui-default/templates/main.html b/packages/ui-default/templates/main.html index 01cf52a..65f7069 100644 --- a/packages/ui-default/templates/main.html +++ b/packages/ui-default/templates/main.html @@ -24,7 +24,7 @@
- U+让信奥 + Kathy 让信奥 学习
变得
From f3362dcd9eecafcc2d02772fa93cb0a43d59fdbe Mon Sep 17 00:00:00 2001 From: Levy Lv <120114434+Lvw666@users.noreply.github.com> Date: Thu, 14 Sep 2023 18:17:37 +0800 Subject: [PATCH 3/4] Added title meta (#36) --- install/nix/hydro.nix | 2 +- packages/hydrooj/src/service/server.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install/nix/hydro.nix b/install/nix/hydro.nix index a10fb7a..321d6de 100644 --- a/install/nix/hydro.nix +++ b/install/nix/hydro.nix @@ -8,7 +8,7 @@ pkgs.stdenv.mkDerivation { unpackPhase = "ls $src"; meta = { - description = "Hydro"; + description = "Kathy"; homepage = https://hydro.js.org/; maintainers = [ "undefined " ]; platforms = [ "x86_64-linux" ]; diff --git a/packages/hydrooj/src/service/server.ts b/packages/hydrooj/src/service/server.ts index 45000e9..c28f3c4 100644 --- a/packages/hydrooj/src/service/server.ts +++ b/packages/hydrooj/src/service/server.ts @@ -147,7 +147,7 @@ export class HandlerCommon { } renderTitle(str: string) { - const name = this.domain?.ui?.name || system.get('server.name'); + const name = "Kathy"; if (this.UiContext.extraTitleContent) return `${this.translate(str)} - ${this.UiContext.extraTitleContent} - ${name}`; return `${this.translate(str)} - ${name}`; } From 0a433913764f74334ca44b2f9e9246dbedb9240b Mon Sep 17 00:00:00 2001 From: Levy Lv <120114434+Lvw666@users.noreply.github.com> Date: Fri, 15 Sep 2023 18:09:39 +0800 Subject: [PATCH 4/4] Added page style (#37) * Added title meta * Added page style --- packages/ui-default/common/variables.inc.styl | 2 +- .../components/form/button.page.styl | 5 + .../components/form/textbox.page.styl | 8 ++ packages/ui-default/misc/structure.styl | 7 +- packages/ui-default/misc/tailwindstylus.styl | 92 ++++++++++++++++++- .../templates/domain_dashboard.html | 4 + .../ui-default/templates/user_register.html | 2 +- .../templates/user_register_with_code.html | 64 +++++++------ 8 files changed, 147 insertions(+), 37 deletions(-) diff --git a/packages/ui-default/common/variables.inc.styl b/packages/ui-default/common/variables.inc.styl index b239584..e4121c9 100644 --- a/packages/ui-default/common/variables.inc.styl +++ b/packages/ui-default/common/variables.inc.styl @@ -70,7 +70,7 @@ $comment-op-link-color = lighten($text-1-color, 50%) $menu-item-bg-color-hover = #F4F4F4 $menu-drop-shadow = rem(0 2px 7px) rgba(#000, 0.3) -$menu-drop-bg-color = $content-bg-color +$menu-drop-bg-color = #F5F5F5 $menu-drop-triangle-size = 4px $menu-drop-triangle-shadow = rem(-2px -2px 2px) rgba(#000, 0.15) diff --git a/packages/ui-default/components/form/button.page.styl b/packages/ui-default/components/form/button.page.styl index af6ddd8..f82bef5 100644 --- a/packages/ui-default/components/form/button.page.styl +++ b/packages/ui-default/components/form/button.page.styl @@ -34,3 +34,8 @@ &, &:visited &, .typo & color: #FFF + + &:hover + background: #4540E1 !important + border: 2px solid #4540E1 !important + color: #FFF !important diff --git a/packages/ui-default/components/form/textbox.page.styl b/packages/ui-default/components/form/textbox.page.styl index 536d95c..c9ef026 100644 --- a/packages/ui-default/components/form/textbox.page.styl +++ b/packages/ui-default/components/form/textbox.page.styl @@ -78,3 +78,11 @@ label.textbox.material.inverse &.focus color: $immersive-primary-color + +.register-submit + background-color: #fff !important + border-color: #fff !important + input + &:hover + background-color: #fff !important + border-color: #fff !important \ No newline at end of file diff --git a/packages/ui-default/misc/structure.styl b/packages/ui-default/misc/structure.styl index a1f543b..cbd11e2 100644 --- a/packages/ui-default/misc/structure.styl +++ b/packages/ui-default/misc/structure.styl @@ -189,4 +189,9 @@ button.bgc-style .button-remove background-color: #f90505 !important - color: #fff !important \ No newline at end of file + color: #fff !important + +.register-container + // width: 30% !important + padding: 0px 40px 40px !important + border-radius: 16px \ No newline at end of file diff --git a/packages/ui-default/misc/tailwindstylus.styl b/packages/ui-default/misc/tailwindstylus.styl index 15ec589..fc50890 100644 --- a/packages/ui-default/misc/tailwindstylus.styl +++ b/packages/ui-default/misc/tailwindstylus.styl @@ -200,13 +200,97 @@ .p-6 padding: 24px !important +.p-7 + padding: 28px !important + +.p-8 + padding: 32px !important + +.p-9 + padding: 36px !important + +.p-10 + padding: 40px !important + +.p-11 + padding: 44px !important + +.p-12 + padding: 48px !important + +.p-13 + padding: 52px !important + +.p-14 + padding: 56px !important + .px-5 - padding-left: 20px - padding-right: 20px + padding-left: 20px !important + padding-right: 20px !important + +.px-6 + padding-left: 24px !important + padding-right: 24px !important + +.px-7 + padding-left: 28px !important + padding-right: 28px !important + +.px-8 + padding-left: 32px !important + padding-right: 32px !important + +.px-9 + padding-left: 36px !important + padding-right: 36px !important + +.px-10 + padding-left: 40px !important + padding-right: 40px !important + +.px-11 + padding-left: 44px !important + padding-right: 44px !important + +.px-12 + padding-left: 48px !important + padding-right: 48px !important + +.py-13 + padding-top: 52px !important + padding-bottom: 52px !important + +.py-1 + padding-top: 4px !important + padding-bottom: 4px !important + +.py-2 + padding-top: 8px !important + padding-bottom: 8px !important + +.py-3 + padding-top: 12px !important + padding-bottom: 12px !important + +.py-4 + padding-top: 16px !important + padding-bottom: 16px !important .py-5 - padding-top: 20px - padding-bottom: 20px + padding-top: 20px !important + padding-bottom: 20px !important + +.py-6 + padding-top: 24px !important + padding-bottom: 24px !important + +.py-7 + padding-top: 28px !important + padding-bottom: 28px !important + +.py-8 + padding-top: 32px !important + padding-bottom: 32px !important .m-5 margin: 20px !important diff --git a/packages/ui-default/templates/domain_dashboard.html b/packages/ui-default/templates/domain_dashboard.html index b3a5c56..68cdc4c 100644 --- a/packages/ui-default/templates/domain_dashboard.html +++ b/packages/ui-default/templates/domain_dashboard.html @@ -42,4 +42,8 @@

{{ _('Delete Domain') }}

{% endif %} #} +
+
Kathy
+
网站后台管理系统
+
{% endblock %} diff --git a/packages/ui-default/templates/user_register.html b/packages/ui-default/templates/user_register.html index ff28163..2291023 100644 --- a/packages/ui-default/templates/user_register.html +++ b/packages/ui-default/templates/user_register.html @@ -1,7 +1,7 @@ {% extends "layout/immersive.html" %} {% block content %}
-
+

{{ _('Sign Up') }}

diff --git a/packages/ui-default/templates/user_register_with_code.html b/packages/ui-default/templates/user_register_with_code.html index 4ca7265..10a2447 100644 --- a/packages/ui-default/templates/user_register_with_code.html +++ b/packages/ui-default/templates/user_register_with_code.html @@ -1,35 +1,39 @@ {% extends "layout/immersive.html" %} {% block content %} -
-

{{ _('Sign Up') }}

- -
- +
+
+
+

{{ _('Sign Up') }}

+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
-
- -
-
- -
-
- -
-
- -
- +
{% endblock %}