From 75d30f21855eef9c3dc017b8f906de556f1aef06 Mon Sep 17 00:00:00 2001 From: "g.palyukh" Date: Sun, 31 May 2026 13:56:30 +0200 Subject: [PATCH 1/2] add task solution --- README.md | 2 +- src/App.css | 86 ------------------------ src/App.jsx | 83 ++--------------------- src/components/Article/Article.css | 32 +++++++++ src/components/Article/Article.jsx | 66 ++++++++++++++++++ src/components/Header/Header.css | 26 +++++++ src/components/Header/Header.jsx | 13 ++++ src/components/Navigation/Navigation.css | 14 ++++ src/components/Navigation/Navigation.jsx | 19 ++++++ src/components/Welcome/Welcome.css | 14 ++++ src/components/Welcome/Welcome.jsx | 12 ++++ 11 files changed, 203 insertions(+), 164 deletions(-) create mode 100644 src/components/Navigation/Navigation.css create mode 100644 src/components/Navigation/Navigation.jsx diff --git a/README.md b/README.md index acd4587e2..8de2908be 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://galina-palyukh.github.io/react_decompose/) and add it to the PR description diff --git a/src/App.css b/src/App.css index cfaa88809..76a2fb868 100644 --- a/src/App.css +++ b/src/App.css @@ -18,89 +18,3 @@ body { 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..fb8df9841 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,86 +1,15 @@ import React from 'react'; import './App.css'; -// Move each BEM block to a separate component (file) and import them here +import Welcome from './components/Welcome/Welcome'; +import Header from './components/Header/Header'; +import Article from './components/Article/Article'; 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..adff8e58a 100644 --- a/src/components/Article/Article.css +++ b/src/components/Article/Article.css @@ -1 +1,33 @@ /* 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..54ea91ca2 100644 --- a/src/components/Article/Article.jsx +++ b/src/components/Article/Article.jsx @@ -3,3 +3,69 @@ // Create an Article function returning the HTML of article block // Add a default export statement for Article component to use it in the other files +import './Article.css'; + +function 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. +

+
+ ); +} + +export default Article; diff --git a/src/components/Header/Header.css b/src/components/Header/Header.css index 0b160f66f..8b6404ec9 100644 --- a/src/components/Header/Header.css +++ b/src/components/Header/Header.css @@ -1 +1,27 @@ /* 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; +} +@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..7157dbed3 100644 --- a/src/components/Header/Header.jsx +++ b/src/components/Header/Header.jsx @@ -3,3 +3,16 @@ // Create a Header function returning the HTML of header block // Add a default export statement for Header component to use it in the other files +import './Header.css'; +import Navigation from '../Navigation/Navigation'; + +function Header() { + return ( +
+

Site Name

+ +
+ ); +} + +export default Header; diff --git a/src/components/Navigation/Navigation.css b/src/components/Navigation/Navigation.css new file mode 100644 index 000000000..a67620c16 --- /dev/null +++ b/src/components/Navigation/Navigation.css @@ -0,0 +1,14 @@ +.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; +} diff --git a/src/components/Navigation/Navigation.jsx b/src/components/Navigation/Navigation.jsx new file mode 100644 index 000000000..7bdc46672 --- /dev/null +++ b/src/components/Navigation/Navigation.jsx @@ -0,0 +1,19 @@ +import './Navigation.css'; + +function Navigation() { + return ( + + ); +} + +export default Navigation; diff --git a/src/components/Welcome/Welcome.css b/src/components/Welcome/Welcome.css index 564ff918a..1c80e43b8 100644 --- a/src/components/Welcome/Welcome.css +++ b/src/components/Welcome/Welcome.css @@ -1 +1,15 @@ /* 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..38e5cf77e 100644 --- a/src/components/Welcome/Welcome.jsx +++ b/src/components/Welcome/Welcome.jsx @@ -3,3 +3,15 @@ // Create a Welcome function returning the HTML of welcome block // Add a default export statement for Welcome component to use it in the other files + +import './Welcome.css'; + +function Welcome() { + return ( +
+ Sticky Header! +
+ ); +} + +export default Welcome; From d97a100350eb2a9b6575bd0c0c3015f4bde45cef Mon Sep 17 00:00:00 2001 From: "g.palyukh" Date: Mon, 1 Jun 2026 14:28:44 +0200 Subject: [PATCH 2/2] fix issues --- src/App.css | 4 ++-- src/components/Article/Article.css | 10 +++++++--- src/components/Article/Article.jsx | 5 ----- src/components/Header/Header.css | 21 +++++++++++++-------- src/components/Header/Header.jsx | 5 ----- src/components/Navigation/Navigation.css | 10 +++++++--- src/components/Welcome/Welcome.css | 11 ++++++----- src/components/Welcome/Welcome.jsx | 6 ------ 8 files changed, 35 insertions(+), 37 deletions(-) diff --git a/src/App.css b/src/App.css index 76a2fb868..6e0a02de5 100644 --- a/src/App.css +++ b/src/App.css @@ -7,10 +7,10 @@ iframe { } html { + font-family: "Source Sans Pro", "Open Sans", Roboto, Arial, sans-serif; font-size: 10pt; - line-height: 1.4; font-weight: 400; - font-family: "Source Sans Pro", "Open Sans", Roboto, Arial, sans-serif; + line-height: 1.4; } body { diff --git a/src/components/Article/Article.css b/src/components/Article/Article.css index adff8e58a..123d03be6 100644 --- a/src/components/Article/Article.css +++ b/src/components/Article/Article.css @@ -1,10 +1,10 @@ -/* Put article styles here */ - .article { + max-width: 800px; 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; } @@ -14,10 +14,14 @@ color: #333; } + .article__paragraph:not(:first-child) { margin-top: 0.7em; } +.article__title { + margin: 0; +} @media (min-width: 500px) { .article { diff --git a/src/components/Article/Article.jsx b/src/components/Article/Article.jsx index 54ea91ca2..cfc37aa89 100644 --- a/src/components/Article/Article.jsx +++ b/src/components/Article/Article.jsx @@ -1,8 +1,3 @@ -// import a css file containig article styles - -// Create an Article function returning the HTML of article block - -// Add a default export statement for Article component to use it in the other files import './Article.css'; function Article() { diff --git a/src/components/Header/Header.css b/src/components/Header/Header.css index 8b6404ec9..7a35fb613 100644 --- a/src/components/Header/Header.css +++ b/src/components/Header/Header.css @@ -1,27 +1,32 @@ -/* 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; + left: 0; + + width: 100%; + padding: 1em; + + font-size: 140%; text-align: center; + + transition: opacity 0.2s ease-in-out; } .header__title { - font-weight: 600; display: inline; + margin: 0; padding: 0; + font-size: inherit; + font-weight: 600; } + @media (min-width: 500px) { .header { - text-align: left; display: flex; justify-content: space-between; + text-align: left; } } diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx index 7157dbed3..f715eae2f 100644 --- a/src/components/Header/Header.jsx +++ b/src/components/Header/Header.jsx @@ -1,8 +1,3 @@ -// import a css file containig header styles - -// Create a Header function returning the HTML of header block - -// Add a default export statement for Header component to use it in the other files import './Header.css'; import Navigation from '../Navigation/Navigation'; diff --git a/src/components/Navigation/Navigation.css b/src/components/Navigation/Navigation.css index a67620c16..0305d044a 100644 --- a/src/components/Navigation/Navigation.css +++ b/src/components/Navigation/Navigation.css @@ -1,10 +1,14 @@ .navigation__link { display: inline-block; - outline: none; - text-decoration: none; - opacity: 0.7; + padding: 0 0.5em; + color: black; + text-decoration: none; + + opacity: 0.7; + outline: none; + transition: opacity 0.2s ease-in-out; } diff --git a/src/components/Welcome/Welcome.css b/src/components/Welcome/Welcome.css index 1c80e43b8..c50b1ebc3 100644 --- a/src/components/Welcome/Welcome.css +++ b/src/components/Welcome/Welcome.css @@ -1,15 +1,16 @@ -/* Put welcome styles here */ .welcome { height: 100vh; background: coral; } .welcome__text { + display: block; + margin: 0; - font-size: 400%; - text-align: center; - line-height: 1; padding-top: calc(50vh - 20pt); - display: block; + + font-size: 400%; font-weight: 700; + line-height: 1; + text-align: center; } diff --git a/src/components/Welcome/Welcome.jsx b/src/components/Welcome/Welcome.jsx index 38e5cf77e..b7aa70a12 100644 --- a/src/components/Welcome/Welcome.jsx +++ b/src/components/Welcome/Welcome.jsx @@ -1,9 +1,3 @@ -// import a css file containig welcome styles - -// Create a Welcome function returning the HTML of welcome block - -// Add a default export statement for Welcome component to use it in the other files - import './Welcome.css'; function Welcome() {