Skip to content

Develop #563

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

Closed
vladyslav-svorin wants to merge 3 commits into from
Closed

Develop #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28a1fd8
half work
May 30, 2026
ebfa28b
final
May 31, 2026
426649d
no autofill styles
Jun 1, 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 @@ -31,7 +31,7 @@ Check font styles. Use [Playfair Display](https://fonts.google.com/specimen/Play
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_2/).
[DEMO LINK](https://vladyslav-svorin.github.io/Museum_2/).
14. Copy `DEMO LINK` to the PR description.

> To update you PR repeat steps 7-11.
250 changes: 244 additions & 6 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,257 @@
<!-- #region head -->
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0"
name="viewport"
content="width=device-width, initial-scale=1.0"
/>
<title>Title</title>
<title>NAMU</title>
<link
rel="stylesheet"
href="src/styles/main.scss"
rel="stylesheet"
href="src/styles/main.scss"
/>
</head>
<!-- #endregion -->
<body>
<h1>Hello Mate Academy</h1>

<header id="header" class="header _header-foto">
<div class="header__container">

<div class="header__top top-menu">
<a href="#" class="top-menu__logo">
<img src="./src/images/NAMU.svg" alt="LOGO">
</a>
<div class="top-menu__icons icons-top-menu">
<a href="#menu" class="icons-top-menu__menu"></a>
<a href="#" class="icons-top-menu__language">UA</a>
</div>
</div>

<div class="header__main">
<div class="header__main__elements header-elements">
<div class="header-elements__date">10 серпня - 10 листопада</div>
<h1 class="header-elements__subject">Мистецтво ХІХ - ХХ ст.</h1>
<div class="header-elements__desription">Внесок українських митців у світову культуру 19-20ст</div>
</div>
<div class="header__button button">
<button onclick="location.href='#subscription'" type="button" class="button__item">Купити квиток</button>
</div>
</div>

<div class="header__bottom">
<div class="header__bottom__date">10.08 - 10.10</div>
</div>

</div>
</header>

<aside class="menu _header-foto" id="menu">
<div class="menu__container">

<div class="menu__top top-menu">
<a href="#" class="top-menu__logo">
<img src="./src/images/NAMU.svg" alt="LOGO">
</a>
<div class="top-menu__icons icons-top-menu">
<a href="#" class="icons-top-menu__close"></a>
<a href="#menu" class="icons-top-menu__language _visiable">UA</a>
</div>
</div>

<div class="menu__main">

<div class="menu__main__info info-menu">
<div class="info-menu__schedule">
<div class="info-menu__schedule__text">Розклад сьогодні:</div>
<div class="info-menu__schedule__value">12:00 - 19:00</div>
</div>
<div class="info-menu__address">
<div class="info-menu__address__text">Адреса:</div>
<div class="info-menu__address__value">Київ, вул. М. Грушевського, 6</div>
</div>
</div>

<nav class="menu__main__links links-menu">
<li class="links-menu__item">
<a href="#exhibitions" class="links-menu__link">Актуальні виставки</a>
</li>
<li class="links-menu__item">
<a href="#events" class="links-menu__link">Найближчі події</a>
</li>
<li class="links-menu__item">
<a href="#news" class="links-menu__link">Новини</a>
</li>
</nav>

<div class="menu__main__button button">
<button type="submit" class="button__item">Купити квиток</button>
</div>

</div>

</div>
</aside>

<main class="main">

<section id="exhibitions" class="actual-exhibitions __container">
<h2 class="actual-exhibitions__title">Актуальні виставки</h2>
<div class="actual-exhibitions__content article-block">
<article class="article-block__exhibition">
<div class="article-block__image _angel">
<img src="./src/images/angel.png" alt="angel">
</div>
<p class="article-block__date">11.07 - 22.09</p>
<h3 class="article-block__title">Кураторська виставка “Ангели”</h3>
<p class="article-block__description">Виставковий проект «Ангели» – знакова подія для української культури і водночас наймасштабніший...</p>
<div class="article-block__button button">
<button onclick="location.href='#subscription'" class="button__item">Купити квиток</button>
</div>
</article>
<article class="article-block__exhibition">
<div class="article-block__image">
<img src="./src/images/paint.png" alt="paint">
</div>
<p class="article-block__date">Діє постійно</p>
<h3 class="article-block__title">Мистецтво ХХ ст. — XXI ст.</h3>
<p class="article-block__description">Знакові роботи Алли Горської, Миколи Самокиша, Федора Кричевського та інших митців.</p>
<div class="article-block__button button">
<button onclick="location.href='#subscription'" class="button__item">Купити квиток</button>
</div>
</article>
</div>
<button class="actual-exhibitions__button empty-button">Архів виставок</button>
</section>

<section id="events" class="future-events __container">
<h2 class="future-events__title">Найближчі події</h2>
<div class="future-events__content article-block">
<article class="article-block__exhibition _future-events-block">
<div class="article-block__image">
<img src="./src/images/aman.png" alt="angel">
</div>
<div class="_future-events-block__main">
<p class="article-block__date">14.08 о 13:00</p>
<h3 class="article-block__title">Кураторські екскурсії від Павла Гудімова </h3>
<p class="article-block__description">Таємниці підготовки, історії експонатів, магія дійства до і в момент вашої присутності – розгортатиметься...</p>
<div class="article-block__button button">
<button onclick="location.href='#subscription'" class="button__item">Зареєструватись</button>
</div>
</div>
</article>
<article class="article-block__exhibition _future-events-block">
<div class="article-block__image">
<img src="./src/images/awoman.png" alt="paint">
</div>
<div class="_future-events-block__main">
<p class="article-block__date">16.08 о 13:00</p>
<h3 class="article-block__title">Майстер-клас “Подорож до Австралії”</h3>
<p class="article-block__description">Цієї неділі о 14:00 на арт-мандрівників чекає останній пункт кругосвітньої подорожі - Австралія.</p>
<div class="article-block__button button">
<button onclick="location.href='#subscription'" class="button__item">Зареєструватись</button>
</div>
</div>
</article>
</div>
<button class="future-events__button empty-button">Календар подій</button>
</section>

<section class="visit">
<div class="visit__content __container">
<h2 class="visit__title">Сплануйте <br> візит до музею</h2>
<p class="visit__text">
Оберіть зручний день, зареєструйтесь на події, що цікавлять, купіть квиток заздалегідь, щоб ніщо не завадило вам насолоджуватись мистецтвом.
</p>
<div class="visit__button button">
<button type="submit" class="button__item">Почати</button>
</div>
</div>
</section>

<section id="news" class="news __container">
<h2 class="news__title">Новини</h2>
<div class="news__content article-block">
<article class="article-block__exhibition">
<div class="article-block__image _angel">
<img src="./src/images/fotos.png" alt="fotos">
</div>
<p class="article-block__date">9 серпня 2019</p>
<h3 class="article-block__title">Оголошення переможця</h3>
<p class="article-block__description">Друзі, сьогодні п'ятниця! А це означає, що час оголосити переможця розіграшу...</p>
</article>
<article class="article-block__exhibition">
<div class="article-block__image">
<img src="./src/images/acat.png" alt="cat">
</div>
<p class="article-block__date">9 серпня 2019</p>
<h3 class="article-block__title">Міжнародний день котів</h3>
<p class="article-block__description">Музей з левами не може просто так взяти і пропустити Міжнародний день котів!</p>
</article>
</div>
<button class="news__button empty-button">Усі новини</button>
</section>

<section id="subscription" class="subscription __container">
<h2 class="subscription__title">Підпишіться на дайджест</h2>
<p class="subscription__text">Першими дізнавайтесь про новини музею та розіграші, отримуйте запрошення на події та читайте статті від кураторів</p>
<form action="" class="subscription__email">
<input type="email" name="email" placeholder="e-mail" id="" class="subscription__input" required>
<div class="subscription__button button">
<input type="submit" value="Підписатись" class="button__item">
</div>
</form>
</section>

</main>

<footer class="footer">
<div class="footer__content __container">
<div class="footer__main">
<div class="footer__contacts contacts-footer">
<h3 class="contacts-footer__title">Контакти</h3>
<div class="contacts-footer__text">
<p class="contacts-footer__address">Київ, <br> вул. М. Грушевського, 6</p>
<p class="contacts-footer__phone">тел. 278-13-57, 278-74-54</p>
<a href="email:info@namu.kiev.ua" class="contacts-footer__email">info@namu.kiev.ua</a>
</div>
<div class="contacts-footer__icons icons-footer">
<a href="#" class="icons-footer_icon icons-footer__facebook"></a>
<a href="#" class="icons-footer_icon icons-footer__twitter"></a>
<a href="#" class="icons-footer_icon icons-footer__telegram"></a>
<a href="#" class="icons-footer_icon icons-footer__instagram"></a>
</div>
</div>
<div class="footer__schedule schedule-footer">
<h3 class="schedule-footer__title">Розклад роботи</h3>
<p class="schedule-footer__text">
ПН: вихідний<br>
ВТ: вихідний<br>
СР: 10:00 - 17:00 <br>
ЧТ: 10:00 - 17:00 <br>
ПТ: 12:00 - 19:00 <br>
СБ: 11:00 - 18:00 <br>
НД: 10:00 - 17:00 <br>
</p>
</div>
<div class="footer__nav nav-footer">
<h3 class="nav-footer__title">Головна</h3>
<div class="nav-footer__links">
<a href="#exhibitions" class="nav-footer__link">Виставки</a>
<a href="#events" class="nav-footer__link">Події</a>
<a href="#news" class="nav-footer__link">Новини</a>
</div>
</div>
</div>
<div class="footer__bottom bottom-footer">
<div class="bottom-footer__years">© 2010 — 2020</div>
<div class="bottom-footer__privacy">Privacy — Terms</div>
<a href="#header" class="bottom-footer__arrow"></a>
</div>
</div>
</footer>

<script 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
6 changes: 6 additions & 0 deletions src/images/NAMU.svg
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.
3 changes: 3 additions & 0 deletions src/images/UA.svg
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/acat.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/aman.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/angel.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.
3 changes: 3 additions & 0 deletions src/images/arrow.svg
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/awoman.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.
4 changes: 4 additions & 0 deletions src/images/close.svg
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.
3 changes: 3 additions & 0 deletions src/images/facebook.svg
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/fotos.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.
3 changes: 3 additions & 0 deletions src/images/instagram.svg
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/main-boy.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/main-women.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