Merge branch 'dev' of https://github.com/WDI-Ideas/rubix into integration_test

This commit is contained in:
rockyeverlast
2024-05-14 15:58:29 +05:30
11 changed files with 216 additions and 271 deletions

View File

@@ -136,10 +136,10 @@ const Contact = () => {
width: "60%",
},
"@media (max-width: 1080px)": {
width: "42%",
width: "100%",
minH: "490px",
},
"@media (max-width: 820px)": { width: "55%" },
"@media (max-width: 820px)": { width: "100%" },
"@media (max-width: 535px)": {
width: "95%",
padding: "10px",

View File

@@ -16,7 +16,7 @@ const MobileSubnet = () => {
return (
<>
<Swiper
className="subnet-mobile"
className="mobile-subnet"
pagination={true}
navigation={true}
modules={[Navigation, Pagination, Autoplay]}
@@ -58,7 +58,7 @@ const MobileSubnet = () => {
as={"h2"}
paddingTop={"2rem"}
fontWeight={500}
fontSize={"20px"}
fontSize={"22px"}
textTransform={"capitalize"}
color={"#fff"}
sx={{

View File

@@ -22,7 +22,7 @@ const MobileSubnet2 = ({ font }) => {
as={"h2"}
paddingTop={"2rem"}
fontWeight={500}
fontSize={"20px"}
fontSize={"22px"}
textTransform={"capitalize"}
color={"#fff"}
sx={{

View File

@@ -24,7 +24,7 @@ const MobileSubnet3 = ({ font }) => {
as={"h2"}
paddingTop={"2rem"}
fontWeight={500}
fontSize={"20px"}
fontSize={"22px"}
textTransform={"capitalize"}
color={"#fff"}
sx={{
@@ -200,7 +200,7 @@ const MobileSubnet3 = ({ font }) => {
},
}}
>
<ListItem>Fixed Supply.Hardcapped</ListItem>
<ListItem>Fixed Supply. Hardcapped</ListItem>
</UnorderedList>
</Box>
</Box>

View File

@@ -10,6 +10,12 @@ import { Swiper, SwiperSlide } from "swiper/react";
import MobileHomeCard from "../Card/MobileHomeCard";
const content = [
{
id: 7,
date: `Published: January 12, 2022`,
text: `Rubix Video`,
link: `rubix-video`,
},
{
id: 1,
date: `Published: January 5, 2023`,
@@ -47,12 +53,6 @@ const content = [
text: `Rubix: The Sustainable Blockchain Solution — a Green Initiative`,
link: `rubix-the-sustainable-blockchain-solution-a-green-initiative`,
},
// {
// id: 7,
// date: `Published: January 12, 2022`,
// text: `Enterprise blockchains on a Public Chain`,
// link: `enterprise-blockchains-on-a-public-chain`,
// },
];
const Content = {

View File

@@ -31,8 +31,6 @@ import fintechIcon from "../../assets/images/Navicons/fintechIcon.png";
import adTech from "../../assets/images/Navicons/adTech.png";
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 { useGetUseCaseQuery } from "../../Redux/slice/useCaseSlice";
const NavBar = () => {
@@ -507,38 +505,87 @@ const NavBar = () => {
onMouseLeave={() => setIsHoveredCases(false)}
>
<PopoverArrow backgroundColor={"#0D0B20"} shadow={"none"} />
<Box
display={"flex"}
alignItems={"center"}
flexWrap={"wrap"}
justifyContent={"space-between"}
>
<PopoverBody width={"45%"}>
{useCase?.map((slug) => (
<Link
key={slug.id}
to={`UseCases/${slug.title_slug}`}
className="link"
style={
location.pathname ===
`UseCases/${slug.title_slug}`
? highlight
: normal
}
>
<Box
display={"flex"}
alignItems={"center"}
gap={"1rem"}
marginBottom={"1rem"}
>
<Image src={fintechIcon} width={`${iconwidth}`} />
<Text>{`${slug.title}`}</Text>
</Box>
</Link>
))}
</PopoverBody>
</Box>
<PopoverBody>
<Link
to="/fin-tech"
className="link"
style={
location.pathname === "/fin-tech" ? highlight : normal
}
>
<Box
display={"flex"}
alignItems={"center"}
gap={"1rem"}
marginBottom={"1rem"}
>
<Image src={fintechIcon} width={`${iconwidth}`} />
FinTech
</Box>
</Link>
</PopoverBody>
<PopoverBody>
<Link
to="/ad-tech"
className="link"
style={
location.pathname === "/ad-tech" ? highlight : normal
}
>
<Box
display={"flex"}
alignItems={"center"}
gap={"1rem"}
marginBottom={"1rem"}
>
<Image src={adTech} width={`${iconwidth}`} />
AdTech
</Box>
</Link>
</PopoverBody>
<PopoverBody>
<Link
to="/mar-tech"
className="link"
style={
location.pathname === "/mar-tech" ? highlight : normal
}
>
<Box
display={"flex"}
alignItems={"center"}
gap={"1rem"}
marginBottom={"1rem"}
>
<Image src={marTech} width={`${iconwidth}`} />
MarTech
</Box>
</Link>
</PopoverBody>
<PopoverBody>
<Link
to="/health-tech"
className="link"
style={
location.pathname === "/health-tech"
? highlight
: normal
}
>
<Box
display={"flex"}
alignItems={"center"}
gap={"1rem"}
marginBottom={"1rem"}
>
<Image src={healthTech} width={`${iconwidth}`} />
HealthTech
</Box>
</Link>
</PopoverBody>
</PopoverContent>
</Popover>

View File

@@ -462,7 +462,7 @@ export const NewSubnetComp = () => {
>
51.4 Million RBT
</Text>
<Text fontSize={"16px"}>Fixed Supply.Hardcapped </Text>
<Text fontSize={"16px"}>Fixed Supply. Hardcapped </Text>
</Box>
</Box>
</Box>

View File

@@ -3,14 +3,9 @@
/* eslint-disable no-unused-vars */
// eslint-disable-next-line no-unused-vars
import React, { useEffect } from "react";
import { Box, Button, Image, Text } from "@chakra-ui/react";
import pdf from "../../assets/pdf/Rubix.pdf";
import cardimg from "../../assets/images/CardImg.png";
import img from "../../assets/images/pdfscreen.png";
import { Box, Text } from "@chakra-ui/react";
import { useParams } from "react-router-dom";
import { useGetUseCaseQuery } from "../../Redux/slice/useCaseSlice";
import Loader from "../Loader/Loader";
import NotFound from "../../pages/NotFound";
// eslint-disable-next-line react/prop-types
const UseCase = ({ useCase, bannerImage, bannerHeading, bannerSubHeading }) => {
@@ -36,87 +31,86 @@ const UseCase = ({ useCase, bannerImage, bannerHeading, bannerSubHeading }) => {
console.log(matchingUseCase);
return (
<>
{matchingUseCase ? (
<div key={matchingUseCase.id}>
<div>
<Box
height={"75vh"}
width={"100%"}
backgroundImage={`url(${bannerImage})`}
backgroundRepeat={"no-repeat"}
backgroundSize={"cover"}
position="relative"
sx={{
"@media (max-width: 600px)": {
height: "400px",
},
}}
>
<Box
position="absolute"
top={0}
left={0}
width="100%"
height="100%"
backgroundColor="rgba(0, 0, 0, 0.8)"
display={"flex"}
justifyContent={"center"}
alignItems={"center"}
flexDirection={"column"}
>
<Box
height={"75vh"}
width={"100%"}
backgroundImage={`url(https://rubix.betadelivery.com/${matchingUseCase.bannerImage})`}
backgroundRepeat={"no-repeat"}
backgroundSize={"cover"}
position="relative"
backgroundPosition={"center"}
w={"50vw"}
sx={{
"@media (max-width: 600px)": {
height: "400px",
width: "100vw",
padding: "2rem",
},
}}
>
<Box
position="absolute"
top={0}
left={0}
width="100%"
height="100%"
backgroundColor="rgba(0, 0, 0, 0.8)"
display={"flex"}
justifyContent={"center"}
alignItems={"center"}
flexDirection={"column"}
<Text
textAlign={"center"}
className="rubix-fw-700"
fontSize={"40px"}
fontFamily={"Mona Sans"}
color={"#fff"}
sx={{
"@media (max-width: 600px)": {
fontSize: "30px",
},
}}
>
<Box
w={"50vw"}
sx={{
"@media (max-width: 600px)": {
width: "100vw",
padding: "2rem",
},
}}
>
<Text
textAlign={"center"}
className="rubix-fw-700"
fontSize={"40px"}
fontFamily={"Mona Sans"}
color={"#fff"}
sx={{
"@media (max-width: 600px)": {
fontSize: "30px",
},
}}
>
{matchingUseCase.title}
</Text>
<Text
textAlign={"center"}
className="rubix-fw-500"
fontSize={"20px"}
fontFamily={"Poppins"}
color={"#fff"}
sx={{
"@media (max-width: 600px)": {
fontSize: "16px",
},
}}
>
{matchingUseCase.meta_description}
</Text>
</Box>
</Box>
{bannerHeading}
</Text>
<Text
textAlign={"center"}
className="rubix-fw-500"
fontSize={"20px"}
fontFamily={"Poppins"}
color={"#fff"}
sx={{
"@media (max-width: 600px)": {
fontSize: "16px",
},
}}
>
{bannerSubHeading}
</Text>
</Box>
</Box>
</Box>
<Box
p={5}
pb={14}
backgroundColor={"#000000"}
display={"flex"}
justifyContent={"center"}
flexDirection={"column"}
alignItems={"center"}
gap={12}
w={"100%"}
>
<Box
p={5}
pb={14}
backgroundColor={"#000000"}
display={"flex"}
justifyContent={"center"}
flexDirection={"column"}
alignItems={"center"}
gap={16}
w={"100%"}
>
{useCase.map(
({ useCaseHeading, useCaseSubHeading, useCaseDetails }) => (
<Box
display={"flex"}
justifyContent={"center"}
@@ -166,155 +160,46 @@ const UseCase = ({ useCase, bannerImage, bannerHeading, bannerSubHeading }) => {
</Text>
</Box>
<Box
width={"75vw"}
sx={{
"@media (max-width: 600px)": {
width: "100%",
},
}}
>
<Text
style={{ marginBottom: 6 }}
className="rubix-fw-500"
fontSize="2xl"
textColor={"#ffffff"}
sx={{
"@media (max-width: 600px)": {
fontSize: "16px",
},
}}
>
{matchingUseCase.problem}
</Text>
<Text
textColor={"#ffffff"}
fontSize="lg"
sx={{
"@media (max-width: 600px)": {
fontSize: "14px",
},
}}
>
{matchingUseCase.solution}
</Text>
</Box>
</Box>
{/* <Box width={"85vw"}>
{useCase.map((item) => (
<>
{item.documents ? (
<Text
className="rubix-fw-500"
fontSize="3xl"
textColor={"#ffffff"}
marginBottom={"3rem"}
sx={{
"@media (max-width: 600px)": {
fontSize: "22px",
textAlign: "center",
},
}}
>
Use Cases
</Text>
) : (
""
)}
</>
))}
{useCase.map(({ documents }) => (
{useCaseDetails.map(({ title, description }, index) => (
<Box
display={"flex"}
flexWrap={"wrap"}
justifyContent={"left"}
gap={"1.2rem"}
width={"100%"}
width={"75vw"}
sx={{
"@media (max-width: 1024px)": {
justifyContent: "space-around",
"@media (max-width: 600px)": {
width: "100%",
},
}}
>
{documents?.map((item) => (
<Box marginBottom={"2rem"} key={item.id}>
<Box
width={"275px"}
background={"#15181E"}
borderRadius={"10px"}
minHeight={"360px"}
padding={"15px"}
sx={{
"@media (max-width: 600px)": {
width: "100%",
minHeight: "0",
},
}}
>
<Image src={img} />
<Box paddingTop={"2rem"}>
<Text
color={"#fff"}
fontSize={"18px"}
marginBottom={"20px"}
minHeight={"85px"}
maxWidth={"420px"}
>
{item.title}
</Text>
<Box
display={"flex"}
alignItems={"center"}
_hover={
{
// flexDirection: "column-reverse",
}
}
>
<Box
position={"relative"}
width={"10%"}
_before={{
content: '""',
width: "100%",
position: "absolute",
left: "0",
borderBottom: "2px solid #DE858E",
borderRadius: "5px",
zIndex: "2",
}}
></Box>
{
<a download={item.name} href={item.link}>
<Button
position={"relative"}
backgroundColor={"transparent"}
color={"#fff"}
fontFamily={"Poppins"}
fontWeight={"400"}
_hover={{
backgroundColor: "transparent",
}}
>
Download
</Button>
</a>
}
</Box>
</Box>
</Box>
</Box>
))}
<Text
style={{ marginBottom: 6 }}
className="rubix-fw-500"
fontSize="2xl"
textColor={"#ffffff"}
sx={{
"@media (max-width: 600px)": {
fontSize: "16px",
},
}}
>
{title}
</Text>
<Text
textColor={"#ffffff"}
fontSize="lg"
sx={{
"@media (max-width: 600px)": {
fontSize: "14px",
},
}}
>
{description}
</Text>
</Box>
))}
</Box> */}
</Box>
</div>
) : (
<NotFound />
)}
</>
</Box>
)
)}
</Box>
</div>
);
};

View File

@@ -368,9 +368,9 @@ export const IdentitySecurityContent = [
},
{
id: 3,
title: "Rubix VC Framework Ver1",
title: " Rubix Verifiable Credentials",
link: secuirty3,
name: `Rubix_VC_Framework_Ver1`,
name: ` Rubix_Verifiable_Credentials`,
},
{
id: 4,

View File

@@ -180,7 +180,8 @@ span.swiper-pagination-bullet {
@media only screen and (max-width: 600px) {
.swiper-button-prev:after,
.swiper-button-next:after {
font-size: 20px;
font-size: 30px;
font-weight: bolder;
}
.swiper-pagination-bullets {

View File

@@ -4,6 +4,8 @@ import ArticleInternalSix from "../components/ArticleInternalSix/ArticleInternal
import ArticleInternalThree from "../components/ArticleInternalThree/ArticleInternalThree";
import ArticleInternalTwo from "../components/ArticleInternalTwo/ArticleInternalTwo";
import ArticleInternalfive from "../components/ArticleInternalfive/ArticleInternalfive";
import ArticleInternalSeven from "../components/ArticleInternalSeven/ArticleInternalSeven";
import ArticleInternalEight from "../components/ArticleInternalEight/ArticleInternalEigth";
import {
IdentitySecurityContent,
adTechContent,
@@ -24,6 +26,8 @@ import martech from "../assets/images/martech.png";
import security from "../assets/images/i&security-bg.png";
import tele from "../assets/images/Telecom-bg.png";
import healthTech from "../assets/images/health-tech.png";
import security from "../assets/images/i&security-bg.png";
import tele from "../assets/images/Telecom-bg.png";
import Form from "../components/Contact/Form";
import ResourcesPage from "../pages/ResourcesPage";
import VideoInternal from "../components/VideoInternal/VideoInternal";
@@ -79,6 +83,14 @@ export const route = [
path: "multichain-over-blockchain-a-reality-check-on-security-threat",
element: <ArticleInternalSix />,
},
{
path: "building-blocks-of-next-gen-blockchain",
element: <ArticleInternalSeven />,
},
{
path: "driving-sustainable-innovations",
element: <ArticleInternalEight />,
},
{
path: "Contact",
element: <Form />,