Skip to content

Develop #725

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
polina3107 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Develop #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0eccb72
Added header and menu
polina3107 Jun 12, 2026
acd5846
Added section 'Events'
polina3107 Jun 12, 2026
75842d4
Added 'Lecture' block
polina3107 Jun 16, 2026
349b59f
Added gallery
polina3107 Jun 17, 2026
8355026
Added subscription
polina3107 Jun 17, 2026
fa70aea
Added footer and minor fixes
polina3107 Jun 23, 2026
74b4f9f
Added fixes
polina3107 Jun 24, 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://polina3107.github.io/Museum/).
14. Copy `DEMO LINK` to the PR description.

> To update you PR repeat steps 7-11.
253 changes: 251 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,263 @@
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="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:ital,wght@0,100..700;1,100..700&family=Montserrat:ital,wght@0,100..900;1,100..900&display=swap" rel="stylesheet">

<link rel="icon"
href="src/images/header/logo.svg"
type="image/svg+xml">
</head>
<body>
<h1>Hello Mate Academy</h1>
<header class="header">
<a href="#menu" class="header__menu">
<img src="src/images/header/menu.svg" alt="Menu button">
</a>
<div class="header__image">
<a href="#" class="header__logo">
<img
class="header__hover"
src="src/images/header/logo.svg"
alt="Museum logo"
>
</a>
</div>
<h1 class="header__title">ХУДОЖНІЙ МУЗЕЙ</h1>
<a href="#form" class="header__tickets">
<p class="header__text">КВИТКИ</p>
<span class="header__button"></span>
</a>
<a href="#events" class="header__mini-btn">ПОДІЇ</a>
</header>

<aside class="menu" id="menu">
<a href="#" class="menu__close">
<img src="src/images/header/close.svg" alt="Close menu">
</a>
<nav class="menu__nav">
<ul class="menu__list">
<li class="menu__item"><a href="#gallery" class="menu__link">Галерея</a></li>
<li class="menu__item"><a href="#events" class="menu__link">Виставки та <br> події</a></li>
<li class="menu__item"><a href="#form" class="menu__link">Про Нас</a></li>
<li class="menu__item"><a href="#contacts" class="menu__link">Контакти</a></li>
</ul>
</nav>
<div class="menu__table">
<div class="menu__table__wrapper">
<p class="menu__table__title">Графік роботи</p>
<ul class="menu__table__list">
<li class="menu__table__item"><span class="menu__bold">12:00 — 20:00</span> середа</li>
<li class="menu__table__item"><span class="menu__bold">12:00 — 20:00</span> четвер</li>
<li class="menu__table__item"><span class="menu__bold">12:00 — 20:00</span> п’ятниця</li>
<li class="menu__table__item"><span class="menu__bold">11:00 — 19:00</span> субота</li>
<li class="menu__table__item"><span class="menu__bold">11:00 — 19:00</span> неділя</li>
</ul>
</div>
<p class="menu__table__text"><span class="menu__bold">Вихідні:</span> понеділок, вівторок <br> Каса припиняє роботу за 1 годину до закриття музею</p>
</div>
</aside>

<main class="main">
<section class="events" id="events">
<h2 class="events__title">Актуальні події</h2>
<div class="events__container">
<img
src="src/images/events/event1.png"
alt="Event1 image"
class="events__image"
>
<div class="events__descr">
<div class="events__group">
<p class="events__type">ВИСТАВКА</p>
<p class="events__date">26.08-29.11.2019</p>
</div>
<div class="events__element">
<p class="events__name">Йду і повертаюсь</p>
<div class="events__square"></div>
</div>
<p class="events__text">Національний Художній Музей України презентує унікальну частину колекції Градобанку - українське мистецтво другої половини 1980-1995 років.</p>
</div>
</div>
<div class="events__container events__container--gap">
<img
src="src/images/events/event2.png"
alt="Event2 image"
class="events__image"
>
<div class="events__descr">
<div class="events__group">
<p class="events__type">ВИСТАВКА</p>
<p class="events__date">26.08-29.11.2019</p>
</div>
<div class="events__element">
<p class="events__name">І спогади і мрії</p>
<div class="events__square"></div>
</div>
<p class="events__text">Національний художній музей України до 100 річчя від дня народження видатної української художниці Тетяни Яблонської відкриває ретроспективну ювілейну виставку «І спогади і мрії».</p>
</div>
</div>
</section>

<section class="lecture">
<img
src="src/images/events/lecture.png"
alt="Lecture image"
class="lecture__image"
>
<div class="lecture__descr">
<div class="lecture__group">
<p class="lecture__type">ЛЕКЦІЯ</p>
<p class="lecture__date">26/08/2019 - 11:00</p>
</div>
<p class="lecture__name">Від класицизму до <br> романтизму</p>
</div>
</section>

<section class="gallery" id="gallery">
<h2 class="gallery__title">Галерея</h2>
<div class="gallery__group">
<div class="gallery__top-group gallery__slide">
<img src="src/images/gallery/1.png"
alt="Gallery photo"
class="gallery__image gallery__image--1 slide-image block"
>
<img src="src/images/gallery/2.png"
alt="Gallery photo"
class="gallery__image gallery__image--sl slide-image"
>
<img src="src/images/gallery/tablet.png"
alt="Gallery photo"
class="gallery__image gallery__image--sl slide-image"
>
<img src="src/images/gallery/4.png"
alt="Gallery photo"
class="gallery__image gallery__image--sl slide-image"
>
</div>
<div class="gallery__bottom-group">
<img src="src/images/gallery/1.png"
alt="Gallery photo"
class="gallery__image gallery__image--1 gallery__image--11"
>
<img src="src/images/gallery/2.png"
alt="Gallery photo"
class="gallery__image gallery__image--2"
>
<img src="src/images/gallery/3.png"
alt="Gallery photo"
class="gallery__image gallery__image--3"
>
<img src="src/images/gallery/4.png"
alt="Gallery photo"
class="gallery__image gallery__image--4"
>
</div>
</div>
<div class="gallery__slider"></div>
</section>

<section class="sub" id="form">
<h2 class="sub__title">Підписка</h2>
<p class="sub__descr">Бути в курсі всіх актуальних подій та останніх новин.</p>
<form class="sub__form" onsubmit="this.reset(); return false;">
<input
type="email"
placeholder="E-mail"
class="sub__input"
name="email"
required
>
<button class="sub__btn"></button>
</form>
</section>
</main>
<footer class="footer" id="contacts">
<div class="footer__top-group">
<div class="footer__images">
<a href="#" class="footer__logo-link">
<img
src="src/images/header/logo.svg"
alt="Logo"
class="footer__image"
>
</a>
<div class="footer__icons">
<a
href="https://www.facebook.com"
class="footer__facebook-link"
target="_blank"
>
<img
src="src/images/footer/facebook.svg"
alt="Facebook icon"
class="footer__facebook-icon"
>
</a>
<a
href="https://www.instagram.com"
class="footer__insta-link"
target="_blank"
>
<img
src="src/images/footer/insta.svg"
alt="Insta logo"
class="footer__insta-icon"
>
</a>
</div>
</div>
<div class="footer__table">
<p class="footer__table__title">Графік роботи</p>
<ul class="footer__table__list">
<li class="footer__table__item"><span class="footer__bold">12:00 — 20:00</span> середа</li>
<li class="footer__table__item"><span class="footer__bold">12:00 — 20:00</span> четвер</li>
<li class="footer__table__item"><span class="footer__bold">12:00 — 20:00</span> п’ятниця</li>
<li class="footer__table__item"><span class="footer__bold">11:00 — 19:00</span> субота</li>
<li class="footer__table__item"><span class="footer__bold">11:00 — 19:00</span> неділя</li>
</ul>
<br>
<p class="footer__table__text"> Вихідні: понеділок, вівторок <br> Каса припиняє роботу за 1 годину до закриття музею</p>
</div>
<div class="footer__contacts">
<p class="footer__contacts__title">Контакти:</p>
<p class="footer__contacts__descr">
<a href="https://share.google/tMXcdWXhbrQC3ZGgC"
class="footer--a"
target="_blank"
>вул. М. Грушевського, 6; <br> Київ, 01001 </a><br>
<a href="tel:+380442781357" class="footer--a">тел. +38 (044) 278-13-57 </a><br>
<a href="tel:+380442787454" class="footer--a">факс +38 (044) 278-74-54 </a><br>
<a href="mailto:info@namu.kiev.ua" class="footer--a">e-mail: info@namu.kiev.ua</a>
</p>
</div>
<a href="#" class="footer__up"></a>
<div class="footer__line"></div>
</div>
<div class="footer__bottom-group">
<nav class="footer__nav">
<ul class="footer__list">
<div class="footer__div1">
<li class="footer__item footer__item--mod"><a href="#gallery" class="footer__link">Галерея</a></li>
<li class="footer__item"><a href="#events" class="footer__link">Виставки та події</a></li>
</div>
<div class="footer__div2">
<li class="footer__item footer__item--mod"><a href="#form" class="footer__link">Про Нас</a></li>
<li class="footer__item"><a href="#contacts" class="footer__link">Контакти</a></li>
</div>
</ul>
</nav>
</div>
<div class="footer__copyright">
<p class="footer__copyright__par">Designed by Zhyriada Marina</p>
<p class="footer__copyright__par">Copyright © 2019. All Rights Reserved.</p>
</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
Binary file added src/images/events/event1.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/events/event2.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/events/lecture.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/footer/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.
12 changes: 12 additions & 0 deletions src/images/footer/insta.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/footer/up.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/gallery/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/gallery/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/gallery/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/gallery/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.
6 changes: 6 additions & 0 deletions src/images/gallery/slider.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/gallery/tablet.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/header/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.
10 changes: 10 additions & 0 deletions src/images/header/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.
Binary file added src/images/header/header-bg.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/header/logo.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.
10 changes: 10 additions & 0 deletions src/images/header/menu.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/sub/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/sub/sub-bg.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