File tree Expand file tree Collapse file tree 10 files changed +34
-41
lines changed
Expand file tree Collapse file tree 10 files changed +34
-41
lines changed File renamed without changes.
Original file line number Diff line number Diff line change 11import './App.css' ;
22import { 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
1010function App ( ) {
1111 return (
File renamed without changes.
Original file line number Diff line number Diff line change 11import "./Footer.css"
22import Footer_top from "./Footer_top/Footer_top"
33import Footer_lower from "./Footer_lower/Footer_lower"
4- import faviconSrc from "./Pic/ favicon.png"
4+ import faviconSrc from "./favicon.png"
55
66function Footer ( ) {
77 return (
File renamed without changes.
Original file line number Diff line number Diff line change 6060.mobileMenu {
6161 z-index : 999 ;
6262}
63-
64- @media only screen and (max-width : 480px ) {
65-
66- }
Original file line number Diff line number Diff line change 11import "./Header.css" ;
2+ import { useLocation } from 'react-router-dom' ;
3+ import { NavLink } from "react-router-dom"
24import faviconSrc from "./favicon.png"
35import { 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
730function 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 >
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 11import { StrictMode } from 'react' ;
22import { createRoot } from 'react-dom/client' ;
3- import App from './App/App .tsx' ;
3+ import App from './App.tsx' ;
44import './index.css' ;
55import { HashRouter , Routes , Route } from 'react-router-dom' ;
66import About from './pages/About/About' ;
Original file line number Diff line number Diff line change 11import './SliderPhoto.css'
2- import Carousel from '../../../components/ Carousel/Carousel' ;
2+ import Carousel from '../../../Carousel/Carousel' ;
33
44const images = [
55 "https://avatars.mds.yandex.net/get-altay/4530524/2a00000179e64be106f8902aa9d99c6d4baf/L_height" ,
You can’t perform that action at this time.
0 commit comments