From d4769fc63541f0f58a60938713fe5ad771a938c1 Mon Sep 17 00:00:00 2001 From: WiiJoy MacOS Date: Tue, 7 Nov 2023 15:01:09 +0600 Subject: [PATCH 1/2] docs: correct of comments --- tasks/coffee-house/coffee-house-week1.md | 119 +++++++-------- tasks/coffee-house/coffee-house-week2.md | 185 +++++++++++------------ tasks/coffee-house/coffee-house-week3.md | 63 ++++---- tasks/coffee-house/coffee-house.md | 6 +- 4 files changed, 174 insertions(+), 199 deletions(-) diff --git a/tasks/coffee-house/coffee-house-week1.md b/tasks/coffee-house/coffee-house-week1.md index fb4b67a65..fc13dc471 100644 --- a/tasks/coffee-house/coffee-house-week1.md +++ b/tasks/coffee-house/coffee-house-week1.md @@ -1,4 +1,4 @@ -## Coffee-House. Week-1 - Fixed layout +## Coffee-House. Week-1 - Fixed Layout ### Main Task Description and Requirements @@ -11,94 +11,85 @@ The content width of 1440px should not change when resizing the browser window. ## Workflow -1. Task should be done in private school's repository. [How to work with a school's private repository](https://docs.rs.school/#/private-repository) -2. Create new branch `coffee-house` from `main`. Create a folder `coffee-house` in the created branch. Place your code in this folder. +1. The task should be completed in private repository of the school. [How to work with a school's private repository](https://docs.rs.school/#/private-repository) +2. Create a new branch named `coffee-house` from `main` branch. Create a folder `coffee-house` in the created branch. Place your code in this folder. 3. Complete the task. -4. Check if your work meets [CrossCheck Criteria](#crosscheck-criteria) -5. Evaluate your work yourself according to the provided [Criteria for evaluation](#criteria-for-evaluation), taking into account the [Specifics of verifying layout](#specifics-of-verifying-layout) for compliance with the layout -6. To make the assessment of your work easier, print your self-assessment to the browser console. To do this, include the `index.js` file in your `*.html` file, write a `console.log()` function in it, and in parentheses within quotes, write your self-assessment points. Use the `\n` character to insert line breaks. - For example: - -``` -console.log('1. First criteria's name: +5\n2.Second criteria's name: +10') -``` - -7. Deploy your work to gh-pages. For example, create and merge a Pull Request from the `coffee-house` branch into `gh-pages` branch. The Pull Request title can be arbitrary. There is no need to describe this Pull Request. -8. After completing your work, open a Pull Request from the `coffee-house` branch to the `main` branch. Give the Pull Request a title based on the task name. Provide a description for the Pull Request following [template](https://docs.rs.school/#/pull-request-review-process?id=Требования-к-pull-request-pr) +4. Ensure your work meets the [CrossCheck Criteria](#crosscheck-criteria). +5. Independently evaluate your work according to the provided [Criteria for Evaluation](#criteria-for-evaluation), keeping in mind the [Specifics of Verifying Layout](#specifics-of-verifying-layout). +6. Deploy your work to gh-pages. For example, create and merge a Pull Request from the `coffee-house` branch into `gh-pages` branch. The title of the Pull Request can be chosen at your discretion. A description for this Pull Request is not necessary. +7. Once you have completed your work, open a Pull Request from the `coffee-house` branch to the `main` branch. Give the Pull Request a title based on the task name. Provide a description for the Pull Request following [template](https://docs.rs.school/#/pull-request-review-process?id=Требования-к-pull-request-pr). There is no need to merge this Pull Request. -9. Submit the link to the deployment of your work in the [RS APP](https://app.rs.school/) section "Cross-Check Submit" -10. After the task deadline, the cross-check process begins. The cross-check lasts for three days. To receive points for the task, you need to review all the submissions sent for review and submit the results of the review in the "Cross-Check Review" section of [RS APP](https://app.rs.school/). +8. Submit the deployment link of your project in the "Cross-Check Submit" section of the [RS APP](https://app.rs.school/). +9. After the task deadline has passed, the cross-check phase will start, lasting three days. To earn points for the task, you must review all the projects assigned to you for cross-checking and submit your review results in the "Cross-Check Review" section of the [RS APP](https://app.rs.school/). ### CrossCheck Criteria (100 points) 1. Checking validation of pages: **+16** - - The layout of both pages is valid: to check the validity of the layout, use the service https://validator.w3.org/ . **+12** (6 points per page) + - The layout for both pages is validated and error-free according to the W3C Validator (https://validator.w3.org/): **+12** (6 points per page) Valid markup of checked page corresponds to the message "Document checking completed. No errors or warnings to show." In this case, we assign the full points for the checked page (+6). If there are `warnings` but no `errors`, we assign half of the points (+3) for the checked page - - Favicon is added to each page **+4** -2. The layout matches the design **+42** - - `
` block on each page **+6** - - `Enjoy` block on `home` page **+6** - - `Favourites Coffee` block on `home` page **+6** - - `About` block on `home` page **+6** - - `Mobile App` block on `home` page **+6** - - `Menu` block on `menu` page **+6** - - `