From 635a0c141648dc596cc5a7b02e53ab9bdf31dc72 Mon Sep 17 00:00:00 2001 From: Reza_ashrafi Date: Wed, 30 Jun 2021 12:33:04 +0430 Subject: [PATCH] reza fixed links --- src/views/About/index.js | 2 +- src/views/Activation/History/index.js | 52 ++++-- src/views/Activation/History/index.scss | 67 ++++++-- src/views/Activation/index.js | 147 +++++++++++------ src/views/Activation/index.scss | 105 ++++++++++++- src/views/Contact/index.js | 2 +- src/views/Faq/Collapse/index.js | 53 ++++++- src/views/Faq/Collapse/index.scss | 3 +- src/views/Faq/index.js | 133 ++++++++++++---- src/views/Faq/index.scss | 75 +++++++-- src/views/Home/HomeSlider/Simple/index.js | 2 +- src/views/Home/HomeSlider/index.js | 4 +- src/views/Home/Navbar/Laptop/index.js | 35 +++-- src/views/Home/Navbar/Laptop/index.scss | 4 - .../Mobile/NavbarDrawer/NavbarDrawer.js | 10 +- src/views/Home/Navbar/index.js | 2 +- src/views/Home/index.js | 4 +- src/views/Product/index.scss | 148 +++++++++++++++++- src/views/Products/index.js | 4 +- src/views/Products/index.scss | 1 + 20 files changed, 702 insertions(+), 151 deletions(-) diff --git a/src/views/About/index.js b/src/views/About/index.js index 0cc62f1..4b1843f 100644 --- a/src/views/About/index.js +++ b/src/views/About/index.js @@ -38,7 +38,7 @@ export default class About extends Component { return ( <>
- +
diff --git a/src/views/Activation/History/index.js b/src/views/Activation/History/index.js index de02e40..cef6b1b 100644 --- a/src/views/Activation/History/index.js +++ b/src/views/Activation/History/index.js @@ -1,18 +1,38 @@ -import React, { Component } from 'react'; +import React, { Component } from "react"; -import './index.scss'; -export default function History(props){ - const {data} = props; - return( - <> - { - window.innerWidth > 1000 ? -
+import "./index.scss"; + +const maxDesktopSize = 1250; + +const fontSize = { + desktop: { + strong: window.innerWidth > maxDesktopSize ? 18 : window.innerWidth / 80, + span: window.innerWidth > maxDesktopSize ? 16 : window.innerWidth / 90, + button: window.innerWidth > maxDesktopSize ? 18 : window.innerWidth / 80, + }, +}; -
: null - } - { - window.innerWidth < 1000 ? +export default function History(props) { + const { data } = props; + return ( + <> + {window.innerWidth > 1000 ? ( +
+
+ {data.title} + + {data.title} + +
+ + {data.subTitle} + + +
+ ) : null} + {window.innerWidth < 1000 ? (
{data.title} @@ -24,8 +44,8 @@ export default function History(props){
-
: null - } +
+ ) : null} ); -} \ No newline at end of file +} diff --git a/src/views/Activation/History/index.scss b/src/views/Activation/History/index.scss index 8e1965c..9ffe4e8 100644 --- a/src/views/Activation/History/index.scss +++ b/src/views/Activation/History/index.scss @@ -1,44 +1,83 @@ -.mobile-activation-history{ +.mobile-activation-history { width: 100%; padding: 15px 10px; justify-content: space-between; - background-color:white; - align-items:center; + background-color: white; + align-items: center; border-radius: 10px; box-shadow: 0px 0px 10px rgb(226, 226, 226); - &__right{ - align-items:center; - img{ + &__right { + align-items: center; + img { height: 100px; border-radius: 10px; margin-left: 15px; } - strong{ + strong { font-family: numeralMedium; font-size: calc(100vw / 30); font-weight: 600; letter-spacing: -1px; } - span{ + span { font-family: numeralMedium; font-size: calc(100vw / 35); - color: #00CC69; + color: #00cc69; } } - &__left{ - button{ + &__left { + button { display: inline; font-family: numeralLight; text-decoration: none; padding: 5px 20px 3px; - color: #00CC69; + color: #00cc69; border-radius: 25px; font-size: calc(100vw / 26); border: 1px solid #00cc69; background-color: white; - &:focus:enabled{ + &:focus:enabled { text-decoration: none; } } } -} \ No newline at end of file +} + +.activation-history { + width: 100%; + padding: 10px 10px; + justify-content: space-between; + background-color: white; + align-items: center; + border-radius: 10px; + box-shadow: 0px 0px 10px rgb(226, 226, 226); + align-items: center; + img { + height: 100px; + border-radius: 10px; + margin-left: 15px; + } + strong { + font-family: numeralMedium; + font-weight: 600; + letter-spacing: -1px; + } + span { + font-family: numeralMedium; + color: #00cc69; + } + + button { + display: inline; + font-family: numeralLight; + text-decoration: none; + padding: 5px 20px 3px; + color: #00cc69; + border-radius: 25px; + border: 1px solid #00cc69; + background-color: white; + &:focus:enabled { + text-decoration: none; + } + } +} diff --git a/src/views/Activation/index.js b/src/views/Activation/index.js index f698431..5b30418 100644 --- a/src/views/Activation/index.js +++ b/src/views/Activation/index.js @@ -1,50 +1,53 @@ import React, { Component } from "react"; import Navbar from "../Home/Navbar/index"; import Footer from "../Home/Footer/index"; -import {Link} from 'react-router-dom'; -import History from './History/index'; +import { Link } from "react-router-dom"; +import History from "./History/index"; -import book1 from '../../assets/images/book1.png'; -import analytics from '../../assets/icons/analytics.svg'; -import danger from '../../assets/icons/danger.svg'; +import book1 from "../../assets/images/book1.png"; +import analytics from "../../assets/icons/analytics.svg"; +import danger from "../../assets/icons/danger.svg"; + +import "./index.scss"; + +const maxDesktopSize = 1250; + +const fontSize = { + desktop: { + h1: window.innerWidth > maxDesktopSize ? 25 : window.innerWidth / 45, + h2: window.innerWidth > maxDesktopSize ? 21 : window.innerWidth / 65, + p: window.innerWidth > maxDesktopSize ? 16 : window.innerWidth / 70, + span: window.innerWidth > maxDesktopSize ? 18 : window.innerWidth / 75, + form: window.innerWidth > maxDesktopSize ? 18 : window.innerWidth / 70, + }, +}; -import './index.scss'; export default class Activation extends Component { - state= { + state = { value: null, - } + }; render() { const { data } = this.props; return ( <> {window.innerWidth > 1000 ? ( <> -
- -
-