Website

Signed-off-by: Ryan Wang <[email protected]>
halo-dev · Mar 3, 2024 · 9d6f374 · 9d6f374
1 parent 3df8a26
commit 9d6f374
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/packages/comment-widget/src/base-comment-item.ts b/packages/comment-widget/src/base-comment-item.ts
@@ -1,7 +1,7 @@
 import { LitElement, html, css } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import './user-avatar';
-import { timeAgo } from './utils/date';
+import { formatDate, timeAgo } from './utils/date';
 import baseStyles from './styles/base';
 import varStyles from './styles/var';
 
@@ -13,6 +13,9 @@ export class BaseCommentItem extends LitElement {
   @property({ type: String })
   userDisplayName: string | undefined;
 
+  @property({ type: String })
+  userWebsite: string | undefined;
+
   @property({ type: String })
   creationTime: string | undefined;
 
@@ -35,8 +38,14 @@ export class BaseCommentItem extends LitElement {
       </div>
       <div class="item__main">
         <div class="item__meta">
-          <div class="item__author">${this.userDisplayName}</div>
-          <div class="item__meta-info">${timeAgo(this.creationTime)}</div>
+          ${this.userWebsite
+            ? html`<a class="item__author" target="_blank" href=${this.userWebsite}>
+                ${this.userDisplayName}
+              </a>`
+            : html`<div class="item__author">${this.userDisplayName}</div>`}
+          <div class="item__meta-info" title=${formatDate(this.creationTime)}>
+            ${timeAgo(this.creationTime)}
+          </div>
           ${!this.approved ? html`<div class="item__meta-info">审核中</div>` : ''}
         </div>
 

diff --git a/packages/comment-widget/src/comment-item.ts b/packages/comment-widget/src/comment-item.ts
@@ -80,6 +80,7 @@ export class CommentItem extends LitElement {
       .content="${this.comment?.spec.content || ''}"
       .creationTime="${this.comment?.spec.creationTime}"
       .approved=${this.comment?.spec.approved}
+      .userWebsite=${this.comment?.spec.owner.annotations?.['website']}
     >
       <base-comment-item-action
         slot="action"

diff --git a/packages/comment-widget/src/comment-widget.ts b/packages/comment-widget/src/comment-widget.ts
@@ -79,7 +79,7 @@ export class CommentWidget extends LitElement {
 
   override render() {
     return html`<div class="comment-widget">
-      <comment-form @reload="${this.fetchComments}"></comment-form>
+      <comment-form @reload="${() => this.fetchComments(1)}"></comment-form>
       ${this.loading
         ? html`<loading-block></loading-block>`
         : html`
@@ -130,12 +130,16 @@ export class CommentWidget extends LitElement {
     this.currentUser = data.user.metadata.name === 'anonymousUser' ? undefined : data.user;
   }
 
-  async fetchComments() {
+  async fetchComments(page?: number) {
     try {
       if (this.comments.items.length === 0) {
         this.loading = true;
       }
 
+      if (page) {
+        this.comments.page = page;
+      }
+
       const queryParams = [
         `group=${this.group}`,
         `kind=${this.kind}`,

diff --git a/packages/comment-widget/src/reply-item.ts b/packages/comment-widget/src/reply-item.ts
@@ -113,6 +113,7 @@ export class ReplyItem extends LitElement {
         .creationTime="${this.reply?.metadata.creationTimestamp ?? undefined}"
         .approved=${this.reply?.spec.approved}
         .breath=${this.isQuoteReplyHovered}
+        .userWebsite=${this.reply?.spec.owner.annotations?.['website']}
       >
         <base-comment-item-action
           slot="action"