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

Develop #2674

Open
wants to merge 66 commits into
base: develop
Choose a base branch
from
Open

Develop #2674

Show file tree
Hide file tree
Changes from 63 commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
625185e
Merge pull request #990 from mate-academy/develop
meforoma Apr 12, 2022
b7a677c
Updated README.md with demo link sample
jstmpelowycz May 27, 2022
7e13326
Removed content bug in README.md
jstmpelowycz May 27, 2022
c2d1ad9
Update checklist.md
mgrinko Jun 22, 2022
6426dbe
Update README.md
mgrinko Jun 27, 2022
6c493f2
Update README.md
mgrinko Jun 27, 2022
61ea8cb
Update README.md
mgrinko Jun 27, 2022
374f13c
Update README.md
solaryasha Jul 8, 2022
8d0b01e
Update README.md
mgrinko Sep 6, 2022
cee64a5
changed my bike figma link to a new version
ihor-jpeg Sep 7, 2022
ea0dece
Merge pull request #1494 from mate-academy/update-my-bike-figma-link
ihor-jpeg Sep 7, 2022
c057b9a
Update README.md
mgrinko Sep 19, 2022
ee253f8
Update checklist.md
G-YaSha Oct 18, 2022
0b6e00c
downgrade parcel to 1.12.3
mgrinko Jun 8, 2023
6e9bbda
Update README.md
mgrinko Jun 16, 2023
b43bc67
fix dependencies
mhrynko Jul 14, 2023
c8ef338
update dependencies
Nov 12, 2023
e2200a7
Merge pull request #2614 from SerhiiKirik/update-deps
mgrinko Nov 20, 2023
bfd224b
fix deps
mgrinko Nov 29, 2023
c514de5
feature/prettier added prettier, updated packages
mykhalenych Feb 21, 2024
484c7a8
feature/prettier updated package
mykhalenych Feb 22, 2024
00951e4
Update package.json
mgrinko Feb 22, 2024
870cfed
Merge pull request #2644 from mykhalenych/feature/prettier
mgrinko Feb 22, 2024
6032576
Update package.json
mgrinko Mar 1, 2024
be86692
Update package.json
mgrinko Mar 4, 2024
03b8d7d
fix deps for node20
mgrinko Mar 11, 2024
b402e4f
add latest deps
mgrinko Jul 21, 2024
f5c9d49
Merge pull request #2660 from mate-academy/node20
mgrinko Sep 2, 2024
b647d3a
Update test.yml
mgrinko Sep 2, 2024
dac1f00
Update test.yml
mgrinko Sep 10, 2024
c773b07
css reset
Codoeh Dec 27, 2024
bff2570
Extract title style to new block file
Codoeh Dec 27, 2024
4135652
Positioning title in header
Codoeh Dec 27, 2024
11f8750
setting header background image
Codoeh Dec 27, 2024
a09cf9b
HTML for main section
Codoeh Dec 27, 2024
8c5dc16
CSS for main secondary header
Codoeh Dec 27, 2024
3f8ea9b
fix for font in main secondary title
Codoeh Dec 27, 2024
44808fe
Header background for big screen + recommended products html
Codoeh Dec 27, 2024
0fb653d
HTML for recommended products
Codoeh Dec 27, 2024
edcb822
HTML linking recommended products images
Codoeh Dec 27, 2024
f52974e
styling for recommended items
Codoeh Dec 27, 2024
c238997
styling for wide screen
Codoeh Dec 27, 2024
b99db12
styling for all dimensions
Codoeh Dec 27, 2024
e14c8f7
HTML adding catogories titles and photos
Codoeh Dec 28, 2024
fd18ddd
Styling for categories differents widths
Codoeh Dec 28, 2024
4864e4c
Adding view all button and styles for him
Codoeh Dec 28, 2024
6b6d76b
Adding variables to button styling
Codoeh Dec 28, 2024
1831815
HTML for article and css for it
Codoeh Dec 29, 2024
7f3c32c
Create mixin for grid and implement it for article and categories
Codoeh Dec 29, 2024
0044ae3
changing header display for grid
Codoeh Dec 29, 2024
1143c80
HTML + style for contact infos
Codoeh Dec 29, 2024
86a9f82
Visually hidden for labels and HTML + css for form
Codoeh Dec 29, 2024
73b17c1
Adding footer image
Codoeh Dec 29, 2024
c2bdb6a
Add wave logo to header
Codoeh Dec 29, 2024
f79aee5
navigation skeleton
Codoeh Dec 29, 2024
267e445
fix for name in main.css
Codoeh Dec 29, 2024
6f09935
Adding transition for photos and html for menu
Codoeh Dec 30, 2024
9deb8a8
html for menu page
Codoeh Dec 30, 2024
e7503fc
animation for header number
Codoeh Dec 30, 2024
100a676
menu transition
Codoeh Dec 30, 2024
6c44da7
working menu
Codoeh Dec 30, 2024
346c491
adding links
Codoeh Dec 30, 2024
617d3e4
Final commit
Codoeh Dec 30, 2024
8dbf918
fixing form
Codoeh Jan 2, 2025
d1744cd
completing task requirments
Codoeh Jan 2, 2025
c538538
final commit
Codoeh Jan 2, 2025
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
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

strategy:
matrix:
node-version: [12.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v2
Expand All @@ -20,10 +20,10 @@ 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
uses: actions/upload-artifact@v4
with:
name: report
path: backstop_data
29 changes: 29 additions & 0 deletions .github/workflows/test.yml-template
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Test

on:
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [20.x]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm test
- name: Upload HTML report(backstop data)
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: report
path: backstop_data
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
styles.css
styles.css.map

# IDE
.idea
.vscode
Expand All @@ -12,3 +15,4 @@ node_modules
backstop_data
dist
.cache
.parcel-cache
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": false,
"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
}
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/node_modules
/dist
**/*.test.js
20 changes: 20 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"tabWidth": 2,
"useTabs": false,
"semi": true,
"singleQuote": true,
"trailingComma": "all",
"printWidth": 80,
"overrides": [
{
"files": "*.html",
"options": {
"parser": "html",
"insertPragma": false,
"endOfLine": "auto",
"singleAttributePerLine": true,
"htmlWhitespaceSensitivity": "ignore"
}
}
]
}
5 changes: 1 addition & 4 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
module.exports = {
extends: [
"stylelint-config-recommended-scss",
"@mate-academy/stylelint-config"
],
extends: "@mate-academy/stylelint-config",
plugins: [
"stylelint-scss"
],
Expand Down
13 changes: 1 addition & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1 @@
# Miami landing page

You have several designs that are very similar to Miami. Choose the most interesting for you. Don't be afraid of another markup. We developed landing pages that in coding will be almost the same as Miami. You still able to chose Miami.

- [the BOSE landing page](https://www.figma.com/file/OMjQNb3hg1LKMV4OwyQ3Ao/BOSE?node-id=0%3A1)
- [the MYBIKE landing page](https://www.figma.com/file/Ic3SlZjkATYaS7uTifZAIk/BIKE?node-id=0%3A1)
- [the MET landing page](https://www.figma.com/file/lSR1m42L9YwzQwzzxKwHpw/THE-MET?node-id=0%3A1)
- [the Miami landing page](https://www.figma.com/file/nHz8bflIwJaWP3P99vKTH5/miami_home_new?node-id=16033%3A3)

Implement selected landing page following the lesson videos.

--> [CHECKLIST](https://github.com/mate-academy/layout_miami/blob/master/checklist.md)
The website meets all the requirements of the task. It is adapted to various display widths. The form has hidden labels to make it more accessible to people using screen readers. The menu is fully functional. The website has animated transitions, buttons and photos.
8 changes: 4 additions & 4 deletions checklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
6. Same when you click on logo. There shouldn't be any error.
7. When clicking on any location / address - prevent errors and make it to open location in Google Maps
8. Pictures in Gallery should increase on hover
9. Location-related addresses / links / images should open google maps in a new tab `target="_blank"`
10. Apply :hover effect for images on page (testimonials / gallery, other sections).
9. Location-related addresses / links should open google maps in a new tab `target="_blank"`
10. Apply `:hover` effect for images on page (testimonials / gallery, other sections).
11. Make sure everything looks neat on mobile and without horizontal scrolling
12. The speed of animations is the same throughout the landing page (for example, increasing when hovering or moving blocks when scrolling)
13. Placeholders in the forms suggest what to enter; apply validation of the form fields (`required`, `email / tel etc.`), then it is clear in what format to enter the data
Expand All @@ -29,7 +29,7 @@

...
```
15. To disable page scrolling under the menu add the next code
18. To disable page scrolling under the menu add the next code
```css
.page__body--with-menu {
overflow: hidden;
Expand All @@ -44,5 +44,5 @@
}
});
```
16. Remember to reset default margins for headings (h1, h2, h3, etc.).
19. Remember to reset default margins for headings (h1, h2, h3, etc.).
* Only for Miami: Make sure that ```<h1>``` is positioned exactly 80px from the bottom of the header.
Loading