ershisan99/home-works
1
0
Fork 0
mirror of https://github.com/IgnatZakalinsky/home-works.git synced 2026-01-29 20:42:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

add prettier and reformat all files

Browse Source
This commit is contained in:
Andres
2022-07-11 12:23:43 +02:00
parent 35e4d96726
commit dfab85da65
72 changed files with 1065 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/s2-homeworks/hw05/HW5.tsx
View File

@@ -8,7 +8,7 @@ function HW5() {
<HashRouter>
{/*в gh-pages лучше работает HashRouter*/}
<Layout>
<Pages/>
<Pages />
</Layout>
</HashRouter>
)

14
src/s2-homeworks/hw05/Pages.tsx
View File

@@ -1,5 +1,5 @@
import React from 'react'
import {Routes, Route, Navigate} from 'react-router-dom'
import { Routes, Route, Navigate } from 'react-router-dom'
import Error404 from './pages/Error404'
import PreJunior from './pages/PreJunior'
import Junior from './pages/Junior'
@@ -16,18 +16,16 @@ function Pages() {
<div>
{/*Routes выбирает первый подходящий роут*/}
<Routes>
{/*роутинг будут писать студенты*/}
{/*в начале мы попадаем на страницу '/' и переходим сразу на страницу PRE_JUNIOR*/}
<Route path={'/'} element={<Navigate to={PATH.PRE_JUNIOR}/>}/>
<Route path={'/'} element={<Navigate to={PATH.PRE_JUNIOR} />} />
<Route path={PATH.PRE_JUNIOR} element={<PreJunior/>}/>
<Route path={PATH.JUNIOR} element={<Junior/>}/>
<Route path={PATH.JUNIOR_PLUS} element={<JuniorPlus/>}/>
<Route path={PATH.PRE_JUNIOR} element={<PreJunior />} />
<Route path={PATH.JUNIOR} element={<Junior />} />
<Route path={PATH.JUNIOR_PLUS} element={<JuniorPlus />} />
{/*он отрисуется если пользователь захочет попасть на несуществующую страницу*/}
<Route path={'/*'} element={<Error404/>}/>
<Route path={'/*'} element={<Error404 />} />
</Routes>
</div>
)

18
src/s2-homeworks/hw05/header/Header.tsx
View File

@@ -7,21 +7,19 @@ type PropsType = {
handleOpen: () => void
}
export const Header: FC<PropsType> = ({open, handleOpen}) => {
export const Header: FC<PropsType> = ({ open, handleOpen }) => {
// hw5-menu изначально отсутствует, при нажатии на бургер - появляется, при повторном нажатии исчезает
return (
<>
<div id={'hw5-header'} className={s.header}>
<img src={burgerIcon}
id={'hw5-burger-menu'}
className={s.burgerMenuIcon}
onClick={handleOpen}
alt={'open menu'}/>
<img
src={burgerIcon}
id={'hw5-burger-menu'}
className={s.burgerMenuIcon}
onClick={handleOpen}
alt={'open menu'}
/>
</div>
</>
)
}

8
src/s2-homeworks/hw05/layout/Layout.tsx
View File

@@ -6,7 +6,7 @@ type PropsType = {
children: ReactNode
}
export const Layout: FC<PropsType> = ({children}) => {
export const Layout: FC<PropsType> = ({ children }) => {
const [open, setOpen] = useState(false)
const handleClose = () => setOpen(false)
const handleOpen = () => setOpen(true)
@@ -17,11 +17,9 @@ export const Layout: FC<PropsType> = ({children}) => {
return (
<>
<Sidebar open={open} handleClose={handleClose}/>
<Header open={open} handleOpen={handleOpen}/>
<Sidebar open={open} handleClose={handleClose} />
<Header open={open} handleOpen={handleOpen} />
{children}
</>
)
}

2
src/s2-homeworks/hw05/pages/Error404.module.css
View File

@@ -11,4 +11,4 @@
display: flex;
height: calc(100vh - var(--header_height));
justify-content: center;
}
}

10
src/s2-homeworks/hw05/pages/Junior.tsx
View File

@@ -8,12 +8,12 @@ function Junior() {
return (
<div id={'hw5-page-junior'}>
junior page
<HW6/>
<HW7/>
<HW8/>
<HW9/>
<HW6 />
<HW7 />
<HW8 />
<HW9 />
</div>
)
}
export default Junior
export default Junior

10
src/s2-homeworks/hw05/pages/JuniorPlus.tsx
View File

@@ -8,12 +8,12 @@ function JuniorPlus() {
return (
<div id={'hw5-page-junior-plus'}>
junior plus page
<HW10/>
<HW11/>
<HW12/>
<HW13/>
<HW10 />
<HW11 />
<HW12 />
<HW13 />
</div>
)
}
export default JuniorPlus
export default JuniorPlus

10
src/s2-homeworks/hw05/pages/PreJunior.tsx
View File

@@ -8,12 +8,12 @@ function PreJunior() {
return (
<div id={'hw5-page-pre-junior'}>
{/*pre junior page*/}
<HW1/>
<HW2/>
<HW3/>
<HW4/>
<HW1 />
<HW2 />
<HW3 />
<HW4 />
</div>
)
}
export default PreJunior
export default PreJunior

5
src/s2-homeworks/hw05/sidebar/Sidebar.module.css
View File

@@ -12,7 +12,8 @@
}
.sidebar.open {
box-shadow: 0 10px 40px rgba(29, 33, 38, 0.13), 0 1px 2px rgba(29, 33, 38, 0.1);
box-shadow: 0 10px 40px rgba(29, 33, 38, 0.13),
0 1px 2px rgba(29, 33, 38, 0.1);
left: 0;
position: fixed;
transition: 0.2s ease-out;
@@ -69,4 +70,4 @@
.close img {
height: 24px;
width: 24px;
}
}

15
src/s2-homeworks/hw05/sidebar/Sidebar.tsx
View File

@@ -9,28 +9,27 @@ type PropsType = {
handleClose: () => void
}
export const Sidebar: FC<PropsType> = ({open, handleClose}) => {
export const Sidebar: FC<PropsType> = ({ open, handleClose }) => {
return (
<>
{/*бэкграунд справа от открытого меню*/}
{open && <div className={s.background} onClick={handleClose}/>}
{open && <div className={s.background} onClick={handleClose} />}
<aside className={`${s.sidebar} ${open ? s.open : ''}`}>
<button className={s.close} onClick={handleClose}>
<img
src={closeIcon}
alt='close sidebar'
alt="close sidebar"
id={'hw5-menu-close'}
/>
</button>
<nav id={'hw5-menu'} className={s.nav}>
<NavLink
id={'hw5-pre-junior-link'}
to={PATH.PRE_JUNIOR}
onClick={handleClose}
className={({isActive}) => isActive ? s.active : ''} // делает студент
className={({ isActive }) => (isActive ? s.active : '')} // делает студент
>
Pre-junior
</NavLink>
@@ -38,7 +37,7 @@ export const Sidebar: FC<PropsType> = ({open, handleClose}) => {
id={'hw5-junior-link'}
to={PATH.JUNIOR}
onClick={handleClose}
className={({isActive}) => isActive ? s.active : ''} // делает студент
className={({ isActive }) => (isActive ? s.active : '')} // делает студент
>
Junior
</NavLink>
@@ -46,14 +45,12 @@ export const Sidebar: FC<PropsType> = ({open, handleClose}) => {
id={'hw5-junior-plus-link'}
to={PATH.JUNIOR_PLUS}
onClick={handleClose}
className={({isActive}) => isActive ? s.active : ''} // делает студент
className={({ isActive }) => (isActive ? s.active : '')} // делает студент
>
Junior+
</NavLink>
</nav>
</aside>
</>
)
}