Skip to content

Commit

Permalink
Merge dev to main for uat-2024-10-17 release
Browse files Browse the repository at this point in the history
Merge pull request #167 from onc-healthit/dev
  • Loading branch information
drbgfc authored Oct 17, 2024
2 parents 684f48b + c186a62 commit 7a2af01
Show file tree
Hide file tree
Showing 74 changed files with 4,111 additions and 1,338 deletions.
7 changes: 6 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,10 @@ NEXT_PUBLIC_CCDA_VALIDATOR_CURES_DOWNLOAD_URL=https://codeload.github.com/onc-he
NEXT_PUBLIC_RELEASE_VERSION_URL=https://raw.githubusercontent.com/onc-healthit/site-content/master/site-ui-4/version.md
NEXT_PUBLIC_RELEASE_DATE_URL=https://raw.githubusercontent.com/onc-healthit/site-content/master/site-ui-4/release-date.md

# TODO: Allow for this to be dynamic per environment file and delete from here. See: https://phase.dev/blog/nextjs-public-runtime-variables/
# TODO: Allow for these to be dynamic per environment file and delete from here.
# For now though, these are STATIC as this file is injected in the build,
# and NEXT_PUBLIC env vars are not overridden by other env file definitions
# See: https://phase.dev/blog/nextjs-public-runtime-variables/
NEXT_PUBLIC_IS_DEBUG_MODE=false
NEXT_PUBLIC_IS_EVENT_TRACKING=true
NEXT_PUBLIC_SCORECARD_SAVESCORECARDSERVICE_API=https://ccda.healthit.gov/scorecard/savescorecardservice
88 changes: 44 additions & 44 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"dompurify": "^3.1.6",
"lodash": "^4.17.21",
"marked": "^12.0.2",
"next": "14.2.3",
"next": "14.2.13",
"next-auth": "^4.24.7",
"nookies": "^2.5.2",
"react": "^18",
Expand Down
Binary file added public/certificates/xdr-tls/keyAndCert.zip
Binary file not shown.
Binary file added public/shared/LogoBackgroundImage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/shared/ONCLogo-backgroundImage.png
Binary file not shown.
46 changes: 36 additions & 10 deletions public/shared/SITEWhiteLogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 36 additions & 9 deletions public/shared/site-nav-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions src/app/account/changepassword/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react'
import ChangePasswordHome from '@/components/account/ChangePasswordHome'

const ChangePassword = () => {
return (
<>
<ChangePasswordHome />
</>
)
}

export default ChangePassword
12 changes: 12 additions & 0 deletions src/app/account/info/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react'
import InfoHome from '@/components/account/InfoHome'

const AccountInfo = () => {
return (
<>
<InfoHome />
</>
)
}

export default AccountInfo
2 changes: 1 addition & 1 deletion src/assets/SMTPTestCases.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2468,14 +2468,14 @@ const testCases = {
sutHisp: true,
criteria: "['h2-6']",
sutEdge: false,
ccdaFileRequired: true,
fields: [
{
label: 'C-CDA Document Type',
name: 'ccdaReferenceFilename',
datatype: 'CCDAWidget',
value: 'ccdaReferenceFilename',
readOnly: false,
ccdaFileRequired: true,
display: true,
},
],
Expand Down
Loading

0 comments on commit 7a2af01

Please sign in to comment.