diff --git a/src/AppRouter.js b/src/AppRouter.js index 34cc308..bdff44a 100644 --- a/src/AppRouter.js +++ b/src/AppRouter.js @@ -8,6 +8,7 @@ import Contact from './views/Contact/index'; import About from './views/About/index'; import Products from './views/Products/index'; import Product from './views/Product/index'; +import Sample from './views/Product/Sample/index'; class AppRouter extends Component { constructor(props) { super(props); @@ -44,6 +45,9 @@ class AppRouter extends Component { + + + ); diff --git a/src/views/Home/HomeScroll/MyProduct/index.scss b/src/views/Home/HomeScroll/MyProduct/index.scss index 8d5248b..5192fc0 100644 --- a/src/views/Home/HomeScroll/MyProduct/index.scss +++ b/src/views/Home/HomeScroll/MyProduct/index.scss @@ -1,6 +1,6 @@ .scroll-my-product{ padding: 10px; - background-color: #ddd; + background-color: #eee; a{ width : 100%; text-decoration: none; diff --git a/src/views/Home/HomeStatic/index.js b/src/views/Home/HomeStatic/index.js index 8eebf63..c83abd3 100644 --- a/src/views/Home/HomeStatic/index.js +++ b/src/views/Home/HomeStatic/index.js @@ -39,21 +39,38 @@ export default class HomeStatic extends Component { const Item = (props) => { return ( -
-
-

{props.data.topText}

-

{props.data.bottomText}

-
- عکس -
+ <> + {window.innerWidth > 1000 ? ( +
+
+

{props.data.topText}

+

{props.data.bottomText}

+
+ عکس +
+ ) : null} + { + window.innerWidth < 1000 ? ( +
+
+

{props.data.topText}

+

{props.data.bottomText}

+
+ عکس +
+ ) : null + } + ); }; diff --git a/src/views/Home/HomeStatic/index.scss b/src/views/Home/HomeStatic/index.scss index 39c9c1d..0fbbb04 100644 --- a/src/views/Home/HomeStatic/index.scss +++ b/src/views/Home/HomeStatic/index.scss @@ -24,4 +24,25 @@ } } } +} + + +.mobile-static{ + div{ + h1{ + font-size: calc(100vw / 27); + letter-spacing: -1px; + margin-bottom: 5px; + } + h2{ + font-size: calc(100vw / 35); + letter-spacing: -1px; + margin-bottom: 0px; + } + } + img { + // margin-right: 20px; + height: 50px; + width: 50px; + } } \ No newline at end of file diff --git a/src/views/Home/Navbar/Mobile/index.js b/src/views/Home/Navbar/Mobile/index.js index 2d97ef2..be384f5 100644 --- a/src/views/Home/Navbar/Mobile/index.js +++ b/src/views/Home/Navbar/Mobile/index.js @@ -6,8 +6,6 @@ import clsx from "clsx"; import logo from "../../../../assets/icons/logoMobile.png"; import hamburger from "../../../../assets/icons/hamburger.png"; -import ar from "../../../../assets/icons/ar.png"; -import qr from "../../../../assets/icons/qr.png"; import search from "../../../../assets/icons/navbarSearch.png"; import "./index.scss"; @@ -75,8 +73,6 @@ export default function MobileNavbar(props) {
جستجو - واقعیت افزوده - کد QR
1000 ? '' : "static", + title: "", + height: 150, + data: [ + { + image: qr, + width: 48, + link: "", + topText: 'QR خوان', + bottomText: 'توضیحات مختصر در این رابطه' + }, + { + image: ar, + width: 48, + link: "", + topText: 'واقعیت افزوده', + bottomText: 'توضیحات مختصر در این رابطه' + }, + ], + }, + { + type: window.innerWidth > 1000 ? "static" : "", title: "", height: 150, data: [ @@ -502,7 +523,7 @@ const Identifier = (props) => { data={props.item.data} /> ) : null} - {props.item.type === "static" && window.innerWidth > 1000 ? ( + {props.item.type === "static" ? ( + {window.innerWidth > 1000 ? ( + <> +
+ +
+