From c5c3ebfedd3ea41b7a6f724c54e2d6d4cfe1f8b9 Mon Sep 17 00:00:00 2001
From: "parth.ramani" <parth.ramani@wdimails.com>
Date: Wed, 12 Feb 2025 12:02:54 +0530
Subject: [PATCH 1/4] worked on the aboutus

---
 src/Pages/ManageCMS/AboutUs/AboutUs.tsx       |  42 +++-
 .../ManageCMS/AboutUs/AboutUsAddModel.tsx     | 194 +++++++++++++++---
 src/Redux/Service/manage.aboutus.service.ts   |  22 +-
 3 files changed, 215 insertions(+), 43 deletions(-)

diff --git a/src/Pages/ManageCMS/AboutUs/AboutUs.tsx b/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
index 0d73b52..89a481e 100644
--- a/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
+++ b/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
@@ -1,16 +1,15 @@
-import { Box, HStack, Text } from "@chakra-ui/react";
+import { Box, Center, HStack, Skeleton, Spinner, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
 import { p } from "framer-motion/client";
 import AboutUsAddModel from "../../ManageCMS/AboutUs/AboutUsAddModel";
 import { useGetAboutUsQuery } from "../../../Redux/Service/manage.aboutus.service";
 
-
-interface AboutUsContent {
+interface AboutUs {
   content: string;
 }
 
 interface ApiResponse {
-  data: AboutUsContent[];
+  data: AboutUs[];
 }
 
 
@@ -19,12 +18,13 @@ const AboutUs = () => {
   // const {
   //   data: data
   // } = useGetAboutUsQuery()
-  const { data: response } = useGetAboutUsQuery<{ data: ApiResponse }>();
+  // const { data: response, isLoading } = useGetAboutUsQuery<{ data: ApiResponse }>();
+  const { data: response, isLoading } = useGetAboutUsQuery<ApiResponse>();
   console.log('====================================');
   console.log(response);
   console.log('====================================');
 
-  const content = response?.data?.[0]?.content || "No content available";
+  const content = response?.data?.[0]?.content;
 
   return (
 
@@ -46,9 +46,35 @@ const AboutUs = () => {
             <AboutUsAddModel />
           </HStack>
         </HStack>
-        <Text as={p} fontSize={"sm"} fontWeight={400} color={"#1D1D1D"} px={3} w={"85%"} mb={"15px"} >
+        {/* Show Skeleton until content is available */}
+        {isLoading || !content ? (
+          <Box px={3} w="85%">
+            <Skeleton height="20px" mb="10px" />
+            <Skeleton height="20px" mb="10px" />
+            <Skeleton height="20px" mb="10px" />
+            <Skeleton height="20px" mb="10px" width="75%" />
+            <Skeleton height="20px" mb="15px" width="90%" />
+            <Skeleton height="20px" mb="10px" />
+            <Skeleton height="20px" mb="10px" width="85%" />
+            <Skeleton height="20px" mb="10px" />
+            <Skeleton height="20px" width="70%" />
+          </Box>
+        ) : (
+          <Text
+            as="p"
+            fontSize="sm"
+            fontWeight={400}
+            color="#1D1D1D"
+            px={3}
+            w="85%"
+            mb="15px"
+          >
+            {content}
+          </Text>
+        )}
+        {/* <Text as={p} fontSize={"sm"} fontWeight={400} color={"#1D1D1D"} px={3} w={"85%"} mb={"15px"} >
           {content}
-        </Text>
+        </Text> */}
         {/* <Text as={p}  fontSize={"sm"} fontWeight={400} color={"#1D1D1D"} px={3} w={"85%"} >
           Lorem ipsum dolor sit amet, consectetur adipisicing elit. Numquam soluta doloremque quibusdam facilis quas, unde hic eaque doloribus sed perferendis atque, eos dolores eius consectetur iure sint adipisci itaque tempora fugit quidem culpa provident possimus. Ullam, vitae in voluptatum dignissimos, quos blanditiis sequi aut repellat error eaque veritatis unde quam temporibus adipisci consectetur neque vero exercitationem dolor cum numquam maiores alias, totam minima quas. Possimus, ratione harum. Alias laboriosam nesciunt esse fugit deserunt pariatur corporis tempora quia veniam laborum aliquid enim voluptatibus asperiores minima tempore repudiandae vero quo porro, doloribus explicabo sit beatae et hic natus. Non earum nisi reiciendis? 
         </Text> */}
diff --git a/src/Pages/ManageCMS/AboutUs/AboutUsAddModel.tsx b/src/Pages/ManageCMS/AboutUs/AboutUsAddModel.tsx
index 75b9c73..301c0de 100644
--- a/src/Pages/ManageCMS/AboutUs/AboutUsAddModel.tsx
+++ b/src/Pages/ManageCMS/AboutUs/AboutUsAddModel.tsx
@@ -1,53 +1,189 @@
-import { FaRegEdit } from "react-icons/fa"
-import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
-import { Field, Stack, Text, Textarea } from "@chakra-ui/react"
-import { Button } from "../../../components/ui/button"
+// import { FaRegEdit } from "react-icons/fa"
+// import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
+// import { Field, Stack, Text, Textarea } from "@chakra-ui/react"
+// import { Button } from "../../../components/ui/button"
+// import { useUpdateAboutUsMutation } from "../../../Redux/Service/manage.aboutus.service"
+
+// function AboutUsAddModel() {
+
+//     const [ updateAboutUs ] = useUpdateAboutUsMutation()
+
+
+//     try {
+//         const res = updateAboutUs({id:2, updatedData:''})
+//         console.log(res);
+
+
+//     } catch (error) {
+
+//     }
+
+
+
+
+//     return (
+
+//         <DialogRoot placement="center">
+//             <DialogTrigger asChild>
+//                 {/* <Button bg={"transparent"} size="sm">
+//                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
+//                 </Button> */}
+//                 <Button bgColor={'#EEEEEE'} pl={3} pr={3} size={'xs'} color={'#000'}> <FaRegEdit color="#000" style={{ height: '14px', width: '14px' }} /> <Text color={"#000"} mt={1}>Edit</Text></Button>
+
+//             </DialogTrigger>
+
+//             <DialogContent
+//                 bg={"#fff"}
+//                 // w={{ lg: "60%", md: "230px" }}
+//                 w={{ base: '90%', md: '400px' }}
+//                 height={"auto"}
+
+//                 p={3} // Reduced padding
+//                 bgSize={'md'}
+//             >
+//                 <DialogHeader bg="white" >
+//                     <DialogTitle alignSelf="center" color="black" fontSize="14px">Edit</DialogTitle>
+//                 </DialogHeader>
+
+//                 <DialogBody bg="white">
+//                     <Stack py={3} >
+
+//                         <Field.Root>
+//                             <Field.Label color="black" pt={1} fontSize="12px">AboutUs</Field.Label>
+//                             <Textarea placeholder="" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" pt={1.5} />
+//                         </Field.Root>
+//                     </Stack>
+//                 </DialogBody>
+//                 <DialogFooter display="flex" justifyContent="center" pt={"2"}>
+//                     <Button w="100%" bg="#02A0A0" color={"#fff"}>
+//                         Save
+//                     </Button>
+//                 </DialogFooter>
+
+//                 <DialogCloseTrigger color="black" />
+//             </DialogContent>
+//         </DialogRoot >
+
+//     )
+// }
+
+// export default AboutUsAddModel
+
+
+import React, { useState } from "react";
+import { FaRegEdit } from "react-icons/fa";
+import {
+    DialogBody,
+    DialogCloseTrigger,
+    DialogContent,
+    DialogFooter,
+    DialogHeader,
+    DialogRoot,
+    DialogTitle,
+    DialogTrigger,
+} from "../../../components/ui/dialog";
+import { Field, Stack, Text, Textarea } from "@chakra-ui/react";
+import { Button } from "../../../components/ui/button";
+import { useUpdateAboutUsMutation } from "../../../Redux/Service/manage.aboutus.service";
 
 function AboutUsAddModel() {
-    return (
+    const [content, setContent] = useState(""); // State for the textarea input
+    const [updateAboutUs, { isLoading }] = useUpdateAboutUsMutation(); // Mutation for updating About Us
+    //   const toast = useToast(); // Toast for feedback
 
+    // Handle form submission
+    const handleSubmit = async (e: any) => {
+        e.preventDefault(); // Prevent default form submission
+
+        try {
+            // Call the updateAboutUs mutation
+            const res = await updateAboutUs({ id: 2, updatedData: content }).unwrap();
+            console.log(res);
+
+            // Show success toast
+            //   toast({
+            //     title: "Success",
+            //     description: "About Us content updated successfully",
+            //     status: "success",
+            //     duration: 5000,
+            //     isClosable: true,
+            //   });
+
+            // Clear the input field after successful submission
+            setContent("");
+        } catch (error) {
+            // Show error toast
+            //   toast({
+            //     title: "Error",
+            //     description: "Failed to update About Us content",
+            //     status: "error",
+            //     duration: 5000,
+            //     isClosable: true,
+            //   });
+        }
+    };
+
+    return (
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                {/* <Button bg={"transparent"} size="sm">
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
-                </Button> */}
-                <Button bgColor={'#EEEEEE'} pl={3} pr={3} size={'xs'} color={'#000'}> <FaRegEdit color="#000" style={{ height: '14px', width: '14px' }} /> <Text color={"#000"} mt={1}>Edit</Text></Button>
-
+                <Button bgColor="#EEEEEE" pl={3} pr={3} size="xs" color="#000">
+                    <FaRegEdit color="#000" style={{ height: "14px", width: "14px" }} />
+                    <Text color="#000" mt={1}>
+                        Edit
+                    </Text>
+                </Button>
             </DialogTrigger>
 
             <DialogContent
-                bg={"#fff"}
-                // w={{ lg: "60%", md: "230px" }}
-                w={{ base: '90%', md: '400px' }}
-                height={"auto"}
-
-                p={3} // Reduced padding
-                bgSize={'md'}
+                bg="#fff"
+                w={{ base: "90%", md: "400px" }}
+                height="auto"
+                p={3}
             >
-                <DialogHeader bg="white" >
-                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Edit</DialogTitle>
+                <DialogHeader bg="white">
+                    <DialogTitle alignSelf="center" color="black" fontSize="14px">
+                        Edit
+                    </DialogTitle>
                 </DialogHeader>
 
                 <DialogBody bg="white">
-                    <Stack py={3} >
-
+                    <Stack py={3}>
                         <Field.Root>
-                            <Field.Label color="black" pt={1} fontSize="12px">AboutUs</Field.Label>
-                            <Textarea placeholder="" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" pt={1.5} />
+                            <Field.Label color="black" pt={1} fontSize="12px">
+                                AboutUs
+                            </Field.Label>
+                            <Textarea
+                                placeholder="Enter About Us content"
+                                bgColor="#EEEEEE"
+                                color="black"
+                                border="none"
+                                pl={1}
+                                fontSize="12px"
+                                height="100px" // Increased height for better usability
+                                pt={1.5}
+                                value={content} // Bind the state to the textarea
+                                onChange={(e) => setContent(e.target.value)} // Update state on change
+                            />
                         </Field.Root>
                     </Stack>
                 </DialogBody>
-                <DialogFooter display="flex" justifyContent="center" pt={"2"}>
-                    <Button w="100%" bg="#02A0A0" color={"#fff"}>
+
+                <DialogFooter display="flex" justifyContent="center" pt="2">
+                    <Button
+                        w="100%"
+                        bg="#02A0A0"
+                        color="#fff"
+                        onClick={handleSubmit} // Trigger handleSubmit on button click
+                    // isLoading={isLoading} // Show loading state while the mutation is in progress
+                    >
                         Save
                     </Button>
                 </DialogFooter>
 
                 <DialogCloseTrigger color="black" />
             </DialogContent>
-        </DialogRoot >
-
-    )
+        </DialogRoot>
+    );
 }
 
-export default AboutUsAddModel
\ No newline at end of file
+export default AboutUsAddModel;
\ No newline at end of file
diff --git a/src/Redux/Service/manage.aboutus.service.ts b/src/Redux/Service/manage.aboutus.service.ts
index 300f497..0e55fbb 100644
--- a/src/Redux/Service/manage.aboutus.service.ts
+++ b/src/Redux/Service/manage.aboutus.service.ts
@@ -24,18 +24,18 @@ export const aboutUs = createApi({
 
     // 🔹 POST: Create a new post
     createPost: builder.mutation<Post, Partial<Post>>({
-      query: (newPost) => ({
+      query: (data) => ({
         url: "/posts",
         method: "POST",
-        body: newPost,
+        body: data,
       }),
     }),
 
     // 🔹 PUT: Update an existing post
-    updatePost: builder.mutation<Post, { id: number; updatedData: Partial<Post> }>({
+    updateAboutUs: builder.mutation<UpdateAboutUsResponse, UpdateAboutUsRequest>({
       query: ({ id, updatedData }) => ({
         url: `/posts/${id}`,
-        method: "PUT",
+        method: "POST",
         body: updatedData,
       }),
     }),
@@ -52,6 +52,7 @@ export const aboutUs = createApi({
 
 export const { 
   useGetAboutUsQuery, 
+  useUpdateAboutUsMutation,
 
 
 
@@ -64,8 +65,7 @@ export const {
 
   
   useGetPostByIdQuery, 
-  useCreatePostMutation, 
-  useUpdatePostMutation, 
+  useCreatePostMutation,  
   useDeletePostMutation 
 } = aboutUs;
 
@@ -77,6 +77,16 @@ export type Post = {
 };
 
 
+export type UpdateAboutUsRequest={
+  id: number; updatedData: string
+}
+
+
+export type UpdateAboutUsResponse={
+  id: number; updatedData: string
+}
+
+
 export type AboutUs = {
   id: number;
   language_master_xid: number;

From 84a64c9ae6f72d1fb46d0d11a94f596376635d68 Mon Sep 17 00:00:00 2001
From: "parth.ramani" <parth.ramani@wdimails.com>
Date: Wed, 12 Feb 2025 12:04:00 +0530
Subject: [PATCH 2/4] worked on the aboutus

---
 src/Pages/ManageCMS/AboutUs/AboutUs.tsx | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/Pages/ManageCMS/AboutUs/AboutUs.tsx b/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
index 89a481e..acc13b6 100644
--- a/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
+++ b/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
@@ -1,15 +1,17 @@
-import { Box, Center, HStack, Skeleton, Spinner, Text } from "@chakra-ui/react";
+import { Box, HStack, Skeleton, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
-import { p } from "framer-motion/client";
 import AboutUsAddModel from "../../ManageCMS/AboutUs/AboutUsAddModel";
 import { useGetAboutUsQuery } from "../../../Redux/Service/manage.aboutus.service";
 
-interface AboutUs {
+interface AboutUsContent {
   content: string;
 }
 
 interface ApiResponse {
-  data: AboutUs[];
+  data: AboutUsContent[];
+}
+interface AboutUs {
+  content: string;
 }
 
 
@@ -18,13 +20,18 @@ const AboutUs = () => {
   // const {
   //   data: data
   // } = useGetAboutUsQuery()
-  // const { data: response, isLoading } = useGetAboutUsQuery<{ data: ApiResponse }>();
-  const { data: response, isLoading } = useGetAboutUsQuery<ApiResponse>();
+  // const { data: response,isLoading, } = useGetAboutUsQuery<{ data: ApiResponse }>();
+
+  // Simple way to fetch data
+  const { data } = useGetAboutUsQuery();
+
+  // Safely access the first content item
+  const content = data?.data?.[0]?.content;
   console.log('====================================');
   console.log(response);
   console.log('====================================');
 
-  const content = response?.data?.[0]?.content;
+  // const content = response?.data?.[0]?.content;
 
   return (
 

From 0bd8cc6434f6cfe1d8e571f80c54215bbb1af1bf Mon Sep 17 00:00:00 2001
From: "Siddhesh.More" <siddhesh.more@wdimails.com>
Date: Wed, 12 Feb 2025 12:27:53 +0530
Subject: [PATCH 3/4] update types folder

---
 .../ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx | 12 +---
 src/Redux/Service/privacy.policy.service.ts   | 66 ++-----------------
 src/Types/privacyPolicyTypes.tsx              | 12 ++++
 3 files changed, 20 insertions(+), 70 deletions(-)
 create mode 100644 src/Types/privacyPolicyTypes.tsx

diff --git a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
index f33ba9c..94b6f41 100644
--- a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
+++ b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
@@ -3,20 +3,10 @@ import MainFrame from "../../../components/MainFrame";
 import PrivacyPolicyAddModel from "./PrivacyPolicyAddModel";
 import { useGetPrivacyPolicyQuery } from "../../../Redux/Service/privacy.policy.service";
 
-// Define interfaces
-interface PrivacyPolicyContent {
-  id: number;
-  content: string;
-}
-
-interface ApiResponse {
-  data: {data:PrivacyPolicyContent[]};
-  isLoading: boolean
-}
 
 const PrivacyPolicy = () => {
   // Fetch data using RTK Query with type annotations
-  const { data, isLoading } = useGetPrivacyPolicyQuery<ApiResponse>();
+  const { data, isLoading } = useGetPrivacyPolicyQuery();
 
   console.log(isLoading);
   
diff --git a/src/Redux/Service/privacy.policy.service.ts b/src/Redux/Service/privacy.policy.service.ts
index b2e0bbb..52ba4d8 100644
--- a/src/Redux/Service/privacy.policy.service.ts
+++ b/src/Redux/Service/privacy.policy.service.ts
@@ -1,68 +1,16 @@
-import { createApi } from "@reduxjs/toolkit/query/react"; // Fix import
-import { baseQueryWithReauth } from "./apiSlice";
-
-
-
+import { createApi } from "@reduxjs/toolkit/query/react";
+import { baseQueryWithReauth } from "./apiSlice"; // Ensure this is correctly configured
+import { PrivacyPolicyResponse } from "../../Types/privacyPolicyTypes";
 
 export const privacyPolicy = createApi({
   reducerPath: "privacyPolicy",
-  baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
+  baseQuery: baseQueryWithReauth, // Ensure this returns a valid `BaseQueryFn`
   endpoints: (builder) => ({
-    // 🔹 GET: Fetch all privacy policies
-    getPrivacyPolicy: builder.query<PrivacyPolicy[], void>({
+    getPrivacyPolicy: builder.query<PrivacyPolicyResponse, void>({ // Fix types here
       query: () => "/privacy-policy",
     }),
-
-    // 🔹 GET: Fetch a single post by ID
-    // getPostById: builder.query<Post, number>({
-    //   query: (id) => `/posts/${id}`,
-    // }),
-
-    // 🔹 POST: Create a new post
-    // createPost: builder.mutation<Post, Partial<Post>>({
-    //   query: (newPost) => ({
-    //     url: "/posts",
-    //     method: "POST",
-    //     body: newPost,
-    //   }),
-    // }),
-
-    // 🔹 PUT: Update an existing post
-    // updatePost: builder.mutation<Post, { id: number; updatedData: Partial<Post> }>({
-    //   query: ({ id, updatedData }) => ({
-    //     url: `/posts/${id}`,
-    //     method: "PUT",
-    //     body: updatedData,
-    //   }),
-    // }),
-
-    // 🔹 DELETE: Remove a post by ID
-    // deletePost: builder.mutation<{ success: boolean }, number>({
-    //   query: (id) => ({
-    //     url: `/posts/${id}`,
-    //     method: "DELETE",
-    //   }),
-    // }),
   }),
 });
 
-// Export hooks for usage in components
-export const {
-  useGetPrivacyPolicyQuery, // Export the correct hook
-  
-} = privacyPolicy;
-
-
-// Define types at the top for better readability
-export type Post = {
-  id: number;
-  title: string;
-  body: string;
-};
-
-export type PrivacyPolicy = {
-  id: number;
-  language_master_xid: number;
-  content: string;
-  is_active: boolean;
-};
\ No newline at end of file
+// Export hook
+export const { useGetPrivacyPolicyQuery } = privacyPolicy;
diff --git a/src/Types/privacyPolicyTypes.tsx b/src/Types/privacyPolicyTypes.tsx
new file mode 100644
index 0000000..d5a8493
--- /dev/null
+++ b/src/Types/privacyPolicyTypes.tsx
@@ -0,0 +1,12 @@
+export type PrivacyPolicy<T> = {
+  success: boolean;
+  message: string;
+  data: T;
+};
+
+export interface PrivacyPolicyContent {
+  id: number;
+  content: string;
+}
+
+export type PrivacyPolicyResponse = PrivacyPolicy<PrivacyPolicyContent[]>; // Fix here

From 066238b3340345aab9e959c59e752200e3eb6e05 Mon Sep 17 00:00:00 2001
From: "Siddhesh.More" <siddhesh.more@wdimails.com>
Date: Wed, 12 Feb 2025 12:34:31 +0530
Subject: [PATCH 4/4] updsate

---
 src/Types/privacyPolicyTypes.tsx | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Types/privacyPolicyTypes.tsx b/src/Types/privacyPolicyTypes.tsx
index d5a8493..fce8cb3 100644
--- a/src/Types/privacyPolicyTypes.tsx
+++ b/src/Types/privacyPolicyTypes.tsx
@@ -1,12 +1,13 @@
-export type PrivacyPolicy<T> = {
-  success: boolean;
-  message: string;
-  data: T;
-};
-
 export interface PrivacyPolicyContent {
   id: number;
+  language_master_xid: number;
   content: string;
+  is_active: boolean;
 }
 
-export type PrivacyPolicyResponse = PrivacyPolicy<PrivacyPolicyContent[]>; // Fix here
+export interface PrivacyPolicyResponse {
+  status: "success" | "error"; // Assuming it can be "success" or "error"
+  status_code: number;
+  message: string;
+  data: PrivacyPolicyContent[];
+}
\ No newline at end of file