diff --git a/frontend/src/screens/explore/components/ExploreCategoryCard.tsx b/frontend/src/screens/explore/components/ExploreCategoryCard.tsx index c7f8906..a176ea6 100644 --- a/frontend/src/screens/explore/components/ExploreCategoryCard.tsx +++ b/frontend/src/screens/explore/components/ExploreCategoryCard.tsx @@ -6,15 +6,18 @@ import Card from '../../../components/Card'; const StyledText = styled(Text); const StyledImage = styled(Image); const StyledTouchableOpacity = styled(TouchableOpacity); +const StyledView = styled(View); const CategoryCard = ({ category, image }) => { return ( - - - - {category} - - + + + + + {category} + + + ); }; diff --git a/frontend/src/screens/explore/components/PropertyCard.tsx b/frontend/src/screens/explore/components/PropertyCard.tsx index d66f1a9..8fc22f2 100644 --- a/frontend/src/screens/explore/components/PropertyCard.tsx +++ b/frontend/src/screens/explore/components/PropertyCard.tsx @@ -1,24 +1,29 @@ import React from 'react'; -import { Text, Image } from 'react-native'; +import { Text, Image, View } from 'react-native'; import { styled } from 'nativewind'; import ProgressBar from '../../../components/ProgressBar'; import Card from '../../../components/Card'; -import Tag from '../../../components/Tag'; const StyledText = styled(Text); const StyledImage = styled(Image); +const StyledView = styled(View); const PropertyCard = ({ image, addressLine1, addressLine2, progressCurrent, progressTotal }) => { return ( - - - - Funding - - {addressLine1} - {addressLine2} - - + + + + {addressLine1} + + {addressLine2} + + + + ); }; diff --git a/frontend/src/screens/explore/components/property-placeholder1.png b/frontend/src/screens/explore/components/property-placeholder1.png new file mode 100644 index 0000000..fb31bd4 Binary files /dev/null and b/frontend/src/screens/explore/components/property-placeholder1.png differ diff --git a/frontend/src/screens/explore/explore.tsx b/frontend/src/screens/explore/explore.tsx index 91c225b..6828a9e 100644 --- a/frontend/src/screens/explore/explore.tsx +++ b/frontend/src/screens/explore/explore.tsx @@ -1,5 +1,5 @@ -import React, { useState } from 'react'; -import { Image, Text, View, TouchableOpacity, GestureResponderEvent } from 'react-native'; +import React from 'react'; +import { Text, View } from 'react-native'; import { NavigationScreenProp } from 'react-navigation'; import { styled } from 'nativewind'; import SideBySide from '../../components/SideBySide'; @@ -7,10 +7,9 @@ import CategoryCard from './components/ExploreCategoryCard'; import GenericCarousel from '../../components/carousel'; import PropertyCard from './components/PropertyCard'; import SearchBar from '../../components/SearchBar'; +import property1 from './components/property-placeholder1.png'; interface ExploreScreenProps { - // This actually should be `any`, so disabling the linter rule - // eslint-disable-next-line @typescript-eslint/no-explicit-any navigation: NavigationScreenProp; } @@ -25,6 +24,7 @@ export default function ExploreScreen({ navigation }: ExploreScreenProps) { Explore + {/* Search Bar */} - Recommended Projects + Recommended Projects {/* Carousel Section */} - + , {/* Popular Projects */} - + Popular Projects + } rightComponent={}