diff --git a/src/views/Home/Navbar/Mobile/NavbarDrawer/NavbarDrawer.js b/src/views/Home/Navbar/Mobile/NavbarDrawer/NavbarDrawer.js
index 2ad6694..adbae9b 100644
--- a/src/views/Home/Navbar/Mobile/NavbarDrawer/NavbarDrawer.js
+++ b/src/views/Home/Navbar/Mobile/NavbarDrawer/NavbarDrawer.js
@@ -164,7 +164,7 @@ NavbarDrawer.defaultProps = {
},
{
name: "بلاگ",
- link: "/blog",
+ link: "/blogs",
icon:
,
toast: "",
message: "",
diff --git a/src/views/MyBooks/BreadCrumb/index.js b/src/views/MyBooks/BreadCrumb/index.js
new file mode 100644
index 0000000..dbd670a
--- /dev/null
+++ b/src/views/MyBooks/BreadCrumb/index.js
@@ -0,0 +1,45 @@
+import React from "react";
+import Breadcrumbs from "@material-ui/core/Breadcrumbs";
+import { Link } from "react-router-dom";
+
+import "./index.scss";
+
+function handleClick(event) {
+ event.preventDefault();
+ console.info("You clicked a breadcrumb.");
+}
+
+const maxDesktopSize = 1250;
+const maxMobileSize = 650;
+
+const fontSize = {
+ desktop: window.innerWidth > maxDesktopSize ? 12 : window.innerWidth / 90,
+ mobile: window.innerWidth > maxDesktopSize ? 14 : window.innerWidth / 25,
+};
+
+export default function ActiveLastBreadcrumb(props) {
+ const { name } = props;
+ return (
+
+ 1000 ? fontSize.desktop : fontSize.mobile,
+ }}
+ to={"/"}
+ >
+ صفحه اصلی
+
+ 1000 ? fontSize.desktop : fontSize.mobile,
+ color: "#00CC69",
+ }}
+ to={"/mybooks"}
+ >
+ کتابهای من
+
+
+ );
+}
diff --git a/src/views/MyBooks/BreadCrumb/index.scss b/src/views/MyBooks/BreadCrumb/index.scss
new file mode 100644
index 0000000..e10f243
--- /dev/null
+++ b/src/views/MyBooks/BreadCrumb/index.scss
@@ -0,0 +1,8 @@
+.MuiBreadcrumbs-li{
+ a {
+ text-decoration: none;
+ font-family: numeralLight;
+ color: #6F7074;
+ letter-spacing: -1px;
+ }
+}
diff --git a/src/views/MyBooks/index.js b/src/views/MyBooks/index.js
index abf8c0f..928f897 100644
--- a/src/views/MyBooks/index.js
+++ b/src/views/MyBooks/index.js
@@ -5,6 +5,7 @@ import { Link } from "react-router-dom";
import Navbar from "../Home/Navbar/index";
import Footer from "../Home/Footer/index";
+import BreadCrumbs from "./BreadCrumb/index";
import sciense_6 from "~/assets/images/olum6.jpg";
import sciense_8 from "~/assets/images/olum8.jpg";
@@ -12,7 +13,7 @@ import sciense_9 from "~/assets/images/olum9.jpg";
import sciense_7 from "~/assets/images/olum7.jpg";
import shimi_10 from "~/assets/images/shimi10.jpg";
import zist_10 from "~/assets/images/zist10.jpg";
-
+import "./index.scss";
const maxDesktopSize = 1250;
const maxMobileSize = 550;
@@ -21,6 +22,10 @@ const fontSize = {
h1: window.innerWidth > maxMobileSize ? 24 : window.innerWidth / 20,
a: window.innerHeight > maxMobileSize ? 15 : window.innerWidth / 30,
},
+ desktop: {
+ h1: window.innerWidth > maxDesktopSize ? 18 : window.innerWidth / 70,
+ a: window.innerHeight > maxDesktopSize ? 15 : window.innerWidth / 85,
+ },
};
class MyBooks extends React.Component {
@@ -29,13 +34,19 @@ class MyBooks extends React.Component {
}
render() {
- const { books } = this.props;
+ const { list } = this.props;
return (
<>
{window.innerWidth > 1000 ? (
<>
+
+
+ {list.map((item, i) => (
+
+ ))}
+
>
@@ -46,7 +57,7 @@ class MyBooks extends React.Component {
{/*
کتابهای من
*/}
- {books.map((item, i) => (
+ {list.map((item, i) => (
))}
@@ -69,76 +80,37 @@ export default connect(
const Item = (props) => {
const { data, id } = props;
return (
-
-
-
-
{data.title}
-
-
+ <>
+ {window.innerWidth < 1000 &&
+ data.condition === 2 &&
+ data.product.productType === (1 || 3) ? (
+
+
+
+
+ {data.product.book.name}
+
+
+
+ ) : null}
+ {window.innerWidth > 1000 &&
+ data.condition === 2 &&
+ data.product.productType === (1 || 3) ? (
+
+
+
+
+ {data.product.book.name}
+
+
+
+ ) : null}
+ >
);
};
-
-MyBooks.defaultProps = {
- books: [
- {
- id: 0,
- title: "علوم ششم",
- link: "",
- imageUrl: sciense_6,
- status: {
- digital: true,
- ar: true,
- },
- },
- {
- id: 1,
- link: "",
- title: "علوم هشتم",
- imageUrl: sciense_8,
- status: {
- digital: false,
- ar: true,
- },
- },
- {
- id: 2,
- link: "",
- title: "علوم نهم",
- imageUrl: sciense_9,
- status: {
- digital: true,
- ar: false,
- },
- },
- {
- id: 3,
- link: "",
- title: "علوم هفتم",
- imageUrl: sciense_7,
- status: {
- digital: true,
- ar: true,
- },
- },
- {
- id: 6,
- link: "",
- title: "شیمی دهم",
- imageUrl: shimi_10,
- status: {
- digital: true,
- ar: true,
- },
- },
- {
- id: 7,
- link: "",
- title: "زیست دهم",
- imageUrl: zist_10,
- status: {
- digital: true,
- ar: true,
- },
- },
- ],
-};
diff --git a/src/views/MyBooks/index.scss b/src/views/MyBooks/index.scss
new file mode 100644
index 0000000..6e26005
--- /dev/null
+++ b/src/views/MyBooks/index.scss
@@ -0,0 +1,14 @@
+.mybooks {
+ width: 100vw;
+ max-width: 1250px;
+ margin: 0px auto;
+ padding: 0px 10px 40px;
+ direction: rtl;
+ overflow-x: hidden;
+ min-height: calc(100vh - 288px);
+ padding-top: 70px;
+ &__list {
+ max-width: 1000px;
+ margin: 0px auto;
+ }
+}
diff --git a/src/views/Product/index.scss b/src/views/Product/index.scss
index db4df48..7b63f09 100644
--- a/src/views/Product/index.scss
+++ b/src/views/Product/index.scss
@@ -37,10 +37,10 @@
&--purchase {
border-top-left-radius: 8px;
border-bottom-left-radius: 8px;
- color: #c24141 !important;
- border: 1px solid #c24141 !important;
- border-right: 0px solid white;
+ background-color: #efefef;
+ color: #6f7074 !important;
flex: 1;
+ margin-right: 2px;
}
&--digitalButton {
border-top-right-radius: 8px;
@@ -48,6 +48,7 @@
background-color: #efefef;
color: #6f7074 !important;
flex: 1;
+ margin-left: 2px;
}
&--sampleButton {
border-radius: 8px;
diff --git a/src/views/QR/BookContent/index.js b/src/views/QR/BookContent/index.js
index 8fb29d3..ad5fdad 100644
--- a/src/views/QR/BookContent/index.js
+++ b/src/views/QR/BookContent/index.js
@@ -1,7 +1,7 @@
import React, { Component, useState } from "react";
import ppt from "../../../assets/icons/ppt.svg";
-import MaterialAudioPlayer from '../VoiceBox/Material-audio-player/index';
+import MaterialAudioPlayer from "../VoiceBox/Material-audio-player/index";
import "./index.scss";
@@ -46,7 +46,7 @@ const Identifier = (props) => {
className="d-flex align-items-center"
>
- {props.data.title}
+ {props.data.name}
@@ -58,7 +58,7 @@ const Identifier = (props) => {
className="d-flex align-items-center"
>
- {props.data.title}
+ {props.data.name}
) : null}
@@ -69,7 +69,7 @@ const Identifier = (props) => {
className="d-flex align-items-center"
>
- {props.data.title}
+ {props.data.name}
) : null}
@@ -80,7 +80,7 @@ const Identifier = (props) => {
className="d-flex align-items-center"
>
- {props.data.title}
+ {props.data.name}
) : null}
@@ -100,7 +100,7 @@ const Identifier = (props) => {
const Item = (props) => {
return (
- {props.data.title}
+ {props.data.name}
);
};
diff --git a/src/views/QR/BookContent/index.scss b/src/views/QR/BookContent/index.scss
index b88e16d..417328d 100644
--- a/src/views/QR/BookContent/index.scss
+++ b/src/views/QR/BookContent/index.scss
@@ -1,112 +1,111 @@
-.book-content{
+.book-content {
width: 100%;
- &__header{
+ &__header {
margin-bottom: 15px;
- span{
+ span {
height: 1px;
- background-color: green;
+ background-color: rgb(165, 165, 165);
display: flex;
flex: 1;
}
- h2{
+ h2 {
font-family: numeralBold;
- color: #6F7074;
+ color: #6f7074;
margin-bottom: 0px;
padding-left: 5px;
}
}
- &-ppt{
+ &-ppt {
width: 100%;
border-radius: 10px;
margin: 10px 0px;
text-decoration: none;
padding: 10px 10px;
background: url(../../../assets/icons/ppt.svg) no-repeat #8dfaf61f;
- background-size: 40px;
+ background-size: 35px;
background-position: 10px 10px;
- h2{
+ h2 {
font-family: numeralLight;
- color: #0D9189;
+ color: #0d9189;
padding: 5px;
- span{
+ span {
width: 7px;
height: 7px;
border-radius: 50%;
- background-color: #0D9189;
+ background-color: #0d9189;
margin-left: 5px;
}
}
}
- &-pdf{
+ &-pdf {
width: 100%;
border-radius: 10px;
margin: 10px 0px;
text-decoration: none;
padding: 10px 10px;
background: url(../../../assets/icons/pdf.svg) no-repeat #ffa9a91e;
- background-size: 37px;
- background-position: 10px 10px;
- h2{
+ background-size: 35px;
+ background-position: 10px 5px;
+ h2 {
font-family: numeralLight;
- color: #FF0808;
+ color: #ff0808;
padding: 5px;
- span{
+ span {
width: 7px;
height: 7px;
border-radius: 50%;
- background-color: #FF0808;
+ background-color: #ff0808;
margin-left: 5px;
}
}
}
- &-voice{
+ &-voice {
width: 100%;
border-radius: 10px;
background-color: #8dfac541;
padding: 10px 10px;
margin: 10px 0px;
text-decoration: none;
- .MuiPaper-elevation1{
+ .MuiPaper-elevation1 {
box-shadow: none !important;
}
- .MuiGrid-container{
+ .MuiGrid-container {
flex-wrap: nowrap !important;
flex-direction: row-reverse;
- background-color: rgba(255,255,255,0) !important;
+ background-color: rgba(255, 255, 255, 0) !important;
padding: 0px !important;
}
-
- .MuiGrid-item{
+
+ .MuiGrid-item {
display: flex !important;
flex-direction: row !important;
padding: 0px !important;
margin-right: 5px !important;
- p{
- color: #02A255 !important;
+ p {
+ color: #02a255 !important;
}
}
- .MuiSvgIcon-root{
- color: #37D386 !important;
+ .MuiSvgIcon-root {
+ color: #37d386 !important;
font-size: 50px !important;
}
- .MuiSlider-root{
- color: #37D386;
+ .MuiSlider-root {
+ color: #37d386;
}
- h2{
+ h2 {
font-family: numeralLight;
- color: #02733C;
- span{
+ color: #02733c;
+ span {
width: 7px;
height: 7px;
border-radius: 50%;
- background-color: #00CC69;
+ background-color: #00cc69;
margin-left: 5px;
}
}
-
}
- &-video{
+ &-video {
width: 100%;
border-radius: 10px;
background-color: #8ddbfa41;
@@ -116,10 +115,10 @@
background-size: 28px;
background-position: 18px 13px;
text-decoration: none;
- h2{
+ h2 {
font-family: numeralLight;
color: #021c73;
- span{
+ span {
width: 7px;
height: 7px;
border-radius: 50%;
@@ -128,7 +127,7 @@
}
}
}
- &-links{
+ &-links {
width: 100%;
border-radius: 10px;
background-color: #fffac948;
@@ -138,11 +137,11 @@
background: url(../../../assets/icons/attachment.svg) no-repeat #fffac948;
background-size: 37px;
background-position: 10px 50%;
- h2{
+ h2 {
font-family: numeralMedium;
color: #72891edc;
padding: 5px;
- span{
+ span {
width: 10px;
height: 10px;
border-radius: 50%;
@@ -150,19 +149,18 @@
margin-left: 5px;
}
}
- ul{
+ ul {
padding: 0px;
margin: 0px;
padding-right: 15px;
color: #72891e;
- li{
+ li {
font-family: numeralLight;
- a{
+ a {
text-decoration: none;
color: #72891e;
}
}
}
}
-
-}
\ No newline at end of file
+}
diff --git a/src/views/QR/Image/Modal/index.js b/src/views/QR/Image/Modal/index.js
index e0e4530..104d831 100644
--- a/src/views/QR/Image/Modal/index.js
+++ b/src/views/QR/Image/Modal/index.js
@@ -20,7 +20,7 @@ export default function Modal(props) {
<>
{window.innerWidth > 1000 ? null : (
setClientX(e.touches[0].clientX)}
onTouchEnd={(e) => handleTouch(e.changedTouches[0].clientX)}
>
@@ -37,14 +37,14 @@ export default function Modal(props) {
/>
handleNavigation("right", selectedImage)}
>
handleNavigation("left", selectedImage)}
>
diff --git a/src/views/QR/Image/Modal/index.scss b/src/views/QR/Image/Modal/index.scss
index 4b10e0b..6cc4bee 100644
--- a/src/views/QR/Image/Modal/index.scss
+++ b/src/views/QR/Image/Modal/index.scss
@@ -16,7 +16,6 @@
width: calc(100% - 70px);
height: 100%;
object-fit: contain;
- margin: 20px 0px;
}
}
diff --git a/src/views/QR/Image/index.js b/src/views/QR/Image/index.js
index 0723b6c..6ecfe74 100644
--- a/src/views/QR/Image/index.js
+++ b/src/views/QR/Image/index.js
@@ -1,5 +1,6 @@
import React, { Component, useState } from "react";
import Modal from "./Modal/index";
+import PhotoLibraryRoundedIcon from "@material-ui/icons/PhotoLibraryRounded";
import "./index.scss";
@@ -8,6 +9,10 @@ const maxMobileSize = 550;
const fontSize = {
mobile: {
span: window.innerWidth > maxMobileSize ? 18 : window.innerWidth / 10,
+ h3: window.innerWidth > maxMobileSize ? 16 : window.innerWidth / 25,
+ },
+ desktop: {
+ h3: window.innerWidth > maxMobileSize ? 16 : window.innerWidth / 80,
},
};
export default function QRImage(props) {
@@ -194,8 +199,23 @@ export default function QRImage(props) {
return (
<>
- {window.innerWidth < 1000 ? mobileImages() : null}
- {window.innerWidth > 1000 ? desktopImages() : null}
+ {window.innerWidth < 1000 ? (
+
+
+ عکسها{" "}
+
+ {mobileImages()}
+
+ ) : null}
+ {window.innerWidth > 1000 ? (
+
+
+
+ عکسها
+
+ {desktopImages()}
+
+ ) : null}
>
);
}
diff --git a/src/views/QR/Image/index.scss b/src/views/QR/Image/index.scss
index 94b06ea..eb4a976 100644
--- a/src/views/QR/Image/index.scss
+++ b/src/views/QR/Image/index.scss
@@ -1,6 +1,7 @@
.mobile-qr-image {
width: 100%;
justify-content: space-between;
+ margin: 0px 0px 20px;
&__single {
width: 100%;
border-radius: 10px;
diff --git a/src/views/QR/PDF/index.js b/src/views/QR/PDF/index.js
index 8c8c651..389cae2 100644
--- a/src/views/QR/PDF/index.js
+++ b/src/views/QR/PDF/index.js
@@ -1,12 +1,20 @@
import React from "react";
-
+import PictureAsPdfRoundedIcon from "@material-ui/icons/PictureAsPdfRounded";
import "./index.scss";
const maxDesktopSize = 1250;
+const maxMobileSize = 550;
const fontSize = {
desktop: {
- h2: window.innerWidth > maxDesktopSize ? 12 : window.innerWidth / 120,
+ h2: window.innerWidth > maxDesktopSize ? 14 : window.innerWidth / 100,
+ div: window.innerWidth > maxDesktopSize ? 14 : window.innerWidth / 100,
+ h3: window.innerWidth > maxMobileSize ? 16 : window.innerWidth / 80,
+ },
+ mobile: {
+ h2: window.innerWidth > maxMobileSize ? 13 : window.innerWidth / 30,
+ div: window.innerWidth > maxMobileSize ? 13 : window.innerWidth / 30,
+ h3: window.innerWidth > maxMobileSize ? 16 : window.innerWidth / 25,
},
};
@@ -14,32 +22,52 @@ export default function PDF(props) {
return (
<>
{window.innerWidth > 1000 ? (
-
-
-
- {props.data.title}
-
-
-
+
) : null}
{window.innerWidth < 1000 ? (
-
-
-
- {props.data.title}
-
-
-
+
) : null}
>
);
diff --git a/src/views/QR/PDF/index.scss b/src/views/QR/PDF/index.scss
index b0a88cc..971387b 100644
--- a/src/views/QR/PDF/index.scss
+++ b/src/views/QR/PDF/index.scss
@@ -2,7 +2,7 @@
width: 100%;
border-radius: 10px;
background-color: #ffa9a91e;
- margin: 15px 0px;
+ margin: 0px 0px 20px;
text-decoration: none;
height: calc(100vh / 9);
padding: 20px 10px;
@@ -22,6 +22,11 @@
margin-left: 5px;
}
}
+ div {
+ text-decoration: none;
+ color: #ff0808;
+ font-family: numeralLight;
+ }
}
.pdf-box {
@@ -32,9 +37,9 @@
margin: 15px auto;
text-decoration: none;
height: calc(100vh / 9);
- padding: 20px 10px;
+ padding: 3px 10px;
background: url(../../../assets/icons/pdf.svg) no-repeat #ffa9a91e;
- background-size: 45px;
+ background-size: 40px;
background-position: 18px 50%;
h2 {
font-family: numeralMedium;
@@ -48,4 +53,9 @@
margin-left: 5px;
}
}
+ div {
+ text-decoration: none;
+ color: #ff0808;
+ font-family: numeralLight;
+ }
}
diff --git a/src/views/QR/PowerPoint/index.js b/src/views/QR/PowerPoint/index.js
index b25ecb4..7d84b59 100644
--- a/src/views/QR/PowerPoint/index.js
+++ b/src/views/QR/PowerPoint/index.js
@@ -1,32 +1,65 @@
-import React from 'react';
-
-import './index.scss';
+import SlideshowRoundedIcon from "@material-ui/icons/SlideshowRounded";
+import "./index.scss";
const maxDesktopSize = 1250;
+const maxMobileSize = 550;
const fontSize = {
desktop: {
- h2: window.innerWidth > maxDesktopSize ? 12 : window.innerWidth / 120,
+ h2: window.innerWidth > maxDesktopSize ? 14 : window.innerWidth / 100,
+ div: window.innerWidth > maxDesktopSize ? 14 : window.innerWidth / 100,
+ h3: window.innerWidth > maxMobileSize ? 16 : window.innerWidth / 80,
+ },
+ mobile: {
+ h2: window.innerWidth > maxMobileSize ? 13 : window.innerWidth / 30,
+ div: window.innerWidth > maxMobileSize ? 13 : window.innerWidth / 30,
+ h3: window.innerWidth > maxMobileSize ? 16 : window.innerWidth / 25,
},
};
-export default function PowerPoint(props){
- return(
- <>
- {
- window.innerWidth > 1000 ?
-
- {props.data.title}
-
- : null
- }
- {
- window.innerWidth < 1000 ?
-
- {props.data.title}
-
- : null
- }
- >
- );
-}
\ No newline at end of file
+export default function PowerPoint(props) {
+ return (
+ <>
+ {window.innerWidth > 1000 ? (
+
+ ) : null}
+ {window.innerWidth < 1000 ? (
+
+
+
+ {props.data.name}
+
+
+ برای دانلود این فایل روی اینجا کلیک کن
+
+
+ ) : null}
+ >
+ );
+}
diff --git a/src/views/QR/PowerPoint/index.scss b/src/views/QR/PowerPoint/index.scss
index be4a748..2966204 100644
--- a/src/views/QR/PowerPoint/index.scss
+++ b/src/views/QR/PowerPoint/index.scss
@@ -22,6 +22,11 @@
margin-left: 5px;
}
}
+ div {
+ text-decoration: none;
+ color: #ff0808;
+ font-family: numeralLight;
+ }
}
.ppt-box {
@@ -48,4 +53,9 @@
margin-left: 5px;
}
}
+ div {
+ text-decoration: none;
+ color: #ff0808;
+ font-family: numeralLight;
+ }
}
diff --git a/src/views/QR/VideoBox/index.js b/src/views/QR/VideoBox/index.js
index 056bd9f..92fb413 100644
--- a/src/views/QR/VideoBox/index.js
+++ b/src/views/QR/VideoBox/index.js
@@ -2,31 +2,44 @@ import React from "react";
import { VideoCard } from "material-ui-player";
import ReactVideoJsPlayer from "./React-video-js-player/index";
+import PlayCircleFilledRoundedIcon from "@material-ui/icons/PlayCircleFilledRounded";
+
import "./index.scss";
+const maxMobileSize = 550;
+
+const fontSize = {
+ mobile: {
+ h3: window.innerWidth > maxMobileSize ? 16 : window.innerWidth / 25,
+ },
+ desktop: {
+ h3: window.innerWidth > maxMobileSize ? 16 : window.innerWidth / 80,
+ },
+};
+
export default function VideoBox(props) {
const { data } = props;
return (
<>
{window.innerWidth > 1000 ? (
-
-
-
- {data.title}
-
-
+
) : null}
{window.innerWidth < 1000 ? (
-
-
-
- {data.title}
-
-
+
) : null}
>
diff --git a/src/views/QR/VideoBox/index.scss b/src/views/QR/VideoBox/index.scss
index 4a7cde4..b942225 100644
--- a/src/views/QR/VideoBox/index.scss
+++ b/src/views/QR/VideoBox/index.scss
@@ -1,24 +1,24 @@
-.mobile-video-box{
+.mobile-video-box {
width: 100%;
border-radius: 10px;
background-color: #eee;
- margin: 15px 0px;
+ margin: 0px 0px 20px;
height: calc(100vh / 4);
position: relative;
- h2{
+ h2 {
font-family: numeralMedium;
font-size: calc(100vw / 35);
- color: #02733C;
+ color: #02733c;
padding: 5px;
- background-color: #FFFFFF;
- color: #4D4D4F;
+ background-color: #ffffff;
+ color: #4d4d4f;
position: absolute;
right: 10px;
top: 20px;
}
}
-.video-box{
+.video-box {
width: 100%;
max-width: 550px;
border-radius: 10px;
@@ -27,14 +27,14 @@
height: calc(100vh / 2.5);
min-height: 300px;
position: relative;
- h2{
+ h2 {
font-family: numeralMedium;
- color: #02733C;
+ color: #02733c;
padding: 5px;
- background-color: #FFFFFF;
- color: #4D4D4F;
+ background-color: #ffffff;
+ color: #4d4d4f;
position: absolute;
right: 10px;
top: 20px;
}
-}
\ No newline at end of file
+}
diff --git a/src/views/QR/VoiceBox/index.js b/src/views/QR/VoiceBox/index.js
index 79b3f39..f18f2fa 100644
--- a/src/views/QR/VoiceBox/index.js
+++ b/src/views/QR/VoiceBox/index.js
@@ -13,7 +13,7 @@ export default function VoiceBox(props) {
className="d-flex align-items-center"
>
- {data.title}
+ {data.name}
@@ -22,7 +22,7 @@ export default function VoiceBox(props) {
- {props.data.title}
+ {data.name}
diff --git a/src/views/QR/index.js b/src/views/QR/index.js
index 39caeea..685a7c8 100644
--- a/src/views/QR/index.js
+++ b/src/views/QR/index.js
@@ -23,7 +23,20 @@ import sciense_7 from "../../assets/images/sciense-7.png";
import "./index.scss";
const maxDesktopSize = 1250;
-
+const grades = [
+ "اول",
+ "دوم",
+ "سوم",
+ "چهارم",
+ "پنجم",
+ "ششم",
+ "هفتم",
+ "هشتم",
+ "نهم",
+ "دهم",
+ "یازدهم",
+ "دوازدهم",
+];
class QR extends Component {
state = {
theme: true,
@@ -86,10 +99,14 @@ class QR extends Component {
},
};
+ // if (this.content.clientHeight < window.innerHeight - 60) {
+ // this.buttons.style.display = "none";
+ // }
+
return (
<>
{window.innerWidth > 1000 ? (
- !this.props.loading ? (
+ qrList ? (
<>
@@ -98,36 +115,33 @@ class QR extends Component {
-
this.setState({ theme: !this.state.theme })
@@ -139,7 +153,7 @@ class QR extends Component {
color: this.state.theme ? "#7dc241" : "white",
}}
/>
-
+ */}
this.handleZoom("increase")}
@@ -154,7 +168,7 @@ class QR extends Component {
- {qrList.content.map((item, i) => (
+ {qrList.qr.content.map((item, i) => (
))}
@@ -177,14 +191,19 @@ class QR extends Component {
)
) : null}
{window.innerWidth < 1000 ? (
- !this.props.loading ? (
+ qrList ? (
<>
{qrList ? (
{this.state.menu ? (
-
+
{
+ this.buttons = div;
+ }}
+ >
- {qrList.content.map((item, i) => (
+ {qrList.qr.content.map((item, i) => (
))}
) : (
-
+
{
+ this.buttons = div;
+ }}
+ >
@@ -209,11 +233,16 @@ class QR extends Component {
/>
)}
-
+
{
+ this.content = div;
+ }}
+ >
بازگشت
- {qrList.content.map((item, i) => (
+ {qrList.qr.content.map((item, i) => (
))}
diff --git a/src/views/QR/index.scss b/src/views/QR/index.scss
index 7268ee9..01ba93c 100644
--- a/src/views/QR/index.scss
+++ b/src/views/QR/index.scss
@@ -6,6 +6,10 @@
direction: rtl;
padding-top: 70px;
overflow-x: hidden;
+ h3 {
+ color: rgb(85, 85, 85);
+ font-family: numeralLight;
+ }
&__notAccess {
justify-content: center;
h1 {
@@ -210,7 +214,7 @@
padding: 8px;
background-color: #eee;
border-radius: 10px;
- width: 130px;
+ // width: 130px;
justify-content: space-between;
span {
cursor: pointer;
@@ -219,6 +223,7 @@
background-color: #ddd;
color: #7dc241;
font-size: 20px;
+ margin: 3px;
}
}
}
@@ -233,6 +238,10 @@
letter-spacing: -1px;
text-align: justify;
}
+ h3 {
+ font-family: numeralLight;
+ color: #4e4e4e;
+ }
}
// &__buttons{
diff --git a/src/views/Support/index.js b/src/views/Support/index.js
index 18728f4..93dcf2e 100644
--- a/src/views/Support/index.js
+++ b/src/views/Support/index.js
@@ -29,14 +29,10 @@ class Support extends Component {