Compare commits

..

No commits in common. "e756a3ab2301593251d7b68006a24b016b56a62d" and "3c109d1619a994f61fa765dcb92e98b5ac1a51c3" have entirely different histories.

7 changed files with 7 additions and 82 deletions

View File

@ -287,7 +287,7 @@
margin-left: 10%; margin-left: 10%;
} }
&_container { &_container {
height: 96%; height: 100%;
display: flex; display: flex;
align-items: start; align-items: start;

View File

@ -2,12 +2,10 @@
import styles from './style.module.scss'; import styles from './style.module.scss';
import logo from '../../img/headerImg/header.png'; import logo from '../../img/headerImg/header.png';
import google from '../../img/headerImg/google.png'; import google from '../../img/headerImg/google.png';
import avatar from '../../img/headerImg/avatar.png';
import icon from '../../img/headerImg/Icon.png'; import icon from '../../img/headerImg/Icon.png';
import Menu from '../Menu'
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { useState } from 'react'; import { useState } from 'react';
const Header = () => { const Header = () => {
@ -25,7 +23,7 @@ const Header = () => {
<div className={styles.header__container}> <div className={styles.header__container}>
<header className={styles.header}> <header className={styles.header}>
<div className={styles.header__logo} onClick={handleHome} ><img onClick={handleHome} src={logo} alt="logo"></img></div> <div className={styles.header__logo} onClick={handleHome} ><img onClick={handleHome} src={logo} alt="logo"></img></div>
<div className={styles.header_img_container}> <img className={styles.header_img} src={icon}></img> <Menu></Menu></div> <div className={styles.header_img_container}> <img className={styles.header_img} src={icon}></img> <img className={styles.header_img} src={avatar}></img></div>
</header> </header>
</div> </div>
) : ) :

View File

@ -9,7 +9,6 @@ import Questions from "../post/Questions";
import { GetQuestions } from "../get/Questions"; import { GetQuestions } from "../get/Questions";
import muza from '../../img/homePage/muza.png';
const APIURL = '' const APIURL = ''
// const events = [ // const events = [
@ -40,9 +39,7 @@ const HomePage = () => {
<> <>
<Header></Header> <Header></Header>
<div className={styles.muza_img_container}><img src={muza} alt='muza' className={styles.muza_img}></img></div>
<section className={styles.muza__container}> <section className={styles.muza__container}>
<div className={styles.muza__title}>МУЗА</div> <div className={styles.muza__title}>МУЗА</div>
<div className={styles.muza__descr_container}> <div className={styles.muza__descr_container}>
<div className={styles.muza__descr}>Платформа для проведения well-being мероприятий</div> <div className={styles.muza__descr}>Платформа для проведения well-being мероприятий</div>

View File

@ -5,19 +5,13 @@
} }
.muza { .muza {
&__container { &__container {
height: 780px; height: 700px;
display: flex; display: flex;
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
width: 100%; width: 100%;
position: relative;
}
&_img {
position: absolute;
left: 0px;
top: 300px;
height: 480px;
} }
&__title { &__title {
margin-top: 150px; margin-top: 150px;
color: #000; color: #000;
@ -29,7 +23,6 @@
text-align: left; text-align: left;
display: flex; display: flex;
width: 90%; width: 90%;
z-index: 10;
} }
&__descr { &__descr {
@ -37,7 +30,7 @@
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
} }
margin-top: 100px; margin-top: 50px;
margin-left: 70px; margin-left: 70px;
color: #000; color: #000;
font-family: Montserrat; font-family: Montserrat;
@ -48,7 +41,7 @@
text-align: left; text-align: left;
display: flex; display: flex;
width: 60%; width: 60%;
z-index: 10;
} }
} }
.meeting { .meeting {

View File

@ -1,55 +0,0 @@
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 (
<>
<img
src={avatar}
className={styles.header_img}
aria-controls={open ? 'basic-menu' : undefined}
aria-expanded={open ? 'true' : undefined}
onClick={handleClick}
>
</img>
<Menu
id="basic-menu"
anchorEl={anchorEl}
open={open}
onClose={handleClose}
MenuListProps={{
'aria-labelledby': 'basic-button',
}}
>
<MenuItem onClick={handleProfile}>Профиль</MenuItem>
<MenuItem onClick={handleAtchive}>Достижения</MenuItem>
<MenuItem onClick={handleHome}>Выйти</MenuItem>
</Menu>
</>
);
}

View File

@ -1,8 +0,0 @@
.header {
&_img {
width: 55px;
margin-right: 40px;
height: 55px;
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 637 KiB