diff --git a/src/Redux/reducers/userProduct.js b/src/Redux/reducers/userProduct.js
index 09b9c10..cccb820 100644
--- a/src/Redux/reducers/userProduct.js
+++ b/src/Redux/reducers/userProduct.js
@@ -8,7 +8,7 @@ const initialState = {
sum: null,
checkEmpty: false,
hasPhysical: false,
- myList: [],
+ myList: null,
};
export default function userProduct(state = initialState, action) {
let { type, data } = action;
diff --git a/src/views/AR/Item/index.js b/src/views/AR/Item/index.js
index bb1f461..3cf099f 100644
--- a/src/views/AR/Item/index.js
+++ b/src/views/AR/Item/index.js
@@ -1,20 +1,5 @@
import React, { Component } from "react";
-const maxMobileSize = 550;
-const maxDesktopSize = 1250;
-
-const fontSize = {
- mobile: {
- h1: window.innerWidth > maxMobileSize ? 18 : window.innerWidth / 26,
- h2: window.innerWidth > maxMobileSize ? 16 : window.innerWidth / 34,
- div: window.innerWidth > maxMobileSize ? 18 : window.innerWidth / 32,
- },
- desktop: {
- h1: window.innerWidth > maxDesktopSize ? 16 : window.innerWidth / 70,
- div: window.innerWidth > maxDesktopSize ? 16 : window.innerWidth / 85,
- old: window.innerWidth > maxDesktopSize ? 9 : window.innerWidth / 120,
- },
-};
const grades = [
"پیش دبستان",
"اول",
@@ -36,28 +21,24 @@ export default class Item extends Component {
console.log({ data });
return (
<>
- {window.innerWidth < 1000 ? (
-
-
-
-
- {data.product?.book?.name}{" "}
- {grades[+data.product?.book?.gradeId]}
-
-
-
- ) : null}
- {window.innerWidth > 1000 ? (
-
- ) : null}
+ {/* {window.innerWidth < 1000 ? ( */}
+
+
+
+
+ {data.product?.book?.name} {grades[+data.product?.book?.gradeId]}
+
+
+
+ {/* ) : null} */}
>
);
}
diff --git a/src/views/AR/index.js b/src/views/AR/index.js
index e592fad..8db9077 100644
--- a/src/views/AR/index.js
+++ b/src/views/AR/index.js
@@ -72,7 +72,11 @@ class AR extends Component {
-
+
+ {arList.map((item, i) => (
+
+ ))}
+
>
diff --git a/src/views/AR/index.scss b/src/views/AR/index.scss
index 0c19cfc..b0daf8b 100644
--- a/src/views/AR/index.scss
+++ b/src/views/AR/index.scss
@@ -18,3 +18,43 @@
overflow-x: hidden;
padding-top: 100px;
}
+.ar_item {
+ &__info {
+ margin: 4px auto;
+ color: #02a1a6;
+ font-size: 14px;
+ text-align: center;
+ text-decoration: none !important;
+ h1 {
+ margin: 0;
+ }
+ }
+ img {
+ border-radius: 0.5rem;
+ max-height: 210px;
+ width: fit-content;
+ margin: 0 auto;
+ }
+ text-decoration: none !important;
+ width: 100%;
+ background-color: #fafafa;
+ margin: 10px 5px 0;
+ padding: 5px;
+ border-radius: 0.5rem;
+ box-shadow: 0 3px 8px 0 rgb(0 0 0 / 16%);
+}
+@media screen and (min-width: 350px) {
+ .ar_item {
+ width: calc(50% - 10px);
+ }
+}
+@media screen and (min-width: 550px) {
+ .ar_item {
+ width: calc(33% - 10px);
+ }
+}
+@media screen and (min-width: 750px) {
+ .ar_item {
+ width: calc(25% - 10px);
+ }
+}
diff --git a/src/views/Contact/index.js b/src/views/Contact/index.js
index bc48e4d..3eccd4d 100644
--- a/src/views/Contact/index.js
+++ b/src/views/Contact/index.js
@@ -11,7 +11,7 @@ import home from "../../assets/icons/home.png";
import contact from "../../assets/icons/contact.png";
import Location from "./Location/Location";
import Loader from "~/components/Loader/index";
-
+import Support from "../Support";
import "./index.scss";
const maxDesktopSize = 1250;
@@ -56,25 +56,7 @@ class Contact extends Component {
-
پشتیبانی
-
- برای ارتباط با دنیای شگفت انگیز دانوین از فرم زیر استفاده
- کنید و پس از انتخاب دپارتمان مد نظر پیام خود را ارسال
- کنید.
-
-
-
-
-
-
-
+
@@ -167,7 +149,7 @@ class Contact extends Component {
- تهران خیابان انقلاب اسلامی بن بست سروش پلاک 2 طبقه چهار
+ تهران، میدان فردوسی، خیابان موسوی، پلاک ۳۰
- 02163462405
+ ۸۸۸۱۴۶۳۷
diff --git a/src/views/Contact/index.scss b/src/views/Contact/index.scss
index 9817046..4eb154d 100644
--- a/src/views/Contact/index.scss
+++ b/src/views/Contact/index.scss
@@ -14,123 +14,12 @@
margin-bottom: 80px;
&--right {
width: 45%;
- .MuiOutlinedInput-notchedOutline {
- top: 0px !important;
- }
- .MuiOutlinedInput-notchedOutline {
- border-color: #cecece !important;
- border-width: 1px !important;
- color: green !important;
- border-radius: 10px !important;
- }
-
- .MuiOutlinedInput-input {
- padding: 20px 14px !important;
- font-size: calc(100vw / 85) !important;
- }
- .MuiInputLabel-outlined {
- font-family: numeralLight !important;
- display: inline !important;
- position: absolute;
- text-align: right !important;
- right: 10px;
- top: 12px;
- padding: 0px !important;
- transform: translate(0px, 0px) scale(1) !important;
- }
- .MuiInputLabel-shrink {
- text-align: right !important;
- display: inline;
- position: absolute;
- right: -5px;
- top: -8px;
- transform: translate(0px, 0px) scale(0.75) !important;
- padding-right: 15px !important;
- }
-
- label {
- background-color: white;
- max-width: 120px;
- text-align: center;
- color: #797979 !important;
- letter-spacing: -1px;
- }
- .Mui-focused {
- color: rgba(0, 0, 0, 0.54) !important;
- border-color: #c4c4c5 !important;
- }
- h1 {
- letter-spacing: -2px;
- color: #6cbe44;
- font-family: numeralMedium;
- font-size: calc(100vw / 40);
- }
- p {
- font-family: numeralLight;
- font-size: calc(100vw / 95);
- color: #6f7074;
- }
-
- button {
- align-self: flex-start;
- margin-top: 30px;
- font-family: numeralLight;
- text-decoration: none;
- color: white;
- background-color: #6cbe44;
- border-radius: 6px;
- padding: 5px 25px;
- font-size: calc(100vw / 90);
- max-width: 110px;
- border: 0px;
- &:hover {
- color: white;
- }
- }
-
- textarea {
- // width: 350px;
- font-family: numeralLight;
- border-radius: 10px;
- font-size: calc(100vw / 90);
- margin-top: 20px;
- border: 1px solid #c4c4c5;
- padding: 10px 8px;
- color: #6f7074;
- &::placeholder {
- color: #797979;
- }
- &:focus {
- outline: 0px;
- }
- }
- .MuiFormControl-root {
- select {
- font-family: numeralLight;
- height: 100%;
- direction: rtl;
- border: 1px solid #cecece !important;
- text-align: center !important;
- border-radius: 10px !important;
- color: #76797e !important;
- &:focus {
- background-color: white !important;
- }
- option {
- padding: 5px !important;
- }
- }
- .MuiNativeSelect-icon {
- display: none;
- }
- .MuiNativeSelect-select {
- padding: 8px 10px 8px 100px !important;
- }
- }
}
&--left {
- width: 45%;
+ margin-top: 30px;
+ width: 48%;
height: 100%;
+ vertical-align: middle;
p {
font-family: numeralLight;
font-size: calc(100vw / 95);
diff --git a/src/views/Home/HomeSlider/Blog/index.js b/src/views/Home/HomeSlider/Blog/index.js
index a7be123..78a80fa 100644
--- a/src/views/Home/HomeSlider/Blog/index.js
+++ b/src/views/Home/HomeSlider/Blog/index.js
@@ -97,10 +97,12 @@ export default class Simple extends Component {
>
{data.type === "image" ? (
-
+
+
+
) : null}
{data.type === "video" ? (
diff --git a/src/views/Home/HomeSlider/Blog/index.scss b/src/views/Home/HomeSlider/Blog/index.scss
index f13f828..ddb0fa8 100644
--- a/src/views/Home/HomeSlider/Blog/index.scss
+++ b/src/views/Home/HomeSlider/Blog/index.scss
@@ -74,9 +74,10 @@
text-decoration: none;
}
img {
- width: 100%;
+ // width: 100%;
height: 150px;
border-radius: 10px;
+ margin: 0 auto;
}
h1 {
font-family: numeralMedium;
diff --git a/src/views/Home/HomeSlider/index.js b/src/views/Home/HomeSlider/index.js
index 7ee34be..fcbaf1b 100644
--- a/src/views/Home/HomeSlider/index.js
+++ b/src/views/Home/HomeSlider/index.js
@@ -44,13 +44,15 @@ const SimpleHeader = (props) => {
{props.title}
-
-
بیشتر
-
-
+ {/* {props.more ? (
+
+
بیشتر
+
+
+ ) : null} */}
) : null}
>
@@ -66,13 +68,13 @@ const TabHeader = (props) => {
{props.title}
-
بیشتر
-
+ */}
) : null}
{window.innerWidth < 1000 ? (
@@ -81,10 +83,10 @@ const TabHeader = (props) => {
{props.title}
-
+ {/*
بیشتر
-
+
*/}
) : null}
>
diff --git a/src/views/Home/Navbar/Mobile/index.js b/src/views/Home/Navbar/Mobile/index.js
index a377f2a..580bd39 100644
--- a/src/views/Home/Navbar/Mobile/index.js
+++ b/src/views/Home/Navbar/Mobile/index.js
@@ -162,6 +162,7 @@ export default function MobileNavbar(props) {
open={state["right"]}
onClose={toggleDrawer("right", false)}
onOpen={toggleDrawer("right", true)}
+ swipeAreaWidth={10}
>
{list(props, "right")}
diff --git a/src/views/Home/Navbar/Mobile/index.scss b/src/views/Home/Navbar/Mobile/index.scss
index 7c59898..71bdcf2 100644
--- a/src/views/Home/Navbar/Mobile/index.scss
+++ b/src/views/Home/Navbar/Mobile/index.scss
@@ -28,7 +28,7 @@
}
.logo {
width: 85px;
- margin-right: 10px;
+ margin-right: 15px;
}
}
&__logo {
@@ -43,7 +43,7 @@
}
}
&__logo2 {
- margin: 0 10px;
+ margin: 0 15px;
img {
// transform: translate(20px, 0px);
width: 85px;
diff --git a/src/views/Support/index.js b/src/views/Support/index.js
index fb2d6d9..963839b 100644
--- a/src/views/Support/index.js
+++ b/src/views/Support/index.js
@@ -8,10 +8,23 @@ import Select from "../Contact/Select/index";
import Upload from "./Upload";
import "./index.scss";
import { connect } from "react-redux";
-
const maxDesktopSize = 1250;
const maxMobileSize = 550;
-
+const grades = [
+ "پیش دبستان",
+ "اول",
+ "دوم",
+ "سوم",
+ "چهارم",
+ "پنجم",
+ "ششم",
+ "هفتم",
+ "هشتم",
+ "نهم",
+ "دهم",
+ "یازدهم",
+ "دوازدهم",
+];
const fontSize = {
desktop: {
h1: window.innerWidth > maxDesktopSize ? 30 : window.innerWidth / 40,
@@ -66,13 +79,18 @@ class Support extends Component {
//todo redirectHome
}
render() {
- let { status } = this.props;
+ let { myProductList, status } = this.props;
+ console.log({ myProductList });
return (
<>
پشتیبانی
+
+ برای ارتباط با دنیای شگفت انگیز دانوین از فرم زیر استفاده کنید و
+ پس از انتخاب دپارتمان مد نظر پیام خود را ارسال کنید.
+
{status ? null : (
<>
item.product.book.name
+ (item) =>
+ `${item.product.book.name} پایه ${
+ grades[item.product.book.gradeId]
+ }`
) || []
),
]}
@@ -127,12 +148,12 @@ class Support extends Component {
export default connect(
(state) => ({
- myProductList: state.userProduct.mylist || [],
+ myProductList: state.userProduct.myList,
status: state.user.status,
uploadFileId: state.file.supportFileId,
}),
{
- getUserProductList: userProduct.mylist,
+ getUserProductList: userProduct.myList,
submit: comment.add,
upload: file.upload,
}
diff --git a/src/views/Support/index.scss b/src/views/Support/index.scss
index 92fa3c7..4670a17 100644
--- a/src/views/Support/index.scss
+++ b/src/views/Support/index.scss
@@ -141,7 +141,7 @@
}
.mobile-support {
- width: 100vw;
+ // width: 100vw;
max-width: 550px;
margin: 0px auto;
padding: 0px 10px;
@@ -215,7 +215,7 @@
button {
align-self: flex-start;
- margin-top: 30px;
+ margin-top: 5px;
font-family: numeralLight;
text-decoration: none;
color: white;