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: rework loading in Settings pages #2650

Merged
merged 9 commits into from
Jun 3, 2024
Merged

Conversation

beonma
Copy link
Contributor

@beonma beonma commented May 18, 2024

What does this PR do?

This pull request ensures that the skeleton is correctly loaded into the appropriate shapes on all settings pages.

Fixes #2620

Screenshot from 2024-05-18 01-26-25
Screenshot from 2024-05-18 00-04-06
Screenshot from 2024-05-18 00-04-12

Required

  • Filled out the "How to test" section in this PR
  • Read How we Code at Formbricks
  • Self-reviewed my own code
  • Commented on my code in hard-to-understand bits
  • Ran pnpm build
  • Checked for warnings, there are none
  • Removed all console.logs
  • Merged the latest changes from main onto my branch with git pull origin main
  • My changes don't cause any responsiveness issues
  • First PR at Formbricks? Please sign the CLA! Without it we wont be able to merge it 🙏

Appreciated

  • If a UI change was made: Added a screen recording or screenshots to this PR
  • Updated the Formbricks Docs if changes were necessary

Copy link

vercel bot commented May 18, 2024

@beonma is attempting to deploy a commit to the formbricks Team on Vercel.

A member of the Team first needs to authorize it.

@CLAassistant
Copy link

CLAassistant commented May 18, 2024

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions bot added enhancement New feature or request good first issue Good for newcomers 🕹️ 50 points 🕹️ oss.gg Community issue via oss.gg 🙋🏻‍♂️help wanted Extra attention is needed labels May 18, 2024
Copy link
Contributor

github-actions bot commented May 18, 2024

Thank you for following the naming conventions for pull request titles! 🙏

Copy link
Contributor

@gupta-piyush19 gupta-piyush19 left a comment

Choose a reason for hiding this comment

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

Thanks, @beonma, for the fix. 😊
Changes look good and consistent with the codebase. There is just one loading behavior that seems a bit off, can you please check the comments and fix this?
We'll be good to go after that 🚀

Copy link
Contributor

Choose a reason for hiding this comment

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

Can you please try fixing these two loading behavior? It first shows the loading element and then the loader for the table, it would be great to see something consistent in just one loader.

loader.mp4

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi, @gupta-piyush19.
I encountered difficulty in reproducing this issue, as I am using the local version with Docker (i guess). Despite removing the cache function to potentially observe the loading, I was still unable to replicate the problem. I have implemented some additional code to ensure consistency in appearance. Please feel free to request any further modifications.

@beonma
Copy link
Contributor Author

beonma commented May 24, 2024

Hi @gupta-piyush19, I have made the necessary changes, along with some additional adjustments for UI consistency. Please let me know if anything else needs to be modified.

@gupta-piyush19
Copy link
Contributor

Hi @gupta-piyush19, I have made the necessary changes, along with some additional adjustments for UI consistency. Please let me know if anything else needs to be modified.

Thanks @beonma for the changes 👍
LGTM, we can now merge this 🚀 😊

@gupta-piyush19
Copy link
Contributor

@pandeymangg Can you please take a final look at the code changes, as these files were recently edited? 😊

@pandeymangg
Copy link
Contributor

Hey! @beonma the changes look good for the settings pages, except the settings/billing page which still seems to have a wrong loading UI, could you also pls take a look at it? 😊

Screen.Recording.2024-05-29.at.1.19.18.PM.mov

@beonma
Copy link
Contributor Author

beonma commented May 31, 2024

Hey, @pandeymangg.
I've made the necessary adjustments to the billing page. Please review the changes to ensure they meet the desired output. Feel free to suggest any additional modifications if needed.

Is there a way to simulate the cloud version within a local development environment? Because i overlooked these parts of the code due to working solely with the community version.

@pandeymangg
Copy link
Contributor

Hey, @pandeymangg. I've made the necessary adjustments to the billing page. Please review the changes to ensure they meet the desired output. Feel free to suggest any additional modifications if needed.

Is there a way to simulate the cloud version within a local development environment? Because i overlooked these parts of the code due to working solely with the community version.

Thanks for making the changes! looking good now 😊
and to simulate the cloud version you can set IS_FORMBRICKS_CLOUD=1 in your .env file

Copy link
Contributor

@pandeymangg pandeymangg left a comment

Choose a reason for hiding this comment

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

LGTM! 🚀

@mattinannt mattinannt dismissed gupta-piyush19’s stale review June 3, 2024 15:10

changes have been made :-)

@mattinannt mattinannt added this pull request to the merge queue Jun 3, 2024
@beonma
Copy link
Contributor Author

beonma commented Jun 3, 2024

Thank you @pandeymangg ! Thanks @gupta-piyush19 for reviewing this pr too.

Merged via the queue into formbricks:main with commit 62c514a Jun 3, 2024
9 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request good first issue Good for newcomers 🙋🏻‍♂️help wanted Extra attention is needed 🕹️ oss.gg Community issue via oss.gg 🕹️ 50 points
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[FEATURE] Rework the loading.tsx on SETTINGS pages
5 participants