Skip to content
Open

Develop #2749

Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/backstop_data
/dist
/node_modules
29 changes: 29 additions & 0 deletions .github/workflows/test.yml-template
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
20 changes: 10 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# IDE
.idea
.vscode
build
dist

# Node
node_modules
.DS_Store

npm-debug.log*
yarn-debug.log*
yarn-error.log*
# MacOS
.DS_Store

raw_reports
reports
cypress/screenshots
cypress/videos
# Generated files
backstop_data
dist
.cache
.parcel-cache
225 changes: 223 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
name="viewport"
content="width=device-width, initial-scale=1.0"
/>
<title>Miami</title>
<title>The Met</title>
<link
rel="stylesheet"
href="src/styles/main.scss"
Expand All @@ -15,8 +15,229 @@
src="src/scripts/main.js"
defer
></script>
<link href="https://fonts.googleapis.com/css2?family=Cinzel:wght@400..900&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@100;300;400;500;700;900&display=swap" rel="stylesheet">
<link rel="icon" href="src/images/logo.svg">
</head>
<body>
<h1>Miami</h1>
<header class="header">
<h1 class="title">
Welcome
<br>
to the Met
</h1>
</header>
<main class="main">
<section class="hours">
<div class="hours--left">
<div class="main__font main__font--highlight main__font--highlight-small">

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Typical BEM Mistakes: Using an Element Inside Another Block

Plan your visit
</div>
<h2 class="title title--secondary title--secondary-left">
Museum hours
</h2>
</div>
<div class="hours--right">

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Typical BEM Mistakes: Using a Modifier Without the Belonging Class

<div class="hours--right-location">
<h3 class="title title--tertiary title--tertiary-black_left">
The Met Fifth Avenue
</h3>
<div class="hours--right-schedule">
<ul class="hours--right-schedule-list">
<li class="main__font main__font--bold">10 AM - 5 PM</li>
<li class="main__font main__font--bold">10 AM - 9 PM</li>
<li class="main__font main__font--bold">Closed</li>
</ul>
<ul class="hours--right-schedule-list">
<li class="main__font">Sun, Mon, Tue, Thu</li>
<li class="main__font">Fri, Sat</li>
<li class="main__font">Wen</li>
</ul>
</div>
<div>
<div class="main__font main__font--bold">
Closed on
</div>
<div class="main__font">
Thanksgiving Day, Dec 25, Jan 1 and the first Monday in May.
</div>
</div>
</div>
<div class="hours--right-location">
<h3 class="title title--tertiary title--tertiary-black_left">
The Met Cloisters
</h3>
<div class="hours--right-schedule">
<ul class="hours--right-schedule-list">
<li class="main__font main__font--bold">10 AM - 4.30 PM</li>
<li class="main__font main__font--bold">Closed</li>
</ul>
<ul class="hours--right-schedule-list">
<li class="main__font">Thu-Tue</li>
<li class="main__font">Wen</li>
</ul>
</div>
<div>
<div class="main__font main__font--bold">
Closed on
</div>
<div class="main__font">
Thanksgiving Day, Dec 25, Jan 1
</div>
</div>
</div>
</div>
</section>
<section class="section">
<div>
<h2 class="title title--secondary main__margin--8px">
Now on view
</h2>
<p class="main__font main__font--center">
Explore exhibition gallery guides, videos, articles, and more.
</p>
</div>
<div>
<div class="pictures main__margin--24px">
<img src="src/images/photos/Old_Masters_1.png" class="pictures__item pictures__item--double-left" alt="">
<img src="src/images/photos/Old_Masters_2.png" class="pictures__item" alt="">
</div>
<p class="main__font main__font--highlight">
A New Look at Old Masters
</p>
<p class="main__font">
December 12, 2020 – Through Spring 2023
</p>
</div>
<div>
<div class="pictures main__margin--24px">
<img src="src/images/photos/Bodhisattvas_1.png" class="pictures__item" alt="">
<img src="src/images/photos/Bodhisattvas_2.png" class="pictures__item" alt="">
<img src="src/images/photos/Bodhisattvas_3.png" class="pictures__item" alt="">
</div>
<p class="main__font main__font--highlight">
Bodhisattvas of Wisdom, Compassion, and Power
</p>
<p class="main__font">
March 27, 2021 – October 30, 2022
</p>
</div>
<div>
<div class="pictures main__margin--24px">
<img src="src/images/photos/Disney_1.png" class="pictures__item" alt="">
<img src="src/images/photos/Disney_2.png" class="pictures__item pictures__item--double-right" alt="">
</div>
<p class="main__font main__font--highlight">
Inspiring Walt Disney: The Animation of French Decorative Arts
</p>
<p class="main__font">
December 10, 2021 – March 6, 2022
</p>
</div>
<a href="#" class="button main__font main__font--bold">
View all exhibitions
</a>
</section>
<section class="section">
<h2 class="title title--secondary">
More to Explore Online
</h2>
<div class="pictures">
<a href="#" class="link">
<img src="src/images/photos/explore_online_1.png" class="pictures__item main__margin--32px" alt="">
<h3 class="title title--tertiary title--tertiary-red_center main__margin--4px">
Collection Areas
</h3>
<p class="main__font main__font--explore">
These collection areas study, exhibit, and care for the objects in The Met collection.
</p>
</a>
<a href="#" class="link">
<img src="src/images/photos/explore_online_2.png" class="pictures__item main__margin--32px" alt="">
<h3 class="title title--tertiary title--tertiary-red_center main__margin--4px">
Travel
</h3>
<p class="main__font main__font--explore">
Travel with The Met connects the Museum's wide
and diverse audience to art, inspiration, and historical perspective.
</p>
</a>
<a href="#" class="link">
<img src="src/images/photos/explore_online_3.png" class="pictures__item main__margin--32px" alt="">
<h3 class="title title--tertiary title--tertiary-red_center main__margin--4px">
Virtual group tours
</h3>
<p class="main__font main__font--explore">
Request a guided tour, reserve admission
and lead your own small group, or request a live
virtual tour led by a Museum guide.
</p>
</a>
</div>
</section>
<section class="section">
<h2 class="title title--secondary">
Contact us
</h2>
<contact class="contact">
<address class="contact--address main__font">
<div class="contact--location">
<p>
<span class="main__font main__font--bold">The Met Fifth Avenue</span>
</p>
<p>
Phone<br>
<span class="main__font main__font--bold">+1 212-535-7710</span>
</p>
<p>
Address<br>
<span class="main__font main__font--bold">
1000 Fifth Avenue<br>
New York, NY 10028
</span>
</p>
</div>
<div class="contact--location">
<p>
<span class="main__font main__font--bold">The Met Cloisters</span>
</p>
<p>
Phone<br>
<span class="main__font main__font--bold">+1 212-923-3700</span>
</p>
<p>
Address<br>
<span class="main__font main__font--bold">
99 Margaret Corbin Drive<br>
Fort Tryon Park<br>
New York, NY 10040
</span>
</p>
</div>
</address>
<form class="contact--form">
<div class="contact--form__item">
<label for="name" class="contact--form__label">Name</label>
<input id="name" class="contact--form__input main__font main__font--form"
type="text" placeholder="Name">
</div>
<div class="contact--form__item">
<label for="email" class="contact--form__label">Email</label>
<input id="email" class="contact--form__input main__font main__font--form"
type="email" placeholder="Email">
</div>
<div class="contact--form__item">
<label for="message" class="contact--form__label">Message</label>
<textarea id="message" class="contact--form__textarea main__font main__font--form"
placeholder="Message"></textarea>
</div>
<input type="submit" value="Send"
class="button button__form main__font main__font--bold">
</form>
</contact>
</section>
</main>
<footer class="footer">
</footer>
</body>
</html>
8 changes: 4 additions & 4 deletions package-lock.json

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
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@linthtml/linthtml": "^0.9.6",
"@mate-academy/bemlint": "latest",
"@mate-academy/linthtml-config": "latest",
"@mate-academy/scripts": "^2.1.2",
"@mate-academy/scripts": "^2.1.3",
"@mate-academy/stylelint-config": "latest",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
Expand Down
Binary file removed src/fonts/Roboto-Regular-webfont.woff
Binary file not shown.
10 changes: 10 additions & 0 deletions src/images/burger_menu.svg
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/close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions src/images/cross.svg

This file was deleted.

3 changes: 0 additions & 3 deletions src/images/crown.svg

This file was deleted.

Binary file removed src/images/favicon.png
Binary file not shown.
Binary file added src/images/footer.png
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.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/images/logo.png
Binary file not shown.
3 changes: 3 additions & 0 deletions src/images/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading