diff --git a/package.json b/package.json index 801c307..a468a63 100644 --- a/package.json +++ b/package.json @@ -71,6 +71,7 @@ "react-dom": "^17.0.2", "react-elastic-carousel": "^0.11.5", "react-player": "^2.9.0", + "react-qr-reader": "^2.2.1", "react-qr-scanner": "^1.0.0-alpha.7", "react-redux": "^7.2.4", "react-refresh": "^0.8.3", diff --git a/src/assets/Video/film.mp4 b/src/assets/Video/film.mp4 index 9b74705..6b56ebf 100644 Binary files a/src/assets/Video/film.mp4 and b/src/assets/Video/film.mp4 differ diff --git a/src/views/Auth/Login/index.js b/src/views/Auth/Login/index.js index e26eab8..8e9897f 100644 --- a/src/views/Auth/Login/index.js +++ b/src/views/Auth/Login/index.js @@ -19,7 +19,7 @@ class Login extends Component { async componentDidUpdate() { const { cellphone, otp, page } = this.state; if (cellphone && !otp) this.props.otp({ cellphone }); - if (page && cellphone && otp) this.props.otp_login({ cellphone : cellphone, otp: Number(otp) }); + if (page && cellphone && otp) this.props.otp_login({ cellphone, otp }); } resend = () => { diff --git a/src/views/QR/VideoBox/React-video-js-player/index.scss b/src/views/QR/VideoBox/React-video-js-player/index.scss index b82bffd..ea931bf 100644 --- a/src/views/QR/VideoBox/React-video-js-player/index.scss +++ b/src/views/QR/VideoBox/React-video-js-player/index.scss @@ -1,36 +1,34 @@ -.video-js{ +.video-js { width: 100% !important; height: 100% !important; border-radius: 20px; - button{ - &:focus{ + button { + &:focus { outline: none !important; } } - .vjs-tech{ - border-radius: 20px; + .vjs-tech { + border-radius: 20px !important; } - .vjs-big-play-button{ - font-size: 3.3em; - width: 50px; - height: 48px; - transform: translateX(25px); - background-color: #37D386; - border-radius: 50%; - border: 0px; + .vjs-big-play-button { + font-size: 3.3em !important; + width: 50px !important; + height: 48px !important; + transform: translateX(25px) !important; + background-color: #37d386 !important; + border-radius: 50% !important; + border: 0px !important; } - .vjs-control-bar{ + .vjs-control-bar { direction: ltr !important; - border-bottom-left-radius: 20px; - border-bottom-right-radius: 20px; - .vjs-progress-control{ - border-bottom-left-radius: 20px; - border-bottom-right-radius: 20px; + border-bottom-left-radius: 20px !important; + border-bottom-right-radius: 20px !important; + .vjs-progress-control { + border-bottom-left-radius: 20px !important; + border-bottom-right-radius: 20px !important; & > * { direction: ltr !important; - } } - } -} \ No newline at end of file +} diff --git a/src/views/QRScan/Scanner/index.js b/src/views/QRScan/Scanner/index.js index 16326bf..f87f93b 100644 --- a/src/views/QRScan/Scanner/index.js +++ b/src/views/QRScan/Scanner/index.js @@ -1,42 +1,36 @@ -import React, { Component } from 'react' -import QrReader from 'react-qr-scanner' +import React, { Component } from "react"; +import QrReader from "react-qr-reader"; export default class Scanner extends Component { - constructor(props){ - super(props) + constructor(props) { + super(props); this.state = { delay: 100, - result: '', - } + result: "", + }; - this.handleScan = this.handleScan.bind(this) + this.handleScan = this.handleScan.bind(this); } - handleScan(data){ + handleScan(data) { this.props.parent.setState({ value: data, - }) + }); } - handleError(err){ - console.error(err) + handleError(err) { + console.error(err); } - render(){ - const previewStyle = { - width: 320, - borderRadius: '10px' - } - - return( + render() { + return ( <> + style={{ width: "100%" }} + facingMode={this.props.parent.state.facingMode} + /> - ) + ); } -} \ No newline at end of file +} diff --git a/src/views/QRScan/index.js b/src/views/QRScan/index.js index 3383aed..a5030a4 100644 --- a/src/views/QRScan/index.js +++ b/src/views/QRScan/index.js @@ -12,6 +12,7 @@ import "./index.scss"; export default class QRScan extends Component { state = { value: null, + facingMode: "environment", }; render() { const { data } = this.props; @@ -39,12 +40,23 @@ export default class QRScan extends Component { قرار دهید تا اسکن دوربین انجام شود

+
+ +
+
-
+ {/*
-
+
*/} {this.state.value !== null ? (
=0.5.1, websocket-driver@^0.7.4: version "0.7.4" resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"