- >
+ )
) : null}
{window.innerWidth < 1000 ? (
-
-
-
- {data.map((item, i) => (
-
- ))}
+ arList ? (
+
+
+
+ {arList.map((item, i) => (
+
+ ))}
+
+
+ ) : (
+
+
-
+ )
) : null}
>
);
}
}
-AR.defaultProps = {
- data: [
- {
- id: 222,
- title: "دانوین زیست دهم",
- imageUrl: zist_10,
- },
- {
- id: 223,
- title: "دانوین شیمی نهم",
- imageUrl: chemistry_10,
- },
- {
- id: 225,
- title: "دانوین علوم نهم",
- imageUrl: sciense_6,
- },
- {
- id: 226,
- title: "دانوین علوم هشتم",
- imageUrl: sciense_8,
- },
- {
- id: 227,
- title: "دانوین علوم هفتم",
- imageUrl: sciense_7,
- },
- {
- id: 228,
- title: "دانوین علوم ششم",
- imageUrl: sciense_6,
- },
- ],
-};
+export default connect(
+ (state) => ({
+ arList: state.publicApi.arList,
+ }),
+ {
+ getArList: publicApi.getArList,
+ }
+)(AR);
diff --git a/src/views/Cart/Table/index.scss b/src/views/Cart/Table/index.scss
index 25409cc..4ec92f1 100644
--- a/src/views/Cart/Table/index.scss
+++ b/src/views/Cart/Table/index.scss
@@ -1,142 +1,150 @@
-.mobile-cart-table-product{
+.mobile-cart-table-product {
width: 100%;
font-family: numeralLight;
- img{
+ img {
height: 100px;
width: 70px;
border-radius: 10px;
}
- &__info{
+ &__info {
width: 100%;
margin-left: 10px;
- strong, p , span{
+ strong,
+ p,
+ span {
margin: 0px;
font-family: numeralLight;
}
- p{
- color: #00CC69;
+ p {
+ color: #00cc69;
}
- span{
- color: #2580EC;
+ span {
+ color: #2580ec;
}
- &--delete{
+ &--delete {
margin-top: 10px;
}
}
-
}
-.mobile-cart-table-price{
+.mobile-cart-table-price {
text-align: center;
font-family: numeralLight;
- &__price{
- strong, span{
+ &__price {
+ strong,
+ span {
font-family: numeralLight;
}
- strong{
- color: #4D4D4F;
+ strong {
+ color: #4d4d4f;
}
- span{
- color: #4D4D4F;
+ span {
+ color: #4d4d4f;
letter-spacing: -1px;
}
}
- &__info{
- strong, p , span{
+ &__info {
+ strong,
+ p,
+ span {
margin: 0px;
font-family: numeralLight;
}
- p{
- color: #00CC69;
+ p {
+ color: #00cc69;
}
- span{
- color: #2580EC;
+ span {
+ color: #2580ec;
}
}
- &__counter{
+ &__counter {
padding: 5px 5px;
border: 1px solid rgb(177, 177, 177);
border-radius: 8px;
margin-top: 10px;
- button{
+ button {
border: 0px;
background-color: white;
- color: #4D4D4F;
+ color: #4d4d4f;
+ &:focus {
+ outline: none;
+ }
}
- span{
+ span {
margin: 0px 15px;
- color: #4D4D4F;
-
+ color: #4d4d4f;
}
}
}
-.MuiTableCell-root{
+.MuiTableCell-root {
padding: 10px 0px !important;
+ font-family: numeralLight !important;
}
-.cart-item{
+.cart-item {
// justify-content: space-between;
border-top: 1px solid #eee;
padding: 15px 0px;
- &__info{
+ &__info {
// flex-shrink: 1;
- img{
+ img {
height: 100px;
border-radius: 10px;
margin-left: 10px;
}
- div{
- strong{
+ div {
+ strong {
font-family: numeralBold;
color: #373737;
}
- p{
+ p {
font-family: numeralLight;
- color: #00CC69;
+ color: #00cc69;
margin: 0px;
letter-spacing: -1px;
}
- span{
+ span {
font-family: numeralLight;
- color: #2580EC;
+ color: #2580ec;
letter-spacing: -1px;
}
}
}
- &__price{
- color: #4D4D4F;
- strong{
+ &__price {
+ color: #4d4d4f;
+ strong {
font-family: numeralBold;
}
- span{
+ span {
font-family: numeralLight;
}
}
- &__counter{
- justify-content: center;
- &--box{
+ &__counter {
+ justify-content: center;
+ &--box {
padding: 5px 10px;
border: 1px solid rgb(177, 177, 177);
border-radius: 8px;
- button{
+ button {
border: 0px;
background-color: white;
- color: #4D4D4F;
+ color: #4d4d4f;
+ &:focus {
+ outline: none;
+ }
}
- span{
+ span {
margin: 0px 15px;
- color: #4D4D4F;
-
+ color: #4d4d4f;
}
}
-
}
- &__delete{
+ &__delete {
margin-left: 20px;
- span{
+ span {
font-family: numeralLight;
- color : #FC120A;
+ color: #fc120a;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/views/Cart/index.js b/src/views/Cart/index.js
index 7fbda2b..43403a5 100644
--- a/src/views/Cart/index.js
+++ b/src/views/Cart/index.js
@@ -201,9 +201,10 @@ class Cart extends Component {
سبد خرید
@@ -228,7 +229,7 @@ class Cart extends Component {
- {this.totalPrice()}
+ {payPrice}
تومان
diff --git a/src/views/Product/index.js b/src/views/Product/index.js
index 9fb10c1..9fa8ed3 100644
--- a/src/views/Product/index.js
+++ b/src/views/Product/index.js
@@ -4,6 +4,7 @@ import { ToastContainer } from "react-toastify";
import { Link } from "react-router-dom";
import { connect } from "react-redux";
import { book } from "~/Redux/actions";
+import { userProduct } from "~/Redux/actions";
import Footer from "../Home/Footer/index";
import Navbar from "../Home/Navbar/index";
@@ -51,8 +52,7 @@ class Product extends Component {
}
render() {
- const { product, sameProducts, supportItems, info, page, loading, list } =
- this.props;
+ const { product, supportItems, info, page } = this.props;
return (
<>
{window.innerWidth > 1000 ? (
@@ -125,38 +125,56 @@ class Product extends Component {
/>
{info.name}
- {product.subTitle}
+ {info.category}
- خرید نسخه دیجیتال
+ {page === "digital" ? "کتاب فیزیکی" : "نسخه دیجیتال"}
- خرید نسخه چاپی
+ مطالعه نمونه کتاب
-
+ this.props.pushToCart({
+ productId:
+ page === "digital"
+ ? info.product[0].id
+ : info.product[1].id,
+ userId: this.props.id,
+ count: 1,
+ })
+ }
className="mobile-product__header--sampleButton"
style={{ fontSize: fontSize.mobile.a }}
>
- مطالعه نمونه کتاب
-
+ افزودن به سبد خرید
+
خلاصه کتاب
- {product.abstraction}
+ {info.description || "توضیحات محصول خالیست"}
@@ -164,11 +182,11 @@ class Product extends Component {
این کتاب شامل چه مواردی است؟
- {product.modules.map((item, i) => (
+ {/* {product.modules.map((item, i) => (
- ))}
+ ))} */}
@@ -176,16 +194,16 @@ class Product extends Component {
نکاتی که هنگام خرید باید به آن توجه داشته باشید؟
- {product.tips.map((item, i) => (
+ {/* {product.tips.map((item, i) => (
- ))}
+ ))} */}
- {product.description}
+ {info.description}
@@ -193,9 +211,11 @@ class Product extends Component {
نظرات خریداران
- {product.comments.map((item, i) => (
-
- ))}
+ {info.comment.length > 0
+ ? info.comment.map((item, i) => (
+
+ ))
+ : null}
@@ -231,8 +251,9 @@ export default connect(
// status: state.user.status,
loading: state.book.loading,
list: state.book.list,
+ id: state.user.status.id,
}),
- { getInfo: book.info, getList: book.list }
+ { getInfo: book.info, getList: book.list, pushToCart: userProduct.add }
)(Product);
Product.defaultProps = {
diff --git a/src/views/Product/index.scss b/src/views/Product/index.scss
index ece880e..9b1197f 100644
--- a/src/views/Product/index.scss
+++ b/src/views/Product/index.scss
@@ -37,8 +37,9 @@
&--purchase {
border-top-left-radius: 8px;
border-bottom-left-radius: 8px;
- background-color: #00cc69;
- color: white !important;
+ color: #c24141 !important;
+ border: 1px solid #c24141 !important;
+ border-right: 0px solid white;
flex: 1;
}
&--digitalButton {
@@ -50,10 +51,19 @@
}
&--sampleButton {
border-radius: 8px;
- border: 1px solid #c24141 !important;
- background-color: white;
- color: #c24141 !important;
+ background-color: #00cc69;
margin-top: 8px;
+ border: none;
+ border: 0px;
+ font-family: numeralLight;
+ padding: 10px 0px;
+ text-align: center;
+ letter-spacing: -1px;
+ text-decoration: none;
+ color: white;
+ &:focus {
+ outline: none;
+ }
}
}
&__abstraction {