diff --git a/src/components/category/MainImg.tsx b/src/components/category/MainImg.tsx deleted file mode 100644 index 826d16e..0000000 --- a/src/components/category/MainImg.tsx +++ /dev/null @@ -1,59 +0,0 @@ -// Modules -import { LazyLoadImage } from "react-lazy-load-image-component"; -import { Link } from "react-router-dom"; -import { useSelector } from "react-redux"; -import { v4 as uuidv4 } from "uuid"; -import placeholder from "../../assets/images/placeholder.webp"; - -// Types -import { RootState } from "../../types/store.types"; - -const MainImg = () => { - // redux - const data = useSelector( - (state) => state.newsScroll.data - ); - return ( - <> - {data.length > 0 ? ( - data[0].id > -1 ? ( - - 0 - ? data[0].featured_images[0].path - : "") as string - } - alt={ - (data[0].featured_images.length > 0 - ? data[0].featured_images[0].file_name - : "") as string - } - useIntersectionObserver - effect="opacity" - /> - -
-

{data[0].title}

-
-

- {data[0].categories.map((category) => { - return {category.name}; - })} -

- {data[0].published_at} -
-
- - ) : ( - "" - ) - ) : ( - "" - )} - - ); -}; - -export default MainImg; diff --git a/src/pages/Category.tsx b/src/pages/Category.tsx index ed6e7b1..3eb460f 100644 --- a/src/pages/Category.tsx +++ b/src/pages/Category.tsx @@ -1,14 +1,22 @@ // Modules import { motion } from "framer-motion"; +import { useSelector } from "react-redux"; // Components import { useParams } from "react-router-dom"; import Aside from "../components/aside/Aside"; import NewsScroll from "../components/global/NewsScroll"; -import MainImg from "../components/category/MainImg"; +import ContentItem from "../components/main/ContentItem"; + +// Types +import { RootState } from "../types/store.types"; +import Loader from "../components/global/Loader"; const Category = () => { let { category } = useParams(); + const data = useSelector( + (state) => state.newsScroll.data + ); return ( {
- + {data.length > 0 ? ( + data[0].id > -1 ? ( + + ) : ( + + ) + ) : ( + + )}
diff --git a/src/styles/_category.scss b/src/styles/_category.scss index 8ff4e78..053fe78 100644 --- a/src/styles/_category.scss +++ b/src/styles/_category.scss @@ -92,6 +92,9 @@ display: flex; flex-direction: column; gap: 2.4rem; + .main-content-item { + height: 40rem; + } } @media (max-width: 1024px) {