Update RingdownForm.js #288
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Restructure
fwextensions
requested changes
Apr 5, 2023
client/src/EMS/RingdownForm.js
Outdated
| <fieldset className="usa-fieldset border-top border-base-lighter"> | ||
| {step === 0 && <PatientFields onChange={onChange} ringdown={ringdown} />} |
There was a problem hiding this comment.
Can you combine this with the next block, so there's just one step === 0 check? The PatientFields will probably need to go into the fragment. Same with step 1.
fwextensions
approved these changes
Apr 6, 2023
|
Thanks for fixing this! Wouldn't have thought it would be such a simple change, but it works great. |
holliskuang
added a commit
that referenced
this pull request
Apr 6, 2023
francisli
added a commit
that referenced
this pull request
May 11, 2023
* Create Email Transporter Object Create Email Object that uses takes gmail email and password from .env || SendMail function takes in (recipient email, email subject, and email contact) parameters to send out an email * Update isAuthenticated to involve 2fa User needs session two be authenticated in order to proceed. * Add 2fa routing Route to email authentication page utilizing time-based one time password to authenticate * Adding ToTP Generator 1. Take in Request 2. Generate token and key 3. Send Token to Email 4. Save Key in Request for Authentication * Create Two Factor View * Nodemail log-in var * Update local.js * Update RingdownForm.js (#288) (#290) * Update RingdownForm.js * Prettier * prettier * cicd * redirects when authenticated * cicd * Making generateToTP a reusable function * Switched from notp to OTPAuth * Save Token to Database instead of Session * MailCatcher up and Running! * Link logo to send to user back to Login from 2fa * turn sendEmail into a separate function * WIP * Migration for TwoFactorAuth * rector ssodata to twofactordata * correcting JSON formatting * Playwright Tests * Tests! * Test edits * yml * Fix typo in package.json script * Fix formatting * eslint & migration * Commented out home page tests * prettier * Remove previous addition of Auth-Related Columns * Adding two Factor Flow to all tests * Put 2fa for tests into helper fx for cleaner code * Parameterize SMTP settings, update example.env * Refactoring * refactoring, adding else statement before next() * Code style changes --------- Co-authored-by: holliskuang <[email protected]> Co-authored-by: Francis Li <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reformatted how the Field/Selection components were structured
When the SelectHospital button is selected, the focus jumps to the buttons and seems to remain there for the newly rendered components.
Currently, it is set up as:
{(Step 0) render }
{(Step 1) render }
{(Step 0) render }
{(Step 1) render }
A solution may be to restructure the Step 0s together, then the Step 1s together.
{(Step 0) render }
{(Step 0) render }
{(Step 1) render }
{(Step 1) render }
Therefore, when the Select Hospital Button is clicked, the next tab will naturally be the Hospital Selections without having to mess with tabIndex. Unsure if there are any unintended consequences with this, but everything seems to work fine on my side.