diff --git a/README.md b/README.md index acd4587e2..813c15536 100644 --- a/README.md +++ b/README.md @@ -9,4 +9,4 @@ Split the `App.js` into components based on CSS blocks. CSS code should be split - Install Prettier Extention and use this [VSCode settings](https://mate-academy.github.io/fe-program/tools/vscode/settings.json) to enable format on save. - Implement a solution following the [React task guideline](https://github.com/mate-academy/react_task-guideline#react-tasks-guideline) - Open one more terminal and run tests with `npm test` to ensure your solutions is correct -- Replace `` with your Github username in the [DEMO LINK](https://.github.io/react_decompose/) and add it to the PR description +- Replace `` with your Github username in the [DEMO LINK](https://azesmmisha.github.io/react_decompose/) and add it to the PR description diff --git a/src/App.css b/src/App.css index cfaa88809..241ccafaf 100644 --- a/src/App.css +++ b/src/App.css @@ -17,90 +17,3 @@ body { margin: 0; background: #eee; } - -.welcome { - height: 100vh; - background: coral; -} - -.welcome__text { - margin: 0; - font-size: 400%; - text-align: center; - line-height: 1; - padding-top: calc(50vh - 20pt); - display: block; - font-weight: 700; -} - -.header { - width: 100%; - padding: 1em; - font-size: 140%; - position: sticky; - top: 0; - left: 0; - right: 0; - transition: opacity 0.2s ease-in-out; - text-align: center; -} - -.header__title { - font-weight: 600; - display: inline; - margin: 0; - padding: 0; - font-size: inherit; -} - -.navigation__link { - display: inline-block; - outline: none; - text-decoration: none; - opacity: 0.7; - padding: 0 0.5em; - color: black; - transition: opacity 0.2s ease-in-out; -} - -.navigation__link:hover, -.navigation__link:focus { - opacity: 1; -} - -.article { - margin: 5em auto 0; - padding: 1em; - font-size: 140%; - max-width: 800px; - background: white; - box-shadow: rgba(0, 0, 0, 0.05) 0 3px 15px; -} - -.article__paragraph { - margin: 0; - color: #333; -} - -.article__paragraph:not(:first-child) { - margin-top: 0.7em; -} - -@media (min-width: 500px) { - .header { - text-align: left; - display: flex; - justify-content: space-between; - } - - .article { - margin: 3.5em auto 0; - padding: 2em; - } -} - -@media (min-width: 800px) { - .article { - margin: 3.5em auto; - } -} diff --git a/src/App.jsx b/src/App.jsx index 71951ebcd..346149169 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,86 +1,16 @@ -import React from 'react'; -import './App.css'; +import React from "react"; +import Header from "./components/Header/Header"; +import Article from "./components/Article/Article"; +import Welcome from "./components/Welcome/Welcome"; +import "./App.css"; // Move each BEM block to a separate component (file) and import them here function App() { return (
-
- Sticky Header! -
-
-

Site Name

- -
-
-

Headline

-

- In elementum lorem eget est euismod ornare. Phasellus sit amet - pellentesque mauris. Aliquam quis malesuada ex. Nullam eu aliquam - nibh. Mauris molestie, urna accumsan ornare semper, augue nibh posuere - lorem, vitae feugiat sem magna eget massa. Vivamus quis tincidunt - dolor. Fusce efficitur, orci non vestibulum consequat, lectus turpis - bibendum odio, in efficitur leo felis sed justo. Fusce commodo iaculis - orci, quis imperdiet urna. Sed mollis facilisis lacus non condimentum. - Nunc efficitur massa non neque elementum semper. Vestibulum lorem - arcu, tincidunt in quam et, feugiat venenatis augue. Donec sed - tincidunt tellus, a facilisis magna. Proin sit amet viverra nibh, - bibendum gravida felis. Vivamus ut nunc id mauris posuere - pellentesque. Praesent tincidunt id odio id feugiat. -

-

- In ac nisi lacus. Fusce est dolor, tincidunt ut bibendum vitae, - fermentum ac quam. Aliquam pretium tristique nibh quis iaculis. In et - cursus ex, eu aliquet ex. Proin facilisis lacus sit amet sapien - ultrices, ut vehicula arcu lobortis. Vivamus mollis ipsum ut hendrerit - molestie. Morbi lacinia, sapien eu dictum dignissim, tellus tortor - congue magna, sit amet bibendum libero nisi id massa. -

-

- Donec arcu elit, euismod vel lobortis eu, fringilla sit amet dolor. - Cras congue, massa nec sagittis mollis, dui felis ultrices magna, - tincidunt finibus lorem quam in sem. Morbi odio turpis, pulvinar sit - amet vulputate quis, ultricies eu libero. Donec ac maximus neque, nec - maximus nibh. Morbi rhoncus convallis urna, accumsan porta lorem - hendrerit in. Cras eget nisl dui. Morbi faucibus nisi eget ipsum - semper vulputate. Mauris nec tincidunt lectus. Aenean ac mi consequat - velit dignissim consectetur. Fusce placerat ac ipsum ac eleifend. - Aenean quis faucibus ex. -

-

- Cras egestas tempor nibh, a fermentum lorem sollicitudin non. Nulla - facilisi. In at elit id leo tristique condimentum. Donec at est nulla. - Mauris egestas magna ut laoreet pretium. Sed ultrices suscipit - vestibulum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. - Fusce id sapien eros. Vivamus viverra ultricies gravida. Nam urna - nibh, blandit a vulputate at, vehicula non nulla. Aenean ut nulla leo. - Praesent in ullamcorper est. -

-

- Pellentesque habitant morbi tristique senectus et netus et malesuada - fames ac turpis egestas. Phasellus bibendum nec arcu eu lobortis. Nam - convallis faucibus ante sed porta. Nullam ut convallis elit, quis - venenatis nunc. Curabitur sed sem eget velit condimentum rutrum in et - orci. Nunc non suscipit eros. Suspendisse porta sem vel justo commodo - dictum. Aliquam erat ligula, fringilla nec suscipit sed, porta vitae - turpis. Vestibulum rhoncus placerat nulla vitae suscipit. Curabitur - consectetur ex ut odio tristique vehicula. Ut ligula tortor, tincidunt - quis sodales vitae, ornare a turpis. Proin sit amet finibus enim. - Fusce tempus a neque vitae tempor. Aenean rutrum, libero iaculis - interdum vulputate, dui eros vehicula nisi, at interdum enim lacus eu - diam. -

-
+ +
+
); } diff --git a/src/components/Article/Article.css b/src/components/Article/Article.css index 56e2e0542..ab0b59343 100644 --- a/src/components/Article/Article.css +++ b/src/components/Article/Article.css @@ -1 +1,30 @@ -/* Put article styles here */ +.article { + margin: 5em auto 0; + padding: 1em; + font-size: 140%; + max-width: 800px; + background: white; + box-shadow: rgba(0, 0, 0, 0.05) 0 3px 15px; +} + +.article__paragraph { + margin: 0; + color: #333; +} + +.article__paragraph:not(:first-child) { + margin-top: 0.7em; +} + +@media (min-width: 500px) { + .article { + margin: 3.5em auto 0; + padding: 2em; + } +} + +@media (min-width: 800px) { + .article { + margin: 3.5em auto; + } +} diff --git a/src/components/Article/Article.jsx b/src/components/Article/Article.jsx index 073476529..1f9c33199 100644 --- a/src/components/Article/Article.jsx +++ b/src/components/Article/Article.jsx @@ -1,5 +1,68 @@ // import a css file containig article styles - +import "./Article.css"; // Create an Article function returning the HTML of article block - +const Article = () => { + return ( +
+

Headline

+

+ In elementum lorem eget est euismod ornare. Phasellus sit amet + pellentesque mauris. Aliquam quis malesuada ex. Nullam eu aliquam nibh. + Mauris molestie, urna accumsan ornare semper, augue nibh posuere lorem, + vitae feugiat sem magna eget massa. Vivamus quis tincidunt dolor. Fusce + efficitur, orci non vestibulum consequat, lectus turpis bibendum odio, + in efficitur leo felis sed justo. Fusce commodo iaculis orci, quis + imperdiet urna. Sed mollis facilisis lacus non condimentum. Nunc + efficitur massa non neque elementum semper. Vestibulum lorem arcu, + tincidunt in quam et, feugiat venenatis augue. Donec sed tincidunt + tellus, a facilisis magna. Proin sit amet viverra nibh, bibendum gravida + felis. Vivamus ut nunc id mauris posuere pellentesque. Praesent + tincidunt id odio id feugiat. +

+

+ In ac nisi lacus. Fusce est dolor, tincidunt ut bibendum vitae, + fermentum ac quam. Aliquam pretium tristique nibh quis iaculis. In et + cursus ex, eu aliquet ex. Proin facilisis lacus sit amet sapien + ultrices, ut vehicula arcu lobortis. Vivamus mollis ipsum ut hendrerit + molestie. Morbi lacinia, sapien eu dictum dignissim, tellus tortor + congue magna, sit amet bibendum libero nisi id massa. +

+

+ Donec arcu elit, euismod vel lobortis eu, fringilla sit amet dolor. Cras + congue, massa nec sagittis mollis, dui felis ultrices magna, tincidunt + finibus lorem quam in sem. Morbi odio turpis, pulvinar sit amet + vulputate quis, ultricies eu libero. Donec ac maximus neque, nec maximus + nibh. Morbi rhoncus convallis urna, accumsan porta lorem hendrerit in. + Cras eget nisl dui. Morbi faucibus nisi eget ipsum semper vulputate. + Mauris nec tincidunt lectus. Aenean ac mi consequat velit dignissim + consectetur. Fusce placerat ac ipsum ac eleifend. Aenean quis faucibus + ex. +

+

+ Cras egestas tempor nibh, a fermentum lorem sollicitudin non. Nulla + facilisi. In at elit id leo tristique condimentum. Donec at est nulla. + Mauris egestas magna ut laoreet pretium. Sed ultrices suscipit + vestibulum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Fusce id sapien eros. Vivamus viverra ultricies gravida. Nam urna nibh, + blandit a vulputate at, vehicula non nulla. Aenean ut nulla leo. + Praesent in ullamcorper est. +

+

+ Pellentesque habitant morbi tristique senectus et netus et malesuada + fames ac turpis egestas. Phasellus bibendum nec arcu eu lobortis. Nam + convallis faucibus ante sed porta. Nullam ut convallis elit, quis + venenatis nunc. Curabitur sed sem eget velit condimentum rutrum in et + orci. Nunc non suscipit eros. Suspendisse porta sem vel justo commodo + dictum. Aliquam erat ligula, fringilla nec suscipit sed, porta vitae + turpis. Vestibulum rhoncus placerat nulla vitae suscipit. Curabitur + consectetur ex ut odio tristique vehicula. Ut ligula tortor, tincidunt + quis sodales vitae, ornare a turpis. Proin sit amet finibus enim. Fusce + tempus a neque vitae tempor. Aenean rutrum, libero iaculis interdum + vulputate, dui eros vehicula nisi, at interdum enim lacus eu diam. +

+
+ ); +}; // Add a default export statement for Article component to use it in the other files + +export default Article; diff --git a/src/components/Article/Article.spec.jsx b/src/components/Article/Article.spec.jsx index 814793ebf..1cd97dc36 100644 --- a/src/components/Article/Article.spec.jsx +++ b/src/components/Article/Article.spec.jsx @@ -1,31 +1,31 @@ -import React from 'react'; -import { mount } from '@cypress/react18'; -import TestdArticle from './Article'; +import React from "react"; +import { mount } from "@cypress/react18"; +import TestdArticle from "./Article"; -describe('Article component', () => { +describe("Article component", () => { beforeEach(() => { mount(); }); - it('should contain Headline', () => { - cy.get('h2').should('have.text', 'Headline'); + it("should contain Headline", () => { + cy.get("h2").should("have.text", "Headline"); }); - it('should contain 5 paragraphs', () => { - cy.get('p.article__paragraph').should('have.length', 5); + it("should contain 5 paragraphs", () => { + cy.get("p.article__paragraph").should("have.length", 5); }); - it('should have correct styles', () => { - cy.get('.article').should('have.css', 'max-width', '800px'); + it("should have correct styles", () => { + cy.get(".article").should("have.css", "max-width", "800px"); - cy.get('.article__paragraph') + cy.get(".article__paragraph") .eq(0) - .should('have.css', 'color', 'rgb(51, 51, 51)'); + .should("have.css", "color", "rgb(51, 51, 51)"); }); - it('should have styles added with media', () => { - cy.get('.article') - .should('have.css', 'padding-left', '44.8px') - .and('have.css', 'margin-bottom', '78.4px'); + it("should have styles added with media", () => { + cy.get(".article") + .should("have.css", "padding-left", "44.8px") + .and("have.css", "margin-bottom", "78.4px"); }); }); diff --git a/src/components/Header/Header.css b/src/components/Header/Header.css index 0b160f66f..267c32261 100644 --- a/src/components/Header/Header.css +++ b/src/components/Header/Header.css @@ -1 +1,42 @@ -/* Put header styles here */ +.header { + width: 100%; + padding: 1em; + font-size: 140%; + position: sticky; + top: 0; + left: 0; + right: 0; + transition: opacity 0.2s ease-in-out; + text-align: center; +} + +.header__title { + font-weight: 600; + display: inline; + margin: 0; + padding: 0; + font-size: inherit; +} + +.navigation__link { + display: inline-block; + outline: none; + text-decoration: none; + opacity: 0.7; + padding: 0 0.5em; + color: black; + transition: opacity 0.2s ease-in-out; +} + +.navigation__link:hover, +.navigation__link:focus { + opacity: 1; +} + +@media (min-width: 500px) { + .header { + text-align: left; + display: flex; + justify-content: space-between; + } +} diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx index 3f2fea103..ed17fd8a4 100644 --- a/src/components/Header/Header.jsx +++ b/src/components/Header/Header.jsx @@ -1,5 +1,24 @@ // import a css file containig header styles - +import "./Header.css"; // Create a Header function returning the HTML of header block - +const Header = () => { + return ( +
+

Site Name

+ +
+ ); +}; // Add a default export statement for Header component to use it in the other files + +export default Header; diff --git a/src/components/Header/Header.spec.jsx b/src/components/Header/Header.spec.jsx index dc3dc766c..33959f41a 100644 --- a/src/components/Header/Header.spec.jsx +++ b/src/components/Header/Header.spec.jsx @@ -1,37 +1,37 @@ -import React from 'react'; -import { mount } from '@cypress/react18'; -import TestedHeader from './Header'; +import React from "react"; +import { mount } from "@cypress/react18"; +import TestedHeader from "./Header"; -describe('Header component', () => { +describe("Header component", () => { beforeEach(() => { mount(); }); - it('should containt Site Name', () => { - cy.get('h1').should('contain', 'Site Name'); + it("should containt Site Name", () => { + cy.get("h1").should("contain", "Site Name"); }); - it('should contain About link', () => { - cy.get('[href="#about"]').should('have.text', 'About'); + it("should contain About link", () => { + cy.get('[href="#about"]').should("have.text", "About"); }); - it('should contain Services link', () => { - cy.get('[href="#services"]').should('have.text', 'Services'); + it("should contain Services link", () => { + cy.get('[href="#services"]').should("have.text", "Services"); }); - it('should contain Contact link', () => { - cy.get('[href="#contact"]').should('have.text', 'Contact'); + it("should contain Contact link", () => { + cy.get('[href="#contact"]').should("have.text", "Contact"); }); - it('should have correct styles', () => { - cy.get('.header').should('have.css', 'position', 'sticky'); + it("should have correct styles", () => { + cy.get(".header").should("have.css", "position", "sticky"); - cy.get('.header__title').should('have.css', 'font-weight', '600'); + cy.get(".header__title").should("have.css", "font-weight", "600"); - cy.get('.navigation__link').eq(0).should('have.css', 'opacity', '0.7'); + cy.get(".navigation__link").eq(0).should("have.css", "opacity", "0.7"); }); - it('should have styles added with media', () => { - cy.get('.header').should('have.css', 'display', 'flex'); + it("should have styles added with media", () => { + cy.get(".header").should("have.css", "display", "flex"); }); }); diff --git a/src/components/Welcome/Welcome.css b/src/components/Welcome/Welcome.css index 564ff918a..af6498e91 100644 --- a/src/components/Welcome/Welcome.css +++ b/src/components/Welcome/Welcome.css @@ -1 +1,14 @@ -/* Put welcome styles here */ +.welcome { + height: 100vh; + background: coral; +} + +.welcome__text { + margin: 0; + font-size: 400%; + text-align: center; + line-height: 1; + padding-top: calc(50vh - 20pt); + display: block; + font-weight: 700; +} diff --git a/src/components/Welcome/Welcome.jsx b/src/components/Welcome/Welcome.jsx index fbaaa3c4d..2021447f3 100644 --- a/src/components/Welcome/Welcome.jsx +++ b/src/components/Welcome/Welcome.jsx @@ -1,5 +1,13 @@ // import a css file containig welcome styles - +import "./Welcome.css"; // Create a Welcome function returning the HTML of welcome block - +const Welcome = () => { + return ( +
+ Sticky Header! +
+ ); +}; // Add a default export statement for Welcome component to use it in the other files + +export default Welcome; diff --git a/src/components/Welcome/Welcome.spec.jsx b/src/components/Welcome/Welcome.spec.jsx index b6cbac85a..002909db4 100644 --- a/src/components/Welcome/Welcome.spec.jsx +++ b/src/components/Welcome/Welcome.spec.jsx @@ -1,23 +1,23 @@ -import React from 'react'; -import { mount } from '@cypress/react18'; -import TestedWelcome from './Welcome'; +import React from "react"; +import { mount } from "@cypress/react18"; +import TestedWelcome from "./Welcome"; -describe('Welcome component', () => { +describe("Welcome component", () => { beforeEach(() => { mount(); }); - it('should contain Sticky Header', () => { - cy.get('.welcome__text').should('have.text', 'Sticky Header!'); + it("should contain Sticky Header", () => { + cy.get(".welcome__text").should("have.text", "Sticky Header!"); }); - it('should have correct styles', () => { - cy.get('.welcome').should( - 'have.css', - 'background-color', - 'rgb(255, 127, 80)', + it("should have correct styles", () => { + cy.get(".welcome").should( + "have.css", + "background-color", + "rgb(255, 127, 80)", ); - cy.get('.welcome__text').should('have.css', 'text-align', 'center'); + cy.get(".welcome__text").should("have.css", "text-align", "center"); }); }); diff --git a/src/index.jsx b/src/index.jsx index 434b05d2f..248ed07ae 100644 --- a/src/index.jsx +++ b/src/index.jsx @@ -1,5 +1,5 @@ -import { createRoot } from 'react-dom/client'; +import { createRoot } from "react-dom/client"; -import App from './App'; +import App from "./App"; -createRoot(document.getElementById('root')).render(); +createRoot(document.getElementById("root")).render();