Skip to content

Commit

Permalink
Merge pull request #130 from trilitech/staging
Browse files Browse the repository at this point in the history
ETHLondon merge 2023
  • Loading branch information
sashaaldrick authored Oct 27, 2023
2 parents b964327 + 158febb commit e8ede76
Show file tree
Hide file tree
Showing 44 changed files with 2,924 additions and 2,325 deletions.
20 changes: 20 additions & 0 deletions markdoc/tags.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,19 @@ import CalendlyEmbed from '@/components/CalendlyEmbed';
// Import the built-in Next.js tags
import { comment } from '@markdoc/next.js/tags'

// Custom tag to allow embedding HTML elements
const UnescapedHtml = ({ htmlWrapperTag = 'div', children }) => {
const html =
typeof children === 'string'
? children
: typeof children.props.children === 'string'
? children.props.children
: children.props.children.join('')

const CustomTag = htmlWrapperTag
return <CustomTag dangerouslySetInnerHTML={{ __html: html }} />
}

const tags = {
callout: {
attributes: {
Expand Down Expand Up @@ -82,6 +95,13 @@ const tags = {
calendlyEmbed: {
render: CalendlyEmbed,
},
html: {
render: UnescapedHtml,
attributes: {
htmlWrapperTag: { type: String },
children: { type: String },
},
},
// tabs: {
// render: Tabs,
// attributes: {},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 public/images/nft-create/web-ligo-ide-account.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/images/nft-pinata/image10.png
Binary file not shown.
Binary file removed public/images/nft-pinata/image14.png
Binary file not shown.
Binary file removed public/images/nft-pinata/image15.png
Binary file not shown.
Binary file removed public/images/nft-pinata/image19.png
Binary file not shown.
Binary file removed public/images/nft-pinata/image20.png
Binary file not shown.
Binary file removed public/images/nft-pinata/image21.png
Binary file not shown.
Binary file removed public/images/nft-pinata/image22.png
Binary file not shown.
Binary file removed public/images/nft-pinata/image23.png
Binary file not shown.
Binary file removed public/images/nft-pinata/image24.png
Binary file not shown.
Binary file removed public/images/nft-pinata/image26.png
Binary file not shown.
Binary file removed public/images/nft-pinata/image28.png
Binary file not shown.
Binary file removed public/images/nft-pinata/image29.png
Binary file not shown.
Binary file removed public/images/nft-pinata/image32.png
Binary file not shown.
Binary file removed public/images/nft-pinata/image33.png
Binary file not shown.
Binary file removed public/images/nft-pinata/image34.png
Binary file not shown.
Binary file removed public/images/nft-pinata/image36.png
Binary file not shown.
Binary file removed public/images/nft-pinata/image37.png
Binary file not shown.
Binary file removed public/images/nft-pinata/image41.png
Binary file not shown.
Binary file removed public/images/nft-pinata/image8.png
Binary file not shown.
Binary file removed public/images/nft-pinata/image9.png
Diff not rendered.
44 changes: 37 additions & 7 deletions src/components/Layout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -285,17 +285,17 @@ const tutorialNavigation = [
},
],
},
{
title: 'Deploy your own smart rollup',
href: '/tutorials/smart-rollups',
},
{
title: 'Create an NFT',
href: '/tutorials/create-an-nft',
children: [
{
title: 'Mint NFT using Taquito and Pinata',
href: '/tutorials/create-an-nft/nft-pinata',
title: 'Create an NFT with the `tznft` tool',
href: '/tutorials/create-an-nft/nft-tznft',
},
{
title: 'Create a web app that mints NFTs',
href: '/tutorials/create-an-nft/nft-taquito',
},
],
},
Expand Down Expand Up @@ -347,6 +347,36 @@ const tutorialNavigation = [
},
],
},
{
title: 'Deploy a smart rollup',
href: '/tutorials/smart-rollups',
children: [
{
title: "Introduction",
href: '/tutorials/smart-rollups',
},
{
title: "Part 1: Setting up the application",
href: '/tutorials/smart-rollups/set-up',
},
{
title: "Part 2: Running the kernel in debug mode",
href: '/tutorials/smart-rollups/debug',
},
{
title: "Part 3: Optimizing the kernel",
href: '/tutorials/smart-rollups/optimize',
},
{
title: "Part 4: Deploying (originating) the rollup",
href: '/tutorials/smart-rollups/deploy',
},
{
title: "Part 5: Running and interacting with the rollup node",
href: '/tutorials/smart-rollups/run',
},
],
},
],
},
]
Expand Down Expand Up @@ -471,7 +501,7 @@ export function Layout({ children, title, tableOfContents, lastUpdated }) {
let router = useRouter()
let isHomePage = router.pathname === '/'

let tabPaths = ['tutorials', 'office-hours']
let tabPaths = ['tutorials', 'office-hours', 'ethlondon']
let isTabHomePage =
tabPaths.some((basePath) => router.pathname.endsWith(basePath)) ||
isHomePage
Expand Down
22 changes: 22 additions & 0 deletions src/components/TabLinks.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export function TabLinks({ isHomePage }) {
className={`px-4 py-2 ${
!router.pathname.includes('tutorials') &&
!router.pathname.includes('office-hours') &&
!router.pathname.includes('ethlondon') &&
!isHomePage
? 'text-blue-400'
: 'text-white'
Expand Down Expand Up @@ -89,6 +90,27 @@ export function TabLinks({ isHomePage }) {
</h2>
)}
</Link>
<Link
href="/ethlondon"
className={`px-4 py-2 ${
router.pathname.includes('/ethlondon')
? 'text-blue-400'
: 'text-white'
}`}
>
{isLargeScreen ? (
<div className="hover:text-gray-300 dark:hover:text-gray-500">
ETHLondon
</div>
) : (
<h2
className="font-display font-medium text-slate-900 hover:text-blue-400 dark:text-white"
style={{ fontSize: '1.3em' }}
>
ETHLondon
</h2>
)}
</Link>
</div>
)

Expand Down
77 changes: 77 additions & 0 deletions src/pages/ethlondon/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
---
title: ETHLondon 2023 Cheatsheet
description: Get started on your Tezos hackathon project
---

Interested in building on Tezos for ETHLondon 2023?
**You’ve come to the right place.**

## Support

* We'll be at ETHLondon all weekend, look out for the people in white Tezos t-shirts! We're a friendly bunch, come and talk to us!
* Join our [Discord](https://discord.gg/tezos) and use the [#dev-help](https://discord.com/channels/699325006928281720/710095412639432705) channel to ask any questions
* You're on the docs site, so feel free to start at the [beginning](https://docs.tezos.com/tezos-basics/tezos-blockchain-overview/) or head straight over to the [tutorials](https://docs.tezos.com/tutorials/) to get started 🚀



## Bounties

{% table %}
* **ETHLondon Tezos Bounties** {% colspan=2 %}
---
* ****
* **Prize Amount**
---
* Best project using [SmartPy](https://smartpy.io)
* $2500
---
* Best project using [LIGO](https://ligolang.org/)
* $2500
---
* Best DeFi project
* $2500
---
* Best project using [Taquito](https://tezostaquito.io/) & [Beacon SDK](https://tezos.com/developers/docs/dapp-development/wallets-and-beacon-sdk/)
* $2500

{% /table %}

## Quick Links

{% table %}
* **Development** {% colspan=2 %}
---
* **Languages**
* [SmartPy](https://smartpy.io/)
* [LIGO](https://ligolang.org/)
---
* **Tooling**
* [Taqueria](https://taqueria.io/): `brew install taqueria`
* [Unity SDK (Gaming)](https://tezos.com/unity)
---
* **Frontend**
* Looking for Ethers.JS? —> [Taquito](https://tezostaquito.io/)
* Looking for WalletConnect? —> [Beacon SDK](https://tezos.com/developers/docs/dapp-development/wallets-and-beacon-sdk/)
{% /table %}

{% table %}

* **Apps** {% colspan=2 %}
---
* **Wallets**
* [Temple](https://templewallet.com/)
* [Umami](https://umamiwallet.com/)
* [Kukai](https://wallet.kukai.app/)
* [Airgap](https://airgap.it/)
---
* **DeFi**
* [Plenty](https://plenty.network/)
* [Youves](https://youves.com/)
* [Quipuswap](https://quipuswap.com/)
---
* **Art**
* [objkt](https://objkt.com/)
* [fxhash](https://www.fxhash.xyz/)
{% /table %}

# Thanks and enjoy ETHLondon 🙏
Loading

1 comment on commit e8ede76

@vercel
Copy link

@vercel vercel bot commented on e8ede76 Oct 27, 2023

Choose a reason for hiding this comment

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

Please sign in to comment.