From 96ae01c4646a0cdeb7c0c0fef840e0fff336bc58 Mon Sep 17 00:00:00 2001
From: siddheshmorewdi <siddhesh.more@wdimails.com>
Date: Tue, 7 May 2024 13:31:17 +0530
Subject: [PATCH] blog updated

---
 src/Components/ChipSelector/ChipSelector.jsx  |  4 +-
 .../BlogsAndArticles/BlogsAndArticles.jsx     |  5 ++-
 .../BlogsAndArticles/ViewBlogsAndArticles.jsx | 19 ++++-----
 src/Validations/Validations.js                | 39 +++----------------
 4 files changed, 21 insertions(+), 46 deletions(-)

diff --git a/src/Components/ChipSelector/ChipSelector.jsx b/src/Components/ChipSelector/ChipSelector.jsx
index 173bd48..1363f8b 100644
--- a/src/Components/ChipSelector/ChipSelector.jsx
+++ b/src/Components/ChipSelector/ChipSelector.jsx
@@ -48,8 +48,8 @@ const ChipSelector = ({chips, setChips}) => {
         gap={2}
         >
           {chips?.map((chip, i) => (
-            <Tag key={i} size="md" variant='solid' colorScheme='teal'>
-              <TagLabel>{chip}</TagLabel>
+            <Tag key={i} size="sm" rounded="sm" variant='solid' colorScheme='teal'>
+              <TagLabel className="text-uppercase">{chip}</TagLabel>
               <TagCloseButton onClick={() => removeChip(chip)} />
             </Tag>
           ))}
diff --git a/src/Pages/BlogsAndArticles/BlogsAndArticles.jsx b/src/Pages/BlogsAndArticles/BlogsAndArticles.jsx
index b43f3ee..9443064 100644
--- a/src/Pages/BlogsAndArticles/BlogsAndArticles.jsx
+++ b/src/Pages/BlogsAndArticles/BlogsAndArticles.jsx
@@ -31,6 +31,7 @@ import {
   useToast,
   Skeleton,
   VStack,
+  Badge,
 } from "@chakra-ui/react";
 import { AddIcon } from "@chakra-ui/icons";
 import DataTable from "../../Components/DataTable/DataTable";
@@ -207,9 +208,9 @@ const BlogsAndArticles = () => {
           w={220}
         >
           {item?.tags?.map(({ id, tag }) => (
-            <Tag key={id}  colorScheme="gray" size={"sm"}>
+            <Badge key={id} variant='solid' colorScheme="teal" size={"sm"}>
               {tag}
-            </Tag>
+            </Badge>
           ))}
         </Box>
       ),
diff --git a/src/Pages/BlogsAndArticles/ViewBlogsAndArticles.jsx b/src/Pages/BlogsAndArticles/ViewBlogsAndArticles.jsx
index 5091217..f1bfc8f 100644
--- a/src/Pages/BlogsAndArticles/ViewBlogsAndArticles.jsx
+++ b/src/Pages/BlogsAndArticles/ViewBlogsAndArticles.jsx
@@ -1,4 +1,5 @@
 import {
+  Badge,
   Box,
   Button,
   Divider,
@@ -84,22 +85,22 @@ const ViewBlogsAndArticles = () => {
         </Box>
 
         <Box className="col-7 pt-4  p-4">
-          <Box>
-            <Box className="web-text-large fw-bold mb-1 rubix-text-dark">
+          <Box className="d-flex flex-column align-items-start gap-1 mb-3">
+            <Box className="web-text-large fw-bold rubix-text-dark">
               Status
             </Box>
             {blog.active_blog ? (
-              <Tag size={"sm"} borderRadius="full" colorScheme="teal">
+              <Badge size={"sm"}  colorScheme="teal">
                 Active
-              </Tag>
+              </Badge>
             ) : (
-              <Tag
+              <Badge
                 size={"sm"}
                 variant="solid"
                 colorScheme="red"
               >
                 Inactive
-              </Tag>
+              </Badge>
             )}
           </Box>
 
@@ -152,14 +153,14 @@ const ViewBlogsAndArticles = () => {
               w={"100%"}
             >
               {blog?.tags?.map(({ id, tag }) => (
-                <Tag
+                <Badge
                   key={id}
-                  borderRadius="full"
+                variant='solid'
                   colorScheme="teal"
                   size={"sm"}
                 >
                   {tag}
-                </Tag>
+                </Badge>
               ))}
             </Box>
           </Box>
diff --git a/src/Validations/Validations.js b/src/Validations/Validations.js
index 9ce3c67..256027a 100644
--- a/src/Validations/Validations.js
+++ b/src/Validations/Validations.js
@@ -17,9 +17,7 @@ export const schemaEdit = Yup.object().shape({
   member_name: Yup.string().required("Name is required"),
   designation: Yup.string().required("Designation is required"),
   description: Yup.string().required("Description is required"),
-  linkedin: Yup.string()
-    .url("Invalid LinkedIn URL")
-    .required("LinkedIn is required"),
+  linkedin: Yup.string().url("Invalid LinkedIn URL").required("LinkedIn is required"),
 });
 
 export const addCommunityBannerSchema = Yup.object().shape({
@@ -34,9 +32,7 @@ export const editCommunityBannerSchema = Yup.object().shape({
   Heading: Yup.string().required("Name is required"),
   sub_heading: Yup.string().required("Designation is required"),
   CTO_button_title: Yup.string().required("Description is required"),
-  CTO_button_link: Yup.string()
-    .url("Invalid LinkedIn URL")
-    .required("LinkedIn is required"),
+  CTO_button_link: Yup.string().url("Invalid LinkedIn URL").required("LinkedIn is required"),
 });
 
 export const addBlogSchema = Yup.object().shape({
@@ -44,50 +40,27 @@ export const addBlogSchema = Yup.object().shape({
   author_designation: Yup.string().required("Author designation is required"),
   title: Yup.string().required("Title is required"),
   meta_description: Yup.string().required("Description is required"),
-  // content: Yup.string().required("Content is required"),
+  content: Yup.string().required("Content is required"),
   summary: Yup.string().required("Summary is required"),
 });
 
-
-
-
 export const addNews = Yup.object().shape({
   title: Yup.string().required("Author is required"),
   release_date: Yup.date().required("Release date is required"),
   meta_description: Yup.string().required("Description is required"),
   content: Yup.string().required("Content is required"),
-  banner_image: Yup.mixed()
-    .test("fileSize", "Image must be at least 2MB", (value) => {
-      // If no file uploaded, return true (validation passed)
+  banner_image: Yup.mixed().test("fileSize", "Image must be at least 2MB", (value) => {
       if (!value) return true;
-      
-      // Calculate file size in bytes
       const fileSizeInBytes = value.size;
-      // Convert bytes to megabytes
       const fileSizeInMB = fileSizeInBytes / (1024 * 1024);
-      
-      // Check if file size is at least 2MB
       return fileSizeInMB >= 10;
-    }).required("Banner image is required")
+    }).required("Banner image is required"),
 });
 
-
 export const editNews = Yup.object().shape({
   title: Yup.string(),
   release_date: Yup.date(),
   meta_description: Yup.string(),
   content: Yup.string(),
   banner_image: Yup.mixed()
-    // .test("fileSize", "Image must be at least 2MB", (value) => {
-    //   // If no file uploaded, return true (validation passed)
-    //   if (!value) return true;
-      
-    //   // Calculate file size in bytes
-    //   const fileSizeInBytes = value.size;
-    //   // Convert bytes to megabytes
-    //   const fileSizeInMB = fileSizeInBytes / (1024 * 1024);
-      
-    //   // Check if file size is at least 2MB
-    //   return fileSizeInMB >= 10;
-    // })
-});
\ No newline at end of file
+});