changed contribution tutorial for new Gitea instance
@ -4,6 +4,12 @@ sidebar_position: 2
|
|||||||
|
|
||||||
# Shopping District
|
# Shopping District
|
||||||
|
|
||||||
|
## Currency
|
||||||
|
|
||||||
|
We use *Diamonds* as the currency.
|
||||||
|
|
||||||
|
# Shopping District
|
||||||
|
|
||||||
The economy and Spawn is managed by the community. The community-elected mayor is responsible for keeping the shopping district nice-looking and manages the themes. See [here](./season2.md) to learn who is Mayor at the moment.
|
The economy and Spawn is managed by the community. The community-elected mayor is responsible for keeping the shopping district nice-looking and manages the themes. See [here](./season2.md) to learn who is Mayor at the moment.
|
||||||
|
|
||||||
The mayor and the minister of building came up with a plan for Spawn, the shopping district, and the economy. Read below for more information. If you have questions, ask the Mayor or other players.
|
The mayor and the minister of building came up with a plan for Spawn, the shopping district, and the economy. Read below for more information. If you have questions, ask the Mayor or other players.
|
||||||
@ -14,7 +20,7 @@ The mayor and minister of building decided they want a flexible shop system keep
|
|||||||
|
|
||||||
- **Districts:** Medieval/market, modern/industrial, fantasy, themed shops. Build your shop in the district that fits your design. Below is a picture of where the districts are located.
|
- **Districts:** Medieval/market, modern/industrial, fantasy, themed shops. Build your shop in the district that fits your design. Below is a picture of where the districts are located.
|
||||||

|

|
||||||
- **Price:** 3 Picobitcoins per block. For example, a `10 x 10` plot is `100 x 3 = 300 PB`. All the money goes towards funding the Nether highway, the shopping district, and other community projects.
|
- **Price:** 0.5 Diamond per blocks. For example, a `10 x 10` plot is `100 x 0.5 = 50 Diamonds`. All the money goes towards funding the Nether highway, the shopping district, and other community projects.
|
||||||
|
|
||||||
- **Maximum plot size:** `25 x 25` or any plot size equivalent to that area. If you need more space than that, ask the Mayor and he'll find a spot for your shop.
|
- **Maximum plot size:** `25 x 25` or any plot size equivalent to that area. If you need more space than that, ask the Mayor and he'll find a spot for your shop.
|
||||||
|
|
||||||
@ -22,4 +28,4 @@ The mayor and minister of building decided they want a flexible shop system keep
|
|||||||
|
|
||||||
## Currency
|
## Currency
|
||||||
|
|
||||||
This season, we're a little bit more flexible about the currency. **The owner of the shop decides what they want as a currency.** Most people like to use **Diamonds** or the less inflationary and fractional currency **Bitcoins**. You can invest in Bitcoin with the Villager at Spawn. You can also create your own currency if you want to. ☺️
|
We use *Diamonds* as the currency.
|
||||||
|
@ -9,73 +9,47 @@ import TabItem from '@theme/TabItem';
|
|||||||
|
|
||||||
# How to contribute
|
# How to contribute
|
||||||
|
|
||||||
This website is a community project for the community and by the community. It is fully open-source with the code being available at [GitHub](pathname://https://github.com/aleabodo/survival-pi-docs). It means that every member of the community can literally edit *anything* of the website and contribute to adding new information and posts to it.
|
This website is a community project. It is fully open-source with the code being available on [Gitea](pathname://https://git.alexbell.de/aleabodo/survival-pi-docs). It means that every member of the community can edit *anything* of the website and contribute to adding new information and posts to it.
|
||||||
|
|
||||||
## Some terms
|
## Follow these simple steps to make your first edit
|
||||||
|
|
||||||
These are some of the most important terms you should know when working with Git. I will be using them, so I recommend to at least skim over them.
|
### 1. Create a Gitea Account
|
||||||
|
Ask the server owner (BuildingBrute) to create an account for you on [Gitea](pathname://https://git.alexbell.de/).
|
||||||
|
|
||||||
<Tabs>
|
### 2. Sign in on Gitea
|
||||||
<TabItem value="git" label="Git" default>
|
Sign in on [Gitea](pathname://https://git.alexbell.de/) with the credentials given to you. Follow the instructions to set a new password.
|
||||||
Git is a powerful version control system that helps track changes to files and coordinate work on those files among multiple people.
|
|
||||||
</TabItem>
|
|
||||||
<TabItem value="repo" label="Repository (Repo) 💾">
|
|
||||||
A repository is a storage space where this project lives. It contains all the files and the history of all changes ever made to them. Repositories can be local (on your computer) or remote (on a server like [GitHub](pathname://https://github.com/aleabodo/survival-pi-docs)).
|
|
||||||
</TabItem>
|
|
||||||
<TabItem value="commit" label="Commit ✅">
|
|
||||||
A commit is like a snapshot of your project at a specific point in time. Each commit contains information about what changes were made, who made them, and when. Think of it as saving your changes to a log book.
|
|
||||||
</TabItem>
|
|
||||||
<TabItem value="fork" label="Fork 🍴">
|
|
||||||
A fork is a personal copy of someone else's repository that lives on *your* account. It allows you to freely experiment with changes and make commits without affecting the original project. Forking is often used when you want to contribute to a repository you don’t own (as we will see later).
|
|
||||||
</TabItem>
|
|
||||||
<TabItem value="pullrequest" label="Pull Request (PR) 📩">
|
|
||||||
A pull request is a way to propose changes you've made (on your fork) to a project so that they can be reviewed and potentially merged ("*pulled*") into the original repository. As you will see later, you'll need to make a PR so I can review your commits before accepting them into the website.
|
|
||||||
</TabItem>
|
|
||||||
</Tabs>
|
|
||||||
|
|
||||||
## Follow these 5 steps to make your first edit
|
### 3. Fork The Survival-Pi Website.
|
||||||
|
*Forking* means copying the code to your own account, so you can edit it. Visit the [repository page](pathname://https://git.alexbell.de/aleabodo/survival-pi-docs/) and click on the `Fork` button on the top-right to create a fork.\
|
||||||
|
 \
|
||||||
|
Next, click on `Fork Repository` to confirm.\
|
||||||
|
 \
|
||||||
|
After forking, you will be redirected to your local copy of the website code. You are ready for editing!
|
||||||
|
|
||||||
1. **Create a GitHub Account** \
|
:::tip[Tip]
|
||||||
[Create an account on GitHub](pathname://https://github.com/signup). Sign in with your new account.
|
For subsequent edits you can use your forked repository on your profile directly. **You need to create a fork only once with your first edit.**
|
||||||
|
|
||||||
2. **Click on *Edit this page*** \
|
|
||||||
Visit any page you want to edit and scroll to the bottom. Click on the button `Edit this page`, redirecting you to the corresponding file on the [GitHub repository](pathname://https://github.com/aleabodo/survival-pi-docs). \
|
|
||||||

|
|
||||||
|
|
||||||
3. **Follow the instructions to fork the Repo** \
|
|
||||||
Since you don't own this repository, GitHub will ask you to create a Fork. Follow the instructions. \
|
|
||||||

|
|
||||||
|
|
||||||
4. **Edit the Page** \
|
|
||||||
Now you can edit the website's code. Most pages, including the Wiki and Season pages, use Markdown, a simple format you might know from note-taking apps. To learn more, check out [this markdown cheatsheet](pathname://https://www.markdownguide.org/cheat-sheet/). To get started quickly, I recommend getting familiar with the existing text and checking out the [example page of a base](./example-page.md) and the corresponding code.
|
|
||||||
|
|
||||||
:::note[Some footnotes on editing:]
|
|
||||||
- You can format pages however you see fit, not limited to specific templates.
|
|
||||||
- All pages of the seasons and the Wiki are in the `/docs/` directory. The sidebar of the website will follow that directory tree.
|
|
||||||
- Adding images is a little bit more involved since the GitHub website doesn't allow you to easily upload images. So if you want to add images to your page, just add the template image as below and send BuildingBrute your real images. He will handle the rest.
|
|
||||||
```markdown
|
|
||||||

|
|
||||||
```
|
|
||||||
- When you create new files (on the sidebar is a *+* button), make sure you don't include any whitespaces in the file name. Also, it needs to have the file ending `.md` standing for *markdown*. Please make sure you familiarize yourself with the directory structure to keep it organized.
|
|
||||||
:::
|
|
||||||
|
|
||||||
5. **Commit Your Changes** \
|
|
||||||
Click on `Commit changes...` to create a snapshot of your edits on your forked repository. Please make a meaningful commit messages. Avoid messages like "LOL" or "Changed something". Describe your changes briefly and clearly; this helps the reviewer understand your edits.
|
|
||||||
|
|
||||||
6. **Create a Pull Request** \
|
|
||||||
Review your changes and click `Create pull request` to propose merging your commits into the main repository. \
|
|
||||||

|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
:::tip
|
|
||||||
You can make multiple commits on your account's forked repository before making a pull request. This is especially useful if you need to add multiple files like pictures for a page.
|
|
||||||
:::
|
:::
|
||||||
|
|
||||||
:::warning[Keep your repo in sync before making subsequent Pull Requests!]
|
### 4. Make Your Edit
|
||||||
Before making subsequent edits to your forked repository, you need to make sure that it's synced and up-to-date with the main repository, else you're editing old files. You can do that by clicking `Sync fork` on you repository's main page. You can see whether your fork is commits behind the main repository. You can also make PR from here.
|
Navigate inside `/docs/` to the corresponding page you want to edit. \
|
||||||
|
Click the edit button and start editing. \
|
||||||
|

|
||||||
|
|
||||||
|
:::tip[Tip]
|
||||||
|
Type `#` to make a headline or `**` to make something bold. Check out [this example page](./example-page.md) or [the markdown cheatsheet](pathname://https://www.markdownguide.org/cheat-sheet/) for more details. If you want to add images send them to the server owner and add the following code to where you want the images to be placed:
|
||||||
|
```markdown
|
||||||
|

|
||||||
|
```
|
||||||
|
:::
|
||||||
|
|
||||||
|
|
||||||

|
### 5. Save Your Changes
|
||||||
|
Scroll down. \
|
||||||
You can find your repository in your GitHub profile under `Your repositories`.
|
Fill out the text field with a meaningful explaination of what you changed. \
|
||||||
:::
|
Click on `Commit Changes`. \
|
||||||
|

|
||||||
|
|
||||||
|
### 6. Merge Your Changes Into The Main Repository
|
||||||
|
Click `New Pull Request` to request merging your commit into the [main repository](pathname://https://git.alexbell.de/aleabodo/survival-pi-docs/). \
|
||||||
|
 \
|
||||||
|
The [website](pathname://https://survival-pi.com/) will update with your changes after the server owner accepts your Pull Request.
|
BIN
docs/wiki/Contribute/{13A39645-24BB-450E-AAE1-A0EC97E8C0ED}.png
Normal file
After Width: | Height: | Size: 22 KiB |
BIN
docs/wiki/Contribute/{6BE92668-57AD-444F-B8A9-CE293A9B77B3}.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
BIN
docs/wiki/Contribute/{793A3D76-27B2-4E09-B055-7C649E1926B1}.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
docs/wiki/Contribute/{7B1716AD-AF11-4256-9FB8-EEC5D53FD331}.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
docs/wiki/Contribute/{A4DE5353-35E8-4E73-A56C-53A2122AA350}.png
Normal file
After Width: | Height: | Size: 609 B |
Before Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 22 KiB |