From f2c1dae3addc4b8faf2b868506e0fcc2fab87c62 Mon Sep 17 00:00:00 2001 From: rockyeverlast Date: Wed, 5 Jun 2024 20:01:41 +0530 Subject: [PATCH] update and fixes --- src/components/Card/DevCards.jsx | 7 +- src/components/Card/HappenCard.jsx | 9 +- src/components/Card/LearnCard.jsx | 6 +- src/components/EventsPage/NewestEvents.jsx | 115 +++++++++++++++++- src/components/EventsPage/UpcomingEvents.jsx | 1 + .../tableContent/ArticlesTable.jsx | 8 +- 6 files changed, 138 insertions(+), 8 deletions(-) diff --git a/src/components/Card/DevCards.jsx b/src/components/Card/DevCards.jsx index 617eb8d..ef3877d 100644 --- a/src/components/Card/DevCards.jsx +++ b/src/components/Card/DevCards.jsx @@ -60,8 +60,13 @@ const DevCards = ({ id, src, alt, text, href }) => { fontFamily={"Poppins"} marginBottom={"20px"} // fontWeight={"100"} - minHeight={"100px"} + m + minHeight={"85px"} sx={{ + display: "-webkit-box", + WebkitBoxOrient: "vertical", + overflow: "hidden", + WebkitLineClamp: 3, "@media (max-width: 500px)": { fontSize: "14px", }, diff --git a/src/components/Card/HappenCard.jsx b/src/components/Card/HappenCard.jsx index 7fd01a8..89e344a 100644 --- a/src/components/Card/HappenCard.jsx +++ b/src/components/Card/HappenCard.jsx @@ -7,7 +7,7 @@ import Loader from "../Loader/Loader"; import { Link } from "react-router-dom"; import { useGetEventsViewQuery } from "../../Redux/slice/eventsViewSlice"; -const HappenCard = ({ key, date, text, para, loader, title }) => { +const HappenCard = ({ key, date, text, para, loader, title, img }) => { const { data, isLoading, error } = useGetEventsViewQuery(); const eventsCard = data?.data?.rows; console.log(eventsCard); @@ -43,7 +43,7 @@ const HappenCard = ({ key, date, text, para, loader, title }) => { background={"#151419"} borderRadius={"10px"} position={"relative"} - minHeight={"355px"} + minHeight={"410px"} key={key} sx={{ "@media (max-width: 500px)": { @@ -66,7 +66,10 @@ const HappenCard = ({ key, date, text, para, loader, title }) => { {day} { fontFamily={"Poppins"} marginBottom={"20px"} // fontWeight={"100"} - minHeight={"100px"} + minHeight={"85px"} sx={{ + display: "-webkit-box", + WebkitBoxOrient: "vertical", + overflow: "hidden", + WebkitLineClamp: 3, "@media (max-width: 500px)": { fontSize: "14px", }, diff --git a/src/components/EventsPage/NewestEvents.jsx b/src/components/EventsPage/NewestEvents.jsx index 908ecfd..51c5de3 100644 --- a/src/components/EventsPage/NewestEvents.jsx +++ b/src/components/EventsPage/NewestEvents.jsx @@ -1,7 +1,31 @@ import { Badge, Box, Container, Image, Text } from "@chakra-ui/react"; import pic from "../../assets/images/eventsPic.png"; +import { Swiper, SwiperSlide } from "swiper/react"; +import { Autoplay, Navigation, Pagination } from "swiper/modules"; +import { Link } from "react-router-dom"; +import { useGetEventsViewQuery } from "../../Redux/slice/eventsViewSlice"; +import Loader from "../Loader/Loader"; const NewestEvent = () => { + const { data, isLoading, error } = useGetEventsViewQuery(); + const eventsCard = data?.data?.rows; + console.log(eventsCard); + // const dateString = date; + // const newDate = new Date(dateString); + // const day = newDate.getDate(); + // const month = new Intl.DateTimeFormat("en-US", { month: "long" }).format( + // newDate + // ); + + // console.log(date); + + if (isLoading) { + return ( +
+ +
+ ); + } return ( { > Newest Post - + {eventsCard?.slice(0, 3).map((item) => ( + + + + + + + + {item.eventDates.map((date) => ( + + Event :{" "} + {(function () { + const createdAtDate = new Date(date.date); + const formattedDate = createdAtDate + .toLocaleDateString("en-GB", { + day: "2-digit", + month: "2-digit", + year: "2-digit", + }) + .replace(/\//g, "-"); + return ( + + {formattedDate} + + ); + })()} + + ))} + + {item.title} + + {item.content} + + + + + ))} + + {/* { Sunday, 10 May 2024 - + */} diff --git a/src/components/EventsPage/UpcomingEvents.jsx b/src/components/EventsPage/UpcomingEvents.jsx index 75842d9..68e14de 100644 --- a/src/components/EventsPage/UpcomingEvents.jsx +++ b/src/components/EventsPage/UpcomingEvents.jsx @@ -125,6 +125,7 @@ const UpcomingEvents = () => { {eventsCard?.map((item) => item.eventDates.map((dateItem) => ( { color={"#fff"} fontSize={"18px"} marginBottom={"20px"} - minHeight={"90px"} + minHeight={"60px"} maxWidth={"420px"} + sx={{ + display: "-webkit-box", + WebkitBoxOrient: "vertical", + overflow: "hidden", + WebkitLineClamp: 2, + }} > {content.title}