this.setState({ resendStatus: false })}
>
@@ -301,7 +316,11 @@ export default class Code extends Component {
)}
this.props.parent.setState({ page: 0, cellphone: "" })
diff --git a/src/views/Auth/Login/Code/index.scss b/src/views/Auth/Login/Code/index.scss
index 4acc5e7..0f57005 100644
--- a/src/views/Auth/Login/Code/index.scss
+++ b/src/views/Auth/Login/Code/index.scss
@@ -8,8 +8,15 @@
border-radius: 20px;
justify-content: space-between;
height: 80%;
+ background: url(../../../../assets/images/auth_bg.png);
+ background-position: -58px -60px;
+ background-size: calc(100% + 150px) calc(100% + 200px);
+ background-repeat: no-repeat;
+ height: 80%;
+ max-height: 600px;
img {
margin-bottom: 30px;
+ width: 200px;
}
button {
margin-top: 20px;
@@ -24,6 +31,9 @@
}
&--codes {
direction: ltr;
+ width: 100%;
+ max-width: 300px;
+ position: relative;
input {
max-width: 60px;
max-height: 60px;
@@ -55,52 +65,50 @@
align-items: center;
direction: ltr;
position: relative;
- max-width: 360px;
+ // max-width: 360px;
margin: 0px auto;
img {
margin-bottom: 30px;
position: relative;
- bottom: 40px;
}
h1 {
+ width: 100%;
font-family: numeralBold;
- font-size: calc(100vw / 15);
color: #6f7074;
position: relative;
- bottom: 40px;
}
p {
font-family: numeralLight;
- font-size: calc(100vw / 25);
color: #6f7074;
- letter-spacing: -1px;
position: relative;
- bottom: 40px;
}
button {
margin-top: 20px;
width: 100%;
- max-width: 300px;
border: 0px;
- font-family: numeralMedium;
+ font-family: numeralLight;
background-color: #6cbe44;
color: white;
border-radius: 7px;
padding: 8px;
- font-size: calc(100vw / 20);
+ margin-top: 30px;
+ }
+ div {
+ letter-spacing: -1px;
+ color: #6cbe44;
}
&__codes {
direction: ltr;
+ width: 100%;
input {
max-width: 60px;
max-height: 60px;
background-color: #f2f2f2;
border: 0px;
- margin: 0px 10px;
+ margin: 0px;
color: #6f7074;
text-align: center;
direction: ltr;
- font-size: calc(100vw / 15);
border-radius: 5px;
padding: 10px 15px;
&:focus {
diff --git a/src/views/Auth/Login/Timer/index.js b/src/views/Auth/Login/Timer/index.js
index c13167f..dfa75ae 100644
--- a/src/views/Auth/Login/Timer/index.js
+++ b/src/views/Auth/Login/Timer/index.js
@@ -2,11 +2,15 @@ import { Component } from "react";
import "./index.css";
const maxDesktopSize = 1250;
+const maxMobileSize = 550;
const fontSize = {
desktop: {
div: window.innerWidth > maxDesktopSize ? 12 : window.innerWidth / 95,
},
+ mobile: {
+ div: window.innerWidth > maxMobileSize ? 12 : window.innerWidth / 30,
+ },
};
export default class Timer extends Component {
constructor(props) {
@@ -87,11 +91,30 @@ export default class Timer extends Component {
) : null}
{window.innerWidth < 1000 ? (
-
+
زمان باقیمانده تا انقضای کد
-
{this.state.time.s}
:
-
{this.state.time.m + this.state.time.h * 60}
+
+ {this.state.time.s}
+
+ :
+
+ {this.state.time.m + this.state.time.h * 60}
+
) : null}
>
diff --git a/src/views/Auth/Login/index.js b/src/views/Auth/Login/index.js
index a0c7b8b..ce82fee 100644
--- a/src/views/Auth/Login/index.js
+++ b/src/views/Auth/Login/index.js
@@ -26,6 +26,8 @@ class Login extends Component {
userToken: "1",
applicationToken: "11",
});
+ localStorage.setItem("refresh", "sff234r324rf423dfsdfsaf");
+ localStorage.setItem("userData", "srrfsadf");
}
resend = () => {
diff --git a/src/views/Auth/Profile/index.js b/src/views/Auth/Profile/index.js
index 9db6312..d061f1d 100644
--- a/src/views/Auth/Profile/index.js
+++ b/src/views/Auth/Profile/index.js
@@ -37,7 +37,7 @@ class Profile extends Component {
username: "",
address: "",
gender: "",
- userRoleId: "",
+ userRoleId: "معلم",
nationalId: "",
provinceId: "",
cityId: "",
@@ -66,9 +66,8 @@ class Profile extends Component {
componentDidMount() {
const { getProfile, profile } = this.props;
- // if (!profile) {
- // getProfile();
- // }
+
+ getProfile();
}
onSubmit = (e) => {
diff --git a/src/views/Auth/index.scss b/src/views/Auth/index.scss
index a07174c..505fb88 100644
--- a/src/views/Auth/index.scss
+++ b/src/views/Auth/index.scss
@@ -1,5 +1,7 @@
.auth {
width: 100%;
+ height: 100vh;
min-height: 100vh;
overflow-x: hidden;
+ min-height: 450px;
}
diff --git a/src/views/Cart/Discount/index.js b/src/views/Cart/Discount/index.js
index 0a214e4..cb78483 100644
--- a/src/views/Cart/Discount/index.js
+++ b/src/views/Cart/Discount/index.js
@@ -1,5 +1,5 @@
-import React from 'react';
-import './index.scss';
+import React from "react";
+import "./index.scss";
const maxDesktopSize = 1250;
const maxMobileSize = 550;
@@ -7,35 +7,35 @@ const maxMobileSize = 550;
const fontSize = {
desktop: {
h2: window.innerWidth > maxDesktopSize ? 20 : window.innerWidth / 55,
- input : window.innerWidth > maxDesktopSize ? 16 : window.innerWidth / 75,
- button : window.innerWidth > maxDesktopSize ? 16 : window.innerWidth / 75,
+ input: window.innerWidth > maxDesktopSize ? 16 : window.innerWidth / 75,
+ button: window.innerWidth > maxDesktopSize ? 16 : window.innerWidth / 75,
p: window.innerWidth > maxDesktopSize ? 12 : window.innerWidth / 90,
},
mobile: {
h2: window.innerWidth > maxMobileSize ? 16 : window.innerWidth / 24,
p: window.innerWidth > maxMobileSize ? 12 : window.innerWidth / 32,
input: window.innerWidth > maxMobileSize ? 16 : window.innerWidth / 20,
- button: window.innerWidth > maxMobileSize ? 16 : window.innerWidth / 20,
-
+ button: window.innerWidth > maxMobileSize ? 16 : window.innerWidth / 25,
},
};
-
const DiscoutCode = (props) => {
return (
<>
{window.innerWidth > 1000 ? (
-
کد تخفیف
-
- اگر کد تخفیفی دارید آن را در کادر زیر وارد نمائید و دکمه ثبت کد را
- بزنید
-
-
-
-
+
کد تخفیف
+
+ اگر کد تخفیفی دارید آن را در کادر زیر وارد نمائید و دکمه ثبت کد را
+ بزنید
+
+
+
+
+
-
) : null}
{window.innerWidth < 1000 ? (
) : null}
@@ -54,4 +54,4 @@ const DiscoutCode = (props) => {
);
};
-export default DiscoutCode;
\ No newline at end of file
+export default DiscoutCode;
diff --git a/src/views/Cart/index.scss b/src/views/Cart/index.scss
index 9900037..022a93d 100644
--- a/src/views/Cart/index.scss
+++ b/src/views/Cart/index.scss
@@ -5,24 +5,24 @@
padding: 0px;
font-family: numeralLight;
padding-top: 100px;
- &__totalPrice{
+ &__totalPrice {
padding: 20px 0px;
- border-bottom: 1px dotted #A5A5A5;
+ border-bottom: 1px dotted #a5a5a5;
padding-bottom: 20px;
- h3{
+ h3 {
font-family: numeralLight;
- color: #00CC69;
+ color: #00cc69;
margin: 0px;
}
- div{
+ div {
margin-right: 20px;
- strong{
+ strong {
font-family: numeralBold;
- color: #4D4D4F;
+ color: #4d4d4f;
margin-left: 5px;
}
- span{
+ span {
font-family: numeralLight;
color: #848484;
}
@@ -31,14 +31,13 @@
&__right {
flex: 4;
padding: 10px 0px 0px;
-
}
&__left {
flex: 1.2;
box-shadow: 0px 0px 13px #d5d5d5b0;
border-radius: 13px;
margin-right: 30px;
-
+
&--header {
h2 {
font-family: numeralBold;
@@ -50,7 +49,7 @@
letter-spacing: -1px;
}
}
- &--submit{
+ &--submit {
justify-self: flex-end;
padding: 12px;
width: 100%;
@@ -70,10 +69,10 @@
margin: 0px auto;
padding: 0px 10px 40px;
direction: rtl;
- padding-top: 60px;
+ padding-top: 70px;
overflow-x: hidden;
font-family: numeralLight;
- &__submit{
+ &__submit {
justify-self: flex-end;
padding: 12px;
width: 100%;
@@ -88,9 +87,9 @@
font-family: numeralBold;
color: #373737;
}
-
+
&__payMethods {
- border-bottom: 1px dotted #A5A5A5;
+ border-bottom: 1px dotted #a5a5a5;
margin-top: 20px;
padding-bottom: 20px;
h2 {
@@ -102,9 +101,5 @@
color: #a5a5a5;
letter-spacing: -1px;
}
-
-
}
-
-
}
diff --git a/src/views/Contact/Select/index.js b/src/views/Contact/Select/index.js
index 5f2c8b4..d554c89 100644
--- a/src/views/Contact/Select/index.js
+++ b/src/views/Contact/Select/index.js
@@ -1,40 +1,25 @@
-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: {
- width : 350,
+ width: 350,
borderRadius: 4,
- position: 'relative',
+ position: "relative",
backgroundColor: theme.palette.background.paper,
- border: '0px solid #cecece',
- fontSize: 16,
- padding: '10px 26px 10px 12px',
- transition: theme.transitions.create(['border-color', 'box-shadow']),
+ border: "0px solid #cecece",
+ fontSize: 14,
+ 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',
- '"Segoe UI"',
- 'Roboto',
- '"Helvetica Neue"',
- 'Arial',
- 'sans-serif',
- '"Apple Color Emoji"',
- '"Segoe UI Emoji"',
- '"Segoe UI Symbol"',
- ].join(','),
- '&:focus': {
- borderRadius: 4,
- },
},
}))(InputBase);
@@ -47,7 +32,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);
};
@@ -60,11 +45,9 @@ export default function CustomizedSelects(props) {
onChange={handleChange}
input={
}
>
- {
- props.options.map(item => (
-
- ))
- }
+ {props.options.map((item) => (
+
+ ))}
diff --git a/src/views/Contact/index.js b/src/views/Contact/index.js
index aeddfdc..a384157 100644
--- a/src/views/Contact/index.js
+++ b/src/views/Contact/index.js
@@ -21,8 +21,8 @@ const fontSize = {
},
mobile: {
h1: window.innerWidth > maxMobileSize ? 25 : window.innerWidth / 16,
- p: window.innerWidth > maxMobileSize ? 14 : window.innerWidth / 28,
- span: window.innerWidth > maxMobileSize ? 15 : window.innerWidth / 28,
+ p: window.innerWidth > maxMobileSize ? 14 : window.innerWidth / 34,
+ span: window.innerWidth > maxMobileSize ? 15 : window.innerWidth / 32,
},
};
export default class Contact extends Component {
diff --git a/src/views/Contact/index.scss b/src/views/Contact/index.scss
index 11722bc..94f4c39 100644
--- a/src/views/Contact/index.scss
+++ b/src/views/Contact/index.scss
@@ -163,7 +163,8 @@
padding: 0px 10px;
direction: rtl;
overflow-x: hidden;
- padding-top: 90px;
+ padding-top: 70px;
+ padding-bottom: 50px;
&__form {
width: 100%;
justify-content: space-between;
@@ -200,7 +201,9 @@
right: -5px;
top: -8px;
transform: translate(0px, 0px) scale(0.75) !important;
- padding-right: 15px !important;
+ padding-right: 0px !important;
+ width: fit-content;
+ padding: 0px 6px !important;
}
label {
@@ -209,6 +212,8 @@
text-align: center;
color: #797979 !important;
letter-spacing: -1px;
+ font-family: numeralLight !important;
+ font-size: 14px;
}
.Mui-focused {
color: rgba(0, 0, 0, 0.54) !important;
@@ -222,7 +227,6 @@
p {
font-family: numeralLight;
color: #6f7074;
- letter-spacing: -1px;
}
button {
@@ -249,6 +253,7 @@
border: 1px solid #c4c4c5;
padding: 10px 8px;
color: #6f7074;
+ font-size: 14px;
&::placeholder {
color: #797979;
}
diff --git a/src/views/Faq/index.scss b/src/views/Faq/index.scss
index 71df8b1..68e4c8b 100644
--- a/src/views/Faq/index.scss
+++ b/src/views/Faq/index.scss
@@ -64,7 +64,7 @@
padding: 0px 10px;
direction: rtl;
overflow-x: hidden;
- padding-top: 90px;
+ padding-top: 70px;
&__header {
margin-top: 30px;
width: 100%;
diff --git a/src/views/Home/Membership/Input/index.js b/src/views/Home/Membership/Input/index.js
index 634aa11..8be79ab 100644
--- a/src/views/Home/Membership/Input/index.js
+++ b/src/views/Home/Membership/Input/index.js
@@ -1,14 +1,16 @@
-import React from 'react';
-import TextField from '@material-ui/core/TextField';
-import { makeStyles } from '@material-ui/core/styles';
+import React from "react";
+import TextField from "@material-ui/core/TextField";
+import { makeStyles } from "@material-ui/core/styles";
const useStyles = makeStyles((theme) => ({
root: {
- '& .MuiTextField-root': {
-
- width: '200px',
- position : 'relative',
- marginRight : 10,
+ "& .MuiTextField-root": {
+ width: "200px",
+ position: "relative",
+ marginRight: 30,
+ },
+ input: {
+ border: "0px",
},
},
}));
@@ -19,7 +21,12 @@ export default function FormPropsTextFields(props) {
return (
);
diff --git a/src/views/Home/Membership/index.scss b/src/views/Home/Membership/index.scss
index 3493661..8b0dbb8 100644
--- a/src/views/Home/Membership/index.scss
+++ b/src/views/Home/Membership/index.scss
@@ -41,6 +41,7 @@
right: 4px;
top: 12px;
transform: translate(0px, 0px) scale(1) !important;
+ border: 0px !important;
}
.MuiInputLabel-shrink {
display: inline;
diff --git a/src/views/Home/Navbar/Mobile/index.scss b/src/views/Home/Navbar/Mobile/index.scss
index 1a8b54d..2399126 100644
--- a/src/views/Home/Navbar/Mobile/index.scss
+++ b/src/views/Home/Navbar/Mobile/index.scss
@@ -1,26 +1,26 @@
-.mobile-navbar{
+.mobile-navbar {
width: 100%;
position: fixed;
- top : 0px;
- left : 0px;
+ top: 0px;
+ left: 0px;
justify-content: space-between;
align-items: center;
background-color: white;
z-index: 400;
padding: 15px 10px;
- &__menu{
- img{
- width : calc(100vw / 12);
+ &__menu {
+ img {
+ width: 25px;
}
}
- &__logo{
- img{
- width: calc(100vw / 4);
+ &__logo {
+ img {
+ width: 80px;
}
}
- &__left{
- img{
- width : calc(100vw / 15);
+ &__left {
+ img {
+ width: 25px;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/views/Home/Navbar/index.scss b/src/views/Home/Navbar/index.scss
index d3cd692..00ff47b 100644
--- a/src/views/Home/Navbar/index.scss
+++ b/src/views/Home/Navbar/index.scss
@@ -1,11 +1,11 @@
-.navbar{
+.navbar {
width: 100%;
max-width: 1250px;
position: fixed !important;
top: 0px !important;
overflow-x: hidden;
- background-color:white !important;
- z-index: 200;
-
+ background-color: white !important;
+ z-index: 300;
+
// margin: 0px auto !important;
}
diff --git a/src/views/Home/index.scss b/src/views/Home/index.scss
index 9cc8b54..74f8157 100644
--- a/src/views/Home/index.scss
+++ b/src/views/Home/index.scss
@@ -14,5 +14,5 @@
padding: 0px 10px;
direction: rtl;
overflow-x: hidden;
- padding-top: 90px;
+ padding-top: 70px;
}
diff --git a/src/views/MyBooks/index.scss b/src/views/MyBooks/index.scss
index 7b498e5..5506f07 100644
--- a/src/views/MyBooks/index.scss
+++ b/src/views/MyBooks/index.scss
@@ -1,14 +1,14 @@
-.mybooks{
+.mybooks {
width: 100vw;
max-width: 1250px;
margin: 0px auto;
- padding : 0px 10px;
+ padding: 0px 10px;
direction: rtl;
min-height: calc(100vh - 288px);
padding-top: 100px;
}
-.mobile-mybooks{
+.mobile-mybooks {
width: 100vw;
max-width: 600px;
margin: 0px auto;
@@ -16,27 +16,27 @@
direction: rtl;
overflow-x: hidden;
padding-top: 70px;
- h1{
+ h1 {
padding: 0px 10px;
font-family: numeralBold;
- color: #6F7074;
+ color: #6f7074;
margin-bottom: 10px;
}
- &__item{
- background-color: #F2F2F2;
+ &__item {
+ background-color: #f2f2f2;
width: calc(100vw / 2 - 15px);
margin: 5px;
border-top-left-radius: 30px;
border-top-right-radius: 30px;
margin-bottom: 20px;
- & img{
+ & img {
width: 100%;
height: calc(100vh / 3.5);
border-radius: 30px;
max-height: 200px;
margin-bottom: 10px;
}
- &--buttons{
+ &--buttons {
padding: 5px 9px;
a {
text-decoration: none;
@@ -50,7 +50,7 @@
display: flex;
align-items: center;
justify-content: space-between;
- img{
+ img {
position: absolute;
top: calc(50% - 8px);
left: 5px;
@@ -60,4 +60,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/views/Product/index.js b/src/views/Product/index.js
index cb45548..f6903f2 100644
--- a/src/views/Product/index.js
+++ b/src/views/Product/index.js
@@ -65,9 +65,9 @@ export default class Product extends Component {
-
+
نظرات خریداران
-
+