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

report: celebrate your all 100's #5455

Merged
merged 18 commits into from
Jan 11, 2019
Merged

report: celebrate your all 100's #5455

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
38943d9
report: celebrate your all 100's
paulirish Jun 8, 2018
903fb09
fireworks even if you're testing one category (and it scores 100)
paulirish Jun 8, 2018
934e6da
pause on click per @hwikyounglee
paulirish Jun 8, 2018
0ffc453
driveby: fix exception when scrolling a solocat non-devtools
paulirish Jun 8, 2018
218cadc
fix extra 2px of space under lighthouse svg
paulirish Jun 8, 2018
ca6f7ca
make header 11px shorter. same LH size.
paulirish Jun 8, 2018
d28370a
dark blue sky for the fireworks
paulirish Jun 8, 2018
02f83e0
Made metadata + product info text white on the header when scrolled d…
exterkamp Sep 28, 2018
1190cce
Delayed start of animation to after gauges animate.
exterkamp Oct 1, 2018
221639a
Merge branch 'master' into fireworks
exterkamp Oct 1, 2018
4234ceb
Merge branch 'master' into fireworks
exterkamp Nov 6, 2018
e04d281
Added report-renderer-test for coverage.
exterkamp Nov 6, 2018
3a94450
Merge branch 'master' into fireworks
exterkamp Jan 4, 2019
60a97bf
Add lighthouse beam hue-rotation animation!
exterkamp Jan 10, 2019
7ea2db5
Add beam color test.
exterkamp Jan 10, 2019
fa02564
Merge branch 'master' into fireworks
exterkamp Jan 10, 2019
5dad698
Deferring party-lights until later :'(
exterkamp Jan 10, 2019
4a68ab2
Remove party -beam tests.
exterkamp Jan 10, 2019
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: 10 additions & 0 deletions lighthouse-core/report/html/renderer/report-renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,16 @@ class ReportRenderer {
categories.appendChild(renderer.render(category, report.categoryGroups));
}

// Fireworks
const scoresAll100 = report.reportCategories.every(cat => cat.score === 1);
if (scoresAll100) {
headerContainer.classList.add('score100');
this._dom.find('.lh-header', headerContainer).addEventListener('click', _ => {
headerContainer.classList.toggle('fireworks-paused');
});
this._dom.find('#animate-hue-rotate', headerContainer).setAttribute('begin', '1s');
}

if (scoreHeader) {
const defaultGauges = [];
const customGauges = [];
Expand Down
10 changes: 6 additions & 4 deletions lighthouse-core/report/html/renderer/report-ui-features.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,12 @@ class ReportUIFeatures {
scoreShadow.style.transform = `scaleY(${1 - scrollPct * 0.2})`;

// Fade & move the scorescale
const scoreScalePositionDelta = 32;
const scoreScale = this._dom.find('.lh-scorescale', scoresContainer);
scoreScale.style.opacity = `${1 - scrollPct}`;
scoreScale.style.transform = `translateY(${scrollPct * -scoreScalePositionDelta}px)`;
try {
Copy link
Member Author

Choose a reason for hiding this comment

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

I think we don't need this try/catch any longer.. pretty sure it was resolved somewhere else.. but IIRC it only applied in the single-category case.

Copy link
Member

Choose a reason for hiding this comment

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

I think we still need it. Even on master it throws errors when scrolling in single category reports. I can split this into another PR if it doesn't belong here, but I think this is still a bug.
master:
image

Copy link
Member Author

Choose a reason for hiding this comment

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

lets just move a few lines inside of a

const scoreScale = this._dom.find('.lh-scorescale', scoresContainer);
if (scoreScale) { ... }

Copy link
Member

Choose a reason for hiding this comment

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

The error is on the find itself. This still throws, no?

Copy link
Member Author

Choose a reason for hiding this comment

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

what i meant to say is.. "what a beautiful try/catch! let's keep it just like it is."

const scoreScalePositionDelta = 32;
const scoreScale = this._dom.find('.lh-scorescale', scoresContainer);
scoreScale.style.opacity = `${1 - scrollPct}`;
scoreScale.style.transform = `translateY(${scrollPct * -scoreScalePositionDelta}px)`;
} catch (e) {}

// Move the toolbar & export
this.toolbar.style.transform = `translateY(${heightDiff * scrollPct}px)`;
Expand Down
98 changes: 94 additions & 4 deletions lighthouse-core/report/html/templates.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@
top: 0;
width: 100%;
will-change: transform;
contain: strict;
}
.lh-lighthouse {
position: absolute;
Expand Down Expand Up @@ -352,8 +353,91 @@
77.0001% { transform: translateX(195px); }
100% { transform: translateX(0px); }
} */

.score100 .lh-header-bg {
background-color: hsl(234, 64%, 19%);
}
.score100 .lh-metadata, .score100 .lh-toolbar__metadata, .score100 .lh-product-info {
color: #fff;
}
.score100 .lh-config {
color: #eee;
}

/* CSS Fireworks. Originally by Eddie Lin
https://codepen.io/paulirish/pen/yEVMbP
*/
.pyro {
display: none;
}
.score100 .pyro {
display: block;
}
.score100 .lh-lighthouse stop:first-child {
stop-color: hsla(200, 12%, 95%, 0);
}
.score100 .lh-lighthouse stop:last-child {
stop-color: hsla(65, 81%, 76%, 1);
}

.pyro > .before, .pyro > .after {
position: absolute;
width: 5px;
height: 5px;
border-radius: 2.5px;
box-shadow: 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff, 0 0 #fff;
animation: 1s bang ease-out infinite backwards, 1s gravity ease-in infinite backwards, 5s position linear infinite backwards;
animation-delay: 1s, 1s, 1s;
}

.pyro > .after {
animation-delay: 2.25s, 2.25s, 2.25s;
animation-duration: 1.25s, 1.25s, 6.25s;
}
.fireworks-paused .pyro > div {
animation-play-state: paused;
}

@keyframes bang {
to {
box-shadow: -70px -115.67px #47ebbc, -28px -99.67px #eb47a4, 58px -31.67px #7eeb47, 13px -141.67px #eb47c5, -19px 6.33px #7347eb, -2px -74.67px #ebd247, 24px -151.67px #eb47e0, 57px -138.67px #b4eb47, -51px -104.67px #479eeb, 62px 8.33px #ebcf47, -93px 0.33px #d547eb, -16px -118.67px #47bfeb, 53px -84.67px #47eb83, 66px -57.67px #eb47bf, -93px -65.67px #91eb47, 30px -13.67px #86eb47, -2px -59.67px #83eb47, -44px 1.33px #eb47eb, 61px -58.67px #47eb73, 5px -22.67px #47e8eb, -66px -28.67px #ebe247, 42px -123.67px #eb5547, -75px 26.33px #7beb47, 15px -52.67px #a147eb, 36px -51.67px #eb8347, -38px -12.67px #eb5547, -46px -59.67px #47eb81, 78px -114.67px #eb47ba, 15px -156.67px #eb47bf, -36px 1.33px #eb4783, -72px -86.67px #eba147, 31px -46.67px #ebe247, -68px 29.33px #47e2eb, -55px 19.33px #ebe047, -56px 27.33px #4776eb, -13px -91.67px #eb5547, -47px -138.67px #47ebc7, -18px -96.67px #eb47ac, 11px -88.67px #4783eb, -67px -28.67px #47baeb, 53px 10.33px #ba47eb, 11px 19.33px #5247eb, -5px -11.67px #eb4791, -68px -4.67px #47eba7, 95px -37.67px #eb478b, -67px -162.67px #eb5d47, -54px -120.67px #eb6847, 49px -12.67px #ebe047, 88px 8.33px #47ebda, 97px 33.33px #eb8147, 6px -71.67px #ebbc47;
}
}
@keyframes gravity {
to {
transform: translateY(80px);
opacity: 0;
}
}
@keyframes position {
0%, 19.9% {
margin-top: 4%;
margin-left: 47%;
}
20%, 39.9% {
margin-top: 7%;
margin-left: 30%;
}
40%, 59.9% {
margin-top: 6%;
margin-left: 70%;
}
60%, 79.9% {
margin-top: 3%;
margin-left: 20%;
}
80%, 99.9% {
margin-top: 3%;
margin-left: 80%;
}
}
</style>
<div class="lh-header-bg"></div>
<div class="lh-header-bg">
<div class="pyro">
<div class="before"></div>
<div class="after"></div>
</div>
</div>


<div class="lh-header-container">
Expand All @@ -368,16 +452,22 @@
<stop offset="0" stop-color="#FFFFFF00"/>
<stop offset="1" stop-color="#FFFFFF"/>
</linearGradient>
<filter id="hue-rotate">
<feColorMatrix id="hue-rotate-element" type="hueRotate" values="0"></feColorMatrix>
</filter>
</defs>
<g mask="url(#a)">
<!-- lighthouse building elements -->
<path d="M95 47h24v2H95z" fill="#ec5548"/>
<path d="M98 49h18v11H98z" fill="#fbc21b"/>
<path d="M95 59h24v7H95z" fill="#ec5548"/>
<path d="M97.63 66h19.74l2.63 47H95z" fill="#fff"/>
<path d="M107 38a10 10 0 0 1 10 10v1H97v-1a10 10 0 0 1 10-10zM96.77 82.23l21-10.7.63 11.87-22.31 11.87zM95 110.8L119.1 98l.9 14H95z" fill="#ec5548"/>
<path d="M0 148a177.58 177.58 0 0 1 217 0z" fill="#e8eaed"/>
<path d="M103 49a5 5 0 0 1 5 5 5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5z" fill="#fef0c8"/>
<path d="M7 16l91 33.18v10L7 93z" fill="url(#b)"/>
<!-- lighthouse beam elements -->
<path d="M98 49h18v11H98z" filter="url(#hue-rotate)" fill="#fbc21b"/>
<path d="M103 49a5 5 0 0 1 5 5 5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5z" filter="url(#hue-rotate)" fill="#fef0c8"/>
<path d="M7 16l91 33.18v10L7 93z" filter="url(#hue-rotate)" fill="url(#b)"/>
<animate id="animate-hue-rotate" xlink:href="#hue-rotate-element" attributeName="values" from="0" to="360" begin="" dur="2s" repeatCount="indefinite"/>
</g>
<g mask="url(#a)" class="lh-lighthouse__clouds">
<path d="M60 .19A9.77 9.77 0 0 1 61.93 0a9.44 9.44 0 0 1 9.24 7.83A7.24 7.24 0 0 1 79 14.45v.73A7.37 7.37 0 0 1 76.2 21h-31a7.44 7.44 0 0 1-1.2-4.09 7.31 7.31 0 0 1 7.26-7.36 6.84 6.84 0 0 1 1.28.1v-.11A9.51 9.51 0 0 1 60 .19m79.78 22.31h-17.9a4.37 4.37 0 0 1-.63-2.25 4.2 4.2 0 0 1 4.16-4.25 4.37 4.37 0 0 1 .72.06V16a5.35 5.35 0 0 1 10.64-1h.33a4.2 4.2 0 0 1 4.15 4.25 4.29 4.29 0 0 1-1.47 3.25zM163 62h-24.15a5.1 5.1 0 0 1-.85-2.81 5.65 5.65 0 0 1 6.59-5.19v-.08a7.07 7.07 0 0 1 7.24-6.92 7.15 7.15 0 0 1 7.17 5.64h.44a5.46 5.46 0 0 1 5.6 5.32A5.19 5.19 0 0 1 163 62z" fill="#fff"/>
Expand Down
25 changes: 25 additions & 0 deletions lighthouse-core/test/report/html/renderer/report-renderer-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ describe('ReportRenderer', () => {
assert.ok(output.querySelector('.lh-report'), 'has report body');
assert.equal(output.querySelectorAll('.lh-gauge__wrapper, .lh-gauge--pwa__wrapper').length,
sampleResults.reportCategories.length * 2, 'renders category gauges');
// no fireworks
assert.ok(output.querySelector('.score100') === null, 'has no fireworks treatment');
// no party beam
assert.ok(output.querySelector('#animate-hue-rotate').getAttribute('begin') === '',
'has regular colored light beam');
});

it('renders additional reports by replacing the existing one', () => {
Expand Down Expand Up @@ -180,6 +185,26 @@ describe('ReportRenderer', () => {
assert.equal(renderer._templateContext, otherDocument);
});

it('should render an all 100 report with fireworks', () => {
const container = renderer._dom._document.body;

sampleResults.reportCategories.forEach(element => {
element.score = 1;
});

const output = renderer.renderReport(sampleResults, container);
// standard checks
assert.ok(output.querySelector('.lh-header-sticky'), 'has a header');
assert.ok(output.querySelector('.lh-report'), 'has report body');
assert.equal(output.querySelectorAll('.lh-gauge__wrapper, .lh-gauge--pwa__wrapper').length,
sampleResults.reportCategories.length * 2, 'renders category gauges');
// fireworks!
assert.ok(output.querySelector('.score100'), 'has fireworks treatment');
// party beam
assert.ok(output.querySelector('#animate-hue-rotate').getAttribute('begin') === '1s',
'has party colored light beam');
});

it('renders `not_applicable` audits as `notApplicable`', () => {
const clonedSampleResult = JSON.parse(JSON.stringify(sampleResultsOrig));

Expand Down