Skip to content

Commit 0aa2946

Browse files
Merge pull request #311 from rolling-scopes-school/sync-missing-docs
Sync missing documentation files: Add schedule, notifications, privat…
2 parents 98f3be2 + 04aff79 commit 0aa2946

File tree

5 files changed

+265
-0
lines changed

5 files changed

+265
-0
lines changed

docs/en/docsMenu_en.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,10 @@
235235
"title": "Overview",
236236
"link": "rs-app"
237237
},
238+
{
239+
"title": "Schedule",
240+
"link": "rs-app-schedule"
241+
},
238242
{
239243
"title": "Submitting Assignments in RS APP",
240244
"link": "rs-app-tasks"
@@ -243,12 +247,50 @@
243247
"title": "Cross check",
244248
"link": "cross-check-flow"
245249
},
250+
{
251+
"title": "Notifications",
252+
"link": "notifications"
253+
},
246254
{
247255
"title": "Typical Problems",
248256
"link": "rs-app-issues"
249257
}
250258
]
251259
},
260+
{
261+
"title": "Private Repository",
262+
"items": [
263+
{
264+
"title": "Private Repository",
265+
"link": "private-repository"
266+
},
267+
{
268+
"title": "Git Convention",
269+
"link": "git-convention"
270+
}
271+
]
272+
},
273+
{
274+
"title": "How to help the school?",
275+
"items": [
276+
{
277+
"title": "Become an Activist",
278+
"link": "rs-school-activist"
279+
},
280+
{
281+
"title": "How to Fix a Typo in Documentation?",
282+
"link": "fix-typo"
283+
},
284+
{
285+
"title": "Who are RSS AI?",
286+
"link": "rs-school-ai"
287+
},
288+
{
289+
"title": "Support Community",
290+
"link": "fundraiser"
291+
}
292+
]
293+
},
252294
{
253295
"title": "How to contribute",
254296
"link": "how-to-contribute"

docs/en/fix-typo.md

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
# How to Make Changes to RS School Documentation
2+
3+
If you notice an inaccuracy or typo in the [school documentation](https://docs.rs.school/#/), or in an assignment description, it's advisable to fix it.
4+
5+
The documentation repository is [here](https://github.com/rolling-scopes-school/docs)
6+
7+
If necessary, you can discuss changes in an issue, [for example](https://github.com/rolling-scopes-school/docs/issues/33).
8+
But if the content of the fixes is obvious to you, it's better to create a **Pull Request**.
9+
10+
## How to Add Changes to Someone Else's Repository
11+
12+
By sending a Pull Request, you're proposing to the repository author and all interested parties to review the changes you've made and merge them into the project. If the changes are reasonable and appropriate, your Pull Request will be accepted.
13+
14+
I'll show you how to do this using the example of the repository https://github.com/rolling-scopes-school/docs
15+
16+
### 1. Make Your Own Copy of the Repository
17+
18+
To do this, click the "Fork" button on the repository page.
19+
20+
![image](../images/fix-typo1.png)
21+
22+
As a result, a copy of the repository appears in your account.
23+
24+
![image](../images/fix-typo2.png)
25+
26+
The address of your repository copy contains your GitHub account name.
27+
28+
- Original repository `https://github.com/rolling-scopes-school/docs`
29+
- Created copy `https://github.com/irinainina/docs`
30+
31+
### 2. Clone Your Own Copy of the Repository to Your Computer
32+
33+
```sh
34+
git clone https://github.com/irinainina/docs
35+
```
36+
37+
## 3. Link the Local Copy to the Original Repository
38+
39+
To do this, go to the cloned repository folder and run two commands:
40+
41+
```sh
42+
git remote add upstream https://github.com/rolling-scopes-school/docs
43+
git fetch upstream
44+
```
45+
46+
![image](../images/fix-typo3.png)
47+
48+
### 4. Create Your Own Development Branch
49+
50+
The branch name usually indicates the content of the edits. Let's assume our branch will be called `fix-typo`. The command to create a new branch `fix-typo` and make it active:
51+
52+
```sh
53+
git checkout -b fix-typo
54+
```
55+
56+
At this point, we can already edit the code and add the necessary changes to it.
57+
58+
### 5. Add Changes to Your Own Copy of the Repository
59+
60+
As soon as you've done the work (or part of it), send it to your own copy of the repository on GitHub.
61+
To do this, run the commands:
62+
63+
```sh
64+
git add .
65+
git commit -m "feat: add fix-typo"
66+
git push origin fix-typo
67+
```
68+
69+
### 6. Return Changes: Pull request
70+
71+
So, everything is done. You've written the code, it's in your `fix-typo` branch both on your computer and on GitHub. All that's left is to send it to the original repository.
72+
73+
Go to your repository copy page on GitHub, select the `fix-typo` branch and click the Pull Request button.
74+
![image](../images/fix-typo4.png)
75+
76+
Add a title and description of your changes and click the "Create pull request" button.
77+
![image](../images/fix-typo5.png)
78+
79+
### What's Next?
80+
81+
Follow your Pull Request. See what people comment, what the maintainer says, whether they accept or reject your proposed edits.
82+
83+
Using the same principle, you can fix errors in the [course assignments repository](https://github.com/rolling-scopes-school/tasks) or even propose your own tasks.
84+
85+
Only the repository name will change, but the principle of working with the repository remains unchanged. Because it's the foundation of collaborative work on GitHub and creating open-source projects.
86+
87+
[Source](https://habr.com/ru/post/125999/)
88+

docs/en/notifications.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
## Rolling Scopes School Notifications
2+
3+
## Notification Types
4+
5+
- You, as a mentor, are approved for the course (contains links to confirm participation as a mentor, **does not require subscription**).
6+
- Your task was reviewed by a mentor/cross-check (contains the grade, maximum grade for this task, grade 'weight').
7+
- Upcoming deadline for tasks/tests/cross-check/interviews/presentations (contains course name(s), task name(s), and a link to RS App).
8+
- Message (feedback) from reviewers/reviewees during cross-check.
9+
10+
## Channels
11+
12+
- **Telegram**: Notifications come from [@rsschool_bot](https://t.me/rsschool_bot)
13+
- **E-mail**: Notifications come to E-Mail
14+
15+
## How to subscribe/unsubscribe from notifications
16+
17+
**In the `Contacts` card (in [profile](https://app.rs.school/profile)), the `E-Mail` and `Telegram` fields (without `@`) must be filled in. Fields are case-sensitive.**
18+
19+
1. In the profile, go to [Notifications](https://app.rs.school/profile/notifications).
20+
2. On the `Notifications` page, check the boxes next to the channels you want to subscribe to.
21+
22+
**To change the subscription status for `Telegram` notifications in the profile, you need to subscribe/unsubscribe in a conversation with [@rsschool_bot](https://t.me/rsschool_bot)**
23+

docs/en/private-repository.md

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# Private Repository
2+
3+
## How to create your private repository in RS School?
4+
5+
At the beginning of the course, you need to:
6+
7+
- open `Dashboard` in [RS App](https://app.rs.school)
8+
- click "Create repository" (or "Fix repository" if repository settings need to be reset to initial state)
9+
- GitHub automatically sends you an invite to access the repository. The invite comes to the email you specified when registering on GitHub (not the email you specified in RS App)
10+
11+
## How to work with a private repository?
12+
13+
- Clone it to your computer:
14+
`git clone https://github.com/rolling-scopes-school/<your-school-repository>.git`
15+
- Go to the cloned repository folder:
16+
`cd <your-school-repository>`
17+
- Set your data in the config (enter the email linked [to your GitHub account](https://github.com/settings/emails)):
18+
`git config user.name "Name Surname"`
19+
`git config user.email "your@email"`
20+
- Create a branch from `main` with the assignment name:
21+
`git checkout -b <task-name>`
22+
- Create a folder with the assignment name:
23+
`mkdir <task-name>`
24+
All files related to the assignment should be in it.
25+
- Complete the assignment, committing solutions in the process (see [commit requirements](https://docs.rs.school/#/git-convention)).
26+
- Push the branch to the remote branch on GitHub:
27+
`git push origin <task-name>`
28+
- Create a Pull Request from branch `<task-name>` to branch `main`. You don't need to merge the Pull Request.
29+
30+
## How to deploy an assignment from the school's private repository?
31+
32+
1. In the `gh-pages` branch, you need to place a folder with the assignment name, and the project files in it. The `index.html` file should be at the top level. This can be done in two ways:
33+
- for projects that don't use `webpack`, it's enough to make a Pull Request from the development branch to the `gh-pages` branch and merge it.
34+
- for projects that use `webpack`, you need to create a project build by running the `npm run build` command, create a folder with the assignment name in the `gh-pages` branch, and place the built project files in the created folder. Note that the `.gitignore` file lists the names of folders created during application build. Therefore, in the `gh-pages` branch, the `.gitignore` file can be deleted.
35+
2. The link to the deployed application version looks like: `https://rolling-scopes-school.github.io/repository-name/folder-name`, where
36+
- `repository-name` - your repository name in rs school
37+
- `folder-name` - the folder name with project files
38+
3. All other projects are deployed this way, a separate folder is created for each of them
39+
- this is how the `gh-pages` branch [looks](https://docs.rs.school/images/deploy-to-gh-pages.png) with project folders
40+
- example link: `https://rolling-scopes-school.github.io/irinainina-JS2020Q3/repair-design-project/`
41+
42+
#### Video&nbsp;[Deploy to GitHub Pages](https://www.youtube.com/watch?v=0lvKcqP3aP0)
43+
44+
## FAQ
45+
46+
### I deleted the gh-pages branch, what should I do?
47+
48+
1. Create the `gh-pages` branch from `main` again and push it to your school private repository
49+
2. In `Dashboard` RS App, click the `Fix repository` button
50+
3. Make any commit to the `gh-pages` branch and push the changes. (Each push to `gh-pages` triggers the deployment mechanism for this branch)
51+
4. Wait 5 minutes
52+
53+
### I can't open/merge a Pull Request from the development branch to the gh-pages branch, what should I do?
54+
55+
1. Delete the `gh-pages` branch on GitHub
56+
2. In `Dashboard` RS App, click the `Fix repository` button
57+
3. Merge the Pull Request into the `gh-pages` branch
58+
59+
### My site is not deploying and the Deployments section is not appearing, what should I do?
60+
61+
- Go to the settings of the private repository and check/set the required branch for deployment: `gh-pages/root`
62+
- If there's no settings section, in `Dashboard` RS App, click the `Fix repository` button, settings should appear.
63+
64+
![private-repo-settings-info](../images/private-repo-pages-settings.png)
65+
66+
## Adding a list of completed assignments and contacts to the private repository
67+
68+
The created private repository already has a `readme.md` file with the repository name.
69+
You can add your contacts (or a link to CV with contacts) to this file and maintain a list of completed assignments in it. This will help reviewers find your work in case of an error during submission.
70+
71+
After creating the `gh-pages` branch from `main`, this file will be copied there and will be available at
72+
`https://rolling-scopes-school.github.io/<repository-name>/`
73+

docs/en/rs-app-schedule.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
## Schedule in RS APP
2+
3+
For successful completion of the selected course in **RS App**, there is a **schedule** that can be accessed from the main menu
4+
5+
1. Select the desired course
6+
2. Go to the link or Schedule tab
7+
8+
![schedule](../images/schedule-1.png)
9+
10+
#### General view of the schedule
11+
12+
![schedule view](../images/schedule-2.png)
13+
14+
#### Schedule control panel
15+
16+
![schedule control panel](../images/schedule-3.png)
17+
18+
1. Filter by assignment status
19+
2. Time zone selection
20+
3. Hide/show individual table columns
21+
4. Event tag color settings
22+
23+
#### Event/assignment details
24+
25+
Clicking a link from the schedule opens a page with the event/assignment description.
26+
27+
#### Using the schedule
28+
29+
For convenient use of the schedule in RS App, the following features are provided:
30+
31+
![schedule control panel](../images/schedule-4.png)
32+
33+
1. Filter by assignment status
34+
2. Search by event/assignment name
35+
3. Filter by assignment type
36+
4. Sort by assignment release date
37+
5. Sort by assignment end date
38+
6. Search by organizer
39+

0 commit comments

Comments
 (0)