From 0f92953afc4837f7d878854b12c287fabcdd28c0 Mon Sep 17 00:00:00 2001 From: rockyeverlast Date: Wed, 15 May 2024 17:39:01 +0530 Subject: [PATCH] partner card slice api integrated --- src/Redux/slice/learPageSlice.js | 5 +++- src/Redux/store/store.js | 2 +- src/components/BuildPage/BuildBanner.jsx | 19 +++++++++++-- src/components/Card/LearnCard.jsx | 9 +++--- src/components/Community/CommunityBanner.jsx | 5 +++- src/components/HomePage/HomeBanner.jsx | 11 ++++++- src/components/LearnPage/LearnBanner.jsx | 8 ++++-- src/components/LearnPage/LearnDev.jsx | 18 +++++++----- src/components/MobileMenu/MobileMenu.jsx | 30 ++++++++++++++++---- src/pages/BuildPage.jsx | 4 +-- 10 files changed, 84 insertions(+), 27 deletions(-) diff --git a/src/Redux/slice/learPageSlice.js b/src/Redux/slice/learPageSlice.js index ff2579a..18405eb 100644 --- a/src/Redux/slice/learPageSlice.js +++ b/src/Redux/slice/learPageSlice.js @@ -10,7 +10,10 @@ export const learnPageApi = createApi({ getLearnFaq: builder.query({ query: () => 'faq/active', }), + getpartnerCard: builder.query({ + query: () => 'card/active', + }), }), }); -export const { useGetLearnPageQuery, useGetLearnFaqQuery } = learnPageApi; +export const { useGetLearnPageQuery, useGetLearnFaqQuery, useGetpartnerCardQuery } = learnPageApi; diff --git a/src/Redux/store/store.js b/src/Redux/store/store.js index aebae9d..266d4af 100644 --- a/src/Redux/store/store.js +++ b/src/Redux/store/store.js @@ -37,7 +37,7 @@ const store = configureStore({ learnPageApi.middleware, homePageApi.middleware, eventsViewApi.middleware, - useCaseApi.middleware + useCaseApi.middleware, ), // Add blogApi.middleware here }); diff --git a/src/components/BuildPage/BuildBanner.jsx b/src/components/BuildPage/BuildBanner.jsx index 0889afb..a93e6aa 100644 --- a/src/components/BuildPage/BuildBanner.jsx +++ b/src/components/BuildPage/BuildBanner.jsx @@ -3,6 +3,7 @@ import { Box, Button, Container, Text } from "@chakra-ui/react"; import banner from "../../assets/images/BuildBanner.webp"; import { Link } from "react-router-dom"; +import Loader from "../Loader/Loader"; const BannerContent = [ { @@ -18,7 +19,14 @@ const BannerContent = [ }, ]; -const BuildBanner = ({ data }) => { +const BuildBanner = ({ data, isLoading }) => { + if (isLoading) { + return ( +
+ +
+ ); + } return ( <> {data?.map((item) => ( @@ -29,7 +37,9 @@ const BuildBanner = ({ data }) => { backgroundRepeat={"no-repeat"} backgroundSize={"cover"} display={"grid"} - placeContent={"center"} + // placeContent={"center"} + alignContent={"center"} + justifyContent={"start"} sx={{ "@media (max-width: 1024px)": { height: "70vh", @@ -49,8 +59,11 @@ const BuildBanner = ({ data }) => { maxW="container.xl" textAlign={"left"} marginTop={"2rem"} - paddingLeft={"3.5rem"} + paddingLeft={"6.5rem"} sx={{ + "@media (max-width: 1024px)": { + paddingLeft: "2.5rem", // Correctly target paddingLeft instead of padding + }, "@media (max-width: 500px)": { paddingLeft: "1rem", // Correctly target paddingLeft instead of padding }, diff --git a/src/components/Card/LearnCard.jsx b/src/components/Card/LearnCard.jsx index 7ee8306..bfe2a3b 100644 --- a/src/components/Card/LearnCard.jsx +++ b/src/components/Card/LearnCard.jsx @@ -3,7 +3,7 @@ import { Box, Container, Text, Image, Button } from "@chakra-ui/react"; import { Link } from "react-router-dom"; -const LearnCard = ({ id, src, alt, text, href }) => { +const LearnCard = ({ id, src, text, href }) => { return ( {/* {images.map((img) => ( @@ -36,8 +36,8 @@ const LearnCard = ({ id, src, alt, text, href }) => { > {alt} { /> - { maxW="container.xl" textAlign={"left"} marginTop={"2rem"} - paddingLeft={"3.5rem"} + paddingLeft={"6.5rem"} sx={{ + "@media (max-width: 1024px)": { + paddingLeft: "2.5rem", // Correctly target paddingLeft instead of padding + }, "@media (max-width: 500px)": { paddingLeft: "1rem", // Correctly target paddingLeft instead of padding }, diff --git a/src/components/HomePage/HomeBanner.jsx b/src/components/HomePage/HomeBanner.jsx index 47bb62a..d70a532 100644 --- a/src/components/HomePage/HomeBanner.jsx +++ b/src/components/HomePage/HomeBanner.jsx @@ -5,6 +5,7 @@ import { useMediaQuery } from "@chakra-ui/react"; import banner from "../../assets/images/bannerBg.gif"; import { Link } from "react-router-dom"; import { useGetHomePageQuery } from "../../Redux/slice/homeSlice"; +import Loader from "../Loader/Loader"; const BannerContent = [ { @@ -22,9 +23,17 @@ const BannerContent = [ const HomeBanner = () => { const { data, isLoading, error } = useGetHomePageQuery(); - console.log(data?.data?.data); + console.log(data); const HomeBanner = data?.data?.data; + if (isLoading) { + return ( +
+ +
+ ); + } + return ( <> {HomeBanner?.map((item) => ( diff --git a/src/components/LearnPage/LearnBanner.jsx b/src/components/LearnPage/LearnBanner.jsx index 3e3d5ae..2452ef0 100644 --- a/src/components/LearnPage/LearnBanner.jsx +++ b/src/components/LearnPage/LearnBanner.jsx @@ -48,7 +48,8 @@ const LearnBanner = () => { loading="lazy" backgroundSize={"cover"} display={"grid"} - placeContent={"center"} + alignContent={"center"} + justifyContent={"start"} sx={{ "@media (max-width: 1024px)": { height: "70vh", @@ -67,8 +68,11 @@ const LearnBanner = () => { maxW="container.xl" textAlign={"left"} marginTop={"2rem"} - paddingLeft={"3.5rem"} + paddingLeft={"6.5rem"} sx={{ + "@media (max-width: 1024px)": { + paddingLeft: "2.5rem", // Correctly target paddingLeft instead of padding + }, "@media (max-width: 500px)": { paddingLeft: "1rem", // Correctly target paddingLeft instead of padding }, diff --git a/src/components/LearnPage/LearnDev.jsx b/src/components/LearnPage/LearnDev.jsx index 1d1d55b..2cdaf78 100644 --- a/src/components/LearnPage/LearnDev.jsx +++ b/src/components/LearnPage/LearnDev.jsx @@ -7,6 +7,7 @@ import exr from "../../assets/images/LearnCard5.png"; import finalo from "../../assets/images/LearnCard1.png"; import jupiter from "../../assets/images/LearnCard3.png"; import { useMediaQuery } from "@chakra-ui/react"; +import { useGetpartnerCardQuery } from "../../Redux/slice/learPageSlice"; // import { Badge } from "@chakra-ui/react"; @@ -55,6 +56,9 @@ const Content = { const LearnDev = () => { const [isSmallScreen] = useMediaQuery("(max-width: 996px)"); + const { data, isLoading, error } = useGetpartnerCardQuery(); + const partnerCard = data?.data?.data; + console.log(partnerCard); return ( { fontSize: "22px", fontWeight: "400", marginBottom: "30px", - padding:'1rem', - paddingBottom:'0px' + padding: "1rem", + paddingBottom: "0px", }, }} > @@ -110,13 +114,13 @@ const LearnDev = () => { }, }} > - {content.map((item) => ( + {partnerCard?.map((item) => ( ))} diff --git a/src/components/MobileMenu/MobileMenu.jsx b/src/components/MobileMenu/MobileMenu.jsx index ed3ea50..ab9747f 100644 --- a/src/components/MobileMenu/MobileMenu.jsx +++ b/src/components/MobileMenu/MobileMenu.jsx @@ -19,12 +19,17 @@ import { Button } from "@chakra-ui/react"; // import { HashLink } from "react-router-hash-link"; import logo from "../../assets/images/rubix.png"; import { useEffect, useState } from "react"; +import { useGetUseCaseQuery } from "../../Redux/slice/useCaseSlice"; export const MobileMenu = () => { const [isScrolled, setIsScrolled] = useState(false); const [menu, setMenu] = useState(false); const location = useLocation(); + const { data } = useGetUseCaseQuery(); + console.log(data); + const useCase = data?.data?.rows; + const handleClick = () => { setMenu(!menu); }; @@ -247,10 +252,25 @@ export const MobileMenu = () => { - - FinTech - - ( + + {slug.title} + + ))} + + {/* { onClick={handleClick} > Telecom - + */} diff --git a/src/pages/BuildPage.jsx b/src/pages/BuildPage.jsx index 9fd056d..d44db97 100644 --- a/src/pages/BuildPage.jsx +++ b/src/pages/BuildPage.jsx @@ -11,7 +11,7 @@ import MobileSolve from "../components/MobileComponent/MobileSolve"; import { useGetBuildPageQuery } from "../Redux/slice/bannerSlice"; const BuildPage = () => { - const { data } = useGetBuildPageQuery(); + const { data, isLoading } = useGetBuildPageQuery(); const buildBanner = data?.data?.data; console.log(buildBanner); @@ -38,7 +38,7 @@ const BuildPage = () => { return ( <> - + {!isMobile ? : } {!isMobile ? : }