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.

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

Quick fixes MORE STUFF #98

Merged
merged 4 commits into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 frontend/app/ProfileScreens/ViewProfile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default function ViewProfile() {
firstName: userState.name,
lastName: "No Last Name",
age: calculateAge(new Date(userState.birthday)),
pronouns: "they/them",
pronouns: userState.pronouns,
location: userState.location,
school: userState.school,
work: userState.job,
Expand Down
15 changes: 11 additions & 4 deletions frontend/components/Event/EventCardItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,12 @@ export function EventCardItem({ title, description, imageUrl }: EventCardItemPro
return (
<View style={styles.cardContainer}>
<Image source={{ uri: imageUrl }} style={styles.cardImage} />
<Text style={styles.cardTitle}>{title}</Text>
<Text style={styles.cardDescription}>{description}</Text>
<Text style={styles.cardTitle} numberOfLines={1}>
{title}
</Text>
<Text style={styles.cardDescription} numberOfLines={3}>
{description}
</Text>
</View>
);
}
Expand All @@ -32,7 +36,9 @@ const styles = StyleSheet.create({
},
cardImage: {
width: "100%",
aspectRatio: 0.93
aspectRatio: 0.93,
borderTopRightRadius: 10,
borderTopLeftRadius: 10
},
cardTitle: {
marginTop: 6,
Expand All @@ -44,7 +50,8 @@ const styles = StyleSheet.create({
cardDescription: {
fontSize: 14,
paddingLeft: 6,
fontFamily: "DMSansRegular"
fontFamily: "DMSansRegular",
padding: 10
}
});

Expand Down
8 changes: 5 additions & 3 deletions frontend/components/Home/HomeEventCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@ export default function HomeEventCard({ event }: HomeEventCardProps) {
<Image source={{ uri: event.images[0] }} style={scaledStyles.image} />
</View>
<View style={scaledStyles.textContainer}>
<Text style={scaledStyles.titleText} numberOfLines={2} ellipsizeMode="tail">
{event.name}
<Text style={styles.titleText} numberOfLines={1}>
{event.name.length < 20 ? event.name : `${event.name.substring(0, 17)}...`}
</Text>
<View style={styles.row}>
<Icon source="map-marker" size={20} color={COLORS.darkPurple} />
<Text style={styles.text}>{event.address}</Text>
<Text style={styles.text} numberOfLines={1}>
{event.address.length < 20 ? event.address : `${event.address.substring(0, 17)}...`}
</Text>
</View>
<View style={styles.row}>
<Icon source="currency-usd" size={20} color={COLORS.darkPurple} />
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/Login/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default function Login() {
const [isLoading, setIsLoading] = useState(false);

const handleGoogleSignIn = async () => {
router.push("Home");
router.push("Onboarding/AboutMe/AboutName");
// try {
// await GoogleSignin.hasPlayServices();
// const userInfo = await GoogleSignin.signIn();
Expand Down
3 changes: 2 additions & 1 deletion frontend/components/Person/Person.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ export default function Person({
<HeaderScrollView
headerContainerStyle={{}}
containerStyle={{
flex: 1
flex: 1,
paddingBottom: 50
}}
title={
<>
Expand Down
Loading