Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

solution #768

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .bemlintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"elementDivider": "__",
"modifierDivider": "--",
"ignore": [
"node_modules",
"dist"
],
"rules": {
"one-block": true,
"one-element": true,
"element-inside-parent-block": true,
"no-double-element": true,
"no-neighbour-parent-block": true,
"modifiable-class": true
}
}
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm start & sleep 5 && npm test
- run: npm test
- name: Upload HTML report(backstop data)
if: ${{ always() }}
uses: actions/upload-artifact@v2
Expand Down
48 changes: 47 additions & 1 deletion .linthtmlrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,49 @@
{
"extends": "@mate-academy/linthtml-config"
"attr-bans": [
"align",
"background",
"bgcolor",
"border",
"frameborder",
"style"
],
"attr-name-ignore-regex": "viewBox",
"attr-no-dup": true,
"attr-quote-style": "double",
"attr-req-value": true,
"class-no-dup": true,
"doctype-first": true,
"doctype-html5": true,
"fig-req-figcaption": true,
"head-req-title": true,
"html-req-lang": true,
"id-class-style": false,
"id-no-dup": true,
"img-req-src": true,
"img-req-alt": "allownull",
"indent-width": 2,
"indent-style": "spaces",
"indent-width-cont": true,
"input-radio-req-name": true,
"spec-char-escape": true,
"tag-bans": [
"b",
"i",
"u",
"center",
"style",
"marquee",
"font",
"s"
],
"tag-name-lowercase": true,
"tag-name-match": true,
"tag-self-close": "never",
"tag-close": true,
"text-ignore-regex": "&",
"title-no-dup": true,
"line-end-style": "lf",
"attr-new-line": 2,
"attr-name-style": "dash",
"attr-no-unsafe-char": true
}
32 changes: 16 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Dia landing page
<!-- # Dia landing page
Implement landing page according to [Figma design](https://www.figma.com/file/7qwsWggv9BAxMi2VPhBuPr/Air-(formerly-Dia)?node-id=9138%3A35) - Use BEM and SCSS

Adapt the page to the following screens:
Expand All @@ -24,31 +24,31 @@ Adapt the page to the following screens:
- use https://github.com/mate-academy/layout_dia/blob/master/src/images/Shapes.png as background picture
9. Implement `Send us a message` block.
10. Implement `Contact us` block.
11. Implement the footer.
11. Implement the footer. -->

## Checklist for preparing a portfolio project for HR review

1. Don’t forget to add the title “Air” for the whole web page
<!-- 1. Don’t forget to add the title “Air” for the whole web page
2. A landing page is implemented strictly according to the design in Figma
4. Links in the header and footer menus should lead to the corresponding blocks of the landing page
5. The speed of animations is the same throughout the landing page (for example, increasing when hovering or moving blocks when scrolling)
6. Placeholders in the forms suggest what to enter, and if there is a validation of the form, then it is clear in what format to enter the phone number
7. Make sure everything looks neat on mobile and without horizontal scrolling
8. Add favicon
6. Placeholders in the forms suggest what to enter, and if there is a validation of the form, then it is clear in what format to enter the phone number -->
<!-- 7. Make sure everything looks neat on mobile and without horizontal scrolling -->
<!-- 8. Add favicon
9. Add a smooth scroll for the whole page
10. When you try to send the form there is no 405 error and the form is automatically cleared after submit and is scrolled to the top of the page or the page is reloaded
11. The form shouldn’t submit empty
12. The "Learn more" button should lead to the closest block (Our expertise)
13. The "Hire Us" button in the header menu should lead to the contact form
14. In the PROCESS section add a hover effect to cards (for example, let them increase in size a little)
15. Inside the cards in PROCESS sections, make a link out of the "Learn More" text, so that it hovers simultaneously with the arrow button on the left
16. In the Vision, Passion, Results section, the “Apply” button also should lead to the contact form
17. In the Testimonials and Our expertise section add hover effects for each review
18. After clicking the menu buttons, the landing page will scroll exactly to the beginning of the desired block (exactly where its section begins)
19. The arrows at the bottom of the first block should not respond slowly to pressing (this is possible if the pictures are too large)
20. When a user clicks on Address Google Maps is opened in a new tab
21. The user must have the opportunity to conveniently write 2-3 lines of text in the message field
22. OPTIONAL: After everything is done, you can implement the slider on the hero page (you can find images for it on Unsplash)
14. In the PROCESS section add a hover effect to cards (for example, let them increase in size a little) -->
<!-- 15. Inside the cards in PROCESS sections, make a link out of the "Learn More" text, so that it hovers simultaneously with the arrow button on the left -->
<!-- 16. In the Vision, Passion, Results section, the “Apply” button also should lead to the contact form -->
<!-- 17. In the Testimonials and Our expertise section add hover effects for each review -->
<!-- 18. After clicking the menu buttons, the landing page will scroll exactly to the beginning of the desired block (exactly where its section begins) -->
<!-- 19. The arrows at the bottom of the first block should not respond slowly to pressing (this is possible if the pictures are too large) -->
<!-- 20. When a user clicks on Address Google Maps is opened in a new tab -->
<!-- 21. The user must have the opportunity to conveniently write 2-3 lines of text in the message field -->
<!-- 22. OPTIONAL: After everything is done, you can implement the slider on the hero page (you can find images for it on Unsplash) -->


## Github flow
Expand All @@ -65,7 +65,7 @@ Adapt the page to the following screens:
11. `git push origin develop` - to send you code for PR.
12. Create a Pull Request (PR) from your branch `develop` to branch `master` of original repo.
13. Replace `<your_account>` with your Github username in the
[DEMO LINK](https://<your_account>.github.io/layout_dia/).
[DEMO LINK](https://spec0s.github.io/layout_dia/).
14. Copy `DEMO LINK` to the PR description.

> To update you PR repeat steps 7-11.
10 changes: 5 additions & 5 deletions checklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

## Tech review

1. Add favicon
<!-- 1. Add favicon
2. Add a smooth scroll for the whole page (`scroll-behavior: smooth;`)
3. Logos in header and footer should be links to home page
4. Make sure when you click on logo there is no 404 error (Use `href="#"` in `anchor tag`)
Expand All @@ -14,13 +14,13 @@
9. Make sure when you click on logo there is no 404 error (Use `href="#"` in `anchor tag`)
10. The user must have the opportunity to conveniently write 2-3 lines of text in the message input field
11. When you try to send the form there is no 405 error and the form is automatically cleared after submit and is scrolled to the top of the page or the page is reloaded
12. The form shouldn’t submit empty
13. After autocomplete the form, change the [default styles](http://joxi.ru/EA4xgG8HXwL4lA). Read more about [changing autocomplete styles](https://css-tricks.com/snippets/css/change-autocomplete-styles-webkit-browsers/)
12. The form shouldn’t submit empty -->
<!-- 13. After autocomplete the form, change the [default styles](http://joxi.ru/EA4xgG8HXwL4lA). Read more about [changing autocomplete styles](https://css-tricks.com/snippets/css/change-autocomplete-styles-webkit-browsers/) -->
14. OPTIONAL: After everything is done, you can implement the slider in the first section

## HR review

1. To make it clear to the recruiter what exactly this landing page is, it is better to give the whole web page the title “Air”
<!-- 1. To make it clear to the recruiter what exactly this landing page is, it is better to give the whole web page the title “Air”
2. A landing page is implemented strictly according to the design in Figma
3. Links in the header and footer menus should lead to the corresponding blocks of the landing page
4. The speed of animations is the same throughout the landing page (for example, increasing when hovering or moving blocks when scrolling)
Expand All @@ -29,4 +29,4 @@
7. The "Learn more" button should lead to the closest block (Our expertise)
8. The "Hire Us" button in the header menu should lead to the contact form
9. In the `Vision`, `Passion`, `Results` sections, the “Apply” button also should lead to the contact form
10. All the social icons in the footer should be clickable and open the social networks in a new tab
10. All the social icons in the footer should be clickable and open the social networks in a new tab -->
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@mate-academy/bemlint": "^0.1.1",
"@mate-academy/eslint-config": "*",
"@mate-academy/linthtml-config": "0.0.2",
"@mate-academy/scripts": "^0.9.0",
"@mate-academy/scripts": "^1.2.8",
"@mate-academy/stylelint-config": "*",
"colors": "^1.3.3",
"eslint": "^5.16.0",
Expand Down
Binary file added src/images/cross.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/expertise/image-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/expertise/image-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/expertise/image-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/images/features/features-bg.jpg
Binary file not shown.
4 changes: 0 additions & 4 deletions src/images/features/features-item-icon-1.svg

This file was deleted.

8 changes: 0 additions & 8 deletions src/images/features/features-item-icon-2.svg

This file was deleted.

7 changes: 0 additions & 7 deletions src/images/features/features-item-icon-3.svg

This file was deleted.

3 changes: 0 additions & 3 deletions src/images/logo/dia-logo.svg

This file was deleted.

Binary file added src/images/logo/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/images/logo/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/mdi-arrow-forward.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/menu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions src/images/slider/arrow-left.svg

This file was deleted.

3 changes: 0 additions & 3 deletions src/images/slider/arrow-right.svg

This file was deleted.

Binary file added src/images/slider/mdi-chevron-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/slider/mdi-chevron-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/slider/photo0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/slider/photo1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/slider/photo2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/slider/photo3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/images/slider/slide-img-1.jpg
Binary file not shown.
10 changes: 10 additions & 0 deletions src/images/socials/facebook-1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading