Skip to content

Commit 10c8341

Browse files
Revert "refactor arhitect"
This reverts commit f965b34.
1 parent f965b34 commit 10c8341

File tree

10 files changed

+34
-41
lines changed

10 files changed

+34
-41
lines changed
File renamed without changes.

src/App/App.tsx renamed to src/App.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import './App.css';
22
import { Routes, Route } from 'react-router-dom';
3-
import About from './../pages/About/About';
4-
import Question from './../pages/Main/Question/Accordion';
5-
import Teachgers_Slider from './../pages/Main/Teachgers_Slider/Teachgers_Slider';
6-
import SliderPhoto from './../pages/Main/SliderPhoto/SliderPhoto';
7-
import Achievements from './../pages/Main/Achievements/Achievements';
8-
import DirectorPhoto from './../pages/Main/DirectorPhoto/DirectorPhoto';
3+
import About from './pages/About/About';
4+
import Question from './pages/Main/Question/Accordion';
5+
import Teachgers_Slider from './pages/Main/Teachgers_Slider/Teachgers_Slider';
6+
import SliderPhoto from './pages/Main/SliderPhoto/SliderPhoto';
7+
import Achievements from './pages/Main/Achievements/Achievements';
8+
import DirectorPhoto from './pages/Main/DirectorPhoto/DirectorPhoto';
99

1010
function App() {
1111
return (

src/Footer/Footer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import "./Footer.css"
22
import Footer_top from "./Footer_top/Footer_top"
33
import Footer_lower from "./Footer_lower/Footer_lower"
4-
import faviconSrc from "./Pic/favicon.png"
4+
import faviconSrc from "./favicon.png"
55

66
function Footer() {
77
return (

src/Header/Header.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,3 @@
6060
.mobileMenu{
6161
z-index: 999;
6262
}
63-
64-
@media only screen and (max-width: 480px) {
65-
66-
}

src/Header/Header.tsx

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,31 @@
11
import "./Header.css";
2+
import { useLocation } from 'react-router-dom';
3+
import { NavLink } from "react-router-dom"
24
import faviconSrc from "./favicon.png"
35
import { useState } from 'react';
4-
import Button from "../components/Button/Button";
56

7+
export interface ButtonProps {
8+
name: string;
9+
link: string;
10+
className: string;
11+
}
12+
13+
export function Button(props: ButtonProps) {
14+
const location = useLocation();
15+
const isActive = location.pathname === props.link;
16+
17+
return (
18+
<>
19+
<NavLink className={`mybutton ${isActive ? 'active' : ''} ${props.className}`} to={props.link}>
20+
{props.name}
21+
</NavLink>
22+
</>
23+
)
24+
}
25+
26+
Button.defaultProps = {
27+
className: ""
28+
};
629

730
function Header() {
831
const [isOpen, setIsOpen] = useState(false);
@@ -45,7 +68,7 @@ function Header() {
4568
<img src="https://img.icons8.com/?size=50&id=38514&format=png" alt="VK icon"></img>
4669
</a>
4770
</div>
48-
71+
4972
</div>
5073

5174
</nav>

src/components/Button/Button.tsx

Lines changed: 0 additions & 26 deletions
This file was deleted.

src/main.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { StrictMode } from 'react';
22
import { createRoot } from 'react-dom/client';
3-
import App from './App/App.tsx';
3+
import App from './App.tsx';
44
import './index.css';
55
import { HashRouter, Routes, Route } from 'react-router-dom';
66
import About from './pages/About/About';

src/pages/Main/SliderPhoto/SliderPhoto.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import './SliderPhoto.css'
2-
import Carousel from '../../../components/Carousel/Carousel';
2+
import Carousel from '../../../Carousel/Carousel';
33

44
const images = [
55
"https://avatars.mds.yandex.net/get-altay/4530524/2a00000179e64be106f8902aa9d99c6d4baf/L_height",

0 commit comments

Comments
 (0)