Skip to content

A platform for community discussion. Free, open, simple.

UX: redesign user status (#44381)

chapoi3c8d5608f401
diff --git a/app/assets/stylesheets/common/components/user-card.scss b/app/assets/stylesheets/common/components/user-card.scss
index dad7401ddfc..69968128bdf 100644
--- a/app/assets/stylesheets/common/components/user-card.scss
+++ b/app/assets/stylesheets/common/components/user-card.scss
@@ -9,6 +9,7 @@
.fk-d-menu__inner-content {
min-width: 0;
overflow: visible;
+ border-radius: var(--d-border-radius-large);
}
@include viewport.until(sm) {
@@ -61,11 +62,11 @@
color: var(--primary);
background: var(--secondary) center center;
background-size: cover;
- position: unset !important;
- margin: 0 !important;
- border-radius: var(--d-border-radius) !important;
- box-shadow: unset !important;
- z-index: unset !important;
+ position: unset;
+ margin: 0;
+ border-radius: var(--d-border-radius-large);
+ box-shadow: unset;
+ z-index: unset;
@include viewport.until(sm) {
box-sizing: border-box;
@@ -74,9 +75,11 @@
}
.card-content {
+ container-type: inline-size;
padding: 10px;
background: rgb(var(--secondary-rgb), 0.85);
- border-radius: var(--d-border-radius);
+ border-radius: var(--d-border-radius-large);
+ border: 5px solid var(--secondary);
&::after {
content: "";
@@ -263,14 +266,18 @@
height: var(--avatar-width);
}
- .user-card-avatar {
+ .user-card-avatar-wrapper {
margin-top: var(--avatar-margin);
- max-height: var(--avatar-width);
position: relative;
@include viewport.until(sm) {
flex: 0 0 auto;
}
+ }
+
+ .user-card-avatar {
+ max-height: var(--avatar-width);
+ position: relative;
.own-avatar-pencil {
opacity: 0;
@@ -502,26 +509,42 @@
.user-status {
display: flex;
align-items: center;
+ gap: var(--space-1);
+ position: absolute;
+ top: 0;
+ left: 50%;
+ transform: translateX(calc((var(--avatar-width) / 3)));
+ box-sizing: border-box;
+ width: max-content;
+ max-width: calc(100cqi - 50% - var(--avatar-width) / 3);
+ background: var(--primary-very-low);
+ padding: var(--space-1) var(--space-3);
+ border-radius: 9999px;
+ border: 5px solid var(--secondary);
+ box-shadow:
+ 0 0 0 1px var(--primary-low),
+ 0 2px 12px rgb(0, 0, 0, 0.1);
+ font-size: var(--font-down-1);
+
+ &.--empty {
+ font-style: italic;
- @include viewport.until(sm) {
- font-size: var(--font-down-1);
- }
-
- img.emoji {
- margin-right: 0.3em;
+ .d-icon {
+ color: var(--primary-medium);
+ }
}
.relative-date {
flex: 1 0 auto;
text-align: left;
- font-size: var(--font-down-3);
- padding-top: 0.5em;
- margin-left: 0.6em;
+ font-size: var(--font-down-2);
+ margin-left: var(--space-half);
color: var(--primary-medium);
}
&__description {
@include ellipsis;
+ min-width: 0;
}
}
}
diff --git a/app/assets/stylesheets/common/modal/user-status.scss b/app/assets/stylesheets/common/modal/user-status.scss
index f0ad04f3da1..0cef6079638 100644
--- a/app/assets/stylesheets/common/modal/user-status.scss
+++ b/app/assets/stylesheets/common/modal/user-status.scss
@@ -1,4 +1,4 @@
-.user-status.d-modal {
+.modal-user-status {
.d-modal {
&__footer {
.delete-status {
@@ -25,4 +25,47 @@
}
}
}
+
+ .user-card {
+ width: 80%;
+ margin: var(--space-8) auto;
+ border-radius: var(--d-border-radius-large);
+ }
+
+ .card-content {
+ border: 1px solid var(--content-border-color);
+ box-shadow: var(--shadow-dropdown);
+ }
+
+ .emoji-picker-trigger {
+ font-size: var(--font-up-1-rem);
+
+ @media (prefers-reduced-motion: no-preference) {
+ transition:
+ transform 0.15s ease-out,
+ filter 0.15s ease-out;
+ }
+
+ &:hover,
+ &.-expanded {
+ transform: scale(1.2);
+ }
+ }
+
+ &.--default-emoji {
+ .user-status.--empty {
+ .emoji {
+ filter: grayscale(1);
+ }
+ }
+
+ .emoji-picker-trigger {
+ filter: grayscale(1);
+
+ &:hover,
+ &.-expanded {
+ filter: none;
+ }
+ }
+ }
}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 43618b3e3fb..ad20db2e7c5 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2847,6 +2847,7 @@ en:
user_status:
save: "Save"
set_custom_status: "Set custom status"
+ edit_status: "Edit status"
what_are_you_doing: "What are you doing?"
pause_notifications: "Pause notifications"
remove_status: "Remove status"
diff --git a/frontend/discourse/app/components/modal/user-status.gjs b/frontend/discourse/app/components/modal/user-status.gjs
index cbd0a216a8e..43b0625a4e4 100644
--- a/frontend/discourse/app/components/modal/user-status.gjs
+++ b/frontend/discourse/app/components/modal/user-status.gjs
@@ -1,34 +1,92 @@
import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
import { Input } from "@ember/component";
import { action } from "@ember/object";
import { trackedObject } from "@ember/reactive/collections";
import { service } from "@ember/service";
+import { trustHTML } from "@ember/template";
import ItsATrap from "@discourse/itsatrap";
import UserStatusPicker from "discourse/components/user-status-picker";
+import formatUsername from "discourse/helpers/format-username";
import { popupAjaxError } from "discourse/lib/ajax-error";
+import { getURLWithCDN } from "discourse/lib/get-url";
+import { prioritizeNameInUx } from "discourse/lib/settings";
+import { emojiUnescape } from "discourse/lib/text";
import {
TIME_SHORTCUT_TYPES,
timeShortcuts,
} from "discourse/lib/time-shortcut";
+import { escapeExpression } from "discourse/lib/utilities";
+import User from "discourse/models/user";
import DButton from "discourse/ui-kit/d-button";
import DModal from "discourse/ui-kit/d-modal";
import DModalCancel from "discourse/ui-kit/d-modal-cancel";
import DTimeShortcutPicker from "discourse/ui-kit/d-time-shortcut-picker";
+import dBoundAvatar from "discourse/ui-kit/helpers/d-bound-avatar";
+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";
+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";
import { i18n } from "discourse-i18n";
export default class UserStatusModal extends Component {
@service currentUser;
@service dialog;
+ @service siteSettings;
- status = trackedObject({ ...this.args.model.status });
+ @tracked emojiChosen = false;
+ @tracked loadedUser;
+
+ status = trackedObject({
+ emoji: "speech_balloon",
+ ...this.args.model.status,
+ });
timeShortcuts = this.#buildTimeShortcuts();
_itsatrap = new ItsATrap();
+ constructor() {
+ super(...arguments);
+
+ if (!this.args.model.user) {
+ this.#loadPreviewUser();
+ }
+ }
+
willDestroy() {
super.willDestroy(...arguments);
this._itsatrap.destroy();
}
+ get user() {
+ return this.args.model.user ?? this.loadedUser ?? this.currentUser;
+ }
+
+ get cardBackgroundStyle() {
+ const url = this.user.card_background_upload_url;
+
+ if (!url || !this.siteSettings.allow_profile_backgrounds) {
+ return;
+ }
+
+ return trustHTML(`background-image: url(${getURLWithCDN(url)})`);
+ }
+
+ get nameFirst() {
+ return prioritizeNameInUx(this.user.name);
+ }
+
+ get statusEmoji() {
+ return emojiUnescape(escapeExpression(`:${this.status.emoji}:`));
+ }
+
+ get statusEndsAt() {
+ return this.status.endsAt !== undefined
+ ? this.status.endsAt
+ : this.status.ends_at;
+ }
+
+ get isDefaultEmoji() {
+ return !this.args.model.status?.emoji && !this.emojiChosen;
+ }
+
get showDeleteButton() {
return !!this.args.model.status;
}
@@ -51,6 +109,11 @@ export default class UserStatusModal extends Component {
return [TIME_SHORTCUT_TYPES.LAST_CUSTOM];
}
+ @action
+ onEmojiSelected() {
+ this.emojiChosen = true;
+ }
+
@action
onTimeSelected(_, time) {
this.status.endsAt = time;
@@ -85,6 +148,12 @@ export default class UserStatusModal extends Component {
}
}
+ async #loadPreviewUser() {
+ this.loadedUser = await User.findByUsername(this.currentUser.username, {
+ forCard: true,
+ }).catch(() => null);
+ }
+
#buildTimeShortcuts() {
const shortcuts = timeShortcuts(this.currentUser.user_option.timezone);
return [shortcuts.oneHour(), shortcuts.twoHours(), shortcuts.tomorrow()];
@@ -100,13 +169,74 @@ export default class UserStatusModal extends Component {
<template>
<DModal
- class="user-status"
+ class={{dConcatClass
+ "modal-user-status"
+ (if this.isDefaultEmoji "--default-emoji")
+ }}
@closeModal={{@closeModal}}
@title={{i18n "user_status.set_custom_status"}}
>
<:body>
+ <div
+ aria-hidden="true"
+ class="user-card --preview"
+ style={{this.cardBackgroundStyle}}
+ >
+ <div class="card-content">
+ <div class="card-row first-row">
+ <div class="user-card-avatar-wrapper">
+ <div class="user-card-avatar">
+ <span class="card-huge-avatar">
+ {{dBoundAvatar this.user "huge"}}
+ </span>
+ </div>
+
+ {{#if this.status.description}}
+ <div class="user-status">
+ {{trustHTML this.statusEmoji}}
+ <span class="user-status__description">
+ {{this.status.description}}
+ </span>
+ {{dFormatDate this.statusEndsAt format="tiny"}}
+ </div>
+ {{else}}
+ <div class="user-status --empty">
+ {{trustHTML this.statusEmoji}}
+ <span class="user-status__description">
+ {{i18n "user_status.what_are_you_doing"}}
+ </span>
+ </div>
+ {{/if}}
+ </div>
+ <div class="names">
+ <div class="names__primary">
+ <span class="name-username-wrapper">
+ {{if
+ this.nameFirst
+ this.user.name
+ (formatUsername this.user.username)
+ }}
+ </span>
+ </div>
+ {{#if this.nameFirst}}
+ <div class="names__secondary username">
+ {{this.user.username}}
+ </div>
+ {{else if this.user.name}}
+ <div class="names__secondary full-name">
+ {{this.user.name}}
+ </div>
+ {{/if}}
+ </div>
+ </div>
+ </div>
+ </div>
+
<div class="control-group">
- <UserStatusPicker @status={{this.status}} />
+ <UserStatusPicker
+ @onEmojiSelected={{this.onEmojiSelected}}
+ @status={{this.status}}
+ />
</div>
{{#unless @model.hidePauseNotifications}}
diff --git a/frontend/discourse/app/components/user-card-contents.gjs b/frontend/discourse/app/components/user-card-contents.gjs
index 144a7f73480..facc0511015 100644
--- a/frontend/discourse/app/components/user-card-contents.gjs
+++ b/frontend/discourse/app/components/user-card-contents.gjs
@@ -3,6 +3,7 @@ import { array, fn, hash } from "@ember/helper";
import { on } from "@ember/modifier";
import EmberObject, { action, computed, set } from "@ember/object";
import { LinkTo } from "@ember/routing";
+import { service } from "@ember/service";
import { dasherize } from "@ember/string";
import { trustHTML } from "@ember/template";
import { compare, isEmpty } from "@ember/utils";
@@ -13,6 +14,7 @@ import {
} from "@ember-decorators/component";
import { observes, on as onEvent } from "@ember-decorators/object";
import CardContentsBase from "discourse/components/card-contents-base";
+import UserStatusModal from "discourse/components/modal/user-status";
import PluginOutlet from "discourse/components/plugin-outlet";
import UserBadge from "discourse/components/user-badge";
import formatUsername from "discourse/helpers/format-username";
@@ -47,6 +49,9 @@ import { i18n } from "discourse-i18n";
)
@attributeBindings("ariaLabel:aria-label")
export default class UserCardContents extends CardContentsBase {
+ @service modal;
+ @service userStatus;
+
elementId = "user-card";
avatarSelector = "[data-user-card]";
avatarDataAttrKey = "userCard";
@@ -183,11 +188,6 @@ export default class UserCardContents extends CardContentsBase {
return this.user.location || this.user.website_name || this.userTimezone;
}
- @computed("user.status")
- get hasStatus() {
- return this.siteSettings.enable_user_status && this.user.status;
- }
-
@computed("user.status.emoji")
get userStatusEmoji() {
return emojiUnescape(escapeExpression(`:${this.user?.status?.emoji}:`));
@@ -367,6 +367,23 @@ export default class UserCardContents extends CardContentsBase {
user.checkEmail();
}
+ @action
+ editUserStatus() {
+ const user = this.user;
+ this._close();
+
+ this.modal.show(UserStatusModal, {
+ model: {
+ user,
+ status: this.currentUser.status,
+ pauseNotifications: this.currentUser.isInDoNotDisturb(),
+ saveAction: (status, pauseNotifications) =>
+ this.userStatus.set(status, pauseNotifications),
+ deleteAction: () => this.userStatus.clear(),
+ },
+ });
+ }
+
@onEvent("didInsertElement")
_inserted() {
this.appEvents.on("dom:clean", this, this.cleanUp);
@@ -455,38 +472,79 @@ export default class UserCardContents extends CardContentsBase {
handleShowUser=this.handleShowUser
}}
>
- <div aria-hidden="true" class="user-card-avatar">
- {{#if this.contentHidden}}
- <span class="card-huge-avatar">{{dBoundAvatar
- this.user
- "huge"
- }}</span>
- {{else}}
- <a
- class="card-huge-avatar"
- href={{this.avatarUrl}}
- tabindex="-1"
- >
- {{dBoundAvatar this.user "huge"}}
- {{#if this.isOwnCard}}
- <span class="own-avatar-pencil">
- <span class="own-avatar-pencil--icon">
- {{dIcon "pencil"}}
+ <div class="user-card-avatar-wrapper">
+ <div aria-hidden="true" class="user-card-avatar">
+ {{#if this.contentHidden}}
+ <span class="card-huge-avatar">{{dBoundAvatar
+ this.user
+ "huge"
+ }}</span>
+ {{else}}
+ <a
+ class="card-huge-avatar"
+ href={{this.avatarUrl}}
+ tabindex="-1"
+ >
+ {{dBoundAvatar this.user "huge"}}
+ {{#if this.isOwnCard}}
+ <span class="own-avatar-pencil">
+ <span class="own-avatar-pencil--icon">
+ {{dIcon "pencil"}}
+ </span>
</span>
- </span>
- {{/if}}
- </a>
- {{/if}}
+ {{/if}}
+ </a>
+ {{/if}}
- <DUserAvatarFlair @user={{this.user}} />
+ <DUserAvatarFlair @user={{this.user}} />
- <div>
- <PluginOutlet
- @connectorTagName="div"
- @name="user-card-avatar-flair"
- @outletArgs={{lazyHash user=this.user}}
- />
+ <div>
+ <PluginOutlet
+ @connectorTagName="div"
+ @name="user-card-avatar-flair"
+ @outletArgs={{lazyHash user=this.user}}
+ />
+ </div>
</div>
+
+ {{#if this.siteSettings.enable_user_status}}
+ {{#if this.user.status}}
+ {{#if this.isOwnCard}}
+ <button
+ class="user-status --editable"
+ title={{i18n "user_status.edit_status"}}
+ type="button"
+ {{on "click" this.editUserStatus}}
+ >
+ {{trustHTML this.userStatusEmoji}}
+ <span class="user-status__description">
+ {{this.user.status.description}}
+ </span>
+ {{dFormatDate this.user.status.ends_at format="tiny"}}
+ </button>
+ {{else}}
+ <div class="user-status">
+ {{trustHTML this.userStatusEmoji}}
+ <span class="user-status__description">
+ {{this.user.status.description}}
+ </span>
+ {{dFormatDate this.user.status.ends_at format="tiny"}}
+ </div>
+ {{/if}}
+ {{else if this.isOwnCard}}
+ <button
+ class="user-status --empty"
+ title={{i18n "user_status.set_custom_status"}}
+ type="button"
+ {{on "click" this.editUserStatus}}
+ >
+ {{dIcon "circle-plus"}}
+ <span class="user-status__description">
+ {{i18n "user_status.what_are_you_doing"}}
+ </span>
+ </button>
+ {{/if}}
+ {{/if}}
</div>
<div class="names">
<div
@@ -551,15 +609,6 @@ export default class UserCardContents extends CardContentsBase {
"user.staged"
}}</div>
{{/if}}
- {{#if this.hasStatus}}
- <div class="user-status">
- {{trustHTML this.userStatusEmoji}}
- <span class="user-status__description">
- {{this.user.status.description}}
- </span>
- {{dFormatDate this.user.status.ends_at format="tiny"}}
- </div>
- {{/if}}
<div>
<PluginOutlet
@connectorTagName="div"
diff --git a/frontend/discourse/app/components/user-status-picker.gjs b/frontend/discourse/app/components/user-status-picker.gjs
index 6cf33a52f72..6b521bc1f70 100644
--- a/frontend/discourse/app/components/user-status-picker.gjs
+++ b/frontend/discourse/app/components/user-status-picker.gjs
@@ -24,6 +24,7 @@ export default class UserStatusPicker extends Component {
@action
emojiSelected(emoji) {
this.args.status.emoji = emoji;
+ this.args.onEmojiSelected?.(emoji);
}
@action
@@ -46,7 +47,7 @@ export default class UserStatusPicker extends Component {
}}
>
<EmojiPicker
- @btnClass="btn-emoji"
+ @btnClass="btn-emoji btn-transparent"
@context="user-status"
@didSelectEmoji={{this.emojiSelected}}
@emoji={{@status.emoji}}
diff --git a/frontend/discourse/app/controllers/preferences/account.js b/frontend/discourse/app/controllers/preferences/account.js
index 1da2b44aed4..18808810300 100644
--- a/frontend/discourse/app/controllers/preferences/account.js
+++ b/frontend/discourse/app/controllers/preferences/account.js
@@ -208,6 +208,7 @@ export default class AccountController extends Controller {
showUserStatusModal(status) {
this.modal.show(UserStatusModal, {
model: {
+ user: this.model,
status,
hidePauseNotifications: true,
saveAction: (s) => this.set("newStatus", s),
diff --git a/frontend/discourse/tests/acceptance/user-status-test.js b/frontend/discourse/tests/acceptance/user-status-test.js
index 67b63ada229..ed0873ad77d 100644
--- a/frontend/discourse/tests/acceptance/user-status-test.js
+++ b/frontend/discourse/tests/acceptance/user-status-test.js
@@ -1,5 +1,9 @@
import { click, fillIn, visit } from "@ember/test-helpers";
import { test } from "qunit";
+import pretender, {
+ parsePostData,
+ response,
+} from "discourse/tests/helpers/create-pretender";
import emojiPicker from "discourse/tests/helpers/emoji-picker-helper";
import {
acceptance,
@@ -115,7 +119,9 @@ acceptance("User Status", function (needs) {
await visit("/");
await openUserStatusModal();
- assert.dom(".d-icon-far-face-smile").exists("empty status icon is shown");
+ assert
+ .dom(".modal-user-status.--default-emoji")
+ .exists("default status emoji is shown");
await pickEmoji(userStatusEmoji);
@@ -236,17 +242,20 @@ acceptance("User Status", function (needs) {
assert.dom(".btn-primary").isDisabled("the save button is disabled");
});
- test("sets default status emoji automatically after user started inputting status description", async function (assert) {
+ test("saves the speech balloon emoji when no emoji was picked", async function (assert) {
this.siteSettings.enable_user_status = true;
- const defaultStatusEmoji = "speech_balloon";
+
+ pretender.put("/user-status.json", (request) => {
+ assert.step(parsePostData(request.requestBody).emoji);
+ return response({ success: true });
+ });
await visit("/");
await openUserStatusModal();
await fillIn(".user-status-description", "some status");
+ await click(".btn-primary");
- assert
- .dom(`.btn-emoji img.emoji[title=${defaultStatusEmoji}]`)
- .exists("default status emoji is shown");
+ assert.verifySteps(["speech_balloon"]);
});
test("shows actual status on the modal after canceling the modal and opening it again", async function (assert) {
@@ -308,7 +317,9 @@ acceptance("User Status", function (needs) {
await click(".btn.delete-status");
await openUserStatusModal();
- assert.dom(".d-icon-far-face-smile").exists("empty status icon is shown");
+ assert
+ .dom(".modal-user-status.--default-emoji")
+ .exists("default status emoji is shown");
assert
.dom(".user-status-description")
.hasValue("", "no status description is shown");