diff --git a/src/App.css b/src/App.css index c8773a4..c7181d9 100644 --- a/src/App.css +++ b/src/App.css @@ -3,7 +3,9 @@ direction: rtl; font-family: numeralLight; } - +#root { + height: 100vh; +} @font-face { font-family: numeralMedium; src: url(assets/IRANSans/Farsi_numerals/IRANSans\(FaNum\)_Medium.ttf); diff --git a/src/AppRouter.js b/src/AppRouter.js index f8061e0..83b85a9 100644 --- a/src/AppRouter.js +++ b/src/AppRouter.js @@ -26,6 +26,7 @@ import Chatroom from "./views/ChatRoom/index"; import Cart from "./views/Cart/index"; import MyBooks from "./views/MyBooks/index"; import AR from "./views/AR/index"; +import Download from "./views/Download/index"; import Support from "./views/Support/index"; import Callback from "./views/Callback/index"; import NewProfile from "./views/NewProfile/index"; @@ -60,7 +61,7 @@ class AppRouter extends Component { } componentDidMount() { - //sthis.props.getUserProductList(); + if (proxy.status()) this.props.getUserProductList(); } render() { @@ -425,6 +426,9 @@ class AppRouter extends Component { /> )} + + + {mobile ? ( proxy.status() ? ( diff --git a/src/assets/icons/back.png b/src/assets/icons/back.png new file mode 100644 index 0000000..c197d6d Binary files /dev/null and b/src/assets/icons/back.png differ diff --git a/src/views/Activation/index.js b/src/views/Activation/index.js index 7677511..cd76919 100644 --- a/src/views/Activation/index.js +++ b/src/views/Activation/index.js @@ -6,7 +6,9 @@ import Footer from "../Home/Footer/index"; import { Link } from "react-router-dom"; import analytics from "../../assets/icons/analytics.svg"; - +import ReplayIcon from "@material-ui/icons/Replay"; +import Scanner from "../QRScan/Scanner/index"; +import qrcode from "~/assets/icons/drawer-qr.png"; import "./index.scss"; const maxDesktopSize = 1250; @@ -99,39 +101,60 @@ class Activation extends Component { {window.innerWidth < 1000 ? (
-
- - بازگشت - -
+
فعال سازی کتاب

فعال سازی کتاب الکترونیک

+
+ . +

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

+
-
- . -

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

-
+ + {/*
+ +
+
+ {this.state.value !== null ? ( +
this.setState({ value: null })} + > + +
+ ) : ( + + )} +
*/}
console.log()} > - this.setState({ code: e.target.value })} - placeholder={"FC5DFD : مثال"} - style={{ fontSize: fontSize.mobile.form }} - /> +
+ + qr + + this.setState({ code: e.target.value })} + placeholder={"FC5DFD : مثال"} + style={{ fontSize: fontSize.mobile.form }} + /> +
diff --git a/src/views/Activation/index.scss b/src/views/Activation/index.scss index 67cb90a..fae22c8 100644 --- a/src/views/Activation/index.scss +++ b/src/views/Activation/index.scss @@ -6,7 +6,7 @@ direction: rtl; padding-top: 70px; overflow-x: hidden; - + height: 100%; &__back { width: 100%; justify-content: flex-end; @@ -57,22 +57,37 @@ position: fixed; bottom: 20px; background-color: white !important; - input { - width: 100%; - background-color: #f6f6f6; - color: #4d4d4f; - text-align: center; - direction: ltr; - border: 0px; - padding: 15px 0px; + .inputBox { + background-color: #aaaaaa; border-radius: 10px; - &:focus { - outline: 0px; + height: 50px; + .qrb { + cursor: pointer; + margin: auto; + width: 50px; } - &::placeholder { - color: #afafaf; + img { + margin: auto; + padding: 0 10px; + } + input { + width: 100%; + background-color: #dbdbdb; + color: #4d4d4f; + text-align: center; + direction: ltr; + border: 0px; + padding: 15px 0px; + border-radius: 10px 0 0 10px; + &:focus { + outline: 0px; + } + &::placeholder { + color: #afafaf; + } } } + button { display: inline; font-family: numeralLight; diff --git a/src/views/Auth/Profile/index.js b/src/views/Auth/Profile/index.js index e649713..f8eff97 100644 --- a/src/views/Auth/Profile/index.js +++ b/src/views/Auth/Profile/index.js @@ -16,6 +16,7 @@ import logo from "../../../assets/icons/logo.png"; import pic from "../../../assets/images/pic.png"; import "./index.scss"; import { useHistory } from "react-router-dom"; +import Navbar from "../../Home/Navbar/index"; function Navigate({ path }) { let history = useHistory(); return <>{history.push(path)}; @@ -403,163 +404,170 @@ class Profile extends Component { ) : null} {window.innerWidth < 1000 ? ( profile ? ( -
- دانوین -
-
-

حساب کاربری

-

- لطفا مشحصات خود را به صورت کامل وارد نمایید -

+ <> + +
+
+ {/* دانوین */} + +
+
+

+ حساب کاربری +

+

+ لطفا مشحصات خود را به صورت کامل وارد نمایید +

+
+
- -
- - - - - - - - {this.state.status === 1 ? ( - + + + - ) : null} + + {this.state.status === 1 ? ( + + ) : null} - - {/* + {/* + ) : null} + {this.state.status == 2 ? ( + + ) : null} + {this.state.status == 2 ? ( + + ) : null} - ) : null} - {this.state.status == 2 ? ( - - ) : null} - {this.state.status == 2 ? ( - - ) : null} - -