From 5ae4660507fab3c812798fea66e6ba006291b019 Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Tue, 11 Feb 2025 15:32:37 +0530 Subject: [PATCH 1/2] update --- dev-dist/sw.js | 2 +- src/Pages/Login.tsx | 2 +- src/Routes/Routes.ts | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-dist/sw.js b/dev-dist/sw.js index 2892c8c..24a967b 100644 --- a/dev-dist/sw.js +++ b/dev-dist/sw.js @@ -82,7 +82,7 @@ define(['./workbox-54d0af47'], (function (workbox) { 'use strict'; "revision": "3ca0b8505b4bec776b69afdba2768812" }, { "url": "index.html", - "revision": "0.s1fup7lrbig" + "revision": "0.f3u8hds6p7" }], {}); workbox.cleanupOutdatedCaches(); workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), { diff --git a/src/Pages/Login.tsx b/src/Pages/Login.tsx index 77c63cf..512f1fe 100644 --- a/src/Pages/Login.tsx +++ b/src/Pages/Login.tsx @@ -61,7 +61,7 @@ const Login = () => { console.log('===================================='); console.log(res.data?.data); console.log('===================================='); - navigate('/') + navigate('/dashboard') dispatch(setToken(String(res.data?.data["access-token"]))); } else { diff --git a/src/Routes/Routes.ts b/src/Routes/Routes.ts index aadb3d9..084cc1b 100644 --- a/src/Routes/Routes.ts +++ b/src/Routes/Routes.ts @@ -25,6 +25,7 @@ import DeactivatedAccounts from "../Pages/ManageUsers/DeactivatedAccounts/Deacti export const RouteLink = [ { path: "/", Component: Dashboard }, + { path: "/dashboard", Component: Dashboard }, { path: "/register-users", Component: RegisterUsers }, { path: "/deactivated-accounts", Component: DeactivatedAccounts }, { path: "/manage-post", Component: ManagePost }, From bc1d1923d21ac063f1096d709408895b7efc73f9 Mon Sep 17 00:00:00 2001 From: "parth.ramani" Date: Tue, 11 Feb 2025 17:18:28 +0530 Subject: [PATCH 2/2] get called in aboutus --- src/Pages/ManageCMS/AboutUs/AboutUs.tsx | 36 ++++++++++++++++--------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/src/Pages/ManageCMS/AboutUs/AboutUs.tsx b/src/Pages/ManageCMS/AboutUs/AboutUs.tsx index c704868..0d73b52 100644 --- a/src/Pages/ManageCMS/AboutUs/AboutUs.tsx +++ b/src/Pages/ManageCMS/AboutUs/AboutUs.tsx @@ -5,15 +5,27 @@ import AboutUsAddModel from "../../ManageCMS/AboutUs/AboutUsAddModel"; import { useGetAboutUsQuery } from "../../../Redux/Service/manage.aboutus.service"; +interface AboutUsContent { + content: string; +} + +interface ApiResponse { + data: AboutUsContent[]; +} + + const AboutUs = () => { - const { - data - } = useGetAboutUsQuery() + // const { + // data: data + // } = useGetAboutUsQuery() + const { data: response } = useGetAboutUsQuery<{ data: ApiResponse }>(); + console.log('===================================='); + console.log(response); + console.log('===================================='); + + const content = response?.data?.[0]?.content || "No content available"; - console.log('===================================='); - console.log(data); - console.log('===================================='); return ( @@ -26,21 +38,21 @@ const AboutUs = () => { px={3} > - AboutUs + AboutUs - + - 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? + {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? - - + */} + ) }