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

Lots of content fixes, deletions, updates #102

Merged
merged 14 commits into from
Dec 5, 2023
Merged
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Development

Uses node v16

### Setup

Install dependencies:
Expand Down
16 changes: 0 additions & 16 deletions src/components/LPCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,14 @@ import useChakraBreakpoint from "../hooks/useChakraBreakpoint"

interface LPCardProps {
image1: ImageProps
image2: ImageProps
title: string
subTitle: string
buttonText: string
buttonUrl: string
}

const LPCard: FC<LPCardProps> = ({
image1,
image2,
title,
subTitle,
buttonUrl,
buttonText,
...props
Expand All @@ -38,21 +34,9 @@ const LPCard: FC<LPCardProps> = ({
w="32px"
{...image1}
/>
<Image
left="20px"
top="20px"
position="absolute"
boxSize="48px"
h="32px"
w="32px"
{...image2}
/>
</Box>
<Stack spacing={0}>
<H5 color="gray.100">{title}</H5>
<LabelMd textTransform="uppercase" color="gray.500">
{subTitle}
</LabelMd>
</Stack>
</Stack>
<ExternalButtonLink
Expand Down
18 changes: 10 additions & 8 deletions src/content/components/footer.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ columns:
- label: Press
url: /press
isExternal: false
- label: Roadmap
url: "https://blog.threshold.network/the-story-of-threshold/ "
isExternal: true
- label: Blog
url: https://blog.threshold.network/
isExternal: true
Expand All @@ -32,9 +29,6 @@ columns:
- label: Token Holder
url: /earn/token-holder
isExternal: false
- label: Earn Profile Quiz
url: /profile-quiz
isExternal: false
- title: Community
links:
- label: Governance
Expand All @@ -43,11 +37,14 @@ columns:
- label: Ecosystem
url: /ecosystem
isExternal: false
- label: Forum
url: https://forum.threshold.network/
isExternal: true
- label: Discord
url: https://discord.gg/Threshold
isExternal: true
- label: Forum
url: https://forum.threshold.network/
- label: Telegram
url: https://t.me/thresholdnetwork
isExternal: true
- title: About
links:
Expand Down Expand Up @@ -79,6 +76,11 @@ social_links:
icon:
image: /images/discord.svg
alt: discord
- label: Discourse
url: https://forum.threshold.network
icon:
image: /images/discourse-resources.svg
alt: Threshold Forum
- label: Github
url: https://github.com/threshold-network
icon:
Expand Down
5 changes: 5 additions & 0 deletions src/content/components/nav-bar.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ social_links:
icon:
image: /images/discord.svg
alt: Threshold Discord
- label: Discourse
url: https://forum.threshold.network
icon:
image: /images/discourse-resources.svg
alt: Threshold Forum
- label: GitHub
url: https://github.com/threshold-network
icon:
Expand Down
17 changes: 2 additions & 15 deletions src/content/pages/about/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ teamsSection:
cryptographic access controls for distributed apps and protocols.
image: /images/nu-logo.png
buttons:
- label: Visit NuCypher’s Website
url: https://www.nucypher.com/
- label: Visit NuCypher’s Github
url: https://github.com/nucypher
variant: EXTERNAL_OUTLINE
faq:
title: FAQ
Expand All @@ -41,19 +41,6 @@ faq:
distributes sensitive operations across multiple independent entities –
like nodes in a network – and requires a threshold, or minimum number of
those entities to cooperate for the operation to be successful.
- question: Do legacy KEEP stakers need to set up a PRE node?
answer:
Yes, everyone who stakes on Threshold will need to run a PRE node. If
you are working with a stakng provider, reach out to them to accomplish
this. If you are running your own node, you can refer to the following
guide.
buttons:
- label: How to run a PRE Node
leftIcon:
image: /images/document.svg
rightIcon:
image: /images/external-arrow.svg
url: https://docs.nucypher.com/en/latest/pre_application/running_a_node.html
- question: What staking providers work with Threshold?
answer: You can refer to the list of staking providers below.
buttons:
Expand Down
7 changes: 0 additions & 7 deletions src/content/pages/earn/btc.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,4 @@ btcInfo:
url: https://dashboard.threshold.network/tBTC
variant: EXTERNAL_SOLID
posthogLabel: Mint now [btcInfo] (/earn/btc)
interestedPools:
- image1: /images/tbtc-v2.svg
image2: /images/tbtc-v2.svg
title: TBTCv1 -> TBTCv2
subTitle: Upgrade
buttonText: View Portal
buttonUrl: https://dashboard.keep.network/tbtc-migration/portal
---
18 changes: 7 additions & 11 deletions src/content/pages/earn/liquidity-provider.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,11 @@ lpInfo:
rowReverse: false
interestedPools:
- image1: /images/threshold.svg
image2: /images/ethereum.svg
title: T + ETH
subTitle: Curve
buttonText: View Pool on Curve
buttonUrl: https://curve.fi/#/ethereum/pools/teth/deposit
- image1: /images/threshold.svg
image2: /images/ethereum.svg
title: T + ETH
subTitle: Balancer
buttonText: View Pool on Balancer
buttonUrl: https://app.balancer.fi/#/ethereum/pool/0x8167a1117691f39e05e9131cfa88f0e3a620e96700020000000000000000038c/invest
title: Threshold (T)
buttonText: View on DefiLlama
buttonUrl: https://defillama.com/yields?exactToken=T
- image1: /images/tbtc.svg
title: tBTC
buttonText: View on DefiLlama
buttonUrl: https://defillama.com/yields?token=TBTC
---
13 changes: 0 additions & 13 deletions src/content/pages/earn/staker.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,6 @@ techRequirements:
image:
image: /images/gb-icon.png
alt: storage
legacyStakers:
preTitle: Legacy Stakers
title: Currently Staking with KEEP or NU?
description: Stake your legacy KEEP and NU stakes on T using the respective
legacy dashboards.
image: /images/legacy-tokens.png
buttons:
- label: Keep Dapp
url: https://dashboard.keep.network/
variant: EXTERNAL_OUTLINE
- label: NuCypher Dapp
url: https://stake.nucypher.network/
variant: EXTERNAL_OUTLINE
title: Threshold Staker
template: earn-page/staker
seoTitle: Threshold Staker
Expand Down
20 changes: 6 additions & 14 deletions src/content/pages/earn/token-holder.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ tokenHolderInfo:
next for Threshold. Legacy NU or KEEP tokens should first be upgraded to T.
image: /images/token-holder.png
buttons:
- label: Upgrade to T
url: https://dashboard.threshold.network/upgrade
- label: Delegate Vote
url: https://delegates.threshold.network
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This domain doesn't appear to resolve?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

variant: EXTERNAL_SOLID
rowReverse: false
secondaryInfo:
Expand All @@ -30,7 +30,7 @@ secondaryInfo:
variant: INTERNAL_OUTLINE
right:
label: Legacy Token Holders
title: Migrate your KEEP to T
title: Migrate your KEEP or NU to T
description:
Do you have KEEP or NU tokens? Upgrade them to T to make the most
of the Threshold network.
Expand All @@ -40,15 +40,7 @@ secondaryInfo:
variant: EXTERNAL_OUTLINE
interestedPools:
- image1: /images/threshold.svg
image2: /images/ethereum.svg
title: T + ETH
subTitle: Curve
buttonText: View Pool on Curve
buttonUrl: https://curve.fi/#/ethereum/pools/teth/deposit
- image1: /images/threshold.svg
image2: /images/ethereum.svg
title: T + ETH
subTitle: Balancer
buttonText: View Pool on Balancer
buttonUrl: https://app.balancer.fi/#/ethereum/pool/0x8167a1117691f39e05e9131cfa88f0e3a620e96700020000000000000000038c/invest
title: Threshold (T)
buttonText: View on DefiLlama
buttonUrl: https://defillama.com/yields?exactToken=T
---
33 changes: 5 additions & 28 deletions src/content/pages/ecosystem/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,6 @@ integrations:
title: Arbitrum
- image: /images/logo-polygon.svg
title: Polygon
programsAndEventsInfo:
preTitle: Get Involved
title: Community Programs & Events
description: "Stay informed about the most recent community programs and events."
rowReverse: false
programsAndEvents:
- image: /images/wormhole-hackathon.png
title: Wormhole Encode Hackathon
description: 4 days packed with learning, networking and building with Wormhole at the Encode Club Hacker House.
url: https://www.encode.club/wormhole-hackathon
- image: /images/bond-program.png
title: T Bond Bootstrap Program
description: Threshold Bond Program is here to help the Threshold Treasury Guild continue to grow tBTC liquidity.
url: https://blog.threshold.network/unlocking-liquidity-threshold-launches-bond-program-with-bond-protocol/
- image: /images/tbtc-wrapper.png
title: tBTC Wrapped Tour
description: Mint tBTC during Tour Stop 3 to claim this exclusive tBTC Wrapped Tour Arbitrum OAT!
url: https://blog.threshold.network/stop-three-on-tbtcs-wrapped-tour-kicks-off-with-an-arbitrum-integration-and-a-new-galxe-oat/
projectsAndToolsInfo:
preTitle: Ecosystem
title: Powered By Threshold DAO
Expand Down Expand Up @@ -155,16 +137,6 @@ projectsAndTools:
- label: Go to App
url: https://thegraph.com/explorer/subgraphs/8iv4pFv7UL3vMjYeetmFCKD9Mg2V4d1S2rapQXo8fRq5?view=Overview&chain=mainnet
variant: EXTERNAL_SOLID
- image: /images/101-courses.svg
title: 101 Courses and Videos
description: Initiative from the Marketing Guild to help understand better the technologies around our products.
categories:
- label: tool
date: 2023-03-11
buttons:
- label: Go to App
url: https://101.xyz/course/claqymc0v067108kyden9aehq
variant: EXTERNAL_SOLID
resourcesInfo:
preTitle: Resources
title: Ecosystem Resources
Expand Down Expand Up @@ -203,6 +175,11 @@ community:
description: Ask questions and engage with our community.
url: https://discord.gg/Threshold
rightIcon: /images/external-arrow.svg
- leftIcon: /images/telegram-social.svg
title: Telegram
description: Ask questions and engage with our community.
Copy link

@jMyles jMyles Nov 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it worth saying, "Ask questions and engage with our community. Beware of scammers - we won't DM you first." ?

Or are we finally at the point where such things are implicit and common knowledge? :-)

url: https://twitter.com/TheTNetwork
rightIcon: /images/external-arrow.svg
- leftIcon: /images/twitter-social.svg
title: Twitter
description: Keep in the loop on the latest ecosystem news.
Expand Down
10 changes: 5 additions & 5 deletions src/content/pages/governance/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ governanceInfo:
- label: Governance Forum
url: https://forum.threshold.network/
variant: EXTERNAL_SOLID
- label: Read Proposal
url: https://forum.threshold.network/c/governance-proposals/7
- label: Delegate Vote
url: https://delegates.threshold.network/
variant: EXTERNAL_OUTLINE
rowReverse: false
guildsInfo:
Expand All @@ -32,9 +32,9 @@ guildsInfo:
url: https://forum.threshold.network/t/tip-13-bootstrap-threshold-dao-guilds/246
variant: EXTERNAL_OUTLINE
guildStats:
- value: 700+
- value: 7,000+
label: Guild Members in Discord
- value: 20+
- value: 60+
label: Proposals
guildCards:
- title: Marketing Guild
Expand Down Expand Up @@ -99,7 +99,7 @@ guildsInfo:
image: /images/162_2.jpg
joinUrl: https://thresholdnetwork.notion.site/Integrations-Guild-4ff2e5fdea4442d7af19d27342ab8225
migrationInfo:
title: Do you own KEEP or Nu and want to participate in Threshold Goverance?
title: Do you own KEEP or NU and want to participate in Threshold Governance?
description: Migrate your tokens to T so you can take full advantage of the Threshold DAO.
image: /images/legacy-tokens.png
buttons:
Expand Down
2 changes: 1 addition & 1 deletion src/content/pages/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ btcRole:
bugBounty:
preTitle: Bug bounty
title: "Join the hunt: $500K Bug Bounty"
description: "Spot security risks, claim your prize. No KYC, no fuss."
description: "Spot security risks, claim your prize."
image: /images/immunefi.svg
buttons:
- label: Read more
Expand Down
4 changes: 2 additions & 2 deletions src/hooks/useBalanceOfDAOTreasury.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { FixedNumber } from "ethers"
import { CoingeckoID, exchangeAPI, formatUnits } from "../utils"
import { useERC20TokensBalanceCall } from "./useERC20TokensBalanceCall"

// https://etherscan.io/address/0x9f6e831c8f8939dc0c830c6e492e7cef4f9c2f5f
const DAO_TREASURY_ADDRESS = "0x9f6e831c8f8939dc0c830c6e492e7cef4f9c2f5f"
// https://etherscan.io/address/0x87F005317692D05BAA4193AB0c961c69e175f45f
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed this is the DAO's Timelock address

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'd be really nice to include treasury details beyond just the timelock on the site somewhere. Outside the scope of this PR of course

Copy link
Contributor Author

@mswilkison mswilkison Nov 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'd be really nice to include treasury details beyond just the timelock on the site somewhere. Outside the scope of this PR of course

ya... query will just be more complex b/c need to capture LP and vote-escrowed positions, x-chain, etc

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if zapper or debank provide some kind of api or embed?

const DAO_TREASURY_ADDRESS = "0x87F005317692D05BAA4193AB0c961c69e175f45f"

const query = graphql`
query {
Expand Down
2 changes: 0 additions & 2 deletions src/templates/earn-page/RolePageTemplate.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import { FC } from "react"
import TakeTheQuizBanner from "../../components/TakeTheQuizBanner"
import RolesNav from "./RolesNav"
import { PageSection } from "../../components/PageSection"

const RolePageTemplate: FC = ({ children }) => {
return (
<PageSection bg="gray.900" withSmallPadding>
<TakeTheQuizBanner />
<RolesNav />
{children}
</PageSection>
Expand Down
Loading