diff --git a/src/App.tsx b/src/App.tsx index a232968..3fcd5a1 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,6 +1,5 @@ // Modules import { Routes, Route, useLocation } from "react-router-dom"; -import { AnimatePresence } from "framer-motion"; import ScrollToTop from "./hooks/ScrollToTop"; // Styles @@ -18,6 +17,7 @@ import Category from "./pages/Category"; import SearchResult from "./pages/SearchResult"; import AllPosts from "./pages/AllPosts"; import NotFound404 from "./pages/NotFound404"; + // Components import Header from "./components/header/Header"; import Footer from "./components/footer/Footer"; @@ -47,16 +47,14 @@ const App = () => {
- - - } /> - } /> - } /> - } /> - } /> - } /> - - + + } /> + } /> + } /> + } /> + } /> + } /> +
diff --git a/src/components/main/ContentSlider.tsx b/src/components/main/ContentSlider.tsx index 8bdc88c..a9d7844 100644 --- a/src/components/main/ContentSlider.tsx +++ b/src/components/main/ContentSlider.tsx @@ -35,12 +35,10 @@ const ContentSlider = ({ data }: IProps) => { return ( ); diff --git a/src/components/main/MainContent.tsx b/src/components/main/MainContent.tsx index 088f2c3..c07bae7 100644 --- a/src/components/main/MainContent.tsx +++ b/src/components/main/MainContent.tsx @@ -1,11 +1,9 @@ // Modules import { useEffect, useState } from "react"; -// import { LazyLoadComponent } from "react-lazy-load-image-component"; import { useSelector, useDispatch } from "react-redux"; // Components import ContentItem from "./ContentItem"; -import SectionTitle from "../global/SectionTitle"; import ContentSlider from "./ContentSlider"; import Loader from "../global/Loader"; @@ -17,6 +15,7 @@ import { url } from "../../url"; import { Api } from "../../api/Api"; import { featuredParams } from "../../api/params"; import { setFeatured } from "../../actions/setData"; +import { INewPostsData } from "../../types/posts.types"; const MainContent = () => { const dispatch = useDispatch(); @@ -27,17 +26,15 @@ const MainContent = () => { const language = api.language; const [lastLanguage, setLastLanguage] = useState(language); - const getData = () => { - api.get(data, (data) => dispatch(setFeatured(data))); - }; useEffect(() => { if (!(data.status_code > 0 && language === lastLanguage)) { - getData(); + api.get(data, (data: INewPostsData) => dispatch(setFeatured(data))); setLastLanguage(language); } }, [language, lastLanguage]); + return ( - <> +
{data.status_code > 0 ? ( data.data.data.length >= 5 ? (
@@ -79,7 +76,7 @@ const MainContent = () => { ) : ( )} - +
); }; diff --git a/src/pages/Category.tsx b/src/pages/Category.tsx index 283d7dc..7a944a1 100644 --- a/src/pages/Category.tsx +++ b/src/pages/Category.tsx @@ -1,14 +1,11 @@ // Modules -import { motion } from "framer-motion"; import { useState, useEffect, useMemo } from "react"; // Components import { useParams } from "react-router-dom"; import Aside from "../components/aside/Aside"; -import NewsScroll from "../components/global/NewsScroll"; import CustomNewsScroll from "../components/global/CustomNewsScroll"; import ContentItem from "../components/main/ContentItem"; -import Pagination from "../components/global/Pagination"; // Types import Loader from "../components/global/Loader"; @@ -43,12 +40,7 @@ const Category = () => { }, [params]); return ( - +
@@ -76,7 +68,7 @@ const Category = () => {
- +
); }; diff --git a/src/pages/Main.tsx b/src/pages/Main.tsx index 87f7dec..9208193 100644 --- a/src/pages/Main.tsx +++ b/src/pages/Main.tsx @@ -1,6 +1,3 @@ -// Modules -import { motion } from "framer-motion"; - // Components import Aside from "../components/aside/Aside"; import NewsScroll from "../components/global/NewsScroll"; @@ -9,12 +6,7 @@ import MainContent from "../components/main/MainContent"; const Main = () => { return ( - +

Туркменистан новостной портал

@@ -28,7 +20,7 @@ const Main = () => {
- + ); }; diff --git a/src/pages/NewsArticle.tsx b/src/pages/NewsArticle.tsx index 218512f..2b1760a 100644 --- a/src/pages/NewsArticle.tsx +++ b/src/pages/NewsArticle.tsx @@ -3,16 +3,13 @@ import { Link, useParams } from "react-router-dom"; import { useEffect, useState } from "react"; import { useSelector, useDispatch } from "react-redux"; import { v4 as uuidv4 } from "uuid"; -import { motion } from "framer-motion"; // Components import Aside from "../components/aside/Aside"; import NewsArticleSlider from "../components/news/NewsArticleSlider"; import Loader from "../components/global/Loader"; -// import VideosItem from "../components/videos/VideosItem"; // Icons -import { ReactComponent as Share } from "../assets/icons/share.svg"; import { ReactComponent as View } from "../assets/icons/eye.svg"; // Types @@ -67,12 +64,7 @@ const NewsArticle = () => { }, [data]); return ( - +
{data.data.id > -1 ? ( @@ -103,18 +95,6 @@ const NewsArticle = () => {

{data.data.title}

- {/* {data.data.video ? ( - - ) : ( - - )} */} { className="news-article-text" dangerouslySetInnerHTML={{ __html: data.data.content_html }} >

- {/* */}
) : ( @@ -134,7 +111,7 @@ const NewsArticle = () => {
-
+ ); };