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.

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

new version modal #822

Merged
merged 1 commit into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@
},
"lint-staged": {
"*.{jsx,js,ts,tsx}": [
"bash -c 'npm run type-check'",
"npm run lint",
"git add ."
]
Expand Down
Binary file added src/assets/images/beta-image.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
130 changes: 130 additions & 0 deletions src/components/NewVersionModal/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
import React, { useState } from 'react'
import styled, { css } from 'styled-components'
import BetaImage from '../../assets/images/beta-image.jpg'
import { ButtonPrimary, ButtonSecondary } from '../Button'

const Modal = styled.div`
width: 100vw;
height: 100dvh;
padding: 144px 0;
position: fixed;
z-index: 9999999;
top: 0;
left: 0;
display: flex;
align-items: center;
justify-content: center;
backdrop-filter: blur(10px);
background-color: hsla(0, 0, 7, 80%);
visibility: hidden;
opacity: 0;
transition: all 0.4s;

${props =>
props.isOpen &&

Check failure on line 24 in src/components/NewVersionModal/index.tsx

View workflow job for this annotation

GitHub Actions / lint_tsc

Property 'isOpen' does not exist on type 'ThemedStyledProps<Pick<DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "key" | keyof HTMLAttributes<HTMLDivElement>> & { ...; }, DefaultTheme>'.
css`
visibility: visible;
opacity: 1;
`}
`

const ModalContent = styled.div`
display: flex;
overflow: hidden;
border-radius: 12px;
height: 100%;
background-color: #1c1c1c;
box-shadow: 0 251px 70px hsla(0, 0%, 0%, 0), 0 161px 64px hsla(0, 0%, 0%, 4%), 0 90px 54px hsla(0, 0%, 0%, 13%),
0 40px 40px hsla(0, 0%, 0%, 21%), 0 10px 22px hsla(0, 0%, 0%, 25%);
`

const ModalColumn = styled.div`
flex: 1;
`

const ModalImage = styled.img`
object-fit: cover;
width: 100%;
height: 100%;
`

const Content = styled(ModalColumn)`
padding: 32px 52px;
display: flex;
flex-direction: column;
justify-content: center;
gap: 32px;
`

const ModalTextWrapper = styled.div`
display: flex;
flex-direction: column;
gap: 16px;
`

const Actions = styled.div`
display: flex;
gap: 12px;
`

const ModalHeading = styled.h3`
font-size: 36px;
font-weight: bold;
margin: 0;
`

const ModalText = styled.p`
margin: 0;
text-wrap: balance;
max-width: 85%;
`

const BtnPrimary = styled(ButtonPrimary)`
border-radius: 4px;
font-size: 14px;
color: #111;
font-weight: semibold;
display: inline-block;
`
const BtnSecondary = styled(ButtonSecondary)`
border-radius: 4px;
font-size: 14px;
font-weight: semibold;
display: inline-block;
`

export const NewVersionModal = () => {
const [betaModal, setBetaModal] = useState(true)

const toggleModal = () => {
setBetaModal(!betaModal)
}

const goToBeta = () => window.open('https://beta.pangolin.exchange/', '_blank')

return (
<Modal isOpen={betaModal} onDismiss={toggleModal}>

Check failure on line 106 in src/components/NewVersionModal/index.tsx

View workflow job for this annotation

GitHub Actions / lint_tsc

No overload matches this call.
<ModalContent>
<ModalColumn>
<ModalImage src={BetaImage} />
</ModalColumn>
<Content>
<ModalTextWrapper>
<ModalHeading>Pangolin V3 Concentrated Liquidity is on the Way!</ModalHeading>
<ModalText>
Until then, feel free to use the classic Pangolin with original UI or explore the beta UI.
</ModalText>
</ModalTextWrapper>
<Actions>
<BtnPrimary variant="primary" onClick={goToBeta}>
Explore the beta
</BtnPrimary>
<BtnSecondary variant="primary" onClick={toggleModal}>
Return to app
</BtnSecondary>
</Actions>
</Content>
</ModalContent>
</Modal>
)
}
2 changes: 2 additions & 0 deletions src/layout/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { useState } from 'react'
import { Outlet } from 'react-router-dom'
import HederaPoolWarning from 'src/components/Header/HederaPoolWarning'
import URLWarning from 'src/components/Header/URLWarning'
import { NewVersionModal } from 'src/components/NewVersionModal'
import styled from 'styled-components'
import Footer from './Footer'
import Header from './Header'
Expand Down Expand Up @@ -57,6 +58,7 @@ const Layout: React.FC<unknown> = () => {
</AppContent>
{activeMobileMenu && <MobileMenu activeMobileMenu={activeMobileMenu} handleMobileMenu={handleMobileMenu} />}
<Footer />
<NewVersionModal />
</MainContent>
</Wrapper>
)
Expand Down
Loading