Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FEAT] NEAR-11: Landing Page Update #3116

Merged
merged 15 commits into from
Jan 18, 2024
Merged

[FEAT] NEAR-11: Landing Page Update #3116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
424fa02
NEAR-11 FEAT: Implemented the new landing page
valmir-haxholli Jan 11, 2024
89175b2
NEAR-11 FEAT: Implemented the new landing page
valmir-haxholli Jan 12, 2024
3d2eab1
NEAR-11 FEAT: eslint fix
valmir-haxholli Jan 12, 2024
02b63d3
NEAR-11 FEAT: near landing page responsive update
valmir-haxholli Jan 12, 2024
6e31b4e
NEAR-11 FEAT: eslint fix
valmir-haxholli Jan 12, 2024
42418b2
NEAR-11 FEAT: Update non-connected state condition
valmir-haxholli Jan 12, 2024
7e48b8c
NEAR-11 FEAT: Update button tracking events
valmir-haxholli Jan 12, 2024
62ba1b6
NEAR-11 FEAT: Update footer and header issues
valmir-haxholli Jan 15, 2024
4f18ae8
NEAR-11 FEAT: Fixed the transfer account CTA
valmir-haxholli Jan 15, 2024
e1fda1b
feat: Update routes, minor UX fixes
hcho112 Jan 17, 2024
e883ba1
feat: UX improvements on landing page, implement anaytlics, redirect …
hcho112 Jan 17, 2024
5238392
chore: lint fixes
hcho112 Jan 17, 2024
21cb2f5
chore: delete unavailable routes
hcho112 Jan 18, 2024
e415c3c
fix: update translation with spacing, minor UI update
hcho112 Jan 18, 2024
ae2aabc
chore: lint fixes
hcho112 Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
357 changes: 13 additions & 344 deletions packages/frontend/src/components/Routing.js
View file
Open in desktop

Large diffs are not rendered by default.

79 changes: 25 additions & 54 deletions packages/frontend/src/components/common/Footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@ import styled from 'styled-components';

import { isWhitelabel } from '../../config/whitelabel';
import NearLogo from '../../images/near.svg';
import { Mixpanel } from '../../mixpanel/index';
import MyNearWalletLogo from '../svg/MyNearWalletLogo';

const StyledContainer = styled.div`
position: absolute;
right: 0;
left: 0;
bottom: 0;
padding: 35px;
background-color: #f8f8f8;
padding-top: 35px;
background-color: #FFFFFF;
font-size: 12px;
color: #999999;
display: flex;
Expand Down Expand Up @@ -48,7 +46,6 @@ const StyledContainer = styled.div`
}

img {
opacity: 0.3;
width: 125px;
}

Expand Down Expand Up @@ -78,6 +75,10 @@ const StyledContainer = styled.div`
display: block;
}
}

@media(max-width: 768px) {
padding: 30px 30px 10px;
}
`;

const StyledLogo = styled.div`
Expand All @@ -86,61 +87,31 @@ const StyledLogo = styled.div`
}
`;

const InnerContainer = styled.div`
display: flex;
width: 1224px;
margin: 0 auto;
justify-content: space-between;
align-items: center;
`;

const Footer = () => {
return (
<StyledContainer className='wallet-footer'>
<div className='left'>
{
isWhitelabel ? (
<StyledLogo>
<MyNearWalletLogo mode='footer' />
</StyledLogo>
) : <img src={NearLogo} alt='NEAR' />
}
<InnerContainer>
<div className='left'>
{
isWhitelabel ? (
<StyledLogo>
<MyNearWalletLogo mode='footer' />
</StyledLogo>
) : <img src={NearLogo} alt='NEAR' />
}
</div>
<div>
&copy; {new Date().getFullYear()} <Translate id='footer.copyrights' />
<div>
<a
href='/terms'
rel='noopener noreferrer'
target='_blank'
onClick={() => Mixpanel.track('Footer Click terms of service')}
>
<Translate id='footer.termsOfService' />
</a>
<span className='color-brown-grey'>|</span>
<a href='/privacy'
rel='noopener noreferrer'
target='_blank'
onClick={() => Mixpanel.track('Footer Click privacy policy')}
>
<Translate id='footer.privacyPolicy' />
</a>
</div>
</div>
</div>
<div className='center'>
<Translate id='footer.desc' />&nbsp;
<a
href='https://near.org'
rel='noopener noreferrer'
target='_blank'
onClick={() => Mixpanel.track('Footer Click Learn More')}
>
<Translate id='footer.learnMore' />
</a>
</div>
<div className='right'>
<Translate id='footer.needHelp' /><br />
<a
href={isWhitelabel ? 'https://discord.com/invite/Vj74PpQYsh' : 'https://near.chat'}
rel='noopener noreferrer'
target='_blank'
onClick={() => Mixpanel.track('Footer Click Join Community')}
>
<Translate id='footer.contactSupport' />
</a>
</div>
</InnerContainer>
</StyledContainer>
);
};
Expand Down
75 changes: 74 additions & 1 deletion packages/frontend/src/components/common/FormButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,23 @@ const CustomButton = styled.button`
}
}

&.dark-gray-black {
background-color: #000000;
color: #FFFFFF;
padding: 0 20px;
margin: 0;
:hover {
background-color: #706f6c;
}

:disabled {
background: #e6e6e6;
border-color: #e6e6e6;
opacity: 1 !important;
color: #A2A2A8;
}
}

&.gray-gray {
background-color: #F0F0F1;
border-color: #F0F0F1;
Expand Down Expand Up @@ -193,6 +210,62 @@ const CustomButton = styled.button`
opacity: 0.8;
}
}
&.dark-gray-transparent {
background-color: transparent;
border-color: #000000;
color: #000000;
margin: 0;
padding: 10px 24px;

:hover {
background-color: #000000;
color: #FFFFFF;
}

:disabled {
background: #e6e6e6;
border-color: #e6e6e6;
opacity: 1 !important;
color: #A2A2A8;
}
}
&.dark-green-transparent {
background-color: transparent;
border-color: #00EC97;
color: #FFFFFF;
margin: 0;
padding: 10px 24px;

:hover {
background-color: rgb(0, 236, 151);
color: #000000;
}

:disabled {
background: #e6e6e6;
border-color: #e6e6e6;
opacity: 1 !important;
color: #A2A2A8;
}
}
&.light-green-transparent {
background-color: #00EC97;
border-color: #00EC97;
color: #000000;
margin: 0;
padding: 10px 24px;

:hover {
background-color: #45e394;
}

:disabled {
background: #e6e6e6;
border-color: #e6e6e6;
opacity: 1 !important;
color: #A2A2A8;
}
}
&.green {
border-color: #5ace84;
background: #5ace84;
Expand Down Expand Up @@ -236,7 +309,7 @@ const CustomButton = styled.button`
background-size: 14px 20px;

:disabled {
color: e6e6e6;
color: #e6e6e6;
border-color: #e6e6e6;
background: #fff;
opacity: 1 !important;
Expand Down
Loading