Skip to content

Commit

Permalink
Merge pull request #3096 from erditkurteshiSQA/master
Browse files Browse the repository at this point in the history
Add Nearcon graphic to NEAR Wallet page
  • Loading branch information
andy-haynes authored Aug 10, 2023
2 parents c4ffd80 + f9edf35 commit e35bcc9
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 8 deletions.
63 changes: 63 additions & 0 deletions packages/frontend/src/components/wallet/GetYourTickets.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import React from 'react';
import styled from 'styled-components';

import NearCon from '../../images/nearcon-wallet.png';

const Container = styled.div`
&& {
border-radius: 8px;
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
color: #d5d4d8;
font-size: 14px;
margin-bottom: 40px;
& div {
position: relative;
}
}
`;

const StyledBannerLink = styled.a`
margin-top: 12px;
width: 270px;
height: 35px;
background: #604cc8;
color: #fff;
border: 2px solid #604cc8;
border-radius: 50px;
font-weight: 400;
font-size: 16px;
line-height: 24px;
display: flex;
align-items: center;
text-align: center;
justify-content: center;
position: absolute;
left: 24px;
bottom: 18px;
&:hover {
color: #fff;
text-decoration: none;
cursor: pointer;
}
`;

const GetYourTicket = () => {
return (
<Container>
<div>
<img src={NearCon} alt='NearCon-wallet'/>
<StyledBannerLink href="https://near.org/nearcon23.near/widget/Index" target="_blank">
GET YOUR TICKETS
</StyledBannerLink>
</div>
</Container>
);
};

export default GetYourTicket;
29 changes: 29 additions & 0 deletions packages/frontend/src/components/wallet/SidebarNearcon.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import React from 'react';
import styled from 'styled-components';

import GetYourTicket from './GetYourTickets';

const StyledContainer = styled.div`
background-color: transparent;
border-radius: 8px;
padding-bottom: 30px;
margin-bottom: 35px;
height: 400px;
color: #25272A;
`;

const StyledBanner = styled.div`
height: 395px;
margin-bottom: 10px;
`;

export default () => {
return (
<StyledContainer>
<StyledBanner>
<GetYourTicket />
</StyledBanner>
</StyledContainer>
);
};
11 changes: 3 additions & 8 deletions packages/frontend/src/components/wallet/Wallet.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@ import AllTokensTotalBalanceUSD from './AllTokensTotalBalanceUSD';
import CreateCustomNameModal from './CreateCustomNameModal';
import CreateFromImplicitSuccessModal from './CreateFromImplicitSuccessModal';
import DepositNearBanner from './DepositNearBanner';
import ExploreApps from './ExploreApps';
import LinkDropSuccessModal from './LinkDropSuccessModal';
import NFTs from './NFTs';
import Sidebar from './Sidebar';
import SidebarLight from './SidebarLight';
import SidebarNearcon from './SidebarNearcon';
import Tokens from './Tokens';
import { ZeroBalanceAccountImportedModal } from './ZeroBalanceAccountImportedModal';

Expand Down Expand Up @@ -367,11 +365,8 @@ export function Wallet({
)}
</div>
<div className="right">
{isWhitelabel
? <SidebarLight availableAccounts={accountExists && availableAccounts} />
: accountExists
? <Sidebar availableAccounts={availableAccounts} />
: <ExploreApps />
{
<SidebarNearcon/ >
}
<ActivitiesWrapper />
</div>
Expand Down
Binary file added packages/frontend/src/images/nearcon-wallet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e35bcc9

Please sign in to comment.