CircleCollect/circle-collect
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some bug fixed

Browse Source
This commit is contained in:
Jaanu423
2025-11-25 16:02:16 +05:30
parent 0957236098
commit e03a695734
10 changed files with 248 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/JoinedGroupCard.tsx
+25 -8
View File
@@ -29,12 +29,15 @@ interface JoinedGroupCardProps {
hasPaid?: boolean; // whether user has already paid hasPaid?: boolean; // whether user has already paid
} }
const formatDate = (dateArray: [number, number, number] | null): string => { const formatDate = (dateStr: string | null): string => {
if (!dateArray) return 'N/A'; if (!dateStr) return 'N/A';
const date = new Date(dateArray[0], dateArray[1] - 1, dateArray[2]);
return date.toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' }); const [year, month, day] = dateStr.split('-');
return `${day}-${month}-${year}`;
}; };
const getStatusStyle = (status: JoinedGroup['status']) => { const getStatusStyle = (status: JoinedGroup['status']) => {
switch (status) { switch (status) {
case 'ACTIVE': case 'ACTIVE':
@@ -67,6 +70,9 @@ export const JoinedGroupCard: FC<JoinedGroupCardProps> = ({ item, onViewPress, h
const [loading, setLoading] = React.useState(false); const [loading, setLoading] = React.useState(false);
const [payable, setPayable] = React.useState<any>(); const [payable, setPayable] = React.useState<any>();
const onPayPress = async () => { const onPayPress = async () => {
// Navigate to payment screen or handle payment logic // Navigate to payment screen or handle payment logic
// navigation.navigate('PaymentScreen', { groupId: item.id, amount: item.contributionAmount }); // navigation.navigate('PaymentScreen', { groupId: item.id, amount: item.contributionAmount });
@@ -126,18 +132,29 @@ export const JoinedGroupCard: FC<JoinedGroupCardProps> = ({ item, onViewPress, h
{/* Footer with Dates & Buttons */} {/* Footer with Dates & Buttons */}
<View style={styles.footer}> <View style={styles.footer}>
<Text style={styles.dateText}> <Text style={styles.dateText}>
{formatDate(item.startDate)} - {formatDate(item.endDate)} {formatDate(item.startDate)} to {formatDate(item.endDate)}
</Text> </Text>
{/* Add Pay / Paid button here */} {/* Add Pay / Paid button here */}
{hasPaid ? ( {/* {hasPaid ? (
<View style={styles.paidButton}> <View style={styles.paidButton}>
<Text style={styles.paidButtonText}>Paid</Text> <Text style={styles.paidButtonText}>Paid</Text>
</View> </View>
) : ( ) : (
<TouchableOpacity style={styles.payButton} onPress={onPayPress}> <TouchableOpacity style={styles.payButton} onPress={onPayPress}>
<Text style={styles.payButtonText}>{loading ? 'Loading...' : 'Pay'}</Text> <Text style={styles.payButtonText}>{loading ? 'Loading...' : ' Pay'}</Text>
</TouchableOpacity> </TouchableOpacity>
)} )} */}
{
hasPaid && <View style={styles.paidButton}>
<Text style={styles.paidButtonText}>Paid</Text>
</View>
}
{
item.status !== 'COMPLETED' && <TouchableOpacity style={styles.payButton} onPress={onPayPress}>
<Text style={styles.payButtonText}>{loading ? 'Loading...' : ' Pay'}</Text>
</TouchableOpacity>
}
</View> </View>
</TouchableOpacity> </TouchableOpacity>
); );
src/components/common/Header.tsx
+6 -5
View File
@@ -37,7 +37,7 @@ const Header: React.FC<HeaderProps> = ({
<TouchableOpacity onPress={handleBack} style={{padding:6}}> <TouchableOpacity onPress={handleBack} style={{padding:6}}>
<Ionicons name="arrow-back" size={24} color={arrowColor} /> <Ionicons name="arrow-back" size={24} color={arrowColor} />
</TouchableOpacity> </TouchableOpacity>
)} )}
<Text style={[styles.headerTitle, {color:titleColor}]}>{title}</Text> <Text style={[styles.headerTitle, {color:titleColor}]}>{title}</Text>
<View>{rightAction}</View> <View>{rightAction}</View>
</View> </View>
@@ -49,14 +49,15 @@ export default Header;
const styles = StyleSheet.create({ const styles = StyleSheet.create({
header: { header: {
flexDirection: "row", flexDirection: "row",
alignItems: "center", // alignItems: "center",
justifyContent: "space-between", // justifyContent: "space-between",
paddingVertical: 12, paddingVertical: 12,
paddingHorizontal:12 paddingHorizontal:12
}, },
headerTitle: { headerTitle: {
fontSize: 18, fontSize: 22,
fontWeight: "600", fontWeight: "600",
textTransform: "capitalize", // textTransform: "capitalize",
}, },
}); });
src/screens/home/UserProfileStatus.tsx
+107 -101
View File
@@ -69,6 +69,7 @@ const UserProfileStatus: React.FC<UserProfileStatusProps> = ({
const [selectedGroupIds, setSelectedGroupIds] = useState<string[]>([]); const [selectedGroupIds, setSelectedGroupIds] = useState<string[]>([]);
const [submitting, setSubmitting] = useState(false); const [submitting, setSubmitting] = useState(false);
// console.log("user me : ", userDashboard)
// Preselect all due groups at mount and on change // Preselect all due groups at mount and on change
useEffect(() => { useEffect(() => {
if (userDashboard?.dueGroupDetails) { if (userDashboard?.dueGroupDetails) {
@@ -77,22 +78,25 @@ const UserProfileStatus: React.FC<UserProfileStatusProps> = ({
}, [userDashboard?.dueGroupDetails]); }, [userDashboard?.dueGroupDetails]);
// Show profile completion modal only if profile is incomplete // Show profile completion modal only if profile is incomplete
console.log("userDashboard : ", userDashboard)
useEffect(() => { useEffect(() => {
if (statusData && !statusData.profileStatus) setShowModal(true); if (statusData && !statusData.profileStatus) setShowModal(true);
}, [statusData]); }, [statusData]);
// Top grid info items // Top grid info items
const infoItems = useMemo( const infoItems = useMemo(
() => [ () => [
{ label: "Role", value: statusData?.role || "-" }, { icon: <Ionicons name="person-outline" size={20} color={colors.primary} />, label: "Role", value: statusData?.role || "-" },
{ label: "Active Groups", value: userDashboard?.activeStatusMyGroupCount?.toString() || "0" }, { icon: <Ionicons name="pie-chart-outline" size={20} color={colors.primary} />, label: "Active Groups", value: userDashboard?.activeStatusMyGroupCount?.toString() || "0" },
{ label: "Joined Groups", value: userDashboard?.myJoinedGroups?.length?.toString() || "0" }, { icon: <Ionicons name="book-outline" size={20} color={colors.primary} />, label: "Joined Groups", value: userDashboard?.myJoinedGroups?.length?.toString() || "0" },
{ label: "My Groups", value: userDashboard?.myCreatedGroups?.length?.toString() || "0" }, { icon: <Ionicons name="people-outline" size={20} color={colors.primary} />, label: "My Groups", value: userDashboard?.myCreatedGroups?.length?.toString() || "0" },
{ label: "Total Due", value: `₹${userDashboard?.multiplePayAmount || 0}` }, { icon: <Ionicons name="document-text-outline" size={20} color={colors.primary} />, label: "Total Due", value: `₹${userDashboard?.multiplePayAmount || 0}` },
{ label: "Completed", value: userDashboard?.completeStatusMyGroupCount?.toString() || "0" }, { icon: <Ionicons name="checkmark-done-outline" size={20} color={colors.primary} />, label: "Completed", value: userDashboard?.completeStatusMyGroupCount?.toString() || "0" },
], ],
[userDashboard, statusData] [userDashboard, statusData]
); );
// Utility for info color // Utility for info color
const getValueColor = (value: string) => { const getValueColor = (value: string) => {
@@ -127,18 +131,9 @@ const UserProfileStatus: React.FC<UserProfileStatusProps> = ({
} }
setSubmitting(true); setSubmitting(true);
try { try {
const response = await apiCall(PAY_ALL_URL, 'POST',{ groupIds: selectedGroupIds }, undefined, "Payment failed. Try again.") as any; const response = await apiCall(PAY_ALL_URL, 'POST', { groupIds: selectedGroupIds }, undefined, "Payment failed. Try again.") as any;
console.log("-=-=-=-=-=-=-=-=-=-=-=",response) console.log("-=-=-=-=-=-=-=-=-=-=-=", response)
// const response = await fetch(
// "https://api.godemo.in/FundCollect/api/payments/payments/bulk",
// {
// method: "POST",
// headers: { "Content-Type": "application/json" },
// body: JSON.stringify({ groupIds: selectedGroupIds, payAllDue: true }),
// }
// );
if (response.status) { if (response.status) {
ToastAndroid.show("Payment initiated!", ToastAndroid.LONG); ToastAndroid.show("Payment initiated!", ToastAndroid.LONG);
setShowPayDialog(false); setShowPayDialog(false);
@@ -186,7 +181,7 @@ const UserProfileStatus: React.FC<UserProfileStatusProps> = ({
<Ionicons name="close-circle" color="#000000ff" size={24} /> <Ionicons name="close-circle" color="#000000ff" size={24} />
</TouchableOpacity> </TouchableOpacity>
</View> </View>
<ScrollView <ScrollView
style={{ maxHeight: 200, width: "100%" }} style={{ maxHeight: 200, width: "100%" }}
contentContainerStyle={{ paddingVertical: 8, paddingHorizontal: 4 }} contentContainerStyle={{ paddingVertical: 8, paddingHorizontal: 4 }}
> >
@@ -261,7 +256,6 @@ const UserProfileStatus: React.FC<UserProfileStatusProps> = ({
</Text> </Text>
</View> </View>
</View> </View>
<View style={styles.contentSection}> <View style={styles.contentSection}>
<View style={styles.leftSection}> <View style={styles.leftSection}>
<View style={styles.infoGrid}> <View style={styles.infoGrid}>
@@ -269,7 +263,7 @@ const UserProfileStatus: React.FC<UserProfileStatusProps> = ({
<View key={item.label} style={styles.infoCard}> <View key={item.label} style={styles.infoCard}>
<View style={styles.infoCardHeader}> <View style={styles.infoCardHeader}>
<View style={styles.iconContainer}> <View style={styles.iconContainer}>
<Ionicons name="information-circle-outline" size={16} color={colors.primary} /> {item.icon}
</View> </View>
<Text style={styles.infoLabel} > <Text style={styles.infoLabel} >
{item.label} {item.label}
@@ -289,17 +283,19 @@ const UserProfileStatus: React.FC<UserProfileStatusProps> = ({
activeOpacity={0.8} activeOpacity={0.8}
> >
<View style={styles.profileContainer}> <View style={styles.profileContainer}>
{profileImage ? ( {profileImage !== undefined ? (
<Image source={{ uri: profileImage.uri }} style={styles.avatar} /> <Image source={{ uri: profileImage.uri }} style={styles.avatar} />
) : ( ) : (
<View style={styles.avatarPlaceholder}> <View style={styles.avatarPlaceholder}>
<Ionicons name="person" size={45} color="#fff" /> <Ionicons name="person" size={45} color="#fff" />
</View> </View>
)} )}
<View style={styles.profileBadge}>
<Ionicons name="camera" size={18} color={colors.primary} />
</View>
</View> </View>
<View style={styles.infoCardOne}>
<Text style={{ color: "#fff", fontWeight: "400"}}>Total Paid Amount {userDashboard?.totalPaidAmountMonth}</Text>
{/* <Text style={{ color: "#fff", fontWeight: "400"}}>Total Paid Amount {userDashboard?.totalPaidAmountMonth}</Text> */}
</View>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
</View> </View>
@@ -318,8 +314,8 @@ const UserProfileStatus: React.FC<UserProfileStatusProps> = ({
Your profile is incomplete. Update your details to unlock all features. Your profile is incomplete. Update your details to unlock all features.
</Text> </Text>
<View style={styles.modalButtons}> <View style={styles.modalButtons}>
<TouchableOpacity <TouchableOpacity
style={[styles.button, styles.primaryButton]} style={[styles.button, styles.primaryButton]}
onPress={() => { onPress={() => {
setShowModal(false); setShowModal(false);
navigation.navigate("Profile" as never); navigation.navigate("Profile" as never);
@@ -328,8 +324,8 @@ const UserProfileStatus: React.FC<UserProfileStatusProps> = ({
<Ionicons name="person" size={18} color="#fff" /> <Ionicons name="person" size={18} color="#fff" />
<Text style={styles.buttonText}>Complete Profile</Text> <Text style={styles.buttonText}>Complete Profile</Text>
</TouchableOpacity> </TouchableOpacity>
<TouchableOpacity <TouchableOpacity
style={[styles.button, styles.secondaryButton]} style={[styles.button, styles.secondaryButton]}
onPress={() => setShowModal(false)} onPress={() => setShowModal(false)}
> >
<Ionicons name="time" size={18} color="#666" /> <Ionicons name="time" size={18} color="#666" />
@@ -368,17 +364,17 @@ const styles = StyleSheet.create({
paddingHorizontal: 18, paddingHorizontal: 18,
marginBottom: 16, marginBottom: 16,
}, },
titleWithIcon: { titleWithIcon: {
flexDirection: 'row', flexDirection: 'row',
alignItems: 'center' alignItems: 'center'
}, },
headerIcon: { headerIcon: {
marginRight: 8 marginRight: 8
}, },
header: { header: {
fontSize: 20, fontSize: 20,
fontWeight: "700", fontWeight: "700",
color: "#fff" color: "#fff"
}, },
statusBadge: { statusBadge: {
flexDirection: 'row', flexDirection: 'row',
@@ -388,26 +384,26 @@ const styles = StyleSheet.create({
paddingVertical: 6, paddingVertical: 6,
borderRadius: 20, borderRadius: 20,
}, },
statusBadgeText: { statusBadgeText: {
color: "#fff", color: "#fff",
fontSize: 13, fontSize: 13,
fontWeight: '600', fontWeight: '600',
marginLeft: 4 marginLeft: 4
}, },
contentSection: { contentSection: {
flexDirection: 'row', flexDirection: 'row',
alignItems: 'flex-start', alignItems: 'flex-start',
paddingHorizontal: 16, paddingHorizontal: 16,
paddingBottom: 16, paddingBottom: 16,
}, },
leftSection: { leftSection: {
flex: 1, flex: 1,
marginRight: 16 marginRight: 16
}, },
infoGrid: { infoGrid: {
flexDirection: 'row', flexDirection: 'row',
flexWrap: 'wrap', flexWrap: 'wrap',
gap: 10 gap: 10
}, },
infoCard: { infoCard: {
backgroundColor: 'rgba(255,255,255,0.15)', backgroundColor: 'rgba(255,255,255,0.15)',
@@ -419,10 +415,20 @@ const styles = StyleSheet.create({
minWidth: '45%', minWidth: '45%',
marginBottom: 8, marginBottom: 8,
}, },
infoCardHeader: { infoCardOne: {
flexDirection: 'row', backgroundColor: 'rgba(255,255,255,0.15)',
alignItems: 'center', borderRadius: 14,
marginBottom: 6 padding: 12,
borderWidth: 1,
borderColor: 'rgba(255,255,255,0.2)',
// flex: 1,
minWidth: '45%',
marginTop: 21,
},
infoCardHeader: {
flexDirection: 'row',
alignItems: 'center',
marginBottom: 6
}, },
iconContainer: { iconContainer: {
width: 28, width: 28,
@@ -439,9 +445,9 @@ const styles = StyleSheet.create({
fontWeight: '500', fontWeight: '500',
flexShrink: 1, flexShrink: 1,
}, },
infoValue: { infoValue: {
fontWeight: "700", fontWeight: "700",
fontSize: 16, fontSize: 16,
textAlign: 'left', textAlign: 'left',
color: "#fff" color: "#fff"
}, },
@@ -450,8 +456,8 @@ const styles = StyleSheet.create({
alignItems: 'center', alignItems: 'center',
justifyContent: 'center', justifyContent: 'center',
}, },
profileContainer: { profileContainer: {
alignItems: 'center' alignItems: 'center'
}, },
avatar: { avatar: {
width: 80, width: 80,
@@ -490,10 +496,10 @@ const styles = StyleSheet.create({
borderColor: "rgba(255,255,255,0.15)", borderColor: "rgba(255,255,255,0.15)",
backgroundColor: "rgba(0,0,0,0.15)", backgroundColor: "rgba(0,0,0,0.15)",
}, },
dueBarText: { dueBarText: {
color: "#fff", color: "#fff",
fontSize: 16, fontSize: 16,
fontWeight: "600" fontWeight: "600"
}, },
payAllButton: { payAllButton: {
backgroundColor: "#ffffffff", backgroundColor: "#ffffffff",
@@ -504,10 +510,10 @@ const styles = StyleSheet.create({
borderRadius: 20, borderRadius: 20,
gap: 6, gap: 6,
}, },
payAllButtonText: { payAllButtonText: {
color: "#000000ff", color: "#000000ff",
fontWeight: "bold", fontWeight: "bold",
fontSize: 16 fontSize: 16
}, },
payModalOverlay: { payModalOverlay: {
flex: 1, flex: 1,
@@ -535,10 +541,10 @@ const styles = StyleSheet.create({
borderBottomWidth: 1, borderBottomWidth: 1,
borderColor: "rgba(255,255,255,0.1)", borderColor: "rgba(255,255,255,0.1)",
}, },
payDialogTitle: { payDialogTitle: {
color: "#000000ff", color: "#000000ff",
fontSize: 18, fontSize: 18,
fontWeight: "700" fontWeight: "700"
}, },
payGroupOption: { payGroupOption: {
flexDirection: "row", flexDirection: "row",
@@ -546,7 +552,7 @@ const styles = StyleSheet.create({
gap: 16, gap: 16,
paddingVertical: 12, paddingVertical: 12,
paddingHorizontal: 14, paddingHorizontal: 14,
borderColor: colors.primary, borderColor: colors.primary,
borderWidth: 1, borderWidth: 1,
borderRadius: 12, borderRadius: 12,
marginBottom: 8, marginBottom: 8,
@@ -556,20 +562,20 @@ const styles = StyleSheet.create({
borderColor: colors.primary, borderColor: colors.primary,
borderWidth: 1, borderWidth: 1,
}, },
payGroupName: { payGroupName: {
color: "#000000ff", color: "#000000ff",
fontWeight: "700", fontWeight: "700",
fontSize: 16 fontSize: 16
}, },
payDueText: { payDueText: {
color: "rgba(0, 0, 0, 0.8)", color: "rgba(0, 0, 0, 0.8)",
fontSize: 13, fontSize: 13,
marginTop: 2 marginTop: 2
}, },
payAmount: { payAmount: {
fontWeight: "bold", fontWeight: "bold",
fontSize: 16, fontSize: 16,
color: "#4CAF50" color: "#4CAF50"
}, },
payDialogFooter: { payDialogFooter: {
flexDirection: "row", flexDirection: "row",
@@ -579,10 +585,10 @@ const styles = StyleSheet.create({
paddingVertical: 16, paddingVertical: 16,
paddingHorizontal: 18, paddingHorizontal: 18,
}, },
payDialogTotal: { payDialogTotal: {
color: "#000000ff", color: "#000000ff",
fontWeight: "600", fontWeight: "600",
fontSize: 17 fontSize: 17
}, },
payConfirmButton: { payConfirmButton: {
flexDirection: "row", flexDirection: "row",
@@ -592,14 +598,14 @@ const styles = StyleSheet.create({
paddingHorizontal: 24, paddingHorizontal: 24,
borderRadius: 20, borderRadius: 20,
elevation: 4, elevation: 4,
borderColor:colors.primary, borderColor: colors.primary,
borderWidth:1, borderWidth: 1,
gap: 8, gap: 8,
}, },
payButtonText: { payButtonText: {
color: "#ffffffff", color: "#ffffffff",
fontWeight: "bold", fontWeight: "bold",
fontSize: 16 fontSize: 16
}, },
modalOverlay: { modalOverlay: {
flex: 1, flex: 1,
src/screens/home/user-home/CycleDashboard.tsx
+15 -13
View File
@@ -9,7 +9,7 @@ import {
UIManager, UIManager,
Platform, Platform,
} from 'react-native'; } from 'react-native';
import { Ionicons } from "@react-native-vector-icons/ionicons";import colors from "../../../components/colors"; // Assuming a colors file import { Ionicons } from "@react-native-vector-icons/ionicons"; import colors from "../../../components/colors"; // Assuming a colors file
// Enable LayoutAnimation for Android // Enable LayoutAnimation for Android
if (Platform.OS === 'android' && UIManager.setLayoutAnimationEnabledExperimental) { if (Platform.OS === 'android' && UIManager.setLayoutAnimationEnabledExperimental) {
@@ -68,14 +68,11 @@ interface CycleDashboardData {
// --- Helper Functions --- // --- Helper Functions ---
const formatDate = (dateArray: [number, number, number]): string => { const formatDate = (dateStr: string | null): string => {
if (!dateArray || dateArray.length < 3) return 'N/A'; if (!dateStr) return 'N/A';
const [year, month, day] = dateArray;
return new Date(year, month - 1, day).toLocaleDateString('en-US', { const [year, month, day] = dateStr.split('-');
month: 'short', return `${day}-${month}-${year}`;
day: 'numeric',
year: 'numeric',
});
}; };
const formatCurrency = (amount: number): string => { const formatCurrency = (amount: number): string => {
@@ -106,7 +103,7 @@ const CycleItem = ({ item, isExpanded, onToggle }: { item: Cycle, isExpanded: bo
<View style={styles.cycleDetails}> <View style={styles.cycleDetails}>
{/* Withdrawal Info */} {/* Withdrawal Info */}
{item.withdrawal && ( {item.withdrawal && (
<View style={styles.section}> <View style={styles.section}>
<Text style={styles.sectionTitle}>Withdrawal</Text> <Text style={styles.sectionTitle}>Withdrawal</Text>
<View style={styles.withdrawalCard}> <View style={styles.withdrawalCard}>
<Ionicons name="arrow-down-circle-outline" size={32} color={colors.Home} /> <Ionicons name="arrow-down-circle-outline" size={32} color={colors.Home} />
@@ -116,18 +113,19 @@ const CycleItem = ({ item, isExpanded, onToggle }: { item: Cycle, isExpanded: bo
</View> </View>
<Text style={styles.withdrawalDate}>{formatDate(item.withdrawal.paidDate)}</Text> <Text style={styles.withdrawalDate}>{formatDate(item.withdrawal.paidDate)}</Text>
</View> </View>
</View> </View>
)} )}
{/* Contributions List */} {/* Contributions List */}
<View style={styles.section}> <View style={styles.section}>
<Text style={styles.sectionTitle}>Contributions ({item.paidParticipants}/{item.totalParticipants})</Text> <Text style={styles.sectionTitle}>Contributions ({item.paidParticipants}/{item.totalParticipants})</Text>
{item.contributions.map(contribution => ( {item.contributions.map(contribution => (
<View key={contribution.transactionId} style={styles.contributionItem}> <View key={contribution.transactionId} style={[styles.contributionItem, { backgroundColor: contribution.status === 'SUCCESS' ? '#D1FAE5' : contribution.status === 'PENDING' ? '#FEF3C7' : '#FEE2E2' }]}>
<Ionicons name="person-circle-outline" size={28} color="#475569" /> <Ionicons name="person-circle-outline" size={28} color="#475569" />
<View style={{ flex: 1, marginLeft: 10 }}> <View style={{ flex: 1, marginLeft: 10 }}>
<Text style={styles.contributorName}>{contribution.userName}</Text> <Text style={styles.contributorName} numberOfLines={1} > {contribution.userName}</Text>
<Text style={styles.contributionDate}>{formatDate(contribution.paidDate)}</Text> <Text style={styles.contributionDate}>{formatDate(contribution.paidDate)}</Text>
<Text style={{color: contribution.status === 'SUCCESS' ? 'green' : contribution.status === 'PENDING' ? 'orange' : 'red', fontSize:12, textTransform:'capitalize'}}>{contribution.status}</Text>
</View> </View>
<Text style={styles.contributionAmount}>{formatCurrency(contribution.totalAmount)}</Text> <Text style={styles.contributionAmount}>{formatCurrency(contribution.totalAmount)}</Text>
</View> </View>
@@ -150,6 +148,7 @@ const CycleDashboard = ({ data }: { data: CycleDashboardData }) => {
setExpandedCycle(expandedCycle === cycleNumber ? null : cycleNumber); setExpandedCycle(expandedCycle === cycleNumber ? null : cycleNumber);
}; };
console.log("expanded cycle : ", data)
const renderHeader = () => ( const renderHeader = () => (
<View style={styles.headerContainer}> <View style={styles.headerContainer}>
<Text style={styles.groupName}>{data.groupName}</Text> <Text style={styles.groupName}>{data.groupName}</Text>
@@ -297,6 +296,9 @@ const styles = StyleSheet.create({
flexDirection: 'row', flexDirection: 'row',
alignItems: 'center', alignItems: 'center',
paddingVertical: 10, paddingVertical: 10,
paddingHorizontal: 8,
borderRadius: 6,
marginBottom: 10,
borderBottomWidth: 1, borderBottomWidth: 1,
borderBottomColor: '#f1f5f9', borderBottomColor: '#f1f5f9',
}, },
src/screens/home/user-home/GroupDetails.tsx
+6 -7
View File
@@ -77,7 +77,7 @@ const GroupDetails = () => {
const [openModal, setOpenModal] = useState(false); const [openModal, setOpenModal] = useState(false);
const [payable, setPayable] = useState<any>(); const [payable, setPayable] = useState<any>();
const [refreshing, setRefreshing] = useState(false); const [refreshing, setRefreshing] = useState(false);
const [cycleDashboardData, setCycleDashboardData] = useState<any>(); const [cycleDashboardData, setCycleDashboardData] = useState<any>([]);
const [selectedCycleNumber, setSelectedCycleNumber] = useState(null); const [selectedCycleNumber, setSelectedCycleNumber] = useState(null);
const [cycleItems, setCycleItems] = useState([]); const [cycleItems, setCycleItems] = useState([]);
const [selectedUser, setSelectedUser] = useState() as string | any; const [selectedUser, setSelectedUser] = useState() as string | any;
@@ -109,8 +109,8 @@ const GroupDetails = () => {
try { try {
const response = await apiCall(`${BASE_URL}payments/groups/${group.id || route?.params?.groupId}/cycle-dashboard`, "GET") as any; const response = await apiCall(`${BASE_URL}payments/groups/${group.id || route?.params?.groupId}/cycle-dashboard`, "GET") as any;
const responseData = response.data; const responseData = response.data;
setCycleDashboardData(responseData); setCycleDashboardData(responseData || []);
console.log("cycledata", responseData) console.log("cycle data", responseData)
if (responseData?.cycles) { if (responseData?.cycles) {
const items = responseData.cycles.map((cycle: any) => ({ const items = responseData.cycles.map((cycle: any) => ({
label: `Cycle ${cycle.cycleNumber}`, label: `Cycle ${cycle.cycleNumber}`,
@@ -191,7 +191,8 @@ const GroupDetails = () => {
}; };
const selectedCycleData = cycleDashboardData?.cycles.find((c: any) => c.cycleNumber === selectedCycleNumber); const selectedCycleData = cycleDashboardData?.cycles?.find((c: any) => c.cycleNumber === selectedCycleNumber);
// const selectedCycleData = cycleDashboardData?.cycles.find((c: any) => c.cycleNumber === selectedCycleNumber);
return ( return (
@@ -263,14 +264,12 @@ const GroupDetails = () => {
))} ))}
{cycleDashboardData?.status === 'ACTIVE' || cycleDashboardData?.status === 'DELAY' && !payable?.hasPaid && ( {(cycleDashboardData?.status === 'ACTIVE' || cycleDashboardData?.status === 'DELAY') && !payable?.hasPaid && (
<TouchableOpacity onPress={() => setOpenModal(true)} style={styles.button}> <TouchableOpacity onPress={() => setOpenModal(true)} style={styles.button}>
<Text style={styles.buttonText}>Contribute</Text> <Text style={styles.buttonText}>Contribute</Text>
</TouchableOpacity> </TouchableOpacity>
)} )}
</ScrollView> </ScrollView>
{openModal && ( {openModal && (
<ContributionScreen <ContributionScreen
data={payable} data={payable}
src/screens/management/Payments.tsx
+5 -1
View File
@@ -38,6 +38,8 @@ interface PaymentDetails {
contributionAmount: number; contributionAmount: number;
totalDueWithLateFee: number; totalDueWithLateFee: number;
participants: Participant[]; participants: Participant[];
nextCycleStart: string;
cycleCompleted: boolean;
} }
type PaymentStackParamList = { Payments: { groupId: string } }; type PaymentStackParamList = { Payments: { groupId: string } };
@@ -253,7 +255,9 @@ const Payments: React.FC = () => {
</View> </View>
</View> </View>
<Text style={styles.sectionTitle}>Participants</Text> <Text style={styles.sectionTitle}>Participants</Text>
{paymentDetails.participants.map(renderParticipant)} { paymentDetails?.cycleCompleted &&
<Text style={{ marginLeft: 20, marginBottom: 10, color: '#6c757d' }}>Next Cycle from : {paymentDetails?.nextCycleStart}</Text>
}{paymentDetails.participants.map(renderParticipant)}
</> </>
)} )}
</ScrollView> </ScrollView>
src/screens/management/WinnerUser.tsx
+3 -3
View File
@@ -34,7 +34,7 @@ interface WinnerUserProps {
} }
visible: boolean visible: boolean
onClose: () => void onClose: () => void
groupId:string | number groupId: string | number
} }
const WinnerUser: React.FC<WinnerUserProps> = ({ data, visible, onClose, groupId }) => { const WinnerUser: React.FC<WinnerUserProps> = ({ data, visible, onClose, groupId }) => {
@@ -95,7 +95,7 @@ const WinnerUser: React.FC<WinnerUserProps> = ({ data, visible, onClose, groupId
const onConfirm = async () => { const onConfirm = async () => {
try { try {
const res = await apiCall(`${BASE_URL}payments/withdraw/${groupId}/${data?.selectedUser?.id}`, 'PUT') const res = await apiCall(`${BASE_URL}payments/withdraw`, 'PUT', { groupId, userId: data?.selectedUser?.id, cycleNumber: currentCycle }) as any
console.log("res winner user : ", res) console.log("res winner user : ", res)
ToastAndroid.show('Withdrawal successful', ToastAndroid.SHORT) ToastAndroid.show('Withdrawal successful', ToastAndroid.SHORT)
onClose() onClose()
@@ -119,7 +119,7 @@ const WinnerUser: React.FC<WinnerUserProps> = ({ data, visible, onClose, groupId
{/* Header */} {/* Header */}
<View style={styles.header}> <View style={styles.header}>
<Ionicons name="trophy" size={24} color="#ff9800" /> <Ionicons name="trophy" size={24} color="#ff9800" />
<Text style={styles.cycle}>Cycle {currentCycle} Winner</Text> <Text style={styles.cycle}>Cycle {currentCycle} Winner </Text>
<Ionicons name="trophy" size={24} color="#ff9800" /> <Ionicons name="trophy" size={24} color="#ff9800" />
</View> </View>
src/screens/profile/Profile.tsx
+65 -74
View File
@@ -30,7 +30,7 @@ import { clearUser, setUserData } from "../../redux/userSlice";
import { StackNavigationProp } from "@react-navigation/stack"; import { StackNavigationProp } from "@react-navigation/stack";
import { RootStackParamList } from "../../navigation/AppNavigator"; import { RootStackParamList } from "../../navigation/AppNavigator";
import { firebase } from "@react-native-firebase/messaging"; import { firebase } from "@react-native-firebase/messaging";
import FirebaseService, { deleteFcmToken } from "../../utils/firebase/firebaseServices"; import FirebaseService, { deleteFcmToken, getFcmToken } from "../../utils/firebase/firebaseServices";
type UserProfile = { type UserProfile = {
@@ -303,7 +303,15 @@ const Profile = () => {
ToastAndroid.show('No user is currently logged in', ToastAndroid.SHORT); ToastAndroid.show('No user is currently logged in', ToastAndroid.SHORT);
return; return;
} }
const fcmToken = await getFcmToken(user?.userId?.toString());
const res = await fetch(`${BASE_URL}token/remove?fcmToken=${fcmToken}`, {
method: "PUT",
headers: {
Accept: "*/*",
Authorization: `Bearer ${credentials.password}`,
},
});
console.log(" logout api response : ", res)
await deleteFcmToken(user?.userId?.toString()); await deleteFcmToken(user?.userId?.toString());
// Clear stored credentials // Clear stored credentials
@@ -353,25 +361,7 @@ const Profile = () => {
}, 2000); // 2 seconds delay }, 2000); // 2 seconds delay
}; };
console.log("user image :", user?.filePath);
const getProfileImage = () => {
return require('../../assets/images/placeholder.png');
if (user?.imageBlob) {
return { uri: `data:image/jpeg;base64,${user.imageBlob}` };
}
if (user?.filePath) {
return { uri: user.filePath };
}
// Return a require for local asset if nothing is available
return require('../../assets/images/placeholder.png');
};
return ( return (
<AppView paddingHorizontal={5} > <AppView paddingHorizontal={5} >
{/* Header */} {/* Header */}
@@ -433,11 +423,12 @@ const Profile = () => {
<View style={styles.profileImageSection}> <View style={styles.profileImageSection}>
<View style={styles.avatarContainer}> <View style={styles.avatarContainer}>
<Image <Image
source={getProfileImage()} source={{ uri: user?.imageBlob ? `data:image/jpeg;base64,${user?.imageBlob}` : user?.filePath || 'https://via.placeholder.com/150' }}
style={styles.avatar} style={styles.avatar}
onError={() => console.log("Error loading image")} onError={() => console.log("Error loading image")}
resizeMode='contain' resizeMode='contain'
/> />
<Text numberOfLines={1} style={{ textAlign: 'center', marginTop: 8 }}>{user?.filePath}</Text>
<TouchableOpacity style={styles.cameraIcon} onPress={pickImage}> <TouchableOpacity style={styles.cameraIcon} onPress={pickImage}>
<Ionicons name="camera" size={18} color="#000" /> <Ionicons name="camera" size={18} color="#000" />
</TouchableOpacity> </TouchableOpacity>
@@ -464,7 +455,7 @@ const Profile = () => {
<Text style={{ color: "#64748b", marginBottom: 16 }}>Become Organizer</Text> <Text style={{ color: "#64748b", marginBottom: 16 }}>Become Organizer</Text>
</View> </View>
<View> <View>
<CustomButton <CustomButton
title="Edit Profile" title="Edit Profile"
onPress={() => setEditing(true)} onPress={() => setEditing(true)}
@@ -638,29 +629,29 @@ const Profile = () => {
/> />
<View style={styles.inputContainer}> <View style={styles.inputContainer}>
<Text style={styles.inputLabel}>Gender</Text> <Text style={styles.inputLabel}>Gender</Text>
<View style={styles.genderRow}> <View style={styles.genderRow}>
{["Male", "Female", "Other"].map((option) => ( {["Male", "Female", "Other"].map((option) => (
<TouchableOpacity <TouchableOpacity
key={option} key={option}
style={[ style={[
styles.genderButton, styles.genderButton,
user?.gender === option && styles.genderButtonActive, user?.gender === option && styles.genderButtonActive,
]} ]}
onPress={() => setUser({ ...user, gender: option })} onPress={() => setUser({ ...user, gender: option })}
> >
<Text <Text
style={[ style={[
styles.genderButtonText, styles.genderButtonText,
user?.gender === option && styles.genderButtonTextActive, user?.gender === option && styles.genderButtonTextActive,
]} ]}
> >
{option} {option}
</Text> </Text>
</TouchableOpacity> </TouchableOpacity>
))} ))}
</View> </View>
</View> </View>
<View style={styles.editButtons}> <View style={styles.editButtons}>
@@ -716,7 +707,7 @@ const styles = StyleSheet.create({
borderBottomRightRadius: 20, borderBottomRightRadius: 20,
}, },
headerTitle: { headerTitle: {
fontSize: 22, fontWeight: "600", color: colors.black fontSize: 22, fontWeight: "600", color: colors.black
}, },
refreshButton: { refreshButton: {
padding: 4, padding: 4,
@@ -887,33 +878,33 @@ const styles = StyleSheet.create({
color: "#6366f1", color: "#6366f1",
}, },
genderRow: { genderRow: {
flexDirection: "row", flexDirection: "row",
justifyContent: "space-between", justifyContent: "space-between",
marginTop: 8, marginTop: 8,
marginBottom: 16, marginBottom: 16,
gap: 12, gap: 12,
}, },
genderButton: { genderButton: {
flex: 1, flex: 1,
paddingVertical: 12, paddingVertical: 12,
backgroundColor: "#f1f5f9", backgroundColor: "#f1f5f9",
borderRadius: 12, borderRadius: 12,
alignItems: "center", alignItems: "center",
borderWidth: 1, borderWidth: 1,
borderColor: "#e2e8f0", borderColor: "#e2e8f0",
}, },
genderButtonActive: { genderButtonActive: {
backgroundColor: colors.pastelBlue, backgroundColor: colors.pastelBlue,
}, },
genderButtonText: { genderButtonText: {
color: "#64748b", color: "#64748b",
fontWeight: "500", fontWeight: "500",
fontSize: 16, fontSize: 16,
}, },
genderButtonTextActive: { genderButtonTextActive: {
color: colors.black, color: colors.black,
fontWeight: "700" fontWeight: "700"
}, },
buttonIcon: { buttonIcon: {
marginRight: 8, marginRight: 8,
src/screens/transaction/TransactionList.tsx
+14 -3
View File
@@ -69,9 +69,20 @@ const StatusBadge: React.FC<{ status?: string }> = ({ status }) => {
}; };
const TransactionItem: React.FC<{ item: Transaction }> = ({ item }) => { const TransactionItem: React.FC<{ item: Transaction }> = ({ item }) => {
const date = useMemo(() => parseTransactionDate(item.transactionDate), [item.transactionDate]); const formatDate = (dateStr: string | null): string => {
const dateStr = date ? date.toLocaleString("en-IN") : "-"; if (!dateStr) return 'N/A';
const date = new Date(dateStr);
const day = String(date.getDate()).padStart(2, '0');
const month = String(date.getMonth() + 1).padStart(2, '0');
const year = date.getFullYear();
return `${day}-${month}-${year}`;
};
const dateStr = item.transactionDate ? formatDate(item.transactionDate) : "N/A";
console.log("item of the transaction : ", item)
return ( return (
<TouchableOpacity activeOpacity={0.8} style={styles.card}> <TouchableOpacity activeOpacity={0.8} style={styles.card}>
<View style={styles.cardLeft}> <View style={styles.cardLeft}>
@@ -130,7 +141,7 @@ const TransactionsList: React.FC = () => {
return ( return (
<AppView> <AppView>
<Header title="transactions" titleColor={colors.Home} arrowColor={colors.Home}/> <Header title="transactions" titleColor={colors.Home} arrowColor={colors.Home} />
<Text style={styles.headerTitle}>{message}</Text> <Text style={styles.headerTitle}>{message}</Text>
src/utils/ApiUrls.tsx
+2 -2
View File
@@ -1,6 +1,6 @@
export const BASE_URL = "https://api.godemo.in/FundCollect/api/" // export const BASE_URL = "https://11.godemo.in/FundCollect/api/"
// export const BASE_URL = "http://192.168.1.5:9060/api/" export const BASE_URL = "http://192.168.1.8:9060/api/"
export const LOGIN_URL = `${BASE_URL}user/generate/otp?mobiles=` export const LOGIN_URL = `${BASE_URL}user/generate/otp?mobiles=`
export const VARIFY_OTP_URL = `${BASE_URL}user/otp/verify` export const VARIFY_OTP_URL = `${BASE_URL}user/otp/verify`
export const ORGRAGISTRATION = `${BASE_URL}organizer/registration/apply` export const ORGRAGISTRATION = `${BASE_URL}organizer/registration/apply`