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.

Sign up for GitHub

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

Post.js file modification #13

Closed
wants to merge 4 commits into from
Closed

Post.js file modification #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8596ee8
Updated
preethasarkar Jan 30, 2024
883212d
Updated
preethasarkar Jan 30, 2024
86b5451
Updated
preethasarkar Jan 30, 2024
b219c95
Modified Post.js
preethasarkar Jan 30, 2024
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
2 changes: 1 addition & 1 deletion client/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ import Navigation from './components/Navigation';

export default function App() {
return <Navigation />;
}
}
2 changes: 1 addition & 1 deletion client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 55 additions & 9 deletions client/screens/Dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ import {
StyleSheet,
Image,
ImageBackground,
<<<<<<< HEAD
TouchableOpacity,
ScrollView
} from "react-native";
import { Card, Title, Button, Text } from "react-native-paper";
import { getAuth, signOut } from "firebase/auth";
import { CommonActions } from "@react-navigation/native";
import Icon from "react-native-vector-icons/FontAwesome";
import Icon1 from "react-native-vector-icons/FontAwesome5";
import Icon2 from "react-native-vector-icons/Ionicons";
import Carousel from "react-native-reanimated-carousel";
=======
TouchableOpacity
} from 'react-native'
import BottomNavigationR from '../components/BottomNavigationR'
Expand All @@ -15,6 +27,7 @@ import Icon from 'react-native-vector-icons/FontAwesome'
import Icon1 from 'react-native-vector-icons/FontAwesome5'
import Icon2 from 'react-native-vector-icons/Ionicons'
import Carousel from 'react-native-reanimated-carousel'
>>>>>>> 5e57e9b24a82d10c2a1a4a6b4778f13801533161
// import axios from "axios"; for fetching instagram posts

const images = [
Expand Down Expand Up @@ -84,30 +97,31 @@ const Dashboard = ({ navigation }) => {
</Button>
</View>
</View>

<View style={styles.cardCover}>
<View style={styles.cardContainer}>
<Card style={styles.card1}>
<Card.Content>
<View style={styles.card1}>

<Text style={styles.content1}>Daily Reduction</Text>
<Icon
name="circle-o-notch"
size={50}
color="#000"
style={styles.cardlogo2}
/>
</Card.Content>
</Card>
<Card style={styles.card1}>
<Card.Content>

</View>
<View style={styles.card1}>

<Text style={styles.content1}>Global Position</Text>
<Icon
name="line-chart"
size={50}
color="#000"
style={styles.cardlogo2}
/>
</Card.Content>
</Card>

</View>
</View>
<View style={styles.cardContainer}>
<Card style={styles.card}>
Expand Down Expand Up @@ -354,31 +368,63 @@ const styles = StyleSheet.create({
marginTop: 25
},
cardContainer: {
<<<<<<< HEAD
flexDirection: "row",
justifyContent: "space-between",
margin: 11,
borderWidth :0,

=======
flexDirection: 'row',
justifyContent: 'space-between',
margin: 14
>>>>>>> 5e57e9b24a82d10c2a1a4a6b4778f13801533161
},
card2: {
flex: 1,
marginHorizontal: 3,
height: 55,
<<<<<<< HEAD
backgroundColor: "#FFFFED",
marginBottom: 0,
borderRadius: 0,
=======
backgroundColor: '#FFFFED',
marginBottom: 0
>>>>>>> 5e57e9b24a82d10c2a1a4a6b4778f13801533161
},
card: {
flex: 1,
marginHorizontal: 3,
height: 55,
marginBottom: -20,
<<<<<<< HEAD
backgroundColor: "#FFFFED",
borderRadius: 0,
borderWidth:1,
borderTopWidth:0,
borderColor:"#F7B4BB",
=======
backgroundColor: '#FFFFED'
>>>>>>> 5e57e9b24a82d10c2a1a4a6b4778f13801533161
},
card1: {
flex: 1,
marginHorizontal: 15,
//marginHorizontal: 15,
height: 80,
<<<<<<< HEAD
//marginBottom: -20,
//marginTop: -5,
backgroundColor: "#FFFFED",
borderWidth: 0,
border: 0,
margin: 10,
padding: 5,
=======
marginBottom: -20,
marginTop: -5,
backgroundColor: '#FFFFED'
>>>>>>> 5e57e9b24a82d10c2a1a4a6b4778f13801533161
},
emptySpace: {
flex: 1
Expand Down
22 changes: 12 additions & 10 deletions client/screens/Post.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {

export default function Post() {
const [tweetContent, setTweetContent] = useState(
`Hey Guys, Check out [ToDo]!
`Hey guys, check out @embertechworks!

Join me on Ember for:
- Eco-transit
Expand Down Expand Up @@ -52,7 +52,7 @@ Let's go green!
placeholder={'Enter Tweet Content'}
style={styles.textInput}
multiline={true}
numberOfLines={6}
numberOfLines={10}
/>

<TouchableOpacity
Expand All @@ -76,7 +76,7 @@ const styles = StyleSheet.create({
flex: 1,
backgroundColor: 'white',
padding: 10,
textAlign: 'center'
textAlign: 'center',
},
titleText: {
fontSize: 20,
Expand All @@ -96,11 +96,11 @@ const styles = StyleSheet.create({
alignContent: 'center',
justifyContent: 'center',
alignItems: 'center',
marginLeft: 150,
marginLeft: 120,
marginTop: 5,
marginBottom: 10,
margin: 50,
width: '20%',
width: '25%',
borderRadius: 5,
shadowColor: 'rgba(0, 0, 0, 0.2)',
shadowOffset: { width: 0, height: 2 },
Expand All @@ -113,14 +113,16 @@ const styles = StyleSheet.create({
fontWeight: 'bold'
},
textInput: {
height: 200,
height: 220,
borderColor: 'gray',
borderWidth: 0.01,
borderWidth: 1,
marginBottom: 20,
padding: 10,
margin: 35,
width: '65%',
alignSelf: 'center'
margin: 40,
marginLeft: 20,
marginRight:20,
width: 300,
alignSelf: 'center',
},
logo: {
width: 100,
Expand Down
Loading