Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 63 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@
"@emotion/styled": "^11.10.6",
"@mui/icons-material": "^5.11.11",
"@mui/material": "^5.11.13",
"@mui/x-data-grid": "^6.4.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"@types/jest": "^27.5.2",
"@types/node": "^16.11.68",
"@types/react": "^18.0.21",
"@types/react-dom": "^18.0.6",
"axios": "^1.4.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-scripts": "5.0.1",
Expand Down
24 changes: 24 additions & 0 deletions src/Components/Artamonov/ArtamonovPopup/ArtamonovPopup.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
.artamonov_popup {
width: 100%;
height: 100vh;
display: flex;
justify-content: center;
align-items: center;

&__content {
background-color: #fff;
padding: 1em;
border-radius: 1em;
min-width: 400px;


&__header {
display: flex;
justify-content: space-between;
align-items: center;
padding-bottom: .5em;
margin-bottom: .5em;
border-bottom: solid 1px #ccc;
}
}
}
48 changes: 48 additions & 0 deletions src/Components/Artamonov/ArtamonovPopup/ArtamonovPopup.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import { Button, Modal, Typography } from '@mui/material';
import React from 'react';
import "./ArtamonovPopup.scss";

export type IPopup = {
open: boolean,
onClose: () => void;
}


type Props = IPopup & {
children: any,
title: string
}

const ArtamonovPopup = ({ open, onClose, children, title }: Props) => {


return (<Modal
open={open}
onClose={() => onClose()}
>
<Typography className='artamonov_popup'>
<div className='artamonov_popup__content'>
<div className='artamonov_popup__content__header'>
<div>
{title}
</div>

<div>
<Button
onClick={() => onClose()}
>
Close
</Button>
</div>
</div>


<div>
{children}
</div>

</div>
</Typography>
</Modal>)
}
export default ArtamonovPopup;
24 changes: 24 additions & 0 deletions src/Components/Kurgankov/KurgankovPopup/KurgankovPopup.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
.kurgankov_popup {
width: 100%;
height: 100vh;
display: flex;
justify-content: center;
align-items: center;

&__content {
background-color: #fff;
padding: 1em;
border-radius: 1em;
min-width: 400px;


&__header {
display: flex;
justify-content: space-between;
align-items: center;
padding-bottom: .5em;
margin-bottom: .5em;
border-bottom: solid 1px #ccc;
}
}
}
49 changes: 49 additions & 0 deletions src/Components/Kurgankov/KurgankovPopup/KurgankovPopup.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import { Button, Modal, Typography } from '@mui/material';
import React from 'react';
import "./KurgankovPopup.scss";

export type IPopup = {
open: boolean,
onClose: () => void;
}


type Props = IPopup & {
children: any,
title: string
}

const KurgankovPopup = ({ open, onClose, children, title }: Props) => {


return (<Modal
open={open}
onClose={() => onClose()}
>
<Typography className='artamonov_popup'>
<div className='artamonov_popup__content'>
<div className='artamonov_popup__content__header'>
<div>
{title}
</div>

<div>
<Button
onClick={() => onClose()}
>
Close
</Button>
</div>
</div>


<div>
{children}
</div>

</div>
</Typography>
</Modal>)
}

export default KurgankovPopup;
37 changes: 36 additions & 1 deletion src/Pages/Route/RouteComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,15 @@ import {default as OndyshevClient} from "../StudentPage/OndyshevDmitry/Client/Cl
import {default as OndyshevManufacturer} from "../StudentPage/OndyshevDmitry/Manufacturer/Manufacturer";
import {default as OndyshevOrder} from "../StudentPage/OndyshevDmitry/Order/Order";
import {default as OndyshevProduct} from "../StudentPage/OndyshevDmitry/Product/Product";
import {default as OndyshevPurchase} from "../StudentPage/OndyshevDmitry/Purchase/Purchase";
import { default as OndyshevPurchase } from "../StudentPage/OndyshevDmitry/Purchase/Purchase";

import KurgankovPage from "../StudentPage/Kurgankov/KurgankovPage";
import { default as KurgankovCategory } from '../StudentPage/Kurgankov/Category/CategoryPage';
import { default as KurgankovClient } from "../StudentPage/Kurgankov/Client/Client";
import { default as KurgankovManufacturer } from "../StudentPage/Kurgankov/Manufacture/ManufacturePage";
import { default as KurgankovOrder } from "../StudentPage/Kurgankov/Order/Order";
import { default as KurgankovProduct } from "../StudentPage/Kurgankov/Product/Product";
import { default as KurgankovPurchase } from "../StudentPage/Kurgankov/Purchase/Purchase";

import SimakovMatveyPage from "../StudentPage/SimakovMatvey/SimakovMatveyPage";
import {default as SimakovCategory} from '../StudentPage/SimakovMatvey/Category/CategoryPage';
Expand Down Expand Up @@ -93,6 +101,15 @@ import DyakovDanilPage from "../StudentPage/DyakovDanil/DyakovDanilPage";
import { default as DyakovTest2 } from "../StudentPage/DyakovDanil/Test2/Test2";
import { default as DyakovTest1 } from "../StudentPage/DyakovDanil/Test1/Test1";

import ArtamonovPage from "../StudentPage/Artamonov/ArtamonovPage";
import { default as ArtamonovCategory } from '../StudentPage/Artamonov/Category/CategoryPage';
import { default as ArtamonovClient } from "../StudentPage/Artamonov/Client/Client";
import { default as ArtamonovManufacturer } from "../StudentPage/Artamonov/Manufacture/ManufacturePage";
import { default as ArtamonovOrder } from "../StudentPage/Artamonov/Order/Order";
import { default as ArtamonovProduct } from "../StudentPage/Artamonov/Product/Product";
import { default as ArtamonovPurchase } from "../StudentPage/Artamonov/Purchase/Purchase";




const RouteComponent = () => {
Expand All @@ -118,6 +135,15 @@ const RouteComponent = () => {
<Route path={'purchase'} element={<OndyshevPurchase/>} />
</Route>

<Route path={'artamonov'} element={<KurgankovPage></KurgankovPage>}>
<Route path={'category'} element={<KurgankovCategory />} />
<Route path={'client'} element={<KurgankovClient />} />
<Route path={'manufacture'} element={<KurgankovManufacturer />} />
<Route path={'order'} element={<KurgankovOrder />} />
<Route path={'product'} element={<KurgankovProduct />} />
<Route path={'purchase'} element={<KurgankovPurchase />} />
</Route>

<Route path={'simakov'} element={<SimakovMatveyPage></SimakovMatveyPage>}>
<Route path={'category'} element={<SimakovCategory/>} />
<Route path={'client'} element={<SimakovClient/>} />
Expand Down Expand Up @@ -196,6 +222,15 @@ const RouteComponent = () => {
<Route path={'Product'} element={<BezlepkinaProduct />} />
</Route>

<Route path={'artamonov'} element={<ArtamonovPage></ArtamonovPage>}>
<Route path={'category'} element={<ArtamonovCategory />} />
<Route path={'client'} element={<ArtamonovClient />} />
<Route path={'manufacture'} element={<ArtamonovManufacturer />} />
<Route path={'order'} element={<ArtamonovOrder />} />
<Route path={'product'} element={<ArtamonovProduct />} />
<Route path={'purchase'} element={<ArtamonovPurchase />} />
</Route>

</Route>
</Routes>
</HashRouter>
Expand Down
4 changes: 4 additions & 0 deletions src/Pages/StudentPage/Artamonov/ArtamonovPage.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.self_page_content {
display:flex;
gap:1em;
}
Loading