diff --git a/src/views/Blog/index.js b/src/views/Blog/index.js index b6168fd..6596025 100644 --- a/src/views/Blog/index.js +++ b/src/views/Blog/index.js @@ -50,8 +50,16 @@ export const Blog = ({
+ {/* {!blog?.author.picFileId && } + {blog?.author.picFileId && ( + author + )} */}
- + {window.t("نوشته از:" + " " + "کامران ایزدی")}

@@ -159,9 +167,9 @@ export const Blog = ({

{/* desktop */}
- ) :
- -
; + ) : ( +
+ ); }; const mapStateToProps = (state) => ({ diff --git a/src/views/Blogs/layouts/New.js b/src/views/Blogs/layouts/New.js index 833d607..9a3a12d 100644 --- a/src/views/Blogs/layouts/New.js +++ b/src/views/Blogs/layouts/New.js @@ -3,6 +3,7 @@ import { connect } from "react-redux"; import { blog } from "../../../redux/actions"; import { Link } from "react-router-dom"; import Avatar from "../../../components/Avatar"; +import moment from "jalali-moment"; export const New = ({ blog, isMobile, setActive }) => { return ( @@ -26,29 +27,36 @@ export const New = ({ blog, isMobile, setActive }) => { {blog?.title} -

- {window.t( - "هر نفسی که فرو می‌ بریم، مرگی را که مدام به ما دست‌ اندازی می‌کند پس می‌زند در نهایت این مرگ" - )} -

+ +
- + {!blog?.author.picFileId && } + {blog?.author.picFileId && ( + author + )}
- {`{window.t("نوشته از:")}` + " " + `{window.t("کامران ایزدی")}`} + {`{window.t("نوشته از:")}` + " " + `${blog?.author.name}`}

- {window.t("سردبیر بخش وبلاگ دانوین")} + {blog?.author.role}

- {`{window.t("زمان مطالعه")}` + " " + `{window.t("۳۰ دقیقه")}`} + {`{window.t("زمان مطالعه")}` + " " + `${blog?.duration}`} - {window.t("1400/11/24")} + {moment(blog?.updatedAt).locale("fa").format("YYYY/MM/DD")}
diff --git a/src/views/Blogs/layouts/Single.js b/src/views/Blogs/layouts/Single.js index 1df92c3..9698f8d 100644 --- a/src/views/Blogs/layouts/Single.js +++ b/src/views/Blogs/layouts/Single.js @@ -25,22 +25,31 @@ export const Single = ({ blog, isMobile }) => {
- + {!blog?.author.picFileId && } + {blog?.author.picFileId && ( + author + )}
{window.t("نوشته از:")}

- {window.t("سردبیر بخش وبلاگ دانوین ایزدی")} + {blog?.author.name}

-
+
- {window.t("زمان مطالعه" + " " + "۳۰ دقیقه")} + {window.t( + "زمان مطالعه" + " " + `${blog?.duration}` + " " + "دقیقه" + )} - {window.t("1400/11/24")} + {moment(blog?.updatedAt).locale("fa").format("YYYY/MM/DD")}
@@ -60,7 +69,7 @@ export const Single = ({ blog, isMobile }) => { {!isMobile && (
- {!blog?.author.picFileId && } + {!blog?.author.picFileId && } {blog?.author.picFileId && (