diff --git a/src/Components/AddUsersPage/style.module.scss b/src/Components/AddUsersPage/style.module.scss index 2b2b1b7..9ef06a5 100644 --- a/src/Components/AddUsersPage/style.module.scss +++ b/src/Components/AddUsersPage/style.module.scss @@ -287,7 +287,7 @@ margin-left: 10%; } &_container { - height: 100%; + height: 96%; display: flex; align-items: start; diff --git a/src/Components/Header/index.jsx b/src/Components/Header/index.jsx index 07e7579..d4d54f7 100644 --- a/src/Components/Header/index.jsx +++ b/src/Components/Header/index.jsx @@ -2,10 +2,12 @@ import styles from './style.module.scss'; import logo from '../../img/headerImg/header.png'; import google from '../../img/headerImg/google.png'; -import avatar from '../../img/headerImg/avatar.png'; + import icon from '../../img/headerImg/Icon.png'; +import Menu from '../Menu' import { useNavigate } from "react-router-dom"; + import { useState } from 'react'; const Header = () => { @@ -23,7 +25,7 @@ const Header = () => {
logo
-
+
) : diff --git a/src/Components/HomePage/index.jsx b/src/Components/HomePage/index.jsx index dd951bf..c89df93 100644 --- a/src/Components/HomePage/index.jsx +++ b/src/Components/HomePage/index.jsx @@ -6,6 +6,7 @@ import Home from "../Home/Home"; import EditForm from "../edit/EditForm"; import PostForm from "../post/PostForm"; +import muza from '../../img/homePage/muza.png'; const APIURL = '' // const events = [ @@ -36,7 +37,9 @@ const HomePage = () => { <>
+
muza
+
МУЗА
Платформа для проведения well-being мероприятий
diff --git a/src/Components/HomePage/style.module.scss b/src/Components/HomePage/style.module.scss index e3e3ef5..07e64eb 100644 --- a/src/Components/HomePage/style.module.scss +++ b/src/Components/HomePage/style.module.scss @@ -5,13 +5,19 @@ } .muza { &__container { - height: 700px; + height: 780px; display: flex; align-items: center; flex-direction: column; width: 100%; + position: relative; } - + &_img { + position: absolute; + left: 0px; + top: 300px; + height: 480px; + } &__title { margin-top: 150px; color: #000; @@ -23,6 +29,7 @@ text-align: left; display: flex; width: 90%; + z-index: 10; } &__descr { @@ -30,7 +37,7 @@ display: flex; justify-content: flex-end; } - margin-top: 50px; + margin-top: 100px; margin-left: 70px; color: #000; font-family: Montserrat; @@ -41,7 +48,7 @@ text-align: left; display: flex; width: 60%; - + z-index: 10; } } .meeting { diff --git a/src/Components/Menu/index.jsx b/src/Components/Menu/index.jsx new file mode 100644 index 0000000..95c5190 --- /dev/null +++ b/src/Components/Menu/index.jsx @@ -0,0 +1,55 @@ +import * as React from 'react'; +import Button from '@mui/material/Button'; +import Menu from '@mui/material/Menu'; +import MenuItem from '@mui/material/MenuItem'; +import avatar from '../../img/headerImg/avatar.png' +import { useNavigate } from "react-router-dom";; +import styles from './style.module.scss'; +export default function BasicMenu() { + const [anchorEl, setAnchorEl] = React.useState(null); + const open = Boolean(anchorEl); + const handleClick = (event) => { + setAnchorEl(event.currentTarget); + }; + const navigate = useNavigate(); + const handleHome = () => { + navigate('/'); + setAnchorEl(null); + } + const handleProfile = () => { + navigate('/profile'); + setAnchorEl(null); + } + const handleAtchive = () => { + navigate('/achievements'); + setAnchorEl(null); + } + const handleClose = () => { + setAnchorEl(null); + } + return ( + <> + + + + Профиль + Достижения + Выйти + + + ); +} diff --git a/src/Components/Menu/style.module.scss b/src/Components/Menu/style.module.scss new file mode 100644 index 0000000..3615811 --- /dev/null +++ b/src/Components/Menu/style.module.scss @@ -0,0 +1,8 @@ +.header { + &_img { + + width: 55px; + margin-right: 40px; + height: 55px; + } +} \ No newline at end of file diff --git a/src/img/homePage/muza.png b/src/img/homePage/muza.png new file mode 100644 index 0000000..f5ed239 Binary files /dev/null and b/src/img/homePage/muza.png differ