Skip to content

Commit ddf4018

Browse files
committed
Fixes from PR discussion:
- Reverted the note for Chromebook setup. - Renamed all screenshots and text regarding the first repository creation to "my-first-repo". - Updated the "Deploy" chapter with more screenshots. - Fixed the "Create GitHub account" instructions for Chromebook setup. - Used a numbered list for Chromebook instructions. - Corrected indentation in the Chromebook markdown.
1 parent 2cc2b6e commit ddf4018

File tree

7 files changed

+35
-21
lines changed

7 files changed

+35
-21
lines changed

en/chromebook_setup/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
# Chromebook setup
22

3+
> **Note** If you already worked through the [installation steps](../installation/README.md), no need to do this again – you can skip straight ahead to [Introduction to Python](../python_introduction/README.md).
4+
35
{% include "/chromebook_setup/instructions.md" %}
Loading
Loading
-13.8 KB
Loading
Loading

en/chromebook_setup/instructions.md

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,32 @@
1-
For people using a Chromebook or those with limited memory on their laptops, we recommend using a cloud IDE environment. This allows you to interact with the command line, Python, and Django directly through your browser, where a code editor is already installed.
1+
For people using a Chromebook or those with limited memory on their laptops, we recommend using a cloud IDE environment. This allows you to interact with the command line, Python, and Django directly through your browser, where a code editor is already installed. In case you using this instruction, some steps of the tutorial don't have to be done again ("Deploy/Git" [part](https://tutorial.djangogirls.org/en/deploy/#installing-git) ). You’ll find a more detailed explanation in the “Deploy/Git” section.
22

33
Your installation experience will be a little different.
44

5-
- Make a [GitHub](https://github.com) account.
6-
- Create a GitHub project. Visit [this](https://github.com/new) link, choose any name for your project, and make it public (needed for deployment, you can make it private later). Also, add a `README.md` and `.gitignore` file.
5+
1. **Go to [GitHub.com](https://github.com)** and sign up for a new, free user account. Be sure to remember your password (add it to your password manager, if you use one).
76

8-
![](../chromebook_setup/images/create-new-repo.png)
7+
2. **Create a GitHub project**. Visit [this](https://github.com/new) link, use "my-first-blog" name for your project, and make it public (needed for deployment, you can make it private later). Also, add a `README.md` and `.gitignore` file.
98

10-
In case you using this instruction, some steps of the tutorial don't have to be done again ("Deploy/Git" [part](https://tutorial.djangogirls.org/en/deploy/#installing-git)).
9+
![](../chromebook_setup/images/create-new-repo.png)
1110

12-
- Start a Codespace. Go to GitHub [Codespaces](https://github.com/codespaces/new) and select the repository you just created. Click "Create Codespace".
11+
3. **Start a Codespace**. Go to GitHub [Codespaces](https://github.com/codespaces/new) and select the repository you just created. Click "Create Codespace".
1312

14-
![](../chromebook_setup/images/create-new-codespace.png)
13+
![](../chromebook_setup/images/create-new-codespace.png)
1514

16-
Wait a little bit and you'll see something like that:
15+
Wait a little bit and you'll see something like that:
1716

18-
![](../chromebook_setup/images/codespace-preview.png)
17+
![](../chromebook_setup/images/codespace-preview.png)
1918

20-
The [VSCode](https://code.visualstudio.com) editor will open for you automatically. If you see a notification that says "Install Python", please click on it. If not prompted, click the "Extensions" icon on the left sidebar in the Codespace editor. Search for "Python" and click "Install."
19+
The [VSCode](https://code.visualstudio.com) editor will open for you automatically. If you see a notification that says "Install Python", please click on it. If not prompted, click the "Extensions" icon on the left sidebar in the Codespace editor. Search for "Python" and click "Install."
2120

22-
![](../chromebook_setup/images/vscode-install-python.png)
21+
![](../chromebook_setup/images/vscode-install-python.png)
2322

24-
The bash terminal (similar to Linux) is at the bottom of the page.
23+
The bash terminal (similar to Linux) is at the bottom of the page.
2524

26-
![](../chromebook_setup/images/codespace-preview.png)
25+
![](../chromebook_setup/images/codespace-preview.png)
2726

28-
By default, the GitHub Codespace environment will be deleted after 1 month (this applies only to the environment, not your code). To prevent auto-deletion, you can adjust the settings on the page: https://github.com/codespaces
27+
By default, the GitHub Codespace environment will be deleted after 1 month (this applies only to the environment, not your code). To prevent auto-deletion, you can adjust the settings on the page: https://github.com/codespaces
2928

30-
![](../chromebook_setup/images/codespace-auto-delete-off.png)
29+
![](../chromebook_setup/images/codespace-auto-delete-off.png)
3130

32-
- Continue with the tutorial
33-
34-
Follow the next steps from the section [Set up virtual environment and install Django](https://tutorial.djangogirls.org/en/installation/#virtualenv).
35-
Follow than sections for Ubuntu/Linux. Use the Codespaces command line (terminal), accessible through your browser.
31+
4. **Continue with the tutorial**. Follow the next steps from the section [Set up virtual environment and install Django](https://tutorial.djangogirls.org/en/installation/#virtualenv).
32+
Follow than sections for Ubuntu/Linux. Use the Codespaces command line (terminal), accessible through your browser.

en/deploy/README.md

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,26 @@ As you learned, a website has to be located on a server. There are a lot of serv
88

99
The other external service we'll be using is [GitHub](https://www.github.com), which is a code hosting service. There are others out there, but almost all programmers have a GitHub account these days, and now so will you!
1010

11-
These three places will be important to you. Your local computer will be the place where you do development and testing. When you're happy with the changes, you will place a copy of your program on GitHub. Your website will be on PythonAnywhere and you will update it by getting a new copy of your code from GitHub.
11+
These three places will be important to you. Your local computer will be the place where you do development and testing. When you're happy with the changes, you will place a copy of your program on GitHub. Your website will be on PythonAnywhere and you will update it by getting a new copy of your code from GitHub.
12+
13+
The deployment process can be illustrated as follows:
14+
15+
![](../deploy/images/deployment_local.png)
16+
17+
If you’re using a **Chromebook** and [GitHub Codespaces](https://github.com/codespaces), your setup will look a bit different. All code-related changes are made not locally on your **Chromebook**, but in the Cloud Environment provided by GitHub.
18+
19+
The deployment process on **Chromebook** and Cloud environment can be illustrated as follows:
20+
21+
![](../deploy/images/deployment_cloud.png)
1222

1323
# Git
1424

1525
> **Note** If you already did the [installation steps](../installation/README.md), there's no need to do this again – you can skip to the next section and start creating your Git repository.
1626
1727
{% include "/deploy/install_git.md" %}
1828

29+
> **Note** If you're using a **Chromebook** and have already completed the **Chromebook** Installation [part](../chromebook_setup/README.md), you've already created the repository and can **skip** all commands from the "Starting our Git repository" and "Ignoring Files" chapters. You can continue from the "First Git commands" chapter. While you’re welcome to read these chapters, the Terminal commands can be skipped.
30+
1931
## Starting our Git repository
2032

2133
Git tracks changes to a particular set of files in what's called a code repository (or "repo" for short). Let's start one for our project. Open up your console and run these commands, in the `djangogirls` directory:
@@ -31,7 +43,7 @@ $ git config --global user.email you@example.com
3143
```
3244
Initializing the git repository is something we need to do only once per project (and you won't have to re-enter the username and email ever again).
3345

34-
### Ignoring files
46+
## Ignoring Files
3547

3648
Git will track changes to all the files and folders in this directory, but there are some files we want it to ignore. We do this by creating a file called `.gitignore` in the base directory. Open up your editor and create a new file with the following contents:
3749

@@ -80,6 +92,9 @@ Instead use `ls -a` to see the `.gitignore` file.
8092

8193
> **Note** One of the files you specified in your `.gitignore` file is `db.sqlite3`. That file is your local database, where all of your users and posts are stored. We'll follow standard web programming practice, meaning that we'll use separate databases for your local testing site and your live website on PythonAnywhere. The PythonAnywhere database could be SQLite, like your development machine, but usually you will use one called MySQL which can deal with a lot more site visitors than SQLite. Either way, by ignoring your SQLite database for the GitHub copy, it means that all of the posts and superuser you created so far are going to only be available locally, and you'll have to create new ones on production. You should think of your local database as a good playground where you can test different things and not be afraid that you're going to delete your real posts from your blog.
8294
95+
96+
## First Git commands
97+
8398
It's a good idea to use a `git status` command before `git add` or whenever you find yourself unsure of what has changed. This will help prevent any surprises from happening, such as wrong files being added or committed. The `git status` command returns information about any untracked/modified/staged files, the branch status, and much more. The output should be similar to the following:
8499

85100
{% filename %}command-line{% endfilename %}

0 commit comments

Comments
 (0)