diff --git a/addons/addon-base-ui/packages/base-ui/src/parts/Login.js b/addons/addon-base-ui/packages/base-ui/src/parts/Login.js index cd4a94200d..1db23d42d1 100644 --- a/addons/addon-base-ui/packages/base-ui/src/parts/Login.js +++ b/addons/addon-base-ui/packages/base-ui/src/parts/Login.js @@ -180,82 +180,149 @@ class Login extends React.Component { const additionalLoginComponents = this.props.AdditionalLoginComponents || (() => <>); const collectUserNamePassword = this.props.authentication.shouldCollectUserNamePassword; + const borders = { margin: '0px 10px 10px', border: 'solid #2A5FA3 2px', borderRadius: '4px', padding: '10px' }; return (
- - -
{ - e.preventDefault(); - e.stopPropagation(); - }} - > - {renderAuthenticationProviders()} + + + + + + { + e.preventDefault(); + e.stopPropagation(); + }} + > + {renderAuthenticationProviders()} - {collectUserNamePassword && ( - - - {this.usernameError && ( - - )} - - )} + {collectUserNamePassword && ( + + + {this.usernameError && ( + + )} + + )} - {collectUserNamePassword && ( - - - {this.passwordError && ( - - )} - - )} + {collectUserNamePassword && ( + + + {this.passwordError && ( + + )} + + )} - - {additionalLoginComponents(this)} - + + {additionalLoginComponents(this)} + +
+ {branding.picsure.dualBranding && ( + + + +
+

+ Service Workbench +

+

Simple, accessible cloud computing & secure data storage.

+
+
+ Access to: +
    +
  • OCHIN Data (with appropriate data authorization)
  • +
  • Amazon Web Services Open Access Datasets
  • +
  • National Health and Nutrition Examination Survey Data
  • +
  • Upload your own data into the FISMA-secure environment
  • +
+
+
+ Computational environments available: +
    +
  • Rstudio
  • +
  • SageMaker (Jupyter Notebooks)
  • +
  • Linux EC2
  • +
  • Remote WIndows Desktop
  • +
+
+
+ + Learn More + +
+
+ +
+

+ PIC-SURE +

+

A self-service, easily navigable patient-level clinical data search and cohort tool.

+
+
+ Explore: +
    +
  • National Health and Nutrition Examination Survey Data
  • +
+
+
+ Export patient-level cohorts: +
    +
  • To your local machine
  • +
  • To Service Workbench
  • +
+
+
+ + Learn More + +
+
+
+
+ )}
); diff --git a/addons/addon-custom/packages/main/src/extend/withAuth.js b/addons/addon-custom/packages/main/src/extend/withAuth.js index b65bd4b18f..467660d20d 100644 --- a/addons/addon-custom/packages/main/src/extend/withAuth.js +++ b/addons/addon-custom/packages/main/src/extend/withAuth.js @@ -52,7 +52,7 @@ function RegisterLogin(enableCustomRegister) { fluid basic size="large" - className="mb2" + className="mb2 col-6 mr-auto ml-auto" onClick={handleRegister} > Register diff --git a/addons/addon-custom/packages/main/src/parts/BrandingHeader.js b/addons/addon-custom/packages/main/src/parts/BrandingHeader.js index 976e49183d..91d42dc31a 100644 --- a/addons/addon-custom/packages/main/src/parts/BrandingHeader.js +++ b/addons/addon-custom/packages/main/src/parts/BrandingHeader.js @@ -2,12 +2,10 @@ import React from 'react'; import { inject } from 'mobx-react'; import { Grid, Image, Header, Message } from 'semantic-ui-react'; -import { branding } from '@aws-ee/base-ui/dist/helpers/settings'; import { renderHTML } from '../helpers/utils'; export function BrandingHeader({ copy, assets, picsureBoxes = true, authenticationProviderPublicConfigsStore }) { - const borders = { margin: '0px 10px', border: 'solid #2A5FA3 2px', borderRadius: '4px', padding: '10px' }; const maxImageWidth = { height: 'auto', maxWidth: '350px', margin: 'auto' }; const loginBlocking = authenticationProviderPublicConfigsStore.loginBlocking || false; @@ -18,7 +16,7 @@ export function BrandingHeader({ copy, assets, picsureBoxes = true, authenticati className="animated fadeIn" style={{ maxWidth: '800px', margin: '0 auto', fontSize: '1.2em' }} > - +
@@ -33,67 +31,6 @@ export function BrandingHeader({ copy, assets, picsureBoxes = true, authenticati {renderHTML(copy.subtitle)}
- {branding.picsure.dualBranding && picsureBoxes && ( - - -
-

- Service Workbench -

-

Simple, accessible cloud computing & secure data storage.

-
-
- Access to: -
    -
  • OCHIN Data (with appropriate data authorization)
  • -
  • Amazon Web Services Open Access Datasets
  • -
  • National Health and Nutrition Examination Survey Data
  • -
  • Upload your own data into the FISMA-secure environment
  • -
-
-
- Computational environments available: -
    -
  • Rstudio
  • -
  • SageMaker (Jupyter Notebooks)
  • -
  • Linux EC2
  • -
  • Remote WIndows Desktop
  • -
-
-
- - Learn More - -
-
- -
-

- PIC-SURE -

-

A self-service, easily navigable patient-level clinical data search and cohort tool.

-
-
- Explore: -
    -
  • National Health and Nutrition Examination Survey Data
  • -
-
-
- Export patient-level cohorts: -
    -
  • To your local machine
  • -
  • To Service Workbench
  • -
-
- - Learn More - -
-
-
-
- )}