- 
+
{APP_TITLE}
@@ -112,42 +116,66 @@ export const Footer = (): React.ReactElement => { -
+ <Agency Contact Center>
++ <Agency Contact Center> +
diff --git a/src/app/components/header/header.test.tsx b/src/components/header/header.test.tsx similarity index 99% rename from src/app/components/header/header.test.tsx rename to src/components/header/header.test.tsx index 1201a85..15761c2 100644 --- a/src/app/components/header/header.test.tsx +++ b/src/components/header/header.test.tsx @@ -1,12 +1,11 @@ -import React from 'react'; import { act, render, screen } from '@testing-library/react'; -import { BrowserRouter } from 'react-router-dom'; import userEvent from '@testing-library/user-event'; +import { BrowserRouter } from 'react-router-dom'; -import { Header } from './header'; import { RecoilRoot } from 'recoil'; import * as useAuthMock from '../../hooks/use-auth'; import { User } from '../../types/user'; +import { Header } from './header'; describe('Header', () => { const headerComponent = ( diff --git a/src/app/components/header/header.tsx b/src/components/header/header.tsx similarity index 88% rename from src/app/components/header/header.tsx rename to src/components/header/header.tsx index 9d1aab6..a52b7b4 100644 --- a/src/app/components/header/header.tsx +++ b/src/components/header/header.tsx @@ -1,9 +1,9 @@ -import React, { useState, useEffect, SyntheticEvent } from 'react'; -import { Link, NavLink, useNavigate, useLocation } from 'react-router-dom'; import { Banner, Icon, Search } from '@metrostar/comet-uswds'; +import { APP_TITLE } from '@src/utils/constants'; import navigation from '@uswds/uswds/js/usa-header'; +import React, { SyntheticEvent, useEffect, useState } from 'react'; +import { Link, NavLink, useLocation, useNavigate } from 'react-router-dom'; import useAuth from '../../hooks/use-auth'; -import { APP_TITLE } from '../../constants'; export const Header = (): React.ReactElement => { const [showMenu, setShowMenu] = useState(false); @@ -64,7 +64,11 @@ export const Header = (): React.ReactElement => {
diff --git a/src/app/pages/dashboard/types.ts b/src/pages/dashboard/types.ts
similarity index 100%
rename from src/app/pages/dashboard/types.ts
rename to src/pages/dashboard/types.ts
diff --git a/src/app/pages/details/details.test.tsx b/src/pages/details/details.test.tsx
similarity index 92%
rename from src/app/pages/details/details.test.tsx
rename to src/pages/details/details.test.tsx
index fc36739..787072e 100644
--- a/src/app/pages/details/details.test.tsx
+++ b/src/pages/details/details.test.tsx
@@ -1,13 +1,12 @@
-import React from 'react';
-import { render, act } from '@testing-library/react';
+import axios from '@src/utils/axios';
+import { act, render } from '@testing-library/react';
+import MockAdapter from 'axios-mock-adapter';
import { BrowserRouter } from 'react-router-dom';
-import { Details } from './details';
import { RecoilRoot } from 'recoil';
-import MockAdapter from 'axios-mock-adapter';
-import * as useAuthMock from '../../hooks/use-auth';
-import axios from '../../axios';
import { launchData } from '../../data/launch';
+import * as useAuthMock from '../../hooks/use-auth';
import { User } from '../../types/user';
+import { Details } from './details';
jest.mock('react-router-dom', () => ({
...jest.requireActual('react-router-dom'),
@@ -50,7 +49,9 @@ describe('Details', () => {
await act(async () => {
expect(baseElement).toBeTruthy();
});
- expect(baseElement.querySelector('h1')?.textContent).toEqual('Launch Details');
+ expect(baseElement.querySelector('h1')?.textContent).toEqual(
+ 'Launch Details',
+ );
expect(baseElement.querySelectorAll('#details-card li')).toHaveLength(5);
});
@@ -66,7 +67,9 @@ describe('Details', () => {
await act(async () => {
expect(baseElement).toBeTruthy();
});
- expect(baseElement.querySelector('h1')?.textContent).toEqual('Launch Details');
+ expect(baseElement.querySelector('h1')?.textContent).toEqual(
+ 'Launch Details',
+ );
expect(baseElement.querySelector('.usa-alert')).toBeDefined();
expect(baseElement.querySelector('.usa-alert--error')).toBeDefined();
});
diff --git a/src/app/pages/details/details.tsx b/src/pages/details/details.tsx
similarity index 98%
rename from src/app/pages/details/details.tsx
rename to src/pages/details/details.tsx
index 9ac26e5..e7da803 100644
--- a/src/app/pages/details/details.tsx
+++ b/src/pages/details/details.tsx
@@ -1,11 +1,11 @@
+import { Spinner } from '@metrostar/comet-extras';
+import { Card } from '@metrostar/comet-uswds';
import React, { useEffect, useState } from 'react';
import { useParams } from 'react-router-dom';
-import { Card } from '@metrostar/comet-uswds';
-import { Spinner } from '@metrostar/comet-extras';
-import { Launch } from '../../types/launch';
+import ErrorNotification from '../../components/error-notification/error-notification';
import useApi from '../../hooks/use-api';
import useAuth from '../../hooks/use-auth';
-import ErrorNotification from '../../components/error-notification/error-notification';
+import { Launch } from '../../types/launch';
export const Details = (): React.ReactElement => {
const { id } = useParams();
@@ -17,7 +17,7 @@ export const Details = (): React.ReactElement => {
if (isSignedIn && id) {
getItem(id);
}
- }, [isSignedIn, id]);
+ }, [isSignedIn, id, getItem]);
useEffect(() => {
if (item) {
diff --git a/src/app/pages/home/home.test.tsx b/src/pages/home/home.test.tsx
similarity index 90%
rename from src/app/pages/home/home.test.tsx
rename to src/pages/home/home.test.tsx
index fe570af..ebdc80e 100644
--- a/src/app/pages/home/home.test.tsx
+++ b/src/pages/home/home.test.tsx
@@ -1,10 +1,9 @@
-import React from 'react';
-import { render, act } from '@testing-library/react';
+import { act, render } from '@testing-library/react';
import { BrowserRouter } from 'react-router-dom';
-import * as useAuthMock from '../../hooks/use-auth';
-import { Home } from './home';
import { RecoilRoot } from 'recoil';
+import * as useAuthMock from '../../hooks/use-auth';
import { User } from '../../types/user';
+import { Home } from './home';
describe('Home', () => {
test('should render successfully', () => {
@@ -16,7 +15,9 @@ describe('Home', () => {
,
);
expect(baseElement).toBeTruthy();
- expect(baseElement.querySelector('h1')?.textContent).toEqual('Welcome Guest');
+ expect(baseElement.querySelector('h1')?.textContent).toEqual(
+ 'Welcome Guest',
+ );
});
test('should render with mock data', async () => {
@@ -37,6 +38,8 @@ describe('Home', () => {
await act(async () => {
expect(baseElement).toBeTruthy();
});
- expect(baseElement.querySelector('h1')?.textContent).toEqual('Welcome John Doe');
+ expect(baseElement.querySelector('h1')?.textContent).toEqual(
+ 'Welcome John Doe',
+ );
});
});
diff --git a/src/app/pages/home/home.tsx b/src/pages/home/home.tsx
similarity index 75%
rename from src/app/pages/home/home.tsx
rename to src/pages/home/home.tsx
index 9aeb369..73754d1 100644
--- a/src/app/pages/home/home.tsx
+++ b/src/pages/home/home.tsx
@@ -1,7 +1,7 @@
+import { Alert } from '@metrostar/comet-uswds';
+import { getDisplayName } from '@src/utils/auth';
import React from 'react';
import useAuth from '../../hooks/use-auth';
-import { Alert } from '@metrostar/comet-uswds';
-import { getDisplayName } from '../../helpers/auth';
export const Home = (): React.ReactElement => {
const { isSignedIn, currentUserData } = useAuth();
@@ -9,14 +9,18 @@ export const Home = (): React.ReactElement => {
{!isSignedIn && (
- You are not currently signed in. Please Sign In to access the Dashboard.
+ You are not currently signed in. Please Sign In to access the
+ Dashboard.
diff --git a/src/app/pages/sign-in/sign-in.test.tsx b/src/pages/sign-in/sign-in.test.tsx
similarity index 81%
rename from src/app/pages/sign-in/sign-in.test.tsx
rename to src/pages/sign-in/sign-in.test.tsx
index 0d0758f..c563fd1 100644
--- a/src/app/pages/sign-in/sign-in.test.tsx
+++ b/src/pages/sign-in/sign-in.test.tsx
@@ -1,12 +1,11 @@
-import React from 'react';
import { act, render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { BrowserRouter } from 'react-router-dom';
-import { SignIn } from './sign-in';
import { RecoilRoot } from 'recoil';
import * as useAuthMock from '../../hooks/use-auth';
import { User } from '../../types/user';
+import { SignIn } from './sign-in';
describe('SignIn', () => {
const signInComponent = (
@@ -24,21 +23,27 @@ describe('SignIn', () => {
test('should simulate a login attempt with blank fields', async () => {
const { baseElement } = render(signInComponent);
- await userEvent.click(screen.getByText('Sign In', { selector: 'button[type=submit]' }));
+ await userEvent.click(
+ screen.getByText('Sign In', { selector: 'button[type=submit]' }),
+ );
expect(baseElement.querySelectorAll('.usa-error-message').length).toBe(2);
});
test('should simulate a login attempt with blank username', async () => {
const { baseElement } = render(signInComponent);
await userEvent.type(screen.getByLabelText('Password'), 'b');
- await userEvent.click(screen.getByText('Sign In', { selector: 'button[type=submit]' }));
+ await userEvent.click(
+ screen.getByText('Sign In', { selector: 'button[type=submit]' }),
+ );
expect(baseElement.querySelectorAll('.usa-error-message').length).toBe(1);
});
test('should simulate a login attempt with blank password', async () => {
const { baseElement } = render(signInComponent);
await userEvent.type(screen.getByLabelText('Username'), 'a');
- await userEvent.click(screen.getByText('Sign In', { selector: 'button[type=submit]' }));
+ await userEvent.click(
+ screen.getByText('Sign In', { selector: 'button[type=submit]' }),
+ );
expect(baseElement.querySelectorAll('.usa-error-message').length).toBe(1);
});
@@ -56,7 +61,9 @@ describe('SignIn', () => {
await userEvent.type(screen.getByLabelText('Password'), 'b');
await act(async () => {
- await userEvent.click(screen.getByText('Sign In', { selector: 'button[type=submit]' }));
+ await userEvent.click(
+ screen.getByText('Sign In', { selector: 'button[type=submit]' }),
+ );
});
expect(baseElement.querySelectorAll('.usa-error-message').length).toBe(0);
});
@@ -75,7 +82,9 @@ describe('SignIn', () => {
await userEvent.type(screen.getByLabelText('Password'), 'b');
await act(async () => {
- await userEvent.click(screen.getByText('Sign In', { selector: 'button[type=submit]' }));
+ await userEvent.click(
+ screen.getByText('Sign In', { selector: 'button[type=submit]' }),
+ );
});
expect(baseElement.querySelectorAll('.usa-error-message').length).toBe(0);
});
@@ -94,14 +103,18 @@ describe('SignIn', () => {
await userEvent.type(screen.getByLabelText('Password'), 'b');
await act(async () => {
- await userEvent.click(screen.getByText('Sign In', { selector: 'button[type=submit]' }));
+ await userEvent.click(
+ screen.getByText('Sign In', { selector: 'button[type=submit]' }),
+ );
});
expect(baseElement.querySelectorAll('.usa-alert').length).toBe(1);
});
test('should cancel a login attempt', async () => {
const { baseElement } = render(signInComponent);
- await userEvent.click(screen.getByText('Cancel', { selector: 'button[type=button]' }));
+ await userEvent.click(
+ screen.getByText('Cancel', { selector: 'button[type=button]' }),
+ );
expect(baseElement.querySelectorAll('.usa-error-message').length).toBe(0);
});
});
diff --git a/src/app/pages/sign-in/sign-in.tsx b/src/pages/sign-in/sign-in.tsx
similarity index 85%
rename from src/app/pages/sign-in/sign-in.tsx
rename to src/pages/sign-in/sign-in.tsx
index 9498b03..f8c7c66 100644
--- a/src/app/pages/sign-in/sign-in.tsx
+++ b/src/pages/sign-in/sign-in.tsx
@@ -1,16 +1,16 @@
-import React, { FormEvent, useEffect, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
import {
+ Alert,
+ Button,
+ ButtonGroup,
+ ErrorMessages,
Form,
FormGroup,
Label,
TextInput,
- Button,
- Alert,
- ErrorMessages,
- ButtonGroup,
} from '@metrostar/comet-uswds';
-import { REQUIRED_FIELD_MESSAGE } from '../../constants';
+import { REQUIRED_FIELD_MESSAGE } from '@src/utils/constants';
+import React, { FormEvent, useEffect, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
import useAuth from '../../hooks/use-auth';
export const SignIn = (): React.ReactElement => {
@@ -27,7 +27,7 @@ export const SignIn = (): React.ReactElement => {
setHasLoginError(false);
navigate('/');
}
- }, [isSignedIn]);
+ }, [isSignedIn, navigate]);
useEffect(() => {
if (error) {
@@ -37,8 +37,12 @@ export const SignIn = (): React.ReactElement => {
const handleLogin = (event: FormEvent): void => {
event.preventDefault();
- username === '' ? setUsernameErrors([REQUIRED_FIELD_MESSAGE]) : setUsernameErrors([]);
- password === '' ? setPasswordErrors([REQUIRED_FIELD_MESSAGE]) : setPasswordErrors([]);
+ username === ''
+ ? setUsernameErrors([REQUIRED_FIELD_MESSAGE])
+ : setUsernameErrors([]);
+ password === ''
+ ? setPasswordErrors([REQUIRED_FIELD_MESSAGE])
+ : setPasswordErrors([]);
if (username.length === 0 || password.length === 0) {
setHasLoginError(true);
@@ -94,7 +98,12 @@ export const SignIn = (): React.ReactElement => {
-
-