diff --git a/src/Components/Banner/BannerTable.jsx b/src/Components/Banner/BannerTable.jsx index 0282675..1185d0f 100644 --- a/src/Components/Banner/BannerTable.jsx +++ b/src/Components/Banner/BannerTable.jsx @@ -202,7 +202,7 @@ const BannerCommunity = ({ Active: ( handleUpdateStatus(item.id, item?.status)} isChecked={item.status} // disabled={item.status} diff --git a/src/Components/Header.jsx b/src/Components/Header.jsx index e681f3d..44fa9a1 100644 --- a/src/Components/Header.jsx +++ b/src/Components/Header.jsx @@ -13,12 +13,12 @@ const Header = ({ link, btnTitle, title }) => { top={0} zIndex={999} className={`${ - link && btnTitle ? "" : " pt-3 pb-3" - } p-2 pe-2 fw-400 border-bottom d-flex justify-content-between align-items-center`} + link && btnTitle ? "" : " pt-3 pb-3 " + } p-2 pe-2 ps-0 fw-400 border-bottom d-flex justify-content-between align-items-center`} > {/* Community */} - + {title} diff --git a/src/Layout/DefaultLayout.jsx b/src/Layout/DefaultLayout.jsx index 0253900..9821b5f 100644 --- a/src/Layout/DefaultLayout.jsx +++ b/src/Layout/DefaultLayout.jsx @@ -270,11 +270,7 @@ const DashboardLayout = () => { }} > + + + + + + + Author name + + + {errors.name && ( + + {" "} + {errors.author_name.message} + + )} + + + + + Author designation + + + {errors.author_designation && ( + + {" "} + {errors.author_designation.message} + + )} + + + + + Display profile + + {/* */} + + + + + + + + Drop images here + + + or click to upload + + + + + + + + + {errors.profile_image && ( + + {" "} + {errors.profile_image.message} + + )} + + Maximum limit of image is 5mb. + + + + + + + + + @@ -575,209 +780,6 @@ const EditBlogsAndArticles = () => { - - - - - {/* - Author's Info - - - Select the platform for which you need to create this campaign. - - - */} - - - Author's display profile - - - Below is the profile that will be displayed on the community page. - - - Selected Image - {selectedImage === fallbackImage ? ( - "" - ) : ( - - {smallImageData?.name} - - {(smallImageData?.size / (1024 * 1024)).toFixed(2)} mb - - - )} - - - - - - - - Author name - - - {errors.name && ( - - {" "} - {errors.author_name.message} - - )} - - - - - Author designation - - - {errors.author_designation && ( - - {" "} - {errors.author_designation.message} - - )} - - - - - Display profile - - {/* */} - - - - - - - - Drop images here - - - or click to upload - - - - - - - - - {errors.profile_image && ( - - {" "} - {errors.profile_image.message} - - )} - - Maximum limit of image is 5mb. - - - - - - - - ); diff --git a/src/Pages/BlogsAndArticles/ViewBlogsAndArticles.jsx b/src/Pages/BlogsAndArticles/ViewBlogsAndArticles.jsx index ef02508..77f797a 100644 --- a/src/Pages/BlogsAndArticles/ViewBlogsAndArticles.jsx +++ b/src/Pages/BlogsAndArticles/ViewBlogsAndArticles.jsx @@ -38,7 +38,54 @@ const ViewBlogsAndArticles = () => { btnTitle={'Edit blog'} link={`/blogs-articles/edit/${id}`} /> + + + + + + Author's display profile + + + Below is the profile that will be displayed on the community page. + + + + Selected Image + + + + + + + Author name + + + {blog?.author_name} + + + + + + Author designation + + + {blog?.author_designation} + + + + + + @@ -172,52 +219,7 @@ const ViewBlogsAndArticles = () => { - - - - - Author's display profile - - - Below is the profile that will be displayed on the community page. - - - - Selected Image - - - - - - - Author name - - - {blog?.author_name} - - - - - - Author designation - - - {blog?.author_designation} - - - - ); }; diff --git a/src/Pages/Community/CommunityBannerCard.jsx b/src/Pages/Community/CommunityBannerCard.jsx index 6fd6c3b..485ccb0 100644 --- a/src/Pages/Community/CommunityBannerCard.jsx +++ b/src/Pages/Community/CommunityBannerCard.jsx @@ -132,7 +132,7 @@ const CommunityBannerCard = ({ - + @@ -166,7 +166,7 @@ const CommunityBannerCard = ({ { Status: ( handleUpdateStatus(item?.id)} isChecked={item?.status} /> diff --git a/src/Pages/Login.jsx b/src/Pages/Login.jsx index 562f761..2f64b47 100644 --- a/src/Pages/Login.jsx +++ b/src/Pages/Login.jsx @@ -23,6 +23,7 @@ import { import GlobalStateContext from "../Contexts/GlobalStateContext"; import Cookies from 'js-cookie'; import { validationSchema } from "../Validations/Validations"; +import ToastBox from "../Components/ToastBox"; const Login = () => { const { isAuthenticate, setIsAuthenticate } = useContext(GlobalStateContext); @@ -47,10 +48,11 @@ const Login = () => { setIsAuthenticate(true) setIsLoading(false); toast({ - title: "Logged In", - status: "success", - isClosable: true, + render: () => ( + + ), }); + Cookies.set('isAuthenticated', true, { expires: 7 }); navigate("/"); }, 2000); // 3-second delay diff --git a/src/Pages/UnderConstruction.jsx b/src/Pages/UnderConstruction.jsx index 0793c67..d859231 100644 --- a/src/Pages/UnderConstruction.jsx +++ b/src/Pages/UnderConstruction.jsx @@ -16,7 +16,7 @@ const UnderConstruction = () => { > - Comming soon... + Comming soon... ) diff --git a/src/Pages/Videos/AddVideos.jsx b/src/Pages/Videos/AddVideos.jsx index f9effe3..bd2f4d8 100644 --- a/src/Pages/Videos/AddVideos.jsx +++ b/src/Pages/Videos/AddVideos.jsx @@ -229,7 +229,7 @@ const AddVideos = () => { diff --git a/src/Theme/Theme.js b/src/Theme/Theme.js new file mode 100644 index 0000000..de7f680 --- /dev/null +++ b/src/Theme/Theme.js @@ -0,0 +1,45 @@ +// theme.js +import { extendTheme } from "@chakra-ui/react"; + +const customTheme = extendTheme({ + colors: { + customPink: { + 50: '#ffe5e9', + 100: '#ffbcc9', + 200: '#ff93a8', + 300: '#ff6a87', + 400: '#ff4166', + 500: '#ff1845', // you can choose your custom color values here + 600: '#db1139', + 700: '#b70d2d', + 800: '#930921', + 900: '#700616', + }, + peach: { + 50: '#ffe6e9', + 100: '#f8c2c7', + 200: '#ef9da4', + 300: '#e67882', + 400: '#dd5460', + 500: '#DE858E', // primary shade for your custom color + 600: '#DE858E', + 700: '#DE858E', + 800: '#DE858E', + 900: '#DE858E', + }, + + }, + components: { + Switch: { + baseStyle: { + track: { + _checked: { + bg: '#fd1449', // using your custom color here + }, + }, + }, + }, + }, +}); + +export default customTheme; diff --git a/src/main.jsx b/src/main.jsx index c14a531..dc04b23 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -8,9 +8,10 @@ import { PersistGate } from "redux-persist/integration/react"; import { ChakraProvider } from "@chakra-ui/react"; import GlobalStateProvider from "./Contexts/GlobalStateProvider"; import { store } from "./Store/Store.js"; +import customTheme from "./Theme/Theme.js"; ReactDOM.createRoot(document.getElementById("root")).render( - + {/* */}