diff --git a/src/Redux/slice/termsSlice.js b/src/Redux/slice/termsSlice.js new file mode 100644 index 0000000..6230a22 --- /dev/null +++ b/src/Redux/slice/termsSlice.js @@ -0,0 +1,13 @@ +import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react' + +export const TermsPage = createApi({ + reducerPath: 'Terms', + baseQuery: fetchBaseQuery({ baseUrl: 'https://rubix.betadelivery.com/api/' }), + endpoints: (builder) => ({ + getTermsPage: builder.query({ + query: () => 'term-condition/active', + }), + }), +}); + +export const { useGetTermsPageQuery } = TermsPage; \ No newline at end of file diff --git a/src/Redux/store/store.js b/src/Redux/store/store.js index 7528242..88964d2 100644 --- a/src/Redux/store/store.js +++ b/src/Redux/store/store.js @@ -13,6 +13,7 @@ import { useCaseApi } from '../slice/useCaseSlice'; import { newsInternalApi } from '../slice/NewsInternalSlice'; import { ecoSystem } from '../slice/ecosystemSlice'; import { statsApi } from '../slice/statsSlice'; +import { TermsPage } from '../slice/termsSlice'; const store = configureStore({ reducer: { @@ -30,6 +31,7 @@ const store = configureStore({ [newsInternalApi.reducerPath]: newsInternalApi.reducer, [ecoSystem.reducerPath]: ecoSystem.reducer, [statsApi.reducerPath]: statsApi.reducer, + [TermsPage.reducerPath]: TermsPage.reducer, }, middleware: (getDefaultMiddleware) => getDefaultMiddleware().concat( @@ -47,6 +49,7 @@ const store = configureStore({ newsInternalApi.middleware, ecoSystem.middleware, statsApi.middleware, + TermsPage.middleware, ), // Add blogApi.middleware here }); diff --git a/src/components/EcoPage/EcoBanner.jsx b/src/components/EcoPage/EcoBanner.jsx index 4ffdb5b..3af4430 100644 --- a/src/components/EcoPage/EcoBanner.jsx +++ b/src/components/EcoPage/EcoBanner.jsx @@ -126,7 +126,7 @@ const EcoBanner = () => { cursor={"pointer"} transition="0.3s ease-in-out" color={"#fff"} - width={"216px"} + width={"auto"} marginTop={"2rem"} height={"56px"} fontFamily={"Poppins"} diff --git a/src/components/Footer/Footer.jsx b/src/components/Footer/Footer.jsx index 159d1e1..c855158 100644 --- a/src/components/Footer/Footer.jsx +++ b/src/components/Footer/Footer.jsx @@ -382,18 +382,16 @@ const Footer = () => { > - - - All rights reserved. - - + + All rights reserved. + - + { - + { onMouseLeave={() => setIsHoveredCases(false)} > USE CASES - { + location.pathname === `${item.title_slug}` ? active - : linkStyle - } - /> + : linkStyle; + })} + /> */} { borderRadius={"10px"} border={"none"} padding={"1rem"} - width={useCase?.length > 1 ? "50%" : "auto"} + width={useCase?.length > 1 ? "65%" : "auto"} margin={"0 auto"} _focus={{ boxShadow: "none", @@ -506,34 +503,12 @@ const NavBar = () => { onMouseLeave={() => setIsHoveredCases(false)} > - - {/* - - - - FinTech - - - */} - {useCase?.map((slug) => ( { @@ -568,94 +543,6 @@ const NavBar = () => { ))} - - {/* - - - - MarTech - - - - - - - - - HealthTech - - - - - - - - - Identity and Security - - - - - - - - - Telecom - - - */} {/* { - const { tabs } = useParams(); - switch (tab) { case "The Rubix whitepapers": return ( diff --git a/src/components/ResourcesPage/NewestEvents.jsx b/src/components/ResourcesPage/NewestEvents.jsx index 5e5ac99..c8ebe7f 100644 --- a/src/components/ResourcesPage/NewestEvents.jsx +++ b/src/components/ResourcesPage/NewestEvents.jsx @@ -11,7 +11,7 @@ import { Tabs, Text, } from "@chakra-ui/react"; -import { useState } from "react"; +import { useEffect, useState } from "react"; import Content from "./Content"; import ArticlesTable from "./tableContent/ArticlesTable"; @@ -32,9 +32,17 @@ const tabsBtn = [ const NewestEvents = () => { const [selectedTab, setSelectedTab] = useState(tabsBtn[0].btn); + const [selectedIndex, setSelectedIndex] = useState(0); + useEffect(() => { + const storedIndex = sessionStorage.getItem("selectedTabIndex"); + if (storedIndex) { + setSelectedIndex(parseInt(storedIndex, 10)); + } + }, []); const handleTabChange = (tab) => { - setSelectedTab(tab); + setSelectedIndex(tab); + setSelectedTab("setSelectedIndex", tab); }; return ( diff --git a/src/components/UseCase/NewUseCase.jsx b/src/components/UseCase/NewUseCase.jsx index 5e36e1e..ecce815 100644 --- a/src/components/UseCase/NewUseCase.jsx +++ b/src/components/UseCase/NewUseCase.jsx @@ -170,7 +170,9 @@ const NewUseCase = ({ @@ -208,12 +210,12 @@ const NewUseCase = ({ */} - {matchingUseCase ? ( + {matchingUseCase.attachments.length >= 1 ? ( {matchingUseCase.attachments.map((item) => ( diff --git a/src/pages/Policy.jsx b/src/pages/Policy.jsx new file mode 100644 index 0000000..e5a1bca --- /dev/null +++ b/src/pages/Policy.jsx @@ -0,0 +1,131 @@ +/* eslint-disable no-unused-vars */ +import { Avatar, Box, Image, Text } from "@chakra-ui/react"; +import { Link } from "react-router-dom"; +import { useGetTermsPageQuery } from "../Redux/slice/termsSlice"; +import { useEffect } from "react"; +import Loader from "../components/Loader/Loader"; + +const Policy = () => { + const { data, isLoading } = useGetTermsPageQuery(); + console.log(data?.data); + const terms = data?.data; + + useEffect(() => { + window.scrollTo(0, 0); + }, []); + + if (isLoading) { + return ( +
+ +
+ ); + } + + return ( + <> + {terms?.map((item) => ( + <> + + + + + {item.title} + + + + + + + + {/* ========[ Head-Para ]====== */} + + + + + + + ))} + + ); +}; + +export default Policy; diff --git a/src/pages/Terms.jsx b/src/pages/Terms.jsx new file mode 100644 index 0000000..3ebe2bd --- /dev/null +++ b/src/pages/Terms.jsx @@ -0,0 +1,131 @@ +/* eslint-disable no-unused-vars */ +import { Avatar, Box, Image, Text } from "@chakra-ui/react"; +import { Link } from "react-router-dom"; +import { useGetTermsPageQuery } from "../Redux/slice/termsSlice"; +import { useEffect } from "react"; +import Loader from "../components/Loader/Loader"; + +const Terms = () => { + const { data, isLoading } = useGetTermsPageQuery(); + console.log(data?.data); + const terms = data?.data; + + useEffect(() => { + window.scrollTo(0, 0); + }, []); + + if (isLoading) { + return ( +
+ +
+ ); + } + + return ( + <> + {terms?.map((item) => ( + <> + + + + + {item.title} + + + + + + + + {/* ========[ Head-Para ]====== */} + + + + + + + ))} + + ); +}; + +export default Terms; diff --git a/src/routes/_routes.jsx b/src/routes/_routes.jsx index 2443f7f..34e73a2 100644 --- a/src/routes/_routes.jsx +++ b/src/routes/_routes.jsx @@ -35,6 +35,8 @@ import NewsPage from "../pages/NewsPage"; import EventsInternnal from "../pages/EventsInternnal"; import BlogPost from "../components/BlogPost/BlogPost"; import NewsInternal from "../pages/NewsInternal"; +import Terms from "../pages/Terms"; +import Policy from "../pages/Policy"; export const route = [ { @@ -134,6 +136,14 @@ export const route = [ path: "news/:title_slug", element: , }, + { + path: "terms", + element: , + }, + { + path: "policy", + element: , + }, // { // path: "fin-tech",