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.

Sign up for GitHub

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

Jump to bottom

🎨 [Frontend] TIP v3 Feedback #5980

Merged
merged 24 commits into from
Jun 25, 2024
Merged

🎨 [Frontend] TIP v3 Feedback #5980

merged 24 commits into from
Jun 25, 2024

Conversation

odeimaiz
Copy link
Member

@odeimaiz odeimaiz commented Jun 20, 2024 •
edited
Loading

What do these changes do?

Feedback from 20.06 meeting:

  • Login page
    • Add Powered by Sim4Life logo

image

  • Request Account
    • Company Name -> Organization
    • Remove Application
    • Remove Description

image

  • New Plans:
    • Show Credits icon instead of plus button for billable plans
    • When starting a billable show credits warning if within threshold

Warning

  • Credits Indicator:
    • Bring it back, but this time just the Credits Icon. Its color depends on the amount credits. When clicked, show the number of credits and provide access to the Billing Center

Good
Indicator

Not so Good
Indicator_red

Related issue/s

related to ITISFoundation/osparc-issues#1309
related to ITISFoundation/osparc-issues#1409

How to test

Dev-ops checklist

@odeimaiz odeimaiz requested review from jsaq007 and ignapas as code owners June 20, 2024 14:12
@odeimaiz odeimaiz self-assigned this Jun 20, 2024
@odeimaiz odeimaiz added t:enhancement Improvement or request on an existing feature a:frontend issue affecting the front-end (area group) labels Jun 20, 2024
@odeimaiz odeimaiz added this to the South Island Iced Tea milestone Jun 20, 2024
@odeimaiz odeimaiz marked this pull request as draft June 21, 2024 09:36
@odeimaiz odeimaiz changed the title 🎨 [Frontend] TIP Login page and Request Account 🎨 [Frontend] TIP Feedback Jun 21, 2024
@odeimaiz odeimaiz changed the title 🎨 [Frontend] TIP Feedback 🎨 [Frontend] TIP v3 Feedback Jun 21, 2024
@odeimaiz odeimaiz marked this pull request as ready for review June 21, 2024 13:44
elisabettai
elisabettai approved these changes Jun 21, 2024
View reviewed changes
Copy link
Collaborator

@elisabettai elisabettai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice! Quite smart the way of handling credits. 😉

Minor: did the POs suggest the icon for credits? It doesn't remind me of credits, rather it looks like a disk/storage

@odeimaiz
Copy link
Member Author

odeimaiz commented Jun 21, 2024 •
edited
Loading

Minor: did the POs suggest the icon for credits? It doesn't remind me of credits, rather it looks like a disk/storage

They suggested a coin, coins, pile of coins....

It's actually the database icon :(, feel free to pick one from here (make sure it was released before 5.0.5):
https://fontawesome.com/v5/search?o=r&m=free&s=solid

@elisabettai
Copy link
Collaborator

Minor: did the POs suggest the icon for credits? It doesn't remind me of credits, rather it looks like a disk/storage

They suggested a coin, coins, pile of coins....

Feel free to pick from here (make sure it was released before 5.0.5): https://fontawesome.com/v5/search?o=r&m=free&s=solid

Mmh, didn't find anything much better.
If we can use pro, I'd go for https://fontawesome.com/v5/icons/coin?f=classic&s=regular
If not, maybe: https://fontawesome.com/v5/icons/coins?f=classic&s=solid (which is not much different from what you already have, though...)

@odeimaiz
Copy link
Member Author

odeimaiz commented Jun 21, 2024 •
edited
Loading

Minor: did the POs suggest the icon for credits? It doesn't remind me of credits, rather it looks like a disk/storage

They suggested a coin, coins, pile of coins....
Feel free to pick from here (make sure it was released before 5.0.5): https://fontawesome.com/v5/search?o=r&m=free&s=solid

Mmh, didn't find anything much better. If we can use pro, I'd go for https://fontawesome.com/v5/icons/coin?f=classic&s=regular If not, maybe: https://fontawesome.com/v5/icons/coins?f=classic&s=solid (which is not much different from what you already have, though...)

No pro... and "coins", which was my first choice, was released in 5.0.13. We would have to upgrade our fontawesome dependency, it might take some time....

@odeimaiz odeimaiz enabled auto-merge (squash) June 23, 2024 19:35
GitHK
GitHK approved these changes Jun 24, 2024
View reviewed changes
Copy link
Contributor

@GitHK GitHK left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🪙

@odeimaiz odeimaiz disabled auto-merge June 24, 2024 07:28
@odeimaiz odeimaiz enabled auto-merge (squash) June 24, 2024 12:22
jsaq007
jsaq007 previously requested changes Jun 24, 2024
View reviewed changes
Copy link
Contributor

@jsaq007 jsaq007 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just the couple issues I thought could be addressed.

services/static-webserver/client/source/class/osparc/desktop/credits/CreditsNavBarContainer.js Outdated Show resolved Hide resolved
services/static-webserver/client/source/class/osparc/desktop/credits/CreditsNavBarContainer.js Outdated Show resolved Hide resolved
services/static-webserver/client/source/class/osparc/desktop/credits/Utils.js Show resolved Hide resolved
@odeimaiz
Copy link
Member Author

@jsaq007

CreditsAppearance

@odeimaiz odeimaiz requested a review from jsaq007 June 24, 2024 13:36
jsaq007
jsaq007 approved these changes Jun 25, 2024
View reviewed changes
Copy link
Contributor

@jsaq007 jsaq007 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, thanks

@odeimaiz odeimaiz merged commit 9d7e144 into ITISFoundation:master Jun 25, 2024
50 checks passed
@GitHK GitHK mentioned this pull request Jul 1, 2024
Closed
17 tasks
@matusdrobuliak66 matusdrobuliak66 mentioned this pull request Jul 5, 2024
Closed
26 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sanderegg sanderegg sanderegg approved these changes

@pcrespov pcrespov pcrespov approved these changes

@elisabettai elisabettai elisabettai approved these changes

@GitHK GitHK GitHK approved these changes

@jsaq007 jsaq007 jsaq007 approved these changes

@ignapas ignapas Awaiting requested review from ignapas ignapas is a code owner

@Konohana0608 Konohana0608 Awaiting requested review from Konohana0608

Assignees

@odeimaiz odeimaiz

Labels
a:frontend issue affecting the front-end (area group) t:enhancement Improvement or request on an existing feature
Projects
None yet
Milestone
South Island Iced Tea
Development

Successfully merging this pull request may close these issues.
6 participants
@odeimaiz @elisabettai @jsaq007 @GitHK @pcrespov @sanderegg