Skip to content
This repository has been archived by the owner on Jan 16, 2022. It is now read-only.

Commit

Permalink
feat: new not found component (#170)
Browse files Browse the repository at this point in the history
* refactor: updated not found component

* chore: removed react-router

* refactored: applied feedbacks

* fix: removed doc folder

* refactor: rollback yarn.lock
  • Loading branch information
priscilawebdev authored and juanpicado committed Oct 12, 2019
1 parent 7529c02 commit fdbdb63
Show file tree
Hide file tree
Showing 10 changed files with 72 additions and 86 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ Dockerfile
*.html
*.scss
*.png
doc
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ npm-debug.log
verdaccio-*.tgz
.DS_Store
build/
doc

###
node_modules
package-lock.json
Expand Down
66 changes: 30 additions & 36 deletions src/components/NotFound/NotFound.tsx
Original file line number Diff line number Diff line change
@@ -1,53 +1,47 @@
import ListItem from '@material-ui/core/ListItem';
import Box from '@material-ui/core/Box';
import Typography from '@material-ui/core/Typography';
import withWidth, { isWidthUp, WithWidthProps } from '@material-ui/core/withWidth';
import styled from 'react-emotion';
import React, { useCallback } from 'react';
import { RouteComponentProps, withRouter } from 'react-router-dom';
import { useHistory } from 'react-router-dom';

import Button from '../../muiComponents/Button';
import colors from '../../utils/styles/colors';
import { spacings } from '../../utils/styles/spacings';

import PackageImg from './img/package.svg';
import { Card, EmptyPackage, Heading, Inner, List, Wrapper } from './styles';

export const NOT_FOUND_TEXT = `Sorry, we couldn't find it...`;
export const LABEL_NOT_FOUND = `The page you're looking for doesn't exist.`;
export const LABEL_FOOTER_NOT_FOUND = 'Perhaps these links will help find what you are looking for:';
export const NOT_FOUND_TEXT = "Sorry, we couldn't find it...";
export const LABEL_NOT_FOUND = "The page you're looking for doesn't exist.";
export const GO_TO_HOME_PAGE = 'Go to the home page';

export type NotFoundProps = RouteComponentProps & WithWidthProps;
const EmptyPackage = styled('img')({
width: '150px',
margin: '0 auto',
});

const HOME_LABEL = 'Home';
const StyledHeading = styled(Typography)({
color: colors.primary,
marginBottom: spacings.sm,
});

const renderSubTitle = (): JSX.Element => (
<Typography variant="subtitle1">
<div>{LABEL_NOT_FOUND}</div>
<div>{LABEL_FOOTER_NOT_FOUND}</div>
</Typography>
);
const NotFound: React.FC = () => {
const history = useHistory();

const NotFound: React.FC<NotFoundProps> = ({ history, width }) => {
const handleGomHome = useCallback(() => {
history.push('/');
}, [history]);

const renderList = (): JSX.Element => (
<List>
<ListItem button={true} divider={true} onClick={handleGomHome}>
{HOME_LABEL}
</ListItem>
</List>
);

/* eslint-disable @typescript-eslint/no-non-null-assertion */
return (
<Wrapper data-testid="404">
<Inner>
<EmptyPackage alt="404 - Page not found" src={PackageImg} />
<Heading className="not-found-text" variant={isWidthUp('sm', width!) ? 'h2' : 'h4'}>
{NOT_FOUND_TEXT}
</Heading>
{renderSubTitle()}
<Card>{renderList()}</Card>
</Inner>
</Wrapper>
<Box alignItems="center" data-testid="404" display="flex" flexDirection="column" flexGrow={1} justifyContent="center" p={2}>
<EmptyPackage alt="404 - Page not found" src={PackageImg} />
<StyledHeading className="not-found-text" variant="h4">
{NOT_FOUND_TEXT}
</StyledHeading>
<Button onClick={handleGomHome} variant="contained">
{GO_TO_HOME_PAGE}
</Button>
</Box>
);
};

export default withRouter<NotFoundProps, React.ComponentType<NotFoundProps>>(withWidth()(NotFound));
export default NotFound;
9 changes: 4 additions & 5 deletions src/components/NotFound/Notfound.test.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
import React from 'react';
import { BrowserRouter as Router } from 'react-router-dom';
import { shallow } from 'enzyme';
import { render } from '@testing-library/react';

import NotFound from './NotFound';

console.error = jest.fn();

describe('<NotFound /> component', () => {
test('should load the component in default state', () => {
const routerWrapper = shallow(
const { container } = render(
<Router>
<NotFound />
</Router>
);
expect(routerWrapper.find(NotFound)).toMatchSnapshot();
expect(container.firstChild).toMatchSnapshot();
});
test.todo('Test Button Click');
});
32 changes: 31 additions & 1 deletion src/components/NotFound/__snapshots__/Notfound.test.tsx.snap
Original file line number Diff line number Diff line change
@@ -1,3 +1,33 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`<NotFound /> component should load the component in default state 1`] = `<withRouter(WithWidth(NotFound)) />`;
exports[`<NotFound /> component should load the component in default state 1`] = `
<div
class="MuiBox-root MuiBox-root-2"
data-testid="404"
>
<img
alt="404 - Page not found"
class="css-17y48z2 emotion-0"
src="[object Object]"
/>
<h4
class="MuiTypography-root not-found-text css-7pe7kh emotion-1 MuiTypography-h4"
>
Sorry, we couldn't find it...
</h4>
<button
class="MuiButtonBase-root MuiButton-root MuiButton-contained"
tabindex="0"
type="button"
>
<span
class="MuiButton-label"
>
Go to the home page
</span>
<span
class="MuiTouchRipple-root"
/>
</button>
</div>
`;
2 changes: 1 addition & 1 deletion src/components/NotFound/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from './NotFound';
export { default, NOT_FOUND_TEXT } from './NotFound';
41 changes: 0 additions & 41 deletions src/components/NotFound/styles.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/components/Versions/Versions.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { mount } from 'enzyme';
import { MemoryRouter } from 'react-router';
import { MemoryRouter } from 'react-router-dom';
import { render, cleanup } from '@testing-library/react';

import { DetailContext, DetailContextProps } from '../../pages/Version';
Expand Down
1 change: 1 addition & 0 deletions src/utils/styles/spacings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@

export const spacings = {
lg: '30px',
sm: '16px',
};
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14023,4 +14023,4 @@ yup@^0.27.0:
lodash "^4.17.11"
property-expr "^1.5.0"
synchronous-promise "^2.0.6"
toposort "^2.0.2"
toposort "^2.0.2"

0 comments on commit fdbdb63

Please sign in to comment.