Merge pull request #30 from Build-Squad/fix-api-call

Fix package creation/update bug and add influencer
Build-Squad · Dec 7, 2023 · b25cffa · b25cffa
2 parents df06b5b + 962fe51
commit b25cffa
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 9 deletions.
diff --git a/src/ui/app/page.tsx b/src/ui/app/page.tsx
@@ -25,16 +25,17 @@ export default function Home() {
   // Authenticate user based on cookie present on the browser
   const isAuthenticated = async () => {
     try {
-      await axios.get(
+      const res = await axios.get(
         process.env.NEXT_PUBLIC_BACKEND_URL + "is-authenticated/",
         {
           withCredentials: true,
         }
       );
+      console.log("User is authenticated:", res);
+      localStorage.setItem("user", JSON.stringify(res?.data?.data));
       setIsUserAuthenticated(true);
     } catch (e) {
       setIsUserAuthenticated(false);
-      console.log("Error while authenticating:", e);
     }
   };
 

diff --git a/src/ui/app/profile/packages/page.tsx b/src/ui/app/profile/packages/page.tsx
@@ -96,7 +96,7 @@ const Packages = () => {
         }
       );
       if (isSuccess) {
-        setPackages(data?.data);
+        setPackages(data);
         setPagination({
           ...pagination,
           total_data_count: data?.pagination?.total_data_count,
@@ -259,7 +259,7 @@ const Packages = () => {
                   </Tooltip>
                 </Card>
               </Grid>
-              {packages.map((item: PackageType) => (
+              {packages?.map((item: PackageType) => (
                 <Grid item xs={12} sm={6} md={4} lg={3} key={item.id}>
                   <Card
                     sx={{

diff --git a/src/ui/app/profile/services/page.tsx b/src/ui/app/profile/services/page.tsx
@@ -89,7 +89,7 @@ const Services = () => {
         }
       );
       if (isSuccess) {
-        setServices(data?.data);
+        setServices(data);
         setPagination({
           ...pagination,
           total_data_count: data?.pagination?.total_data_count,
@@ -280,7 +280,7 @@ const Services = () => {
                   </Tooltip>
                 </Card>
               </Grid>
-              {services.map((service) => (
+              {services?.map((service) => (
                 <Grid item xs={12} sm={6} md={4} lg={3} key={service.id}>
                   <Card
                     sx={{

diff --git a/src/ui/src/components/profileComponents/createUpdatePackage/index.tsx b/src/ui/src/components/profileComponents/createUpdatePackage/index.tsx
@@ -42,13 +42,17 @@ const CreateUpdatePackage = ({
   setRefreshPage,
 }: CreateUpdatePackageProps) => {
   const [loading, setLoading] = React.useState<boolean>(false);
+  const [influecerId, setInfluencerId] = React.useState<string | null>(null);
 
   const updatePackage = async (values: FormikValues) => {
     try {
       setLoading(true);
       const { message, data, errors, isSuccess } = await putService(
         `/packages/${packageItem?.id}/`,
-        values
+        {
+          ...values,
+          influencer: influecerId,
+        }
       );
       if (isSuccess) {
         notification(message);
@@ -71,7 +75,10 @@ const CreateUpdatePackage = ({
       setLoading(true);
       const { message, data, errors, isSuccess } = await postService(
         "/packages/",
-        values
+        {
+          ...values,
+          influencer: influecerId,
+        }
       );
       if (isSuccess) {
         notification(message);
@@ -120,6 +127,14 @@ const CreateUpdatePackage = ({
     }
   }, [packageItem, open]);
 
+  useEffect(() => {
+    const user = localStorage.getItem("user");
+    if (user) {
+      const userObject = JSON.parse(user);
+      setInfluencerId(userObject?.user?.id);
+    }
+  }, []);
+
   return (
     <CustomModal open={open} setOpen={setOpen}>
       <Grid container>

diff --git a/src/ui/src/components/shared/customAutoComplete/index.tsx b/src/ui/src/components/shared/customAutoComplete/index.tsx
@@ -53,7 +53,7 @@ const CustomAutoComplete = ({
         page_number: pagination.current_page_number,
       });
       if (isSuccess) {
-        setOptions([...options, ...data.data]);
+        setOptions([...options, ...data]);
       }
     } catch (error) {
       console.error("Failed to fetch options:", error);