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

remove MUI circularProgress & grid #5047

Merged
merged 5 commits into from
Mar 8, 2023
Merged

remove MUI circularProgress & grid #5047

merged 5 commits into from
Mar 8, 2023

Conversation

ayushjnv1
Copy link
Contributor

@ayushjnv1 ayushjnv1 commented Mar 6, 2023 •
edited
Loading

Proposed Changes

  • Fixes #issue?
  • Change 1
  • Change 2
  • More?

@coronasafe/care-fe-code-reviewers @coronasafe/code-reviewers

Merge Checklist

  • Add specs that demonstrate bug / test a new feature.
  • Update product documentation.
  • Ensure that UI text is kept in I18n files.
  • Prep screenshot or demo video for changelog entry, and attach it to issue.
  • Request for Peer Reviews
  • Completion of QA

@ayushjnv1 ayushjnv1 requested a review from a team March 6, 2023 17:22
@ayushjnv1 ayushjnv1 requested a review from a team as a code owner March 6, 2023 17:22
@ayushjnv1 ayushjnv1 requested a review from gigincg March 6, 2023 17:22
@vercel
Copy link

vercel bot commented Mar 6, 2023 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated
care-storybook ✅ Ready (Inspect) Visit Preview 💬 Add your feedback Mar 7, 2023 at 6:22PM (UTC)

@netlify
Copy link

netlify bot commented Mar 6, 2023 •
edited
Loading

❌ Deploy Preview for care-egov-staging failed.

Name Link
🔨 Latest commit f066e91
🔍 Latest deploy log https://app.netlify.com/sites/care-egov-staging/deploys/64077f6261130b000813ec7c

@gigincg
Copy link
Member

gigincg commented Mar 6, 2023

@ayushjnv1 Thank you for the PR

Could you please, merge the upstream to resolve the conflicts & update the PR description and link to the Issues you are solving

@ayushjnv1 ayushjnv1 mentioned this pull request Mar 6, 2023
Closed
3 tasks
@ayushjnv1
Copy link
Contributor Author

ayushjnv1 commented Mar 6, 2023 •
edited
Loading

#4930 this is the issue that I fixed

@nihal467 nihal467 linked an issue Mar 7, 2023 that may be closed by this pull request
Replace Material UI components in src/Components/Auth/Login.tsx: #4930
Closed
3 tasks
@nihal467
Copy link
Member

nihal467 commented Mar 7, 2023 •
edited
Loading

@ayushjnv1 @rithviknishad @gigincg

image

  • the forgot password text should be left aligned similar to the existing staging
  • the login button should be of the same length as the text box, similar to the existing staging
  • by default, English is selected, so it should be much more highlighted from others and have an underline to make the user understand, the language English is selected, similar to the existing staging.

rithviknishad
rithviknishad requested changes Mar 7, 2023
View reviewed changes
Copy link
Member

@rithviknishad rithviknishad left a comment

Choose a reason for hiding this comment

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

  1. The grid classes are unnecessary.
  2. Make button w-full

src/Components/Auth/Login.tsx Outdated Show resolved Hide resolved
src/Components/Auth/Login.tsx Outdated Show resolved Hide resolved
ayushjnv1 and others added 3 commits March 7, 2023 23:42
@ayushjnv1 @rithviknishad
Update src/Components/Auth/Login.tsx
a652be0 
Co-authored-by: Rithvik Nishad <rithvikn2001@gmail.com>
@ayushjnv1 @rithviknishad
Update src/Components/Auth/Login.tsx
cf61f23 
Co-authored-by: Rithvik Nishad <rithvikn2001@gmail.com>
@ayushjnv1
Merge branch 'coronasafe:develop' into fix/issue#4930
f066e91
@github-actions github-actions bot added the Deploy-Failed Deplyment is not showing preview label Mar 7, 2023
@sonarcloud
Copy link

sonarcloud bot commented Mar 7, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
2.0% 2.0% Duplication

@ayushjnv1 ayushjnv1 requested review from rithviknishad and removed request for gigincg March 7, 2023 18:36
@rithviknishad rithviknishad removed test failed Deploy-Failed Deplyment is not showing preview labels Mar 8, 2023
rithviknishad
rithviknishad approved these changes Mar 8, 2023
View reviewed changes
Copy link
Member

@rithviknishad rithviknishad left a comment

Choose a reason for hiding this comment

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

@ayushjnv1 LGTM.

@nihal467 the language selector issue is a different issue not related to this.

What happens is, if the user has never selected a language in care, it'll be blank and English is not highlighted. Because only when a user selects a language, the preference is stored in the local storage.
In your staging, English is highlighted because you've selected English at some point in time.

This issue is easily noticeable in all deploy previews.

In my fresh staging (see image) I've never selected a language, so it's not highlighted. Will create an issue for this.

image

@rithviknishad rithviknishad mentioned this pull request Mar 8, 2023
Closed
@nihal467
Copy link
Member

nihal467 commented Mar 8, 2023

LGTM

@khavinshankar khavinshankar merged commit 868d635 into coronasafe:develop Mar 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rithviknishad rithviknishad rithviknishad approved these changes

@khavinshankar khavinshankar khavinshankar approved these changes

Assignees
No one assigned
Labels
needs review tested
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Replace Material UI components in src/Components/Auth/Login.tsx:
5 participants
@ayushjnv1 @gigincg @nihal467 @rithviknishad @khavinshankar