diff --git a/src/Pages/ManageCMS/AboutUs/AboutUs.tsx b/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
index 7eba327..901287a 100644
--- a/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
+++ b/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
@@ -1,15 +1,17 @@
-import { Box, HStack, Skeleton, Text } from "@chakra-ui/react";
+import { Box, HStack, Skeleton, Text, VStack } from "@chakra-ui/react";
import MainFrame from "../../../components/MainFrame"
import AboutUsAddModel from "../../ManageCMS/AboutUs/AboutUsAddModel";
import { useGetAboutUsQuery } from "../../../Redux/Service/manage.aboutus.service";
+import { Spinner } from "../../../components/Sipnner/Spinner";
+import PrivacyPolicySkeleton from "../PrivacyPolicy/PrivacyPolicySkeleton";
const AboutUs = () => {
- const { data, isLoading } = useGetAboutUsQuery();
+ const { data, isLoading, isFetching } = useGetAboutUsQuery();
- const content = data?.data?.[0]?.content
+ // const content = data?.data
console.log('====================================');
console.log(data);
console.log('====================================');
@@ -18,56 +20,41 @@ const AboutUs = () => {
return (
-
-
-
- AboutUs
-
-
+ {isLoading ? :
+
+ {data?.data?.map(({ id, content }, index) =>
+
-
-
- {/* Show Skeleton until content is available */}
- {isLoading || !content ? (
-
-
-
-
-
-
-
-
-
-
-
- ) : (
-
- {content}
-
- )}
- {/*
- {content}
- */}
- {/*
- 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?
- */}
-
+ py={0}
+ px={0}
+ >
+
+ About Us
+
+ {/* */}
+
+
+
+
+ {/* Render multiple skeletons or content based on loading state */}
+ {isFetching || !content ? (
+
+ ) : (
+
+ {content}
+
+ )}
+ )}
+ }
)
}
diff --git a/src/Pages/ManageCMS/AboutUs/AboutUsAddModel.tsx b/src/Pages/ManageCMS/AboutUs/AboutUsAddModel.tsx
index 301c0de..cee36c1 100644
--- a/src/Pages/ManageCMS/AboutUs/AboutUsAddModel.tsx
+++ b/src/Pages/ManageCMS/AboutUs/AboutUsAddModel.tsx
@@ -1,76 +1,3 @@
-// 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 (
-
-//
-//
-// {/* */}
-//
-
-//
-
-//
-//
-// Edit
-//
-
-//
-//
-
-//
-// AboutUs
-//
-//
-//
-//
-//
-//
-//
-
-//
-//
-//
-
-// )
-// }
-
-// export default AboutUsAddModel
-
-
-import React, { useState } from "react";
import { FaRegEdit } from "react-icons/fa";
import {
DialogBody,
@@ -84,44 +11,8 @@ import {
} 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 [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 (
@@ -161,8 +52,6 @@ function AboutUsAddModel() {
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
/>
@@ -173,7 +62,6 @@ function AboutUsAddModel() {
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
diff --git a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
index f40d471..73389e4 100644
--- a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
+++ b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
@@ -1,12 +1,14 @@
-import { Box, HStack, Text, Skeleton } from "@chakra-ui/react";
+import { Box, HStack, Text, Skeleton, VStack } from "@chakra-ui/react";
import MainFrame from "../../../components/MainFrame";
import PrivacyPolicyAddModel from "./PrivacyPolicyAddModel";
import { useGetPrivacyPolicyQuery } from "../../../Redux/Service/privacy.policy.service";
+import PrivacyPolicySkeleton from "./PrivacyPolicySkeleton";
+import { Spinner } from "../../../components/Sipnner/Spinner";
const PrivacyPolicy = () => {
// Fetch data using RTK Query with type annotations
- const { data, isLoading } = useGetPrivacyPolicyQuery();
+ const { data, isLoading, isFetching } = useGetPrivacyPolicyQuery();
console.log(isLoading);
@@ -16,51 +18,42 @@ const PrivacyPolicy = () => {
console.log(data);
console.log("====================================");
- // Extract content array from the response
- const content = data?.data?.[0]?.content;
return (
-
-
-
-
- Privacy Policy
-
+
+ {isLoading ? :
+
+ {data?.data?.map(({ id, content }, index) =>
+
-
-
-
+ py={0}
+ px={0}
+ >
+
+ Privacy Policy
+
- {/* Render multiple skeletons or content based on loading state */}
- {isLoading || !content ? (
-
-
-
-
-
-
-
- ) : (
-
- {content}
-
- )}
-
+
+
+
+ {/* Render multiple skeletons or content based on loading state */}
+ {isFetching || !content ? (
+
+ ) : (
+
+ {content}
+
+ )}
+ )}
+ }
);
};
diff --git a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx
index 05eacd1..92503df 100644
--- a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx
+++ b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx
@@ -11,7 +11,7 @@ function PrivacyPolicyAddModel() {
{/* */}
-
+
diff --git a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicySkeleton.tsx b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicySkeleton.tsx
new file mode 100644
index 0000000..e65d4a9
--- /dev/null
+++ b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicySkeleton.tsx
@@ -0,0 +1,15 @@
+import { Box, Skeleton } from '@chakra-ui/react'
+
+const PrivacyPolicySkeleton = () => {
+ return (
+
+
+
+
+
+
+
+ )
+}
+
+export default PrivacyPolicySkeleton
\ 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 1465b2f..dac7113 100644
--- a/src/Redux/Service/manage.aboutus.service.ts
+++ b/src/Redux/Service/manage.aboutus.service.ts
@@ -78,12 +78,12 @@ export type Post = {
export type UpdateAboutUsRequest={
- id: number; updatedData: string
+ id: number; updatedData: string,language_code:string
}
export type UpdateAboutUsResponse={
- id: number; updatedData: string
+ id: number; updatedData: string,language_code:string
}
diff --git a/src/components/MainFrame.tsx b/src/components/MainFrame.tsx
index d6a3404..79ce468 100644
--- a/src/components/MainFrame.tsx
+++ b/src/components/MainFrame.tsx
@@ -9,19 +9,20 @@ const MotionVStack = motion(VStack)
interface MainFrameProps {
children: React.ReactNode
title?: string
+ transperant?:boolean
}
-const MainFrame: FC = ({ children }) => {
+const MainFrame: FC = ({ children, transperant }) => {
return (
-
+
{children}