diff --git a/docs/deploy/README.md b/docs/deploy/README.md index 80302789d2..a608715735 100644 --- a/docs/deploy/README.md +++ b/docs/deploy/README.md @@ -19,7 +19,7 @@ PC such as an Intel NUC. The instructions assume that: has been cloned on the host machine. This directory is referred to as \. - the target machine where _The Combine_ is being installed will be referred to as _\_ - the user on the target machine that will be used for installing docker, etc. will be referred to as _\_. - You must be able to login to _\_ as _\_ and _\_ must have `sudo` privileges. + You must be able to log in to _\_ as _\_ and _\_ must have `sudo` privileges. ## Contents diff --git a/docs/deploy/kubernetes_design/README.md b/docs/deploy/kubernetes_design/README.md index c7dd5af5f6..0b2f1fc8d1 100644 --- a/docs/deploy/kubernetes_design/README.md +++ b/docs/deploy/kubernetes_design/README.md @@ -133,10 +133,10 @@ The following diagram shows the Kubernetes resources used to create the image pu ### Additional AWS Login Resources -| Resource | Kind | Description | -| ------------------- | --------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| aws-ecr-config | ConfigMap | `aws-ecr-config` defines the runtime configuration for AWS ECR logins. | -| aws-ecr-credentials | Secret | `aws-ecr-credentials` defines the access accounts and credentials to login to the AWS ECR service. Note that these credentials may be different than the `aws-s3-credentials` | +| Resource | Kind | Description | +| ------------------- | --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| aws-ecr-config | ConfigMap | `aws-ecr-config` defines the runtime configuration for AWS ECR logins. | +| aws-ecr-credentials | Secret | `aws-ecr-credentials` defines the access accounts and credentials to log in to the AWS ECR service. Note that these credentials may be different than the `aws-s3-credentials` | ## SSL Termination diff --git a/docs/user_guide/docs/account.md b/docs/user_guide/docs/account.md index eb79f7f8cc..e79f903355 100644 --- a/docs/user_guide/docs/account.md +++ b/docs/user_guide/docs/account.md @@ -1,6 +1,6 @@ # Account -How to sign up, login, and edit your account. +How to sign up, log in, and edit your account. ![Login](images/login.png){ .center } @@ -12,9 +12,9 @@ To create a new account, click the [SIGN UP](../sign-up) button on the Login pag The email address is used to reset your password, so there is only one account allowed per email address. -## Login +## Log In -[Login](../login) to The Combine with the username and password given at registration. +[Log in](../login) to The Combine with the username and password given at registration. If you want to change your password, click the "Forget password?" link. Follow the instructions and a password-reset will be sent to the email address associated with your account. diff --git a/src/components/LandingPage/BottomBar.tsx b/src/components/LandingPage/BottomBar.tsx index 0ab3dd03c9..84edfcb219 100644 --- a/src/components/LandingPage/BottomBar.tsx +++ b/src/components/LandingPage/BottomBar.tsx @@ -1,10 +1,11 @@ import { AppBar, Button, Grid, Toolbar, Typography } from "@material-ui/core"; +import { ReactElement } from "react"; import { Translate } from "react-localize-redux"; export const bottomBarHeight = 55; /** A bar shown at the bottom of the landing page. */ -export default function BottomBar() { +export default function BottomBar(): ReactElement { const { REACT_APP_VERSION } = process.env; return (
diff --git a/src/components/LandingPage/LandingButtons.tsx b/src/components/LandingPage/LandingButtons.tsx index 77d5ea6d44..083a738086 100644 --- a/src/components/LandingPage/LandingButtons.tsx +++ b/src/components/LandingPage/LandingButtons.tsx @@ -1,4 +1,5 @@ import { Button, Card, Grid, Typography } from "@material-ui/core"; +import { ReactElement } from "react"; import { Translate } from "react-localize-redux"; import history, { openUserGuide, Path } from "browserHistory"; @@ -19,7 +20,9 @@ interface LandingButtonsProps { top?: boolean; } -export default function LandingButtons(props: LandingButtonsProps) { +export default function LandingButtons( + props: LandingButtonsProps +): ReactElement { return ( - history.push(Path.SignUp)} - textId="login.signUp" - buttonId={`${idAffix}-signUp`} - /> + history.push(Path.Login)} textId="login.login" @@ -53,21 +52,31 @@ export default function LandingButtons(props: LandingButtonsProps) { ); } +interface SignUpButtonProps { + buttonIdPrefix?: string; +} +export function SignUpButton(props: SignUpButtonProps): ReactElement { + return ( + history.push(Path.SignUp)} + textId="login.signUp" + buttonId={`${props.buttonIdPrefix ?? idAffix}-signUp`} + filled + /> + ); +} + interface LandingButtonProps { onClick: () => void; textId: string; buttonId: string; + filled?: boolean; } -function LandingButton(props: LandingButtonProps) { +function LandingButton(props: LandingButtonProps): ReactElement { return ( - +