diff --git a/src/Redux/reducers/book.js b/src/Redux/reducers/book.js index f98232b..d81afb2 100644 --- a/src/Redux/reducers/book.js +++ b/src/Redux/reducers/book.js @@ -11,6 +11,7 @@ const initialState = { }; const grades = [ + "پیش دبستان", "اول", "دوم", "سوم", @@ -32,7 +33,11 @@ export default function book(state = initialState, action) { if (window.innerWidth < 1000) { itemsSubject.unshift("نام کتاب"); } - let itemsLevel = data.map((item) => grades[item.gradeId]); + let itemsLevel = data + .map((item) => item.gradeId * 1) + .sort((a, b) => a - b) + .map((e) => grades[e]); + console.log(itemsLevel); if (window.innerWidth < 1000) { itemsLevel.unshift("پایه تحصیلی"); } diff --git a/src/assets/icons/logo.png b/src/assets/icons/logo.png index de20ca3..42ea219 100644 Binary files a/src/assets/icons/logo.png and b/src/assets/icons/logo.png differ diff --git a/src/assets/icons/logo2.png b/src/assets/icons/logo2.png new file mode 100644 index 0000000..de20ca3 Binary files /dev/null and b/src/assets/icons/logo2.png differ diff --git a/src/assets/icons/logoMobile.png b/src/assets/icons/logoMobile.png index 66203b1..42ea219 100644 Binary files a/src/assets/icons/logoMobile.png and b/src/assets/icons/logoMobile.png differ diff --git a/src/assets/icons/logoMobile2.png b/src/assets/icons/logoMobile2.png new file mode 100644 index 0000000..66203b1 Binary files /dev/null and b/src/assets/icons/logoMobile2.png differ diff --git a/src/views/Activation/index.js b/src/views/Activation/index.js index a07d337..cbf1336 100644 --- a/src/views/Activation/index.js +++ b/src/views/Activation/index.js @@ -112,8 +112,7 @@ export default class Activation extends Component {
.

- کد فعال سازی در اختیار شما قرار گرفته است را در قسمت زیر وارد - وارد تا کتاب الکترونیک آن فعالسازی شود + برای خدمات هوشمند کتاب کد فعال سازی را اینجا وارد نمایید

@@ -203,20 +218,7 @@ class Profile extends Component {
+ diff --git a/src/views/Home/HomeSearch/Select/index.js b/src/views/Home/HomeSearch/Select/index.js index cf3ddf4..6de4ffe 100644 --- a/src/views/Home/HomeSearch/Select/index.js +++ b/src/views/Home/HomeSearch/Select/index.js @@ -1,37 +1,37 @@ -import React from 'react'; -import { makeStyles, withStyles } from '@material-ui/core/styles'; -import FormControl from '@material-ui/core/FormControl'; -import NativeSelect from '@material-ui/core/NativeSelect'; -import InputBase from '@material-ui/core/InputBase'; +import React from "react"; +import { makeStyles, withStyles } from "@material-ui/core/styles"; +import FormControl from "@material-ui/core/FormControl"; +import NativeSelect from "@material-ui/core/NativeSelect"; +import InputBase from "@material-ui/core/InputBase"; const BootstrapInput = withStyles((theme) => ({ root: { - 'label + &': { + "label + &": { marginTop: theme.spacing(3), }, }, input: { borderRadius: 4, - position: 'relative', + position: "relative", backgroundColor: theme.palette.background.paper, - border: '1px solid #ced4da', + border: "1px solid #ced4da", fontSize: 16, - padding: '10px 26px 10px 12px', - transition: theme.transitions.create(['border-color', 'box-shadow']), + padding: "10px 26px 10px 12px", + transition: theme.transitions.create(["border-color", "box-shadow"]), // Use the system font instead of the default Roboto font. fontFamily: [ - '-apple-system', - 'BlinkMacSystemFont', + "-apple-system", + "BlinkMacSystemFont", '"Segoe UI"', - 'Roboto', + "Roboto", '"Helvetica Neue"', - 'Arial', - 'sans-serif', + "Arial", + "sans-serif", '"Apple Color Emoji"', '"Segoe UI Emoji"', '"Segoe UI Symbol"', - ].join(','), - '&:focus': { + ].join(","), + "&:focus": { borderRadius: 4, }, }, @@ -45,7 +45,7 @@ const useStyles = makeStyles((theme) => ({ export default function CustomizedSelects(props) { const classes = useStyles(); - const [age, setAge] = React.useState(''); + const [age, setAge] = React.useState(""); const handleChange = (event) => { setAge(event.target.value); }; @@ -58,11 +58,11 @@ export default function CustomizedSelects(props) { onChange={handleChange} input={} > - { - props.options.map(item => ( - - )) - } + {props.options.map((item, i) => ( + + ))}
diff --git a/src/views/Home/HomeSearch/index.js b/src/views/Home/HomeSearch/index.js index 14bb2f4..e927753 100644 --- a/src/views/Home/HomeSearch/index.js +++ b/src/views/Home/HomeSearch/index.js @@ -17,7 +17,7 @@ export default class HomeSearch extends Component { />
- + +
- : null - } - { - window.innerWidth < 1000 ? + + ) : null} + {window.innerWidth < 1000 ? (
-

دانوینی شو

+

+ دانوینی شو +

مشخصات خودت رو وارد کنید و امتیاز هدیه بگیرید

- +
- +
-
: null - } + + ) : null} ); } diff --git a/src/views/Home/Navbar/Laptop/index.js b/src/views/Home/Navbar/Laptop/index.js index a024526..f94cdc8 100644 --- a/src/views/Home/Navbar/Laptop/index.js +++ b/src/views/Home/Navbar/Laptop/index.js @@ -72,7 +72,7 @@ export default class LaptopNavbar extends Component { LaptopNavbar.defaultProps = { links: [ { name: "صفحه اصلی", to: "/", page: "home" }, - { name: "فروشگاه ", to: "/products", page: "products" }, + { name: "سبد خرید ", to: "/cart", page: "cart" }, { name: "سوالات متداول", to: "/faq", page: "faq" }, { name: "درباره ما", to: "/about", page: "about" }, { name: "تماس با ما", to: "/contact", page: "contact" }, diff --git a/src/views/Home/Navbar/Mobile/NavbarDrawer/NavbarDrawer.js b/src/views/Home/Navbar/Mobile/NavbarDrawer/NavbarDrawer.js index 9786ac9..832ef47 100644 --- a/src/views/Home/Navbar/Mobile/NavbarDrawer/NavbarDrawer.js +++ b/src/views/Home/Navbar/Mobile/NavbarDrawer/NavbarDrawer.js @@ -29,6 +29,7 @@ class NavbarDrawer extends Component { render() { const { status } = this.props; + let score = 2; return (
@@ -52,16 +53,16 @@ class NavbarDrawer extends Component { className="navbar-drawer__header--dropdown" onClick={() => this.setState({ dropdown: false })} > - 25 امتیاز - + {score ? {score} امتیاز : null} +
) : (
this.setState({ dropdown: true })} > - 25 امتیاز - + {score ? {score} امتیاز : null}{" "} +
)}
@@ -148,8 +149,8 @@ NavbarDrawer.defaultProps = { message: "", }, { - name: "فروشگاه", - link: "/products", + name: "سبد خرید", + link: "/cart", icon: فروشگاه, toast: "", message: "", @@ -165,8 +166,8 @@ NavbarDrawer.defaultProps = { name: "دانوینی‌ها", link: "/", icon: دانوینی‌ها, - toast: "", - message: "", + toast: "به زودی این بخش فعال می شود", + message: "به زودی", }, { name: "پشتیبانی", @@ -181,7 +182,7 @@ NavbarDrawer.defaultProps = { link: "/profile", icon: ویرایش مشخصات, toast: "", - message: "4 پیام", + // message: "4 پیام", }, { name: "خروج", diff --git a/src/views/Home/Navbar/Mobile/NavbarDrawer/NavbarDrawer.scss b/src/views/Home/Navbar/Mobile/NavbarDrawer/NavbarDrawer.scss index 3274ad5..51432ab 100644 --- a/src/views/Home/Navbar/Mobile/NavbarDrawer/NavbarDrawer.scss +++ b/src/views/Home/Navbar/Mobile/NavbarDrawer/NavbarDrawer.scss @@ -25,7 +25,7 @@ margin-right: 10px; & h1 { margin-bottom: 0px; - font-size: calc(100vw / 22); + font-size: 17px; color: #4d4d4f; letter-spacing: -1px; } @@ -41,10 +41,11 @@ top: 10px; span { background-color: #6cbe44; + color: white; padding: 2px 4px; border-radius: 7px; - font-size: calc(100vw / 27); + font-size: 15px; } } & img { @@ -57,6 +58,7 @@ &__dropdown { width: calc(100vw * 0.8); margin: 10px auto; + background-color: #eee; .navbar-drawer-user { padding: 10px 10px; width: 100%; diff --git a/src/views/Home/Navbar/Mobile/index.js b/src/views/Home/Navbar/Mobile/index.js index ec7cad8..3b3bdcf 100644 --- a/src/views/Home/Navbar/Mobile/index.js +++ b/src/views/Home/Navbar/Mobile/index.js @@ -79,7 +79,9 @@ export default function MobileNavbar(props) {
{page === "home" ? ( - جستجو + + جستجو + ) : (
diff --git a/src/views/Home/index.scss b/src/views/Home/index.scss index ff01b3c..ca3dacd 100644 --- a/src/views/Home/index.scss +++ b/src/views/Home/index.scss @@ -16,3 +16,14 @@ overflow-x: hidden; padding-top: 70px; } + +body::-webkit-scrollbar, +.no-scroll::-webkit-scrollbar { + display: none !important; +} + +body, +.no-scroll { + -ms-overflow-style: none !important; /* IE and Edge */ + scrollbar-width: none !important; /* Firefox */ +} diff --git a/src/views/NewProfile/index.js b/src/views/NewProfile/index.js index 22ce5f1..0c27898 100644 --- a/src/views/NewProfile/index.js +++ b/src/views/NewProfile/index.js @@ -194,6 +194,21 @@ class NewProfile extends Component { render() { const { user, profile } = this.props; + const grades = [ + "پیش دبستان", + "اول", + "دوم", + "سوم", + "چهارم", + "پنجم", + "ششم", + "هفتم", + "هشتم", + "نهم", + "دهم", + "یازدهم", + "دوازدهم", + ]; return ( <> {window.innerWidth > 1000 ? ( @@ -275,20 +290,7 @@ class NewProfile extends Component {
+
+ + سبد خرید + +
) : null} diff --git a/src/views/Products/index.scss b/src/views/Products/index.scss index 8facf96..02db07f 100644 --- a/src/views/Products/index.scss +++ b/src/views/Products/index.scss @@ -14,11 +14,13 @@ } } } - +.MuiMenuItem-root { + font-family: numeralLight !important; +} .mobile-products { width: 100vw; max-width: 600px; - margin: 0px auto; + margin: 0px auto 40px; padding: 0px; direction: rtl; overflow-x: hidden; @@ -41,7 +43,7 @@ &__search { // width: 100%; position: relative; - margin: 15px 10px; + margin: 5px 10px; height: 35px; img { position: absolute; diff --git a/src/views/Support/index.js b/src/views/Support/index.js index 5113742..3c9702a 100644 --- a/src/views/Support/index.js +++ b/src/views/Support/index.js @@ -44,8 +44,8 @@ class Support extends Component {

پشتیبانی

- - + {/* + */} - +