From 6401a3d9bf9639fde8d66a931a5df62663bcd220 Mon Sep 17 00:00:00 2001 From: RezaAshrafi77 Date: Tue, 5 Oct 2021 21:24:21 +0330 Subject: [PATCH] reza fixed some bugs --- public/index.html | 2 +- src/components/Navbar/index.scss | 28 +++--- src/components/Navbar/index.tsx | 14 +-- src/components/PrivateRouter/index.js | 30 +++++++ src/components/Timer/index.css | 8 ++ src/components/Timer/index.js | 85 +++++++++++++++++++ src/redux/actions-type/book.tsx | 7 +- src/redux/actions/book.tsx | 3 +- src/redux/reducers/book.tsx | 23 +++-- src/router.js | 53 ++++++++++++ src/router.tsx | 55 ------------ src/views/Auth/Login/index.scss | 5 ++ src/views/Auth/Login/index.tsx | 25 +++--- src/views/Auth/SignUp/index.scss | 10 +++ src/views/Auth/SignUp/index.tsx | 60 ++++++++----- src/views/Auth/index.tsx | 5 +- src/views/Home/Books/Book/index.tsx | 2 +- src/views/Home/Books/index.tsx | 12 ++- .../Subscription/DiscountCode/index.scss | 4 +- .../Subscription/SubscribeRadio/index.scss | 13 +-- .../Subscription/SubscribeRadio/index.tsx | 16 ++-- src/views/Subscription/index.scss | 12 +-- src/views/VideoTube/Attachments/index.scss | 2 +- src/views/VideoTube/Book/index.scss | 4 +- src/views/VideoTube/LessonPlayList/index.scss | 3 + src/views/VideoTube/LessonPlayList/index.tsx | 27 ++++-- src/views/VideoTube/index.scss | 18 ++-- 27 files changed, 366 insertions(+), 160 deletions(-) create mode 100644 src/components/PrivateRouter/index.js create mode 100644 src/components/Timer/index.css create mode 100644 src/components/Timer/index.js create mode 100644 src/router.js delete mode 100644 src/router.tsx diff --git a/public/index.html b/public/index.html index 19b741f..2c92801 100644 --- a/public/index.html +++ b/public/index.html @@ -29,7 +29,7 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> - React App + Danovin VOD diff --git a/src/components/Navbar/index.scss b/src/components/Navbar/index.scss index 40935db..00be9d9 100644 --- a/src/components/Navbar/index.scss +++ b/src/components/Navbar/index.scss @@ -13,6 +13,18 @@ a{ color: white; } + &--buttons{ + li{ + text-align: center; + padding: 6px 0px; + border-radius: 7px; + min-width : 130px; + font-family: numeralLight; + a{ + margin: 0px auto; + } + } + } } &___share{ background-color: #46454A; @@ -41,12 +53,7 @@ } &--buttons{ li{ - padding: 6px; - border-radius: 7px; - min-width : 100px; - text-align: center; - font-size: 14px; - font-family: numeralLight; + font-size: 18px; } } } @@ -79,13 +86,8 @@ } &--buttons{ li{ - padding: 6px; - border-radius: 7px; - min-width : 100px; - text-align: center; - font-size: calc(100vw / 95); - font-family: numeralLight; - + font-size: calc(100vw / 100); + min-width: 100px; } } } diff --git a/src/components/Navbar/index.tsx b/src/components/Navbar/index.tsx index ba8643f..1d82a69 100644 --- a/src/components/Navbar/index.tsx +++ b/src/components/Navbar/index.tsx @@ -32,7 +32,7 @@ export default function Navbar(props: any) { const { page } = props; const toggleDrawer = (anchor: any, open: any) => (event: any) => { - console.log('on'); + console.log("on"); if ( event && event.type === "keydown" && @@ -41,7 +41,7 @@ export default function Navbar(props: any) { return; } - setState({...state, [anchor]: open }); + setState({ ...state, [anchor]: open }); }; const list = (props: any, anchor: any) => ( @@ -59,6 +59,8 @@ export default function Navbar(props: any) { /> ); + + const userStatus = proxy.status(); return (