Skip to content

Commit 64ba993

Browse files
committed
complete basic layout
1 parent 6e3ed01 commit 64ba993

File tree

3 files changed

+94
-2
lines changed

3 files changed

+94
-2
lines changed

components/containers/TwoColumn.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export default function TwoColumn({
1515
customInnerClass,
1616
customBtnClass,
1717
linkText = 'Learn more',
18+
secondTextColumn
1819
}) {
1920
// Add rowOrder="row-reverse" prop to the component to reverse its order on desktop
2021

@@ -48,7 +49,8 @@ export default function TwoColumn({
4849
</ButtonLink>
4950
)}
5051
</div>
51-
{image && (
52+
{secondTextColumn && secondTextColumn}
53+
{!secondTextColumn && image && (
5254
<div className={styles.inner__image}>
5355
<Image
5456
src={image}

pages/about.js

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import RevealContentContainer from '@/components/containers/RevealContentContainer';
22
import TwoColumn from '@/components/containers/TwoColumn';
3-
import { white, primary, primaryAccent } from '@/styles/TwoColumn.module.scss';
3+
import { white, primary, primaryAccent, lightBgColor } from '@/styles/TwoColumn.module.scss';
44
import CardsColumns from '@/components/containers/CardsColumns';
55
import Title from '@/components/snippets/Title';
66
import Container from '@/components/containers/Container';
@@ -127,6 +127,50 @@ export default function AboutUs() {
127127
customInnerClass='our-purpose'
128128
/>
129129
</RevealContentContainer>
130+
<RevealContentContainer>
131+
<TwoColumn
132+
title='Wanna learn more?'
133+
content={''}
134+
rowOrder='row'
135+
image='/images/svg/semi-colon.svg'
136+
color={primary}
137+
bgColor={lightBgColor}
138+
customInnerClass='our-purpose'
139+
/>
140+
<TwoColumn
141+
title={<div>Junior <br/> Developers</div>}
142+
content={
143+
'If you are a junior web developer looking for some guidance and mentoring, ' +
144+
'we invite you to join us and start coding our platform. ' +
145+
'You will learn how to code in a team environment by following issue\'s ' +
146+
'instructions and submitting your code to our repository through a ' +
147+
'PR while guided throughout the entire process.\n'
148+
}
149+
rowOrder='row'
150+
linkText='Our Wiki'
151+
link='https://github.com/Web-Dev-Path/web-dev-path/wiki'
152+
customBtnClass='inverted-grey'
153+
color={primary}
154+
bgColor={lightBgColor}
155+
customInnerClass='two-text-columns'
156+
secondTextColumn=
157+
<TwoColumn
158+
title='Experienced Developers'
159+
content={'If you are an experienced and patient-loving developer, ' +
160+
'a true rockstar who wants to mentor juniors, ' +
161+
'it will be wonderful to have your help to review those PR\'s, ' +
162+
'write detailed issues and guide the developers when necessary.\n'
163+
}
164+
rowOrder='row'
165+
linkText='Our Wiki'
166+
link='https://github.com/Web-Dev-Path/web-dev-path/wiki'
167+
customBtnClass='inverted-grey'
168+
color={primary}
169+
bgColor={lightBgColor}
170+
customInnerClass='second-text-column'
171+
/>
172+
/>
173+
</RevealContentContainer>
130174
</div>
131175
);
132176
}

styles/TwoColumn.module.scss

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
@use './mixins' as *;
33

44
.wrapper {
5+
align-self: stretch;
56
.inner {
67
padding: 5rem 0;
78
margin: 0 auto;
@@ -113,6 +114,51 @@
113114
}
114115
}
115116

117+
&.two-text-columns {
118+
justify-content: center;
119+
gap: 170px;
120+
121+
122+
.inner{
123+
padding: 0px;
124+
margin: 0px;
125+
126+
}
127+
128+
.inner__content{
129+
display: flex;
130+
flex-direction: column;
131+
align-items: flex-start;
132+
justify-content: stretch;
133+
}
134+
135+
h2{
136+
font-size: 2rem;
137+
line-height: 2.5rem;
138+
}
139+
140+
.inner__content{
141+
width: 400px;
142+
flex-basis: unset;
143+
}
144+
145+
a{
146+
margin-top: auto;
147+
}
148+
}
149+
150+
&.second-text-column {
151+
height: 100%;
152+
.inner{
153+
154+
height: 100%;
155+
}
156+
157+
.inner__content{
158+
height: 100%;
159+
}
160+
}
161+
116162
@include desktop {
117163
display: flex;
118164
align-items: center;

0 commit comments

Comments
 (0)