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

pull #17

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

pull #17

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
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Program Owner in this file needs to match program owner that is part of on-chain swap program
# Applicable only to token-swap programs compiled with feature flag: ('program-owner-fees')
SWAP_PROGRAM_OWNER_FEE_ADDRESS=''
SWAP_PROGRAM_OWNER_FEE_ADDRESS='8LtxGeZJn5WbFqdFWoCLseGD37mJBLZTRJVFY6pTdXLD'

# HOST Public Key used for additional swap fees
SWAP_HOST_FEE_ADDRESS=''
SWAP_HOST_FEE_ADDRESS='8LtxGeZJn5WbFqdFWoCLseGD37mJBLZTRJVFY6pTdXLD'

# Rewired variables to comply with CRA restrictions
REACT_APP_SWAP_HOST_FEE_ADDRESS=$SWAP_HOST_FEE_ADDRESS
Expand Down
9 changes: 9 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# This configuration file was automatically generated by Gitpod.
# Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file)
# and commit this file to your remote git repository to share the goodness with others.

tasks:
- init: yarn install && yarn run build
command: yarn run start


Binary file added favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20,056 changes: 20,020 additions & 36 deletions package-lock.json

Large diffs are not rendered by default.

Binary file modified public/favicon.ico
Binary file not shown.
6 changes: 3 additions & 3 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Web site created using create-react-app" />
<meta name="theme-color" content="#5d6d7e" />
<meta name="description" content="(c) 2022 Antidote Data System" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
Expand All @@ -21,7 +21,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>Swap | Solana</title>
<title>Antidote Potion Swap</title>
<style type="text/css">
#root {
height: 100%;
Expand Down
12 changes: 6 additions & 6 deletions public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"short_name": "Swap | Serum",
"name": "Swap | Serum",
"short_name": "Changling | Exchange",
"name": "Changling | Exchange",
"icons": [
{
"src": "icon.ico",
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"src": "favicon.ico",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"src": "favicon.ico",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
"background_color": "#ff5733"
}
43 changes: 22 additions & 21 deletions src/App.less
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,27 @@ body {
}

.App-logo {
background-image: url("data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9JzMwMHB4JyB3aWR0aD0nMzAwcHgnICBmaWxsPSIjZDgzYWViIiB4bWxuczp4PSJodHRwOi8vbnMuYWRvYmUuY29tL0V4dGVuc2liaWxpdHkvMS4wLyIgeG1sbnM6aT0iaHR0cDovL25zLmFkb2JlLmNvbS9BZG9iZUlsbHVzdHJhdG9yLzEwLjAvIiB4bWxuczpncmFwaD0iaHR0cDovL25zLmFkb2JlLmNvbS9HcmFwaHMvMS4wLyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iLTIwNSAyMDcgMTAwIDEwMCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAtMjA1IDIwNyAxMDAgMTAwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PHN3aXRjaD48Zm9yZWlnbk9iamVjdCByZXF1aXJlZEV4dGVuc2lvbnM9Imh0dHA6Ly9ucy5hZG9iZS5jb20vQWRvYmVJbGx1c3RyYXRvci8xMC4wLyIgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSI+PC9mb3JlaWduT2JqZWN0PjxnIGk6ZXh0cmFuZW91cz0ic2VsZiI+PHBhdGggZD0iTS0xODMuMywyNzMuMWMwLjMsMS0wLjIsMi4xLTEuMiwyLjRjLTAuMiwwLjEtMC40LDAuMS0wLjYsMC4xYy0wLjgsMC0xLjUtMC41LTEuOC0xLjNjLTAuMy0xLDAuMi0yLjEsMS4yLTIuNCAgICBDLTE4NC42LDI3MS41LTE4My42LDI3Mi4xLTE4My4zLDI3My4xeiBNLTE4MC41LDI2MS40YzAuNCwwLDAuOC0wLjEsMS4xLTAuNGMwLjgtMC42LDEtMS44LDAuNC0yLjZjLTAuNi0wLjgtMS44LTEtMi42LTAuNCAgICBjMCwwLDAsMCwwLDBjLTAuOCwwLjYtMSwxLjgtMC40LDIuNkMtMTgxLjYsMjYxLjEtMTgxLDI2MS40LTE4MC41LDI2MS40eiBNLTE4NS42LDI2Ny42YzAuMiwwLjEsMC40LDAuMSwwLjYsMC4xICAgIGMwLjgsMCwxLjUtMC41LDEuOC0xLjNjMC4zLTEtMC4yLTIuMS0xLjItMi40Yy0xLTAuMy0yLjEsMC4yLTIuNCwxLjJDLTE4Ny4yLDI2Ni4yLTE4Ni42LDI2Ny4zLTE4NS42LDI2Ny42eiBNLTE3OS4zLDI3OC41ICAgIGMtMC44LTAuNi0yLTAuNC0yLjYsMC40Yy0wLjYsMC44LTAuNCwyLDAuNCwyLjZjMC4zLDAuMiwwLjcsMC40LDEuMSwwLjRjMC42LDAsMS4yLTAuMywxLjUtMC44ICAgIEMtMTc4LjMsMjgwLjMtMTc4LjUsMjc5LjEtMTc5LjMsMjc4LjV6IE0tMTczLDI1OC45YzAuNSwwLDEtMC4yLDEuMy0wLjVjMC4zLTAuNCwwLjYtMC44LDAuNi0xLjNjMC0wLjUtMC4yLTEtMC42LTEuMyAgICBjLTAuNC0wLjQtMC44LTAuNi0xLjMtMC42Yy0wLjUsMC0xLDAuMi0xLjMsMC42Yy0wLjMsMC4zLTAuNiwwLjgtMC42LDEuM2MwLDAuNSwwLjIsMSwwLjYsMS4zQy0xNzQsMjU4LjctMTczLjUsMjU4LjktMTczLDI1OC45eiAgICAgTS0xNTguNiwyNTUuMmMtMSwwLTEuOSwwLjgtMS45LDEuOWMwLDEsMC45LDEuOSwxLjksMS45YzEsMCwxLjktMC44LDEuOS0xLjlDLTE1Ni43LDI1Ni0xNTcuNiwyNTUuMi0xNTguNiwyNTUuMnogTS0xNTMuMywyNTcuMSAgICBjMCwxLDAuOCwxLjksMS45LDEuOWMxLDAsMS45LTAuOCwxLjktMS45YzAtMS0wLjgtMS45LTEuOS0xLjlDLTE1Mi40LDI1NS4yLTE1My4zLDI1Ni0xNTMuMywyNTcuMXogTS0xNDYuMSwyNTcuMSAgICBjMCwxLDAuOCwxLjksMS45LDEuOWMxLDAsMS45LTAuOCwxLjktMS45YzAtMS0wLjgtMS45LTEuOS0xLjlDLTE0NS4zLDI1NS4yLTE0Ni4xLDI1Ni0xNDYuMSwyNTcuMXogTS0xNjcuNywyNTcuMSAgICBjMCwxLDAuOCwxLjksMS45LDEuOXMxLjktMC44LDEuOS0xLjljMC0xLTAuOC0xLjktMS45LTEuOVMtMTY3LjcsMjU2LTE2Ny43LDI1Ny4xeiBNLTEzNywyNTUuMmMtMC41LDAtMSwwLjItMS4zLDAuNiAgICBjLTAuMywwLjMtMC42LDAuOC0wLjYsMS4zYzAsMC41LDAuMiwxLDAuNiwxLjNjMC4zLDAuNCwwLjgsMC42LDEuMywwLjZjMC41LDAsMS0wLjIsMS4zLTAuNmMwLjMtMC4zLDAuNi0wLjgsMC42LTEuMyAgICBjMC0wLjUtMC4yLTEtMC42LTEuM0MtMTM2LDI1NS40LTEzNi41LDI1NS4yLTEzNywyNTUuMnogTS0xMjQuNCwyNDYuNWMtMS0wLjMtMi4xLDAuMi0yLjQsMS4ybDAsMGMtMC4zLDEsMC4yLDIuMSwxLjIsMi40ICAgIGMwLjIsMC4xLDAuNCwwLjEsMC42LDAuMWMwLjgsMCwxLjUtMC41LDEuOC0xLjNjMCwwLDAsMCwwLDBDLTEyMi44LDI0Ny45LTEyMy40LDI0Ni44LTEyNC40LDI0Ni41eiBNLTEzMC43LDI1My4xTC0xMzAuNywyNTMuMSAgICBjLTAuOCwwLjYtMSwxLjgtMC40LDIuNmMwLjQsMC41LDAuOSwwLjgsMS41LDAuOGMwLjQsMCwwLjgtMC4xLDEuMS0wLjRjMC44LTAuNiwxLTEuOCwwLjQtMi42ICAgIEMtMTI4LjYsMjUyLjctMTI5LjgsMjUyLjUtMTMwLjcsMjUzLjF6IE0tMTMwLjcsMjM1LjZjMC4zLDAuMiwwLjcsMC40LDEuMSwwLjRjMC42LDAsMS4yLTAuMywxLjUtMC44YzAuNi0wLjgsMC40LTItMC40LTIuNiAgICBjLTAuOC0wLjYtMi0wLjQtMi42LDAuNEMtMTMxLjcsMjMzLjgtMTMxLjUsMjM1LTEzMC43LDIzNS42eiBNLTEyNC45LDI0Mi4zYzAuMiwwLDAuNCwwLDAuNi0wLjFjMS0wLjMsMS41LTEuNCwxLjItMi40ICAgIGMtMC4zLTEtMS40LTEuNS0yLjQtMS4yYy0xLDAuMy0xLjUsMS40LTEuMiwyLjRDLTEyNi41LDI0MS44LTEyNS43LDI0Mi4zLTEyNC45LDI0Mi4zeiBNLTE0MS4zLDI4MC45bC0xMC43LTEwLjcgICAgYy0wLjctMC43LTEuOS0wLjctMi43LDBjLTAuNywwLjctMC43LDEuOSwwLDIuN2w3LjYsNy42aC0yNmMtMSwwLTEuOSwwLjgtMS45LDEuOXMwLjgsMS45LDEuOSwxLjloMjUuOGwtNy40LDcuNCAgICBjLTAuNywwLjctMC43LDEuOSwwLDIuN2MwLjQsMC40LDAuOSwwLjYsMS4zLDAuNnMxLTAuMiwxLjMtMC42bDEwLjctMTAuN2MwLjQtMC40LDAuNi0wLjksMC41LTEuNCAgICBDLTE0MC43LDI4MS44LTE0MC45LDI4MS4zLTE0MS4zLDI4MC45eiBNLTE3MSwyMzMuMWwxMC43LDEwLjdjMC40LDAuNCwwLjksMC42LDEuMywwLjZzMS0wLjIsMS4zLTAuNmMwLjctMC43LDAuNy0xLjksMC0yLjcgICAgbC03LjUtNy41aDI4LjJjMSwwLDEuOS0wLjgsMS45LTEuOXMtMC44LTEuOS0xLjktMS45aC0yOC4ybDcuNS03LjVjMC43LTAuNywwLjctMS45LDAtMi43Yy0wLjctMC43LTEuOS0wLjctMi43LDBsLTEwLjcsMTAuNyAgICBjLTAuNCwwLjQtMC42LDAuOS0wLjUsMS40Qy0xNzEuNiwyMzIuMi0xNzEuNCwyMzIuNy0xNzEsMjMzLjF6Ij48L3BhdGg+PC9nPjwvc3dpdGNoPjwvc3ZnPg==");
height: 40px;
background-image: url("https://oceanmarket.s3.us-west-2.amazonaws.com/android-chrome-192x192.png");
height: 240px;
pointer-events: none;
background-repeat: no-repeat;
background-size: 50px;
width: 40px;
justify-content: center;
background-size: 240px;
width: 240px;
}

.Banner {
min-height: 30px;
min-height: 80px;
width: 100%;
background-color: #fff704;
background-color: #26e7d7;
display: flex;
flex-direction: column;
justify-content: center;
// z-index: 10;
}

.Banner-description {
color: black;
color: rgb(16, 0, 0);
font: 2em large;
text-align: center;
width: 100%;
}
Expand Down Expand Up @@ -93,18 +94,18 @@ body {
}

.App-header {
background-color: #282c34;
background-color: #417dc1;
min-height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
font-size: calc(60px + 2vmin);
color: rgb(255, 253, 253);
}

.App-link {
color: #61dafb;
color: #61dafb5f;
}

.social-buttons {
Expand All @@ -113,11 +114,11 @@ body {
margin-bottom: 0.5rem;
margin-right: 1rem;
gap: 0.3rem;
display: flex;
display: table;
}

.wallet-wrapper {
background: @background-color-base;
background: @background-color-base;table
padding-left: 0.7rem;
border-radius: 0.5rem;
display: flex;
Expand All @@ -135,17 +136,17 @@ body {
}

.exchange-card {
border-radius: 20px;
box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 10px 0px;
width: 450px;
margin: 4px auto;
padding: 0px;
border-radius: 30px;
box-shadow: rgba(0, 0, 0, 1.1) 100px 0px 100px 0px;
width: 300x;
margin: 0px;
padding: 70px 0px 70px 0px;

.ant-tabs-tab {
width: 50%;
width: 100%;
margin: 0px;
justify-content: center;
border-radius: 20px 20px 0px 0px;
border-radius: 60px 60px 0px 0px;
}

.ant-tabs-tab-active {
Expand Down
9 changes: 0 additions & 9 deletions src/App.test.tsx

This file was deleted.

10 changes: 5 additions & 5 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,26 @@ function App() {
<div className="App">
<div className="Banner">
<div className="Banner-description">
Swap is unaudited software. Use at your own risk.
Antidote Potion Exchange
</div>
</div>
<Routes />
<div className="social-buttons">
<GitHubButton
href="https://github.com/project-serum/oyster-swap"
href="https://github.com/crownholder"
data-color-scheme="no-preference: light; light: light; dark: light;"
data-icon="octicon-star"
data-size="large"
data-show-count={true}
aria-label="Star solana-labs/oyster-swap on GitHub"
aria-label="Antidote"
>
Star
</GitHubButton>
<GitHubButton
href="https://github.com/project-serum/oyster-swap/fork"
href="https://github.com/crownholder"
data-color-scheme="no-preference: light; light: light; dark: light;"
data-size="large"
aria-label="Fork project-serum/oyster-swap on GitHub"
aria-label="Anti Git Hub Account "
>
Fork
</GitHubButton>
Expand Down
4 changes: 2 additions & 2 deletions src/ant-custom.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "~antd/dist/antd.css";
@import "~antd/dist/antd.dark.less";
@primary-color: #ff00a8;
@popover-background: #1a2029;
@primary-color: #ff00a6;
@popover-background: #b3b4ba;
6 changes: 3 additions & 3 deletions src/components/currencyInput/styles.less
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
display: grid;

grid-template-columns: repeat(2, 1fr);
grid-column-gap: 10px;
grid-column-gap: 1px;

-webkit-box-pack: justify;
justify-content: space-between;
Expand All @@ -24,8 +24,8 @@
.ccy-input-header-left {
width: 100%;
box-sizing: border-box;
margin: 0px;
min-width: 0px;
margin:100px;
min-width: 80px;
display: flex;
padding: 0px;
-webkit-box-align: center;
Expand Down
2 changes: 1 addition & 1 deletion src/components/exchange.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const ExchangeView = (props: {}) => {
<div className="App-Bar-right">
<Button type="text" size="large" style={{ color: "#2abdd2" }}>
<a
href={"https://dex.projectserum.com"}
href={"https://www.antidote.world"}
target="_blank"
rel="noopener noreferrer"
>
Expand Down
2 changes: 1 addition & 1 deletion src/components/pool/add.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
display: grid;
grid-template-columns: 1fr 1fr;
gap: 0.5em 1em;
align-items: center;
align-items: left;
text-align: right;

input {
Expand Down
2 changes: 1 addition & 1 deletion src/components/pool/add.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export const AddToLiquidity = () => {
</div>
}
>
<Button type="text">Read more about providing liquidity.</Button>
<Button type="text"></Button>
</Popover>

<CurrencyInput
Expand Down
2 changes: 1 addition & 1 deletion src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ body {
}

code {
font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
font-family: source-code-pro, Menlo, "Monaco", Consolas, Courier New,
monospace;
}
Binary file added src/logo512.png.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/logo512.png9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/utils/token-list.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
"mintAddress": "So11111111111111111111111111111111111111112",
"tokenName": "Solana",
"icon": "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/solana/info/logo.png"
},
{
"tokenSymbol": "ANTI",
"mintAddress": "0xa2c685a19aA159B3f7fa7b71332a181e1861Ae9d",
"tokenName": "Antidote",
"icon": "https://oceanmarket.s3.us-west-2.amazonaws.com/antidote-icon-to-be-icon.svg"
},
{
"tokenSymbol": "BTC",
Expand Down
Loading