diff --git a/src/App.scss b/src/App.scss index a78f799..c612a88 100644 --- a/src/App.scss +++ b/src/App.scss @@ -90,4 +90,4 @@ .container{ max-width: 1480px; } -} \ No newline at end of file +} diff --git a/src/assets/icons/search-light.svg b/src/assets/icons/search-light.svg new file mode 100644 index 0000000..8049c85 --- /dev/null +++ b/src/assets/icons/search-light.svg @@ -0,0 +1,7 @@ + diff --git a/src/components/Navbar/index.js b/src/components/Navbar/index.js index 53912b4..2fa5080 100644 --- a/src/components/Navbar/index.js +++ b/src/components/Navbar/index.js @@ -31,7 +31,7 @@ function Navbar({ pages, isDark, isLogin }) { className={_.join( [ "z-50 flex flex-1 flex-row fixed left-0 top-0 justify-between w-full lg:bg-opacity-20 lg:bg-transparent lg:shadow-sm lg:backdrop-filter lg:backdrop-blur-md lg:px-5 xl:px-10 transition-all duration-300", - !top ? "bg-white" : "", + !top ? (isDark ? "bg-dark" :"bg-white") : "", ], " " )} diff --git a/src/components/Search/index.js b/src/components/Search/index.js new file mode 100644 index 0000000..8c7cfee --- /dev/null +++ b/src/components/Search/index.js @@ -0,0 +1,49 @@ +import React from "react"; +import _ from "lodash"; + +const langDetector = (lang = "fa", option1, option2) => { + return lang === "fa" ? option1 : option2; +}; + +export default function Search({ + lang, + backgroundColor, + borderColor, + textColor, + icon, +}) { + return ( +
{`پایه ${grades[book.gradeId]}`}
+{`پایه ${grades[book.gradeId]}`}
diff --git a/src/views/Home/Portrait/Private/Shop/index.js b/src/views/Home/Portrait/Private/Shop/index.js index 797ae70..89d3a22 100644 --- a/src/views/Home/Portrait/Private/Shop/index.js +++ b/src/views/Home/Portrait/Private/Shop/index.js @@ -3,8 +3,9 @@ import { Link } from "react-router-dom"; import { connect } from "react-redux"; import { book } from "../../../../../redux/actions"; import arrowBlueIcon from "../../../../../assets/icons/arrow-right-blue.svg"; +import arrowWhiteIcon from "../../../../../assets/icons/arrow-left-white.svg"; -function Shop({ list, getList, grades }) { +function Shop({ list, getList, grades, isDark }) { useEffect(() => { getList(); }, []); @@ -12,8 +13,14 @@ function Shop({ list, getList, grades }) {{`پایه ${grades[book.gradeId]}`}
+{`پایه ${ + grades[book.gradeId] + }`}
@@ -55,8 +60,8 @@ const Book = ({ book, grades }) => { const mapStateToProps = (state) => ({ list: state.book.list, - grades : state.publicApi.grades - + grades: state.publicApi.grades, + isDark: state.publicApi.isDark, }); export default connect(mapStateToProps, { getList: book.list })(Videos); diff --git a/src/views/Home/Portrait/Public/Features/index.js b/src/views/Home/Portrait/Public/Features/index.js index f34babe..9883fa0 100644 --- a/src/views/Home/Portrait/Public/Features/index.js +++ b/src/views/Home/Portrait/Public/Features/index.js @@ -26,7 +26,7 @@ const Feature = ({ feature }) => { > {feature.title} -{feature.text}
+{feature.text}