Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Project/co map.ru/integrated #92

Open
wants to merge 2 commits into
base: project/co-map.ru/integrated
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 86 additions & 0 deletions pages/team.tsx
Original file line number Diff line number Diff line change
@@ -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 (
<Col className={'team_member'}>
<div className={'team_member-img'}>
<Image
width={'120px'}
height={'120px'}
src={props.pictureSrc}
layout={'fixed'}
/>
</div>
<div className='team_member-info'>
<div className={'team_member-name_wrap'}>
<span className={'team_member-name'}>
{props.name}
</span>
</div>
<span className={'team_member-position'}>
{props.position}
</span>
</div>
</Col>
)
}


const TeamPage: FC = () => {
return (
<>
<HomeHeaderCoMap />


<Collapse className={'team_page-accordion'}>
<Panel className={'team-panel'} key='1' header='Управление'>
<>
{data.Managment.map(e => {
return <TeamMember
name={e.name} pictureSrc={e.pic} position={e.position} hackathon={e.hackathon}
/>
})}
</>
</Panel>
<Panel className={'team-panel'} key='2' header='Разработка'>
<>
{data.Develop.map(e => {
return <TeamMember
name={e.name} pictureSrc={e.pic} position={e.position} hackathon={e.hackathon}
/>
})}
</>
</Panel>
<Panel className={'team-panel'} key='3' header='Хакатон'>
<>
{data.Hackathon.map(e => {
return <TeamMember
name={e.name} pictureSrc={e.pic} position={e.position} hackathon={e.hackathon}
/>
})}
</>
</Panel>
</Collapse>


<Partners />
</>
)
}

export default TeamPage;
2 changes: 1 addition & 1 deletion projects/co-map/components/ChooseDirectionSearch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function ItemDirection({ text, icon, onClick }: ItemDirectionProps) {
return (
<div className={'item-direction co_map_text noselect'} onClick={onClick}>
<div className='choose-direction-img-container'><img src={icon} className='direction-tag-icon'/></div>
{text}
<div className={'item-direction-text'}>{text}</div>
</div>
)
}
2 changes: 1 addition & 1 deletion projects/co-map/components/CoMapHomePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ const Main: FC = () => {
<>
<HomeHeaderCoMap/>
<MapBannerCoMap/>
<ChooseDirectionSearch/>
<div style={{ display: 'flex', justifyContent: 'center', marginTop: '20px' }}>
<div className={'bounding_element'}>
<ChooseDirectionSearch/>
<HowToUseMap/>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions projects/co-map/utils/team.json
Original file line number Diff line number Diff line change
@@ -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
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading