Added Home, SubjectList and Card components

This commit is contained in:
Dm1tr1y147 2020-09-16 07:51:14 +05:00
parent cb7e45a550
commit 4ed055dcb6
16 changed files with 668 additions and 55 deletions

View File

@ -6,10 +6,16 @@
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
"@types/node": "^14.10.1",
"@types/react": "^16.9.49",
"@types/react-dom": "^16.9.8",
"@types/react-router-dom": "^5.1.5",
"framer-motion": "2.3.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-scripts": "3.4.3"
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.3",
"typescript": "^4.0.2"
},
"scripts": {
"start": "react-scripts start",

View File

@ -1,13 +0,0 @@
import React from "react";
import "./App.css";
import Navbar from "./Navbar";
function App() {
return (
<div className="App">
<Navbar />
</div>
);
}
export default App;

66
src/App.tsx Normal file
View File

@ -0,0 +1,66 @@
import React from "react";
import { Switch, Route, useLocation } from "react-router-dom";
import "./App.css";
import Home from "./Home";
import Navbar from "./Navbar";
import SubjectList from "./SubjectList";
const genName = (path: string, search?: string): string => {
if (path === "/list" && search) {
search = decodeURI(search);
let query: any = {};
search
.split("?")
.slice(1)
.map((param) => (query[param.split("=")[0]] = param.split("=")[1]));
let result = "";
if (query.clas) {
result = result + query.clas + " класс";
}
if (query.subject) {
result = result + ", " + query.subject;
}
if (query.teacher) {
result = result + ", " + query.teacher;
}
return result;
}
if (path === "/") {
return "Банк семинаров";
}
return "";
};
function App() {
const location = useLocation();
return (
<div>
<header id="name">
<h1>{genName(location.pathname, location.search)}</h1>
</header>
<Navbar />
<Switch>
<Route exact path="/">
<Home />
</Route>
<Route path="/list">
<SubjectList />
</Route>
<Route path="*">
<h1>404</h1>
</Route>
</Switch>
</div>
);
}
export default App;

12
src/Card/index.jsx Normal file
View File

@ -0,0 +1,12 @@
import React from "react";
import './main.css'
const Card = (props) => (
<a className="card" href={ '/' + props.data.image.slice(props.data.image.indexOf('media'))}>
<h4 className="cardTitle">{props.data.title}</h4>
<h5 className="cardTeacher">{props.data.teacher}</h5>
</a>
);
export default Card;

19
src/Card/main.css Normal file
View File

@ -0,0 +1,19 @@
.card {
padding: 1.5vh;
box-shadow: 0 1px 6px 0 rgba(255, 109, 109, .16);
border-radius: 0.75vh;
min-width: 35vw;
background-color: rgb(255, 109, 109);
color: #ffffff;
white-space: nowrap;
text-decoration: none;
}
.carousel .card {
max-width: 50vw;
}
.card h4 {
text-overflow: ellipsis;
overflow: hidden;
}

187
src/Home/index.jsx Normal file
View File

@ -0,0 +1,187 @@
import React from "react";
import { Link } from "react-router-dom";
import Card from "../Card";
import "./main.css";
const data = [
{
title: "Семинар 10",
type_num: "Семинары",
class_num: "1",
post_date: "2020-09-15",
predmet_type: "Математика",
teacher: "Ню В.В",
image:
"/code/media/card_img/bxd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd0xb0xd1x80_10_xd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd_lN2D1k2.jpg",
slug: "card-3-11-2020-09-15",
card_id: 3,
},
{
title: "Семинар 10",
type_num: "Семинары",
class_num: "1",
post_date: "2020-09-15",
predmet_type: "Физика",
teacher: "Ню В.В",
image:
"/code/media/card_img/bxd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd0xb0xd1x80_10_xd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd_lN2D1k2.jpg",
slug: "card-3-11-2020-09-15",
card_id: 3,
},
{
title: "Семинар 10",
type_num: "Семинары",
class_num: "1",
post_date: "2020-09-15",
predmet_type: "Математика",
teacher: "Ню В.В",
image:
"/code/media/card_img/bxd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd0xb0xd1x80_10_xd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd_lN2D1k2.jpg",
slug: "card-3-11-2020-09-15",
card_id: 1,
},
{
title: "Very long text, too long to show it full",
type_num: "Семинары",
class_num: "2",
post_date: "2020-09-15",
predmet_type: "Математика",
teacher: "Ню В.В",
image:
"/code/media/card_img/bxd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd0xb0xd1x80_10_xd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd_lN2D1k2.jpg",
slug: "card-3-11-2020-09-15",
card_id: 2,
},
{
title: "Семинар 10",
type_num: "Семинары",
class_num: "2",
post_date: "2020-09-15",
predmet_type: "Математика",
teacher: "Ню В.В",
image:
"/code/media/card_img/bxd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd0xb0xd1x80_10_xd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd_lN2D1k2.jpg",
slug: "card-3-11-2020-09-15",
card_id: 3,
},
{
title: "Семинар 10",
type_num: "Семинары",
class_num: "3",
post_date: "2020-09-15",
predmet_type: "Математика",
teacher: "Ню В.В",
image:
"/code/media/card_img/bxd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd0xb0xd1x80_10_xd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd_lN2D1k2.jpg",
slug: "card-3-11-2020-09-15",
card_id: 1,
},
{
title: "Very long text, too long to show it full",
type_num: "Семинары",
class_num: "3",
post_date: "2020-09-15",
predmet_type: "Математика",
teacher: "Ню В.В",
image:
"/code/media/card_img/bxd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd0xb0xd1x80_10_xd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd_lN2D1k2.jpg",
slug: "card-3-11-2020-09-15",
card_id: 2,
},
{
title: "Семинар 10",
type_num: "Семинары",
class_num: "11",
post_date: "2020-09-15",
predmet_type: "Математика",
teacher: "Ню В.В",
image:
"/code/media/card_img/bxd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd0xb0xd1x80_10_xd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd_lN2D1k2.jpg",
slug: "card-3-11-2020-09-15",
card_id: 3,
},
{
title: "Семинар 10",
type_num: "Семинары",
class_num: "10",
post_date: "2020-09-15",
predmet_type: "Математика",
teacher: "Ню В.В",
image:
"/code/media/card_img/bxd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd0xb0xd1x80_10_xd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd_lN2D1k2.jpg",
slug: "card-3-11-2020-09-15",
card_id: 1,
},
{
title: "Very long text, too long to show it full",
type_num: "Семинары",
class_num: "11",
post_date: "2020-09-15",
predmet_type: "Математика",
teacher: "Ню В.В",
image:
"/code/media/card_img/bxd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd0xb0xd1x80_10_xd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd_lN2D1k2.jpg",
slug: "card-3-11-2020-09-15",
card_id: 2,
},
];
const Home = () => {
const classes = [
...new Set(data.map((el) => parseInt(el.class_num)).sort()),
];
const subjects = [...new Set(data.map((el) => el.predmet_type).sort())];
return (
<main>
{classes.map((class_num, index) => (
<div key={index} className="classContainer">
<h1>{class_num} класс</h1>
{subjects.map((subject, jndex) =>
data.filter(
(el) =>
parseInt(el.class_num) === class_num &&
el.predmet_type === subject
).length ? (
<div key={jndex} className="subjectContainer">
<h2>{subject}</h2>
<div className="carousel">
<div className="carouselInner">
{data
.filter(
(el) =>
parseInt(el.class_num) ===
class_num &&
el.predmet_type === subject
)
.map((el, kndex) => (
<Card key={kndex} data={el} />
))}
</div>
<div className="showMore">
<Link
to={
"/list?subject=" +
subject +
"?clas=" +
class_num
}
>
Больше &rarr;
</Link>
</div>
</div>
</div>
) : (
""
)
)}
<div className="curve"></div>
</div>
))}
</main>
);
};
export default Home;

83
src/Home/main.css Normal file
View File

@ -0,0 +1,83 @@
.classContainer {
padding: 2vh;
padding-top: calc(20px + 2vh);
margin-top: -20px;
position: relative;
}
.subjectContainer {
z-index: 11;
position: relative;
margin-bottom: max(1.5vh, 20px);
}
.subjectContainer>h2 {
margin-bottom: min(10px, 0.75vh);
}
.classContainer:last-child {
margin-bottom: 0;
}
.curve {
border-radius: 0 0 20px 20px;
display: block;
position: absolute;
bottom: 0;
height: 40px;
width: 100vw;
z-index: 1;
margin-left: -2vh;
}
.classContainer:nth-child(odd),
.classContainer:nth-child(odd) .curve {
background-color: #f4f4f4;
}
.classContainer:nth-child(even),
.classContainer:nth-child(even) .curve {
background-color: #ffffff;
}
.carousel {
overflow: hidden;
position: relative;
width: calc(100vw - 5vh);
}
.carouselInner {
display: flex;
flex-direction: row;
gap: 1.5vh;
}
.showMore {
position: absolute;
right: 0;
top: 0;
height: 100%;
/* background: linear-gradient(to right, rgba(244, 244, 244, 0) 25%, rgb(244, 244, 244) 70%); */
min-width: 40vw;
display: flex;
align-items: center;
justify-content: right;
}
.classContainer:nth-child(odd) .showMore {
background: linear-gradient(to right, rgba(244, 244, 244, 0) 25%, rgb(244, 244, 244) 70%);
}
.classContainer:nth-child(even) .showMore {
background: linear-gradient(to right, rgba(255, 255, 255, 0) 25%, rgb(255, 255, 255) 70%);
}
/* .showMore:hover {
background-image: linear-gradient(to right, rgba(244, 244, 244, 0) 25%, rgb(244, 244, 244) 50%);
} */
.showMore a {
color: rgb(54, 54, 69);
text-decoration: none;
}

View File

@ -1,6 +1,6 @@
import React, { useState } from "react";
import { motion } from "framer-motion";
import { Link } from "react-router-dom";
import "./main.css";
@ -14,11 +14,11 @@ const Navbar = (props) => {
const searchVariants = {
open: {
width: "calc(100vw - 5vh)",
width: "calc(100vw - 4vh)",
display: "block",
},
closed: {
width: "7vh",
width: "6vh",
transitionEnd: {
display: "none",
},
@ -32,7 +32,7 @@ const Navbar = (props) => {
borderTopRightRadius: 0,
},
closed: {
height: "12vh",
height: "10vh",
borderTopLeftRadius: "20px",
borderTopRightRadius: "20px",
},
@ -41,7 +41,7 @@ const Navbar = (props) => {
const filtersVariants = {
open: {
height: "100vh",
padding: "2.5vh",
padding: "2vh",
},
closed: {
height: 0,
@ -62,9 +62,9 @@ const Navbar = (props) => {
animate={filtersCollapsed ? "closed" : "open"}
>
<nav>
<a href="#">
<Link to="/">
<img id="logo" src={LogoImage} alt="Логотип ЮФМЛ" />
</a>
</Link>
<div id="spacing"></div>

View File

@ -1,27 +1,28 @@
#navbar {
position: fixed;
bottom: 0;
height: 12vh;
height: 10vh;
background-color: rgb(54, 54, 69);
width: 100%;
border-radius: 20px 20px 0 0;
padding: 2.5vh;
padding: 2vh;
box-sizing: border-box;
color: #ffffff;
z-index: 500;
}
#navbar nav {
background-color: rgb(54, 54, 69);
display: flex;
gap: 1.5vh;
height: 7vh;
height: 6vh;
position: relative;
z-index: 1000;
}
#logo {
height: 7vh;
width: 7vh;
height: 6vh;
width: 6vh;
background-color: white;
border-radius: 100%;
padding: 1vh;
@ -34,8 +35,8 @@
.navButton {
background-color: rgb(255, 109, 109);
height: 7vh;
width: 7vh;
height: 6vh;
width: 6vh;
padding: 1.5vh;
border-radius: 100%;
border: none;
@ -47,20 +48,21 @@
}
.navButton img {
height: 4vh;
width: 4vh;
height: 3vh;
width: 3vh;
}
#searchInput {
position: fixed;
width: 7vh;
bottom: 2.5vh;
right: 2.5vh;
height: 7vh;
width: 6vh;
bottom: 2vh;
right: 2vh;
height: 6vh;
border: none;
border-radius: 100vh;
border-radius: 1000px;
box-sizing: border-box;
z-index: 500;
padding: 0 2vh;
}
#filters {
@ -70,20 +72,20 @@
left: 0;
width: 100vw;
box-sizing: border-box;
padding: 2.5vh;
padding: 2vh;
display: flex;
align-items: center;
flex-direction: column;
justify-content: center;
gap: 5vh;
padding-top: -12vh;
padding-top: -10vh;
overflow: hidden;
z-index: 1;
}
#filters label h2 {
margin: 1.5vh 0;
text-align: center;
text-align: left;
}
#filters select {
@ -91,11 +93,11 @@
border: none;
appearance: none;
padding: 1.5vh;
height: 7vh;
border-radius: 100vh;
height: 6vh;
border-radius: 20px;
width: 75vw;
}
body {
padding-bottom: 12vh;
padding-bottom: 10.5vh;
}

69
src/SubjectList/index.tsx Normal file
View File

@ -0,0 +1,69 @@
import React from "react";
import { useLocation } from "react-router-dom";
import Card from "../Card";
import "./main.css";
const data = [
{
title: "Семинар 10",
type_num: "Семинары",
class_num: "1",
post_date: "2020-09-15",
predmet_type: "Математика",
teacher: "Ню В.В",
image:
"/code/media/card_img/bxd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd0xb0xd1x80_10_xd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd_lN2D1k2.jpg",
slug: "card-3-11-2020-09-15",
card_id: 3,
},
{
title: "Семинар 10",
type_num: "Семинары",
class_num: "1",
post_date: "2020-09-15",
predmet_type: "Физика",
teacher: "Ню В.В",
image:
"/code/media/card_img/bxd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd0xb0xd1x80_10_xd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd_lN2D1k2.jpg",
slug: "card-3-11-2020-09-15",
card_id: 3,
},
{
title: "Семинар 10",
type_num: "Семинары",
class_num: "1",
post_date: "2020-09-15",
predmet_type: "Математика",
teacher: "Ню В.В",
image:
"/code/media/card_img/bxd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd0xb0xd1x80_10_xd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd_lN2D1k2.jpg",
slug: "card-3-11-2020-09-15",
card_id: 1,
},
{
title: "Very long text, too long to show it full",
type_num: "Семинары",
class_num: "2",
post_date: "2020-09-15",
predmet_type: "Математика",
teacher: "Ню В.В",
image:
"/code/media/card_img/bxd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd0xb0xd1x80_10_xd0xa1xd0xb5xd0xbcxd0xb8xd0xbdxd_lN2D1k2.jpg",
slug: "card-3-11-2020-09-15",
card_id: 2,
},
];
const SubjectList = () => {
const location = useLocation();
return (
<main className="subjectList">
{data.map((el, index) => (
<Card key={index} data={el} />
))}
</main>
);
};
export default SubjectList;

7
src/SubjectList/main.css Normal file
View File

@ -0,0 +1,7 @@
.subjectList {
display: flex;
flex-direction: column;
gap: 1.5vh;
padding: 2vh;
align-items: stretch;
}

View File

@ -1,13 +1,39 @@
* {
margin: 0;
padding: 0;
-ms-overflow-style: none;
scrollbar-width: none;
box-sizing: border-box;
}
*::-webkit-scrollbar {
display: none;
}
body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-family: Inter, system-ui, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
background: rgba(54, 54, 69, 0.05) none repeat scroll 0% 0%;
color: rgb(54, 54, 69);
}
code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
monospace;
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
}
#name {
background-color: rgb(54, 54, 69);
padding: 2vh;
color: #ffffff;
border-bottom-left-radius: 20px;
border-bottom-right-radius: 20px;
position: relative;
z-index: 10;
height: 10vh;
}
#name h1 {
text-align: center;
line-height: 6vh;
}

View File

@ -1,11 +1,14 @@
import React from "react";
import ReactDOM from "react-dom";
import { BrowserRouter as Router } from "react-router-dom";
import "./index.css";
import App from "./App";
ReactDOM.render(
<React.StrictMode>
<App />
<Router>
<App />
</Router>
</React.StrictMode>,
document.getElementById("root")
);

1
src/react-app-env.d.ts vendored Normal file
View File

@ -0,0 +1 @@
/// <reference types="react-scripts" />

25
tsconfig.json Normal file
View File

@ -0,0 +1,25 @@
{
"compilerOptions": {
"target": "es5",
"lib": [
"dom",
"dom.iterable",
"esnext"
],
"allowJs": true,
"skipLibCheck": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"strict": true,
"forceConsistentCasingInFileNames": true,
"module": "esnext",
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react"
},
"include": [
"src"
]
}

130
yarn.lock
View File

@ -1004,7 +1004,7 @@
dependencies:
regenerator-runtime "^0.13.4"
"@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.5.1":
"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.5":
version "7.11.2"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
@ -1562,6 +1562,11 @@
"@types/minimatch" "*"
"@types/node" "*"
"@types/history@*":
version "4.7.7"
resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.7.tgz#613957d900fab9ff84c8dfb24fa3eef0c2a40896"
integrity sha512-2xtoL22/3Mv6a70i4+4RB7VgbDDORoWwjcqeNysojZA0R7NK17RbY5Gof/2QiFfJgX+KkWghbwJ+d/2SB8Ndzg==
"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
version "2.0.1"
resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
@ -1609,6 +1614,11 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.2.tgz#ace1880c03594cc3e80206d96847157d8e7fa349"
integrity sha512-bnoqK579sAYrQbp73wwglccjJ4sfRdKU7WNEZ5FW4K2U6Kc0/eZ5kvXG0JKsEKFB50zrFmfFt52/cvBbZa7eXg==
"@types/node@^14.10.1":
version "14.10.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.10.1.tgz#cc323bad8e8a533d4822f45ce4e5326f36e42177"
integrity sha512-aYNbO+FZ/3KGeQCEkNhHFRIzBOUgc7QvcVNKXbfnhDkSfwUv91JsQQa10rDgKSTSLkXZ1UIyPe4FJJNVgw1xWQ==
"@types/parse-json@^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
@ -1624,14 +1634,31 @@
resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
"@types/react-dom@*":
"@types/react-dom@*", "@types/react-dom@^16.9.8":
version "16.9.8"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz#fe4c1e11dfc67155733dfa6aa65108b4971cb423"
integrity sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA==
dependencies:
"@types/react" "*"
"@types/react@*":
"@types/react-router-dom@^5.1.5":
version "5.1.5"
resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.1.5.tgz#7c334a2ea785dbad2b2dcdd83d2cf3d9973da090"
integrity sha512-ArBM4B1g3BWLGbaGvwBGO75GNFbLDUthrDojV2vHLih/Tq8M+tgvY1DSwkuNrPSwdp/GUL93WSEpTZs8nVyJLw==
dependencies:
"@types/history" "*"
"@types/react" "*"
"@types/react-router" "*"
"@types/react-router@*":
version "5.1.8"
resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.8.tgz#4614e5ba7559657438e17766bb95ef6ed6acc3fa"
integrity sha512-HzOyJb+wFmyEhyfp4D4NYrumi+LQgQL/68HvJO+q6XtuHSDvw6Aqov7sCAhjbNq3bUPgPqbdvjXC5HeB2oEAPg==
dependencies:
"@types/history" "*"
"@types/react" "*"
"@types/react@*", "@types/react@^16.9.49":
version "16.9.49"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.49.tgz#09db021cf8089aba0cdb12a49f8021a69cce4872"
integrity sha512-DtLFjSj0OYAdVLBbyjhuV9CdGVHCkHn2R+xr3XkBvK2rS1Y1tkc14XSGjYgm5Fjjr90AxH9tiSzc1pCFMGO06g==
@ -5070,6 +5097,18 @@ hey-listen@^1.0.5, hey-listen@^1.0.8:
resolved "https://registry.yarnpkg.com/hey-listen/-/hey-listen-1.0.8.tgz#8e59561ff724908de1aa924ed6ecc84a56a9aa68"
integrity sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==
history@^4.9.0:
version "4.10.1"
resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"
integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==
dependencies:
"@babel/runtime" "^7.1.2"
loose-envify "^1.2.0"
resolve-pathname "^3.0.0"
tiny-invariant "^1.0.2"
tiny-warning "^1.0.0"
value-equal "^1.0.1"
hmac-drbg@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@ -5079,6 +5118,13 @@ hmac-drbg@^1.0.0:
minimalistic-assert "^1.0.0"
minimalistic-crypto-utils "^1.0.1"
hoist-non-react-statics@^3.1.0:
version "3.3.2"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
dependencies:
react-is "^16.7.0"
hosted-git-info@^2.1.4:
version "2.8.8"
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
@ -5746,6 +5792,11 @@ is-wsl@^2.1.1:
resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.1.tgz#4a1c152d429df3d441669498e2486d3596ebaf1d"
integrity sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==
isarray@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@ -6596,7 +6647,7 @@ loglevel@^1.6.8:
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
@ -6784,6 +6835,14 @@ min-indent@^1.0.0:
resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
mini-create-react-context@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.0.tgz#df60501c83151db69e28eac0ef08b4002efab040"
integrity sha512-b0TytUgFSbgFJGzJqXPKCFCBWigAjpjo+Fl7Vf7ZbKRDptszpppKxXH6DRXEABZ/gcEQczeb0iZ7JvL8e8jjCA==
dependencies:
"@babel/runtime" "^7.5.5"
tiny-warning "^1.0.3"
mini-css-extract-plugin@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"
@ -7558,6 +7617,13 @@ path-to-regexp@0.1.7:
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
path-to-regexp@^1.7.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
dependencies:
isarray "0.0.1"
path-type@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
@ -8670,11 +8736,40 @@ react-error-overlay@^6.0.7:
resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.7.tgz#1dcfb459ab671d53f660a991513cb2f0a0553108"
integrity sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA==
react-is@^16.12.0, react-is@^16.8.1, react-is@^16.8.4:
react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
react-router-dom@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz#9e65a4d0c45e13289e66c7b17c7e175d0ea15662"
integrity sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==
dependencies:
"@babel/runtime" "^7.1.2"
history "^4.9.0"
loose-envify "^1.3.1"
prop-types "^15.6.2"
react-router "5.2.0"
tiny-invariant "^1.0.2"
tiny-warning "^1.0.0"
react-router@5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.0.tgz#424e75641ca8747fbf76e5ecca69781aa37ea293"
integrity sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==
dependencies:
"@babel/runtime" "^7.1.2"
history "^4.9.0"
hoist-non-react-statics "^3.1.0"
loose-envify "^1.3.1"
mini-create-react-context "^0.4.0"
path-to-regexp "^1.7.0"
prop-types "^15.6.2"
react-is "^16.6.0"
tiny-invariant "^1.0.2"
tiny-warning "^1.0.0"
react-scripts@3.4.3:
version "3.4.3"
resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.3.tgz#21de5eb93de41ee92cd0b85b0e1298d0bb2e6c51"
@ -9028,6 +9123,11 @@ resolve-from@^4.0.0:
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
resolve-pathname@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd"
integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==
resolve-url-loader@3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz#28931895fa1eab9be0647d3b2958c100ae3c0bf0"
@ -10064,6 +10164,16 @@ timsort@^0.3.0:
resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
tiny-invariant@^1.0.2:
version "1.1.0"
resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz#634c5f8efdc27714b7f386c35e6760991d230875"
integrity sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw==
tiny-warning@^1.0.0, tiny-warning@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
tmp@^0.0.33:
version "0.0.33"
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@ -10212,6 +10322,11 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
typescript@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2"
integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==
unicode-canonical-property-names-ecmascript@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@ -10404,6 +10519,11 @@ validate-npm-package-license@^3.0.1:
spdx-correct "^3.0.0"
spdx-expression-parse "^3.0.0"
value-equal@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c"
integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==
vary@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"