Skip to content

Commit

Permalink
Merge branch 'master' into jmongeon-vetkey
Browse files Browse the repository at this point in the history
  • Loading branch information
jessiemongeon1 authored Jul 10, 2023
2 parents 541c752 + e6002dc commit e112bec
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 80 deletions.
14 changes: 7 additions & 7 deletions docs/developer-docs/backend/motoko/access-control.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,17 +169,17 @@ shared({ caller = initializer }) actor class() {
};
```

Let's take a look at a few key elements of this dapp:
Let's take a look at a few key elements of this dapp:

- You might notice that the `greet` function is a variation on the `greet` function you have seen in previous guides. In this dapp, however, the `greet` function uses a message caller to determine the permissions that should be applied and, based on the permissions associated with the caller, which greeting to display.
- You might notice that the `greet` function is a variation on the `greet` function you have seen in previous guides. In this dapp, however, the `greet` function uses a message caller to determine the permissions that should be applied and, based on the permissions associated with the caller, which greeting to display.

- The dapp defines two custom types—one for `Roles` and one for `Permissions`.
- The dapp defines two custom types—one for `Roles` and one for `Permissions`.

- The `assign_roles` function enables the message caller to assign a role to the principal associated with an identity.
- The `assign_roles` function enables the message caller to assign a role to the principal associated with an identity.

- The `callerPrincipal` function enables you to return the principal associated with an identity.
- The `callerPrincipal` function enables you to return the principal associated with an identity.

- The `my_role` function enables you to return the role that is associated with an identity.
- The `my_role` function enables you to return the role that is associated with an identity.

- #### Step 3: Save your changes and close the `main.mo` file to continue.

Expand Down Expand Up @@ -490,4 +490,4 @@ To stop the local canister execution environment:

If you are looking for more information about identity and authentication, check out the following related resources:

- [dfx identity (command reference)](/references/cli-reference/dfx-identity.md).
- [dfx identity (command reference)](/references/cli-reference/dfx-identity.md).
2 changes: 1 addition & 1 deletion docs/tokenomics/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Welcome to our DAO docs. If there's anything in particular you'd like to see her
The NNS is the open tokenized DAO that controls the IC. As we move to more and more decentralization, it is crucial to learn more about the IC components that facilitate community governance. The NNS allows users to participate the governance of the IC by staking tokens and voting (or delegating votes - liquid democracy ftw) and to earn rewards over time.
- A more detailed introduction to the NNS can be [found here](./nns/nns-intro.md)
- Proposals, voting and rewards are [explained here](./nns/nns-staking-voting-rewards.md) can be explored in the [Governance section](https://dashboard.internetcomputer.org/governance) on the dashboard
- You can read about the community fund [here](./nns/community-fund.md)
- You can read about the neurons' fund [here](./nns/neurons-fund.md)
- Start participating in the NNS app by checking out the [NNS Intro](token-holders/nns-app-quickstart.md)

## Service Nervous System (SNS)
Expand Down
71 changes: 0 additions & 71 deletions docs/tokenomics/nns/community-fund.md

This file was deleted.

1 change: 0 additions & 1 deletion sidebars.js
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,6 @@ const sidebars = {
},
items: [
"tokenomics/token-holders/nns-app-quickstart",
"tokenomics/nns/community-fund",
"tokenomics/nns/neurons-fund",
"tokenomics/nns/nns-staking-voting-rewards",
],
Expand Down

0 comments on commit e112bec

Please sign in to comment.