Skip to content

Commit 140cfb0

Browse files
vaibhavdarenvaibhavdaren
authored
Merge pull request #180 from lakshyabatman/development
removed hardcode html to component and added favicon
2 parents 4c012ae + 406c696 commit 140cfb0

File tree

6 files changed

+162
-196
lines changed

6 files changed

+162
-196
lines changed

‎public/favicon.ico‎

-112 Bytes
Binary file not shown.

‎src/pages/Team/BoardMembers.js‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
import React from 'react'
2+
import TeamCard from './TeamCard'
3+
import jaskirat from './Jaskirat.jpeg';
4+
import devesh from './Devesh.jpeg';
5+
import shivam from './Shivam.jpeg';
6+
import vaibhav from './Vaibhav.jpeg';
7+
import './TeamCardWrapper.css'
8+
var BoardMembers = [
9+
{
10+
name:"Jaskirat Singh",
11+
post:"Founder",
12+
headline:'Matthew is a musician living in Nashville.',
13+
profile:jaskirat,
14+
github:'',
15+
linkedin:''
16+
},
17+
{
18+
name:"Devesh",
19+
post:"Donut Maintainer",
20+
headline:'Matthew is a musician living in Nashville.',
21+
profile:devesh,
22+
github:'',
23+
linkedin:''
24+
},
25+
{
26+
name:"Vaibhav D. Aren",
27+
post:"Co-Founder",
28+
headline:'Matthew is a musician living in Nashville.',
29+
profile:vaibhav,
30+
github:'',
31+
linkedin:''
32+
33+
},
34+
{
35+
name:"Shivam Luthra",
36+
post:"CodeBadge Maintainer",
37+
headline:'Matthew is a musician living in Nashville.',
38+
profile:shivam,
39+
github:'',
40+
linkedin:''
41+
42+
},
43+
{
44+
name:"Ayush Nagar",
45+
post:"CodeBadge Maintainer",
46+
headline:'Matthew is a musician living in Nashville.',
47+
profile:'https://avatars1.githubusercontent.com/u/32647423?s=460&v=4',
48+
github:'',
49+
linkedin:''
50+
51+
},
52+
{
53+
name:"Siddharth",
54+
post:"Designer",
55+
headline:'Matthew is a musician living in Nashville.',
56+
profile:'https://avatars1.githubusercontent.com/u/33068322?s=460&v=4',
57+
github:'',
58+
linkedin:''
59+
60+
},
61+
]
62+
const InjectedJSX = BoardMembers.map((member,index) => {
63+
return <TeamCard member={member}/>
64+
})
65+
const BoardMembersWrapper = () => {
66+
return (
67+
<div className="grid">
68+
{InjectedJSX}
69+
</div>
70+
)
71+
}
72+
export default BoardMembersWrapper

‎src/pages/Team/CoreContributors.js‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import React from 'react'
2+
import TeamCard from './TeamCard'
3+
import './TeamCardWrapper.css'
4+
5+
var CoreContributors = [
6+
{
7+
name:"Rupeshiya",
8+
post:"Core Colaborator",
9+
headline:'Matthew is a musician living in Nashville.',
10+
profile:'https://avatars0.githubusercontent.com/u/31209617?s=460&v=4',
11+
github:'',
12+
linkedin:''
13+
},
14+
{
15+
name:"Tushar",
16+
post:"Core Colaborator",
17+
headline:'Matthew is a musician living in Nashville.',
18+
profile:'https://avatars2.githubusercontent.com/u/34160672?s=460&v=4',
19+
github:'',
20+
linkedin:''
21+
},
22+
{
23+
name:"Shivansh",
24+
post:"Core Colaborator",
25+
headline:'Matthew is a musician living in Nashville.',
26+
profile:'https://avatars3.githubusercontent.com/u/43990819?s=460&v=4',
27+
github:'',
28+
linkedin:''
29+
},
30+
]
31+
const InjectedJSX = CoreContributors.map((member,index) => {
32+
return <TeamCard member={member}/>
33+
})
34+
const CoreContributorsWrapper = () => {
35+
return (
36+
<div className="grid">
37+
{InjectedJSX}
38+
</div>
39+
)
40+
}
41+
export default CoreContributorsWrapper

‎src/pages/Team/Team.js‎

Lines changed: 10 additions & 196 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import React, { Component } from 'react';
2+
23
import PropTypes from 'prop-types';
34
// import {Card,Button} from 'react-bootstrap'
4-
import jaskirat from './Jaskirat.jpeg';
5-
import devesh from './Devesh.jpeg';
6-
import shivam from './Shivam.jpeg';
7-
import vaibhav from './Vaibhav.jpeg';
5+
86
import './Team.css';
7+
import BoardMembersWrapper from './BoardMembers'
8+
import CoreContributorsWrapper from './CoreContributors'
99
import axios from 'axios';
1010
import $ from 'jquery';
11-
import { Card, Icon, Image } from 'semantic-ui-react'
1211
class Team extends Component {
1312

1413
constructor(props){
1514
super(props);
1615
this.state={
16+
boardMembers:[],
1717
contributors:[]
1818
}
1919
}
@@ -47,198 +47,12 @@ class Team extends Component {
4747
<div class="mt-12"></div>
4848
<h2>Board</h2>
4949
<div class="container pt-8 pb-6">
50-
51-
<div class="row"style={{display:"flex",justifyContent:"space-between"}}>
52-
53-
<div class="col-md-4">
54-
55-
<Card style={{marginBottom:"2vh",border:"0px"}}>
56-
<Image src={jaskirat} wrapped ui={false}/>
57-
<Card.Content>
58-
<Card.Header>Jaskirat Singh</Card.Header>
59-
<Card.Meta>
60-
<span className='date'>Founder</span>
61-
</Card.Meta>
62-
<Card.Description>
63-
Open Source Enthusiast.
64-
</Card.Description>
65-
</Card.Content>
66-
<Card.Content extra>
67-
<div class="container" style={{display:"flex",justifyContent:"space-evenly"}}>
68-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-github" aria-hidden="true"></i></a>
69-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-facebook" aria-hidden="true"></i></a>
70-
</div>
71-
</Card.Content>
72-
</Card>
73-
</div>
74-
<div class="col-md-4">
75-
<Card style={{marginBottom:"2vh",border:"0px"}}>
76-
<Image src={devesh} wrapped ui={false}/>
77-
<Card.Content>
78-
<Card.Header>Devesh</Card.Header>
79-
<Card.Meta>
80-
<span className='date'>Donut Maintainer</span>
81-
</Card.Meta>
82-
<Card.Description>
83-
Matthew is a musician living in Nashville.
84-
</Card.Description>
85-
</Card.Content>
86-
<Card.Content extra>
87-
<div class="container" style={{display:"flex",justifyContent:"space-evenly"}}>
88-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-github" aria-hidden="true"></i></a>
89-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-facebook" aria-hidden="true"></i></a>
90-
</div>
91-
</Card.Content>
92-
</Card>
93-
</div>
94-
<div class="col-md-4">
95-
<Card style={{marginBottom:"2vh",border:"0px"}}>
96-
<Image src={vaibhav} wrapped ui={false} />
97-
<Card.Content>
98-
<Card.Header>Vaibhav D. Aren</Card.Header>
99-
<Card.Meta>
100-
<span className='date'>Co-Founder</span>
101-
</Card.Meta>
102-
<Card.Description>
103-
Matthew is a musician living in Nashville.
104-
</Card.Description>
105-
</Card.Content>
106-
<Card.Content extra>
107-
<div class="container" style={{display:"flex",justifyContent:"space-evenly"}}>
108-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-github" aria-hidden="true"></i></a>
109-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-facebook" aria-hidden="true"></i></a>
110-
</div>
111-
</Card.Content>
112-
</Card>
113-
</div>
114-
<div class="col-md-4">
115-
<Card style={{marginBottom:"2vh",border:"0px"}}>
116-
<Image src={shivam} wrapped ui={false} />
117-
<Card.Content>
118-
<Card.Header>Shivam Luthra</Card.Header>
119-
<Card.Meta>
120-
<span className='date'>CodeBadge Maintainer</span>
121-
</Card.Meta>
122-
<Card.Description>
123-
Matthew is a musician living in Nashville.
124-
</Card.Description>
125-
</Card.Content>
126-
<Card.Content extra>
127-
<div class="container" style={{display:"flex",justifyContent:"space-evenly"}}>
128-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-github" aria-hidden="true"></i></a>
129-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-facebook" aria-hidden="true"></i></a>
130-
</div>
131-
</Card.Content>
132-
</Card>
133-
</div>
134-
<div class="col-md-4">
135-
<Card style={{marginBottom:"2vh",border:"0px"}}>
136-
<Image src="https://avatars1.githubusercontent.com/u/32647423?s=460&v=4" wrapped ui={false} width={{maxWidth:"350px"}}/>
137-
<Card.Content>
138-
<Card.Header>Ayush Nagar</Card.Header>
139-
<Card.Meta>
140-
<span className='date'>CodeBadge Maintainer</span>
141-
</Card.Meta>
142-
<Card.Description>
143-
Matthew is a musician living in Nashville.
144-
</Card.Description>
145-
</Card.Content>
146-
<Card.Content extra>
147-
<div class="container" style={{display:"flex",justifyContent:"space-evenly"}}>
148-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-github" aria-hidden="true"></i></a>
149-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-facebook" aria-hidden="true"></i></a>
150-
</div>
151-
</Card.Content>
152-
</Card>
153-
</div>
154-
<div class="col-md-4">
155-
<Card style={{marginBottom:"2vh",border:"0px"}}>
156-
<Image src="https://avatars1.githubusercontent.com/u/33068322?s=460&v=4" wrapped ui={false} />
157-
<Card.Content>
158-
<Card.Header>Siddharth</Card.Header>
159-
<Card.Meta>
160-
<span className='date'>Designer</span>
161-
</Card.Meta>
162-
<Card.Description>
163-
Matthew is a musician living in Nashville.
164-
</Card.Description>
165-
</Card.Content>
166-
<Card.Content extra>
167-
<div class="container" style={{display:"flex",justifyContent:"space-evenly"}}>
168-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-github" aria-hidden="true"></i></a>
169-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-facebook" aria-hidden="true"></i></a>
170-
</div>
171-
</Card.Content>
172-
</Card>
173-
</div>
174-
</div>
175-
</div>
176-
<h2>Our Backbone</h2>
177-
<div class="container pt-8 pb-6" style={{display:"flex",justifyContent:"space-evenly"}}>
178-
<div class="row">
179-
<div class="col-md-4">
180-
181-
<Card style={{marginBottom:"2vh",border:"0px"}}>
182-
<Image src="https://avatars0.githubusercontent.com/u/31209617?s=460&v=4" wrapped ui={false}/>
183-
<Card.Content>
184-
<Card.Header>Rupeshiya</Card.Header>
185-
<Card.Meta>
186-
<span className='date'>Core Colaborator</span>
187-
</Card.Meta>
188-
<Card.Description>
189-
Matthew is a musician living in Nashville.
190-
</Card.Description>
191-
</Card.Content>
192-
<Card.Content extra>
193-
<div class="container" style={{display:"flex",justifyContent:"space-evenly"}}>
194-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-github" aria-hidden="true"></i></a>
195-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-facebook" aria-hidden="true"></i></a>
196-
</div>
197-
</Card.Content>
198-
</Card>
199-
</div>
200-
<div class="col-md-4">
201-
<Card style={{marginBottom:"2vh",border:"0px"}}>
202-
<Image src="https://avatars2.githubusercontent.com/u/34160672?s=460&v=4" wrapped ui={false} width={{maxWidth:"350px"}}/>
203-
<Card.Content>
204-
<Card.Header>Tushar</Card.Header>
205-
<Card.Meta>
206-
<span className='date'>Core Colaborator</span>
207-
</Card.Meta>
208-
<Card.Description>
209-
Matthew is a musician living in Nashville.
210-
</Card.Description>
211-
</Card.Content>
212-
<Card.Content extra>
213-
<div class="container" style={{display:"flex",justifyContent:"space-evenly"}}>
214-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-github" aria-hidden="true"></i></a>
215-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-facebook" aria-hidden="true"></i></a>
216-
</div>
217-
</Card.Content>
218-
</Card>
219-
</div>
220-
<div class="col-md-4">
221-
<Card style={{marginBottom:"2vh",border:"0px"}}>
222-
<Image src="https://avatars3.githubusercontent.com/u/43990819?s=460&v=4" wrapped ui={false} />
223-
<Card.Content>
224-
<Card.Header>Shivansh</Card.Header>
225-
<Card.Meta>
226-
<span className='date'>Core Colaborator</span>
227-
</Card.Meta>
228-
<Card.Description>
229-
Matthew is a musician living in Nashville.
230-
</Card.Description>
231-
</Card.Content>
232-
<Card.Content extra>
233-
<div class="container" style={{display:"flex",justifyContent:"space-evenly"}}>
234-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-github" aria-hidden="true"></i></a>
235-
<a class="btn btn-primary mr-1" href="https://github.com/codeuino/codebadge" role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-facebook" aria-hidden="true"></i></a>
50+
<BoardMembersWrapper/>
51+
</div>
52+
<h2>Our Backbone</h2>
53+
<div class="container pt-8 pb-6" style={{display:"flex",justifyContent:"space-evenly"}}>
54+
<CoreContributorsWrapper/>
23655
</div>
237-
</Card.Content>
238-
</Card>
239-
</div>
240-
</div>
241-
</div>
24256
<h2>Our Awesome Contributors</h2>
24357
<div id="cotributors" className="container d-flex">
24458
<div class="row" style={{display:"flex",justifyContent:"center"}}>

‎src/pages/Team/TeamCard.js‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import React from 'react'
2+
import { Card, Image } from 'semantic-ui-react'
3+
4+
5+
const TeamCard = (props) => {
6+
console.log(props)
7+
return (
8+
<Card style={{marginBottom:"2vh",border:"0px"}}>
9+
<Image src={props.member.profile} wrapped ui={false}/>
10+
<Card.Content>
11+
<Card.Header>{props.member.name}</Card.Header>
12+
<Card.Meta>
13+
<span className='date'>{props.member.post}</span>
14+
</Card.Meta>
15+
<Card.Description>
16+
{props.member.headline}
17+
</Card.Description>
18+
</Card.Content>
19+
<Card.Content extra>
20+
<div class="container" style={{display:"flex",justifyContent:"space-evenly",marginTop:20}}>
21+
<a class="btn btn-primary mr-1" href={props.member.github} role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-github" aria-hidden="true"></i></a>
22+
<a class="btn btn-primary mr-1" href={props.member.linkedin} role="button" style={{borderRadius:"50%",backgroundColor:" #22247A"}}><i class="fa fa-linkedin" aria-hidden="true"></i></a>
23+
</div>
24+
</Card.Content>
25+
</Card>
26+
)
27+
}
28+
export default TeamCard

‎src/pages/Team/TeamCardWrapper.css‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
.grid {
2+
display: grid;
3+
grid-template-columns: auto auto auto;
4+
grid-gap: 30px;
5+
grid-row-gap: 50px;
6+
}
7+
@media screen and (max-width:767px) {
8+
.grid {
9+
grid-template-columns: auto;
10+
}
11+
}

0 commit comments

Comments
 (0)