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

Beta #8

Merged
merged 154 commits into from
Jun 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
154 commits
Select commit Hold shift + click to select a range
19f655e
feat: add master input component
ZakMooney May 14, 2024
212c846
chore: remove unused line
ZakMooney May 14, 2024
c5680a5
feat: expand future vault create
ZakMooney May 20, 2024
17848f0
feat: fix
ZakMooney May 20, 2024
27ad060
style: collateral modal icon spacing
ZakMooney May 21, 2024
ba64e88
feat: add available total to swap
ZakMooney May 21, 2024
b5fa954
feat: add available total to withdraw
ZakMooney May 21, 2024
5361b16
feat: add totals to debt modals
ZakMooney May 21, 2024
7c8c46c
feat: dynamic update vault health and display in borrow/repay modals
ZakMooney May 21, 2024
983397d
feat: add qr to vault deposit
ZakMooney May 21, 2024
e839c20
feat: show percentage health when borrowing
ZakMooney May 21, 2024
dc95bf0
fix: crashing repay modal
ZakMooney May 22, 2024
954d07b
force beta change
ewansheldon May 29, 2024
f5e7521
wip: projected rewards
ZakMooney Jun 4, 2024
10935fa
wip: deposit
ZakMooney Jun 4, 2024
20a96fb
feat: liquidity pools staking v2
ZakMooney Jun 4, 2024
e1c9992
feat: folder restructure
ZakMooney Jun 5, 2024
45e8423
feat: folder restructure
ZakMooney Jun 5, 2024
9277234
add dockerfile and nginx server
ewansheldon May 3, 2024
112798d
add deployment workflow
ewansheldon May 3, 2024
ee676d1
remove branch from deployment name
ewansheldon May 3, 2024
4a37cc8
add dapp name to env
ewansheldon May 3, 2024
c6e854e
force redeploy
ewansheldon May 3, 2024
edb38cb
remove logging
ewansheldon May 3, 2024
d6da135
chore: favicon
ZakMooney May 3, 2024
5092e0a
wip: custom theme
ZakMooney May 3, 2024
9c2f853
wip: custom theme
ZakMooney May 3, 2024
dcac62b
feat: added glass start
ZakMooney May 9, 2024
790d3f3
fix: modal glass
ZakMooney May 9, 2024
549cd01
chore: remove commented out code
ZakMooney May 9, 2024
e7c4de8
chore: merge conflict
ZakMooney May 13, 2024
8c7914c
feat: glass cards
ZakMooney May 13, 2024
134d99f
wip: glass layout
ZakMooney May 13, 2024
782c01d
wip: theme
ZakMooney May 14, 2024
8cd4569
wip: input style
ZakMooney May 14, 2024
108a0bc
style: basic input and table
ZakMooney May 14, 2024
183735e
style: add token icons
ZakMooney May 14, 2024
1635605
style: mob nav
ZakMooney May 14, 2024
41d923e
style: fix double glass
ZakMooney May 14, 2024
c2d06f4
style: tooltip vault typpe
ZakMooney May 15, 2024
f538ae6
feat: collapse token actions
ZakMooney May 15, 2024
679398f
feat: vault token charts
ZakMooney May 15, 2024
1320f09
feat: vault token charts
ZakMooney May 15, 2024
ebac620
feat: vault donut chart
ZakMooney May 16, 2024
8fce74d
feat: vault donut chart
ZakMooney May 16, 2024
4b45e0c
feat: placeholder backgrounds
ZakMooney May 16, 2024
e464753
feat: empty pie for new vaults
ZakMooney May 17, 2024
e4f1920
feat: swap auto fill, vault history, staking charts, logo and more
ZakMooney May 17, 2024
1a62f26
add dockerfile and nginx server
ewansheldon May 3, 2024
e5eeaaa
feat: swap auto fill, vault history, staking charts, logo and more
ZakMooney May 17, 2024
e87df70
feat: vault table styling and rows clickable
ZakMooney May 20, 2024
a774895
style: warn transparency
ZakMooney May 20, 2024
f26e0c0
feat: vault main card, lightmode logo
ZakMooney May 20, 2024
36e558e
feat: hide pagination if only 1 page
ZakMooney May 20, 2024
0beb3a4
feat: pretty up create vault buttons
ZakMooney May 20, 2024
3477f74
style: top align sidebar
ZakMooney May 20, 2024
4f43ffd
feat: tooltips sidebar
ZakMooney May 20, 2024
1a135a8
style: icon padding for modals
ZakMooney May 20, 2024
205006c
style: fix background jumping on mobile
ZakMooney May 20, 2024
8db1eda
style: donut
ZakMooney May 21, 2024
6915d72
style: donut
ZakMooney May 21, 2024
5bbcc61
style: token list active style
ZakMooney May 21, 2024
75de92e
feat: token list button disable if 0
ZakMooney May 21, 2024
bf58058
feat: add available total to swap
ZakMooney May 21, 2024
b4882c8
feat: dynamic update vault health and display in borrow/repay modals
ZakMooney May 21, 2024
f6d42f5
feat: vault token charts
ZakMooney May 15, 2024
25907e2
feat: swap auto fill, vault history, staking charts, logo and more
ZakMooney May 17, 2024
d56a6be
feat: vault main card, lightmode logo
ZakMooney May 20, 2024
55dbe9a
feat: code clean history
ZakMooney May 21, 2024
e900f8a
style: vault health spacing tweak
ZakMooney May 21, 2024
e5fc655
feat: add qr to vault deposit
ZakMooney May 21, 2024
c8fe0c9
feat: vault token charts
ZakMooney May 15, 2024
129ff9f
feat: swap auto fill, vault history, staking charts, logo and more
ZakMooney May 17, 2024
9910a21
feat: vault main card, lightmode logo
ZakMooney May 20, 2024
9ad531c
fix: vault list broken navigation
ZakMooney May 22, 2024
fbbeb47
style: thicker pie
ZakMooney May 22, 2024
ec9bef5
feat: add no data state to history table
ZakMooney May 22, 2024
722306d
fix: wrong token address when fetching wallet balance
ZakMooney May 22, 2024
68f3a6e
style: button styles
ZakMooney May 22, 2024
7684b35
style: button styles
ZakMooney May 22, 2024
5a7e328
feat: replace all styled buttons
ZakMooney May 22, 2024
be8a221
feat: glass pie
ZakMooney May 23, 2024
8db9086
style: tweak buttons to look better with darklight
ZakMooney May 23, 2024
809ef7d
style: style sidenav
ZakMooney May 23, 2024
f7a474d
feat: add theme selector
ZakMooney May 24, 2024
0fb1484
feat: tidied themes and added bgs
ZakMooney May 24, 2024
0e8c832
feat: change borrow success modal to prompt lynxfinance
ZakMooney May 24, 2024
3c828c9
chore: higher res gold
ZakMooney May 24, 2024
679b4ff
chore: fix nebula text
ZakMooney May 24, 2024
eadca8e
style: dark buttons for deluxe themes
ZakMooney May 24, 2024
600a05a
chore: remove temp bypass
ZakMooney May 24, 2024
e5a49b2
feat: have first token open in vault by defaukt
ZakMooney May 24, 2024
8662266
style: deluxe button glow
ZakMooney May 28, 2024
8768f77
style: top and side nav glass rim
ZakMooney May 28, 2024
60d59c8
style: deluxe button glow
ZakMooney May 28, 2024
5fda2e3
deploy to smart vault deployments (main + beta)
ewansheldon May 29, 2024
eee2cc7
force change
ewansheldon May 29, 2024
b85a833
feat: added history message
ZakMooney May 29, 2024
9fa3b98
feat: added footer
ZakMooney May 29, 2024
7071686
feat: added terms
ZakMooney May 29, 2024
6b41858
fix: staking arb one
ZakMooney May 29, 2024
dedf767
chore: remove unused var
ZakMooney May 29, 2024
8a6e936
style: clearer liquidated label
ZakMooney May 30, 2024
452aa25
style: clearer liquidated label
ZakMooney May 30, 2024
7ef1aa4
feat: return missing debt repay guide
ZakMooney Jun 3, 2024
52201f4
feat: return missing debt repay guide
ZakMooney Jun 3, 2024
c42f6b4
chore: rebase & more
ZakMooney Jun 5, 2024
a85f7c9
feat: add tst styling
ZakMooney Jun 5, 2024
3a00ed0
style: sidenav med style
ZakMooney Jun 5, 2024
14f7f64
fix: misc bug fixes incl Fragment key
ZakMooney Jun 5, 2024
1cc4683
feat: added history message
ZakMooney May 29, 2024
b5e0faf
feat: added footer
ZakMooney May 29, 2024
c83e5a6
feat: added terms
ZakMooney May 29, 2024
c7f3947
fix: staking arb one
ZakMooney May 29, 2024
75f6e45
chore: remove unused var
ZakMooney May 29, 2024
301823f
style: clearer liquidated label
ZakMooney May 30, 2024
18ddf2f
style: clearer liquidated label
ZakMooney May 30, 2024
9f47395
feat: return missing debt repay guide
ZakMooney Jun 3, 2024
55090cc
feat: return missing debt repay guide
ZakMooney Jun 3, 2024
ca473a1
feat: dynamic update vault health and display in borrow/repay modals
ZakMooney May 21, 2024
e4b6fe8
feat: add qr to vault deposit
ZakMooney May 21, 2024
a6fdc74
wip: projected rewards
ZakMooney Jun 4, 2024
b85cc74
wip: deposit
ZakMooney Jun 4, 2024
6e56394
feat: liquidity pools staking v2
ZakMooney Jun 4, 2024
1d53a5d
feat: folder restructure
ZakMooney Jun 5, 2024
64b726c
feat: added glass start
ZakMooney May 9, 2024
f62a160
wip: glass layout
ZakMooney May 13, 2024
f408eb6
feat: vault token charts
ZakMooney May 15, 2024
c33528b
feat: swap auto fill, vault history, staking charts, logo and more
ZakMooney May 17, 2024
cf66644
feat: vault main card, lightmode logo
ZakMooney May 20, 2024
d50ff01
feat: dynamic update vault health and display in borrow/repay modals
ZakMooney May 21, 2024
eac8c78
style: button styles
ZakMooney May 22, 2024
f89cb41
feat: replace all styled buttons
ZakMooney May 22, 2024
3c9a481
chore: rebase & more
ZakMooney Jun 5, 2024
1b0e78b
feat: add tst styling
ZakMooney Jun 5, 2024
a8e7f2a
style: sidenav med style
ZakMooney Jun 5, 2024
23b6181
fix: misc bug fixes incl Fragment key
ZakMooney Jun 5, 2024
ba23496
feat: swap auto fill, vault history, staking charts, logo and more
ZakMooney May 17, 2024
6e321eb
fix: remove demo
ZakMooney Jun 5, 2024
81623c6
style: force dark tooltip for charts
ZakMooney Jun 5, 2024
bfcc627
chore: post rebase fix
ZakMooney Jun 5, 2024
3e47ea9
style: fix button default
ZakMooney Jun 5, 2024
704181b
fix: staking reward decimals
ZakMooney Jun 6, 2024
3be4c1a
chore: merge conflicts
ZakMooney Jun 6, 2024
87860eb
chore: add clarification on reward rates
ZakMooney Jun 7, 2024
164920f
chore: merge conflict
ZakMooney Jun 7, 2024
a6e55d0
fix: fix claim error
ZakMooney Jun 7, 2024
c5c34d8
chore: merge conflicts main
ZakMooney Jun 11, 2024
9521de9
feat: adjust text for release
ZakMooney Jun 11, 2024
0a83739
feat: add arb one contract address
ZakMooney Jun 13, 2024
bb99aa4
feat: remove depricated liquidation pool deposits
ZakMooney Jun 14, 2024
d897464
feat: remove depricated liquidation pool deposits
ZakMooney Jun 14, 2024
b870a70
feat: fix payback flash
ZakMooney Jun 14, 2024
da7895e
update staking address
ewansheldon Jun 19, 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
2 changes: 1 addition & 1 deletion src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -610,4 +610,4 @@ button.btn.btn-outline:disabled {
box-shadow: inset 0px 0px 20px 1px rgba(255, 255, 255, 0.2);
-webkit-mask: radial-gradient(67px, #0000 98%, #000);
mask: radial-gradient(67px, #0000 98%, #000);
}
}
2 changes: 2 additions & 0 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import Vaults from './pages/vaults/Vaults';
import Vault from './pages/vault/Vault';
import VaultHistory from './pages/vault/VaultHistory';
import LiquidationPools from './pages/liquidation-pools/LiquidationPools';
import StakingPool from './pages/staking-pool/StakingPool';
import TermsOfUse from './pages/TermsOfUse';

import './App.css';
Expand All @@ -34,6 +35,7 @@ function App() {
<Route path="vault/:vaultId" element={<DashLayout><Vault /></DashLayout>} />
<Route path="vault/:vaultId/history" element={<DashLayout><VaultHistory /></DashLayout>} />
<Route path="liquidation-pools" element={<DashLayout><LiquidationPools /></DashLayout>} />
<Route path="staking-pool" element={<DashLayout><StakingPool /></DashLayout>} />
<Route path="termsofuse" element={<DashLayout><TermsOfUse /></DashLayout>} />
<Route path="*" element={<Home/>} />
</Routes>
Expand Down
148 changes: 148 additions & 0 deletions src/abis/stakingPoolV2.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
export const abi = [
{
"inputs": [
{
"internalType": "bool",
"name": "_compound",
"type": "bool"
}
],
"name": "claim",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [],
"name": "dailyYield",
"outputs": [
{
"internalType": "uint256",
"name": "_EUROs",
"type": "uint256"
},
{
"components": [
{
"internalType": "address",
"name": "token",
"type": "address"
},
{
"internalType": "uint256",
"name": "amount",
"type": "uint256"
}
],
"internalType": "struct Staking.Reward[]",
"name": "_rewards",
"type": "tuple[]"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "_tst",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "_euros",
"type": "uint256"
}
],
"name": "decreaseStake",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "_tst",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "_euros",
"type": "uint256"
}
],
"name": "increaseStake",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "",
"type": "address"
}
],
"name": "positions",
"outputs": [
{
"internalType": "uint256",
"name": "start",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "TST",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "EUROs",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "_holder",
"type": "address"
}
],
"name": "projectedEarnings",
"outputs": [
{
"internalType": "uint256",
"name": "_EUROs",
"type": "uint256"
},
{
"components": [
{
"internalType": "address",
"name": "token",
"type": "address"
},
{
"internalType": "uint256",
"name": "amount",
"type": "uint256"
}
],
"internalType": "struct Staking.Reward[]",
"name": "_rewards",
"type": "tuple[]"
}
],
"stateMutability": "view",
"type": "function"
}
]

export default abi;
Binary file added src/assets/bg-dark.webp
Binary file not shown.
19 changes: 19 additions & 0 deletions src/assets/standardiologo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/liquidation-pools/ClaimTokens.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const ClaimTokens = ({
<Card className="card-compact w-full">
<div className="card-body">
<Typography variant="h2" className="card-title justify-between">
Claimable Tokens
Claimable Liquidation Pool Tokens
</Typography>

<div className="overflow-x-auto">
Expand Down
2 changes: 1 addition & 1 deletion src/components/liquidation-pools/StakedAssets.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const StakedAssets = ({
<>
<Card className="card-compact w-full">
<div className="card-body">
<Typography variant="h2" className="card-title">Staked Assets</Typography>
<Typography variant="h2" className="card-title">Staked Liquidation Pool Assets</Typography>

<div className="overflow-x-auto">
<table className="table">
Expand Down
1 change: 1 addition & 0 deletions src/components/liquidation-pools/ValueChart.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ const ValueChart = ({ chartData }) => {
tooltip: {
enabled: true,
shared: true,
theme: 'dark',
x: {
show: false,
// formatter: function (
Expand Down
1 change: 1 addition & 0 deletions src/components/liquidation-pools/VolumeChart.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ const VolumeChart = ({ chartData }) => {
tooltip: {
enabled: true,
shared: true,
theme: 'dark',
x: {
show: false,
// formatter: function (
Expand Down
Loading
Loading