From 23c1e43ba97f9c558dd230a75ffc4741b8b1b41e Mon Sep 17 00:00:00 2001 From: mihail323i21 Date: Tue, 21 Nov 2023 03:08:48 +0500 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?= =?UTF-8?q?=D0=B5=D1=82=20=D1=84=D0=BE=D1=82=D0=BE=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=84=D0=B8=D0=BB=D1=8F,=20=D1=84=D0=B8=D0=BE=20=D0=B2=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=B4=D0=B0=D0=BB=D0=BA=D1=83=20=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/mapMenu/MapMenu.tsx | 2 +- .../mapMenu/UIMapMenu/UserProfile.tsx | 33 ------------ .../UIMapMenu/UserProfile/UserProfile.tsx | 35 +++++++++++++ .../UserProfile/UserProfileModalBody.tsx | 23 +++++++++ .../UserProfile/userProfileModalBody.css.map | 1 + .../UserProfile/userProfileModalBody.scss | 51 +++++++++++++++++++ .../mapMenu/UIMapMenu/UserProfileModal.tsx | 15 ------ 7 files changed, 111 insertions(+), 49 deletions(-) delete mode 100644 frontend/src/components/mapMenu/UIMapMenu/UserProfile.tsx create mode 100644 frontend/src/components/mapMenu/UIMapMenu/UserProfile/UserProfile.tsx create mode 100644 frontend/src/components/mapMenu/UIMapMenu/UserProfile/UserProfileModalBody.tsx create mode 100644 frontend/src/components/mapMenu/UIMapMenu/UserProfile/userProfileModalBody.css.map create mode 100644 frontend/src/components/mapMenu/UIMapMenu/UserProfile/userProfileModalBody.scss delete mode 100644 frontend/src/components/mapMenu/UIMapMenu/UserProfileModal.tsx diff --git a/frontend/src/components/mapMenu/MapMenu.tsx b/frontend/src/components/mapMenu/MapMenu.tsx index a3c7e89..6f92b4d 100644 --- a/frontend/src/components/mapMenu/MapMenu.tsx +++ b/frontend/src/components/mapMenu/MapMenu.tsx @@ -4,7 +4,7 @@ import {useNavigate} from "react-router-dom"; import Coins from "./UIMapMenu/Coins.tsx"; import './../../styles/mapMenu.scss' import ChooseModuleWindow from "./UIMapMenu/ChooseModuleWindow.tsx"; -import UserProfile from "./UIMapMenu/UserProfile.tsx"; +import UserProfile from "./UIMapMenu/UserProfile/UserProfile.tsx"; import Module from "./UIMapMenu/Level/Module.tsx"; import mapMenuStore from "../../store/mapMenuStore.ts"; import {observer} from "mobx-react-lite"; diff --git a/frontend/src/components/mapMenu/UIMapMenu/UserProfile.tsx b/frontend/src/components/mapMenu/UIMapMenu/UserProfile.tsx deleted file mode 100644 index 7d765d2..0000000 --- a/frontend/src/components/mapMenu/UIMapMenu/UserProfile.tsx +++ /dev/null @@ -1,33 +0,0 @@ -import React, {useState} from 'react'; -import ModalWindow from "../../../UIComponents/modalWindow/ModalWindow.tsx"; - -interface IPropTypes { - -} - -const UserProfile: React.FC = () => { - const [isModalOpen, setIsModalOpen] = useState(false) - - return ( -
-
- - - - - - - - - -
- {isModalOpen && setIsModalOpen(!isModalOpen)} b/>} -
- ); -}; - -export default UserProfile; diff --git a/frontend/src/components/mapMenu/UIMapMenu/UserProfile/UserProfile.tsx b/frontend/src/components/mapMenu/UIMapMenu/UserProfile/UserProfile.tsx new file mode 100644 index 0000000..27ce93b --- /dev/null +++ b/frontend/src/components/mapMenu/UIMapMenu/UserProfile/UserProfile.tsx @@ -0,0 +1,35 @@ +import React, {useState} from 'react'; +import ModalWindow from "../../../../UIComponents/modalWindow/ModalWindow.tsx"; +import UserProfileModalBody from "./UserProfileModalBody.tsx"; +import "./userProfileModalBody.scss" + +interface IPropTypes { + +} + +const UserProfile: React.FC = () => { + const [isModalOpen, setIsModalOpen] = useState(false) + + return ( +
+
setIsModalOpen(!isModalOpen)}> + + + + + + + + + +
+ {isModalOpen && setIsModalOpen(!isModalOpen)} body={}/>} +
+ ); +}; + +export default UserProfile; diff --git a/frontend/src/components/mapMenu/UIMapMenu/UserProfile/UserProfileModalBody.tsx b/frontend/src/components/mapMenu/UIMapMenu/UserProfile/UserProfileModalBody.tsx new file mode 100644 index 0000000..0a3abd8 --- /dev/null +++ b/frontend/src/components/mapMenu/UIMapMenu/UserProfile/UserProfileModalBody.tsx @@ -0,0 +1,23 @@ +import React from 'react'; + +interface IUserProfileModalProps { + img?: string +} + +const UserProfileModalBody: React.FC = () => { + return ( +
+
+

ПРОФИЛЬ СОТРУДНИКА

+
+
+ +
+ Фото профиля +
+ ); +}; + +export default UserProfileModalBody; diff --git a/frontend/src/components/mapMenu/UIMapMenu/UserProfile/userProfileModalBody.css.map b/frontend/src/components/mapMenu/UIMapMenu/UserProfile/userProfileModalBody.css.map new file mode 100644 index 0000000..1d62b83 --- /dev/null +++ b/frontend/src/components/mapMenu/UIMapMenu/UserProfile/userProfileModalBody.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["userProfileModalBody.scss","../../../../styles/variablesStyles.scss"],"names":[],"mappings":"AAEA;EACE;EAEA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA,YC5Ba;ED6Bb;EACA;EACA;;;AAIF;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA","file":"userProfileModalBody.css"} \ No newline at end of file diff --git a/frontend/src/components/mapMenu/UIMapMenu/UserProfile/userProfileModalBody.scss b/frontend/src/components/mapMenu/UIMapMenu/UserProfile/userProfileModalBody.scss new file mode 100644 index 0000000..27a0be2 --- /dev/null +++ b/frontend/src/components/mapMenu/UIMapMenu/UserProfile/userProfileModalBody.scss @@ -0,0 +1,51 @@ +@import "./../../../../styles/variablesStyles"; + +.user-profile-title { + text-align: left; + + position: relative; + left: 5%; + top: 5%; + + color: #2B2A29; + font-family: Golos, sans-serif; + font-size: 1rem; + font-style: normal; + font-weight: 700; + line-height: normal; + letter-spacing: 0.1rem; +} + +.user-profile-photo { + position: absolute; + top: 20%; + left: 10%; + border-radius: 100px; +} + +.header-modal-user-profile { + width: 100%; + height: 5rem; + border-radius: 15px; + background: $formsBGColor; + display: flex; + justify-content: left; + align-items: center; + +} + +.user-info-fields{ + position: absolute; + top: 20%; + left: 35%; + + & input { + width: 19rem; + height: 4rem; + border-radius: 10px; + } +} + +.full-name__input { + +} diff --git a/frontend/src/components/mapMenu/UIMapMenu/UserProfileModal.tsx b/frontend/src/components/mapMenu/UIMapMenu/UserProfileModal.tsx deleted file mode 100644 index 3702378..0000000 --- a/frontend/src/components/mapMenu/UIMapMenu/UserProfileModal.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import React from 'react'; - -interface IUserProfileModalProps { - -} - -const UserProfileModal: React.FC = () => { - return ( -
- -
- ); -}; - -export default UserProfileModal;