Compare commits
7 Commits
unit-tests
...
plan-histo
| Author | SHA1 | Date | |
|---|---|---|---|
| 93107fcd0b | |||
| bcd8a62d4e | |||
| e8580c6a75 | |||
| 1930b80cd8 | |||
| 1c7888a478 | |||
| d4f7ad341a | |||
| 0b10ed05d6 |
31278
package-lock.json
generated
31278
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
118
package.json
118
package.json
@ -1,61 +1,61 @@
|
|||||||
{
|
{
|
||||||
"name": "plannaplan",
|
"name": "plannaplan",
|
||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@material-ui/core": "^4.10.0",
|
"@material-ui/core": "^4.10.0",
|
||||||
"@material-ui/icons": "^4.9.1",
|
"@material-ui/icons": "^4.9.1",
|
||||||
"@material-ui/lab": "^4.0.0-alpha.56",
|
"@material-ui/lab": "^4.0.0-alpha.56",
|
||||||
"axios": "^0.19.2",
|
"axios": "^0.19.2",
|
||||||
"notistack": "^1.0.1",
|
"notistack": "^1.0.1",
|
||||||
"react": "16.9.0",
|
"react": "16.9.0",
|
||||||
"react-click-away-listener": "^1.4.3",
|
"react-click-away-listener": "^1.4.3",
|
||||||
"react-dom": "^16.13.1",
|
"react-dom": "^16.13.1",
|
||||||
"react-loading-overlay": "^1.0.1",
|
"react-loading-overlay": "^1.0.1",
|
||||||
"react-scripts": "3.4.1",
|
"react-scripts": "3.4.1",
|
||||||
"react-spinners": "^0.9.0",
|
"react-spinners": "^0.9.0",
|
||||||
"styled-components": "^5.1.1"
|
"styled-components": "^5.1.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@testing-library/jest-dom": "^5.11.6",
|
"@testing-library/jest-dom": "^5.11.6",
|
||||||
"@testing-library/react": "^11.2.2",
|
"@testing-library/react": "^11.2.2",
|
||||||
"@types/jest": "^26.0.19",
|
"@types/jest": "^26.0.19",
|
||||||
"@types/react": "^16.9.46",
|
"@types/react": "^16.9.46",
|
||||||
"@types/react-dom": "^16.9.8",
|
"@types/react-dom": "^16.9.8",
|
||||||
"@types/styled-components": "^5.1.2",
|
"@types/styled-components": "^5.1.2",
|
||||||
"@typescript-eslint/eslint-plugin": "^4.8.1",
|
"@typescript-eslint/eslint-plugin": "^4.8.1",
|
||||||
"@typescript-eslint/parser": "^4.8.1",
|
"@typescript-eslint/parser": "^4.8.1",
|
||||||
"eslint-config-prettier": "^6.15.0",
|
"eslint-config-prettier": "^6.15.0",
|
||||||
"eslint-config-react-app": "^6.0.0",
|
"eslint-config-react-app": "^6.0.0",
|
||||||
"eslint-loader": "^4.0.2",
|
"eslint-loader": "^4.0.2",
|
||||||
"eslint-plugin-prettier": "^3.1.4",
|
"eslint-plugin-prettier": "^3.1.4",
|
||||||
"eslint-plugin-react": "^7.21.5",
|
"eslint-plugin-react": "^7.21.5",
|
||||||
"prettier": "^2.2.0",
|
"prettier": "^2.2.0",
|
||||||
"ts-jest": "^26.4.4",
|
"ts-jest": "^26.4.4",
|
||||||
"typescript": "^3.9.7"
|
"typescript": "^3.9.7"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "react-scripts start",
|
"start": "react-scripts start",
|
||||||
"build": "react-scripts build",
|
"build": "react-scripts build",
|
||||||
"test": "react-scripts test",
|
"test": "react-scripts test",
|
||||||
"eject": "react-scripts eject"
|
"eject": "react-scripts eject"
|
||||||
},
|
},
|
||||||
"eslintConfig": {
|
"eslintConfig": {
|
||||||
"extends": [
|
"extends": [
|
||||||
"react-app",
|
"react-app",
|
||||||
"react-app/jest"
|
"react-app/jest"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"browserslist": {
|
"browserslist": {
|
||||||
"production": [
|
"production": [
|
||||||
">0.2%",
|
">0.2%",
|
||||||
"not dead",
|
"not dead",
|
||||||
"not op_mini all"
|
"not op_mini all"
|
||||||
],
|
],
|
||||||
"development": [
|
"development": [
|
||||||
"last 1 chrome version",
|
"last 1 chrome version",
|
||||||
"last 1 firefox version",
|
"last 1 firefox version",
|
||||||
"last 1 safari version"
|
"last 1 safari version"
|
||||||
]
|
]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|||||||
43
src/assets/left-arrow.svg
Normal file
43
src/assets/left-arrow.svg
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||||
|
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||||
|
viewBox="0 0 492 492" style="enable-background:new 0 0 492 492;" xml:space="preserve">
|
||||||
|
<g>
|
||||||
|
<g>
|
||||||
|
<path d="M198.608,246.104L382.664,62.04c5.068-5.056,7.856-11.816,7.856-19.024c0-7.212-2.788-13.968-7.856-19.032l-16.128-16.12
|
||||||
|
C361.476,2.792,354.712,0,347.504,0s-13.964,2.792-19.028,7.864L109.328,227.008c-5.084,5.08-7.868,11.868-7.848,19.084
|
||||||
|
c-0.02,7.248,2.76,14.028,7.848,19.112l218.944,218.932c5.064,5.072,11.82,7.864,19.032,7.864c7.208,0,13.964-2.792,19.032-7.864
|
||||||
|
l16.124-16.12c10.492-10.492,10.492-27.572,0-38.06L198.608,246.104z"/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 964 B |
43
src/assets/right-arrow.svg
Normal file
43
src/assets/right-arrow.svg
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||||
|
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||||
|
viewBox="0 0 492.004 492.004" style="enable-background:new 0 0 492.004 492.004;" xml:space="preserve">
|
||||||
|
<g>
|
||||||
|
<g>
|
||||||
|
<path d="M382.678,226.804L163.73,7.86C158.666,2.792,151.906,0,144.698,0s-13.968,2.792-19.032,7.86l-16.124,16.12
|
||||||
|
c-10.492,10.504-10.492,27.576,0,38.064L293.398,245.9l-184.06,184.06c-5.064,5.068-7.86,11.824-7.86,19.028
|
||||||
|
c0,7.212,2.796,13.968,7.86,19.04l16.124,16.116c5.068,5.068,11.824,7.86,19.032,7.86s13.968-2.792,19.032-7.86L382.678,265
|
||||||
|
c5.076-5.084,7.864-11.872,7.848-19.088C390.542,238.668,387.754,231.884,382.678,226.804z"/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 971 B |
209
src/components/Administrator.tsx
Normal file
209
src/components/Administrator.tsx
Normal file
@ -0,0 +1,209 @@
|
|||||||
|
import { format } from 'date-fns';
|
||||||
|
import React, { useEffect, useState } from 'react';
|
||||||
|
import styled from 'styled-components/macro';
|
||||||
|
import { axiosInstance } from '../utils/axiosInstance';
|
||||||
|
import { useSnackbar } from 'notistack';
|
||||||
|
import CloseIcon from '@material-ui/icons/Close';
|
||||||
|
import { SyncLoader } from 'react-spinners';
|
||||||
|
|
||||||
|
const StyledCloseIcon = styled(CloseIcon)`
|
||||||
|
color: #000000;
|
||||||
|
&:hover {
|
||||||
|
color: white;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
const SaveButton = styled.button`
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
user-select: none;
|
||||||
|
background-color: #c7a424;
|
||||||
|
border: none;
|
||||||
|
font-weight: bold;
|
||||||
|
cursor: pointer;
|
||||||
|
height: 40px;
|
||||||
|
&:hover {
|
||||||
|
color: #ffffff;
|
||||||
|
box-shadow: 0px 5px 4px 0px rgba(0, 0, 0, 0.24);
|
||||||
|
}
|
||||||
|
|
||||||
|
width: 150px;
|
||||||
|
`;
|
||||||
|
const AdministratorWrapper = styled.div`
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
margin: 0 auto;
|
||||||
|
height: 100vh;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const Wrap = styled.div`
|
||||||
|
display: flex;
|
||||||
|
flex: 1;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const LogoWrapper = styled.div`
|
||||||
|
display: flex;
|
||||||
|
flex: 1;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const Text = styled.div`
|
||||||
|
font-family: 'Roboto', sans-serif;
|
||||||
|
font-size: 5rem;
|
||||||
|
user-select: none;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const Logo = styled.img`
|
||||||
|
width: 400px;
|
||||||
|
height: 400px;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const Form = styled.form`
|
||||||
|
flex: 1;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
flex-direction: column;
|
||||||
|
|
||||||
|
input {
|
||||||
|
padding: 5px;
|
||||||
|
margin-top: 10px;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
width: 210px;
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
export const Administrator = () => {
|
||||||
|
const { enqueueSnackbar } = useSnackbar();
|
||||||
|
const { closeSnackbar } = useSnackbar();
|
||||||
|
|
||||||
|
const today = new Date();
|
||||||
|
const dd = String(today.getDate()).padStart(2, '0');
|
||||||
|
const mm = String(today.getMonth() + 1).padStart(2, '0');
|
||||||
|
const yyyy = today.getFullYear();
|
||||||
|
|
||||||
|
const date = yyyy + '-' + mm + '-' + dd;
|
||||||
|
|
||||||
|
const [selectedFile, setSelectedFile] = useState<File | null>(null);
|
||||||
|
const [startFirstDate, setStartFirstDate] = useState<Date | null>(null);
|
||||||
|
const [endFirstDate, setEndFirstDate] = useState<Date | null>(null);
|
||||||
|
const [startSecondDate, setStartSecondDate] = useState<Date | null>(null);
|
||||||
|
const [endSecondDate, setEndSecondDate] = useState<Date | null>(null);
|
||||||
|
const [loading, setLoading] = useState(false);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (startFirstDate !== null) {
|
||||||
|
console.log(format(startFirstDate, 'dd.MM.yyyy'));
|
||||||
|
}
|
||||||
|
}, [startFirstDate]);
|
||||||
|
|
||||||
|
const uploadFile = async (event: React.FormEvent<HTMLFormElement>) => {
|
||||||
|
const action = (key: any) => (
|
||||||
|
<>
|
||||||
|
<StyledCloseIcon
|
||||||
|
onClick={() => {
|
||||||
|
closeSnackbar(key);
|
||||||
|
}}
|
||||||
|
></StyledCloseIcon>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
event.preventDefault();
|
||||||
|
const formData = new FormData();
|
||||||
|
formData.append('file', selectedFile as Blob);
|
||||||
|
if (startFirstDate !== null) {
|
||||||
|
formData.append('firstTourBegin', format(startFirstDate, 'dd.MM.yyyy'));
|
||||||
|
}
|
||||||
|
if (endFirstDate !== null) {
|
||||||
|
formData.append('firstTourEnd', format(endFirstDate, 'dd.MM.yyyy'));
|
||||||
|
}
|
||||||
|
if (startSecondDate !== null) {
|
||||||
|
formData.append('secondTourBegin', format(startSecondDate, 'dd.MM.yyyy'));
|
||||||
|
}
|
||||||
|
if (endSecondDate !== null) {
|
||||||
|
formData.append('secondTourEnd', format(endSecondDate, 'dd.MM.yyyy'));
|
||||||
|
}
|
||||||
|
|
||||||
|
const config = {
|
||||||
|
headers: {
|
||||||
|
'content-type': 'multipart/form-data',
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
setLoading(true);
|
||||||
|
const response = await axiosInstance.post(
|
||||||
|
`${process.env.REACT_APP_API_URL}/api/v1/configurator/config/`,
|
||||||
|
formData,
|
||||||
|
config,
|
||||||
|
);
|
||||||
|
enqueueSnackbar('Plan został zapisany', {
|
||||||
|
variant: 'success',
|
||||||
|
action,
|
||||||
|
});
|
||||||
|
console.log(response);
|
||||||
|
} catch (e) {
|
||||||
|
enqueueSnackbar('Zapisywanie planu nie powiodło się', {
|
||||||
|
variant: 'error',
|
||||||
|
action,
|
||||||
|
});
|
||||||
|
console.log(e);
|
||||||
|
}
|
||||||
|
setLoading(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<AdministratorWrapper>
|
||||||
|
<Wrap>
|
||||||
|
<LogoWrapper>
|
||||||
|
<Logo alt="logo" src="https://plannaplan.pl/img/logo.svg" />
|
||||||
|
<Text> plan na plan </Text>
|
||||||
|
</LogoWrapper>
|
||||||
|
<Form onSubmit={uploadFile}>
|
||||||
|
<div>
|
||||||
|
<div>Start pierwszej tury:</div>{' '}
|
||||||
|
<div>
|
||||||
|
<input type="date" min={date} onChange={(e) => setStartFirstDate(e.target.valueAsDate)} />
|
||||||
|
</div>
|
||||||
|
<div>Koniec pierwszej tury:</div>{' '}
|
||||||
|
<div>
|
||||||
|
<input type="date" min={date} onChange={(e) => setEndFirstDate(e.target.valueAsDate)} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<div>Start drugiej tury:</div>{' '}
|
||||||
|
<div>
|
||||||
|
<input type="date" min={date} onChange={(e) => setStartSecondDate(e.target.valueAsDate)} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<div>Koniec drugiej tury:</div>{' '}
|
||||||
|
<div>
|
||||||
|
<input type="date" min={date} onChange={(e) => setEndSecondDate(e.target.valueAsDate)} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<input
|
||||||
|
type="file"
|
||||||
|
onChange={(e) => {
|
||||||
|
if (e.target.files && e.target.files[0]) {
|
||||||
|
const file = e.target.files[0];
|
||||||
|
setSelectedFile(file);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<SaveButton type="submit">{loading === false ? 'Zapisz' : <SyncLoader />} </SaveButton>
|
||||||
|
</div>
|
||||||
|
</Form>
|
||||||
|
</Wrap>
|
||||||
|
</AdministratorWrapper>
|
||||||
|
);
|
||||||
|
};
|
||||||
@ -1,14 +1,15 @@
|
|||||||
import React, { ElementType, useContext, useEffect, useState } from 'react';
|
import React, { useContext, useState } from 'react';
|
||||||
import Topbar from './Topbar';
|
import Topbar from './Topbar';
|
||||||
import { Transfer } from './Transfer';
|
import { Transfer } from './Transfer';
|
||||||
import { Admin } from './Admin';
|
import { Deanery } from './DeaneryPanel';
|
||||||
import { Scheduler } from './Scheduler';
|
import { Scheduler } from './Scheduler';
|
||||||
import { Rightbar } from './Rightbar';
|
import { Rightbar } from './Rightbar';
|
||||||
|
import { Administrator } from './Administrator';
|
||||||
import styled from 'styled-components';
|
import styled from 'styled-components';
|
||||||
import { coursesContext } from '../contexts/CoursesProvider';
|
|
||||||
import LoadingOverlay from 'react-loading-overlay';
|
import LoadingOverlay from 'react-loading-overlay';
|
||||||
import { SyncLoader } from 'react-spinners';
|
import { SyncLoader } from 'react-spinners';
|
||||||
import { CASContext } from '../contexts/CASProvider';
|
import { CASContext } from '../contexts/CASProvider';
|
||||||
|
import { coursesContext } from '../contexts/CoursesProvider';
|
||||||
const Wrapper = styled.div`
|
const Wrapper = styled.div`
|
||||||
display: flex;
|
display: flex;
|
||||||
height: calc(100vh - 80px);
|
height: calc(100vh - 80px);
|
||||||
@ -19,33 +20,38 @@ const Wrapper = styled.div`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export const App = () => {
|
export const App = () => {
|
||||||
const { isDataLoading } = useContext(coursesContext)!;
|
const { role } = useContext(CASContext)!;
|
||||||
const { isFetchingToken, user, role } = useContext(CASContext)!;
|
|
||||||
const [isOpenTransfer, setOpenTransfer] = useState(false);
|
const [isOpenTransfer, setOpenTransfer] = useState(false);
|
||||||
|
|
||||||
|
const { selectSchedulerEvents } = useContext(coursesContext)!;
|
||||||
|
const schedulerEvents = selectSchedulerEvents();
|
||||||
|
|
||||||
const handleTransfer = () => {
|
const handleTransfer = () => {
|
||||||
setOpenTransfer(!isOpenTransfer);
|
setOpenTransfer(!isOpenTransfer);
|
||||||
};
|
};
|
||||||
|
|
||||||
const userPrivilige = localStorage.getItem('userPrivilige');
|
const userPrivilige = localStorage.getItem('userPrivilige');
|
||||||
console.log('role of that user is: ', role);
|
|
||||||
useEffect(() => {
|
|
||||||
console.log('is fetching token: ', isFetchingToken);
|
|
||||||
}, [isFetchingToken]);
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<LoadingOverlay active={role === undefined} spinner={<SyncLoader />}>
|
<LoadingOverlay active={role === undefined} spinner={<SyncLoader />}>
|
||||||
<Topbar handleTransfer={handleTransfer} />
|
{userPrivilige !== 'ADMIN' && (
|
||||||
<Transfer isOpen={isOpenTransfer} handleClose={handleTransfer} />
|
|
||||||
<Wrapper>
|
|
||||||
{userPrivilige === 'STUDENT' && (
|
|
||||||
<>
|
<>
|
||||||
<Scheduler />
|
<Topbar handleTransfer={handleTransfer} />
|
||||||
<Rightbar />
|
<Transfer isOpen={isOpenTransfer} handleClose={handleTransfer} />
|
||||||
|
<Wrapper>
|
||||||
|
{userPrivilige === 'STUDENT' && (
|
||||||
|
<>
|
||||||
|
<Scheduler schedulerEvents={schedulerEvents} />
|
||||||
|
<Rightbar />
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
{userPrivilige === 'DEANERY' && <Deanery schedulerEvents={schedulerEvents} />}
|
||||||
|
</Wrapper>
|
||||||
</>
|
</>
|
||||||
)}{' '}
|
)}
|
||||||
{userPrivilige === 'DEANERY' && <Admin />}
|
{userPrivilige === 'ADMIN' && (
|
||||||
</Wrapper>
|
<Administrator></Administrator>
|
||||||
|
)}
|
||||||
</LoadingOverlay>
|
</LoadingOverlay>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -161,9 +161,8 @@ export const CourseCard = ({ course }: CourseCardProps) => {
|
|||||||
const basketCourseGroups = useMemo(() => selectBasketCourseGroups(course.id), []);
|
const basketCourseGroups = useMemo(() => selectBasketCourseGroups(course.id), []);
|
||||||
const [previous, setPrevious] = useState(basketCourseGroups);
|
const [previous, setPrevious] = useState(basketCourseGroups);
|
||||||
|
|
||||||
console.log('course is: ', course);
|
|
||||||
const onGroupClick = (group: Group, courseId: number) => {
|
const onGroupClick = (group: Group, courseId: number) => {
|
||||||
setPrevious((prev) => (group.type === GroupType.CLASS ? { ...prev, classes: group } : { ...prev, lecture: group }));
|
setPrevious((prev) => (group.type === GroupType.CLASS ? { ...prev, classes: group, prev:"classes" } : { ...prev, lecture: group,prev:"lecture" }));
|
||||||
changeGroupInBasket(group, courseId);
|
changeGroupInBasket(group, courseId);
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -188,22 +187,17 @@ export const CourseCard = ({ course }: CourseCardProps) => {
|
|||||||
onClick={() => onGroupClick(group, course.id)}
|
onClick={() => onGroupClick(group, course.id)}
|
||||||
onMouseEnter={() => {
|
onMouseEnter={() => {
|
||||||
if (group.type === GroupType.CLASS) {
|
if (group.type === GroupType.CLASS) {
|
||||||
changeGroupInBasket(group, course.id);
|
changeGroupInBasket({classes: group,lecture:previous.lecture}, course.id);
|
||||||
}
|
}
|
||||||
if (group.type === GroupType.LECTURE) {
|
if (group.type === GroupType.LECTURE) {
|
||||||
changeGroupInBasket(group, course.id);
|
changeGroupInBasket({lecture: group,classes:previous.classes}, course.id);
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
onMouseLeave={() => {
|
onMouseLeave={() => {
|
||||||
if (hoveredGroup) {
|
if (hoveredGroup) {
|
||||||
if (hoveredGroup.type === GroupType.CLASS && previous.classes !== undefined) {
|
changeGroupInBasket(previous, course.id);
|
||||||
changeGroupInBasket(previous.classes, course.id);
|
|
||||||
}
|
|
||||||
if (hoveredGroup.type === GroupType.LECTURE && previous.lecture !== undefined) {
|
|
||||||
changeGroupInBasket(previous.lecture, course.id);
|
|
||||||
}
|
|
||||||
changeHoveredGroup(null);
|
|
||||||
}
|
}
|
||||||
|
changeHoveredGroup(null);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<StyledGroupType groupType={group.type}>{group.type === 'CLASS' ? 'ĆW' : 'WYK'}</StyledGroupType>
|
<StyledGroupType groupType={group.type}>{group.type === 'CLASS' ? 'ĆW' : 'WYK'}</StyledGroupType>
|
||||||
|
|||||||
@ -1,10 +1,13 @@
|
|||||||
import React, { useState, MouseEvent } from 'react';
|
import React, { useState, MouseEvent,useContext } from 'react';
|
||||||
import styled from 'styled-components/macro';
|
import styled from 'styled-components/macro';
|
||||||
import Plan from '../assets/plan.svg';
|
import Plan from '../assets/plan.svg';
|
||||||
import History from '../assets/history.svg';
|
import History from '../assets/history.svg';
|
||||||
import Statistics from '../assets/statistics.svg';
|
import Statistics from '../assets/statistics.svg';
|
||||||
import { Scheduler } from './Scheduler';
|
import { Scheduler } from './Scheduler';
|
||||||
import { Rightbar } from './Rightbar';
|
import { Rightbar } from './Rightbar';
|
||||||
|
import { SchedulerHistory } from './SchedulerHistory';
|
||||||
|
import { coursesContext } from '../contexts/CoursesProvider';
|
||||||
|
import { SchedulerEvent } from '../types';
|
||||||
|
|
||||||
const LeftSide = styled.div`
|
const LeftSide = styled.div`
|
||||||
height: 100%;
|
height: 100%;
|
||||||
@ -13,7 +16,7 @@ const LeftSide = styled.div`
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
background-color: white;
|
background-color: white;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
border-radius:5px;
|
border-radius: 5px;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const Wrap = styled.div`
|
const Wrap = styled.div`
|
||||||
@ -45,11 +48,11 @@ const LeftPanelElement = styled.div<LeftPanelElement>`
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
box-shadow: ${({ isCurrentTab }) => (isCurrentTab === true ? `inset 0px 0px 11px 0px rgba(0,0,0,0.30)` : '')};
|
box-shadow: ${({ isCurrentTab }) => (isCurrentTab === true ? `inset 0px 0px 11px 0px rgba(0,0,0,0.30)` : '')};
|
||||||
border-bottom: 1px solid #979797;
|
border-bottom: 1px solid #979797;
|
||||||
:first-child{
|
:first-child {
|
||||||
border-radius:0px 5px 0px 0px;
|
border-radius: 0px 5px 0px 0px;
|
||||||
}
|
}
|
||||||
:last-child{
|
:last-child {
|
||||||
border-radius:0px 0px 5px 0px;
|
border-radius: 0px 0px 5px 0px;
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
@ -94,11 +97,19 @@ const Icon = styled.img`
|
|||||||
margin: 5px;
|
margin: 5px;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
export const Admin = () => {
|
interface Deanery {
|
||||||
|
schedulerEvents: Array<SchedulerEvent>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const Deanery = ({ schedulerEvents }: Deanery) => {
|
||||||
const [currentTab, setCurrentTab] = useState<null | number>(1);
|
const [currentTab, setCurrentTab] = useState<null | number>(1);
|
||||||
|
const { getNewestStudentTimetable,userID } = useContext(coursesContext)!;
|
||||||
|
const { selectHistorySchedulerEvents } = useContext(coursesContext)!;
|
||||||
|
const schedulerHistoryEvents = selectHistorySchedulerEvents();
|
||||||
|
|
||||||
const handleClick = (e: MouseEvent<HTMLDivElement>) => {
|
const handleClick = (e: MouseEvent<HTMLDivElement>) => {
|
||||||
setCurrentTab(Number(e.currentTarget.id));
|
setCurrentTab(Number(e.currentTarget.id));
|
||||||
|
getNewestStudentTimetable(userID);
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -120,11 +131,11 @@ export const Admin = () => {
|
|||||||
<Wrapper>
|
<Wrapper>
|
||||||
{currentTab === 1 ? (
|
{currentTab === 1 ? (
|
||||||
<>
|
<>
|
||||||
<Scheduler />
|
<Scheduler schedulerEvents={schedulerEvents}/>
|
||||||
<Rightbar />
|
<Rightbar />
|
||||||
</>
|
</>
|
||||||
) : currentTab === 2 ? (
|
) : currentTab === 2 ? (
|
||||||
<HistoryDiv />
|
<SchedulerHistory schedulerHistoryEvents={schedulerHistoryEvents}/>
|
||||||
) : currentTab === 3 ? (
|
) : currentTab === 3 ? (
|
||||||
<StatsDiv />
|
<StatsDiv />
|
||||||
) : (
|
) : (
|
||||||
@ -50,7 +50,7 @@ interface DropdownProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const Dropdown = ({ open, input, handleCloseDropdown, selectedOption }: DropdownProps) => {
|
export const Dropdown = ({ open, input, handleCloseDropdown, selectedOption }: DropdownProps) => {
|
||||||
const { courses, selectBasketNames, addCourseToBasket, changeStudent } = useContext(coursesContext)!;
|
const { courses, selectBasketNames, addCourseToBasket, changeStudent, getStudentTimetablesHistory } = useContext(coursesContext)!;
|
||||||
const { students, changeSelectedStudent } = useContext(studentsContext)!;
|
const { students, changeSelectedStudent } = useContext(studentsContext)!;
|
||||||
const basketNames = useMemo(() => selectBasketNames(), [selectBasketNames]);
|
const basketNames = useMemo(() => selectBasketNames(), [selectBasketNames]);
|
||||||
const [filteredCourses, setFilteredCourses] = useState<Array<Course>>([]);
|
const [filteredCourses, setFilteredCourses] = useState<Array<Course>>([]);
|
||||||
@ -67,10 +67,10 @@ export const Dropdown = ({ open, input, handleCloseDropdown, selectedOption }: D
|
|||||||
|
|
||||||
const onUserClick = (event: MouseEvent) => {
|
const onUserClick = (event: MouseEvent) => {
|
||||||
const target = event.currentTarget;
|
const target = event.currentTarget;
|
||||||
console.log('target: ', target);
|
|
||||||
//to be moved to students provider
|
//to be moved to students provider
|
||||||
changeStudent(target.id);
|
changeStudent(target.id);
|
||||||
changeSelectedStudent(Number(target.id));
|
changeSelectedStudent(Number(target.id));
|
||||||
|
|
||||||
handleCloseDropdown();
|
handleCloseDropdown();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -1,8 +1,9 @@
|
|||||||
import React, { useEffect, useLayoutEffect, useRef } from 'react';
|
import React, { useLayoutEffect, useRef } from 'react';
|
||||||
import { useState } from 'react';
|
import { useState } from 'react';
|
||||||
import { SchedulerEvents } from './SchedulerEvents';
|
import { SchedulerEvents } from './SchedulerEvents';
|
||||||
import { days, hours } from '../constants/index';
|
import { days, hours } from '../constants/index';
|
||||||
import styled from 'styled-components/macro';
|
import styled from 'styled-components/macro';
|
||||||
|
import { SchedulerEvent } from '../types';
|
||||||
|
|
||||||
const SchedulerWrapper = styled.div`
|
const SchedulerWrapper = styled.div`
|
||||||
border-collapse: collapse;
|
border-collapse: collapse;
|
||||||
@ -61,7 +62,11 @@ const TableCell = styled.div<TableCellProps>`
|
|||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
export const Scheduler = () => {
|
interface SchedulerProps {
|
||||||
|
schedulerEvents: Array<SchedulerEvent>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const Scheduler = ({ schedulerEvents }: SchedulerProps) => {
|
||||||
const cellRef = useRef<HTMLDivElement>(null);
|
const cellRef = useRef<HTMLDivElement>(null);
|
||||||
const [cellWidth, setCellWidth] = useState(0);
|
const [cellWidth, setCellWidth] = useState(0);
|
||||||
const [cellHeight, setCellHeight] = useState(0);
|
const [cellHeight, setCellHeight] = useState(0);
|
||||||
@ -123,7 +128,7 @@ export const Scheduler = () => {
|
|||||||
)}
|
)}
|
||||||
</TableRow>
|
</TableRow>
|
||||||
))}
|
))}
|
||||||
<SchedulerEvents cellWidth={cellWidth} cellHeight={cellHeight} />
|
<SchedulerEvents cellWidth={cellWidth} cellHeight={cellHeight} schedulerEvents={schedulerEvents} />
|
||||||
</TableBody>
|
</TableBody>
|
||||||
</SchedulerWrapper>
|
</SchedulerWrapper>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -3,15 +3,15 @@ import { SchedulerRow } from './SchedulerRow';
|
|||||||
import { coursesContext } from '../contexts/CoursesProvider';
|
import { coursesContext } from '../contexts/CoursesProvider';
|
||||||
import { selectGroupsToShow } from '../utils/index';
|
import { selectGroupsToShow } from '../utils/index';
|
||||||
import { ROWS_COUNT } from '../constants';
|
import { ROWS_COUNT } from '../constants';
|
||||||
|
import { SchedulerEvent } from '../types';
|
||||||
|
|
||||||
interface SchedulerEventsProps {
|
interface SchedulerEventsProps {
|
||||||
cellWidth: number;
|
cellWidth: number;
|
||||||
cellHeight: number;
|
cellHeight: number;
|
||||||
|
schedulerEvents: Array<SchedulerEvent>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const SchedulerEvents = ({ cellWidth, cellHeight }: SchedulerEventsProps) => {
|
export const SchedulerEvents = ({ cellWidth, cellHeight,schedulerEvents }: SchedulerEventsProps) => {
|
||||||
const { selectSchedulerEvents } = useContext(coursesContext)!;
|
|
||||||
|
|
||||||
const schedulerEvents = selectSchedulerEvents();
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
54
src/components/SchedulerHistory.tsx
Normal file
54
src/components/SchedulerHistory.tsx
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
import React, { useContext, useEffect, useState } from 'react';
|
||||||
|
import styled from 'styled-components';
|
||||||
|
import { coursesContext } from '../contexts/CoursesProvider';
|
||||||
|
import { SchedulerEvent } from '../types';
|
||||||
|
import { Scheduler } from './Scheduler';
|
||||||
|
import { SchedulerHistoryNavigation } from './SchedulerHistoryNavigation';
|
||||||
|
|
||||||
|
const Wrapper = styled.div`
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
width: 100%;
|
||||||
|
`;
|
||||||
|
|
||||||
|
interface SchedulerHistoryProps {
|
||||||
|
schedulerHistoryEvents: Array<SchedulerEvent>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const SchedulerHistory = ({schedulerHistoryEvents}:SchedulerHistoryProps) => {
|
||||||
|
const { timetableHistory, setHistoryBasketFromHistoryGroups } = useContext(coursesContext)!;
|
||||||
|
const [currentTimetable, setCurrentTimetable] = useState(timetableHistory.length===0 ? 0 : timetableHistory.length - 1);
|
||||||
|
let commisionDate = timetableHistory[currentTimetable]?.commisionDate;
|
||||||
|
|
||||||
|
const SubstractCurrentTimetable = (value: number) => {
|
||||||
|
if (currentTimetable > 0) {
|
||||||
|
setCurrentTimetable((currentTimetable) => currentTimetable + value);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const AddCurrentTimetable = (value: number) => {
|
||||||
|
if (currentTimetable < timetableHistory.length - 1) {
|
||||||
|
setCurrentTimetable((currentTimetable) => currentTimetable + value);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const timetable = timetableHistory[currentTimetable];
|
||||||
|
if (timetable) {
|
||||||
|
const { groups } = timetable;
|
||||||
|
setHistoryBasketFromHistoryGroups(groups);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
setHistoryBasketFromHistoryGroups([]);
|
||||||
|
}
|
||||||
|
}, [currentTimetable,timetableHistory]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Wrapper>
|
||||||
|
{timetableHistory.length > 0 && (
|
||||||
|
<SchedulerHistoryNavigation commisionDate={commisionDate} SubstractCurrentTimetable={SubstractCurrentTimetable} AddCurrentTimetable={AddCurrentTimetable} />
|
||||||
|
)}
|
||||||
|
<Scheduler schedulerEvents={schedulerHistoryEvents}/>
|
||||||
|
</Wrapper>
|
||||||
|
);
|
||||||
|
};
|
||||||
91
src/components/SchedulerHistoryNavigation.tsx
Normal file
91
src/components/SchedulerHistoryNavigation.tsx
Normal file
@ -0,0 +1,91 @@
|
|||||||
|
import React, { useContext } from 'react';
|
||||||
|
import styled from 'styled-components';
|
||||||
|
import { coursesContext } from '../contexts/CoursesProvider';
|
||||||
|
import RightArrow from '../assets/right-arrow.svg';
|
||||||
|
import LeftArrow from '../assets/left-arrow.svg';
|
||||||
|
|
||||||
|
type ButtonProps = {
|
||||||
|
direction: 'left' | 'right';
|
||||||
|
};
|
||||||
|
|
||||||
|
const Wrapper = styled.div`
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
margin-top:-15px;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const StyledButton = styled.div<ButtonProps>`
|
||||||
|
cursor:pointer;
|
||||||
|
user-select: none;
|
||||||
|
margin:10px;
|
||||||
|
border-radius:5px;
|
||||||
|
border-radius: 15px;
|
||||||
|
background-color: #9ed3ff;
|
||||||
|
border: 2px solid white;
|
||||||
|
min-width: 45px;
|
||||||
|
color: black;
|
||||||
|
display:flex;
|
||||||
|
align-items:center;
|
||||||
|
justify-content:center;
|
||||||
|
padding: 12px;
|
||||||
|
:hover{
|
||||||
|
background-color:#85c8ff;
|
||||||
|
}
|
||||||
|
transition: color 0.3s, background-color 0.3s;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const StyledArrow = styled.img`
|
||||||
|
width:20px;
|
||||||
|
`;
|
||||||
|
|
||||||
|
|
||||||
|
const StyledDate = styled.div`
|
||||||
|
user-select: none;
|
||||||
|
margin:10px;
|
||||||
|
border-radius:5px;
|
||||||
|
border-radius: 15px;
|
||||||
|
background-color: #FFDC61;
|
||||||
|
border: 2px solid white;
|
||||||
|
min-width: 45px;
|
||||||
|
text-align:center;
|
||||||
|
color: black;
|
||||||
|
padding: 10px;
|
||||||
|
`;
|
||||||
|
|
||||||
|
type SchedulerHistoryNavigationProps = {
|
||||||
|
commisionDate?: Date;
|
||||||
|
SubstractCurrentTimetable: (value: number) => void;
|
||||||
|
AddCurrentTimetable: (value: number) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const SchedulerHistoryNavigation = ({
|
||||||
|
commisionDate,
|
||||||
|
SubstractCurrentTimetable,
|
||||||
|
AddCurrentTimetable,
|
||||||
|
}: SchedulerHistoryNavigationProps) => {
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Wrapper>
|
||||||
|
<StyledButton
|
||||||
|
direction="left"
|
||||||
|
onClick={() => {
|
||||||
|
console.log('left clicked');
|
||||||
|
SubstractCurrentTimetable(-1);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<StyledArrow src={LeftArrow}></StyledArrow>
|
||||||
|
</StyledButton>
|
||||||
|
<StyledDate>{commisionDate}</StyledDate>
|
||||||
|
<StyledButton
|
||||||
|
direction="right"
|
||||||
|
onClick={() => {
|
||||||
|
console.log('right clicked');
|
||||||
|
AddCurrentTimetable(1);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<StyledArrow src={RightArrow}></StyledArrow>
|
||||||
|
</StyledButton>
|
||||||
|
</Wrapper>
|
||||||
|
);
|
||||||
|
};
|
||||||
@ -146,14 +146,10 @@ export const SchedulerRow = ({ groups, indexRow, rowTop, cellWidth, cellHeight }
|
|||||||
};
|
};
|
||||||
|
|
||||||
const handlePopoverClose = (e: MouseEvent<any>) => {
|
const handlePopoverClose = (e: MouseEvent<any>) => {
|
||||||
console.log('current target:', e.currentTarget);
|
|
||||||
console.log(' target:', e.target);
|
|
||||||
setPopoverId(null);
|
setPopoverId(null);
|
||||||
setAnchorEl(null);
|
setAnchorEl(null);
|
||||||
console.log('click awayyy');
|
|
||||||
};
|
};
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
console.log('anchorEl: ', anchorEl);
|
|
||||||
}, [anchorEl]);
|
}, [anchorEl]);
|
||||||
const open = Boolean(anchorEl);
|
const open = Boolean(anchorEl);
|
||||||
const id = open ? 'simple-popover' : undefined;
|
const id = open ? 'simple-popover' : undefined;
|
||||||
|
|||||||
@ -3,6 +3,8 @@ import { ReactComponent as Close } from '../assets/close.svg';
|
|||||||
import ProfileIcon from '../assets/account.svg';
|
import ProfileIcon from '../assets/account.svg';
|
||||||
import { Profile } from './Profile';
|
import { Profile } from './Profile';
|
||||||
import { Dropdown } from './Dropdown';
|
import { Dropdown } from './Dropdown';
|
||||||
|
import PolishIcon from '../assets/poland.svg';
|
||||||
|
import EnglishIcon from '../assets/united-kingdom.svg';
|
||||||
import styled from 'styled-components/macro';
|
import styled from 'styled-components/macro';
|
||||||
import ClickAwayListener from 'react-click-away-listener';
|
import ClickAwayListener from 'react-click-away-listener';
|
||||||
import { SelectMenu } from './SelectMenu';
|
import { SelectMenu } from './SelectMenu';
|
||||||
|
|||||||
@ -1,20 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
import { cleanup, fireEvent, screen } from '@testing-library/react';
|
|
||||||
import '@testing-library/jest-dom/extend-expect';
|
|
||||||
import { customRender } from '../../customRender';
|
|
||||||
import { Admin } from '../Admin';
|
|
||||||
|
|
||||||
beforeAll(() => {
|
|
||||||
delete window.location;
|
|
||||||
window.location = { replace: jest.fn() };
|
|
||||||
});
|
|
||||||
|
|
||||||
afterAll(() => {
|
|
||||||
window.location = location;
|
|
||||||
});
|
|
||||||
|
|
||||||
test('renders component', async () => {
|
|
||||||
const addItem = jest.fn();
|
|
||||||
customRender(<Admin />);
|
|
||||||
expect(screen.getByText(/Pokaż plan/i)).toBeInTheDocument();
|
|
||||||
});
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
import { cleanup, fireEvent, screen } from '@testing-library/react';
|
|
||||||
import '@testing-library/jest-dom/extend-expect';
|
|
||||||
import { customRender } from '../../customRender';
|
|
||||||
import { App } from '../App';
|
|
||||||
|
|
||||||
beforeAll(() => {
|
|
||||||
delete window.location;
|
|
||||||
window.location = { replace: jest.fn() };
|
|
||||||
});
|
|
||||||
|
|
||||||
afterAll(() => {
|
|
||||||
window.location = location;
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(cleanup);
|
|
||||||
|
|
||||||
test('renders application', async () => {
|
|
||||||
customRender(<App />);
|
|
||||||
expect(screen.getByText(/plan na plan/i)).toBeInTheDocument();
|
|
||||||
});
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
import { cleanup, fireEvent, waitForElement, screen, waitFor } from '@testing-library/react';
|
|
||||||
import '@testing-library/jest-dom/extend-expect';
|
|
||||||
import { customRender } from '../../customRender';
|
|
||||||
import Topbar from '../Topbar';
|
|
||||||
import { Rightbar } from '../Rightbar';
|
|
||||||
|
|
||||||
beforeAll(() => {
|
|
||||||
delete window.location;
|
|
||||||
window.location = { replace: jest.fn() };
|
|
||||||
});
|
|
||||||
|
|
||||||
afterAll(() => {
|
|
||||||
window.location = location;
|
|
||||||
});
|
|
||||||
|
|
||||||
test('renders component', async () => {
|
|
||||||
const addItem = jest.fn();
|
|
||||||
customRender(<Rightbar handrleTransfer={() => {}} />);
|
|
||||||
expect(screen.getByText(/zapisz/i)).toBeInTheDocument();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('component handles button click', async () => {
|
|
||||||
customRender(<Rightbar />);
|
|
||||||
fireEvent.click(screen.getByText(/zapisz/i));
|
|
||||||
// await waitFor(() => {
|
|
||||||
// expect(screen.getByText(/zapisywanie planu nie powiodło się/i)).toBeInTheDocument();
|
|
||||||
// });
|
|
||||||
});
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
import { cleanup, fireEvent, waitForElement, screen } from '@testing-library/react';
|
|
||||||
import '@testing-library/jest-dom/extend-expect';
|
|
||||||
import { customRender,customRenderCAS } from '../../customRender';
|
|
||||||
import {Scheduler} from '../Scheduler';
|
|
||||||
|
|
||||||
beforeAll(() => {
|
|
||||||
delete window.location;
|
|
||||||
window.location = { replace: jest.fn() };
|
|
||||||
});
|
|
||||||
|
|
||||||
afterAll(() => {
|
|
||||||
window.location = location;
|
|
||||||
});
|
|
||||||
|
|
||||||
test('renders component', async () => {
|
|
||||||
const addItem = jest.fn();
|
|
||||||
customRender(<Scheduler/>);
|
|
||||||
expect(screen.getByText(/Poniedziałek/i)).toBeInTheDocument();
|
|
||||||
});
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
import { cleanup, fireEvent, waitForElement, screen } from '@testing-library/react';
|
|
||||||
import '@testing-library/jest-dom/extend-expect';
|
|
||||||
import { customRender,customRenderCAS } from '../../customRender';
|
|
||||||
import {SelectMenu} from '../SelectMenu';
|
|
||||||
import { Select } from '@material-ui/core';
|
|
||||||
|
|
||||||
beforeAll(() => {
|
|
||||||
delete window.location;
|
|
||||||
window.location = { replace: jest.fn() };
|
|
||||||
});
|
|
||||||
|
|
||||||
afterAll(() => {
|
|
||||||
window.location = location;
|
|
||||||
});
|
|
||||||
|
|
||||||
test('not render component for student', async () => {
|
|
||||||
customRender(<SelectMenu/>);
|
|
||||||
expect(screen.queryByText(/przedmioty/i)).not.toBeInTheDocument();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('not render component for deanery', async () => {
|
|
||||||
customRenderCAS(<SelectMenu/>);
|
|
||||||
expect(screen.queryByText(/przedmioty/i)).not.toBeInTheDocument();
|
|
||||||
});
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
import { cleanup, fireEvent, waitForElement, screen } from '@testing-library/react';
|
|
||||||
import '@testing-library/jest-dom/extend-expect';
|
|
||||||
import { customRender } from '../../customRender';
|
|
||||||
import Topbar from '../Topbar';
|
|
||||||
|
|
||||||
beforeAll(() => {
|
|
||||||
delete window.location;
|
|
||||||
window.location = { replace: jest.fn() };
|
|
||||||
});
|
|
||||||
|
|
||||||
afterAll(() => {
|
|
||||||
window.location = location;
|
|
||||||
});
|
|
||||||
|
|
||||||
test('renders component', async () => {
|
|
||||||
customRender(<Topbar handrleTransfer={() => {}} />);
|
|
||||||
expect(screen.getByText(/plan na plan/i)).toBeInTheDocument();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('input should display default placeholder for student', async () => {
|
|
||||||
const { getByPlaceholderText, getByText, debug } = customRender(<Topbar handleTransfer={() => {}} />);
|
|
||||||
setTimeout(()=>{const input = getByPlaceholderText('Wyszukaj przedmioty...');
|
|
||||||
expect(input).toBeInTheDocument();},2000);
|
|
||||||
// fireEvent.change(input, { target: { value: '122' } });
|
|
||||||
// console.log(debug());
|
|
||||||
// const textNode = await waitForElement(() => getByText('asdasdsa'));
|
|
||||||
// console.log(debug());
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
test('input should display changed value', async () => {
|
|
||||||
const { getByPlaceholderText, getByText, debug } = customRender(<Topbar handleTransfer={() => {}} />);
|
|
||||||
setTimeout(()=>{ const input = getByPlaceholderText('Wyszukaj przedmioty...');
|
|
||||||
fireEvent.change(input, { target: { value: '122' } });expect(input.value).toBe("122");},2000);
|
|
||||||
|
|
||||||
|
|
||||||
// console.log(debug());
|
|
||||||
// console.log(debug());
|
|
||||||
|
|
||||||
});
|
|
||||||
@ -36,7 +36,6 @@ export const CASProvider = ({ children }: CASProviderProps) => {
|
|||||||
const { data: user } = await axiosInstance.get<LoggedUser & { token: string; refreshToken: string }>(
|
const { data: user } = await axiosInstance.get<LoggedUser & { token: string; refreshToken: string }>(
|
||||||
`${process.env.REACT_APP_API_URL}/token?ticket=${ticket}`,
|
`${process.env.REACT_APP_API_URL}/token?ticket=${ticket}`,
|
||||||
);
|
);
|
||||||
console.log('token response: ', user);
|
|
||||||
setUser({ authorityRole: user.authorityRole, email: user.email, id: user.id });
|
setUser({ authorityRole: user.authorityRole, email: user.email, id: user.id });
|
||||||
localStorage.setItem('userToken', user.token);
|
localStorage.setItem('userToken', user.token);
|
||||||
localStorage.setItem('userPrivilige', user.authorityRole);
|
localStorage.setItem('userPrivilige', user.authorityRole);
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import React, { useState, createContext, useEffect, ReactNode } from 'react';
|
import React, { useState, createContext, useEffect, ReactNode } from 'react';
|
||||||
import { Course, Group, Basket, GroupType, SchedulerEvent } from '../types';
|
import { Course, Group, Basket, GroupType, SchedulerEvent, TimetableHistory } from '../types';
|
||||||
import { useSnackbar } from 'notistack';
|
import { useSnackbar } from 'notistack';
|
||||||
import { axiosInstance } from '../utils/axiosInstance';
|
import { axiosInstance } from '../utils/axiosInstance';
|
||||||
import CloseIcon from '@material-ui/icons/Close';
|
import CloseIcon from '@material-ui/icons/Close';
|
||||||
@ -16,22 +16,27 @@ const StyledCloseIcon = styled(CloseIcon)`
|
|||||||
interface CourseContext {
|
interface CourseContext {
|
||||||
courses: Array<Course>;
|
courses: Array<Course>;
|
||||||
basket: Array<Basket>;
|
basket: Array<Basket>;
|
||||||
|
timetableHistory: Array<TimetableHistory>;
|
||||||
hoveredGroup: Group | undefined | null;
|
hoveredGroup: Group | undefined | null;
|
||||||
userID: string;
|
userID: string;
|
||||||
isDataLoading: boolean;
|
isDataLoading: boolean;
|
||||||
|
historyBasket: Array<Basket>;
|
||||||
addCourseToBasket: (courses: Course) => void;
|
addCourseToBasket: (courses: Course) => void;
|
||||||
changeHoveredGroup: (group: Group | null) => void;
|
changeHoveredGroup: (group: Group | null) => void;
|
||||||
changeGroupInBasket: (group: Group, courseId: number) => void;
|
changeGroupInBasket: (group: any, courseId: number) => void;
|
||||||
restoreGroupInBasket: (restoreGroup: Group, courseId: number) => void;
|
restoreGroupInBasket: (restoreGroup: Group, courseId: number) => void;
|
||||||
deleteFromBasket: (id: number) => void;
|
deleteFromBasket: (id: number) => void;
|
||||||
saveBasket: (userID: string) => Promise<void>;
|
saveBasket: (userID: string) => Promise<void>;
|
||||||
changeStudent: (studentId: string) => void;
|
changeStudent: (studentId: string) => void;
|
||||||
selectSchedulerEvents: () => Array<SchedulerEvent>;
|
selectSchedulerEvents: () => Array<SchedulerEvent>;
|
||||||
|
selectHistorySchedulerEvents: () => Array<SchedulerEvent>;
|
||||||
selectBasketNames: () => Array<string>;
|
selectBasketNames: () => Array<string>;
|
||||||
selectBasketCourses: () => Array<Course>;
|
selectBasketCourses: () => Array<Course>;
|
||||||
selectBasketCourseGroups: (courseId: number) => { lecture: Group | undefined; classes: Group | undefined };
|
selectBasketCourseGroups: (courseId: number) => { lecture: Group | undefined; classes: Group | undefined };
|
||||||
getNewestStudentTimetable: (studentId: string) => void;
|
getNewestStudentTimetable: (studentId: string) => void;
|
||||||
|
getStudentTimetablesHistory: (studentId: string) => void;
|
||||||
changeDataLoading: (isLoading: boolean) => void;
|
changeDataLoading: (isLoading: boolean) => void;
|
||||||
|
setHistoryBasketFromHistoryGroups: (groupsIds: Array<number>) => void;
|
||||||
}
|
}
|
||||||
export const coursesContext = createContext<CourseContext | undefined>(undefined);
|
export const coursesContext = createContext<CourseContext | undefined>(undefined);
|
||||||
|
|
||||||
@ -46,6 +51,8 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
//fetch courses with groups
|
//fetch courses with groups
|
||||||
const [courses, setCourses] = useState<Array<Course>>([]);
|
const [courses, setCourses] = useState<Array<Course>>([]);
|
||||||
const [basket, setBasket] = useState<Array<Basket>>([]);
|
const [basket, setBasket] = useState<Array<Basket>>([]);
|
||||||
|
const [historyBasket, setHistoryBasket] = useState<Array<Basket>>([]);
|
||||||
|
const [timetableHistory, setTimetableHistory] = useState<Array<TimetableHistory>>([]);
|
||||||
const [userID, setUserID] = useState('');
|
const [userID, setUserID] = useState('');
|
||||||
const [hoveredGroup, setHoveredGroup] = useState<Group | undefined | null>(null);
|
const [hoveredGroup, setHoveredGroup] = useState<Group | undefined | null>(null);
|
||||||
const [isDataLoading, setIsDataLoading] = useState(false);
|
const [isDataLoading, setIsDataLoading] = useState(false);
|
||||||
@ -70,18 +77,29 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
return basket.reduce((res, el) => {
|
return basket.reduce((res, el) => {
|
||||||
const { name } = el;
|
const { name } = el;
|
||||||
if (el.classes) {
|
if (el.classes) {
|
||||||
console.log('element kurwa is: ', el);
|
|
||||||
res.push({ ...el.classes, name });
|
res.push({ ...el.classes, name });
|
||||||
}
|
}
|
||||||
if (el.lecture) {
|
if (el.lecture) {
|
||||||
console.log('element kurwa is: ', el);
|
|
||||||
|
|
||||||
res.push({ ...el.lecture, name });
|
res.push({ ...el.lecture, name });
|
||||||
}
|
}
|
||||||
return res;
|
return res;
|
||||||
}, [] as Array<SchedulerEvent>);
|
}, [] as Array<SchedulerEvent>);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const selectHistorySchedulerEvents = () => {
|
||||||
|
return historyBasket.reduce((res, el) => {
|
||||||
|
const { name } = el;
|
||||||
|
if (el.classes) {
|
||||||
|
res.push({ ...el.classes, name });
|
||||||
|
}
|
||||||
|
if (el.lecture) {
|
||||||
|
res.push({ ...el.lecture, name });
|
||||||
|
}
|
||||||
|
return res;
|
||||||
|
}, [] as Array<SchedulerEvent>);
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
const selectBasketCourseGroups = (courseId: number) => {
|
const selectBasketCourseGroups = (courseId: number) => {
|
||||||
const course = basket.find(({ id }) => id === courseId);
|
const course = basket.find(({ id }) => id === courseId);
|
||||||
if (course !== undefined) {
|
if (course !== undefined) {
|
||||||
@ -111,6 +129,7 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
setUserID(studentId);
|
setUserID(studentId);
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
getNewestStudentTimetable(studentId);
|
getNewestStudentTimetable(studentId);
|
||||||
|
getStudentTimetablesHistory(studentId);
|
||||||
}, 100);
|
}, 100);
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -131,32 +150,30 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
`${process.env.REACT_APP_API_URL}/api/v1/commisions/user/${userID}`,
|
`${process.env.REACT_APP_API_URL}/api/v1/commisions/user/${userID}`,
|
||||||
JSON.stringify(basketIds),
|
JSON.stringify(basketIds),
|
||||||
);
|
);
|
||||||
enqueueSnackbar('Plan został zapisany', {
|
enqueueSnackbar('Ustawienia zostały zapisane', {
|
||||||
variant: 'success',
|
variant: 'success',
|
||||||
action,
|
action,
|
||||||
});
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('error: ', e);
|
console.log('error: ', e);
|
||||||
enqueueSnackbar('Zapisywanie planu nie powiodło się', {
|
enqueueSnackbar('Ustawienia nie zostały zapisane', {
|
||||||
variant: 'error',
|
variant: 'error',
|
||||||
action,
|
action,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
getStudentTimetablesHistory(userID);
|
||||||
};
|
};
|
||||||
|
|
||||||
const changeGroupInBasket = (choosenGroup: Group, courseId: number) => {
|
const changeGroupInBasket = (choosenGroup: any, courseId: number) => {
|
||||||
const basketCourse = basket.filter((course) => course.id === courseId)[0];
|
const basketCourse = basket.filter((course) => course.id === courseId)[0];
|
||||||
const { type } = choosenGroup;
|
if (choosenGroup.lecture && choosenGroup.classes)
|
||||||
if (type === GroupType.CLASS) {
|
{
|
||||||
|
const prev = choosenGroup.prev==="lecture"?choosenGroup.lecture : choosenGroup.classes
|
||||||
setBasket(
|
setBasket(
|
||||||
basket.map((basket) => (basket.id === basketCourse.id ? { ...basket, classes: choosenGroup } : basket)),
|
basket.map((basket) => (basket.id === basketCourse.id ? { ...basket, lecture: choosenGroup.lecture, classes:choosenGroup.classes } : basket)),
|
||||||
);
|
|
||||||
} else if (type === GroupType.LECTURE) {
|
|
||||||
setBasket(
|
|
||||||
basket.map((basket) => (basket.id === basketCourse.id ? { ...basket, lecture: choosenGroup } : basket)),
|
|
||||||
);
|
);
|
||||||
|
changeHoveredGroup(prev);
|
||||||
}
|
}
|
||||||
changeHoveredGroup(choosenGroup);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const restoreGroupInBasket = (restoreGroup: Group, courseId: number) => {
|
const restoreGroupInBasket = (restoreGroup: Group, courseId: number) => {
|
||||||
@ -179,8 +196,6 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
`${process.env.REACT_APP_API_URL}/api/v1/commisions/user/schedule`,
|
`${process.env.REACT_APP_API_URL}/api/v1/commisions/user/schedule`,
|
||||||
);
|
);
|
||||||
const basket = data === '' ? [] : data;
|
const basket = data === '' ? [] : data;
|
||||||
console.log('basket is: ', basket);
|
|
||||||
console.log('mordo weź');
|
|
||||||
setBasket(basket);
|
setBasket(basket);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log(e);
|
console.log(e);
|
||||||
@ -200,19 +215,59 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const getStudentTimetablesHistory = async (studentId: string) => {
|
||||||
|
try {
|
||||||
|
const { data } = await axiosInstance.get<Array<TimetableHistory> | []>(
|
||||||
|
`${process.env.REACT_APP_API_URL}/api/v1/commisions/user/${studentId}?groups=true`,
|
||||||
|
);
|
||||||
|
console.log('data is mordo: ', data);
|
||||||
|
setTimetableHistory(data);
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const fetchCourses = async () => {
|
const fetchCourses = async () => {
|
||||||
try {
|
try {
|
||||||
const { data: courses } = await axiosInstance.get<Array<Course>>(
|
const { data: courses } = await axiosInstance.get<Array<Course>>(
|
||||||
`${process.env.REACT_APP_API_URL}/api/v1/courses/all?groups=true&takenPlaces=true`,
|
`${process.env.REACT_APP_API_URL}/api/v1/courses/all?groups=true&takenPlaces=true`,
|
||||||
);
|
);
|
||||||
const sortedCourses = courses.sort((a, b) => (a.name > b.name ? 1 : -1));
|
const sortedCourses = courses.sort((a, b) => (a.name > b.name ? 1 : -1));
|
||||||
console.log('sortedCourses: ', sortedCourses);
|
|
||||||
setCourses(sortedCourses);
|
setCourses(sortedCourses);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log(e);
|
console.log(e);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const setHistoryBasketFromHistoryGroups = (groupsIds: Array<number>) => {
|
||||||
|
const basket: Array<Basket> = [];
|
||||||
|
for (const groupId of groupsIds) {
|
||||||
|
for (const course of courses) {
|
||||||
|
const { lectures, classes, name, id } = course;
|
||||||
|
let basketElement: Basket = { name: name, id: id };
|
||||||
|
if (lectures) {
|
||||||
|
for (const lecture of lectures) {
|
||||||
|
if (groupId === lecture.id) {
|
||||||
|
basketElement = { ...basketElement, lecture: lecture };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (classes) {
|
||||||
|
for (const singleClass of classes) {
|
||||||
|
if (groupId === singleClass.id) {
|
||||||
|
basketElement = { ...basketElement, classes: singleClass };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (basketElement.classes !== undefined || basketElement.lecture !== undefined) {
|
||||||
|
basket.push(basketElement);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
console.log('baskeeeeeet: ', basket);
|
||||||
|
setHistoryBasket(basket);
|
||||||
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setIsDataLoading(true);
|
setIsDataLoading(true);
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
@ -222,8 +277,6 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
}, 600);
|
}, 600);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
console.log("123,",userID,courses,basket)
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<coursesContext.Provider
|
<coursesContext.Provider
|
||||||
value={{
|
value={{
|
||||||
@ -231,7 +284,9 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
courses,
|
courses,
|
||||||
basket,
|
basket,
|
||||||
hoveredGroup,
|
hoveredGroup,
|
||||||
|
timetableHistory,
|
||||||
isDataLoading,
|
isDataLoading,
|
||||||
|
historyBasket,
|
||||||
addCourseToBasket,
|
addCourseToBasket,
|
||||||
changeHoveredGroup,
|
changeHoveredGroup,
|
||||||
changeGroupInBasket,
|
changeGroupInBasket,
|
||||||
@ -239,11 +294,14 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => {
|
|||||||
restoreGroupInBasket,
|
restoreGroupInBasket,
|
||||||
saveBasket,
|
saveBasket,
|
||||||
selectSchedulerEvents,
|
selectSchedulerEvents,
|
||||||
|
selectHistorySchedulerEvents,
|
||||||
selectBasketNames,
|
selectBasketNames,
|
||||||
selectBasketCourses,
|
selectBasketCourses,
|
||||||
selectBasketCourseGroups,
|
selectBasketCourseGroups,
|
||||||
getNewestStudentTimetable,
|
getNewestStudentTimetable,
|
||||||
changeStudent,
|
changeStudent,
|
||||||
|
getStudentTimetablesHistory,
|
||||||
|
setHistoryBasketFromHistoryGroups,
|
||||||
changeDataLoading,
|
changeDataLoading,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
import React, { useState, createContext, useEffect, ReactNode, useRef, useContext } from 'react';
|
import React, { useState, createContext, useEffect, ReactNode, useRef, useContext } from 'react';
|
||||||
import { Student } from '../types';
|
import { Student } from '../types';
|
||||||
import { axiosInstance } from '../utils/axiosInstance';
|
import { axiosInstance } from '../utils/axiosInstance';
|
||||||
import { CASContext } from './CASProvider';
|
|
||||||
|
|
||||||
interface StudentContext {
|
interface StudentContext {
|
||||||
students: Array<Student>;
|
students: Array<Student>;
|
||||||
@ -19,15 +18,12 @@ export const StudentsProvider = ({ children }: StudentsProviderProps) => {
|
|||||||
const [students, setStudents] = useState<Array<Student>>([]);
|
const [students, setStudents] = useState<Array<Student>>([]);
|
||||||
const [selectedStudent, setSelectedStudent] = useState<Student | null>(null);
|
const [selectedStudent, setSelectedStudent] = useState<Student | null>(null);
|
||||||
|
|
||||||
//not working currently
|
|
||||||
|
|
||||||
const getStudents = async () => {
|
const getStudents = async () => {
|
||||||
try {
|
try {
|
||||||
const { data } = await axiosInstance.get<Array<Student>>(
|
const { data } = await axiosInstance.get<Array<Student>>(
|
||||||
`${process.env.REACT_APP_API_URL}/api/v1/users/students`,
|
`${process.env.REACT_APP_API_URL}/api/v1/users/students`,
|
||||||
);
|
);
|
||||||
setStudents(data);
|
setStudents(data);
|
||||||
console.log(data);
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log(e);
|
console.log(e);
|
||||||
}
|
}
|
||||||
@ -40,7 +36,6 @@ export const StudentsProvider = ({ children }: StudentsProviderProps) => {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
const userPrivilige = localStorage.getItem('userPrivilige');
|
const userPrivilige = localStorage.getItem('userPrivilige');
|
||||||
console.log('mordo privilidż: ', userPrivilige);
|
|
||||||
userPrivilige === 'DEANERY' && getStudents();
|
userPrivilige === 'DEANERY' && getStudents();
|
||||||
}, 500);
|
}, 500);
|
||||||
}, []);
|
}, []);
|
||||||
|
|||||||
@ -1,33 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
import { render, screen } from '@testing-library/react';
|
|
||||||
import { CASProvider } from './contexts/CASProvider';
|
|
||||||
import { CoursesProvider } from './contexts/CoursesProvider';
|
|
||||||
import { StudentsProvider } from './contexts/StudentsProvider';
|
|
||||||
import { SnackbarProvider } from 'notistack';
|
|
||||||
|
|
||||||
export const customRender = (ui, CASValue = {}, studentsValue = {}, coursesValue = {}) => {
|
|
||||||
return render(
|
|
||||||
<SnackbarProvider>
|
|
||||||
<CASProvider value={20}>
|
|
||||||
<StudentsProvider value={50}>
|
|
||||||
<CoursesProvider value={100}>{ui}</CoursesProvider>
|
|
||||||
</StudentsProvider>
|
|
||||||
</CASProvider>
|
|
||||||
</SnackbarProvider>,
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export const customRenderCAS = (ui, CASValue = {}, studentsValue = {}, coursesValue = {}) => {
|
|
||||||
|
|
||||||
const user={authorityRole: "DEANERY", email: "test@test.pl", id: "123"}
|
|
||||||
|
|
||||||
return render(
|
|
||||||
<SnackbarProvider>
|
|
||||||
<CASProvider value={{user}}>
|
|
||||||
<StudentsProvider value={50}>
|
|
||||||
<CoursesProvider value={100}>{ui}</CoursesProvider>
|
|
||||||
</StudentsProvider>
|
|
||||||
</CASProvider>
|
|
||||||
</SnackbarProvider>,
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@ -54,3 +54,20 @@ export interface SchedulerEvent {
|
|||||||
takenPlaces: number;
|
takenPlaces: number;
|
||||||
name: string;
|
name: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface TimetableHistory {
|
||||||
|
commisionDate: Date;
|
||||||
|
commiter: {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
surname: string;
|
||||||
|
email: string;
|
||||||
|
};
|
||||||
|
groups: Array<number>;
|
||||||
|
owner: {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
surname: string;
|
||||||
|
email: string;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|||||||
@ -37,7 +37,6 @@ axiosInstance.interceptors.response.use(
|
|||||||
},
|
},
|
||||||
async (error) => {
|
async (error) => {
|
||||||
const originalRequest = error.config;
|
const originalRequest = error.config;
|
||||||
console.log("original request is: ", originalRequest)
|
|
||||||
if (error.response.status === 403 && !originalRequest._retry) {
|
if (error.response.status === 403 && !originalRequest._retry) {
|
||||||
originalRequest._retry = true;
|
originalRequest._retry = true;
|
||||||
const access_token = await getNewTokens();
|
const access_token = await getNewTokens();
|
||||||
|
|||||||
296
yarn.lock
296
yarn.lock
@ -1138,7 +1138,7 @@
|
|||||||
"@babel/helper-plugin-utils" "^7.8.3"
|
"@babel/helper-plugin-utils" "^7.8.3"
|
||||||
"@babel/plugin-transform-typescript" "^7.9.0"
|
"@babel/plugin-transform-typescript" "^7.9.0"
|
||||||
|
|
||||||
"@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.12.1":
|
"@babel/runtime-corejs3@^7.12.1":
|
||||||
version "7.12.5"
|
version "7.12.5"
|
||||||
resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.12.5.tgz#ffee91da0eb4c6dae080774e94ba606368e414f4"
|
resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.12.5.tgz#ffee91da0eb4c6dae080774e94ba606368e414f4"
|
||||||
integrity sha512-roGr54CsTmNPPzZoCP1AmDXuBoNao7tnSA83TXTwt+UK5QVyh1DIJnrgYRPWKCF2flqZQXwa7Yr8v7VmLzF0YQ==
|
integrity sha512-roGr54CsTmNPPzZoCP1AmDXuBoNao7tnSA83TXTwt+UK5QVyh1DIJnrgYRPWKCF2flqZQXwa7Yr8v7VmLzF0YQ==
|
||||||
@ -1153,7 +1153,7 @@
|
|||||||
dependencies:
|
dependencies:
|
||||||
regenerator-runtime "^0.13.4"
|
regenerator-runtime "^0.13.4"
|
||||||
|
|
||||||
"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
|
"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.7":
|
||||||
version "7.12.5"
|
version "7.12.5"
|
||||||
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
|
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
|
||||||
integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
|
integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
|
||||||
@ -1515,17 +1515,6 @@
|
|||||||
"@types/istanbul-reports" "^1.1.1"
|
"@types/istanbul-reports" "^1.1.1"
|
||||||
"@types/yargs" "^13.0.0"
|
"@types/yargs" "^13.0.0"
|
||||||
|
|
||||||
"@jest/types@^26.6.2":
|
|
||||||
version "26.6.2"
|
|
||||||
resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
|
|
||||||
integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
|
|
||||||
dependencies:
|
|
||||||
"@types/istanbul-lib-coverage" "^2.0.0"
|
|
||||||
"@types/istanbul-reports" "^3.0.0"
|
|
||||||
"@types/node" "*"
|
|
||||||
"@types/yargs" "^15.0.0"
|
|
||||||
chalk "^4.0.0"
|
|
||||||
|
|
||||||
"@material-ui/core@^4.10.0":
|
"@material-ui/core@^4.10.0":
|
||||||
version "4.11.0"
|
version "4.11.0"
|
||||||
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.0.tgz#b69b26e4553c9e53f2bfaf1053e216a0af9be15a"
|
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.0.tgz#b69b26e4553c9e53f2bfaf1053e216a0af9be15a"
|
||||||
@ -1745,47 +1734,6 @@
|
|||||||
"@svgr/plugin-svgo" "^4.3.1"
|
"@svgr/plugin-svgo" "^4.3.1"
|
||||||
loader-utils "^1.2.3"
|
loader-utils "^1.2.3"
|
||||||
|
|
||||||
"@testing-library/dom@^7.28.1":
|
|
||||||
version "7.29.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.29.0.tgz#60b18065bab50a5cde21fe80275a47a43024d9cc"
|
|
||||||
integrity sha512-0hhuJSmw/zLc6ewR9cVm84TehuTd7tbqBX9pRNSp8znJ9gTmSgesdbiGZtt8R6dL+2rgaPFp9Yjr7IU1HWm49w==
|
|
||||||
dependencies:
|
|
||||||
"@babel/code-frame" "^7.10.4"
|
|
||||||
"@babel/runtime" "^7.12.5"
|
|
||||||
"@types/aria-query" "^4.2.0"
|
|
||||||
aria-query "^4.2.2"
|
|
||||||
chalk "^4.1.0"
|
|
||||||
dom-accessibility-api "^0.5.4"
|
|
||||||
lz-string "^1.4.4"
|
|
||||||
pretty-format "^26.6.2"
|
|
||||||
|
|
||||||
"@testing-library/jest-dom@^5.11.6":
|
|
||||||
version "5.11.6"
|
|
||||||
resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.11.6.tgz#782940e82e5cd17bc0a36f15156ba16f3570ac81"
|
|
||||||
integrity sha512-cVZyUNRWwUKI0++yepYpYX7uhrP398I+tGz4zOlLVlUYnZS+Svuxv4fwLeCIy7TnBYKXUaOlQr3vopxL8ZfEnA==
|
|
||||||
dependencies:
|
|
||||||
"@babel/runtime" "^7.9.2"
|
|
||||||
"@types/testing-library__jest-dom" "^5.9.1"
|
|
||||||
aria-query "^4.2.2"
|
|
||||||
chalk "^3.0.0"
|
|
||||||
css "^3.0.0"
|
|
||||||
css.escape "^1.5.1"
|
|
||||||
lodash "^4.17.15"
|
|
||||||
redent "^3.0.0"
|
|
||||||
|
|
||||||
"@testing-library/react@^11.2.2":
|
|
||||||
version "11.2.2"
|
|
||||||
resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.2.tgz#099c6c195140ff069211143cb31c0f8337bdb7b7"
|
|
||||||
integrity sha512-jaxm0hwUjv+hzC+UFEywic7buDC9JQ1q3cDsrWVSDAPmLotfA6E6kUHlYm/zOeGCac6g48DR36tFHxl7Zb+N5A==
|
|
||||||
dependencies:
|
|
||||||
"@babel/runtime" "^7.12.5"
|
|
||||||
"@testing-library/dom" "^7.28.1"
|
|
||||||
|
|
||||||
"@types/aria-query@^4.2.0":
|
|
||||||
version "4.2.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz#14264692a9d6e2fa4db3df5e56e94b5e25647ac0"
|
|
||||||
integrity sha512-iIgQNzCm0v7QMhhe4Jjn9uRh+I6GoPmt03CbEtwx3ao8/EfoQcmgtqH4vQ5Db/lxiIGaWDv6nwvunuh0RyX0+A==
|
|
||||||
|
|
||||||
"@types/babel__core@^7.1.0":
|
"@types/babel__core@^7.1.0":
|
||||||
version "7.1.12"
|
version "7.1.12"
|
||||||
resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"
|
resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"
|
||||||
@ -1860,21 +1808,6 @@
|
|||||||
"@types/istanbul-lib-coverage" "*"
|
"@types/istanbul-lib-coverage" "*"
|
||||||
"@types/istanbul-lib-report" "*"
|
"@types/istanbul-lib-report" "*"
|
||||||
|
|
||||||
"@types/istanbul-reports@^3.0.0":
|
|
||||||
version "3.0.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821"
|
|
||||||
integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==
|
|
||||||
dependencies:
|
|
||||||
"@types/istanbul-lib-report" "*"
|
|
||||||
|
|
||||||
"@types/jest@*", "@types/jest@26.x", "@types/jest@^26.0.19":
|
|
||||||
version "26.0.19"
|
|
||||||
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.19.tgz#e6fa1e3def5842ec85045bd5210e9bb8289de790"
|
|
||||||
integrity sha512-jqHoirTG61fee6v6rwbnEuKhpSKih0tuhqeFbCmMmErhtu3BYlOZaXWjffgOstMM4S/3iQD31lI5bGLTrs97yQ==
|
|
||||||
dependencies:
|
|
||||||
jest-diff "^26.0.0"
|
|
||||||
pretty-format "^26.0.0"
|
|
||||||
|
|
||||||
"@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5":
|
"@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5":
|
||||||
version "7.0.6"
|
version "7.0.6"
|
||||||
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
|
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
|
||||||
@ -1956,13 +1889,6 @@
|
|||||||
"@types/react-native" "*"
|
"@types/react-native" "*"
|
||||||
csstype "^3.0.2"
|
csstype "^3.0.2"
|
||||||
|
|
||||||
"@types/testing-library__jest-dom@^5.9.1":
|
|
||||||
version "5.9.5"
|
|
||||||
resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.5.tgz#5bf25c91ad2d7b38f264b12275e5c92a66d849b0"
|
|
||||||
integrity sha512-ggn3ws+yRbOHog9GxnXiEZ/35Mow6YtPZpd7Z5mKDeZS/o7zx3yAle0ov/wjhVB5QT4N2Dt+GNoGCdqkBGCajQ==
|
|
||||||
dependencies:
|
|
||||||
"@types/jest" "*"
|
|
||||||
|
|
||||||
"@types/yargs-parser@*":
|
"@types/yargs-parser@*":
|
||||||
version "15.0.0"
|
version "15.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
|
resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
|
||||||
@ -1975,13 +1901,6 @@
|
|||||||
dependencies:
|
dependencies:
|
||||||
"@types/yargs-parser" "*"
|
"@types/yargs-parser" "*"
|
||||||
|
|
||||||
"@types/yargs@^15.0.0":
|
|
||||||
version "15.0.12"
|
|
||||||
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.12.tgz#6234ce3e3e3fa32c5db301a170f96a599c960d74"
|
|
||||||
integrity sha512-f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw==
|
|
||||||
dependencies:
|
|
||||||
"@types/yargs-parser" "*"
|
|
||||||
|
|
||||||
"@typescript-eslint/eslint-plugin@^2.10.0":
|
"@typescript-eslint/eslint-plugin@^2.10.0":
|
||||||
version "2.34.0"
|
version "2.34.0"
|
||||||
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz#6f8ce8a46c7dea4a6f1d171d2bb8fbae6dac2be9"
|
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz#6f8ce8a46c7dea4a6f1d171d2bb8fbae6dac2be9"
|
||||||
@ -2400,7 +2319,7 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
color-convert "^1.9.0"
|
color-convert "^1.9.0"
|
||||||
|
|
||||||
ansi-styles@^4.0.0, ansi-styles@^4.1.0:
|
ansi-styles@^4.1.0:
|
||||||
version "4.3.0"
|
version "4.3.0"
|
||||||
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
|
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
|
||||||
integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
|
integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
|
||||||
@ -2443,14 +2362,6 @@ aria-query@^3.0.0:
|
|||||||
ast-types-flow "0.0.7"
|
ast-types-flow "0.0.7"
|
||||||
commander "^2.11.0"
|
commander "^2.11.0"
|
||||||
|
|
||||||
aria-query@^4.2.2:
|
|
||||||
version "4.2.2"
|
|
||||||
resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"
|
|
||||||
integrity sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==
|
|
||||||
dependencies:
|
|
||||||
"@babel/runtime" "^7.10.2"
|
|
||||||
"@babel/runtime-corejs3" "^7.10.2"
|
|
||||||
|
|
||||||
arity-n@^1.0.4:
|
arity-n@^1.0.4:
|
||||||
version "1.0.4"
|
version "1.0.4"
|
||||||
resolved "https://registry.yarnpkg.com/arity-n/-/arity-n-1.0.4.tgz#d9e76b11733e08569c0847ae7b39b2860b30b745"
|
resolved "https://registry.yarnpkg.com/arity-n/-/arity-n-1.0.4.tgz#d9e76b11733e08569c0847ae7b39b2860b30b745"
|
||||||
@ -3085,13 +2996,6 @@ browserslist@^4.14.5, browserslist@^4.14.6, browserslist@^4.9.1:
|
|||||||
escalade "^3.1.1"
|
escalade "^3.1.1"
|
||||||
node-releases "^1.1.66"
|
node-releases "^1.1.66"
|
||||||
|
|
||||||
bs-logger@0.x:
|
|
||||||
version "0.2.6"
|
|
||||||
resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
|
|
||||||
integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
|
|
||||||
dependencies:
|
|
||||||
fast-json-stable-stringify "2.x"
|
|
||||||
|
|
||||||
bser@2.1.1:
|
bser@2.1.1:
|
||||||
version "2.1.1"
|
version "2.1.1"
|
||||||
resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
|
resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
|
||||||
@ -3099,7 +3003,7 @@ bser@2.1.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
node-int64 "^0.4.0"
|
node-int64 "^0.4.0"
|
||||||
|
|
||||||
buffer-from@1.x, buffer-from@^1.0.0:
|
buffer-from@^1.0.0:
|
||||||
version "1.1.1"
|
version "1.1.1"
|
||||||
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
|
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
|
||||||
integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
|
integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
|
||||||
@ -3315,15 +3219,7 @@ chalk@^1.1.3:
|
|||||||
strip-ansi "^3.0.0"
|
strip-ansi "^3.0.0"
|
||||||
supports-color "^2.0.0"
|
supports-color "^2.0.0"
|
||||||
|
|
||||||
chalk@^3.0.0:
|
chalk@^4.1.0:
|
||||||
version "3.0.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
|
|
||||||
integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
|
|
||||||
dependencies:
|
|
||||||
ansi-styles "^4.1.0"
|
|
||||||
supports-color "^7.1.0"
|
|
||||||
|
|
||||||
chalk@^4.0.0, chalk@^4.1.0:
|
|
||||||
version "4.1.0"
|
version "4.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
|
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
|
||||||
integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
|
integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
|
||||||
@ -3960,11 +3856,6 @@ css-what@^3.2.1:
|
|||||||
resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
|
resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
|
||||||
integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
|
integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
|
||||||
|
|
||||||
css.escape@^1.5.1:
|
|
||||||
version "1.5.1"
|
|
||||||
resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
|
|
||||||
integrity sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=
|
|
||||||
|
|
||||||
css@^2.0.0:
|
css@^2.0.0:
|
||||||
version "2.2.4"
|
version "2.2.4"
|
||||||
resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
|
resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
|
||||||
@ -3975,15 +3866,6 @@ css@^2.0.0:
|
|||||||
source-map-resolve "^0.5.2"
|
source-map-resolve "^0.5.2"
|
||||||
urix "^0.1.0"
|
urix "^0.1.0"
|
||||||
|
|
||||||
css@^3.0.0:
|
|
||||||
version "3.0.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d"
|
|
||||||
integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==
|
|
||||||
dependencies:
|
|
||||||
inherits "^2.0.4"
|
|
||||||
source-map "^0.6.1"
|
|
||||||
source-map-resolve "^0.6.0"
|
|
||||||
|
|
||||||
cssdb@^4.4.0:
|
cssdb@^4.4.0:
|
||||||
version "4.4.0"
|
version "4.4.0"
|
||||||
resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-4.4.0.tgz#3bf2f2a68c10f5c6a08abd92378331ee803cddb0"
|
resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-4.4.0.tgz#3bf2f2a68c10f5c6a08abd92378331ee803cddb0"
|
||||||
@ -4281,11 +4163,6 @@ diff-sequences@^24.9.0:
|
|||||||
resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
|
resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
|
||||||
integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
|
integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
|
||||||
|
|
||||||
diff-sequences@^26.6.2:
|
|
||||||
version "26.6.2"
|
|
||||||
resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
|
|
||||||
integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
|
|
||||||
|
|
||||||
diffie-hellman@^5.0.0:
|
diffie-hellman@^5.0.0:
|
||||||
version "5.0.3"
|
version "5.0.3"
|
||||||
resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
|
resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
|
||||||
@ -4352,11 +4229,6 @@ doctrine@^3.0.0:
|
|||||||
dependencies:
|
dependencies:
|
||||||
esutils "^2.0.2"
|
esutils "^2.0.2"
|
||||||
|
|
||||||
dom-accessibility-api@^0.5.4:
|
|
||||||
version "0.5.4"
|
|
||||||
resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.4.tgz#b06d059cdd4a4ad9a79275f9d414a5c126241166"
|
|
||||||
integrity sha512-TvrjBckDy2c6v6RLxPv5QXOnU+SmF9nBII5621Ve5fu6Z/BDrENurBEvlC1f44lKEUVqOpK4w9E5Idc5/EgkLQ==
|
|
||||||
|
|
||||||
dom-converter@^0.2:
|
dom-converter@^0.2:
|
||||||
version "0.2.0"
|
version "0.2.0"
|
||||||
resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
|
resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
|
||||||
@ -5163,7 +5035,7 @@ fast-glob@^3.1.1:
|
|||||||
micromatch "^4.0.2"
|
micromatch "^4.0.2"
|
||||||
picomatch "^2.2.1"
|
picomatch "^2.2.1"
|
||||||
|
|
||||||
fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
|
fast-json-stable-stringify@^2.0.0:
|
||||||
version "2.1.0"
|
version "2.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
|
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
|
||||||
integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
|
integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
|
||||||
@ -5665,7 +5537,7 @@ globby@^6.1.0:
|
|||||||
pify "^2.0.0"
|
pify "^2.0.0"
|
||||||
pinkie-promise "^2.0.0"
|
pinkie-promise "^2.0.0"
|
||||||
|
|
||||||
graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4:
|
graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2:
|
||||||
version "4.2.4"
|
version "4.2.4"
|
||||||
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
|
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
|
||||||
integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
|
integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
|
||||||
@ -6659,16 +6531,6 @@ jest-diff@^24.9.0:
|
|||||||
jest-get-type "^24.9.0"
|
jest-get-type "^24.9.0"
|
||||||
pretty-format "^24.9.0"
|
pretty-format "^24.9.0"
|
||||||
|
|
||||||
jest-diff@^26.0.0:
|
|
||||||
version "26.6.2"
|
|
||||||
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
|
|
||||||
integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
|
|
||||||
dependencies:
|
|
||||||
chalk "^4.0.0"
|
|
||||||
diff-sequences "^26.6.2"
|
|
||||||
jest-get-type "^26.3.0"
|
|
||||||
pretty-format "^26.6.2"
|
|
||||||
|
|
||||||
jest-docblock@^24.3.0:
|
jest-docblock@^24.3.0:
|
||||||
version "24.9.0"
|
version "24.9.0"
|
||||||
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.9.0.tgz#7970201802ba560e1c4092cc25cbedf5af5a8ce2"
|
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.9.0.tgz#7970201802ba560e1c4092cc25cbedf5af5a8ce2"
|
||||||
@ -6727,11 +6589,6 @@ jest-get-type@^24.9.0:
|
|||||||
resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
|
resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
|
||||||
integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==
|
integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==
|
||||||
|
|
||||||
jest-get-type@^26.3.0:
|
|
||||||
version "26.3.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
|
|
||||||
integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
|
|
||||||
|
|
||||||
jest-haste-map@^24.9.0:
|
jest-haste-map@^24.9.0:
|
||||||
version "24.9.0"
|
version "24.9.0"
|
||||||
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.9.0.tgz#b38a5d64274934e21fa417ae9a9fbeb77ceaac7d"
|
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.9.0.tgz#b38a5d64274934e21fa417ae9a9fbeb77ceaac7d"
|
||||||
@ -6938,18 +6795,6 @@ jest-util@^24.0.0, jest-util@^24.9.0:
|
|||||||
slash "^2.0.0"
|
slash "^2.0.0"
|
||||||
source-map "^0.6.0"
|
source-map "^0.6.0"
|
||||||
|
|
||||||
jest-util@^26.1.0:
|
|
||||||
version "26.6.2"
|
|
||||||
resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
|
|
||||||
integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==
|
|
||||||
dependencies:
|
|
||||||
"@jest/types" "^26.6.2"
|
|
||||||
"@types/node" "*"
|
|
||||||
chalk "^4.0.0"
|
|
||||||
graceful-fs "^4.2.4"
|
|
||||||
is-ci "^2.0.0"
|
|
||||||
micromatch "^4.0.2"
|
|
||||||
|
|
||||||
jest-validate@^24.9.0:
|
jest-validate@^24.9.0:
|
||||||
version "24.9.0"
|
version "24.9.0"
|
||||||
resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab"
|
resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab"
|
||||||
@ -7151,13 +6996,6 @@ json3@^3.3.2:
|
|||||||
resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
|
resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
|
||||||
integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
|
integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
|
||||||
|
|
||||||
json5@2.x, json5@^2.1.2:
|
|
||||||
version "2.1.3"
|
|
||||||
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
|
|
||||||
integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
|
|
||||||
dependencies:
|
|
||||||
minimist "^1.2.5"
|
|
||||||
|
|
||||||
json5@^1.0.1:
|
json5@^1.0.1:
|
||||||
version "1.0.1"
|
version "1.0.1"
|
||||||
resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
|
resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
|
||||||
@ -7165,6 +7003,13 @@ json5@^1.0.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
minimist "^1.2.0"
|
minimist "^1.2.0"
|
||||||
|
|
||||||
|
json5@^2.1.2:
|
||||||
|
version "2.1.3"
|
||||||
|
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
|
||||||
|
integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
|
||||||
|
dependencies:
|
||||||
|
minimist "^1.2.5"
|
||||||
|
|
||||||
jsonfile@^4.0.0:
|
jsonfile@^4.0.0:
|
||||||
version "4.0.0"
|
version "4.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
|
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
|
||||||
@ -7458,7 +7303,7 @@ lodash._reinterpolate@^3.0.0:
|
|||||||
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
|
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
|
||||||
integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
|
integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
|
||||||
|
|
||||||
lodash.memoize@4.x, lodash.memoize@^4.1.2:
|
lodash.memoize@^4.1.2:
|
||||||
version "4.1.2"
|
version "4.1.2"
|
||||||
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
|
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
|
||||||
integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
|
integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
|
||||||
@ -7519,18 +7364,6 @@ lru-cache@^5.1.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
yallist "^3.0.2"
|
yallist "^3.0.2"
|
||||||
|
|
||||||
lru-cache@^6.0.0:
|
|
||||||
version "6.0.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
|
|
||||||
integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
|
|
||||||
dependencies:
|
|
||||||
yallist "^4.0.0"
|
|
||||||
|
|
||||||
lz-string@^1.4.4:
|
|
||||||
version "1.4.4"
|
|
||||||
resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26"
|
|
||||||
integrity sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY=
|
|
||||||
|
|
||||||
make-dir@^2.0.0, make-dir@^2.1.0:
|
make-dir@^2.0.0, make-dir@^2.1.0:
|
||||||
version "2.1.0"
|
version "2.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
|
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
|
||||||
@ -7546,11 +7379,6 @@ make-dir@^3.0.2:
|
|||||||
dependencies:
|
dependencies:
|
||||||
semver "^6.0.0"
|
semver "^6.0.0"
|
||||||
|
|
||||||
make-error@1.x:
|
|
||||||
version "1.3.6"
|
|
||||||
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
|
|
||||||
integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
|
|
||||||
|
|
||||||
makeerror@1.0.x:
|
makeerror@1.0.x:
|
||||||
version "1.0.11"
|
version "1.0.11"
|
||||||
resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
|
resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
|
||||||
@ -7732,11 +7560,6 @@ mimic-fn@^2.0.0, mimic-fn@^2.1.0:
|
|||||||
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
|
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
|
||||||
integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
|
integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
|
||||||
|
|
||||||
min-indent@^1.0.0:
|
|
||||||
version "1.0.1"
|
|
||||||
resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
|
|
||||||
integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
|
|
||||||
|
|
||||||
mini-css-extract-plugin@0.9.0:
|
mini-css-extract-plugin@0.9.0:
|
||||||
version "0.9.0"
|
version "0.9.0"
|
||||||
resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz#47f2cf07aa165ab35733b1fc97d4c46c0564339e"
|
resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz#47f2cf07aa165ab35733b1fc97d4c46c0564339e"
|
||||||
@ -7829,11 +7652,6 @@ mixin-object@^2.0.1:
|
|||||||
for-in "^0.1.3"
|
for-in "^0.1.3"
|
||||||
is-extendable "^0.1.1"
|
is-extendable "^0.1.1"
|
||||||
|
|
||||||
mkdirp@1.x:
|
|
||||||
version "1.0.4"
|
|
||||||
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
|
|
||||||
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
|
|
||||||
|
|
||||||
mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
|
mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
|
||||||
version "0.5.5"
|
version "0.5.5"
|
||||||
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
|
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
|
||||||
@ -9373,16 +9191,6 @@ pretty-format@^24.9.0:
|
|||||||
ansi-styles "^3.2.0"
|
ansi-styles "^3.2.0"
|
||||||
react-is "^16.8.4"
|
react-is "^16.8.4"
|
||||||
|
|
||||||
pretty-format@^26.0.0, pretty-format@^26.6.2:
|
|
||||||
version "26.6.2"
|
|
||||||
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
|
|
||||||
integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
|
|
||||||
dependencies:
|
|
||||||
"@jest/types" "^26.6.2"
|
|
||||||
ansi-regex "^5.0.0"
|
|
||||||
ansi-styles "^4.0.0"
|
|
||||||
react-is "^17.0.1"
|
|
||||||
|
|
||||||
process-nextick-args@~2.0.0:
|
process-nextick-args@~2.0.0:
|
||||||
version "2.0.1"
|
version "2.0.1"
|
||||||
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
|
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
|
||||||
@ -9639,11 +9447,6 @@ react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.1, react-is@^16.8.4:
|
|||||||
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
|
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
|
||||||
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
|
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
|
||||||
|
|
||||||
react-is@^17.0.1:
|
|
||||||
version "17.0.1"
|
|
||||||
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
|
|
||||||
integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
|
|
||||||
|
|
||||||
react-lifecycles-compat@^3.0.4:
|
react-lifecycles-compat@^3.0.4:
|
||||||
version "3.0.4"
|
version "3.0.4"
|
||||||
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
|
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
|
||||||
@ -9745,14 +9548,15 @@ react-transition-group@^4.4.0:
|
|||||||
loose-envify "^1.4.0"
|
loose-envify "^1.4.0"
|
||||||
prop-types "^15.6.2"
|
prop-types "^15.6.2"
|
||||||
|
|
||||||
react@16.9.0:
|
react@16.8.0:
|
||||||
version "16.9.0"
|
version "16.8.0"
|
||||||
resolved "https://registry.yarnpkg.com/react/-/react-16.9.0.tgz#40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa"
|
resolved "https://registry.yarnpkg.com/react/-/react-16.8.0.tgz#8533f0e4af818f448a276eae71681d09e8dd970a"
|
||||||
integrity sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w==
|
integrity sha512-g+nikW2D48kqgWSPwNo0NH9tIGG3DsQFlrtrQ1kj6W77z5ahyIHG0w8kPpz4Sdj6gyLnz0lEd/xsjOoGge2MYQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
loose-envify "^1.1.0"
|
loose-envify "^1.1.0"
|
||||||
object-assign "^4.1.1"
|
object-assign "^4.1.1"
|
||||||
prop-types "^15.6.2"
|
prop-types "^15.6.2"
|
||||||
|
scheduler "^0.13.0"
|
||||||
|
|
||||||
read-pkg-up@^2.0.0:
|
read-pkg-up@^2.0.0:
|
||||||
version "2.0.0"
|
version "2.0.0"
|
||||||
@ -9840,14 +9644,6 @@ recursive-readdir@2.2.2:
|
|||||||
dependencies:
|
dependencies:
|
||||||
minimatch "3.0.4"
|
minimatch "3.0.4"
|
||||||
|
|
||||||
redent@^3.0.0:
|
|
||||||
version "3.0.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
|
|
||||||
integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
|
|
||||||
dependencies:
|
|
||||||
indent-string "^4.0.0"
|
|
||||||
strip-indent "^3.0.0"
|
|
||||||
|
|
||||||
regenerate-unicode-properties@^8.2.0:
|
regenerate-unicode-properties@^8.2.0:
|
||||||
version "8.2.0"
|
version "8.2.0"
|
||||||
resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
|
resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
|
||||||
@ -10253,6 +10049,14 @@ saxes@^3.1.9:
|
|||||||
dependencies:
|
dependencies:
|
||||||
xmlchars "^2.1.1"
|
xmlchars "^2.1.1"
|
||||||
|
|
||||||
|
scheduler@^0.13.0:
|
||||||
|
version "0.13.6"
|
||||||
|
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889"
|
||||||
|
integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==
|
||||||
|
dependencies:
|
||||||
|
loose-envify "^1.1.0"
|
||||||
|
object-assign "^4.1.1"
|
||||||
|
|
||||||
scheduler@^0.19.1:
|
scheduler@^0.19.1:
|
||||||
version "0.19.1"
|
version "0.19.1"
|
||||||
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
|
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
|
||||||
@ -10306,13 +10110,6 @@ semver@7.0.0:
|
|||||||
resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
|
resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
|
||||||
integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
|
integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
|
||||||
|
|
||||||
semver@7.x:
|
|
||||||
version "7.3.4"
|
|
||||||
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
|
|
||||||
integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
|
|
||||||
dependencies:
|
|
||||||
lru-cache "^6.0.0"
|
|
||||||
|
|
||||||
semver@^7.3.2:
|
semver@^7.3.2:
|
||||||
version "7.3.2"
|
version "7.3.2"
|
||||||
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
|
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
|
||||||
@ -10588,14 +10385,6 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
|
|||||||
source-map-url "^0.4.0"
|
source-map-url "^0.4.0"
|
||||||
urix "^0.1.0"
|
urix "^0.1.0"
|
||||||
|
|
||||||
source-map-resolve@^0.6.0:
|
|
||||||
version "0.6.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
|
|
||||||
integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==
|
|
||||||
dependencies:
|
|
||||||
atob "^2.1.2"
|
|
||||||
decode-uri-component "^0.2.0"
|
|
||||||
|
|
||||||
source-map-support@^0.5.6, source-map-support@~0.5.12:
|
source-map-support@^0.5.6, source-map-support@~0.5.12:
|
||||||
version "0.5.19"
|
version "0.5.19"
|
||||||
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
|
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
|
||||||
@ -10925,13 +10714,6 @@ strip-eof@^1.0.0:
|
|||||||
resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
|
resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
|
||||||
integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
|
integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
|
||||||
|
|
||||||
strip-indent@^3.0.0:
|
|
||||||
version "3.0.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
|
|
||||||
integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
|
|
||||||
dependencies:
|
|
||||||
min-indent "^1.0.0"
|
|
||||||
|
|
||||||
strip-json-comments@^3.0.1:
|
strip-json-comments@^3.0.1:
|
||||||
version "3.1.1"
|
version "3.1.1"
|
||||||
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
|
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
|
||||||
@ -11213,23 +10995,6 @@ tr46@^1.0.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
punycode "^2.1.0"
|
punycode "^2.1.0"
|
||||||
|
|
||||||
ts-jest@^26.4.4:
|
|
||||||
version "26.4.4"
|
|
||||||
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.4.4.tgz#61f13fb21ab400853c532270e52cc0ed7e502c49"
|
|
||||||
integrity sha512-3lFWKbLxJm34QxyVNNCgXX1u4o/RV0myvA2y2Bxm46iGIjKlaY0own9gIckbjZJPn+WaJEnfPPJ20HHGpoq4yg==
|
|
||||||
dependencies:
|
|
||||||
"@types/jest" "26.x"
|
|
||||||
bs-logger "0.x"
|
|
||||||
buffer-from "1.x"
|
|
||||||
fast-json-stable-stringify "2.x"
|
|
||||||
jest-util "^26.1.0"
|
|
||||||
json5 "2.x"
|
|
||||||
lodash.memoize "4.x"
|
|
||||||
make-error "1.x"
|
|
||||||
mkdirp "1.x"
|
|
||||||
semver "7.x"
|
|
||||||
yargs-parser "20.x"
|
|
||||||
|
|
||||||
ts-pnp@1.1.6:
|
ts-pnp@1.1.6:
|
||||||
version "1.1.6"
|
version "1.1.6"
|
||||||
resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.6.tgz#389a24396d425a0d3162e96d2b4638900fdc289a"
|
resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.6.tgz#389a24396d425a0d3162e96d2b4638900fdc289a"
|
||||||
@ -12004,11 +11769,6 @@ yaml@^1.7.2:
|
|||||||
resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
|
resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
|
||||||
integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
|
integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
|
||||||
|
|
||||||
yargs-parser@20.x:
|
|
||||||
version "20.2.4"
|
|
||||||
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
|
|
||||||
integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
|
|
||||||
|
|
||||||
yargs-parser@^11.1.1:
|
yargs-parser@^11.1.1:
|
||||||
version "11.1.1"
|
version "11.1.1"
|
||||||
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
|
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
|
||||||
|
|||||||
Reference in New Issue
Block a user