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.

Sign up for GitHub

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 #4910

Closed
wants to merge 4 commits into from
Closed

Develop #4910

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b3acc6
create catalog
olga-wukelan Dec 7, 2024
e212602
change color
olga-wukelan Dec 7, 2024
f42d6e9
fix comments
olga-wukelan Dec 9, 2024
dd28bd6
update comments, body and h2
olga-wukelan Dec 9, 2024
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
10 changes: 5 additions & 5 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

Create an HTML page with a catalog. Develop semantic page structure as shown on [the mockup](https://www.figma.com/file/ojkArVazq7vsX0nbpn9CxZ/Moyo-%2F-Catalog-(ENG)?node-id=32249%3A354).

- use `Header`, `Stars` and `Card` blocks from previous tasks but rewrite them using BEM and SCSS
- use `Header`, `Stars` and `Card`blocks from previous tasks but rewrite them using BEM and SCSS
- remove old `data-qa` attributes
- add `data-qa="nav-hover"` (not just `hover`) to the 4th nav link for testing (`Laptops & computers`)
- add `data-qa="card"` to the first card
- add `data-qa="card-hover"` (not just `hover`) to the link `Buy` inside the first card
- nav links color is not `black` anymore (nav links should have `#060b35` color)
- add the class `is-active` to the first link (`Apple`) in the navigation
- use `<main>` tag for cards container
- use `<main>` tag for cards container
- use the grid for cards with different numbers of columns:
- 1 for the smaller screens
- 2 starting at `488px`
Expand All @@ -32,9 +32,9 @@ This is possible because [we use the Parcel library](https://en.parceljs.org/scs

## Checklist

❗️ Replace `<your_account>` with your GitHub username and copy the links to the `Pull Request` description:
- [DEMO LINK](https://<your_account>.github.io/layout_catalog/)
- [TEST REPORT LINK](https://<your_account>.github.io/layout_catalog/report/html_report/)
❗️ Replace `<your_account>`with your GitHub username and copy the links to the `Pull Request` description:
- [DEMO LINK](https://olga-wukelan.github.io/layout_catalog/)
- [TEST REPORT LINK](https://olga-wukelan.github.io/layout_catalog/report/html_report/)

❗️ Copy this `Checklist` to the `Pull Request` description after links, and put `- [x]` before each point after you checked it.

Expand Down
354 changes: 352 additions & 2 deletions src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<!doctype html>
<html lang="en">
<!-- #region head -->
<head>
<meta charset="UTF-8" />
<meta
Expand All @@ -17,11 +18,360 @@
/>
<link
rel="stylesheet"
href="styles/index.scss"
href="./index.scss"
/>
</head>
<!-- endregion -->

<body>
<h1>Catalog</h1>
<!-- #region header -->
<header class="header">
<a
href="#"
class="header__logo"
>
<img
src="./images/logo.png"
alt="Moyo Logo"
/>
</a>

<nav class="nav">
<ul class="nav__list">
<li class="nav__item">
<a
href="#"
class="is-active nav__link"
>
apple
</a>
</li>
<li class="nav__item">
<a
href="#"
class="nav__link"
>
samsung
</a>
</li>
<li class="nav__item">
<a
href="#"
class="nav__link"
>
smartphones
</a>
</li>
<li class="nav__item">
<a
href="#"
data-qa="nav-hover"
class="nav__link"
>
laptops & computers
</a>
</li>
<li class="nav__item">
<a
href="#"
class="nav__link"
>
gadgets
</a>
</li>
<li class="nav__item">
<a
href="#"
class="nav__link"
>
tablets
</a>
</li>
<li class="nav__item">
<a
href="#"
class="nav__link"
>
photo
</a>
</li>
<li class="nav__item">
<a
href="#"
class="nav__link"
>
video
</a>
</li>
</ul>
</nav>
</header>
<!-- #endregion -->
<main class="main">
<!-- #region card 1 -->
<div
class="card"
data-qa="card"
>
<img
class="card__image"
src="../src/images/imac.jpeg"
alt="imac"
/>
<h1 class="card__title">
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<h1 class="card__title">
<h2 class="card__title">

h1 is a title of the entire page

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

APPLE A1419 iMac 27" Retina 5K Monoblock (MNED2UA/A)
</h1>
<p class="card__code">Product code: 195434</p>
<!-- #region stars -->

<div class="card__reviews-block">
<div class="stars stars--4">
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
</div>
<p class="card__reviews">Reviews: 5</p>
</div>

<!-- #endregion -->
<div class="card__value">
<p class="card__price">Price:</p>
<p class="card__price-number">$2,199</p>
</div>
<button
class="card__button"
data-qa="card-hover"
>
buy
</button>
</div>
<!-- #endregion -->
<!-- #region card 2-->
<div class="card">
<img
class="card__image"
src="../src/images/imac.jpeg"
alt="imac"
/>
<h1 class="card__title">
APPLE A1419 iMac 27" Retina 5K Monoblock (MNED2UA/A)
</h1>
<p class="card__code">Product code: 195434</p>
<!-- #region stars -->

<div class="card__reviews-block">
<div class="stars stars--4">
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
</div>
<p class="card__reviews">Reviews: 5</p>
</div>

<!-- #endregion -->
<div class="card__value">
<p class="card__price">Price:</p>
<p class="card__price-number">$2,199</p>
</div>
<button class="card__button">buy</button>
</div>
<!-- #endregion -->
<!-- #region card 3-->
<div class="card">
<img
class="card__image"
src="../src/images/imac.jpeg"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
src="../src/images/imac.jpeg"
src="./images/imac.jpeg"

should work

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't forget to fix it
image

alt="imac"
/>
<h1 class="card__title">
APPLE A1419 iMac 27" Retina 5K Monoblock (MNED2UA/A)
</h1>
<p class="card__code">Product code: 195434</p>
<!-- #region stars -->

<div class="card__reviews-block">
<div class="stars stars--4">
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
</div>
<p class="card__reviews">Reviews: 5</p>
</div>

<!-- #endregion -->
<div class="card__value">
<p class="card__price">Price:</p>
<p class="card__price-number">$2,199</p>
</div>
<button class="card__button">buy</button>
</div>
<!-- #endregion -->
<!-- #region card 4-->
<div class="card">
<img
class="card__image"
src="../src/images/imac.jpeg"
alt="imac"
/>
<h1 class="card__title">
APPLE A1419 iMac 27" Retina 5K Monoblock (MNED2UA/A)
</h1>
<p class="card__code">Product code: 195434</p>
<!-- #region stars -->

<div class="card__reviews-block">
<div class="stars stars--4">
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
</div>
<p class="card__reviews">Reviews: 5</p>
</div>

<!-- #endregion -->
<div class="card__value">
<p class="card__price">Price:</p>
<p class="card__price-number">$2,199</p>
</div>
<button class="card__button">buy</button>
</div>
<!-- #endregion -->
<!-- #region card 5-->
<div class="card">
<img
class="card__image"
src="../src/images/imac.jpeg"
alt="imac"
/>
<h1 class="card__title">
APPLE A1419 iMac 27" Retina 5K Monoblock (MNED2UA/A)
</h1>
<p class="card__code">Product code: 195434</p>
<!-- #region stars -->

<div class="card__reviews-block">
<div class="stars stars--4">
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
</div>
<p class="card__reviews">Reviews: 5</p>
</div>

<!-- #endregion -->
<div class="card__value">
<p class="card__price">Price:</p>
<p class="card__price-number">$2,199</p>
</div>
<button class="card__button">buy</button>
</div>
<!-- #endregion -->
<!-- #region card 6-->
<div class="card">
<img
class="card__image"
src="../src/images/imac.jpeg"
alt="imac"
/>
<h1 class="card__title">
APPLE A1419 iMac 27" Retina 5K Monoblock (MNED2UA/A)
</h1>
<p class="card__code">Product code: 195434</p>
<!-- #region stars -->

<div class="card__reviews-block">
<div class="stars stars--4">
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
</div>
<p class="card__reviews">Reviews: 5</p>
</div>

<!-- #endregion -->
<div class="card__value">
<p class="card__price">Price:</p>
<p class="card__price-number">$2,199</p>
</div>
<button class="card__button">buy</button>
</div>
<!-- #endregion -->
<!-- #region card 7-->
<div class="card">
<img
class="card__image"
src="../src/images/imac.jpeg"
alt="imac"
/>
<h1 class="card__title">
APPLE A1419 iMac 27" Retina 5K Monoblock (MNED2UA/A)
</h1>
<p class="card__code">Product code: 195434</p>
<!-- #region stars -->

<div class="card__reviews-block">
<div class="stars stars--4">
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
</div>
<p class="card__reviews">Reviews: 5</p>
</div>

<!-- #endregion -->
<div class="card__value">
<p class="card__price">Price:</p>
<p class="card__price-number">$2,199</p>
</div>
<button class="card__button">buy</button>
</div>
<!-- #endregion -->
<!-- #region card 8-->
<div class="card">
<img
class="card__image"
src="../src/images/imac.jpeg"
alt="imac"
/>
<h1 class="card__title">
APPLE A1419 iMac 27" Retina 5K Monoblock (MNED2UA/A)
</h1>
<p class="card__code">Product code: 195434</p>
<!-- #region stars -->

<div class="card__reviews-block">
<div class="stars stars--4">
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
<div class="stars__star"></div>
</div>
<p class="card__reviews">Reviews: 5</p>
</div>

<!-- #endregion -->
<div class="card__value">
<p class="card__price">Price:</p>
<p class="card__price-number">$2,199</p>
</div>
<button class="card__button">buy</button>
</div>
<!-- #endregion -->
</main>
</body>
</html>
Loading
Loading