diff --git a/src/components/aside/Aside.tsx b/src/components/aside/Aside.tsx index 9f941d7..a75ccea 100644 --- a/src/components/aside/Aside.tsx +++ b/src/components/aside/Aside.tsx @@ -1,19 +1,19 @@ // Modules -import { v4 as uuidv4 } from "uuid"; -import { useState, useEffect } from "react"; -import { url } from "../../url"; -import { Api } from "../../api/Api"; -import { asideParams } from "../../api/params"; +import { v4 as uuidv4 } from 'uuid'; +import { useState, useEffect } from 'react'; +import { url } from '../../url'; +import { Api } from '../../api/Api'; +import { asideParams } from '../../api/params'; // Components -import SectionTitle from "../global/SectionTitle"; -import AsideNews from "./AsideNews"; -import Calendar from "./Calendar"; -import { IPostsData } from "../../types/data.types"; -import Loader from "../global/Loader"; +import SectionTitle from '../global/SectionTitle'; +import AsideNews from './AsideNews'; +import Calendar from './Calendar'; +import { IPostsData } from '../../types/data.types'; +import Loader from '../global/Loader'; interface Props { - type: "latest" | "popular"; + type: 'latest' | 'popular'; } interface IData { @@ -21,10 +21,8 @@ interface IData { } const Aside = ({ type }: Props) => { - const api = new Api( - url + `${type === "popular" ? "/popular" : ""}/posts`, - asideParams - ); + const api = new Api(url + `${type === 'popular' ? '/popular' : ''}/posts`, asideParams); + const language = api.language; const [data, setData] = useState(); @@ -36,10 +34,26 @@ const Aside = ({ type }: Props) => {
- {type === "popular" ? ( + {type === 'popular' ? ( data ? ( (data as any).data.map((el: any) => { return ( diff --git a/src/components/videos/Videos.tsx b/src/components/videos/Videos.tsx index d56df66..cd8a3e2 100644 --- a/src/components/videos/Videos.tsx +++ b/src/components/videos/Videos.tsx @@ -1,29 +1,27 @@ // Modules -import { useEffect, useState } from "react"; -import { v4 as uuiv4 } from "uuid"; -import { useSelector, useDispatch } from "react-redux"; +import { useEffect, useState } from 'react'; +import { v4 as uuiv4 } from 'uuid'; +import { useSelector, useDispatch } from 'react-redux'; // Components -import SectionTitle from "../global/SectionTitle"; -import VideosItem from "./VideosItem"; +import SectionTitle from '../global/SectionTitle'; +import VideosItem from './VideosItem'; // Types -import { RootState } from "../../types/store.types"; +import { RootState } from '../../types/store.types'; // Api -import { Api } from "../../api/Api"; -import { url } from "../../url"; -import { videoParams } from "../../api/params"; +import { Api } from '../../api/Api'; +import { url } from '../../url'; +import { videoParams } from '../../api/params'; // Actions -import { setVideo } from "../../actions/setData"; -import Loader from "../global/Loader"; +import { setVideo } from '../../actions/setData'; +import Loader from '../global/Loader'; const Videos = () => { - const data = useSelector( - (state) => state.video.data - ); - const api = new Api(url + "/pagination/posts", videoParams); + const data = useSelector((state) => state.video.data); + const api = new Api(url + '/pagination/posts', videoParams); const language = api.language; const dispatch = useDispatch(); const [lastLanguage, setLastLanguage] = useState(language); @@ -38,9 +36,14 @@ const Videos = () => {
{data.status_code > 0 ? ( @@ -49,11 +52,11 @@ const Videos = () => { return (