diff --git a/package.json b/package.json
index 0926812..433da5a 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
"gh-pages": "^4.0.0",
"react": "^18.1.0",
"react-dom": "^18.1.0",
+ "react-router-dom": "^6.3.0",
"react-scripts": "5.0.1",
"typescript": "^4.4.2",
"uuid": "^8.3.2",
diff --git a/src/s1-main/App.tsx b/src/s1-main/App.tsx
index 56214e4..44b2223 100644
--- a/src/s1-main/App.tsx
+++ b/src/s1-main/App.tsx
@@ -1,21 +1,22 @@
import React from 'react'
import s from './App.module.css'
import HW1 from '../s2-homeworks/hw01/HW1'
-import HW2 from '../s2-homeworks/hw02/HW2'
-import HW3 from '../s2-homeworks/hw03/HW3'
-import HW4 from '../s2-homeworks/hw04/HW4'
+// import HW2 from '../s2-homeworks/hw02/HW2'
+// import HW3 from '../s2-homeworks/hw03/HW3'
+// import HW4 from '../s2-homeworks/hw04/HW4'
+import HW5 from '../s2-homeworks/hw05/HW5'
const App = () => {
return (
react homeworks:
-
-
-
-
-
+ {/*
*/}
+ {/*
*/}
+ {/*
*/}
+ {/*
*/}
+
)
}
diff --git a/src/s2-homeworks/hw04/Stand.tsx b/src/s2-homeworks/hw04/Stand.tsx
index c57a28f..360384c 100644
--- a/src/s2-homeworks/hw04/Stand.tsx
+++ b/src/s2-homeworks/hw04/Stand.tsx
@@ -11,12 +11,12 @@ const Stand = () => {
const [stateForAllCheckboxes, setChecked] = useState(false)
return (
-
+
инпут с ошибкой:
{
совместим со старым кодом
setValue(e.currentTarget.value)}
/>
@@ -39,15 +39,15 @@ const Stand = () => {
обычная кнопка:
- default
+ default
красная кнопка:
- red
+ red
задизэйбленная кнопка:
- disabled
+ disabled
@@ -56,7 +56,7 @@ const Stand = () => {
чекбокс с текстом:
@@ -66,7 +66,7 @@ const Stand = () => {
совместим со старым кодом
setChecked(e.currentTarget.checked)}
/>
diff --git a/src/s2-homeworks/hw05/HW5.tsx b/src/s2-homeworks/hw05/HW5.tsx
new file mode 100644
index 0000000..6aa155c
--- /dev/null
+++ b/src/s2-homeworks/hw05/HW5.tsx
@@ -0,0 +1,21 @@
+import React from 'react'
+import Header from './Header'
+import Pages from './Pages'
+import {HashRouter} from 'react-router-dom'
+
+function HW5() {
+ return (
+
+ {/*в gh-pages лучше работает HashRouter*/}
+
+
+
+
+
+
+
+
+ )
+}
+
+export default HW5
diff --git a/src/s2-homeworks/hw05/Header.module.css b/src/s2-homeworks/hw05/Header.module.css
new file mode 100644
index 0000000..87d0be7
--- /dev/null
+++ b/src/s2-homeworks/hw05/Header.module.css
@@ -0,0 +1,39 @@
+.link {
+ text-decoration: none;
+ color: #7af;
+ margin: 10px;
+}
+
+.link:hover {
+ color: #c9f;
+}
+
+.active {
+ color: #5ff;
+}
+
+.burgerMenu {
+ width: 21px;
+ height: 21px;
+
+ margin: 10px;
+
+ background: #99ff99;
+}
+
+.header {
+ display: flex;
+ justify-content: flex-end;
+
+ width: 280px;
+}
+
+.showMenu {
+ transition-duration: 500ms;
+ transform: translate(0);
+}
+
+.hideMenu {
+ transition-duration: 500ms;
+ transform: translate(-220px);
+}
\ No newline at end of file
diff --git a/src/s2-homeworks/hw05/Header.tsx b/src/s2-homeworks/hw05/Header.tsx
new file mode 100644
index 0000000..c3ef5dd
--- /dev/null
+++ b/src/s2-homeworks/hw05/Header.tsx
@@ -0,0 +1,43 @@
+import React, {useState} from 'react'
+import {NavLink} from 'react-router-dom'
+import {PATH} from './Pages'
+import s from './Header.module.css'
+
+function Header() {
+ const [isShow, setShow] = useState(false)
+
+ // hw5-menu изначально отсутствует, при нажатии на бургер - появляется, при повторном нажатии исчезает
+ return (
+