Skip to content

Commit 286cd3d

Browse files
authored
Feat/update docs (Klimatbyran#663)
* Update docs to include frontend technologies implementation * Update docs to include recommended learning prerequisites and resource * Fixes Klimatbyran#607: Update contributing.md to include relative markdown link to getting-started.md * Fixes Klimatbyran#607: Fix README.md Contributing section link * Remove 'frontend technologies' from getting-started.md meant for Klimatbyran/beta; fix typos in contributing.md
1 parent b65e223 commit 286cd3d

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Looking for ideas on what needs to be done? We appreciate help on existing [issu
7474

7575
Testing, bug fixes, typos or fact checking of our data is highly appreciated.
7676

77-
See [doc/contributing.md] before making your first contribution.
77+
See [doc/contributing.md](./doc/contributing.md) before making your first contribution.
7878

7979
## Contact
8080

doc/contributing.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Once you decide to pick an issue up, leave a comment saying so, to avoid others
2626

2727
### Step 3. Make your changes
2828

29-
For most issues you will start with making sure you can run Klimatkollen locally, see [doc/getting-started.md] for instructions on that.
29+
For most issues you will start with making sure you can run Klimatkollen locally, see [doc/getting-started.md](./getting-started.md) for instructions on that, and how to set up your dev environment.
3030

3131
Run `git log -1` to see the latest commit in your local repo, and make sure this is the same as the `staging` branch on GitHub. This is to make sure you are up to date on everyone's changes.
3232

@@ -54,7 +54,7 @@ Push your commits to your fork of Klimatkollen. If you haven't created a fork al
5454

5555
Create a pull request. Either follow the link git showed after pushing to your fork, or create it from the GitHub web interface. Double check the branches in the PR! Make sure your are merging from your own branch, on your own repo, into "staging" on "klimatkollen". A common mistake is to accidentally start merging into "staging" on your own repo.
5656

57-
In the PR desscription, write "Fixes #XXX" where XXX is the id of the issue you are fixing. E.g. `Fixes #413`
57+
In the PR description, write "Fixes #XXX" where XXX is the id of the issue you are fixing. E.g. `Fixes #413`
5858

5959
If the PR is not ready for review yet, prefix the title wiht "Draft: ". Remove this once you're ready.
6060

@@ -68,7 +68,7 @@ The reviewer will most likely have some comments, questions, or feedback, which
6868

6969
In some cases, the reviewer might make some changes to your PR themselves and commit it, if they need to get the fix in quickly.
7070

71-
The reviewer might also conclude that the changes should not be made, or that there currently isn't time to review it. Such a scenario is unlikely but if it does happen, please be understanding and remember that the reviwer wants what's best for the project, just like you.
71+
The reviewer might also conclude that the changes should not be made, or that there currently isn't time to review it. Such a scenario is unlikely but if it does happen, please be understanding and remember that the reviewer wants what's best for the project, just like you.
7272

7373
Klimatkollen's team has the final say on what goes into the code.
7474

doc/getting-started.md

+7-4
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,27 @@
22

33
Klimatkollen is for the most part a self-contained web application. This means you can run it on your own computer and see your own copy in your web brower. This page will outline how to do that from scratch. If you haven't done some of these things before, it might feel like a long process before you get to launch the page. Almost all of it is one-time setup, meaning once you get through it, contributing in the future is much easier.
44

5+
If you're looking to contribute code, some basic knowledge of HTML, CSS and JS is recommended. [freeCodeCamp](https://www.freecodecamp.org/) is a great place to learn these fundamentals.
6+
57
The steps will be as follows:
68

7-
* Getting the source code
89
* Installing Node.js
10+
* Getting the source code
911
* Installing other dependencies
12+
* Our frontend technologies
1013
* Running Klimatkollen
1114

1215
If you get stuck at any point, don't hesitate to ask on the Discord which is linked in the main README. Really - we want to help!
1316

14-
## Downloading Node.js
17+
## Installing Node.js
1518

1619
Klimatkollen is written mostly in JavaScript. To execute JavaScript directly on your computer, you need [Node.js](https://nodejs.org/en). Just press the big "download" button and follow the instructions. After the installation, start a new terminal or command prompt to verify that it went well. You should be able to run the commands "node" and "npm" successfully. Just remember to start a *new* terminal.
1720

1821
## Getting the source code
1922

2023
Klimatkollen is open source and the source code is hosted on [GitHub](https://github.com/Klimatbyran/klimatkollen). The absolute easiest way to get it is to just press the big green "Code" button on that page and select "Download ZIP". If you don't plan on making any of your own contributions, this is enough and you can skip to the next section.
2124

22-
If you do want to contribute code, or even check out other people's work-in-progress, you will need to use [git](https://git-scm.com/), which is a system that manages source code history and enables collaboration. If you're not faimiliar with git, here are some links that can get you started. Don't feel like you have to spend a lot of time learning git. A basic understanding is enough to get by in most cases.
25+
If you do want to contribute code, or even check out other people's work-in-progress, you will need to use [git](https://git-scm.com/), which is a system that manages source code history and enables collaboration. If you're not familiar with git, here are some links that can get you started. Don't feel like you have to spend a lot of time learning git. A basic understanding is enough to get by in most cases.
2326

2427
* https://docs.github.com/en/get-started/using-git/about-git
2528
* https://www.w3schools.com/git/git_intro.asp?remote=github
@@ -43,4 +46,4 @@ The full list is in "package.json" which is a file that npm can understand. To h
4346

4447
## Running the Klimatkollen webapp.
4548

46-
If all the dependencies were installed without issues, you should be able to run `npm run dev`. This will de a little slow the first time, but ifeverything goes well it will tell you it is serving the app from "localhost:3000". Type that address in your browser and you should see your local copy of Klimatkollen in its full glory!
49+
If all the dependencies were installed without issues, you should be able to run `npm run dev`. This will de a little slow the first time, but if everything goes well it will tell you it is serving the app from "localhost:3000". Type that address in your browser and you should see your local copy of Klimatkollen in its full glory!

0 commit comments

Comments
 (0)