From 37ac2f80f772debcf21cfc5d2b97cad5c1cad13b Mon Sep 17 00:00:00 2001 From: panda Date: Tue, 7 Feb 2023 22:46:50 +0800 Subject: [PATCH] ui: add features (#504) --- .../components/messagepad/MessagePad.page.styl | 12 +++++++++++- .../MessagePadDialogueContentContainer.jsx | 16 +++++++++++++--- packages/ui-default/pages/home_messages.page.jsx | 1 + packages/ui-default/pages/homepage.page.styl | 12 ++++++++++++ .../templates/partials/homepage/contest.html | 3 +++ .../templates/partials/homepage/discussion.html | 3 +++ .../templates/partials/homepage/homework.html | 3 +++ .../templates/partials/homepage/ranking.html | 3 +++ .../templates/partials/homepage/training.html | 3 +++ 9 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 packages/ui-default/pages/homepage.page.styl diff --git a/packages/ui-default/components/messagepad/MessagePad.page.styl b/packages/ui-default/components/messagepad/MessagePad.page.styl index f6b9e787d..48381106c 100644 --- a/packages/ui-default/components/messagepad/MessagePad.page.styl +++ b/packages/ui-default/components/messagepad/MessagePad.page.styl @@ -20,11 +20,21 @@ $send-button-width = 50px overflow: auto height: rem($list-height) -.messagepad__content +.messagepad__header position: absolute left: rem($sidebar-width) right: 0 top: 0 + height: rem(30px) + padding: rem(5px) + text-align: center + border-bottom: 1px solid #eee; + +.messagepad__content + position: absolute + left: rem($sidebar-width) + right: 0 + top: rem(30px) bottom: rem($input-height) overflow: auto padding: rem(30px) diff --git a/packages/ui-default/components/messagepad/MessagePadDialogueContentContainer.jsx b/packages/ui-default/components/messagepad/MessagePadDialogueContentContainer.jsx index 043d90e8e..ddd7b1c9d 100644 --- a/packages/ui-default/components/messagepad/MessagePadDialogueContentContainer.jsx +++ b/packages/ui-default/components/messagepad/MessagePadDialogueContentContainer.jsx @@ -90,9 +90,19 @@ export default connect(mapStateToProps)(class MessagePadDialogueContentContainer render() { return ( -
    - {this.renderInner()} -
+ <> +
+ { this.props.item + && ( + + {`${this.props.item.udoc.uname}(UID: ${this.props.item.udoc._id})`} + + )} +
+
    + {this.renderInner()} +
+ ); } }); diff --git a/packages/ui-default/pages/home_messages.page.jsx b/packages/ui-default/pages/home_messages.page.jsx index 04cd6e3df..7ad8f05ae 100644 --- a/packages/ui-default/pages/home_messages.page.jsx +++ b/packages/ui-default/pages/home_messages.page.jsx @@ -29,6 +29,7 @@ const page = new NamedPage('home_messages', () => { const { Provider, store } = await loadReactRedux(MessagePadReducer); reduxStore = store; + window.store = reduxStore; const sock = new WebSocket(`${UiContext.ws_prefix}home/messages-conn`); sock.onmessage = (message) => { diff --git a/packages/ui-default/pages/homepage.page.styl b/packages/ui-default/pages/homepage.page.styl new file mode 100644 index 000000000..156852fd6 --- /dev/null +++ b/packages/ui-default/pages/homepage.page.styl @@ -0,0 +1,12 @@ +.page--homepage + .more + text-align: center + a + color: #a7a7a7 + font-size: rem($font-size-secondary) + text-decoration: none + border-bottom: 2px solid $pager-border-color + transition: border-bottom .2s linear, color .2s linear + &:hover + color: #666; + border-color: #5f9fd6 \ No newline at end of file diff --git a/packages/ui-default/templates/partials/homepage/contest.html b/packages/ui-default/templates/partials/homepage/contest.html index 65a6336d2..e9b915204 100644 --- a/packages/ui-default/templates/partials/homepage/contest.html +++ b/packages/ui-default/templates/partials/homepage/contest.html @@ -41,5 +41,8 @@ {%- endfor -%} + {% endif %} \ No newline at end of file diff --git a/packages/ui-default/templates/partials/homepage/discussion.html b/packages/ui-default/templates/partials/homepage/discussion.html index 1b0b2d282..49b6f511d 100644 --- a/packages/ui-default/templates/partials/homepage/discussion.html +++ b/packages/ui-default/templates/partials/homepage/discussion.html @@ -6,5 +6,8 @@

{{ _('Discussion') }}

{% include "partials/discussion_list.html" %} + {% endif %} \ No newline at end of file diff --git a/packages/ui-default/templates/partials/homepage/homework.html b/packages/ui-default/templates/partials/homepage/homework.html index a26fa7a81..5c95a938f 100644 --- a/packages/ui-default/templates/partials/homepage/homework.html +++ b/packages/ui-default/templates/partials/homepage/homework.html @@ -38,5 +38,8 @@ {%- endfor -%} + {% endif %} \ No newline at end of file diff --git a/packages/ui-default/templates/partials/homepage/ranking.html b/packages/ui-default/templates/partials/homepage/ranking.html index 576284192..9027aa7b8 100644 --- a/packages/ui-default/templates/partials/homepage/ranking.html +++ b/packages/ui-default/templates/partials/homepage/ranking.html @@ -34,5 +34,8 @@ + {% endif %} \ No newline at end of file diff --git a/packages/ui-default/templates/partials/homepage/training.html b/packages/ui-default/templates/partials/homepage/training.html index 27e124013..c0bebdf23 100644 --- a/packages/ui-default/templates/partials/homepage/training.html +++ b/packages/ui-default/templates/partials/homepage/training.html @@ -43,5 +43,8 @@ {%- endfor -%} + {% endif %} \ No newline at end of file