This commit is contained in:
Krists Kreics 2020-03-01 19:30:02 +02:00 коммит произвёл Maciej Gurban
Родитель 66cdd325e3
Коммит da76f421c2
16 изменённых файлов: 15395 добавлений и 10792 удалений

Просмотреть файл

@ -1,3 +1,31 @@
# React frontend assignment
## Description
Your task is to implement a component or a set of components allowing the users to fetch and display change history of **users** and **projects** in separate tables according to the designs and requirements below. Please provide unit tests for your code.
## Requirements
- Handle the loading state
- Handle the error state (every second call to fetch users or projects will result in an error)
- Make sure the table can be browsed also on smaller screens
- By default table data should be sorted in reverse chronological order (newest first)
- Users should be able to sort by the **Date** column only and be able to toggle between reverse chronological and chronological order
- After fetching new entries, table should be re-sorted according to currently selected sorting order
## Screenshots
### Default state
![Screen Shot 2020-03-03 at 13 25 01](https://user-images.githubusercontent.com/3663640/75771396-919e6600-5d52-11ea-96db-7a6c5e71c780.png)
### Loading state
![Screen Shot 2020-03-03 at 13 25 16](https://user-images.githubusercontent.com/3663640/75771400-93682980-5d52-11ea-9439-dfeea61e24a4.png)
### Error state
![Screen Shot 2020-03-03 at 13 25 09](https://user-images.githubusercontent.com/3663640/75771398-92cf9300-5d52-11ea-8d06-660cd55bb1a1.png)
# Setup
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
## Available Scripts
@ -16,53 +44,3 @@ You will also see any lint errors in the console.
Launches the test runner in the interactive watch mode.<br />
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
### `yarn build`
Builds the app for production to the `build` folder.<br />
It correctly bundles React in production mode and optimizes the build for the best performance.
The build is minified and the filenames include the hashes.<br />
Your app is ready to be deployed!
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
### `yarn eject`
**Note: this is a one-way operation. Once you `eject`, you cant go back!**
If you arent satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point youre on your own.
You dont have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldnt feel obligated to use this feature. However we understand that this tool wouldnt be useful if you couldnt customize it when you are ready for it.
## Learn More
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
To learn React, check out the [React documentation](https://reactjs.org/).
### Code Splitting
This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting
### Analyzing the Bundle Size
This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size
### Making a Progressive Web App
This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app
### Advanced Configuration
This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration
### Deployment
This section has moved here: https://facebook.github.io/create-react-app/docs/deployment
### `yarn build` fails to minify
This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify

15148
package-lock.json сгенерированный Normal file

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -3,11 +3,10 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
"react": "^16.13.0",
"react-dom": "^16.13.0",
"@material-ui/core": "4.9.5",
"@material-ui/icons": "4.9.1",
"react": "16.13.0",
"react-dom": "16.13.0",
"react-scripts": "3.4.0"
},
"scripts": {
@ -30,5 +29,9 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.2"
}
}

Просмотреть файл

@ -1,38 +0,0 @@
.App {
text-align: center;
}
.App-logo {
height: 40vmin;
pointer-events: none;
}
@media (prefers-reduced-motion: no-preference) {
.App-logo {
animation: App-logo-spin infinite 20s linear;
}
}
.App-header {
background-color: #282c34;
min-height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
}
.App-link {
color: #61dafb;
}
@keyframes App-logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}

Просмотреть файл

@ -1,26 +0,0 @@
import React from 'react';
import logo from './logo.svg';
import './App.css';
function App() {
return (
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<p>
Edit <code>src/App.js</code> and save to reload.
</p>
<a
className="App-link"
href="https://reactjs.org"
target="_blank"
rel="noopener noreferrer"
>
Learn React
</a>
</header>
</div>
);
}
export default App;

Просмотреть файл

@ -1,9 +0,0 @@
import React from 'react';
import { render } from '@testing-library/react';
import App from './App';
test('renders learn react link', () => {
const { getByText } = render(<App />);
const linkElement = getByText(/learn react/i);
expect(linkElement).toBeInTheDocument();
});

27
src/components/App.js Normal file
Просмотреть файл

@ -0,0 +1,27 @@
import React from 'react';
import api from '../lib/api';
import Button from '@material-ui/core/Button';
import Typography from '@material-ui/core/Typography';
import Container from '@material-ui/core/Container';
import Box from '@material-ui/core/Box';
const fetchData = async () => {
const result = await api.getUsersDiff();
console.log(result);
};
export const App = () => {
return (
<Container className="app" fixed>
<Box data-testid="app-box" m={2}>
<Typography>Your app should show up here.</Typography>
{/* Just a dummy fetcher to show how the api should be used, this should be removed */}
<Button variant="contained" color="primary" onClick={fetchData}>
Test data fetch
</Button>
</Box>
</Container>
);
};
export default App;

Просмотреть файл

@ -0,0 +1,17 @@
import React from 'react';
import { shallow } from 'enzyme';
import { App } from './App';
describe('<App />', () => {
let wrapper;
beforeEach(() => {
wrapper = shallow(<App />);
});
describe('render()', () => {
it('renders the Box', () => {
expect(wrapper.find({ 'data-testid': 'app-box' })).toHaveLength(1);
});
});
});

Просмотреть файл

@ -1,13 +0,0 @@
body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
monospace;
}

Просмотреть файл

@ -1,12 +1,5 @@
import React from 'react';
import ReactDOM from 'react-dom';
import './index.css';
import App from './App';
import * as serviceWorker from './serviceWorker';
import App from './components/App';
ReactDOM.render(<App />, document.getElementById('root'));
// If you want your app to work offline and load faster, you can change
// unregister() to register() below. Note this comes with some pitfalls.
// Learn more about service workers: https://bit.ly/CRA-PWA
serviceWorker.unregister();

110
src/lib/api/data.js Normal file
Просмотреть файл

@ -0,0 +1,110 @@
export const usersDiff = [
{
id: 'e28d290a-a2f2-48c2-9001-ff43884e271b',
timestamp: new Date('2020/2/14').getTime(),
diff: [
{ field: 'name', oldValue: 'John', newValue: 'Bruce' },
],
},
{
id: '8bd0166f-f0c6-48fd-9fcd-a17e76eb1e92',
timestamp: new Date('2020/2/15').getTime(),
diff: [
{ field: 'name', oldValue: 'Bruce', newValue: 'Nick' },
],
},
{
id: '0a75a2b3-be64-4aeb-ba4c-8ddb913791ac',
timestamp: new Date('2020/2/16').getTime(),
diff: [
{ field: 'name', oldValue: 'Nick', newValue: 'Michel' },
],
},
{
id: 'bf008d15-3d34-422e-9041-039c59d9ed3d',
timestamp: new Date('2020/2/17').getTime(),
diff: [
{ field: 'name', oldValue: 'Michel', newValue: 'Michael' },
],
},
{
id: '2a83c13c-c040-4672-9b7b-c004ce614264',
timestamp: new Date('2020/2/18').getTime(),
diff: [
{ field: 'name', oldValue: 'Michael', newValue: 'Constantine Prescott Nathaniel Jr.' },
],
},
{
id: 'bb177085-7340-4cf7-a892-f436f20951e2',
timestamp: new Date('2020/2/19').getTime(),
diff: [
{ field: 'name', oldValue: 'Constantine Prescott Nathaniel Jr.', newValue: 'Constantine Prescott Nathaniel Sr.' },
],
},
{
id: '67f06020-95b3-484d-8713-36584c79e94a',
timestamp: new Date('2020/2/22').getTime(),
diff: [
{ field: 'name', oldValue: 'Constantine P. N.', newValue: 'Joe' },
],
},
{
id: '57c1fd5d-a11c-433c-8820-a79bbffe6e60',
timestamp: new Date('2020/2/23').getTime(),
diff: [
{ field: 'name', oldValue: 'Joe', newValue: 'Mo' },
],
},
{
id: 'e9bccea8-bb28-4d0e-9bac-4c09122ad5b4',
timestamp: new Date('2020/2/20').getTime(),
diff: [
{ field: 'name', oldValue: 'Constantine Prescott Nathaniel Sr.', newValue: 'Constantine P. N. Sr.' },
],
},
{
id: '08283466-883a-4506-90ac-ab85c3f27ab3',
timestamp: new Date('2020/2/21').getTime(),
diff: [
{ field: 'name', oldValue: 'Constantine P. N. Sr.', newValue: 'Constantine P. N.' },
],
},
];
export const projectsDiff = [
{
id: '01fa742c-b2d0-416a-9394-a0a5dc8bc13e',
timestamp: new Date('2020/2/15').getTime(),
diff: [
{ field: 'name', oldValue: 'Angrier Birds', newValue: 'Angry Birds 2' },
],
},
{
id: '7ba38998-0247-4de9-a3d8-e20cf736e834',
timestamp: new Date('2020/2/14').getTime(),
diff: [
{ field: 'name', oldValue: 'Angry Birds', newValue: 'Angrier Birds' },
],
},
{
id: 'c72d77f1-6e0b-473e-a600-7295d0822e54',
timestamp: new Date('2020/2/16').getTime(),
diff: [
{ field: 'name', oldValue: 'Angry Birds 2', newValue: 'Angry Birds 2: The sequel' },
],
},
{
id: '90b9e1ad-7556-44f8-8278-c723824de782',
timestamp: new Date('2020/2/17').getTime(),
diff: [
{ field: 'name', oldValue: 'Angry Birds 2: The sequel', newValue: 'Angry Birds 2: The return of the birds' },
],
},
{
id: 'fcd064f9-687e-4bd4-9c8f-93361610cc58',
timestamp: new Date('2020/2/18').getTime(),
diff: [
{ field: 'name', oldValue: 'Angry Birds 2: The return of the birds', newValue: 'Angry Birds 2' },
],
},
];

50
src/lib/api/index.js Normal file
Просмотреть файл

@ -0,0 +1,50 @@
import { usersDiff, projectsDiff } from './data';
const DEFAULT_DELAY = 2000;
const PAGE_SIZE = 3;
const resolveOrRejectCollection = (timesCalled, collection) => () => {
return new Promise((resolve, reject) => {
const id = setTimeout(() => {
timesCalled += 1;
const sliceStart = PAGE_SIZE * (Math.ceil(timesCalled / 2) - 1);
const sliceEnd = PAGE_SIZE * Math.ceil(timesCalled / 2);
const totalItems = collection.length;
const hasItems = sliceStart < totalItems;
clearTimeout(id);
if (timesCalled % 2 === 0) {
return reject({
code: 500,
error: 'Uknown error',
});
}
return resolve({
code: 200,
data: collection.slice(sliceStart, sliceEnd),
limit: PAGE_SIZE,
offset: hasItems ? sliceStart : totalItems,
total: totalItems,
});
}, DEFAULT_DELAY)
});
};
const getProjectsDiff = () => {
let timesCalled = 0;
return resolveOrRejectCollection(timesCalled, projectsDiff);
};
const getUsersDiff = () => {
let timesCalled = 0;
return resolveOrRejectCollection(timesCalled, usersDiff);
};
export default {
getProjectsDiff: getProjectsDiff(),
getUsersDiff: getUsersDiff(),
};

Просмотреть файл

@ -1,7 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
<g fill="#61DAFB">
<path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
<circle cx="420.9" cy="296.5" r="45.7"/>
<path d="M520.5 78.1z"/>
</g>
</svg>

До

Ширина:  |  Высота:  |  Размер: 2.6 KiB

Просмотреть файл

@ -1,141 +0,0 @@
// This optional code is used to register a service worker.
// register() is not called by default.
// This lets the app load faster on subsequent visits in production, and gives
// it offline capabilities. However, it also means that developers (and users)
// will only see deployed updates on subsequent visits to a page, after all the
// existing tabs open on the page have been closed, since previously cached
// resources are updated in the background.
// To learn more about the benefits of this model and instructions on how to
// opt-in, read https://bit.ly/CRA-PWA
const isLocalhost = Boolean(
window.location.hostname === 'localhost' ||
// [::1] is the IPv6 localhost address.
window.location.hostname === '[::1]' ||
// 127.0.0.0/8 are considered localhost for IPv4.
window.location.hostname.match(
/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
)
);
export function register(config) {
if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
// The URL constructor is available in all browsers that support SW.
const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
if (publicUrl.origin !== window.location.origin) {
// Our service worker won't work if PUBLIC_URL is on a different origin
// from what our page is served on. This might happen if a CDN is used to
// serve assets; see https://github.com/facebook/create-react-app/issues/2374
return;
}
window.addEventListener('load', () => {
const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
if (isLocalhost) {
// This is running on localhost. Let's check if a service worker still exists or not.
checkValidServiceWorker(swUrl, config);
// Add some additional logging to localhost, pointing developers to the
// service worker/PWA documentation.
navigator.serviceWorker.ready.then(() => {
console.log(
'This web app is being served cache-first by a service ' +
'worker. To learn more, visit https://bit.ly/CRA-PWA'
);
});
} else {
// Is not localhost. Just register service worker
registerValidSW(swUrl, config);
}
});
}
}
function registerValidSW(swUrl, config) {
navigator.serviceWorker
.register(swUrl)
.then(registration => {
registration.onupdatefound = () => {
const installingWorker = registration.installing;
if (installingWorker == null) {
return;
}
installingWorker.onstatechange = () => {
if (installingWorker.state === 'installed') {
if (navigator.serviceWorker.controller) {
// At this point, the updated precached content has been fetched,
// but the previous service worker will still serve the older
// content until all client tabs are closed.
console.log(
'New content is available and will be used when all ' +
'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
);
// Execute callback
if (config && config.onUpdate) {
config.onUpdate(registration);
}
} else {
// At this point, everything has been precached.
// It's the perfect time to display a
// "Content is cached for offline use." message.
console.log('Content is cached for offline use.');
// Execute callback
if (config && config.onSuccess) {
config.onSuccess(registration);
}
}
}
};
};
})
.catch(error => {
console.error('Error during service worker registration:', error);
});
}
function checkValidServiceWorker(swUrl, config) {
// Check if the service worker can be found. If it can't reload the page.
fetch(swUrl, {
headers: { 'Service-Worker': 'script' }
})
.then(response => {
// Ensure service worker exists, and that we really are getting a JS file.
const contentType = response.headers.get('content-type');
if (
response.status === 404 ||
(contentType != null && contentType.indexOf('javascript') === -1)
) {
// No service worker found. Probably a different app. Reload the page.
navigator.serviceWorker.ready.then(registration => {
registration.unregister().then(() => {
window.location.reload();
});
});
} else {
// Service worker found. Proceed as normal.
registerValidSW(swUrl, config);
}
})
.catch(() => {
console.log(
'No internet connection found. App is running in offline mode.'
);
});
}
export function unregister() {
if ('serviceWorker' in navigator) {
navigator.serviceWorker.ready
.then(registration => {
registration.unregister();
})
.catch(error => {
console.error(error.message);
});
}
}

Просмотреть файл

@ -1,5 +1,6 @@
// jest-dom adds custom jest matchers for asserting on DOM nodes.
// allows you to do things like:
// expect(element).toHaveTextContent(/react/i)
// learn more: https://github.com/testing-library/jest-dom
import '@testing-library/jest-dom/extend-expect';
import { configure } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
configure({
adapter: new Adapter(),
});

10490
yarn.lock

Разница между файлами не показана из-за своего большого размера Загрузить разницу