diff --git a/src/components/Cards/VerticalCard.tsx b/src/components/Cards/VerticalCard.tsx
index 8e352c738f93a29d5dcb84befb0158aaa69b5e54..2c988de99cef858d9ab01e44d77ac63fbf1f0da4 100644
--- a/src/components/Cards/VerticalCard.tsx
+++ b/src/components/Cards/VerticalCard.tsx
@@ -67,6 +67,7 @@ const styles = StyleSheet.create({
shadowOpacity: 0.3,
shadowRadius: 6,
elevation: 4,
+ borderRadius: 8,
},
cardContainer: {
width: containerDimension,
diff --git a/src/components/carousel/VerticalEcosystemCarousel.tsx b/src/components/carousel/VerticalEcosystemCarousel.tsx
index e6f79e10f1eb768e1f74a0a11f356e1cc15185b4..745eccebfba081d631a610286425d2c370e170f2 100644
--- a/src/components/carousel/VerticalEcosystemCarousel.tsx
+++ b/src/components/carousel/VerticalEcosystemCarousel.tsx
@@ -59,10 +59,10 @@ const styles = StyleSheet.create({
flexDirection: "row",
},
slide: {
- width: 210,
justifyContent: "center",
alignItems: "center",
- marginRight: 16,
+ paddingHorizontal: 8,
+ paddingBottom: 5,
},
});
diff --git a/src/screens/ecosystem/BusinessEcosystemScreen.tsx b/src/screens/ecosystem/BusinessEcosystemScreen.tsx
index 102b007e6a95b2889b051116a2382c713890fb71..fd8d3eb78b5230fa2451fd04f2c28f09c05f3946 100644
--- a/src/screens/ecosystem/BusinessEcosystemScreen.tsx
+++ b/src/screens/ecosystem/BusinessEcosystemScreen.tsx
@@ -16,6 +16,7 @@ import { IEcosystem } from "../../types/firestore/ecosystems";
import { IUser } from "../../types/firestore/User";
import { getCategories } from "../../service/firestore/categories";
import { ICategory } from "../../types/firestore";
+
const BusinessEcosystemScreen = () => {
const nav = useNavigation();
const user: IUser = useAppSelector((state) => state.user);
@@ -39,39 +40,27 @@ const BusinessEcosystemScreen = () => {
}, []);
return (
-
-
+
+
Selamat Datang, {user.firstName}
-
-
-
- {
- nav.navigate("Ecosystem", {
- screen: "Recommended",
- params: { headerTitle: "Ekosistem Saya", toFetch: "myEcosystem" },
- });
- }}
- >
- Ekosistem Saya
-
-
-
-
+
+ Ekosistem Bisnis
+
- nav.navigate("CreateEcosystem", { screen: "CreateEcosystemScreen" })
+ nav.navigate("CreateEcosystem", {
+ screen: "CreateEcosystemScreen",
+ })
}
colors={"primary"}
/>
-
-
-
-
- Ekosistem Saya
-
-
+
+
+
+
+ Ekosistem Saya
+
nav.navigate("Ecosystem", {
@@ -83,18 +72,15 @@ const BusinessEcosystemScreen = () => {
})
}
>
-
- Lihat Semua
-
+ Lihat Semua
-
-
-
-
- Sudah bergabung
-
-
+
+
+
+
+ Sudah Bergabung
+
nav.navigate("Ecosystem", {
@@ -103,20 +89,17 @@ const BusinessEcosystemScreen = () => {
})
}
>
-
- Lihat Semua
-
+ Lihat Semua
-
-
-
-
-
-
- Kategori Bisnis
-
-
+
+
+
+
+
+
+ Kategori Bisnis
+
nav.navigate("Ecosystem", {
@@ -127,20 +110,17 @@ const BusinessEcosystemScreen = () => {
})
}
>
-
- Lihat Semua
-
+ Lihat Semua
-
-
-
-
-
-
- Paling Populer
-
-
+
+
+
+
+
+
+ Paling Populer
+
nav.navigate("Ecosystem", {
@@ -152,20 +132,17 @@ const BusinessEcosystemScreen = () => {
})
}
>
-
- Lihat Semua
-
+ Lihat Semua
-
-
-
-
-
-
- Terbaru Minggu Ini
-
-
+
+
+
+
+
+
+ Terbaru Minggu Ini
+
nav.navigate("Ecosystem", {
@@ -174,15 +151,12 @@ const BusinessEcosystemScreen = () => {
})
}
>
-
- Lihat Semua
-
+ Lihat Semua
+
+
-
-
-
);
};
@@ -197,24 +171,28 @@ const styles = StyleSheet.create({
fontSize: 24,
color: Colors.text.link,
},
- text: {
+ textTitle: {
fontSize: 24,
color: Colors.text.title,
},
+ subTitle: {
+ fontSize: 20,
+ color: Colors.text.subtitle,
+ },
+ textSeeAll: {
+ fontSize: 16,
+ color: Colors.text.link,
+ },
textContainer: {
flex: 1,
- paddingRight: 118,
+ marginTop: 4,
},
headContainer: {
+ flex: 1,
flexDirection: "row",
- justifyContent: "space-between",
paddingBottom: 16,
alignItems: "center",
},
- subTitle: {
- fontSize: 20,
- color: Colors.text.subtitle,
- },
});
export default BusinessEcosystemScreen;
diff --git a/src/screens/ecosystem/CategoryEcosystemListScreen.tsx b/src/screens/ecosystem/CategoryEcosystemListScreen.tsx
index a3bae207ea38f1bf6647c11fd6eea6dfb2e5418e..8fbf7d7326b812816773e3d15d976bcb6cc41252 100644
--- a/src/screens/ecosystem/CategoryEcosystemListScreen.tsx
+++ b/src/screens/ecosystem/CategoryEcosystemListScreen.tsx
@@ -64,7 +64,9 @@ const CategoryEcosystemListScreen = ({
ItemSeparatorComponent={() => }
showsVerticalScrollIndicator={false}
showsHorizontalScrollIndicator={false}
+ ListFooterComponent={() => }
/>
+
);
};
diff --git a/src/screens/ecosystem/EcosystemDetailScreen.tsx b/src/screens/ecosystem/EcosystemDetailScreen.tsx
index e9bcf0049f22be21990666a620aa94aad51edde8..fc6c80b378c04e1055a47c2bb140a20093062fc9 100644
--- a/src/screens/ecosystem/EcosystemDetailScreen.tsx
+++ b/src/screens/ecosystem/EcosystemDetailScreen.tsx
@@ -46,9 +46,7 @@ const EcosystemDetailScreen = ({
-
- {/* {rate} */}
{rating}
diff --git a/src/screens/ecosystem/RecommendedEcosystemScreen.tsx b/src/screens/ecosystem/RecommendedEcosystemScreen.tsx
index 6a5847ef39e522bf2bb8e8dcd535381d4e7ef4c7..eb84157447807536ede44355cbc42e13994d59f2 100644
--- a/src/screens/ecosystem/RecommendedEcosystemScreen.tsx
+++ b/src/screens/ecosystem/RecommendedEcosystemScreen.tsx
@@ -10,6 +10,7 @@ import { RootState } from "../../redux/store";
import { IEcosystem } from "../../types/firestore/ecosystems";
import HorizontalCards from "../../components/Cards/HorizontalCards";
import { useNavigation } from "@react-navigation/core";
+import Spacer from "../../components/Spacer/Spacer";
const RecommendedEcosystemScreen = ({
route,
@@ -53,32 +54,42 @@ const RecommendedEcosystemScreen = ({
const renderItem: ListRenderItem = ({ item }) => (
- {
- nav.navigate("Ecosystem", {
- screen: "EcosystemDetails",
- params: {
- headerTitle: item.name,
- title: item.name,
- desc: item.description,
- image: item.pic,
- member: item.followerCount.toString(),
- rating: item.rating.toString(),
- },
- });
- }}
- rate={item.rating.toString()}
- />
+
+ {
+ nav.navigate("Ecosystem", {
+ screen: "EcosystemDetails",
+ params: {
+ headerTitle: item.name,
+ title: item.name,
+ desc: item.description,
+ image: item.pic,
+ member: item.followerCount.toString(),
+ rating: item.rating.toString(),
+ },
+ });
+ }}
+ rate={item.rating.toString()}
+ />
+
);
return (
- {ecosystems && }
+ {ecosystems && (
+ }
+ ListHeaderComponent={() => }
+ ListFooterComponent={() => }
+ />
+ )}
);
@@ -91,6 +102,10 @@ const styles = StyleSheet.create({
paddingHorizontal: 24,
justifyContent: "center",
},
+ horizontalCard: {
+ paddingHorizontal: 4,
+ paddingTop: 2,
+ },
});
export default RecommendedEcosystemScreen;