Skip to content

Commit 76bf528

Browse files
cheryllicherylli
authored
Merge branch 'main' into fix/no-stylesheets-in-head-component
2 parents 8efb44a + f8dd186 commit 76bf528

21 files changed

+353
-3539
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
node_modules
44
.env
55
.DS_Store
6+
yarn-error.log
67

78
# PWA files
89
**/public/sw.js

‎CHANGELOG.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
5151
- .prettierignore file
5252
- husky, lint-staged to auto format with prettier on git commit
5353
- lint and format script to run prettier check and write on all files respectively
54-
54+
- who we are components
5555

5656
### Fixed
5757

@@ -68,7 +68,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
6868
- adjust flex-basis of a few sections in the about page to better match the design file
6969
- prettierrc "end of line" to auto
7070
- fixed next.js warning - no stylesheets in head component
71-
(added _document.js and moved google fonts into _document.js
72-
73-
71+
(added _document.js and moved google fonts into _document.js)
7472

‎components/containers/Member.js

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
import Image from 'next/image';
2+
import styles from '@/styles/Member.module.scss';
3+
4+
export default function Member({
5+
image,
6+
name,
7+
title,
8+
position,
9+
about,
10+
linkedIn,
11+
portfolio,
12+
customClass,
13+
}) {
14+
return (
15+
<div className={styles.card}>
16+
{image && (
17+
<div className={styles.card__image}>
18+
<Image src={image} alt={name} className={styles.img} layout='fill' />
19+
</div>
20+
)}
21+
22+
<h2 className={styles.name}>{name}</h2>
23+
<h3 className={styles.title}>{title}</h3>
24+
<h3 className={styles.position}>{position}</h3>
25+
<div className={`${styles.content}`}>
26+
{linkedIn && (
27+
<div className={`${styles.links}`}>
28+
<Image
29+
src='/images/svg/LinkedIn2.svg'
30+
alt='LinkedIn'
31+
height='25px'
32+
width='25px'
33+
/>
34+
<a
35+
href={`https://linkedin.com/in/${linkedIn}`}
36+
target='_blank'
37+
rel='noopener noreferrer'
38+
>
39+
{linkedIn}
40+
</a>
41+
</div>
42+
)}
43+
{portfolio && (
44+
<div className={`${styles.links}`}>
45+
<Image
46+
src='/images/svg/globe.svg'
47+
alt='Web Site'
48+
height='25px'
49+
width='25px'
50+
/>
51+
<a
52+
href={`https://${portfolio}`}
53+
target='_blank'
54+
rel='noopener noreferrer'
55+
>
56+
{portfolio}
57+
</a>
58+
</div>
59+
)}
60+
61+
<p>{about}</p>
62+
</div>
63+
</div>
64+
);
65+
}

‎components/containers/Row.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import rowStyles from '@/styles/Row.module.scss';
2+
3+
export default function Row({ customClass, children, styles }) {
4+
return (
5+
<div
6+
className={
7+
customClass
8+
? `${rowStyles.row} ${rowStyles[customClass]}`
9+
: rowStyles.row
10+
}
11+
style={styles}
12+
>
13+
{children}
14+
</div>
15+
);
16+
}

‎components/containers/Wrapper.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import wrapperStyles from '@/styles/Wrapper.module.scss';
2+
3+
export default function Wrapper({ customClass, children }) {
4+
return (
5+
<div
6+
className={
7+
customClass
8+
? `${wrapperStyles.wrapper} ${wrapperStyles[customClass]}`
9+
: wrapperStyles.wrapper
10+
}
11+
>
12+
{children}
13+
</div>
14+
);
15+
}

‎pages/about.js

Lines changed: 50 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@ import {
66
primaryAccent,
77
lightBgColor,
88
} from '@/styles/TwoColumn.module.scss';
9+
import rowStyles from '@/styles/Row.module.scss';
910
import CardsColumns from '@/components/containers/CardsColumns';
1011
import Title from '@/components/snippets/Title';
12+
import Wrapper from '@/components/containers/Wrapper';
1113
import Container from '@/components/containers/Container';
14+
import Row from '@/components/containers/Row';
15+
import Member from '@/components/containers/Member';
16+
import { whoWeAre } from '../utils/about';
1217

1318
export default function AboutUs() {
1419
return (
@@ -142,7 +147,7 @@ export default function AboutUs() {
142147
customInnerClass='wanna-learn-more'
143148
/>
144149
<TwoColumn
145-
title="Junior Developers"
150+
title='Junior Developers'
146151
content={
147152
'If you are a junior web developer looking for some guidance and mentoring, ' +
148153
'we invite you to join us and start coding our platform. ' +
@@ -159,7 +164,7 @@ export default function AboutUs() {
159164
customInnerClass='two-text-columns'
160165
secondTextColumn={
161166
<TwoColumn
162-
title="Experienced Developers"
167+
title='Experienced Developers'
163168
content={
164169
'If you are an experienced and patient-loving developer, ' +
165170
'a true rockstar who wants to mentor juniors, ' +
@@ -182,15 +187,24 @@ export default function AboutUs() {
182187
content={
183188
<div>
184189
After taking a look at our project&nbsp;
185-
<a target='_blank'
186-
href='https://github.com/Web-Dev-Path/web-dev-path#readme'
187-
rel='noopener noreferrer' >README</a> and&nbsp;
188-
<a target='_blank'
189-
href='https://github.com/Web-Dev-Path/web-dev-path/wiki'
190-
rel='noopener noreferrer' >wiki</a>,
191-
just send us an email sharing with us about your journey in tech and
192-
why you’re interested in joining us.
193-
<br/>
190+
<a
191+
target='_blank'
192+
href='https://github.com/Web-Dev-Path/web-dev-path#readme'
193+
rel='noopener noreferrer'
194+
>
195+
README
196+
</a>{' '}
197+
and&nbsp;
198+
<a
199+
target='_blank'
200+
href='https://github.com/Web-Dev-Path/web-dev-path/wiki'
201+
rel='noopener noreferrer'
202+
>
203+
wiki
204+
</a>
205+
, just send us an email sharing with us about your journey in tech
206+
and why you’re interested in joining us.
207+
<br />
194208
We've got you!
195209
</div>
196210
}
@@ -199,11 +213,34 @@ export default function AboutUs() {
199213
color={primary}
200214
bgColor={white}
201215
customInnerClass='get-started'
202-
link="mailto:[email protected]"
203-
linkText="Ping Us"
216+
link='mailto:[email protected]'
217+
linkText='Ping Us'
204218
customBtnClass='inverted-grey'
205219
/>
206220
</RevealContentContainer>
221+
<RevealContentContainer>
222+
<Wrapper customClass='primary__accent'>
223+
<Container>
224+
<Title title='Who we are' />
225+
<Row customClass='align__left'>
226+
{whoWeAre.map(_ => {
227+
return (
228+
<Member
229+
key={_?.name}
230+
image={_?.image}
231+
name={_?.name}
232+
title={_?.title}
233+
position={_?.position}
234+
linkedIn={_?.linkedIn}
235+
portfolio={_?.portfolio}
236+
about={_?.about}
237+
/>
238+
);
239+
})}
240+
</Row>
241+
</Container>
242+
</Wrapper>
243+
</RevealContentContainer>
207244
</div>
208245
);
209246
}

‎public/images/camila.webp

57.9 KB
Binary file not shown.

‎public/images/cheryl.webp

2.29 KB
Binary file not shown.

‎public/images/ellipse.png

4.29 KB
Loading

‎public/images/jana.webp

22.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)