From e7de006a233e4bcecffdd718207377bf727526c8 Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Thu, 27 Mar 2025 16:31:46 -0500
Subject: [PATCH] UX: Topic list layout changes (#85)

---
 .../components/card/topic-activity-column.gjs |  26 ++-
 .../components/card/topic-replies-column.gjs  |   4 +-
 .../initializers/topic-list-columns.gjs       |   3 +
 locales/en.yml                                |   1 +
 scss/topic-cards.scss                         | 170 ++++++++++--------
 5 files changed, 109 insertions(+), 95 deletions(-)

diff --git a/javascripts/discourse/components/card/topic-activity-column.gjs b/javascripts/discourse/components/card/topic-activity-column.gjs
index fe671f9..ac894b2 100644
--- a/javascripts/discourse/components/card/topic-activity-column.gjs
+++ b/javascripts/discourse/components/card/topic-activity-column.gjs
@@ -5,11 +5,14 @@ import { i18n } from "discourse-i18n";
 import gt from "truth-helpers/helpers/gt";
 
 export default class TopicActivityColumn extends Component {
-  get displayUnreadPosts() {
-    return this.args.topic.unread_posts || this.args.topic.new_posts;
-  }
-
   get activityText() {
+    // this should handle any case where a topic was no bumped due to a reply/post
+    if (
+      moment(this.args.topic.bumped_at).isAfter(this.args.topic.last_posted_at)
+    ) {
+      return "user_updated";
+    }
+
     if (this.args.topic.posts_count > 1) {
       return "user_replied";
     } else if (this.args.topic.posts_count === 1) {
@@ -36,17 +39,12 @@ export default class TopicActivityColumn extends Component {
         {{i18n (themePrefix this.activityText)}}
       </div>
       <div class="topic-activity__time">
-        {{formatDate @topic.bumpedAt}}
+        {{formatDate
+          @topic.bumpedAt
+          leaveAgo="true"
+          format="medium-with-ago-and-on"
+        }}
       </div>
-      {{#if this.displayUnreadPosts}}
-        <span class="topic-post-badges">
-          <a
-            href={{@topic.url}}
-            title={{i18n "topic.unread_posts" count=this.displayUnreadPosts}}
-            class="badge badge-notification unread-posts"
-          >{{this.displayUnreadPosts}}</a>
-        </span>
-      {{/if}}
     </span>
   </template>
 }
diff --git a/javascripts/discourse/components/card/topic-replies-column.gjs b/javascripts/discourse/components/card/topic-replies-column.gjs
index 4410d52..131eff7 100644
--- a/javascripts/discourse/components/card/topic-replies-column.gjs
+++ b/javascripts/discourse/components/card/topic-replies-column.gjs
@@ -2,8 +2,8 @@ import icon from "discourse/helpers/d-icon";
 import gt from "truth-helpers/helpers/gt";
 
 const TopicRepliesColumn = <template>
-  {{#if (gt @topic.posts_count 1)}}
-    <span class="topic-replies">{{icon "reply"}}{{@topic.posts_count}}</span>
+  {{#if (gt @topic.replyCount 1)}}
+    <span class="topic-replies">{{icon "reply"}}{{@topic.replyCount}}</span>
   {{/if}}
 </template>;
 
diff --git a/javascripts/discourse/initializers/topic-list-columns.gjs b/javascripts/discourse/initializers/topic-list-columns.gjs
index eb2c2ba..c4d7088 100644
--- a/javascripts/discourse/initializers/topic-list-columns.gjs
+++ b/javascripts/discourse/initializers/topic-list-columns.gjs
@@ -68,6 +68,9 @@ export default {
           if (context.topic.pinned || context.topic.pinned_globally) {
             classes.push("--pinned");
           }
+          if (context.topic.is_hot) {
+            classes.push("--hot");
+          }
           return classes;
         }
       );
diff --git a/locales/en.yml b/locales/en.yml
index f5a0366..13150d2 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -5,4 +5,5 @@ en:
   topic_hot: "Hot"
   user_replied: "replied"
   user_posted: "posted"
+  user_updated: "updated"
 
diff --git a/scss/topic-cards.scss b/scss/topic-cards.scss
index 9924009..0ad754b 100644
--- a/scss/topic-cards.scss
+++ b/scss/topic-cards.scss
@@ -30,25 +30,43 @@
   border: 1px solid var(--primary-300);
   display: grid;
   grid-template-columns: 20px min-content min-content auto min-content min-content min-content;
-  grid-template-rows: 20px minmax(20px, auto);
+  grid-template-rows: auto minmax(20px, auto);
   grid-template-areas:
-    "activity activity activity activity . . status"
-    "topic-title topic-title topic-title topic-title likes-replies likes-replies category";
+    ". . . . . . status"
+    "activity activity activity activity activity likes-replies category";
   grid-column-gap: 12px;
   grid-row-gap: 8px;
   border-radius: var(--d-border-radius);
+  @include breakpoint(extra-large) {
+    grid-template-columns: 20px repeat(6, 1fr);
+    grid-template-areas:
+      ". . . . . . status"
+      "activity activity activity activity activity likes-replies category";
+  }
+  @include breakpoint(mobile-extra-large) {
+    grid-template-columns: 25px repeat(7, 1fr);
+    grid-template-rows: auto auto auto;
+    grid-template-areas:
+      ". . . . . . . status"
+      "activity activity activity activity activity activity activity activity"
+      "category category category category category category category likes-replies";
+    border: none;
+    border-bottom: 1px solid var(--primary-200);
+    box-shadow: none;
+    border-radius: 0;
+  }
   &.excerpt-expanded {
     grid-template-columns: 20px auto repeat(5, 1fr) auto;
-    grid-template-rows: 20px auto auto 30px;
+    grid-template-rows: auto auto auto 30px;
     grid-template-areas:
-      "activity activity activity activity . . . status"
-      "topic-title topic-title topic-title topic-title topic-title topic-title . ."
+      ". . . . . . . status"
+      "activity activity activity activity activity activity activity activity"
       "excerpt excerpt excerpt excerpt excerpt excerpt . ."
       "excerpt excerpt excerpt excerpt excerpt excerpt likes-replies category";
     @include breakpoint(extra-large) {
       grid-template-areas:
-        "activity activity activity activity . . . status"
-        "topic-title topic-title topic-title topic-title topic-title topic-title . ."
+        ". . . . . . . status"
+        "activity activity activity activity activity activity activity activity"
         "excerpt excerpt excerpt excerpt excerpt excerpt excerpt likes-replies"
         "excerpt excerpt excerpt excerpt excerpt excerpt excerpt category";
     }
@@ -56,36 +74,14 @@
       grid-template-columns: 25px auto repeat(6, 1fr);
       grid-template-rows: auto auto auto;
       grid-template-areas:
-        "activity activity activity activity activity activity activity status"
-        "topic-title topic-title topic-title topic-title topic-title topic-title topic-title topic-title"
+        ". . . . . . . status"
+        "activity activity activity activity activity activity activity activity"
         "category . . . . . . likes-replies";
       .topic-excerpt {
         display: none;
       }
     }
   }
-  @include breakpoint(large) {
-    grid-template-columns: 20px repeat(6, 1fr);
-    grid-template-rows: 20px minmax(20px, auto);
-    grid-template-areas:
-      "activity activity activity activity activity activity status"
-      "topic-title topic-title topic-title topic-title topic-title topic-title topic-title"
-      "category . . . . . likes-replies";
-  }
-  @include breakpoint(mobile-extra-large) {
-    grid-template-columns: 25px repeat(7, 1fr);
-    grid-template-rows: auto auto auto;
-    grid-template-areas:
-      "activity activity activity activity activity activity activity status"
-      "topic-title topic-title topic-title topic-title topic-title topic-title topic-title topic-title"
-      "category . . . . . . likes-replies";
-  }
-  @include breakpoint(mobile-extra-large) {
-    border: none;
-    border-bottom: 1px solid var(--primary-200);
-    box-shadow: none;
-    border-radius: 0;
-  }
 
   // display contents
   td.main-link,
@@ -121,7 +117,16 @@
     border-radius: 4px;
   }
 
+  .topic-activity__username {
+    @include breakpoint(mobile-extra-large) {
+      display: none;
+    }
+  }
+
   // status
+  .topic-status-data {
+    grid-area: status;
+  }
   .topic-status-data {
     grid-area: status;
     position: relative;
@@ -132,10 +137,10 @@
       right: 0px;
       top: -20px;
       background-color: var(--d-content-background);
-      height: 85%;
+      height: 20px;
       font-size: var(--font-down-3);
     }
-    height: 100%;
+    height: min-content;
     margin-left: auto;
     display: flex;
     flex-direction: row;
@@ -148,9 +153,6 @@
     border: 1px solid var(--status-color);
     color: var(--status-color);
     width: min-content;
-    @include breakpoint(mobile-extra-large) {
-      height: calc(100% - 2px);
-    }
     svg {
       font-size: var(--font-down-1);
       color: var(--status-color);
@@ -167,7 +169,8 @@
   // title
   td.main-link .link-top-line {
     font-size: var(--font-0);
-    grid-area: topic-title;
+    grid-row: 1/2;
+    grid-column: 1/-2;
     font-weight: 500;
     display: flex;
   }
@@ -188,10 +191,9 @@
   td.main-link .link-top-line a.raw-topic-link {
     padding: 0;
   }
-  .link-top-line .topic-post-badges .badge-notification.unread-posts {
-    display: none;
-  }
-  .topic-post-badges .badge-notification.unread-posts {
+
+  .topic-post-badges .badge-notification.unread-posts,
+  .topic-post-badges .badge-notification.new-topic {
     background-color: var(--tertiary);
     color: var(--tertiary);
     overflow: hidden;
@@ -229,13 +231,16 @@
   }
   td.topic-category-data {
     grid-area: category;
-    align-self: flex-end;
+    display: flex;
+    justify-content: flex-end;
+    @include breakpoint(mobile-extra-large) {
+      justify-content: flex-start;
+    }
   }
   td.topic-category-data .badge-category__wrapper,
   td.main-link .link-bottom-line .badge-category__wrapper {
     border-radius: var(--d-border-radius);
     padding: 3px 6px;
-    align-self: flex-end;
     background-color: light-dark(
       oklch(from var(--category-badge-color) 97% calc(c * 0.3) h),
       oklch(from var(--category-badge-color) 45% calc(c * 0.5) h)
@@ -270,8 +275,7 @@
     gap: 0.5em;
     justify-content: flex-end;
     height: min-content;
-    align-self: flex-end;
-    padding-bottom: 4px;
+    align-self: center;
   }
   .topic-likes-replies-data .topic-likes,
   .topic-likes-replies-data .topic-replies {
@@ -304,32 +308,35 @@
 // Bookmarks
 
 .topic-list-item.bookmark-list-item {
+  .link-bottom-line {
+    font-size: unset;
+  }
   grid-template-columns: 20px min-content min-content auto min-content min-content 36px;
   grid-template-areas:
-    "avatar update metadata metadata metadata metadata dropdown"
-    "topic-title topic-title topic-title topic-title topic-title category dropdown";
+    ". . . . . . dropdown"
+    "avatar update metadata metadata metadata category dropdown";
   @include breakpoint(mobile-extra-large) {
     grid-template-columns: 20px min-content min-content auto min-content min-content min-content 36px;
     grid-template-areas:
-      "avatar update metadata metadata metadata metadata metadata dropdown"
-      "topic-title topic-title topic-title topic-title topic-title likes-replies category dropdown";
+      ". . . . . . . dropdown"
+      "avatar update metadata metadata metadata metadata category dropdown";
   }
   &.has-metadata {
     grid-template-areas:
-      "avatar update metadata metadata metadata metadata dropdown"
-      "topic-title topic-title topic-title topic-title likes-replies category dropdown";
+      ". . . . . . dropdown"
+      "avatar update metadata metadata metadata category dropdown";
     @include breakpoint(mobile-extra-large) {
       grid-template-areas:
-        "avatar update metadata metadata metadata metadata metadata dropdown"
-        "topic-title topic-title topic-title topic-title likes-replies . category dropdown";
+        ". . . . . . . dropdown"
+        "avatar update metadata metadata metadata metadata category dropdown";
     }
   }
   &.excerpt-expanded {
     grid-template-areas:
+      ". . . . . . . dropdown"
       "avatar update metadata metadata metadata metadata metadata dropdown"
-      "topic-title topic-title topic-title topic-title topic-title topic-title . dropdown"
-      "excerpt excerpt excerpt excerpt excerpt excerpt . dropdown"
-      "excerpt excerpt excerpt excerpt excerpt excerpt category dropdown";
+      "excerpt excerpt excerpt excerpt excerpt . . dropdown"
+      "excerpt excerpt excerpt excerpt excerpt category category dropdown";
     @include breakpoint(mobile-extra-large) {
       grid-template-columns: 20px min-content min-content auto min-content min-content min-content 36px;
       .post-excerpt {
@@ -338,16 +345,23 @@
     }
     &.has-metadata {
       grid-template-areas:
+        ". . . . . . . dropdown"
         "avatar update metadata metadata metadata metadata metadata dropdown"
-        "topic-title topic-title topic-title topic-title topic-title topic-title topic-title dropdown"
-        "excerpt excerpt excerpt excerpt excerpt excerpt . dropdown"
-        "excerpt excerpt excerpt excerpt excerpt excerpt category dropdown";
+        "excerpt excerpt excerpt excerpt excerpt . . dropdown"
+        "excerpt excerpt excerpt excerpt excerpt category category dropdown";
     }
   }
+  td.author-avatar {
+    grid-area: avatar;
+  }
   td.main-link .link-bottom-line {
     display: contents;
     .badge-category__wrapper {
       grid-area: category;
+      display: flex;
+      align-items: center;
+      width: min-content;
+      justify-self: flex-end;
     }
   }
   td.main-link .link-top-line {
@@ -356,7 +370,8 @@
       grid-area: metadata;
     }
     .bookmark-status-with-link {
-      grid-area: topic-title;
+      grid-column: 1/-2;
+      grid-row: 1/2;
     }
   }
   .post-excerpt {
@@ -382,22 +397,19 @@
 // Assigned List
 
 .topic-list-item.assigned-list-item {
+  td.main-link .link-top-line {
+    grid-column: 1/-3;
+  }
   grid-template-columns: 20px min-content min-content auto min-content min-content 36px;
   grid-template-areas:
-    "activity activity activity activity activity status dropdown"
-    "topic-title topic-title topic-title topic-title likes-replies category dropdown";
-  @include breakpoint(large) {
-    grid-template-areas:
-      "activity activity activity activity activity status dropdown"
-      "topic-title topic-title topic-title topic-title topic-title topic-title dropdown"
-      "category . . . . likes-replies dropdown";
-  }
+    ". . . . . status dropdown"
+    "activity activity activity activity likes-replies category dropdown";
   @include breakpoint(mobile-extra-large) {
     grid-template-columns: 20px min-content min-content auto min-content min-content min-content 36px;
     grid-template-areas:
-      "activity activity activity activity activity activity status dropdown"
-      "topic-title topic-title topic-title topic-title topic-title topic-title . dropdown"
-      "category . . . . . likes-replies dropdown";
+      ". . . . . . status dropdown"
+      "activity activity activity activity activity activity activity dropdown"
+      "category category category category category category likes-replies dropdown";
   }
   .assign-topic-buttons {
     display: contents;
@@ -426,19 +438,19 @@ body.user-messages-page .topic-list-item {
   }
   grid-template-areas:
     "activity activity activity activity activity activity activity"
-    "topic-title topic-title topic-title topic-title likes-replies likes-replies likes-replies";
+    ". . . . likes-replies likes-replies likes-replies";
   &.excerpt-expanded {
     grid-template-columns: 20px repeat(6, 1fr) auto;
     grid-template-rows: 20px auto auto 30px;
     grid-template-areas:
       "activity activity activity activity activity activity activity activity"
-      "topic-title topic-title topic-title topic-title topic-title topic-title topic-title topic-title"
+      ". . . . . . . ."
       "excerpt excerpt excerpt excerpt excerpt excerpt . ."
       "excerpt excerpt excerpt excerpt excerpt excerpt likes-replies likes-replies";
     @include breakpoint(extra-large) {
       grid-template-areas:
         "avatar author status status . . . activity"
-        "avatar topic-title topic-title topic-title topic-title . . ."
+        "avatar . . . . . . ."
         ". excerpt excerpt excerpt excerpt excerpt . likes-replies"
         ". excerpt excerpt excerpt excerpt excerpt . likes-replies";
     }
@@ -448,7 +460,7 @@ body.user-messages-page .topic-list-item {
     grid-template-rows: auto auto;
     grid-template-areas:
       "activity activity activity activity activity activity activity activity"
-      "topic-title topic-title topic-title topic-title topic-title topic-title topic-title topic-title";
+      ". . . . . . . .";
     .topic-excerpt {
       display: none;
     }
@@ -460,7 +472,7 @@ body.user-messages-page .topic-list-item {
 .bulk-select-enabled .topic-list-item {
   grid-template-areas:
     "bulk-select activity activity activity . . status"
-    "bulk-select topic-title topic-title topic-title likes-replies likes-replies category";
+    "bulk-select . . . likes-replies likes-replies category";
   .bulk-select {
     grid-area: bulk-select;
     padding: 0;
@@ -476,7 +488,7 @@ body.user-messages-page .topic-list-item {
     grid-template-rows: 20px minmax(20px, auto);
     grid-template-areas:
       "bulk-select activity activity activity activity activity status"
-      "bulk-select topic-title topic-title topic-title topic-title topic-title topic-title"
+      "bulk-select . . . . . ."
       "bulk-select category . . . . likes-replies";
   }
   @include breakpoint(mobile-extra-large) {
@@ -484,7 +496,7 @@ body.user-messages-page .topic-list-item {
     grid-template-rows: auto auto auto;
     grid-template-areas:
       "bulk-select activity activity activity activity activity activity status"
-      "bulk-select topic-title topic-title topic-title topic-title topic-title topic-title topic-title"
+      "bulk-select . . . . . . ."
       "bulk-select category . . . . .  likes-replies";
   }
 }