Skip to content

Commit

Permalink
Merge branch 'staging' into security-tutorial
Browse files Browse the repository at this point in the history
  • Loading branch information
timothymcmackin authored Jan 22, 2024
2 parents ca2990e + 5d67ae7 commit d960996
Show file tree
Hide file tree
Showing 18 changed files with 185 additions and 175 deletions.
2 changes: 1 addition & 1 deletion docs/architecture/tokens.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ One exception is tickets, which are directly stored and managed by smart contrac
To learn about tokens, see these tutorials:

- [Create an NFT](../tutorials/create-an-nft)
- [Build your first app on Tezos](../tutorials/build-your-first-app)
- [Build a simple web application](../tutorials/build-your-first-app)

## Fungible and non-fungible tokens

Expand Down
2 changes: 1 addition & 1 deletion docs/dApps.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ For information on typical tasks that dApps do, see:

These tutorials cover dApps of different complexities:

- For a simple dApp, see [Build your first app on Tezos](./tutorials/build-your-first-app)
- For a simple dApp, see [Build a simple web application](./tutorials/build-your-first-app)
- For a dApp that mints NFTs, see [Mint NFTs from a web app](./tutorials/create-an-nft/nft-web-app)
- For a large dApp that allows users to buy and sell NFTs, see [Build an NFT marketplace](./tutorials/build-an-nft-marketplace)
2 changes: 1 addition & 1 deletion docs/dApps/sending-transactions.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ try {
}
```

For examples of calling smart contracts, see tutorials such as [Build your first app on Tezos](../tutorials/build-your-first-app) or [Create a contract and web app that mints NFTs](../tutorials/create-an-nft/nft-taquito).
For examples of calling smart contracts, see tutorials such as [Build a simple web application](../tutorials/build-your-first-app) or [Create a contract and web app that mints NFTs](../tutorials/create-an-nft/nft-taquito).

For more information about using Taquito, see [Smart contracts](https://tezostaquito.io/docs/smartcontracts) in the Taquito documentation.

Expand Down
4 changes: 2 additions & 2 deletions docs/dApps/wallets.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ The primary tools that dApps use to connect to wallets are:
## Beacon and Taquito

Most of the time, dApps use Beacon and Taquito together for a straightforward way to connect to wallets and submit transactions.
For an example, see the tutorial [Build your first app on Tezos](../tutorials/build-your-first-app).
For an example, see the tutorial [Build a simple web application](../tutorials/build-your-first-app).

### Connecting to wallets

Expand All @@ -49,7 +49,7 @@ const address = await wallet.getPKH();
When this code runs, Beacon opens a popup window that guides the user through connecting their wallet.

Then the application can send transactions to Tezos.
See [Part 3: Sending transactions](../tutorials/build-your-first-app/sending-transactions) in the tutorial [Build your first app on Tezos](../tutorials/build-your-first-app).
See [Part 3: Sending transactions](../tutorials/build-your-first-app/sending-transactions) in the tutorial [Build a simple web application](../tutorials/build-your-first-app).

### Reconnecting to wallets

Expand Down
2 changes: 1 addition & 1 deletion docs/overview/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
Simple page to provide links to tutorials and what you learn from each one.

- To learn about smart contracts, go to 'Deploy your first smart contract'
- To learn about dApps, go to 'Build your first app on Tezos'
- To learn about dApps, go to 'Build a simple web application'
4 changes: 2 additions & 2 deletions docs/tutorials.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ These tutorials contain multiple parts and are intended for developers with some
/>

<TutorialCard
title="Build your first app on Tezos"
title="Build a simple web application"
emoji="💡"
href="/tutorials/build-your-first-app/"
description="Learn how to set up and create a decentralized web application on Tezos using TypeScript, Taquito, and Svelte"
Expand All @@ -70,7 +70,7 @@ These tutorials contain multiple parts and are intended for developers with some
/>

<TutorialCard
title="Create an NFT from the command line"
title="Create NFTs from the command line"
emoji="⚡️"
href="/tutorials/create-an-nft/nft-tznft"
description="Learn about NFTs and how to create them from files on your computer"
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/build-an-nft-marketplace/part-1.md
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ To save time, this tutorial provides a starter React application.
```

This application contains basic navigation and the ability to connect to wallets.
For a tutorial that includes connecting to wallets, see [Build your first app on Tezos](../build-your-first-app).
For a tutorial that includes connecting to wallets, see [Build a simple web application](../build-your-first-app).

Because Taqueria automatically keeps track of your deployed contract, the application automatically accesses the contract and shows that there are no NFTs in it yet.
The application looks like this:
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/build-files-archive-with-dal.mdx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: Implementing a file archive with the DAL and a Smart Rollup
title: Implement a file archive with the DAL and a Smart Rollup
authors: 'Tezos Core Developers'
last_update:
date: 17 January 2024
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ In these steps, you set up a simple Smart Rollup to get the current DAL paramete

## Prerequisites

Before you begin, make sure that you have installed the prerequisites and set up an environment and an account as described in [Implementing a File Archive with the DAL and a Smart Rollup](../build-files-archive-with-dal).
Before you begin, make sure that you have installed the prerequisites and set up an environment and an account as described in [Implement a file archive with the DAL and a Smart Rollup](../build-files-archive-with-dal).

## Fetching the DAL parameters in a kernel

Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/build-your-first-app.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: Build your first app on Tezos
title: Build a simple web application
authors: 'Claude Barde, Tim McMackin'
last_update:
date: 17 October 2023
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/create-an-nft.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ title: Create an NFT
There are many ways to create (or "mint") NFTs; in particular, you can create all of the NFTs in a collection at once or set up an application that can create NFTs as users request them.
Try one of these tutorials to see different ways of minting NFTs:

- [Create NFTs with the `tznft` tool](./create-an-nft/nft-tznft): Create metadata files to describe NFTs and then use a command-line tool to mint them and manipulate them
- [Create NFTs from the command line](./create-an-nft/nft-tznft): Create metadata files to describe NFTs and then use a command-line tool to mint them and manipulate them
- [Mint NFTs from a web app](./create-an-nft/nft-web-app): Use a pre-existing contract to create NFTs from a web application
- [Create a contract and web app that mints NFTs](./create-an-nft/nft-taquito): Set up a web application that authorized users can use to create NFTs and all users can use to see the NFTs in a collection
2 changes: 1 addition & 1 deletion docs/tutorials/create-an-nft/nft-tznft.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: Create NFTs with the `tznft` tool
title: Create NFTs from the command line
authors: 'Sol Lederer, Tim McMackin'
last_update:
date: 18 September 2023
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/smart-contract/archetype.md
Original file line number Diff line number Diff line change
Expand Up @@ -324,5 +324,5 @@ Then, you can verify the updated storage on the block explorer or by running the
Now the contract is running on the Tezos blockchain.
You or any other user can call it from any source that can send transactions to Tezos, including command-line clients, dApps, and other contracts.

If you want to continue working with this contract, try creating a dApp to call it from a web application, similar to the dApp that you create in the tutorial [Build your first app on Tezos](../build-your-first-app/).
If you want to continue working with this contract, try creating a dApp to call it from a web application, similar to the dApp that you create in the tutorial [Build a simple web application](../build-your-first-app/).
You can also try adding your own endpoints and originating a new contract, but you cannot update the existing contract after it is deployed.
2 changes: 1 addition & 1 deletion docs/tutorials/smart-contract/cameligo.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -288,5 +288,5 @@ It also allows you to call the contract.
Now the contract is running on the Tezos blockchain.
You or any other user can call it from any source that can send transactions to Tezos, including Octez, dApps, and other contracts.

If you want to continue working with this contract, try creating a dApp to call it from a web application, similar to the dApp that you create in the tutorial [Build your first app on Tezos](../build-your-first-app/).
If you want to continue working with this contract, try creating a dApp to call it from a web application, similar to the dApp that you create in the tutorial [Build a simple web application](../build-your-first-app/).
You can also try adding your own endpoints and originating a new contract, but you cannot update the existing contract after it is deployed.
2 changes: 1 addition & 1 deletion docs/tutorials/smart-contract/jsligo.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -303,5 +303,5 @@ It also allows you to call the contract.
Now the contract is running on the Tezos blockchain.
You or any other user can call it from any source that can send transactions to Tezos, including Octez, dApps, and other contracts.

If you want to continue working with this contract, try creating a dApp to call it from a web application, similar to the dApp that you create in the tutorial [Build your first app on Tezos](../build-your-first-app/).
If you want to continue working with this contract, try creating a dApp to call it from a web application, similar to the dApp that you create in the tutorial [Build a simple web application](../build-your-first-app/).
You can also try adding your own endpoints and originating a new contract, but you cannot update the existing contract after it is deployed.
2 changes: 1 addition & 1 deletion docs/tutorials/smart-contract/smartpy.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -290,5 +290,5 @@ It will not be shown again.
Now the contract is running on the Tezos blockchain.
You or any other user can call it from any source that can send transactions to Tezos, including Octez, dApps, and other contracts.

If you want to continue working with this contract, try creating a dApp to call it from a web application, similar to the dApp that you create in the tutorial [Build your first app on Tezos](../build-your-first-app/).
If you want to continue working with this contract, try creating a dApp to call it from a web application, similar to the dApp that you create in the tutorial [Build a simple web application](../build-your-first-app/).
You can also try adding your own endpoints and originating a new contract, but you cannot update the existing contract after it is deployed.
Loading

0 comments on commit d960996

Please sign in to comment.