From 503bf41a3d99f5f14ef0cc008166849835673c29 Mon Sep 17 00:00:00 2001 From: Reza_ashrafi Date: Mon, 14 Feb 2022 18:08:59 +0330 Subject: [PATCH] reza added something --- src/router.js | 18 +++++ src/views/Blog/index.js | 119 +++++++++++++++++++++++++++++ src/views/Blogs/layouts/Join.js | 2 +- src/views/Blogs/layouts/New.js | 2 +- src/views/Blogs/layouts/Single.js | 5 +- src/views/Blogs/layouts/Suggest.js | 2 +- 6 files changed, 143 insertions(+), 5 deletions(-) create mode 100644 src/views/Blog/index.js diff --git a/src/router.js b/src/router.js index 07864c3..72c6a33 100644 --- a/src/router.js +++ b/src/router.js @@ -29,6 +29,7 @@ import Dashboard from "./views/Dashboard"; import FooterDesign1 from "./components/Footer"; import Bugs from "./views/BugsAndProblems"; import Blogs from "./views/Blogs"; +import Blog from "./views/Blog"; // import VideoTube from "./views/Home/VideoTube"; function Router({ @@ -370,6 +371,23 @@ function Router({ /> } /> + + } + /> } /> { + useEffect(() => { + setHeaderOptions({ shown: true }); + getInfo({ id: location.getId() }); + if (blogs.length === 0) { + getList(); + } + }, []); + return ( +
+ +
+
+ + {blog?.title} + +
+
+ +
+ + {"نوشته از:" + " " + "کامران ایزدی"} + +

+ {"سردبیر بخش وبلاگ دانوین"} +

+
+
+
+ + {"زمان مطالعه" + " " + "۳۰ دقیقه"} + + + {"1400/11/24"} + +
+
+
+
{" "} +
+
+ {blogs.length > 0 && ( + e.stopPropagation()} + /> + } + leftArrow={ + e.stopPropagation()} + /> + } + > + {blogs.map((blog, index) => ( + + ))} + + )} +
+
+ ); +}; + +const mapStateToProps = (state) => ({ + isMobile: state.publicApi.isMobile, + blog: state.blog.blog, + blogs: state.blog.list, +}); + +const mapDispatchToProps = { + getInfo: blog.info, + getList: blog.list, + setHeaderOptions: publicApi.setHeaderOptions, +}; + +export default connect(mapStateToProps, mapDispatchToProps)(Blog); diff --git a/src/views/Blogs/layouts/Join.js b/src/views/Blogs/layouts/Join.js index ad032a5..a2a0764 100644 --- a/src/views/Blogs/layouts/Join.js +++ b/src/views/Blogs/layouts/Join.js @@ -6,7 +6,7 @@ import picImage from "../pic.svg"; export const Join = ({}) => { return ( -
+
{ return ( diff --git a/src/views/Blogs/layouts/Single.js b/src/views/Blogs/layouts/Single.js index cdeb617..3f8706d 100644 --- a/src/views/Blogs/layouts/Single.js +++ b/src/views/Blogs/layouts/Single.js @@ -1,10 +1,11 @@ import React from "react"; import { connect } from "react-redux"; +import {Link} from 'react-router-dom'; import Avatar from "../../../components/Avatar"; export const Single = ({ blog, isMobile }) => { return ( -
+
{
-
+ ); }; diff --git a/src/views/Blogs/layouts/Suggest.js b/src/views/Blogs/layouts/Suggest.js index d7f1ac8..9b8b42f 100644 --- a/src/views/Blogs/layouts/Suggest.js +++ b/src/views/Blogs/layouts/Suggest.js @@ -5,7 +5,7 @@ import { Link } from "react-router-dom"; export const Suggest = ({ blog }) => { return (