diff --git a/public/Montserrat-Regular.ttf b/public/Montserrat-Regular.ttf new file mode 100644 index 0000000..f4a266d Binary files /dev/null and b/public/Montserrat-Regular.ttf differ diff --git a/src/components/navigation/Navbar.tsx b/src/components/navigation/Navbar.tsx index 98a8f9a..d0a64e8 100644 --- a/src/components/navigation/Navbar.tsx +++ b/src/components/navigation/Navbar.tsx @@ -1,10 +1,14 @@ -import React, {useState} from 'react' +import React, {useEffect, useState} from 'react' import {routerData} from "../router"; -import {Link} from "react-router-dom"; +import {Link, useLocation} from "react-router-dom"; export const Navbar = () => { - const [active, setActive] = useState(routerData[0].name) + const location = useLocation(); + const [url, setUrl] = useState(''); + useEffect(() => { + setUrl(location.pathname); + }, [location]); return ( <> @@ -12,11 +16,9 @@ export const Navbar = () => {
{routerData.map(route => ( setActive(route.name)} - className=""> + to={route.path}> -

{route.name}

+

{route.name}

))}
diff --git a/src/components/navigation/contact/components/contact-form/ContactFormContainer.tsx b/src/components/navigation/contact/components/contact-form/ContactFormContainer.tsx index 29a4456..99a23bd 100644 --- a/src/components/navigation/contact/components/contact-form/ContactFormContainer.tsx +++ b/src/components/navigation/contact/components/contact-form/ContactFormContainer.tsx @@ -1,4 +1,4 @@ -import React, {useRef, useState} from 'react' +import React, {useState} from 'react' export const ContactFormContainer = () => { diff --git a/src/index.css b/src/index.css index 8fee052..a439281 100644 --- a/src/index.css +++ b/src/index.css @@ -12,6 +12,11 @@ } } +@font-face { + font-family: 'Montserrat'; + src: url('/public/Montserrat-Regular.ttf'); +} + h1 { font-size: 2rem; }