Aydogdy
/
hhm-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

date

This commit is contained in:
Kakabay 2023-03-10 15:30:00 +05:00
parent 25d1fab119
commit 0c5c5c4648
3 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/aside/Aside.tsx
View File

@ -62,7 +62,7 @@ const Aside = ({ type }: Props) => {
<AsideNews
key={uuidv4()}
title={el?.title}
date={dateParse(el?.published_at)}
date={el?.published_at}
category={el.categories[0]?.name}
img={el?.featured_images[0]?.path}
id={el?.id}

12
src/components/global/Pagination.tsx
View File

@ -1,6 +1,6 @@
// Icons
import { Dispatch, SetStateAction } from "react";
import { ReactComponent as Arr } from "../../assets/icons/pagintaion-arr.svg";
import { Dispatch, SetStateAction } from 'react';
import { ReactComponent as Arr } from '../../assets/icons/pagintaion-arr.svg';
interface IProps {
pages: number;
@ -9,7 +9,7 @@ interface IProps {
}
const Pagination = ({ pages, activePage, setActivePage }: IProps) => {
console.log(pages, activePage + 1);
// console.log(pages, activePage + 1);
const handleOnClick = (page: number) => {
setActivePage(page);
};
@ -18,8 +18,7 @@ const Pagination = ({ pages, activePage, setActivePage }: IProps) => {
<button
type="button"
disabled={activePage - 1 < 1}
onClick={() => handleOnClick(activePage - 1)}
>
onClick={() => handleOnClick(activePage - 1)}>
<Arr className="pagination-arr pagination-arr-left" />
</button>
<div className="pagination-nums">
@ -28,8 +27,7 @@ const Pagination = ({ pages, activePage, setActivePage }: IProps) => {
<button
type="button"
disabled={activePage + 1 >= pages}
onClick={() => handleOnClick(activePage + 1)}
>
onClick={() => handleOnClick(activePage + 1)}>
<Arr className="pagination-arr pagination-arr-right" />
</button>
</div>

47
src/components/news/News.tsx
View File

@ -1,23 +1,23 @@
// Modules
import { Link } from "react-router-dom";
import { LazyLoadImage } from "react-lazy-load-image-component";
import { v4 as uuidv4 } from "uuid";
import ReactPlayer from "react-player";
import { Link } from 'react-router-dom';
import { LazyLoadImage } from 'react-lazy-load-image-component';
import { v4 as uuidv4 } from 'uuid';
import ReactPlayer from 'react-player';
// Components
import NewsCategory from "../global/NewsCategory";
import NewsDate from "../global/NewsDate";
import { IPostsData } from "../../types/data.types";
import placeholder from "../../assets/images/placeholder.webp";
import { dateParse } from "../../helpers/dateParser";
import NewsCategory from '../global/NewsCategory';
import NewsDate from '../global/NewsDate';
import { IPostsData } from '../../types/data.types';
import placeholder from '../../assets/images/placeholder.webp';
import { dateParse } from '../../helpers/dateParser';
interface Props {
id: IPostsData["id"];
title: IPostsData["title"];
text: IPostsData["content_html"];
categories: IPostsData["categories"];
date: IPostsData["published_at"];
img: IPostsData["featured_images"][0]["path"];
id: IPostsData['id'];
title: IPostsData['title'];
text: IPostsData['content_html'];
categories: IPostsData['categories'];
date: IPostsData['published_at'];
img: IPostsData['featured_images'][0]['path'];
video: {
type: string;
url: string;
@ -29,14 +29,8 @@ const News = ({ id, title, text, categories, date, img, video }: Props) => {
<Link to={`/news/${id}`}>
<div className="news-wrapper">
<div className="news-image">
{video.type === "video" ? (
<ReactPlayer
url={video.url}
controls
light={img}
width="100%"
height="100%"
/>
{video.type === 'video' ? (
<ReactPlayer url={video.url} controls light={img} width="100%" height="100%" />
) : (
<LazyLoadImage
src={img}
@ -57,13 +51,10 @@ const News = ({ id, title, text, categories, date, img, video }: Props) => {
})}
</div>
<div className="news-status-right">
<NewsDate date={dateParse(date)} />
<NewsDate date={date} />
</div>
</div>
<div
className="news-text"
dangerouslySetInnerHTML={{ __html: text }}
></div>
<div className="news-text" dangerouslySetInnerHTML={{ __html: text }}></div>
</div>
</div>
</div>