From 552c12e29da09031bc7bb88211770da3c4140f7d Mon Sep 17 00:00:00 2001 From: Reza_ashrafi Date: Wed, 13 Jul 2022 12:18:54 +0430 Subject: [PATCH] update 5 files --- src/components/Navbar/index.js | 2 +- src/views/Home/Landscape/Page1/Book/index.js | 5 +- .../Home/Portrait/Public/Header/index.js | 122 ++++++------------ src/views/Home/Portrait/Public/index.js | 15 ++- 4 files changed, 57 insertions(+), 87 deletions(-) diff --git a/src/components/Navbar/index.js b/src/components/Navbar/index.js index deba3ad..b057df8 100644 --- a/src/components/Navbar/index.js +++ b/src/components/Navbar/index.js @@ -294,7 +294,7 @@ function Navbar({ {!user ? ( {window.t("ورود یا ثبت نام")} diff --git a/src/views/Home/Landscape/Page1/Book/index.js b/src/views/Home/Landscape/Page1/Book/index.js index b4b2c58..72d5602 100644 --- a/src/views/Home/Landscape/Page1/Book/index.js +++ b/src/views/Home/Landscape/Page1/Book/index.js @@ -1,11 +1,10 @@ import React from "react"; import { Link } from "react-router-dom"; -// import _ from 'lodash'; export default function Book({ book }) { return ( - - {book.name} + + {book.name} diff --git a/src/views/Home/Portrait/Public/Header/index.js b/src/views/Home/Portrait/Public/Header/index.js index 7858b0a..450f839 100644 --- a/src/views/Home/Portrait/Public/Header/index.js +++ b/src/views/Home/Portrait/Public/Header/index.js @@ -1,20 +1,19 @@ import React, { useState } from "react"; import { Link } from "react-router-dom"; import { Carousel } from "@trendyol-js/react-carousel"; + +//components +import Video from "../../../../../components/JolPlayer"; import Book from "../../../Landscape/Page1/Book"; import Lights from "../../../Landscape/Page1/Lights"; -import Video from "../../../../../components/JolPlayer"; + +//assets import arrow from "../../../../../assets/icons/dropdown-blue.svg"; -import olum1Image from "../../../../../assets/images/olum-1.svg"; -import olum2Image from "../../../../../assets/images/olum-2.svg"; -import olum4Image from "../../../../../assets/images/olum-4.svg"; -import olum7Image from "../../../../../assets/images/olum-7.svg"; -import zist11Image from "../../../../../assets/images/zist-11.svg"; import sheffImage from "../../../../../assets/images/sheff.svg"; import flatFlower from "../../../../../assets/icons/flat-flower-white.svg"; import jojoImage from "../../../../../assets/images/jojo.svg"; -function Header({ list }) { +function Header({ bookList }) { const [show, setShow] = useState(2); return ( @@ -32,37 +31,41 @@ function Header({ list }) { className="absolute transform left-1/2 top-0 -translate-x-1/2 opacity-30" /> -
-
- - } - leftArrow={ - - } - > - {list.map((book, index) => ( - - ))} - + {bookList?.length ? ( +
+
+ + } + leftArrow={ + + } + > + {bookList?.map((book, index) => ( + + ))} + +
+
- -
+ ) : null} +
- -
); } export default Header; - -Header.defaultProps = { - list: [ - { - name: window.t("زیست یازدهم"), - - imageUrl: zist11Image, - }, - { - name: window.t("علوم دوم"), - - imageUrl: olum2Image, - }, - { - name: window.t("علوم اول"), - - imageUrl: olum1Image, - }, - { - name: window.t("علوم هفتم"), - - imageUrl: olum7Image, - }, - { - name: window.t("علوم چهارم"), - - imageUrl: olum4Image, - }, - { - name: window.t("علوم چهارم"), - - imageUrl: olum4Image, - }, - { - name: window.t("علوم چهارم"), - imageUrl: olum4Image, - }, - ], -}; diff --git a/src/views/Home/Portrait/Public/index.js b/src/views/Home/Portrait/Public/index.js index 303207e..b2c8c4d 100644 --- a/src/views/Home/Portrait/Public/index.js +++ b/src/views/Home/Portrait/Public/index.js @@ -1,4 +1,7 @@ import React from 'react'; +import {connect} from 'react-redux'; + +//components import Header from './Header'; import Features from './Features'; import Responsive from './Responsive'; @@ -6,17 +9,21 @@ import Platforms from './Platforms'; import App from './App'; import GradiantText from './GradiantText'; -function Public() { +function Public({bookList}) { return (
-
+
- +
) } -export default Public; +const mapStateToProps = (state) => ({ + bookList: state.book.list +}) + +export default connect(mapStateToProps)(Public);