Skip to content

fixed-lint-error #717

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

Open
notbelievable wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fixed-lint-error #717

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
848986d
fixed-lint-error
notbelievable May 26, 2026
ae8f8fb
add-background-wrap_change-name-img_add-footer-links
notbelievable May 26, 2026
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
29 changes: 29 additions & 0 deletions .github/workflows/test.yml-template
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Check font styles. Use [IBM Plex Sans](https://fonts.google.com/specimen/IBM+Ple
11. `git push origin develop` - to send you code for PR.
12. Create a Pull Request (PR) from your branch `develop` to branch `master` of original repo.
13. Replace `<your_account>` with your Github username in the
[DEMO LINK](https://<your_account>.github.io/Museum/).
[DEMO LINK](https://notbelievable.github.io/Museum/).
14. Copy `DEMO LINK` to the PR description.

> To update you PR repeat steps 7-11.
281 changes: 276 additions & 5 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,290 @@
<!doctype html>
<html lang="en">
<html lang="en" class="html">
<head>
<meta charset="UTF-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0"
/>
<title>Title</title>
<title>Museum</title>
<link
rel="stylesheet"
href="src/styles/main.scss"
/>
<link rel="icon" href="./src/images/NA MU.png">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Jura:[email protected]&family=Montserrat:ital,wght@0,100..900;1,100..900&family=Open+Sans:ital,wght@0,300..800;1,300..800&family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Roboto:ital,wght@0,500;1,500&family=Space+Grotesk:[email protected]&family=Space+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap" rel="stylesheet">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:ital,wght@0,100..700;1,100..700&family=Jura:[email protected]&family=Montserrat:ital,wght@0,100..900;1,100..900&family=Open+Sans:ital,wght@0,300..800;1,300..800&family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Roboto:ital,wght@0,500;1,500&family=Space+Grotesk:[email protected]&family=Space+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap" rel="stylesheet">
</head>
<body>
<h1>Hello Mate Academy</h1>
<script src="src/scripts/main.js"></script>
<body class="body">
<header class="header">
<button class="header__menu-open menu-btn"></button>
<a
class="header__logo"
href="#">
<img
class="header__logo-img"
src="./src/images/NA MU.png"
alt="logo-icon">
</a>
<div class="header__placeholder"></div>
</header>

<main class="main">
<section class="art-museum">
<div class="art-museum__images">
<img
class="art-museum__img"
src="./src/images/Natsionalnij-hudozhnij-muzej-Ukrayini-Kiyiv-10-1800x1200.png" alt="museum-img">
</div>
<div class="art-museum__item">
<h1 class="art-museum__title">ХУДОЖНІЙ МУЗЕЙ</h1>
<a
class="art-museum__btn-ticket"
href="#current-events">
<span class="art-museum__btn-text">КВИТКИ</span>
<span class="art-museum__btn-arrow">
<img src="./src/images/arrow1.png" alt="arrow-img">
</span>
</a>
<img
class="art-museum__podii"
src="./src/images/Group 30.png"
alt="icon-podii">
</div>
</section>

<section class="current-events" id="current-events">
<h2 class="current-events__title">Актуальні події</h2>

<div class="current-events__card">
<div class="current-events__image">
<img
class="current-events__img"
src="./src/images/Rectangle 2.1.png" alt="current-events-img">
</div>
<div class="current-events__description">
<p class="current-events__insert insert">
ВИСТАВКА
<span class="current-events__date date">26.08-29.11.2019</span>
</p>

<h3 class="current-events__name">Йду і повертаюсь
<img
class="current-events__icon"
src="./src/images/Rectangle 23.4.png" alt="squre-icon">
</h3>
<p class="current-events__text">
Національний Художній Музей України презентує унікальну
частину колекції Градобанку - українське мистецтво другої
половини 1980-1995 років.
</p>
</div>
</div>

<div class="current-events__card">
<div class="current-events__image">
<img
class="current-events__img"
src="./src/images/Rectangle 4.3.png" alt="current-events-img">
</div>
<div class="current-events__description">
<p class="current-events__insert insert">ВИСТАВКА
<span class="current-events__date date">26.08-29.11.2019</span>
</p>
<h3 class="current-events__name">І спогади і мрії
<img
class="current-events__icon"
src="./src/images/Rectangle 23.4.png" alt="squre-icon">
</h3>
<p class="current-events__text">
Національний художній музей України до 100 річчя
від дня народження видатної української художниці
Тетяни Яблонської відкриває ретроспективну ювілейну
виставку «І спогади і мрії».
</p>
</div>
</div>
</section>

<section class="from-cl-to-rom">
<div class="from-cl-to-rom__image">
</div>

<div class="from-cl-to-rom__item">
<p class="from-cl-to-rom__insert insert">
ЛЕКЦІЯ
<span class="from-cl-to-rom__date date">26/08/2019 - 11:00</span>
</p>
<h2 class="from-cl-to-rom__title">Від класицизму до романтизму</h2>
</div>
</section>

<section class="gallery" id="gallery">
<h2 class="gallery__title">Галерея</h2>
<div class="gallery__slider">
<div class="gallery__wrapper">
<img
class="gallery__img"
src="./src/images/gal1.png" alt="img">
<img
class="gallery__img"
src="./src/images/gal2.png" alt="img">
<img
class="gallery__img"
src="./src/images/gal3.png" alt="img">
<img
class="gallery__img"
src="./src/images/gal4.png" alt="img">
</div>

<div class="gallery__scroll">
<span class="gallery__scroll-dot"></span>
<span class="gallery__scroll-dot"></span>
<span class="gallery__scroll-dot"></span>
<span class="gallery__scroll-dot"></span>
</div>
</div>
</section>

<section class="subscription" id="subscription">
<div class="subscription__title">Підписка</div>
<p class="subscription__text">Бути в курсі всіх актуальних подій та останніх новин.</p>
<form
class="subscription__form">
<label for="email" class="form__label"></label>
<input
class="form__input"
type="email"
name="email"
id="email"
placeholder="E-mail"
required>

<button
type="submit"
class="form__btn"><img src="./src/images/Vector 2.png" alt="form-btn"></button>
</form>
</section>
</main>

<footer class="footer">
<div class="footer__item">
<a
class="footer__logo-link"
href="#">
<img
class="footer__logo-img"
src="./src/images/NA MU.png" alt="namu-logo">
</a>

<div class="footer__social">
<a href="https://www.facebook.com/?locale=ru_RU"
target="_blank"
class="footer__social-website">
<img
class="footer__social-img"
src="./src/images/facebook-letter-logo.png"
alt="facebook">
</a>
<a href="https://www.instagram.com/"
target="_blank"
class="footer__social-website">
<img
class="footer__social-img"
src="./src/images/instagram (3).png"
alt="facebook">
</a>
</div>
</div>

<div class="footer__schedule">
<div class="footer__schedule-container">
<h4 class="footer__text text">Графік роботи</h4>

<ul class="footer__hours-list hours-list">
<li class="footer__hours-time hours-time"><span class="menu__time time">12:00 — 20:00</span> середа</li>
<li class="footer__hours-time hours-time"><span class="menu__time time">12:00 — 20:00</span> четвер</li>
<li class="footer__hours-time hours-time"><span class="menu__time time">12:00 — 20:00</span> п’ятниця</li>
<li class="footer__hours-time hours-time"><span class="menu__time time">11:00 — 19:00</span> субота</li>
<li class="footer__hours-time hours-time"><span class="menu__time time">11:00 — 19:00</span> недiля</li>
</ul>

<div class="footer__day-off day-off">
<p class="footer__warning warning-text">
<span class="footer__warning-text warning-text">Вихідні:</span> понеділок, вівторок <br>
Каса припиняє роботу за 1 годину
до закриття музею
</p>
</div>
</div>

<div class="footer__contact-us" id="contact-us">
<p class="footer__contact-text">
<span class="footer__contact-info">Контакти:</span>
вул. М. Грушевського, 6;
Київ, 01001 <br>
тел. +38 (044) 278-13-57 <br>
факс +38 (044) 278-74-54 <br>
e-mail: [email protected]
</p>
</div>

<a href="#" class="footer__btn-up">
<img
class="footer__btn-img"
src="./src/images/Vector 3.png"
alt="vector-icon">
</a>
</div>

<div class="footer__nav">
<a href="#gallery" class="footer__nav-link nav__link">Галерея</a>
<a href="#subscription" class="footer__nav-link nav__link">Про Нас</a>
<a href="#current-events" class="footer__nav-link nav__link">Виставки та події</a>
<a href="#contact-us" class="footer__nav-link nav__link">Контакти</a>
</div>

<div class="footer__copyright">
<p class="footer__copyright-text">Designed by Zhyriada Marina</p>
<p class="footer__copyright-text">Copyright © 2019. All Rights Reserved.</p>
</div>
</footer>

<div class="asside">
<div class="menu__nav">
<button class="asside__menu-close menu-btn"></button>
<a href="#gallery" class="menu__link nav__link">Галерея</a>
<a href="#subscription" class="menu__link nav__link">Про Нас</a>
<a href="#current-events" class="menu__link nav__link">Виставки та<br>події</a>
<a href="#contact-us" class="menu__link nav__link">Контакти</a>
</div>

<div class="menu__container">
<div class="menu__schedule schedule">
<h4 class="menu__text text">Графік роботи</h4>

<ul class="menu__hours-list hours-list">
<li class="menu__hours-time hours-time"><span class="menu__time time">12:00 — 20:00</span> середа</li>
<li class="menu__hours-time hours-time"><span class="menu__time time">12:00 — 20:00</span> четвер</li>
<li class="menu__hours-time hours-time"><span class="menu__time time">12:00 — 20:00</span> п’ятниця</li>
<li class="menu__hours-time hours-time"><span class="menu__time time">11:00 — 19:00</span> субота</li>
<li class="menu__hours-time hours-time"><span class="menu__time time">11:00 — 19:00</span> недiля</li>
</ul>
</div>

<div class="menu__day-off day-off">
<p class="menu__warning warning">
<span class="menu__warning-text warning-text">Вихідні:</span> понеділок, вівторок <br>
Каса припиняє роботу за 1 годину
до закриття музею
</p>
</div>
</div>
</div>
<script type="module" src="./src/scripts/main.js"></script>
</body>
</html>
9 changes: 5 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@mate-academy/eslint-config": "latest",
"@mate-academy/jest-mochawesome-reporter": "^1.0.0",
"@mate-academy/linthtml-config": "latest",
"@mate-academy/scripts": "^2.1.1",
"@mate-academy/scripts": "^2.1.3",
"@mate-academy/stylelint-config": "latest",
"cypress": "^13.13.0",
"eslint": "^8.57.0",
Expand Down
Binary file added src/images/Close.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/Group 30.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/NA MU.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/Natsionalnij-hudozhnij-muzej-Ukrayini-Kiyiv-10-1800x1200.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/Rectangle 2.1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/Rectangle 20.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/Rectangle 22.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/Rectangle 23.4.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/Rectangle 4.3.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/Vector 2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/Vector 3.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/Vector.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/arrow1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/facebook-letter-logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/gal1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/gal2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/gal3.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/gal4.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/instagram (3).png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/slider.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading