diff --git a/src/AppRouter.js b/src/AppRouter.js index d175729..a10e61e 100644 --- a/src/AppRouter.js +++ b/src/AppRouter.js @@ -15,6 +15,7 @@ import Activation from './views/Activation/index'; import ChatList from './views/ChatList/index'; import Chatroom from './views/ChatRoom/index'; import Cart from './views/Cart/index'; +import MyBooks from './views/MyBooks/index'; class AppRouter extends Component { constructor(props) { @@ -73,6 +74,9 @@ class AppRouter extends Component { + + + { window.innerWidth < 1000 ? diff --git a/src/assets/images/book6.png b/src/assets/images/book6.png new file mode 100644 index 0000000..0d08aad Binary files /dev/null and b/src/assets/images/book6.png differ diff --git a/src/assets/images/book7.png b/src/assets/images/book7.png new file mode 100644 index 0000000..6cfc7a6 Binary files /dev/null and b/src/assets/images/book7.png differ diff --git a/src/assets/images/book8.png b/src/assets/images/book8.png new file mode 100644 index 0000000..2f211d0 Binary files /dev/null and b/src/assets/images/book8.png differ diff --git a/src/assets/images/book9.png b/src/assets/images/book9.png new file mode 100644 index 0000000..fcb1936 Binary files /dev/null and b/src/assets/images/book9.png differ diff --git a/src/views/Home/HomeStatic/Flex/index.js b/src/views/Home/HomeStatic/Flex/index.js index c745f8b..c62ded3 100644 --- a/src/views/Home/HomeStatic/Flex/index.js +++ b/src/views/Home/HomeStatic/Flex/index.js @@ -1,4 +1,5 @@ import React from 'react'; +import {Link} from 'react-router-dom'; const maxMobileSize = 550; @@ -18,7 +19,7 @@ export default function Flex(props){ } return( -
+

{data.title}

{ @@ -28,7 +29,7 @@ export default function Flex(props){ {data.subTitle}
{data.title} -
+ ); } diff --git a/src/views/Home/HomeStatic/Simple/index.js b/src/views/Home/HomeStatic/Simple/index.js index 61dedc2..2ae67e6 100644 --- a/src/views/Home/HomeStatic/Simple/index.js +++ b/src/views/Home/HomeStatic/Simple/index.js @@ -1,4 +1,5 @@ import React from 'react'; +import {Link} from 'react-router-dom'; const maxMobileSize = 550; @@ -29,11 +30,11 @@ export default function Simple(props){ alignItems: data.alignItems }; return( -
+

{data.title}

-
+ ); } diff --git a/src/views/Home/HomeStatic/Vitrin/index.js b/src/views/Home/HomeStatic/Vitrin/index.js index 6e1f020..ddc6810 100644 --- a/src/views/Home/HomeStatic/Vitrin/index.js +++ b/src/views/Home/HomeStatic/Vitrin/index.js @@ -32,7 +32,7 @@ export default function Vitrin(props){ )) } - مشاهده بیشتر + مشاهده بیشتر ); diff --git a/src/views/Home/HomeStatic/index.scss b/src/views/Home/HomeStatic/index.scss index dcddce9..920a017 100644 --- a/src/views/Home/HomeStatic/index.scss +++ b/src/views/Home/HomeStatic/index.scss @@ -31,6 +31,7 @@ &__flex{ padding: 20px 10px; justify-content: space-around; + text-decoration: none; img { // margin-right: 20px; max-height: 55px; @@ -65,16 +66,19 @@ border-radius: 10px; } } - span{ + a{ + text-decoration: none; font-family: numeralLight; align-items: flex-end; margin-bottom: 5px; letter-spacing: -1px; margin-right: 5px; + color: white; } } &__simple{ // padding: 0px 10px; + text-decoration: none; min-height: 50px; div{ width: 100%; diff --git a/src/views/Home/index.js b/src/views/Home/index.js index d7cbecb..917b88b 100644 --- a/src/views/Home/index.js +++ b/src/views/Home/index.js @@ -178,7 +178,7 @@ Home.defaultProps = { design: "flex", title: "QR خوان", subTitle: "در صفحات کتاب هوشمند", - link: '', + link: '/qr-scan', badge : '', flex : 1, fontSize : 'large', @@ -195,7 +195,7 @@ Home.defaultProps = { design: "flex", title: "واقعیت افزوده", subTitle: "توضیحات مختصر در این رابطه", - link: '', + link: '/ar-scan', badge : '', flex : 1, fontSize : 'large', @@ -234,11 +234,11 @@ Home.defaultProps = { angle: '180deg' }, design: "simple", - title: "واقعیت افزوده", + title: "کتابهای من", subTitle: "", justifyContent: 'flex-start', alignItems: 'center', - link: '', + link: '/mybooks', badge : '', flex : 1, fontSize : 'large', @@ -264,7 +264,7 @@ Home.defaultProps = { subTitle: "", justifyContent: 'center', alignItems: 'center', - link: '', + link: '/blog', badge : '', flex : 1.2, fontSize : 'normal', @@ -287,7 +287,7 @@ Home.defaultProps = { { id: 1, imageUrl: book2 }, { id: 2, imageUrl: book3}, ], - link: '', + link: '/products', badge : '', flex : 2, fontSize : 'large', @@ -318,7 +318,7 @@ Home.defaultProps = { subTitle: "", justifyContent: 'center', alignItems: 'center', - link: '', + link: '/contact', badge : '', flex : 1, fontSize : 'normal', @@ -337,7 +337,7 @@ Home.defaultProps = { subTitle: "", justifyContent: 'center', alignItems: 'center', - link: '', + link: '/profile', badge : '', flex : 1, fontSize : 'normal', @@ -358,7 +358,7 @@ Home.defaultProps = { subTitle: "", justifyContent: 'center', alignItems: 'center', - link: '', + link: '/activation', badge : '', flex : 1, fontSize : 'large', diff --git a/src/views/MyBooks/index.js b/src/views/MyBooks/index.js new file mode 100644 index 0000000..4e33104 --- /dev/null +++ b/src/views/MyBooks/index.js @@ -0,0 +1,168 @@ +import React from "react"; +import { Link } from "react-router-dom"; + +import Navbar from "../Home/Navbar/index"; +import Footer from "../Home/Footer/index"; + +import book6 from "../../assets/images/book6.png"; +import book7 from "../../assets/images/book7.png"; +import book8 from "../../assets/images/book8.png"; +import book9 from "../../assets/images/book9.png"; +import basket from "../../assets/icons/basket.png"; + +import "./index.scss"; + +const maxDesktopSize = 1250; +const maxMobileSize = 550; + +const fontSize = { + mobile: { + h1: window.innerWidth > maxMobileSize ? 24 : window.innerWidth / 15, + a: window.innerHeight > maxMobileSize ? 15 : window.innerWidth / 30, + }, +}; + +export default class MyBooks extends React.Component { + render() { + const { books } = this.props; + return ( + <> + {window.innerWidth > 1000 ? ( + <> +
+ +
+