From dbde49fffa0e812dc256e378f5fc95e93003ad4b Mon Sep 17 00:00:00 2001 From: AnsariTufail <168163201+AnsariTufail@users.noreply.github.com> Date: Wed, 12 Feb 2025 11:58:17 +0530 Subject: [PATCH] Worked on the manage cms --- dev-dist/sw.js | 6 +- src/Pages/ManageCMS/AboutUs/AboutUs.tsx | 1 + .../ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx | 81 +++++++++++++------ src/Redux/Service/privacy.policy.service.ts | 1 + 4 files changed, 60 insertions(+), 29 deletions(-) diff --git a/dev-dist/sw.js b/dev-dist/sw.js index b030c08..af56fbe 100644 --- a/dev-dist/sw.js +++ b/dev-dist/sw.js @@ -82,11 +82,7 @@ define(['./workbox-54d0af47'], (function (workbox) { 'use strict'; "revision": "3ca0b8505b4bec776b69afdba2768812" }, { "url": "index.html", -<<<<<<< HEAD - "revision": "0.vu9poovgqsg" -======= - "revision": "0.f3u8hds6p7" ->>>>>>> bc1d1923d21ac063f1096d709408895b7efc73f9 + "revision": "0.iv1sobg60j" }], {}); workbox.cleanupOutdatedCaches(); workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), { diff --git a/src/Pages/ManageCMS/AboutUs/AboutUs.tsx b/src/Pages/ManageCMS/AboutUs/AboutUs.tsx index 0d73b52..cc44cd9 100644 --- a/src/Pages/ManageCMS/AboutUs/AboutUs.tsx +++ b/src/Pages/ManageCMS/AboutUs/AboutUs.tsx @@ -6,6 +6,7 @@ import { useGetAboutUsQuery } from "../../../Redux/Service/manage.aboutus.servic interface AboutUsContent { + id: number; content: string; } diff --git a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx index 6397e9f..f33ba9c 100644 --- a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx +++ b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx @@ -1,20 +1,35 @@ -import { Box, HStack, Text } from "@chakra-ui/react"; -import MainFrame from "../../../components/MainFrame" -import { p } from "framer-motion/client"; +import { Box, HStack, Text, Skeleton } from "@chakra-ui/react"; +import MainFrame from "../../../components/MainFrame"; import PrivacyPolicyAddModel from "./PrivacyPolicyAddModel"; -import { useGetPrivacyPolicyQuery } from "../../../Redux/Service/privacy.policy.service.ts"; -const PrivacyPolicy = () => { - - const { - data - } = useGetPrivacyPolicyQuery() +import { useGetPrivacyPolicyQuery } from "../../../Redux/Service/privacy.policy.service"; - console.log('============================'); +// 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(); + + console.log(isLoading); + + + // Log the response for debugging + console.log("===================================="); console.log(data); - console.log('============================'); + console.log("===================================="); + + // Extract content array from the response + const content = data?.data?.[0]?.content; return ( - { px={3} > - Privacy Policy + Privacy Policy - + - - 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? - - - 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? - - + + {/* Render multiple skeletons or content based on loading state */} + {isLoading || !content ? ( + + + + + + + + ) : ( + + {content} + + )} + - ) -} -export default PrivacyPolicy \ No newline at end of file + ); +}; + +export default PrivacyPolicy; \ No newline at end of file diff --git a/src/Redux/Service/privacy.policy.service.ts b/src/Redux/Service/privacy.policy.service.ts index 4eaf5ac..b2e0bbb 100644 --- a/src/Redux/Service/privacy.policy.service.ts +++ b/src/Redux/Service/privacy.policy.service.ts @@ -3,6 +3,7 @@ import { baseQueryWithReauth } from "./apiSlice"; + export const privacyPolicy = createApi({ reducerPath: "privacyPolicy", baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling