Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Workspace/subscription ux #34057

Merged
merged 19 commits into from
Dec 20, 2024
Merged

Conversation

rique223
Copy link
Contributor

@rique223 rique223 commented Nov 25, 2024

Proposed changes (including videos or screenshots)

  1. Changed the fontScale of the WorkspaceCardSection body to p2, the fontScale of the WorkspaceCardSection title to p2b and the fontScale of the WorkspaceCardSection header titles to h4;
  2. Centralized the information of the Seats and Monthly Active Contracts cards vertically and horizontally;
  3. Centralized the information of the Active Sessions and Active Sessions peak cards horizontally;
  4. Added a minHeight of 244px to the cards and changed the margin between the community card content to be 8px;
  5. Componentized the WorkspaceCardSectionTitle so that it can have variations;
  6. Updated the version card of the workspace page to better align with design specifications.

Demos:

Workspace page:

image
FontScale and spacing changes

workspace_background_responsivity
Change responsivity strategy

Subscription page:

image
Centralize content vertically and horizontally

image
Change spacing for community card and apps card. Add 244px "min-height" to all the cards

image
Centralize content horizontally

Issue(s)

Steps to test or reproduce

Further comments

Jira tasks:
CONN-413: Workspace font size
CONN-414: Version card background image responsivity
CONN-415: Centralize seats and MAC
CONN-417: Subscription page spacing
CONN-418: Centralize active sessions and active sessions peak

The WorkspaceCardSection component was updated to improve typography and clarify title differentiation. The header titles now use the h4 font scale, while the section titles have been updated to use the p2b font scale. Additionally, the default font scale of the component text was changed to p2. A new boolean property was also added to differentiate between header titles and section titles, ensuring consistent styling and clearer hierarchy.
Copy link
Contributor

dionisio-bot bot commented Nov 25, 2024

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

Copy link

changeset-bot bot commented Nov 25, 2024

🦋 Changeset detected

Latest commit: b519f1c

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 35 packages
Name Type
@rocket.chat/meteor Minor
@rocket.chat/core-typings Minor
@rocket.chat/rest-typings Minor
@rocket.chat/uikit-playground Patch
@rocket.chat/api-client Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/ddp-client Patch
@rocket.chat/freeswitch Patch
@rocket.chat/fuselage-ui-kit Major
@rocket.chat/gazzodown Major
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Major
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/network-broker Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Major
@rocket.chat/ui-client Major
@rocket.chat/ui-video-conf Major
@rocket.chat/ui-voip Major
@rocket.chat/web-ui-registration Major
@rocket.chat/instance-status Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@rique223 rique223 changed the title Refactor/workspace subscription ux refactor: Workspace/subscription ux qa Nov 25, 2024
Copy link

codecov bot commented Nov 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 75.27%. Comparing base (c9deda3) to head (b519f1c).
Report is 1 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##           develop   #34057       +/-   ##
============================================
+ Coverage    59.28%   75.27%   +15.99%     
============================================
  Files         2821      516     -2305     
  Lines        67945    22540    -45405     
  Branches     15109     5485     -9624     
============================================
- Hits         40282    16968    -23314     
+ Misses       24831     4911    -19920     
+ Partials      2832      661     -2171     
Flag Coverage Δ
e2e ?
e2e-api ?
unit 75.27% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Copy link
Contributor

github-actions bot commented Nov 25, 2024

PR Preview Action v1.4.8
🚀 Deployed preview to https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-34057/
on branch gh-pages at 2024-12-20 19:23 UTC

@rique223 rique223 changed the title refactor: Workspace/subscription ux qa refactor: Workspace/subscription ux Nov 25, 2024
Componentized the WorkspaceCardSection title and refactored the WorkspaceCardSectionTitle to accept the new title.
The version card background image has been updated to better align with design specifications. On large screens and smaller, the image is fixed to the right side of the container and gradually crops from the right as the container shrinks. On extra-large screens and larger, it remains fixed to the right side with a 20px margin from the container's edge.
@rique223 rique223 marked this pull request as ready for review December 3, 2024 17:41
@rique223 rique223 requested a review from a team as a code owner December 3, 2024 17:41
@rique223 rique223 added this to the 7.2.0 milestone Dec 3, 2024
@ggazzo
Copy link
Member

ggazzo commented Dec 3, 2024

if reflects in ui/ux changes is not a refactor, also requires changeset

@rique223 rique223 changed the title refactor: Workspace/subscription ux fix: Workspace/subscription ux Dec 3, 2024
@ggazzo ggazzo changed the title fix: Workspace/subscription ux chore: Workspace/subscription ux Dec 4, 2024
@dougfabris
Copy link
Member

dougfabris commented Dec 16, 2024

just a reminder: if it changes something to the end user it shouldn't be a chore

@rique223 rique223 changed the title chore: Workspace/subscription ux feat: Workspace/subscription ux Dec 16, 2024
Removed the titleToContentGap prop as the margin-block-end of all h4 titles are 20px anyways so this can be done with a simple ternary.
@tassoevan tassoevan added the stat: QA assured Means it has been tested and approved by a company insider label Dec 19, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Dec 19, 2024
@dionisio-bot dionisio-bot bot removed the stat: ready to merge PR tested and approved waiting for merge label Dec 19, 2024
@KevLehman KevLehman added the stat: ready to merge PR tested and approved waiting for merge label Dec 20, 2024
@kodiakhq kodiakhq bot merged commit 24170d9 into develop Dec 20, 2024
51 of 72 checks passed
@kodiakhq kodiakhq bot deleted the refactor/workspace-subscription-ux branch December 20, 2024 19:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants