From e6ced3736d5917ece770469a6df8db09869e6857 Mon Sep 17 00:00:00 2001 From: amir hosein gorji Date: Sat, 11 Sep 2021 17:16:58 +0430 Subject: [PATCH] fix --- src/App.css | 4 +- src/AppRouter.js | 6 +- src/assets/icons/back.png | Bin 0 -> 1584 bytes src/views/Activation/index.js | 71 ++++-- src/views/Activation/index.scss | 41 ++-- src/views/Auth/Profile/index.js | 278 ++++++++++++----------- src/views/Cart/index.js | 10 +- src/views/Download/BreadCrumb/index.js | 45 ++++ src/views/Download/BreadCrumb/index.scss | 8 + src/views/Download/Item/index.js | 63 +++++ src/views/Download/index.js | 93 ++++++++ src/views/Download/index.scss | 20 ++ src/views/Home/Navbar/Mobile/index.js | 49 ++-- src/views/Home/Navbar/Mobile/index.scss | 9 +- src/views/Home/index.scss | 2 +- src/views/MyBooks/index.js | 1 + src/views/Product/index.js | 10 +- src/views/Products/index.scss | 2 +- src/views/QR/index.js | 5 +- src/views/QRScan/index.js | 8 +- src/views/QRScan/index.scss | 2 +- 21 files changed, 520 insertions(+), 207 deletions(-) create mode 100644 src/assets/icons/back.png create mode 100644 src/views/Download/BreadCrumb/index.js create mode 100644 src/views/Download/BreadCrumb/index.scss create mode 100644 src/views/Download/Item/index.js create mode 100644 src/views/Download/index.js create mode 100644 src/views/Download/index.scss 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 0000000000000000000000000000000000000000..c197d6d5ed177e20032ccc964abfc3f08854f026 GIT binary patch literal 1584 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!SkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpuXh+ zJ|V6^1uAm#Dsl=EoYKnj3d-_|+~TsT@+wMl3M%pnO7il`^71OO%E}4~Dyj-LqQ=T{ z3bHcFN+6YTO7b9yg@^I~|Nk3%pSb{|s=Fk}FBnMU0F0U)^HX?KPyVVD zS${^5bIRY-0!(E;{#1m&oyTu`Z;$jP-RB;hpA#7ySm*9`|CHeUW)9yzsaX=QW-}I) zGEILMD!${6>3-Rl3m9|0{jOo=nEdZUl<1cGmRjeJC@y16|I)<5))z1Q&_u1+%&77D+jMHq+t^N5>qmhfN(qWsDfWuMMrCJNt$S?=ErcQmeeqCn+ z!^FU?rK{#&H+QI8bWH7GejX$Hh8r#S-zg|Rxz6<9T-YJDf=tFOTgwyvB{0m*+sR-v ziLvA)dqUHngA99$7)!pp{P$$&nG$E{5O4p?{CGu6eS*LnhU7OB*d*GbPgpB)EY1+V zbYsVlj%%HsQy$C`a-T8J@OWd(O-sia@e0f=9qR3|0%FrID0)PSwTOPuGl+_f4ri2} z9j%dgd;4OcvhN#exdguP9}#GGH+cBNMZoX8g9B6L+@=D)f7c~qW8ylu?%U_cxxGAU z;~n*+@0}N$!*cuUDh%guDXMK_{PJlP)4d1keVQ--Hh(^^-)TN6`eW_y$!853Hcq*+ zrG#_0UhIEo`!mx!AD_N)MidwuswJ)wB`Jv|saDBFsX&Us$iUD-*U(Vcz%sK)ZhlPp*TOSq&%@GmBBMNF+J5cF+DRm zTft1vT+c$+QUPeCnXZAEuA!MiAP{GiloVL$>z9|8>t%ve12IswUVc&fv;8L9fF??S zObp2=%}uhha>-9F%}vcKv9byPDlKL(T>gKzKAIY^omN&EshQ~+B@Cv9Mh7kg1OnBF zBbftL6P}q;k^xd8Q^R}*s6-M;iEn0ZYDr~5Dg)S6`UQFE_M5`|(9H1-0jgp!G&M0a z2Vzr0kFEogfl7pt%n8n{N@XzDvo!H`a+-SBVJ%SF8A&=c$de&0Gba@o1bX_V1v&YN zDaHDxX8NUNc`3!gM*4 -
- - بازگشت - -
+
فعال سازی کتاب

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

+
+ . +

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

+
-
- . -

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

-
+ + {/*
+ +
+
+ {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} - -