From 178b223d41e3de04bf4b6a6a1742603d912dbab8 Mon Sep 17 00:00:00 2001 From: rockyeverlast Date: Wed, 5 Jun 2024 15:10:10 +0530 Subject: [PATCH] Fixed useCases issues and updated navBar --- src/Redux/slice/useCaseSlice.js | 2 +- src/assets/images/Navicons/events.png | Bin 0 -> 1832 bytes src/assets/images/Navicons/news.png | Bin 0 -> 1550 bytes src/assets/images/Navicons/resources.png | Bin 0 -> 2323 bytes src/components/Card/HomeCard.jsx | 4 +- src/components/MobileMenu/MobileMenu.jsx | 2 +- src/components/NavBar/NavBar.jsx | 14 ++- .../tabInsideContent/TabsVideo.jsx | 2 +- .../ResourcesPage/tableContent/VideoTable.jsx | 2 +- src/components/UseCase/NewUseCase.jsx | 88 ++++-------------- .../VideoInternal/VideoInternal.jsx | 2 +- src/index.css | 4 + src/routes/_routes.jsx | 12 +-- 13 files changed, 44 insertions(+), 88 deletions(-) create mode 100644 src/assets/images/Navicons/events.png create mode 100644 src/assets/images/Navicons/news.png create mode 100644 src/assets/images/Navicons/resources.png diff --git a/src/Redux/slice/useCaseSlice.js b/src/Redux/slice/useCaseSlice.js index da95448..bab7394 100644 --- a/src/Redux/slice/useCaseSlice.js +++ b/src/Redux/slice/useCaseSlice.js @@ -1,7 +1,7 @@ import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'; export const useCaseApi = createApi({ - reducerPath: 'UseCases/:title_slug', + reducerPath: 'UseCases', baseQuery: fetchBaseQuery({ baseUrl: 'https://rubix.betadelivery.com/api/' }), endpoints: (builder) => ({ getUseCase: builder.query({ diff --git a/src/assets/images/Navicons/events.png b/src/assets/images/Navicons/events.png new file mode 100644 index 0000000000000000000000000000000000000000..a5c283f8cd2bd74ed8c3ad6771cf48cef2845362 GIT binary patch literal 1832 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 { src={`https://rubix.betadelivery.com/${card.content_image_large}`} /> - {blogCards?.tags?.map((tag, index) => ( + {card?.tags?.map((tag, index) => ( ))} @@ -66,7 +66,7 @@ const HomeCard = ({ cardkey, date, text, link }) => { }) .replace(/\//g, "-"); return ( - + {formattedDate} ); diff --git a/src/components/MobileMenu/MobileMenu.jsx b/src/components/MobileMenu/MobileMenu.jsx index 51b9012..65d5630 100644 --- a/src/components/MobileMenu/MobileMenu.jsx +++ b/src/components/MobileMenu/MobileMenu.jsx @@ -28,7 +28,7 @@ export const MobileMenu = () => { const { data } = useGetUseCaseQuery(); // console.log(data); const useCase = data?.data?.rows; - console.log(useCase); + // console.log(useCase); const highlight = { color: "rgb(222, 133, 142)", diff --git a/src/components/NavBar/NavBar.jsx b/src/components/NavBar/NavBar.jsx index 578de9b..c5119bc 100644 --- a/src/components/NavBar/NavBar.jsx +++ b/src/components/NavBar/NavBar.jsx @@ -33,6 +33,9 @@ import marTech from "../../assets/images/Navicons/marTech.png"; import healthTech from "../../assets/images/Navicons/healthTech.png"; import security from "../../assets/images/Navicons/security.png"; import telecom from "../../assets/images/Navicons/telecom.png"; +import news from "../../assets/images/Navicons/news.png"; +import events from "../../assets/images/Navicons/events.png"; +import resources from "../../assets/images/Navicons/resources.png"; import { useGetUseCaseQuery } from "../../Redux/slice/useCaseSlice"; const NavBar = () => { @@ -516,10 +519,11 @@ const NavBar = () => { style={{ flexBasis: "calc(50% - 1rem)" }} > { gap={"1rem"} marginBottom={"1rem"} > - + News @@ -675,7 +679,7 @@ const NavBar = () => { gap={"1rem"} marginBottom={"1rem"} > - + Resources @@ -695,7 +699,7 @@ const NavBar = () => { gap={"1rem"} marginBottom={"1rem"} > - + Events diff --git a/src/components/ResourcesPage/tabInsideContent/TabsVideo.jsx b/src/components/ResourcesPage/tabInsideContent/TabsVideo.jsx index 0c34d84..be9afc1 100644 --- a/src/components/ResourcesPage/tabInsideContent/TabsVideo.jsx +++ b/src/components/ResourcesPage/tabInsideContent/TabsVideo.jsx @@ -111,7 +111,7 @@ const TabsVideo = () => { > {videos?.slice(0, 3).map((item) => ( - + { zIndex: "2", }} > - +