From 07053899bd95b0713d9e04f5af470ebe94fd6976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toto=CC=80=20Volturno?= Date: Thu, 30 Sep 2021 10:43:17 +0200 Subject: [PATCH 1/5] created buy-dough component --- src/components/elements/BuyDoughButton.svelte | 22 +++++ src/pages/Dough.svelte | 55 +----------- src/pages/DoughStakingCampaign.svelte | 84 ++----------------- src/pages/landings/Main.svelte | 23 +---- 4 files changed, 32 insertions(+), 152 deletions(-) create mode 100644 src/components/elements/BuyDoughButton.svelte diff --git a/src/components/elements/BuyDoughButton.svelte b/src/components/elements/BuyDoughButton.svelte new file mode 100644 index 00000000..e0e06931 --- /dev/null +++ b/src/components/elements/BuyDoughButton.svelte @@ -0,0 +1,22 @@ + + + \ No newline at end of file diff --git a/src/pages/Dough.svelte b/src/pages/Dough.svelte index bf1b2f9d..4a7ff907 100644 --- a/src/pages/Dough.svelte +++ b/src/pages/Dough.svelte @@ -1,22 +1,11 @@ PieDAO’s
Governance Token dough
Contribute and be rewarded
for building a better organization and products.
- + diff --git a/src/pages/DoughStakingCampaign.svelte b/src/pages/DoughStakingCampaign.svelte index 293ece54..a1081b5f 100644 --- a/src/pages/DoughStakingCampaign.svelte +++ b/src/pages/DoughStakingCampaign.svelte @@ -1,23 +1,11 @@ PieDAO’s
Governance Token dough
Contribute and be rewarded
for building a better organizazion and products.
- + From 61f86591a78bd24721d85de30c7f6a1a76599e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toto=CC=80=20Volturno?= Date: Thu, 30 Sep 2021 12:02:18 +0200 Subject: [PATCH 2/5] created component for add-to-metamask button --- src/components/StakingSummary.svelte | 41 ++--------------- .../elements/AddToMetamaskButton.svelte | 41 +++++++++++++++++ src/components/elements/BoostedModal.svelte | 39 +--------------- src/components/elements/StakedModal.svelte | 39 +--------------- src/pages/Dough.svelte | 29 ++---------- src/pages/DoughStaking.svelte | 44 ++----------------- src/pages/DoughStakingCampaign.svelte | 29 ++---------- 7 files changed, 58 insertions(+), 204 deletions(-) create mode 100644 src/components/elements/AddToMetamaskButton.svelte diff --git a/src/components/StakingSummary.svelte b/src/components/StakingSummary.svelte index 6177ac74..ace73ca6 100644 --- a/src/components/StakingSummary.svelte +++ b/src/components/StakingSummary.svelte @@ -5,6 +5,7 @@ import images from '../config/images.json'; import smartcontracts from '../config/smartcontracts.json'; import Modal from '../components/elements/Modal.svelte'; + import AddToMetamaskButton from '../components/elements/AddToMetamaskButton.svelte'; import { createEventDispatcher } from 'svelte'; const dispatch = createEventDispatcher(); @@ -20,37 +21,6 @@ let founded = participations.find(staker => staker.address.toLowerCase() == eth.address.toLowerCase()); staker = founded ? founded : staker; } - - const addToken = () => { - ethereum.sendAsync( - { - method: 'wallet_watchAsset', - params: { - type: 'ERC20', - options: { - address: smartcontracts.reward, - symbol: 'SLICE', - decimals: 18, - image: images.rewardsPie, - }, - }, - id: Math.round(Math.random() * 100000), - }, - (err, added) => { - if (added) { - displayNotification({ - message: 'The SLICE token has been added to your Metamask!', - type: 'success', - }); - } else { - displayNotification({ - message: 'Sorry, something went wrong. Please try again later.', - type: 'error', - }); - } - }, - ); - }; @@ -181,10 +151,7 @@ - +
+ +
\ No newline at end of file diff --git a/src/components/elements/AddToMetamaskButton.svelte b/src/components/elements/AddToMetamaskButton.svelte new file mode 100644 index 00000000..7dc8828c --- /dev/null +++ b/src/components/elements/AddToMetamaskButton.svelte @@ -0,0 +1,41 @@ + + + \ No newline at end of file diff --git a/src/components/elements/BoostedModal.svelte b/src/components/elements/BoostedModal.svelte index b666696e..841697ab 100644 --- a/src/components/elements/BoostedModal.svelte +++ b/src/components/elements/BoostedModal.svelte @@ -5,6 +5,7 @@ import { formatFiat } from '../helpers.js'; import confetti from '../Confetti.js'; import { toNum, calculateVeDough, AVG_SECONDS_MONTH } from '../../helpers/staking.js'; + import AddToMetamaskButton from '../../components/elements/AddToMetamaskButton.svelte'; let boostedModal; @@ -52,37 +53,6 @@ }, 10); }, 500); }; - - const addToken = () => { - ethereum.sendAsync( - { - method: 'wallet_watchAsset', - params: { - type: 'ERC20', - options: { - address: smartcontracts.reward, - symbol: 'SLICE', - decimals: 18, - image: images.rewardsPie, - }, - }, - id: Math.round(Math.random() * 100000), - }, - (err, added) => { - if (added) { - displayNotification({ - message: 'The SLICE token has been added to your Metamask!', - type: 'success', - }); - } else { - displayNotification({ - message: 'Sorry, something went wrong. Please try again later.', - type: 'error', - }); - } - }, - ); - }; diff --git a/src/components/elements/StakedModal.svelte b/src/components/elements/StakedModal.svelte index 0d2b76c5..4038ae55 100644 --- a/src/components/elements/StakedModal.svelte +++ b/src/components/elements/StakedModal.svelte @@ -6,6 +6,7 @@ import { parseEther } from '@ethersproject/units'; import { calculateVeDough, getLastLockForAddress, boostToMax } from '../../helpers/staking.js'; import BigNumber from 'bignumber.js'; + import AddToMetamaskButton from '../../components/elements/AddToMetamaskButton.svelte'; import { createEventDispatcher } from 'svelte'; const dispatch = createEventDispatcher(); @@ -103,37 +104,6 @@ stakedModal.open(); animateStakeAmount(); }; - - const addToken = () => { - ethereum.sendAsync( - { - method: 'wallet_watchAsset', - params: { - type: 'ERC20', - options: { - address: smartcontracts.veDOUGH, - symbol: 'veDOUGH', - decimals: 18, - image: images.simulator_veDough, - }, - }, - id: Math.round(Math.random() * 100000), - }, - (err, added) => { - if (added) { - displayNotification({ - message: 'The veDOUGH token has been added to your Metamask!', - type: 'success', - }); - } else { - displayNotification({ - message: 'Sorry, something went wrong. Please try again later.', - type: 'error', - }); - } - }, - ); - }; async function restakeLastLock() { let lockId = await getLastLockForAddress(_eth); @@ -218,11 +188,6 @@

3. Add veDOUGH to your Metamask
browser plugin so you will see it
among your assets.

- + diff --git a/src/pages/Dough.svelte b/src/pages/Dough.svelte index 4a7ff907..41bcf0c8 100644 --- a/src/pages/Dough.svelte +++ b/src/pages/Dough.svelte @@ -1,11 +1,12 @@
Contribute and be rewarded
for building a better organization and products.
- + diff --git a/src/pages/DoughStaking.svelte b/src/pages/DoughStaking.svelte index 8fbb959f..aa87dbec 100644 --- a/src/pages/DoughStaking.svelte +++ b/src/pages/DoughStaking.svelte @@ -5,7 +5,7 @@ import { formatToken, subscribeToBalance } from '../components/helpers.js'; import { onDestroy } from 'svelte'; import smartcontracts from '../config/smartcontracts.json'; - import displayNotification from '../notifications'; + import AddToMetamaskButton from '../components/elements/AddToMetamaskButton.svelte'; import Calculator from '../classes/farming_simulator/Calculator.js'; import { stakingDataIntervalRunning } from '../stores/eth/writables.js'; import BigNumber from 'bignumber.js'; @@ -110,37 +110,6 @@ data = data; } - const addToken = () => { - ethereum.sendAsync( - { - method: 'wallet_watchAsset', - params: { - type: 'ERC20', - options: { - address: smartcontracts.veDOUGH, - symbol: 'veDOUGH', - decimals: 18, - image: images.veDough, - }, - }, - id: Math.round(Math.random() * 100000), - }, - (err, added) => { - if (added) { - displayNotification({ - message: 'The veDOUGH token has been added to your Metamask!', - type: 'success', - }); - } else { - displayNotification({ - message: 'Sorry, something went wrong. Please try again later.', - type: 'error', - }); - } - }, - ); - }; - function calculateVeDOUGH() { veDOUGH = calculator.calculateVeDough(stakeAmount, stakeDuration); veDOUGH = formatToken(veDOUGH, '.', 2); @@ -150,7 +119,7 @@
Dough Staking
-
Get paid for Governing the DAO
+
Get paid for Governing the DAO
{#key data} @@ -444,14 +413,7 @@ > {/if} - +
{:else} diff --git a/src/pages/DoughStakingCampaign.svelte b/src/pages/DoughStakingCampaign.svelte index a1081b5f..d696364b 100644 --- a/src/pages/DoughStakingCampaign.svelte +++ b/src/pages/DoughStakingCampaign.svelte @@ -1,11 +1,12 @@
- addTokenToMM(pie, pieAddress)} alt="Add to Metamask" target="_blank"> + addTokenToMM(pie.symbol, pieAddress, 18)} alt="Add to Metamask" target="_blank"> Add token to {$_('brands.addmetamask')} diff --git a/src/components/elements/AddToMetamaskButton.svelte b/src/components/elements/AddToMetamaskButton.svelte index 7dc8828c..2617227c 100644 --- a/src/components/elements/AddToMetamaskButton.svelte +++ b/src/components/elements/AddToMetamaskButton.svelte @@ -1,6 +1,5 @@ diff --git a/src/helpers/addTokenToMM.js b/src/helpers/addTokenToMM.js index 5e247a37..5bde8b0c 100644 --- a/src/helpers/addTokenToMM.js +++ b/src/helpers/addTokenToMM.js @@ -1,7 +1,7 @@ import { getTokenImage } from '../components/helpers'; // eslint-disable-next-line import/prefer-default-export -export const addTokenToMM = (pie, address) => { +export const addTokenToMM = (symbol, address, decimals, image = null) => { /* eslint-disable no-undef */ ethereum.sendAsync( { @@ -10,16 +10,16 @@ export const addTokenToMM = (pie, address) => { type: 'ERC20', options: { address, - symbol: pie.symbol, - decimals: 18, - image: getTokenImage(address), + symbol: symbol, + decimals: decimals, + image: image ? image : getTokenImage(address), }, }, id: Math.round(Math.random() * 100000), }, (err, added) => { if (added) { - console.log('Thanks for your interest!'); + console.log(`The ${symbol} token has been added to your Metamask!`) } else { /* eslint-disable no-alert */ alert('Something went wrong. Is Metamask there?'); From 38ebf75afa07f4c57b2399daf217885043abea24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toto=CC=80=20Volturno?= Date: Thu, 30 Sep 2021 12:26:29 +0200 Subject: [PATCH 4/5] fixed eslint error --- src/helpers/addTokenToMM.js | 8 ++++---- src/stores/routes.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/helpers/addTokenToMM.js b/src/helpers/addTokenToMM.js index 5bde8b0c..112bcc76 100644 --- a/src/helpers/addTokenToMM.js +++ b/src/helpers/addTokenToMM.js @@ -10,16 +10,16 @@ export const addTokenToMM = (symbol, address, decimals, image = null) => { type: 'ERC20', options: { address, - symbol: symbol, - decimals: decimals, - image: image ? image : getTokenImage(address), + symbol, + decimals, + image: image || getTokenImage(address), }, }, id: Math.round(Math.random() * 100000), }, (err, added) => { if (added) { - console.log(`The ${symbol} token has been added to your Metamask!`) + console.log(`The ${symbol} token has been added to your Metamask!`); } else { /* eslint-disable no-alert */ alert('Something went wrong. Is Metamask there?'); diff --git a/src/stores/routes.js b/src/stores/routes.js index d6c7b9dc..18b5c1ea 100644 --- a/src/stores/routes.js +++ b/src/stores/routes.js @@ -81,7 +81,7 @@ const formatRoute = (route) => { const _route = route ? [...route] : []; console.log('formatRoute before -> _route', _route, route); if (_route) { - for (let i = 0; i < _route.length; i++) { + for (let i = 0; i < _route.length; i += 1) { if (_route[i] && _route[i].indexOf('?') >= 0) { _route[i] = _route[i].substring(0, _route[i].indexOf('?')); } @@ -183,7 +183,7 @@ const formatRoute = (route) => { }; const route = deriveRoute(); -console.log("deriveRoute -> route", route); +console.log('deriveRoute -> route', route); export const currentRoute = writable({ ...formatRoute(route) }); From fa016cbe8879183eaa01b49e4861edcbb6b55900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toto=CC=80=20Volturno?= Date: Thu, 30 Sep 2021 12:46:24 +0200 Subject: [PATCH 5/5] cleanup of unused imports and variables --- src/pages/Dashboard.svelte | 2 +- src/pages/ExperiPie.svelte | 9 +++-- src/pages/Integrations.svelte | 4 --- src/pages/LPStaking.svelte | 11 ------- src/pages/LPStakingV2.svelte | 9 +++-- src/pages/Landing.svelte | 2 -- src/pages/Learn.svelte | 5 --- src/pages/Markets.svelte | 10 +++--- src/pages/Migrations.svelte | 53 ------------------------------ src/pages/PieIndexLanding.svelte | 2 +- src/pages/Piefolio.svelte | 8 ++--- src/pages/Pool.svelte | 4 +-- src/pages/Staking.svelte | 8 ++--- src/pages/StakingPageSingle.svelte | 2 +- src/pages/Tokensswap.svelte | 2 +- src/pages/landings/about.svelte | 6 ---- src/pages/landings/defiPie.svelte | 1 - src/pages/landings/oven.svelte | 2 +- 18 files changed, 25 insertions(+), 115 deletions(-) diff --git a/src/pages/Dashboard.svelte b/src/pages/Dashboard.svelte index a8026abd..874f84e9 100644 --- a/src/pages/Dashboard.svelte +++ b/src/pages/Dashboard.svelte @@ -4,7 +4,7 @@ import poolsConfig from "../config/pools.json"; import { piesMarketDataStore } from '../stores/coingecko.js'; import { pools } from '../stores/eth.js'; - import ProductBox from '../components/elements/product-box.svelte'; + // import ProductBox from '../components/elements/product-box.svelte'; import Meta from '../components/elements/meta.svelte'; import { diff --git a/src/pages/ExperiPie.svelte b/src/pages/ExperiPie.svelte index 519383e0..64a74d38 100644 --- a/src/pages/ExperiPie.svelte +++ b/src/pages/ExperiPie.svelte @@ -13,12 +13,7 @@ import TooltipButton from '../components/elements/TooltipButton.svelte'; import LiquidityModal from "../components/modals/ExperiPieLiquidityModal.svelte"; import stakingPools from '../config/stakingPools.json'; - - import SingleAssetModal from "../components/modals/SingleAssetModal.svelte"; - - import SnapshotBanner from "../components/SnapshotBanner.svelte"; import AddMetamaskBanner from "../components/AddMetamaskBanner.svelte"; - import PoolDescription from "../components/PoolDescription.svelte"; import Modal from '../components/elements/Modal.svelte'; import images from '../config/images.json'; import poolsConfig from '../config/pools.json'; @@ -26,6 +21,10 @@ import { piesMarketDataStore } from '../stores/coingecko.js'; import { amountFormatter, getTokenImage, formatFiat, subscribeToBalance } from '../components/helpers.js'; + // import SingleAssetModal from "../components/modals/SingleAssetModal.svelte"; + // import SnapshotBanner from "../components/SnapshotBanner.svelte"; + // import PoolDescription from "../components/PoolDescription.svelte"; + import { eth, } from "../stores/eth.js"; diff --git a/src/pages/Integrations.svelte b/src/pages/Integrations.svelte index 2cd2fcec..2d9ae9ce 100644 --- a/src/pages/Integrations.svelte +++ b/src/pages/Integrations.svelte @@ -1,7 +1,3 @@ - -

Integrations

diff --git a/src/pages/LPStaking.svelte b/src/pages/LPStaking.svelte index 307f05f9..3d5d15f1 100644 --- a/src/pages/LPStaking.svelte +++ b/src/pages/LPStaking.svelte @@ -1,22 +1,16 @@ -

👨🏽‍🎓 Hello fellow PieDAO students!

-

Learn about PieDAO

diff --git a/src/pages/Markets.svelte b/src/pages/Markets.svelte index 6f2154ef..c3287522 100644 --- a/src/pages/Markets.svelte +++ b/src/pages/Markets.svelte @@ -1,9 +1,7 @@
diff --git a/src/pages/PieIndexLanding.svelte b/src/pages/PieIndexLanding.svelte index 9ed74f17..ddecdd1c 100644 --- a/src/pages/PieIndexLanding.svelte +++ b/src/pages/PieIndexLanding.svelte @@ -12,7 +12,6 @@ import LiquidityModal from '../components/modals/LiquidityModal.svelte'; import AddMetamaskBanner from '../components/AddMetamaskBanner.svelte'; import CoinGeckoBanner from '../components/CoinGeckoBanner.svelte'; - import SpreadBanner from '../components/SpreadBanner.svelte'; import images from '../config/images.json'; import poolsConfig from '../config/pools.json'; import ovens from '../config/ovensConf.js'; @@ -33,6 +32,7 @@ import Modal from '../components/elements/Modal.svelte'; import PieExplanation from '../components/marketing-elements/pie-explanation-switch.svelte'; import TooltipButton from '../components/elements/TooltipButton.svelte'; + // import SpreadBanner from '../components/SpreadBanner.svelte'; export let params; diff --git a/src/pages/Piefolio.svelte b/src/pages/Piefolio.svelte index af26be8a..fb9337f0 100644 --- a/src/pages/Piefolio.svelte +++ b/src/pages/Piefolio.svelte @@ -1,7 +1,6 @@ diff --git a/src/pages/Staking.svelte b/src/pages/Staking.svelte index 6b654e89..defd3fc4 100644 --- a/src/pages/Staking.svelte +++ b/src/pages/Staking.svelte @@ -1,6 +1,6 @@ -

Tokenized ETFs governed by a DAO

diff --git a/src/pages/landings/defiPie.svelte b/src/pages/landings/defiPie.svelte index 0c7795c7..f012b92c 100644 --- a/src/pages/landings/defiPie.svelte +++ b/src/pages/landings/defiPie.svelte @@ -1,6 +1,5 @@