diff --git a/pages/team.tsx b/pages/team.tsx
new file mode 100644
index 0000000..8861a9e
--- /dev/null
+++ b/pages/team.tsx
@@ -0,0 +1,86 @@
+import { FC } from 'react';
+import HomeHeaderCoMap from '../projects/co-map/components/HomeHeaderCoMap';
+import Partners from '../projects/co-map/components/Partners';
+import { Collapse, Col, Row } from 'antd';
+import Image from 'next/image'
+import data from '../projects/co-map/utils/team.json'
+
+const { Panel } = Collapse;
+
+
+interface TeamMemberProps {
+ name: string;
+ pictureSrc: string;
+ position: string;
+ hackathon: boolean;
+}
+
+const TeamMember = (props: TeamMemberProps) => {
+ return (
+
+
+
+
+
+
+
+ {props.name}
+
+
+
+ {props.position}
+
+
+
+ )
+}
+
+
+const TeamPage: FC = () => {
+ return (
+ <>
+
+
+
+
+
+ <>
+ {data.Managment.map(e => {
+ return
+ })}
+ >
+
+
+ <>
+ {data.Develop.map(e => {
+ return
+ })}
+ >
+
+
+ <>
+ {data.Hackathon.map(e => {
+ return
+ })}
+ >
+
+
+
+
+
+ >
+ )
+}
+
+export default TeamPage;
\ No newline at end of file
diff --git a/projects/co-map/components/ChooseDirectionSearch.tsx b/projects/co-map/components/ChooseDirectionSearch.tsx
index c64639b..e0ab326 100644
--- a/projects/co-map/components/ChooseDirectionSearch.tsx
+++ b/projects/co-map/components/ChooseDirectionSearch.tsx
@@ -49,7 +49,7 @@ function ItemDirection({ text, icon, onClick }: ItemDirectionProps) {
return (
)
}
diff --git a/projects/co-map/components/CoMapHomePage.tsx b/projects/co-map/components/CoMapHomePage.tsx
index 6bd6317..4fd7fc4 100644
--- a/projects/co-map/components/CoMapHomePage.tsx
+++ b/projects/co-map/components/CoMapHomePage.tsx
@@ -30,9 +30,9 @@ const Main: FC = () => {
<>
+
diff --git a/projects/co-map/utils/team.json b/projects/co-map/utils/team.json
index 3908eed..94f38af 100644
--- a/projects/co-map/utils/team.json
+++ b/projects/co-map/utils/team.json
@@ -1,8 +1,8 @@
{
"Managment": [
{
- "name": "Андрей Андрюсов",
- "pic": "/projects/co-map/assets/img/co-map/andrei_square.JPG",
+ "name": "Алексей Маслов",
+ "pic": "/projects/co-map/assets/img/co-map/aleksei.JPG",
"position": "Куратор проекта",
"hackathon": true
},
diff --git a/public/projects/co-map/assets/img/co-map/aleksei.jpg b/public/projects/co-map/assets/img/co-map/aleksei.jpg
new file mode 100644
index 0000000..81a7d27
Binary files /dev/null and b/public/projects/co-map/assets/img/co-map/aleksei.jpg differ
diff --git a/styles/comap.scss b/styles/comap.scss
index 3b203dc..e7ce7a3 100644
--- a/styles/comap.scss
+++ b/styles/comap.scss
@@ -316,13 +316,9 @@
//// ChooseDirectionSearch
.choose-direction-img-container {
- width: 50px;
- height: 50px;
display: flex;
justify-content: center;
align-items: center;
- padding: 10px;
- margin-bottom: 35px;
}
.direction-tag-icon {
@@ -340,94 +336,68 @@
flex-direction: column;
text-align: center;
- .title {
- font-family: 'Open Sans', sans-serif;
- font-weight: 700;
- font-size: 2.7vw;
- margin-bottom: 8vh;
- }
-
- @media (max-width: 1000px) {
- .title {
- font-size: 5vw;
- margin-bottom: 20px;
- }
- }
-
.item-container {
display: flex;
justify-content: center;
flex-direction: row;
- padding: 0 0 5% 0;
+ gap: 30px;
+ padding: 0 100px 5% 100px;
+ margin-top: 50px;
+ max-width: 100%;
width: 100%;
- // flex-wrap: wrap;
-
+
.item-direction {
cursor: pointer;
text-align: center;
- padding: 20px 15px 20px 15px;
- margin: 80px 30px 25px 15px;
display: flex;
+ gap: 30px;
align-items: center;
- justify-content: center;
+ justify-content: space-between;
flex-direction: column;
- width: 250px;
- height: 6em;
- min-width: 200px;
+
+ .item-direction-text {
+ height: 100%;
+ }
+ }
+ }
+
+ @media (max-width: 1000px) {
+ .item-container {
+ padding: 0 20px 5% 20px;
+ gap: 25px;
- .text {
- user-select: none;
+ .item-direction-text {
+ font-size: 16px;
}
-
}
- // .item-direction:hover {
- // box-shadow: 2px 3px black, -.4em 0 0.4em gray;
- // }
+ img {
+ width: 48px;
+ height: 48px;
+ }
+ }
- // .item-direction:active {
- // box-shadow: none;
- // }
+ @media (max-width: 768px) {
+ .item-container {
+ flex-wrap: wrap;
- @media (max-width: 1000px) {
.item-direction {
- width: 40%;
- height: 5em;
+ flex: 1 0 27%;
}
}
- @media (max-width: 400px) {
- .item-direction {
- width: 38%;
- }
- }
-
}
- @media (max-width: 1000px) {
- .item-container {
- padding: 0 2% 5% 2%;
- }
- }
- @media (max-width: 400px) {
+ @media (max-width: 480px) {
.item-direction {
- padding: 0 0 0 0;
+ flex-basis: calc(50% - (25px / 2)) !important;
}
}
- .text {
- font-family: 'Open Sans', sans-serif;
- font-weight: 400;
- font-size: 1.6vw;
- margin-bottom: 100px;
- }
-
- @media (max-width: 1000px) {
- .text {
- font-size: 3vw;
-
+ @media (max-width: 360px) {
+ .item-direction {
+ max-width: calc(50% - 13px);
}
}
-
}
//// HeaderCardContainer
@@ -661,4 +631,182 @@
color: #AB366A;
white-space: nowrap;
}
+}
+
+
+
+/// TeamPage
+
+
+.team_page-accordion {
+ width: 100vw;
+ margin: 100px 0 120px 0;
+ background-color: #FFFFFF;
+
+ .ant-collapse-header {
+ flex-direction: row-reverse;
+ justify-content: space-between;
+ }
+
+ & > .ant-collapse-item {
+ padding: 0 100px 0 100px;
+ }
+
+ .team-panel > .ant-collapse-content {
+ border: none;
+ background-color: #F7F7F7;
+ width: 100vw;
+ transform: translate(-100px, 0);
+
+ .ant-collapse-content-box {
+ width: 100%;
+ padding: 50px 100px;
+ display: flex;
+ justify-content: space-between;
+ flex-wrap: wrap;
+ gap: 50px 20px;
+
+ .team_member {
+ width: 30%;
+ display: flex;
+ gap: 20px;
+
+ .team_member-info {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+
+ .team_member-name {
+ font-size: 22pt;
+ font-weight: 300;
+ }
+
+ .team_member-position {
+ font-size: 13pt;
+ font-weight: 500;
+ }
+ }
+ }
+ }
+ }
+
+ @media (min-width: 1001px) and (max-width: 1300px) {
+ .team_member {
+ gap: 15px !important;
+
+ .team_member-info {
+ gap: 5px !important;
+
+ .team_member-name {
+ font-size: 18pt !important;
+ line-height: 18pt;
+ }
+
+ .team_member-position {
+ font-size: 10pt !important;
+ }
+ }
+ }
+ }
+
+ @media (min-width: 769px) and (max-width: 1000px) {
+ .ant-collapse-content-box {
+ padding: 50px 20px !important;
+
+ .team_member {
+ max-width: 50% !important;
+ flex: 0 1 48%;
+
+ .team_member-name {
+ line-height: 19pt;
+ }
+ .team_member-position {
+ line-height: 12pt;
+ }
+ }
+ }
+ }
+
+ @media /*(min-width: 481px) and*/ (max-width: 768px) {
+ margin: 50px 0 120px 0;
+
+ .ant-collapse-content-box {
+ padding: 50px 20px !important;
+
+ .team_member {
+ flex-direction: column;
+ align-items: center;
+ gap: 10px !important;
+
+ .team_member-info {
+ justify-content: center;
+ align-items: center;
+ gap: 7px;
+
+ & .team_member-name_wrap {
+ display: flex;
+
+ .team_member-name {
+ font-size: 15pt !important;
+ line-height: 18pt;
+ text-align: center;
+ }
+ }
+
+ .team_member-position {
+ font-size: 10pt !important;
+ line-height: 11pt;
+ text-align: center;
+ }
+ }
+ }
+ }
+ }
+
+ @media (max-width: 480px) {
+ & > .ant-collapse-item {
+ padding: 0 20px 0 20px;
+ }
+
+ .ant-collapse-content {
+ transform: translate(-20px, 0) !important;
+
+ .ant-collapse-content-box {
+ // padding: 25px 20px !important;
+ gap: 25px 20px !important;
+
+ .team_member {
+ max-width: calc(50% - 10px) !important;
+ width: 50% !important;
+ flex: 0 1 calc(50%);
+ // gap: 3px !important;
+
+ .team_member-img,
+ .team_member-img > span,
+ .team_member-img img {
+ // width: 60px !important;
+ // height: 60px !important;
+ min-width: 60px !important;
+ max-width: 60px !important;
+ min-height: 60px !important;
+ max-height: 60px !important;
+ }
+
+ .team_member-info {
+ // max-height: 60px;
+
+ .team_member-name {
+ font-size: 12pt !important;
+ line-height: 12pt;
+ }
+ .team_member-position {
+ font-size: 8pt !important;
+ line-height: 8pt;
+ }
+ }
+
+ }
+ }
+ }
+ }
}
\ No newline at end of file