From a7e93b7295ac2a7aae793c6f7e8d3ea2e6a7507d Mon Sep 17 00:00:00 2001
From: siddheshmorewdi <siddhesh.more@wdimails.com>
Date: Tue, 21 May 2024 22:32:51 +0530
Subject: [PATCH] updated

---
 .../BlogsAndArticles/ViewBlogsAndArticles.jsx |  8 ++----
 src/Pages/Events/Events.jsx                   |  3 ++-
 src/Pages/Login.jsx                           | 25 ++++++++++++++++++-
 src/Pages/News/News.jsx                       |  5 ++--
 src/Pages/Videos/Videos.jsx                   | 20 +++++----------
 src/Pages/Whitepapers/Whitepapers.jsx         | 17 +++----------
 6 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/src/Pages/BlogsAndArticles/ViewBlogsAndArticles.jsx b/src/Pages/BlogsAndArticles/ViewBlogsAndArticles.jsx
index f1bfc8f..ef02508 100644
--- a/src/Pages/BlogsAndArticles/ViewBlogsAndArticles.jsx
+++ b/src/Pages/BlogsAndArticles/ViewBlogsAndArticles.jsx
@@ -153,14 +153,10 @@ const ViewBlogsAndArticles = () => {
               w={"100%"}
             >
               {blog?.tags?.map(({ id, tag }) => (
-                <Badge
-                  key={id}
-                variant='solid'
-                  colorScheme="teal"
-                  size={"sm"}
-                >
+            <Badge rounded={'full'} key={id} variant="solid"  size={"sm"} ps={3} pe={3} pt={0.5} pb={0.5}  backgroundColor={'#565263'}>
                   {tag}
                 </Badge>
+
               ))}
             </Box>
           </Box>
diff --git a/src/Pages/Events/Events.jsx b/src/Pages/Events/Events.jsx
index d82bd2b..b4a2019 100644
--- a/src/Pages/Events/Events.jsx
+++ b/src/Pages/Events/Events.jsx
@@ -145,7 +145,8 @@ const Events = () => {
 
   const extractedArray = filteredData?.map((item, index) => {
     return {
-      Title: item?.title,
+      Title: 
+      <RouterLink to={`view/${item.id}`}>{item?.title}</RouterLink>,
       "Organisation name": item?.organizer_name,
       "Contact no": item?.organizer_mobile_number,
       Email: item?.organizer_email,
diff --git a/src/Pages/Login.jsx b/src/Pages/Login.jsx
index 8a59b42..562f761 100644
--- a/src/Pages/Login.jsx
+++ b/src/Pages/Login.jsx
@@ -10,6 +10,7 @@ import { useForm } from "react-hook-form";
 import { TiWarning } from "react-icons/ti";
 import Loader01 from "../Components/Loaders/Loader01";
 import Ellipse from "../assets/Ellipse-38.png";
+import Ellipse4 from "../assets/Ellipse.png";
 import Ellipse1 from "../assets/Ellipse-37.png";
 import Ellipse2 from "../assets/Ellipse-39.png";
 import {
@@ -89,7 +90,7 @@ const Login = () => {
         position: "relative",
         overflow: "hidden",
       }}
-      className="rubix-primary-background"
+      className="rubix-primary- bg-black"
     >
       <form
         onSubmit={handleSubmit(onSubmit)}
@@ -220,6 +221,28 @@ const Login = () => {
         alt="bg-img"
       />
 
+      <img
+        style={{
+          position: "absolute",
+          top: 0,
+          left: 0,
+          width:300
+        }}
+
+        src={Ellipse4}
+        alt="bg-img"
+      />
+
+      
+<img
+        style={{
+          position: "absolute",
+          bottom: 0,
+          left: 0,
+        }}
+        src={Ellipse2}
+        alt="bg-img"
+      />
       <img
         style={{
           position: "absolute",
diff --git a/src/Pages/News/News.jsx b/src/Pages/News/News.jsx
index 08b2e97..917df01 100644
--- a/src/Pages/News/News.jsx
+++ b/src/Pages/News/News.jsx
@@ -130,7 +130,8 @@ const News = () => {
   ];
   const extractedArray = filteredData?.map((item, index) => {
     return {
-      Title: item?.title,
+      Title: 
+      <RouterLink to={`view/${item.id}`}>{item?.title}</RouterLink>,
       Discription: (
         <Tooltip
           className="rounded-2 web-text-xsmall"
@@ -233,7 +234,7 @@ const News = () => {
   return (
     <>
       <TabularView
-        title={"Videos"}
+        title={"News"}
         btnTitle={"Create videos"}
         link={"/news/add-news"}
         apiData={news}
diff --git a/src/Pages/Videos/Videos.jsx b/src/Pages/Videos/Videos.jsx
index 289d3f2..b0af2d0 100644
--- a/src/Pages/Videos/Videos.jsx
+++ b/src/Pages/Videos/Videos.jsx
@@ -65,7 +65,6 @@ const Videos = () => {
 
   // ====================================================[Table Setup]================================================================
   const tableHeadRow = [
-    "Thumbnail",
     "Title",
     "Discription",
     "Duration",
@@ -75,21 +74,14 @@ const Videos = () => {
 
   const extractedArray = filteredData?.map((item, index) => {
     return {
-      Thumbnail: (
-        <Image
-          w={150}
-          h={14}
-          rounded={4}
-          objectFit="cover"
-          src={`https://rubix.betadelivery.com/${item.thumbnail}`}
-          alt="Dan Abramov"
-        />
-      ),
 
-      Title: (
+    Title: (
+      <Link to={`/videos/view/${item.id}`}>
+        <Box display={"flex"} alignItems={"center"} w={250}>
         <Text as={"span"} isTruncated={true}>
           {item?.title}
-        </Text>
+        </Text></Box>
+        </Link>
       ),
       Discription: (
         <Tooltip
@@ -100,7 +92,7 @@ const Videos = () => {
           label={item?.description}
           bg="blue.200"
         >
-          <Box display={"flex"} alignItems={"center"} w={180}>
+          <Box display={"flex"} alignItems={"center"} w={500}>
             <Text as={"span"} isTruncated={true}>
               {item?.description}
             </Text>
diff --git a/src/Pages/Whitepapers/Whitepapers.jsx b/src/Pages/Whitepapers/Whitepapers.jsx
index 1d68e33..8310695 100644
--- a/src/Pages/Whitepapers/Whitepapers.jsx
+++ b/src/Pages/Whitepapers/Whitepapers.jsx
@@ -67,7 +67,6 @@ const Whitepapers = () => {
 
   // ====================================================[Table Setup]================================================================
   const tableHeadRow = [
-    "Banner image",
     "Title",
     "Document",
     "Active",
@@ -76,21 +75,13 @@ const Whitepapers = () => {
 
   const extractedArray = filteredData?.map((item, index) => {
     return {
-      "Banner image": (
-        <Image
-          w={150}
-          h={14}
-          rounded={4}
-          objectFit="cover"
-          src={`https://rubix.betadelivery.com/${item.bannerImage}`}
-          alt="Dan Abramov"
-        />
-      ),
 
       Title: (
+        <Link  to={`/whitepaper/view/${item.id}`}>
+          <Box w={280}>
         <Text as={"span"} isTruncated={true}>
           {item?.title}
-        </Text>
+        </Text></Box></Link>
       ),
       Document: (
         <Tooltip
@@ -101,7 +92,7 @@ const Whitepapers = () => {
           label={item?.document}
           bg="blue.200"
         >
-          <Box display={"flex"} alignItems={"center"} w={180}>
+          <Box display={"flex"} alignItems={"center"} w={380}>
             <Text as={"span"} isTruncated={true}>
               {extractFilename(item?.document)}
             </Text>