Skip to content

Commit

Permalink
chore: resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
thekidnamedkd committed Oct 29, 2024
2 parents 537e742 + 38c5566 commit 49f5882
Show file tree
Hide file tree
Showing 18 changed files with 442 additions and 282 deletions.
4 changes: 4 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
<meta name="app-version" content="%VITE_REACT_APP_DEPLOY_VERSION%" />

<link href="./styles.css" rel="stylesheet" />
<link
href="https://fonts.googleapis.com/css2?family=Sora:wght@400&display=swap"
rel="stylesheet"
/>
<link
href="https://fonts.googleapis.com/css2?family=Syne:wght@700&display=swap"
rel="stylesheet"
Expand Down
48 changes: 48 additions & 0 deletions src/assets/data/featured-daos.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
[
{
"name": "JankCryptoPioneers",
"description": "A DAO dedicated to pioneering blockchain innovations and fostering decentralized technologies.",
"logo": "https://example.com/avatars/cryptopioneers.png",
"network": "ethereum",
"daoAddress": "0x1234567890abcdef1234567890abcdef12345678",
"overrideUrl": "https://cryptopioneers.io/custom-link"
},
{
"name": "DeFiMasters",
"description": "Mastering decentralized finance through community-driven projects and initiatives.",
"logo": "https://example.com/avatars/defimasters.png",
"network": "polygon",
"daoAddress": "0xabcdef1234567890abcdef1234567890abcdef12"
},
{
"name": "NFTCollectors",
"description": "A vibrant community of NFT enthusiasts focused on collecting and promoting unique digital assets.",
"logo": "https://example.com/avatars/nftcollectors.png",
"network": "polygon",
"daoAddress": "0x7890abcdef1234567890abcdef1234567890abcd",
"overrideUrl": "https://nftcollectors.io"
},
{
"name": "GreenChain",
"description": "Promoting sustainable blockchain solutions and eco-friendly crypto practices.",
"logo": "https://example.com/avatars/greenchain.png",
"network": "sepolia",
"daoAddress": "0x4567890abcdef1234567890abcdef1234567890ef"
},
{
"name": "MetaBuilders",
"description": "Building the future of the metaverse through collaborative projects and virtual initiatives.",
"logo": "https://example.com/avatars/metabuilders.png",
"network": "arbitrum",
"daoAddress": "0xabcdef7890abcdef1234567890abcdef12345678",
"overrideUrl": "https://metabuilders.io/projects"
},
{
"name": "FreakyDeakyDAO",
"description": "Here to be freaky and deaky, this DAO is all about pushing the boundaries of decentralized creativity.",
"logo": "https://example.com/avatars/freakydeakydao.png",
"network": "arbitrum",
"daoAddress": "0x1234567890abcdef1234567890abcdef12345678",
"overrideUrl": "https://freakydeakydao.io"
}
]
1 change: 1 addition & 0 deletions src/assets/images/blueprintTexture.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 49f5882

Please sign in to comment.