diff --git a/.eslintignore b/.eslintignore index 9b1c8b133c..89f52aaca4 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1 +1,2 @@ +/backstop_data /dist diff --git a/.eslintrc.js b/.eslintrc.js index 9af0c3ecfb..66c1bb9901 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,3 +1,3 @@ module.exports = { - extends: ['@mate-academy/eslint-config', 'plugin:cypress/recommended'], + extends: '@mate-academy/eslint-config', }; diff --git a/.gitignore b/.gitignore index ecb0748b03..1558091fd7 100644 --- a/.gitignore +++ b/.gitignore @@ -9,10 +9,7 @@ node_modules .DS_Store # Generated files +backstop_data dist .cache .parcel-cache -raw_reports -cypress/screenshots -cypress/videos -reports diff --git a/.stylelintignore b/.stylelintignore index 9b1c8b133c..f1d4bd2757 100644 --- a/.stylelintignore +++ b/.stylelintignore @@ -1 +1,2 @@ +/backstop_data/ /dist diff --git a/README.md b/README.md index 8b16c19cb9..07718b2cfb 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Follow the instructions in this and next lessons to implement the page block by - Start writing styles in the `main.scss` file. It is be explained in the `Sass` lesson. - **DON'T** try to do it `Pixel Perfect` - implement it the most `simple` way so it looks similar. - When done check yourself using the [CHECKLIST](./checklist.md) when finished. -- Deploy and create a Pull Request with a [DEMO LINK](https://.github.io/layout_landing-page/). +- Deploy and create a Pull Request with a [DEMO LINK](https://MaoZeDun.github.io/layout_landing-page/). # Tips & Hints - Check `background-image: url()` to be relative to the `main.scss`. So should start with `../images`. diff --git a/cypress/integration/page.spec.js b/cypress/integration/page.spec.js index d698dfa20b..4616b5f5a8 100644 --- a/cypress/integration/page.spec.js +++ b/cypress/integration/page.spec.js @@ -1,6 +1,7 @@ 'use strict'; -// TODO: edit it -describe('Page', () => { - it('should be visitable', () => {}); -}); +{ + "scripts": { + "deploy": "node deploy.js" + } +} diff --git a/package-lock.json b/package-lock.json index 919c878ea2..bfe0b241cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@mate-academy/eslint-config": "latest", "@mate-academy/jest-mochawesome-reporter": "^1.0.0", "@mate-academy/linthtml-config": "latest", - "@mate-academy/scripts": "^1.8.5", + "@mate-academy/scripts": "^1.9.12", "@mate-academy/stylelint-config": "latest", "@parcel/transformer-sass": "^2.12.0", "cypress": "^13.13.0", @@ -1467,10 +1467,11 @@ "dev": true }, "node_modules/@mate-academy/scripts": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.8.6.tgz", - "integrity": "sha512-b4om/whj4G9emyi84ORE3FRZzCRwRIesr8tJHXa8EvJdOaAPDpzcJ8A0sFfMsWH9NUOVmOwkBtOXDu5eZZ00Ig==", + "version": "1.9.12", + "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.9.12.tgz", + "integrity": "sha512-/OcmxMa34lYLFlGx7Ig926W1U1qjrnXbjFJ2TzUcDaLmED+A5se652NcWwGOidXRuMAOYLPU2jNYBEkKyXrFJA==", "dev": true, + "license": "MIT", "dependencies": { "@octokit/rest": "^17.11.2", "@types/get-port": "^4.2.0", diff --git a/package.json b/package.json index 3d4833da3f..58c7e57218 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@mate-academy/eslint-config": "latest", "@mate-academy/jest-mochawesome-reporter": "^1.0.0", "@mate-academy/linthtml-config": "latest", - "@mate-academy/scripts": "^1.8.5", + "@mate-academy/scripts": "^1.9.12", "@mate-academy/stylelint-config": "latest", "@parcel/transformer-sass": "^2.12.0", "cypress": "^13.13.0", diff --git a/src/index.html b/src/index.html index 428e3b54bb..075a7e8269 100644 --- a/src/index.html +++ b/src/index.html @@ -1,22 +1,461 @@ + - + - Landing Page + MyBike + + + + + + - + > --> - -

Landing Page

+ + + +
+
+
+
+ + + +
+ + + +
+
+
+

Take the Streets

+
+
+
+
+ + + + +
+
+
+ +
+

+ Move Free +

+ +
+

+ Shift your ride, not gears. Find the fastest way to move in the + city as the bike adapts intuitively to power the speed you need. +

+
+
+ + + +
+

Compare Bikes

+
+
+ + Bike product Sporty 4 + +

Sporty 4

+

+ The iconic frame brought to a new performance height as a + sporty, active ride. +

+

$ 2 590

+
+ +
+ + Bike product Ride in town ST + +

Ride in town ST

+

+ An open frame for an upright riding position as the most + comfortable ride in town. +

+

$ 2 590

+
+ +
+ + Bike product Agile ride 3 + +

Agile ride 3

+

+ The lightweight frame that has earned its street tread as a + sleek, agile ride. +

+

$ 2 090

+
+
+
+ + + +
+

The Details

+ +
+
+
+ + Auto Unlock + + + + Auto Unlock + +
+ +

Auto Unlock

+ +

+ The app senses when you're nearby to unlock automatically. GPS + tracking so you know where your bike is and can track it + anytime. +

+
+ +
+
+ + Range & Integrated lights + + + + Range & Integrated lights + +
+ +

Range & Integrated lights

+ +

+ The removable battery has up to 70km battery autonomy and + weighs only 2.4 kg. Lights integrated into the frame give you + always-on visibility day and night. +

+
+ +
+
+ + Hydraulic disc brakes & Lightweight + + + + Hydraulic disc brakes & Lightweight + +
+ +

+ Hydraulic disc brakes & Lightweight +

+ +

+ Brakes with total stopping power the second you make contact. + The removable battery has up to 70km battery autonomy and + weighs only 2.4 kg. Lights integrated into the frame give you + always-on visibility day and night. +

+
+
+ + +
+ + + +
+

Contact us

+ +
+
+ + + + + + + +
+ +
+
Phone
+ +
+ + +1 234 5555-55-55 + +
+ +
Email
+ +
hello@miami.com
+ +
Address
+ +
+ + 400 first ave. +
+ suite 700 +
+ Minneapolis, MN 55401 + +
+
+
+
+ +
+
+
+ + + + + diff --git a/src/styles/main.scss b/src/styles/main.scss deleted file mode 100644 index 293d3b1f13..0000000000 --- a/src/styles/main.scss +++ /dev/null @@ -1,3 +0,0 @@ -body { - margin: 0; -}