again

2025-09-18 17:23:54 +05:30
parent 0da569641b f7b9cb9190
commit 8038396efd
10 changed files with 134 additions and 92 deletions
@@ -48,7 +48,7 @@ export default function GroupCreationForm() {
    minParticipants: "",
    startDate: "",
    visibility: "PRIVATE",
-    fundDistribution: "SEQUENTIAL",
+    withdrawalMethod: "SEQUENTIAL",
  });

  const [errors, setErrors] = useState<any>({}); // State for validation errors
@@ -96,6 +96,7 @@ export default function GroupCreationForm() {

  const handleReview = () => {
    if (validateForm()) {
+      console.log("------",form)
      navigation.navigate("GroupReview", { form });
    } else {
      Alert.alert("Incomplete Form", "Please fill out all required fields correctly.");
@@ -121,7 +122,7 @@ export default function GroupCreationForm() {

        <Text style={styles.label}>Fund Distribution</Text>
        <View style={styles.toggleContainer}>
-            {distributionTypes.map((type) => (<TouchableOpacity key={type} onPress={() => handleChange("fundDistribution", type)} style={[styles.toggleButton, form.fundDistribution === type && styles.selectedButton]}><Text style={[styles.toggleButtonText, form.fundDistribution === type && styles.selectedButtonText]}>{type.charAt(0) + type.slice(1).toLowerCase()}</Text></TouchableOpacity>))}
+            {distributionTypes.map((type) => (<TouchableOpacity key={type} onPress={() => handleChange("withdrawalMethod", type)} style={[styles.toggleButton, form.withdrawalMethod === type && styles.selectedButton]}><Text style={[styles.toggleButtonText, form.withdrawalMethod === type && styles.selectedButtonText]}>{type.charAt(0) + type.slice(1).toLowerCase()}</Text></TouchableOpacity>))}
        </View>

        <View style={styles.participantsRow}>
@@ -82,6 +82,7 @@ export default function GroupReview({ route, navigation }: any) {
        maxParticipants: Number(form.maxParticipants) || 0,
        minParticipants: Number(form.minParticipants) || 0,
      };
+      console.log("payload:", payload);
      const res = await apiCall(GROUP_CREATION_URL, "POST", payload) as { statusCode?: number };
      
      if (res?.statusCode === 201) {
@@ -111,7 +112,7 @@ export default function GroupReview({ route, navigation }: any) {

        {/* --- Timeline Sections --- */}
        <TimelineSection icon="information-circle-outline" title="Basic Information">{renderRow("Name", form.groupName)}{form.description ? ( <View style={styles.descriptionContainer}> <Text style={styles.label}>Description</Text> <Text style={styles.descriptionText}>{form.description}</Text> </View> ) : null}</TimelineSection>
-        <TimelineSection icon="shield-checkmark-outline" title="Rules & Privacy">{renderRow("Visibility", form.visibility)}{renderRow("Distribution", form.fundDistribution)}{renderRow("Min Members", form.minParticipants)}{renderRow("Max Members", form.maxParticipants)}</TimelineSection>
+        <TimelineSection icon="shield-checkmark-outline" title="Rules & Privacy">{renderRow("Visibility", form.visibility)}{renderRow("Distribution", form.withdrawalMethod)}{renderRow("Min Members", form.minParticipants)}{renderRow("Max Members", form.maxParticipants)}</TimelineSection>
        <TimelineSection icon="wallet-outline" title="Financial Details">{renderRow("Contribution", `${form.contributionAmount} INR`)}{renderRow("Cycle", form.cycleType)}{form.cycleType === "CUSTOM" && renderRow("Cycle Days", `${form.customCycleDays} days`)}{renderRow("Start Date", form.startDate)}</TimelineSection>
        
        <TouchableOpacity onPress={handleSubmit} style={styles.submitBtn} disabled={isLoading}>
@@ -21,7 +21,7 @@ const SplashScreen = () => {
    try {
      const credentials = await Keychain.getGenericPassword();
      if (!credentials) {
-     
+        // Alert.alert("Error", "You are not logged in");
        return;
      }
      const token = credentials.password;
@@ -11,6 +11,7 @@ import {
 import * as Keychain from "react-native-keychain";
 import { useFocusEffect, useNavigation } from "@react-navigation/native";
 import { BASE_URL } from "../../utils/ApiUrls";
+import colors from "../../components/colors";

 export type ApiResponse = {
    message: string;
@@ -136,7 +137,8 @@ const UserProfileStatus: React.FC = () => {

                            <TouchableOpacity
                                style={[styles.button, { backgroundColor: "#ccc", marginTop: 8 }]}
-                                onPress={() => {     if (intervalId) {
+                                onPress={() => {
+                                    if (intervalId) {
                                        clearInterval(intervalId);
                                        setIntervalId(null);
                                    }
@@ -221,7 +223,7 @@ const styles = StyleSheet.create({
        fontSize: 20,
        fontWeight: "700",
        marginBottom: 10,
-        color: "#FF9500",
+        color: colors.primary,
    },
    modalText: {
        fontSize: 14,
@@ -116,6 +116,7 @@ const EditGroupScreen: React.FC<EditGroupScreenProps> = ({ route, navigation })
    }
    setLoading(true);
    try {
+      console.log(`Fetching details for group ID: ${groupId}`);  
      const response = await apiCall(
        `https://api.godemo.in/FundCollect/api/fund/group/details?groupId=${groupId}`,
        'GET',
@@ -14,7 +14,7 @@ import {
 import { useNavigation, useFocusEffect } from "@react-navigation/native";
 import { StackNavigationProp } from "@react-navigation/stack";
 import { RootStackParamList } from "../../navigation/AppNavigator";
-import { APPROVE_REQUEST_URL, BASE_URL, DECLINE_REQUEST_URL, MY_GROUPS_URL, REQUESTS_URL } from "../../utils/ApiUrls";
+import { APPROVE_REQUEST_URL, BASE_URL, DECLINE_REQUEST_URL, JOIN_GROUP_URL, MY_GROUPS_URL, REQUESTS_URL } from "../../utils/ApiUrls";
 import colors from "../../components/colors";
 import AppView from "../../components/AppView";
 import { apiCall } from "../../utils/ApiHelper";
@@ -46,7 +46,7 @@ const ManagementScreen: FC = () => {
        // Fetch all data concurrently
        const [myGroupsRes,joinedGroupsRes,requestsRes] = await Promise.all([
          apiCall(MY_GROUPS_URL, "GET") as Promise<ApiResponse<MyGroup[]>>,
-          apiCall(DECLINE_REQUEST_URL, "GET") as Promise<ApiResponse<JoinedGroup[]>>, // Assuming this is also needed
+          apiCall(JOIN_GROUP_URL, "GET") as Promise<ApiResponse<JoinedGroup[]>>, // Assuming this is also needed
          apiCall(REQUESTS_URL, "GET") as Promise<ApiResponse<JoinRequest[]>>,
        ]);

@@ -9,12 +9,17 @@ import {
  KeyboardAvoidingView,
  Platform,
  SafeAreaView,
+  TouchableOpacity,
 } from "react-native";
 import * as Keychain from "react-native-keychain";
 import { CustomInput, CustomButton } from "../../components/common/Custom";
 import colors from "../../components/colors";
+import { useNavigation } from "@react-navigation/native";
+import AppView from "../../components/AppView";
+import Ionicons from "@react-native-vector-icons/ionicons";

 const BecomeOrg = () => {
+  const navigation = useNavigation<any>();
  const [bankAccountNumber, setBankAccountNumber] = useState("");
  const [bankName, setBankName] = useState("");
  const [branchCode, setBranchCode] = useState("");
@@ -58,6 +63,7 @@ const BecomeOrg = () => {
        setBankAccountNumber("");
        setBankName("");
        setBranchCode("");
+        navigation.navigate("Home" as never);
      } else {
        Alert.alert("Error", result.message || "Failed to apply");
      }
@@ -70,7 +76,14 @@ const BecomeOrg = () => {
  };

  return (
-    <SafeAreaView style={{ flex: 1, backgroundColor: colors.pastelPink }}>
+    <AppView barStyle="dark-content">
+      <View style={styles.header}>
+        <TouchableOpacity onPress={() => navigation.replace("Home" as never)} >
+          <Ionicons name="arrow-back" size={24} color={'#000'} />
+        </TouchableOpacity>
+        <Text style={styles.headerTitle}>User Profile</Text>
+
+      </View>
      <KeyboardAvoidingView
        style={{ flex: 1 }}
        behavior={Platform.OS === "ios" ? "padding" : undefined}
@@ -121,7 +134,7 @@ const BecomeOrg = () => {
          )}
        </ScrollView>
      </KeyboardAvoidingView>
-    </SafeAreaView>
+    </AppView>
  );
 };

@@ -140,4 +153,17 @@ const styles = StyleSheet.create({
    textAlign: "center",
    color: colors.textDark,
  },
+  header: {
+    flexDirection: "row",
+    justifyContent: "space-between",
+    alignItems: "center",
+    padding: 16,
+    borderBottomLeftRadius: 20,
+    borderBottomRightRadius: 20,
+  },
+  headerTitle: {
+    fontSize: 22,
+    fontWeight: "700",
+    color: "#000"
+  },
 });
@@ -316,7 +316,7 @@ const Profile = () => {
        </TouchableOpacity>
      </View>
      <KeyboardAvoidingView
-        style={{ flex: 1 }}
+        // style={{ flex: 1 }}
        behavior={Platform.OS === "ios" ? "padding" : undefined}
      >
        <ScrollView
@@ -327,11 +327,11 @@ const Profile = () => {
          {/* Profile Card */}
          <View style={styles.profileCard}>
            {/* Profile Image Section */}
-            {/* {
-              statusData?.role && statusData?.organizerStatus ?
-                <Text style={{ color: "#64748b", marginBottom: 16, textAlign: 'center', fontSize: 18 }}>Your Role: {statusData.role} | Organizer Status: {statusData.organizerStatus}</Text>
-                :
-                <SwitchNavigator role={statusData?.role || ''} status={statusData?.organizerStatus || ''} />} */}
+            { user?.role === "ORGANIZER" && user?.organizerStatus === "NOT_APPLIED" || "PENDING" ? (
+              <Text style={{ color: "#64748b", marginBottom: 16, textAlign: 'center', fontSize: 18 }}>Your Role: {user.role} | Organizer Status: {user.organizerStatus}</Text>
+            ) : (
+              <SwitchNavigator role={user?.role || ''} status={user?.organizerStatus === "NOT_APPLIED"  ? '' : user?.organizerStatus || ''} />
+            )}
            <View style={styles.profileImageSection}>
              <View style={styles.avatarContainer}>
                <Image
@@ -358,12 +358,25 @@ const Profile = () => {
              <>
                {/* Profile Details */}
                <View style={styles.detailsSection}>
+                  <View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
+                    <View>
                      <Text style={styles.sectionTitle}>Personal Information</Text>
-                  <View style={{ marginBottom: 16 }}>
-
                      <Text style={{ color: "#64748b", marginBottom: 16 }}>Become Organizer</Text>
-                  </View>
+                      {/* <View style={{ marginBottom: 16 }}>

+                        
+                      </View> */}
+                    </View>
+                    <View>
+                      <CustomButton
+                        title="Edit Profile"
+                        onPress={() => setEditing(true)}
+                        icon="create"
+                        style={styles.editButton}
+                        buttonBackground={colors.pastelBlue}
+                      />
+                    </View>
+                  </View>
                  <View style={styles.detailRow}>
                    <Ionicons name="person" size={20} color={colors.pastelBlue} style={styles.detailIcon} />
                    <View>
@@ -419,15 +432,11 @@ const Profile = () => {
                      <Text style={styles.detailText}>{user.role || "User"}</Text>
                    </View>
                  </View>
-                </View>

-                <CustomButton
-                  title="Edit Profile"
-                  onPress={() => setEditing(true)}
-                  icon="create"
-                  style={styles.editButton}
-                  buttonBackground={colors.pastelBlue}
-                />
+
+
+
+                </View>
              </>
            ) : (
              <>
@@ -482,23 +491,25 @@ const Profile = () => {
                    onChangeText={(text) => setUser({ ...user, gender: text })}
                    icon="male-female"
                  />
-                </View>
+
                  <View style={styles.editButtons}>
                    <CustomButton
                      title="Save Changes"
                      onPress={updateProfile}
                      icon="save"
                      style={styles.saveButton}
-                    buttonBackground="#10b981"
+                      buttonBackground={colors.pastelBlue}
                    />
                    <CustomButton
                      title="Cancel"
                      onPress={() => setEditing(false)}
                      icon="close"
                      style={styles.cancelButton}
-                    buttonBackground="#f38080ff"
+                      buttonBackground=""
                    />
                  </View>
+
+                </View>
              </>
            )}
          </View>
@@ -530,15 +541,8 @@ const styles = StyleSheet.create({
    justifyContent: "space-between",
    alignItems: "center",
    padding: 16,
-    // paddingTop: 50,
-    // backgroundColor: "#6366f1",
    borderBottomLeftRadius: 20,
    borderBottomRightRadius: 20,
-    // elevation: 4,
-    // shadowColor: "#000",
-    // shadowOffset: { width: 0, height: 2 },
-    // shadowOpacity: 0.2,
-    // shadowRadius: 4,
  },
  headerTitle: {
    fontSize: 22,
@@ -598,13 +602,13 @@ const styles = StyleSheet.create({
    borderRadius: 25,
  },
  detailsSection: {
-    marginBottom: 24,
+    marginBottom: "40%",
  },
  sectionTitle: {
    fontSize: 18,
    fontWeight: "700",
    color: "#1e293b",
-    marginBottom: 16,
+    // marginBottom: 16,
    paddingBottom: 8,
    borderBottomWidth: 1,
    borderBottomColor: "#f1f5f9",
@@ -629,10 +633,10 @@ const styles = StyleSheet.create({
    fontWeight: "500",
  },
  editButton: {
-    marginTop: 8,
+    paddingHorizontal: 8,
  },
  editSection: {
-    marginBottom: 20,
+    marginBottom: '40%',
    flex: 1,
  },
  editButtons: {
@@ -643,6 +647,8 @@ const styles = StyleSheet.create({
  },
  cancelButton: {
    marginTop: 4,
+    borderWidth: 1,
+    borderColor: "#cbd5e1",
  },
  inputContainer: {
    marginBottom: 16,
@@ -2,6 +2,7 @@ import React, { useState } from "react";
 import { View, Text, StyleSheet, Switch } from "react-native";
 import { useNavigation } from "@react-navigation/native";
 import type { NativeStackNavigationProp } from "@react-navigation/native-stack";
+import colors from "../../components/colors";

 type RootStackParamList = {
  BecomeOrg: undefined;
@@ -24,6 +25,10 @@ const SwitchNavigator: React.FC<SwitchNavigatorProps> = ({ role, status }) => {

    if (newValue) {
      navigation.navigate("BecomeOrg"); // Navigate when ON
+      setTimeout(() => {
+       setIsEnabled(false);  
+      }, 2000);
+      // Reset switch to OFF after navigation
    } else {
      navigation.navigate("Profile"); // Navigate when OFF
    }
@@ -40,8 +45,8 @@ const SwitchNavigator: React.FC<SwitchNavigatorProps> = ({ role, status }) => {
          : `Request Organizer Role ${status}`}
      </Text>
      <Switch
-        trackColor={{ false: "#767577", true: "#81b0ff" }}
-        thumbColor={isEnabled ? "#007AFF" : "#f4f3f4"}
+        trackColor={{ false: "#767577", true: colors.textLight }}
+        thumbColor={isEnabled ? colors.pastelBlue : "#f4f3f4"}
        ios_backgroundColor="#3e3e3e"
        onValueChange={toggleSwitch}
        value={isEnabled}
@@ -5,8 +5,8 @@ export  const ORGRAGISTRATION = `${BASE_URL}organizer/registration/apply`
 export  const GROUP_CREATION_URL = `${BASE_URL}fund/groups/{organizerId}`
 export const  PROFILE_URL =`${BASE_URL}user/profile/view`
 export const PUBLIC_GROUPS_URL =`${BASE_URL}fund/user/public`
-export const JOIN_GROUP_URL = `${BASE_URL}fund`;
-export const MY_GROUPS_URL =`https://api.godemo.in/FundCollect/api/fund/my/join/groups`
+export const JOIN_GROUP_URL = `${BASE_URL}fund/my/join/groups`;
+export const MY_GROUPS_URL =`https://api.godemo.in/FundCollect/api/fund/getAll/my/groups`

 export const REQUESTS_URL =`https://api.godemo.in/FundCollect/api/fund/group/pending/request`
 //https://api.godemo.in/FundCollect/api/fund/groups/2a80cdaa-8532-4b8a-87f0-9c1023d18a7f/join/64