Skip to content

Commit 6e65c2e

Browse files
committed
made changes and moved text to content
2 parents a5f6955 + 57c8307 commit 6e65c2e

File tree

11 files changed

+148
-12
lines changed

11 files changed

+148
-12
lines changed

src/Components/Content/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Projects from './../Projects';
44
import Home from './../Home';
55
import AboutUs from './../AboutUs';
66
import Contribute from '../Contribute';
7-
import Events from '../Events';
7+
import OurEvents from './../OurEvents';
88

99
function Content({ selected, titles }) {
1010
if (selected === 0) {
@@ -13,8 +13,8 @@ function Content({ selected, titles }) {
1313
return <AboutUs />;
1414
} else if (selected === 3) {
1515
return <Projects />;
16-
} else if(selected === 4) {
17-
return <Events />
16+
} else if(selected === 4) {
17+
return <OurEvents />;
1818
}
1919
if (selected === 5) {
2020
return <Contribute />;

src/Components/Header/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ function MenuItem(index, selected, setSelected, title) {
6464
const styles = StyleSheet.create({
6565
logoContainer: {
6666
flex: 1,
67+
marginRight:70,
68+
6769
},
6870
buttonContainer: { marginTop: 25, marginLeft: 40 },
6971
});

src/Components/ImageContent/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@ const ImageContent = ({
2626
}
2727
}}
2828
>
29+
<View style={styles.sectionImage}>
2930
<ScaledImage
3031
source={image}
3132
width={imageContainerWidth}
32-
style={styles.sectionImage}
3333
/>
34+
</View>
3435
<View style={styles.subContainer}>
3536
<Children />
3637
</View>
@@ -55,7 +56,6 @@ const createStyles = (imageSide) =>
5556
minWidth: 200,
5657
},
5758
sectionImage: {
58-
flex: 1,
5959
paddingLeft: 16,
6060
paddingRight: 16,
6161
},

src/Components/ImageTextSection/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ const ImageTextSection = ({
1212
const styles = createStyles(imageSide);
1313
return (
1414
<View style={styles.container}>
15+
<View style={styles.sectionImage}>
1516
<ScaledImage
1617
source={image}
1718
height={imageHeight}
18-
style={styles.sectionImage}
1919
/>
20+
</View>
2021
<View style={styles.subContainer}>
2122
<Text style={styles.header}>{title}</Text>
2223
{content.map((text) => (

src/Components/OurEvents/index.js

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
import React from 'react';
2+
import ImageContent from './../ImageContent';
3+
import SectionHeader from './../SectionHeader';
4+
import { getEvents } from './../../content/our_events';
5+
import { Box, Content, Description } from './styles';
6+
7+
8+
function OurEvents() {
9+
const content = getEvents();
10+
const renderContent = (index, section) => {
11+
return (
12+
<Content key={index}>
13+
<SectionHeader title={section.title} />
14+
{section.content.map((content, indx) => {
15+
return <Description key={indx}>{content.par}</Description>;
16+
})}
17+
</Content>
18+
);
19+
};
20+
21+
return (
22+
<Box>
23+
{content.sections.map((section, index) => {
24+
return (
25+
<ImageContent
26+
image={section.image.source}
27+
imageSide={index % 2 === 0 ? 'right' : 'left'}
28+
Children={() => renderContent(index, section)}
29+
/>
30+
);
31+
})}
32+
</Box>
33+
34+
);
35+
}
36+
export default OurEvents;

src/Components/OurEvents/styles.js

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
import { View, Text, StyleSheet } from 'react-native';
2+
import { styled } from 'react-native-reflect';
3+
4+
export const Box = styled(View, {
5+
flex: 1,
6+
width: '80%',
7+
flexDirection: 'column',
8+
paddingLeft: 16,
9+
paddingRight: 16,
10+
flexWrap: 'wrap',
11+
marginTop: 32,
12+
});
13+
14+
export const Content = styled(View, {
15+
flexDirection: 'column',
16+
paddingLeft: 16,
17+
marginRight:77,
18+
});
19+
20+
export const Description = styled(Text, {
21+
flex: 1,
22+
marginTop: 32,
23+
paddingLeft: 16,
24+
fontSize: 18,
25+
flexGrow: 1,
26+
fontWeight: 200,
27+
color: '#103B81',
28+
textAlign: 'left',
29+
});
30+
31+
const styles = StyleSheet.create({
32+
container: {
33+
display: 'flex',
34+
flexDirection: 'row',
35+
flexWrap: 'wrap',
36+
marginTop: 18,
37+
marginBottom: 18,
38+
},
39+
card: {
40+
width: '33%',
41+
minWidth: 251,
42+
},
43+
cardMiddle: {
44+
alignItems: 'center',
45+
},
46+
cardLast: {
47+
alignItems: 'flex-end',
48+
},
49+
imageText: {
50+
fontSize: 14,
51+
fontWeight: '300',
52+
fontFamily: 'Avenir',
53+
textAlign: 'center',
54+
width: 180,
55+
flex: 1,
56+
color: '#103B81',
57+
},
58+
description: {
59+
fontSize: 14,
60+
fontWeight: '300',
61+
color: '#103B81',
62+
marginLeft: 32,
63+
},
64+
});
65+
66+
export default styles;

src/assets/our_events.png

29.6 KB
Loading

src/content/home.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"par": "Zulip is our main communication platform and you should join us there and first give a short introduction about yourself in the #newcomers stream. Zulip consists of various streams like Documentation, Coding, Design, etc and the one that fascinates you the most is the one you should start contributing in.\nThe #announcements stream will be displaying all the important announcements. Tag our community members if there's any confusion or ask for proper guidance from them regarding your contributions to the community."
1212
},
1313
{
14-
"par": "Our code of conduct is simple- 'Be nice, Be respectful' which is the one of the many reasons the community coexists in harmony. The members should contribute actively keeping the policies of being repectful to everyone and refrainging from conflicts, unruly behaviour and speech. Anyone who wishes to join the community is expected to follow these guidelines.\nIf you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer or adminas soon as possible."
14+
"par": "Our code of conduct is simple- 'Be nice, Be respectful' which is the one of the many reasons the community coexists in harmony. The members should contribute actively keeping the policies of being respectful to everyone and refraining from conflicts, unruly behaviour and speech. Anyone who wishes to join the community is expected to follow these guidelines.\nIf you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer or admins as soon as possible."
1515

1616
}
1717
]
@@ -20,11 +20,11 @@
2020
"title": "Ways To Contribute",
2121
"content":[
2222
{
23-
"par": "You can start contributing to our various open source projects by- \n1) Creating issues on Github regarding the project \n2) Debugging the issues \n3) Creating pull requests, testing pull requests \n4) Create mockups for new applications or redesign the current features \n5) Research about UI/UX improvements and accessibilty features. \n6) Create app walkthroughs with documents or videos, UI testing once the PR is submitted for the UI issue"
23+
"par": "You can start contributing to our various open source projects by- \n1) Creating issues on Github regarding the project \n2) Debugging the issues \n3) Creating pull requests, testing pull requests \n4) Create mockups for new applications or redesign the current features \n5) Research about UI/UX improvements and accessibility features. \n6) Create app walkthroughs with documents or videos, UI testing once the PR is submitted for the UI issue"
2424

2525
},
2626
{
27-
"par": "Each active repository has a stream to direct questions. \nIssues labeled as 'First Timers Only' are meant for contributors who have not contributed to the project yet. Please choose other issues to contribute to, if you have already contributed to these type of issues. \nMake sure to follow the Commit Message Style Guide when submitting PRs which will require review by atleast one maintainer to be merged to the main code."
27+
"par": "Each active repository has a stream to direct questions. \nIssues labeled as 'First Timers Only' are meant for contributors who have not contributed to the project yet. Please choose other issues to contribute to, if you have already contributed to these types of issues. \nMake sure to follow the Commit Message Style Guide when submitting PRs which will require review by atleast one maintainer to be merged to the main code."
2828
}
2929
]
3030
},

src/content/our_events.js

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
const our_events={
2+
sections: [
3+
{
4+
title: "EVENTS",
5+
image: {
6+
source:require("./../assets/our_events.png"),
7+
},
8+
content: [
9+
{
10+
par : "We at AnitaB.org Open Source beleive in Inspiration through Action. To facilitate our Open Souce journey and continue the AnitaB.org legacy we conduct enthralling events all year long, with the purpose of bridging the gap between creative developers and our Open Source community. Keep scrolling to catch a glipse of few such events! ",
11+
}
12+
]
13+
},
14+
{
15+
title: "TITLE 2",
16+
image:{
17+
source:require("./../assets/our_events.png"),
18+
},
19+
content: [
20+
{
21+
par: "We at AnitaB.org Open Source beleive in Inspiration through Action. To facilitate our Open Souce journey and continue the AnitaB.org legacy we conduct enthralling events all year long, with the purpose of bridging the gap between creative developers and our Open Source community. Keep scrolling to catch a glipse of few such events! ",
22+
}
23+
]
24+
}
25+
]
26+
}
27+
28+
29+
export const getEvents = () => {
30+
return our_events;
31+
};
File renamed without changes.

0 commit comments

Comments
 (0)