Skip to content

Commit

Permalink
Merge pull request #82 from trilitech/sasha@landing-tutorials
Browse files Browse the repository at this point in the history
change landing page icon and add tutorials page
  • Loading branch information
johnjoubert authored Jul 7, 2023
2 parents 2219baa + 5c2d063 commit c95947b
Show file tree
Hide file tree
Showing 24 changed files with 7,812 additions and 1,310 deletions.
185 changes: 113 additions & 72 deletions src/components/Layout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,20 @@ const documentationNavigation = [
},
],
},
{
title: 'Originating a contract',
href: '/tezos-basics/originate-your-first-smart-contract/smartpy',
children: [
{
title: 'SmartPy',
href: '/tezos-basics/originate-your-first-smart-contract/smartpy',
},
{
title: 'LIGO',
href: '/tezos-basics/originate-your-first-smart-contract/ligo',
},
],
},
// {
// title: 'Originating a contract',
// href: '/tezos-basics/originate-your-first-smart-contract/smartpy',
// children: [
// {
// title: 'SmartPy',
// href: '/tezos-basics/originate-your-first-smart-contract/smartpy',
// },
// {
// title: 'LIGO',
// href: '/tezos-basics/originate-your-first-smart-contract/ligo',
// },
// ],
// },
{
title: 'Tezos Protocol & Shell',
href: '/tezos-basics/tezos-protocol-and-shell',
Expand Down Expand Up @@ -167,24 +167,24 @@ const documentationNavigation = [
{
title: 'Dapp Development',
links: [
{
title: 'Build your first DApp',
href: '/dapp-development/build-your-first-dapp',
children: [
{
title: 'Wallets and user tokens',
href: '/dapp-development/build-your-first-dapp/wallets-tokens',
},
{
title: 'Swapping tokens',
href: '/dapp-development/build-your-first-dapp/swapping-tokens',
},
{
title: 'Adding and removing liquidity',
href: '/dapp-development/build-your-first-dapp/adding-removing-liquidity',
},
],
},
// {
// title: 'Build your first DApp',
// href: '/dapp-development/build-your-first-dapp',
// children: [
// {
// title: 'Wallets and user tokens',
// href: '/dapp-development/build-your-first-dapp/wallets-tokens',
// },
// {
// title: 'Swapping tokens',
// href: '/dapp-development/build-your-first-dapp/swapping-tokens',
// },
// {
// title: 'Adding and removing liquidity',
// href: '/dapp-development/build-your-first-dapp/adding-removing-liquidity',
// },
// ],
// },
{ title: 'Taquito', href: '/dapp-development/taquito' },
{ title: 'Indexers', href: '/dapp-development/indexers' },
{
Expand Down Expand Up @@ -212,24 +212,42 @@ const documentationNavigation = [
{ title: 'Synthetics', href: '/defi/synthetics' },
{ title: 'Decentralized Autonomous Organization', href: '/defi/dao' },
{ title: 'Lending and Flash Loans', href: '/defi/lending' },
{ title: 'Decentralized Fundraising', href: '/defi/decentralized-fundraising' },
{
title: 'Decentralized Fundraising',
href: '/defi/decentralized-fundraising',
},
],
},
{
title: 'NFTs',
links: [
{ title: 'Create an NFT', href: '/nft/create-an-nft' },
{ title: 'Mint NFT using Taquito and Pinata', href: '/nft/create-an-nft/nft-pinata' },
{
title: 'Build an NFT Marketplace',
href: '/nft/build-an-nft-marketplace',
children: [
{ title: 'NFT Marketplace - Part 1', href: '/nft/build-an-nft-marketplace' },
{ title: 'NFT Marketplace - Part 2', href: '/nft/build-an-nft-marketplace/part-2' },
{ title: 'NFT Marketplace - Part 3', href: '/nft/build-an-nft-marketplace/part-3' },
{ title: 'NFT Marketplace - Part 4', href: '/nft/build-an-nft-marketplace/part-4' },
],
title: 'Mint NFT using Taquito and Pinata',
href: '/nft/create-an-nft/nft-pinata',
},
// {
// title: 'Build an NFT Marketplace',
// href: '/nft/build-an-nft-marketplace',
// children: [
// {
// title: 'NFT Marketplace - Part 1',
// href: '/nft/build-an-nft-marketplace',
// },
// {
// title: 'NFT Marketplace - Part 2',
// href: '/nft/build-an-nft-marketplace/part-2',
// },
// {
// title: 'NFT Marketplace - Part 3',
// href: '/nft/build-an-nft-marketplace/part-3',
// },
// {
// title: 'NFT Marketplace - Part 4',
// href: '/nft/build-an-nft-marketplace/part-4',
// },
// ],
// },
],
},
{
Expand Down Expand Up @@ -297,41 +315,63 @@ const documentationNavigation = [

const tutorialNavigation = [
{
title: 'Tezos Basics',
title: 'Tutorials',
links: [
{
title: 'Tezos Blockchain Tutorials',
href: 'tutorials/tezos-blockchain-overview',
title: 'Originating a contract',
href: '/tutorials/originate-your-first-smart-contract/smartpy',
children: [
{
title: 'Whitepaper',
href: 'tutorials/tezos-blockchain-overview/whitepaper',
title: 'SmartPy',
href: '/tutorials/originate-your-first-smart-contract/smartpy',
},
{
title: 'Position Paper',
href: 'tutorials/tezos-blockchain-overview/positionpaper',
title: 'LIGO',
href: '/tutorials/originate-your-first-smart-contract/ligo',
},
],
},
{
title: 'Deploy your own smart rollup',
href: '/tutorials/smart-rollups',
},
{
title: 'Build an NFT Marketplace',
href: '/tutorials/build-an-nft-marketplace',
children: [
{
title: 'Nomenclature',
href: 'tutorials/tezos-blockchain-overview/nomenclature',
title: 'NFT Marketplace - Part 1',
href: '/tutorials/build-an-nft-marketplace',
},
{
title: 'Governance',
href: 'tutorials/tezos-blockchain-overview/governance/intro',
children: [
{
title: 'Governance Overview',
href: 'tutorials/tezos-blockchain-overview/governance/governance-overview',
},
{
title: 'Tezos Improvement Process',
href: 'tutorials/tezos-blockchain-overview/governance/improvement-process-tzip',
},
],
title: 'NFT Marketplace - Part 2',
href: '/tutorials/build-an-nft-marketplace/part-2',
},
{
title: 'Functional Programming',
href: 'tutorials/tezos-blockchain-overview/governance/functional-programming',
title: 'NFT Marketplace - Part 3',
href: '/tutorials/build-an-nft-marketplace/part-3',
},
{
title: 'NFT Marketplace - Part 4',
href: '/tutorials/build-an-nft-marketplace/part-4',
},
],
},
{
title: 'Build your first app',
href: '/tutorials/build-your-first-app',
children: [
{
title: 'Wallets and user tokens',
href: '/tutorials/build-your-first-app/wallets-tokens',
},
{
title: 'Swapping tokens',
href: '/tutorials/build-your-first-app/swapping-tokens',
},
{
title: 'Adding and removing liquidity',
href: '/tutorials/build-your-first-app/adding-removing-liquidity',
},
],
},
Expand Down Expand Up @@ -858,17 +898,18 @@ function Header({ navigation }) {
Documentation
</Link>
<Link
href="/office-hours"
href="/tutorials"
className="px-4 py-2 text-white hover:text-gray-300"
>
Office Hours
Tutorials
</Link>
{/* <Link
href="/tutorials"
<Link
href="/office-hours"
className="px-4 py-2 text-white hover:text-gray-300"
>
Tutorials
</Link> */}
Office Hours
</Link>

{/* <Link
href="/tooling"
className="px-4 py-2 text-white hover:text-gray-300"
Expand Down Expand Up @@ -1077,7 +1118,7 @@ export function Layout({ children, title, tableOfContents }) {
<Prose>{children}</Prose>
</article>

{!isHomePage && (
{!isHomePage && !router.pathname.endsWith('tutorials') && (
// Don't show the previous and next links on the homepage
<dl className="mt-12 flex border-t border-slate-200 pt-6 dark:border-slate-800">
{previousPage && (
Expand Down
2 changes: 1 addition & 1 deletion src/components/QuickLinks.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export function QuickLinks({ children }) {
}

export function QuickLink({ title, description, href, icon, comingSoon }) {
const pathsToHideDescription = ['/tutorials', '/tooling', '/resources']
const pathsToHideDescription = ['/tooling', '/resources']

// if (comingSoon === "true") {
// console.log('comingSoon', comingSoon);
Expand Down
10 changes: 5 additions & 5 deletions src/pages/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,33 @@ Welcome to the Tezos Documentation Portal. We're currently in _beta_. Please sha

{% lg-link title="Tezos Blockchain Overview" icon="overview" href="/tezos-blockchain-overview" description="Understanding what makes Tezos different and what you need to start building" /%}

{% lg-link title="Quickstart guide" icon="quickstart" href="/dapp-development/build-your-first-dapp" description="Learn how to write a smart contract and get it deployed quickly" /%}
{% lg-link title="Smart Rollups" icon="quickstart" href="/tutorials/smart-rollups/" description="Get started by deploying your own smart rollup with our onboarding tutorial" /%}

{% /lg-links %}

{% quick-links %}

{% quick-link title="Get and Install Tezos" icon="installation" href="/tezos-basics/get-started-with-octez" description="Step-by-step guide to install and use the Tezos client Octez" /%}

{% quick-link title="Originate your First Smart Contract" icon="deploy" href="/tezos-basics/originate-your-first-smart-contract/smartpy" description="How to originate your first smart contract" /%}
{% quick-link title="Originate your First Smart Contract" icon="deploy" href="/tutorials/originate-your-first-smart-contract/smartpy" description="How to originate your first smart contract" /%}

{% quick-link title="Tezos Protocol & Shell" icon="protocol" href="/tezos-basics/tezos-protocol-and-shell" description="Understanding the Tezos Protocol & Shell" /%}

{% quick-link title="Test Networks" icon="test" href="/tezos-basics/test-networks" description="Start with the test networks" /%}

{% quick-link title="Smart Contract Languages" icon="contract" href="/smart-contracts/smart-contract-languages" description="Overview of Smart Contract languages" /%}

{% quick-link title="Wrapped Assets" icon="token" href="/defi/wrapped-assets" description="Learn about ctez and wrapped tokens. Two building blocks for DeFi on Tezos. " /%}
{% quick-link title="Decentralised Exchanges" icon="token" href="/defi/dex" description="Learn about decentralised exchanges, one of the core applications in DeFi" /%}

{% quick-link title="Create an NFT" icon="nft" href="/nft/create-an-nft" description="Create your own NFT" /%}

{% quick-link title="Build an NFT Marketplace" icon="marketplace" href="/nft/build-an-nft-marketplace" description="Build a full marketplace for NFTs" /%}
{% quick-link title="Build an NFT Marketplace" icon="marketplace" href="/tutorials/build-an-nft-marketplace" description="Build a full marketplace for NFTs" /%}

{% quick-link title="Tezos SDK for Unity" icon="unity" href="/gaming/tezos-sdk-for-unity" description="Tezos SDK for Unity" /%}

{% quick-link title="Build a Game on Tezos" icon="game" href="" description="Building a Game on Tezos" comingSoon=true /%}

{% quick-link title="Build your first DApp" icon="dapp" href="/dapp-development/build-your-first-dapp" description="Build your first DApp" /%}
{% quick-link title="Build your first app" icon="dapp" href="/tutorials/build-your-first-app" description="Build your first app on Tezos" /%}

{% quick-link title="Taquito" icon="taquito" href="/dapp-development/taquito" description="How is Taquito instrumental for dapp development" /%}

Expand Down
2 changes: 1 addition & 1 deletion src/pages/nft/build-an-nft-marketplace/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,6 @@ Now you can see all NFTs
![wine collection](/developers/docs/images/winecollection.png)
##µ Conclusion
## Conclusion
You are able to create an NFT collection marketplace from the `ligo/fa` library.
Loading

1 comment on commit c95947b

@vercel
Copy link

@vercel vercel bot commented on c95947b Jul 7, 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.