Skip to content

Commit

Permalink
Merge branch 'main' into js-129-change-datepicker-lib
Browse files Browse the repository at this point in the history
  • Loading branch information
jasalisbury committed Nov 6, 2020
2 parents 1c62c78 + c3ab233 commit 34a5592
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ parameters:
default: "main"
type: string
sandbox_git_branch: # change to feature branch to test deployment
default: "js-79-logout-on-inactive"
default: "js-79-pr-feedback"
type: string
jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions frontend/.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BACKEND_PROXY=http://localhost:8080
REACT_APP_INACTIVE_MODAL_TIMEOUT=60000
REACT_APP_SESSION_TIMEOUT=120000
REACT_APP_INACTIVE_MODAL_TIMEOUT=1500000
REACT_APP_SESSION_TIMEOUT=1800000
7 changes: 7 additions & 0 deletions frontend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ There are yarn commands for starting/testing/linting the frontend defined a dire
| `yarn lint` | Run the linter |
| `yarn lint:ci` | Run the linter outputting results to xml files |

## Build Environment Variables

| Variable | Description |
|-|-|
| `REACT_APP_INACTIVE_MODAL_TIMEOUT` | Amount of time before the "Idle Logout" modal is shown to a user, in milliseconds |
| `REACT_APP_SESSION_TIMEOUT` | Amount of time before an inactive user is automatically logged out |

## Create React App

This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/components/IdleModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ function IdleModal({ modalTimeout, logoutTimeout, logoutUser }) {
{ timeToLogoutMsg }
{' '}
unless you become active again.
<span className="usa-sr-only">
Press any key to continue your session
</span>
</Alert>
</Modal>
));
Expand Down

0 comments on commit 34a5592

Please sign in to comment.