diff --git a/src/assets/images/list-arrow.svg b/src/assets/images/list-arrow.svg new file mode 100644 index 00000000..a6a2db22 --- /dev/null +++ b/src/assets/images/list-arrow.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/components/augmint-ui/button/styles.js b/src/components/augmint-ui/button/styles.js index 80a547b8..ebe073e2 100644 --- a/src/components/augmint-ui/button/styles.js +++ b/src/components/augmint-ui/button/styles.js @@ -50,7 +50,7 @@ export const BaseButton = styledComponent => styledComponent` background-color: ${theme.colors.secondary}; &.fullwidth { - width: 100%; + width: 100%; height: 50px; } @@ -66,7 +66,7 @@ export const BaseButton = styledComponent => styledComponent` text-transform: none; background-color: ${theme.colors.primary}; color: ${theme.colors.white}; - + ${media.tabletMin` padding: 20px 30px; font-size: ${remCalc(16)}; @@ -105,6 +105,12 @@ export const BaseButton = styledComponent => styledComponent` border: 1px solid ${theme.colors.primary}; color: ${theme.colors.primary}; + &.orange { + color: ${theme.colors.secondary}; + background: none; + border: 1px solid ${theme.colors.secondary}; + } + &:hover, &:focus { background: transparent; @@ -112,6 +118,12 @@ export const BaseButton = styledComponent => styledComponent` color: ${theme.colors.white}; box-shadow: none; } + + &.orange:hover, &.orange:focus { + border: 1px solid ${theme.colors.secondaryDark}; + background-color: transparent; + color: ${theme.colors.secondaryDark}; + } } &.naked { diff --git a/src/components/navigation/index.js b/src/components/navigation/index.js index 275ae5a6..2ddab947 100644 --- a/src/components/navigation/index.js +++ b/src/components/navigation/index.js @@ -5,19 +5,13 @@ import { StyleNavLink, StyleNavItem, StyleNavList, - StyledLogoContainer, StyledNavContainer, StyledNavLeftSide, StyledNavRightSide, - StyledLogo, HamburgerMenu } from "./styles"; import { AugmintIcon } from "components/Icons"; - -import augmintLogo from "assets/images/logo/logo.png"; -import augmintLogo2x from "assets/images/logo/logo@2x.png"; -import augmintLogo3x from "assets/images/logo/logo@3x.png"; import hamburgerMenu from "assets/images/menu.svg"; import close from "assets/images/close.svg"; import { toggleScroll } from "utils/bodyHelper"; @@ -120,15 +114,6 @@ export default class SiteMenu extends React.Component { {showConnection && !isConnected &&
Not connected
} - - {!showConnection && ( - - )} - ); } diff --git a/src/components/navigation/styles.js b/src/components/navigation/styles.js index b1a7760d..fa389cbb 100644 --- a/src/components/navigation/styles.js +++ b/src/components/navigation/styles.js @@ -68,6 +68,9 @@ export const StyledLogoContainer = styled.div` display: flex; justify-content: center; min-height: 80px; + ${breakpoint` + max-height: 200px; + `}; `; export const StyledNavLeftSide = styled.div` @@ -97,6 +100,7 @@ export const StyledNavRightSide = styled.div` export const StyledLogo = styled.img` margin-top: 80px; + object-fit: contain; `; export const HamburgerMenu = styled.img` diff --git a/src/containers/app/AppFooter.js b/src/containers/app/AppFooter.js index ef84524f..b2caec35 100644 --- a/src/containers/app/AppFooter.js +++ b/src/containers/app/AppFooter.js @@ -35,7 +35,7 @@ export function AppFooter(props) {

{description}

- + diff --git a/src/containers/app/EthereumState.js b/src/containers/app/EthereumState.js index 7866366d..455d7a4b 100644 --- a/src/containers/app/EthereumState.js +++ b/src/containers/app/EthereumState.js @@ -5,12 +5,13 @@ import React from "react"; import { connect } from "react-redux"; import Container from "components/augmint-ui/container"; import { StyledP } from "components/augmint-ui/paragraph/styles"; -import Header from "components/augmint-ui/header"; import { Link } from "react-router-dom"; import { ErrorDetails, ErrorPanel, WarningPanel, LoadingPanel } from "components/MsgPanels"; import { Tsegment } from "components/TextContent"; import { DiscordButton } from "components/LinkButtons"; +import { HowToConnect } from "containers/home/tryIt/HowToConnect.js"; + export class EthereumState extends React.Component { render() { let msg = null; @@ -26,21 +27,7 @@ export class EthereumState extends React.Component { if (isConnecting) { msg = ; } else if (!web3Connect.isConnected && !web3Connect.isLoading) { - msg = ( - -
- See our{" "} - - Connection Guide - {" "} - on how to connect to Ethereum. -
- - {web3Connect.error && ( - - )} -
- ); + msg = ; } else if ( web3Connect.isConnected && !contracts.isLoaded && diff --git a/src/containers/app/custom_footer_style.css b/src/containers/app/custom_footer_style.css index e63a1ec0..8b8974a0 100644 --- a/src/containers/app/custom_footer_style.css +++ b/src/containers/app/custom_footer_style.css @@ -4,6 +4,8 @@ padding: 0; position: absolute; width: 100%; + margin-left: 0; + margin-right: 0; } .Site-footer .footer > div { @@ -162,6 +164,10 @@ font-weight: 400; } +.Site-footer .footer .contact-list { + margin-top: 40px; +} + @media (max-width: 1200px) { .Site-footer .footer > div { margin-top: 200px; @@ -169,10 +175,34 @@ } @media (max-width: 768px) { + .Site-footer .footer .contact-list { + flex-direction: column; + } + .Site-footer .footer .description { + padding: 0 20px; + } + .Site-footer .footer .contact-list { + margin-top: 30px; + } .Site-footer .footer .contact-list.list > .item { margin: 0; } .Site-footer .footer > div { - margin-top: 150px; + margin-top: 200px; + } + .Site-footer .footer .subscribe { + margin-top: 20px; + } + .Site-footer .footer .chat-container a.join { + margin: 5px; + justify-content: center; + } + .Site-footer .footer .chat-container .join img { + margin-right: 10px; + max-width: 30px; + } + .Site-footer .footer .chat-container { + justify-content: center; + padding: 0 20px; } } diff --git a/src/containers/app/index.js b/src/containers/app/index.js index 064b7c41..03a55d47 100644 --- a/src/containers/app/index.js +++ b/src/containers/app/index.js @@ -217,6 +217,7 @@ class App extends React.Component { /> {!showConnection && ( , - type: "loan", - title: "Deposit ETH", - text: "Get liquid A-Euro using your ETH as collateral." - }, - { - pk: "hiw-2", - image: , - type: "loan", - title: "Spend A-Euro", - text: "Use your A-Euro or convert it to fiat. Stay in your ETH position in the meanwhile." - }, - { - pk: "hiw-3", - image: , - type: "loan", - title: "Get deposit back", - text: "Payback your loan at maturity to get back your ETH collateral." - }, - { - pk: "hiw-4", - image: , - type: "exchange", - title: "Augmint Exchange", - text: "Buy or sell A-Euro for ETH on Augmint’s exchange." - }, - { - pk: "hiw-5", - image: , - type: "exchange", - title: "Partners", - text: "Buy or sell A-Euro for fiat on one of our partner gateways." - }, - { - pk: "hiw-6", - image: , - type: "exchange", - title: "EtherDelta", - text: "Trade with A-Euro on anu ERC20 exchanges like EtherDelta." - }, - { - pk: "hiw-7", - image: , - type: "use", - title: "ATMS", - text: "Withdraw fiat cash from your A-Euro account at one of our partners’ ATMs." - }, - { - pk: "hiw-8", - image: , - type: "use", - title: "Shops", - text: "Use your A-Euro at partner merchants." - }, - { - pk: "hiw-9", - image: , - type: "use", - title: "Transfer", - text: " Send your A-Euro to any other A-Euro account." - }, - { - pk: "hiw-10", - image: , - type: "use", - title: "Use in smart contracts", - text: "A-Euro is usable in any smart contract service because it’s ERC-20 standard token." - }, - { - pk: "hiw-11", - image: , - type: "lock", - title: "Lock", - text: "Choose lock time. Your premium is immediately credited to your lock account." - }, - { - pk: "hiw-12", - image: , - type: "lock", - title: "Wait", - text: "Earn while sleeping." - }, - { - pk: "hiw-13", - image: , - type: "lock", - title: "Get premium", - text: "Your unlocked amount including your premium is available." - } -]; diff --git a/src/containers/home/NotConnectedHome/index.js b/src/containers/home/NotConnectedHome/index.js index 3cecdffd..206c4587 100644 --- a/src/containers/home/NotConnectedHome/index.js +++ b/src/containers/home/NotConnectedHome/index.js @@ -3,250 +3,233 @@ import React from "react"; import Grid from "styled-components-grid"; import { ThemeProvider } from "styled-components"; import Container from "components/augmint-ui/container"; -import Header from "components/augmint-ui/header"; import Button from "components/augmint-ui/button"; -import Rail from "components/augmint-ui/rail"; +import { keyFeatures } from "./helpers.js"; +import Convertible from "./../convertible.js"; +import { StyledLogo, StyledLogoContainer } from "components/navigation/styles"; +import augmintLogo from "assets/images/logo/logo.png"; +import augmintLogo2x from "assets/images/logo/logo@2x.png"; +import augmintLogo3x from "assets/images/logo/logo@3x.png"; -import { BalanceIcon, InterchangeIcon } from "components/Icons"; - -import { keyFeatures, keyBenefits, howItWorks } from "./helpers.js"; - -import { theme } from "styles/media"; -import "./styles.css"; import * as styles from "./styles.js"; +import "./styles.css"; + +const theme = { + breakpoints: { + giant: 1285, + desktop: 992, + tablet: 769, + mobile: 376 + } +}; export default class NotConnectedHome extends React.Component { render() { return (
-
-
-
- Augmint offers digital tokens targeted to a fiat currency. +
+ + + + +
+

Our money, beyond states.

+
+ Decentralized cryptocurrency without the volatility.
+ Borderless, secure, transparent.
- The first Augmint token is A-Euro, targeted to Euro. -
- Stored securely and decentralised stable crypto tokens are instantly transferable - worldwide. -
-
- -
-
+ Our first token is A-EUR. + -
- -
+ + +
+ Learn more about the Augmint concept + +
+
+ +
+ - - {keyFeatures.map(feature => ( +
+ + +

Actually convertible

+
+ -
- {feature.image} +
+ + +

+ Next-day conversion to and from SEPA
+ bank accounts via exchange partners. +

+
-
- {feature.title} -
-

{feature.text}

- ))} - - -
-
-
- Great for business -
- - - - {keyBenefits - .filter(item => item.type === "business") - .map(item => ( - -
-

{item.text}

-
-
- ))} -
-
- -
- And for individuals -
- - - - {keyBenefits - .filter(item => item.type === "individual") - .map(item => ( - -
-

{item.text}

-
-
- ))} -
-
-
- -
- - -
-
-
1
-
Euro
-
- -
-
1
-
A-EUR
-
-
-
-
- -
Augmint loans
-

- Use your cryptocurrencies without -
- losing them. Get a loan and spend easily. -

- - - {howItWorks - .filter(feature => feature.type === "loan") - .map(feature => ( - -
- {feature.image} -
-
- {feature.title} -
-

{feature.text}

-
- ))} -
-
+ +
+ + +

+ Buy or sell A-EUR instantly on our
+ decentralized crypto exchange. +

+ + +
+
+ -
- -
-
Buy and sell A-Euro
+ + +
+

+ Have your crypto
+ and spend it too +

+

+ Borrow A-EUR against your ETH collateral. No waiting for approval. +

+ {/*a className="more-link" href=""> + Learn more + */} + +
+
- - - {howItWorks - .filter(feature => feature.type === "exchange") - .map(feature => ( - -
- {feature.image} + +
+
+

Crypto-backed loans

+
    +
  • + for up to 6 months at +
  • +
  • + 4.9% per year (APR) and +
  • +
  • + 60% loan-to-value. +
  • +
+
-
- {feature.title} -
-

{feature.text}

- - ))} - - - -
- -
-
How to use your A-Euro
+
+
+ - - - {howItWorks - .filter(feature => feature.type === "use") - .map(feature => ( - -
- {feature.image} + + +
+
+

Premium on A-EUR

+
    +
  • + for up to 6 months at +
  • +
  • + 4.5% per year (APR). +
  • +
+
-
- {feature.title} -
-

{feature.text}

- - ))} - - +
+
-
Earn more with A-Euro, get premium by locking
+ +
+

Time is Money

+

+ Get rewarded for parking your A-EUR.
+ Earn a bonus instantly while your funds
+ remain safely locked in a smart contract. +

+ +
+
+
- - - {howItWorks - .filter(feature => feature.type === "lock") - .map(feature => ( + + {keyFeatures.map(feature => ( -
+
{feature.image}
-
- {feature.title} -
+

{feature.title}

{feature.text}

))} - + +
- -
- -
diff --git a/src/containers/home/NotConnectedHome/styles.css b/src/containers/home/NotConnectedHome/styles.css index e7ee1727..08012a27 100644 --- a/src/containers/home/NotConnectedHome/styles.css +++ b/src/containers/home/NotConnectedHome/styles.css @@ -7,17 +7,6 @@ article.segment { margin-top: 115px !important; } -.key-features__header { - margin-left: auto; - margin-right: auto; - max-width: 650px; -} - -h2, -.key-features__header > h2.ui.header { - font-weight: 250; -} - h1, h1.ui.header, h2, @@ -67,22 +56,14 @@ p { margin-bottom: 40px; } -@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) { - p.opac { - opacity: 0.6; - } -} - -.list-item { - padding-left: 30px; - background: url("../../../assets/images/bullet-point.svg") no-repeat left 6px; - margin: 0 40px; +p.opac { + opacity: 0.6; } .segment.how-to-use { position: relative; - padding-top: 200px; - padding-bottom: 200px; + padding-top: 0px; + padding-bottom: 0; background: linear-gradient( rgba(53, 0, 55, 0) 0%, rgba(53, 0, 55, 1) 20%, @@ -135,7 +116,190 @@ p { font-weight: 400; } -@media (max-width: 768px) and (min-width: 320px) { +.segment.how-to-use .grid.margin { + margin-bottom: 140px; +} + +.segment.how-to-use h5.ui.header, +.segment.how-to-use h2.ui.header { + margin: 0; +} + +.interchange-icon { + width: 50px; +} + +a.try-now { + padding: 10px 20px; + width: 91px; +} + +.homePage-grid { + justify-content: space-between; + margin-bottom: 120px; +} +.homePage-grid:last-child { + margin-bottom: 0; +} + +.homePage-grid .homePage-column { + text-align: center; + padding: 1rem; +} +.homePage-grid .homePage-column .grid-cont { + text-align: left; + width: 360px; + margin: 0 auto; +} +.homePage-column p { + font-size: 20px; + line-height: 120%; +} +.homePage-header { + font-weight: bold; + margin: 30px auto; + font-size: 38px; +} +.homePage header h5 { + font-size: 20px; + line-height: 150%; + margin: "14px 0"; +} +.homePage header { + margin-bottom: 150px; +} +h3.homePage-row-header { + padding-left: calc((50% - 350px) / 2); +} +.homePage-row-header, +.homePage-column-header { + margin-bottom: 10px; + margin-top: 0; + line-height: 120%; + font-size: 30px; +} + +.product-box { + background: rgba(255, 255, 255, 0.1); + padding: 40px; + height: calc(100% - 80px); + border-radius: 4px; + width: 280px; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + margin: 0 auto; +} +.product-box h4.box-header { + margin-top: 10px; + margin-bottom: 20px; + font-size: 24px; +} +.product-box ul { + padding: 0; + text-align: left; +} + +.product-box ul .list-item { + padding-left: 25px; + background: url("../../../assets/images/list-arrow.svg") no-repeat left 8px; + list-style-type: none; + margin: 10px 0; + font-size: 20px; + color: rgba(255, 255, 255, 0.6); +} +.product-box ul .list-item span { + color: #ffad00; + font-size: 22px; + font-weight: 600; +} +.box .cta { + display: none; +} +.desc .cta { + display: inline-block; +} +.more-link { + display: block; +} + +@media (max-width: 768px) { + .homePage header { + margin-bottom: 140px; + } + h1.homePage-header { + font-size: 32px; + margin: 10px auto 30px auto; + } + .homePage-grid { + justify-content: flex-start; + margin-bottom: 100px; + } + .homePage-grid:nth-of-type(3) { + margin-bottom: 0; + } + .homePage-grid .homePage-column .grid-cont { + text-align: center; + width: 100%; + } + .desc .cta { + display: none; + } + .homePage-grid { + padding-bottom: 0; + } + .box .cta { + display: inline-block; + margin-top: 10px !important; + } + .how-to-use br { + display: none; + } + .homePage-grid.left { + } + .homePage-grid.right { + flex-direction: column-reverse; + } + .homePage-grid .homePage-column { + text-align: center; + } + .homePage-grid .row { + text-align: center; + } + h3.homePage-row-header { + padding: 0; + text-align: center; + width: 100%; + } + .product-box { + padding: 20px 20px 30px 20px; + max-width: calc(100% - 100px); + width: auto; + height: auto; + } + .homePage-row-header, + .homePage-column-header { + font-size: 28px; + } + + .convertible { + justify-content: center; + } + .homePage-column p { + font-size: 18px; + } + .product-box ul .list-item { + text-align: left; + font-size: 18px; + } + .product-box ul .list-item span { + font-size: 18px; + } + .more-link { + display: none; + } + .team .grid .column > img, .partner .grid .column > img { margin-bottom: 10px; @@ -151,32 +315,14 @@ p { } } -@media (min-width: 769px) and (max-width: 1455px) { - .segment.how-to-use, - .segment.team { - padding-left: 190px; +@media (max-width: 414px) { + .Site-content div.homePage { + max-width: 90%; } - .segment.advantages, - .segment.team, - .segment.partner { - padding: 0px 85px; + .product-box { + max-width: calc(100% - 40px); + } + .homePage-grid:nth-of-type(3) { + margin-bottom: 50px; } -} - -.segment.how-to-use .grid.margin { - margin-bottom: 140px; -} - -.segment.how-to-use h5.ui.header, -.segment.how-to-use h2.ui.header { - margin: 0; -} - -.interchange-icon { - width: 50px; -} - -a.try-now { - padding: 10px 20px; - width: 91px; } diff --git a/src/containers/home/NotConnectedHome/styles.js b/src/containers/home/NotConnectedHome/styles.js index 2150f0e7..6c976769 100644 --- a/src/containers/home/NotConnectedHome/styles.js +++ b/src/containers/home/NotConnectedHome/styles.js @@ -2,7 +2,8 @@ export const keyFeaturesSegment = { minHeight: "125px", display: "flex", alignItems: "center", - justifyContent: "center" + justifyContent: "center", + marginTop: 0 }; export const keyFeaturesHeader = { diff --git a/src/containers/home/convertible.js b/src/containers/home/convertible.js new file mode 100644 index 00000000..fd02b976 --- /dev/null +++ b/src/containers/home/convertible.js @@ -0,0 +1,29 @@ +import React from "react"; +import { InterchangeIcon } from "components/Icons"; + +function Convertible(props) { + const { from, to, simple } = props; + + const containerStyles = { + display: "flex", + flexDirection: "row", + color: "white", + fontSize: 14 + }; + + return ( +
+
+ {!simple &&
1
} +
{from}
+
+ +
+ {!simple &&
1
} +
{to}
+
+
+ ); +} + +export default Convertible; diff --git a/src/containers/home/tryIt/HowToConnect.js b/src/containers/home/tryIt/HowToConnect.js index 22af5b21..04f898ce 100644 --- a/src/containers/home/tryIt/HowToConnect.js +++ b/src/containers/home/tryIt/HowToConnect.js @@ -2,7 +2,6 @@ import React from "react"; import { Tsegment } from "components/TextContent"; import { DiscordButton, TelegramButton } from "components/LinkButtons"; -import Video from "components/augmint-ui/video"; import Header from "components/augmint-ui/header"; import { MobileView, DesktopView, StoreBadge } from "./styles"; @@ -73,26 +72,18 @@ export function HowToConnect(props) { - + To use Augmint you need an Ethereum capable browser.
1. Install{" "} - MetaMask Chrome plugin + MetaMask browser plugin
2. Connect to Main or Rinkeby test network.
- - Video about installing MetaMask and getting test A-EUR: - -
diff --git a/src/styles/theme.js b/src/styles/theme.js index 3ff4ad99..072a3e13 100644 --- a/src/styles/theme.js +++ b/src/styles/theme.js @@ -52,7 +52,7 @@ const theme = { h4: remCalc(24), h3: remCalc(26), h2: remCalc(34), - h1: remCalc(34) + h1: remCalc(38) } }, borderRadius: {