Skip to content

Commit ac65a40

Browse files
authored
Merge pull request #44 from MikeCheek/dev
Other performance improvements
2 parents db1315b + 4f89da8 commit ac65a40

File tree

13 files changed

+28
-147
lines changed

13 files changed

+28
-147
lines changed

src/assets/video/baldini_10s_low.mp4

5.09 MB
Binary file not shown.
5.05 MB
Binary file not shown.
5.25 MB
Binary file not shown.

src/assets/video/shorty_10s_low.mp4

4.77 MB
Binary file not shown.
4.98 MB
Binary file not shown.

src/components/atoms/BigPictureSection/index.module.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
text-align: center;
1515

1616
// mix-blend-mode: soft-light;
17-
h4 {
17+
h3 {
1818
font-size: 5rem;
1919
text-transform: uppercase;
2020
margin-bottom: 5px;
@@ -33,8 +33,7 @@
3333
width: 40%;
3434
text-align: right;
3535
right: 4%;
36-
h4 {
37-
opacity: 0.2;
36+
h3 {
3837
font-size: 10rem;
3938
}
4039

src/components/atoms/BigPictureSection/index.tsx

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,6 @@ import { GatsbyImage } from 'gatsby-plugin-image';
66
import Carousel from '../Carousel';
77

88
const Index = ({ title, text, reverse = false, images, videos }: BigPictureSectionProps) => {
9-
// let base = 0;
10-
// const [offset, setOffset] = useState<number>(0);
11-
12-
// const [ref, inView, entry] = useInView({
13-
// threshold: 0.2,
14-
// fallbackInView: true,
15-
// triggerOnce: false,
16-
// });
17-
18-
// const parallax = () => {
19-
// const rect = entry!.target.getBoundingClientRect();
20-
// const a = rect.top + rect.bottom;
21-
// setOffset((a / window.innerHeight) * 100);
22-
// };
23-
24-
// useEffect(() => {
25-
// if (inView) {
26-
// base = window.scrollY;
27-
// window.addEventListener('scroll', () => parallax());
28-
// } else window.removeEventListener('scroll', () => {});
29-
30-
// return window.removeEventListener('scroll', () => {});
31-
// }, [inView]);
32-
33-
// const transform = `translateX(${reverse ? '-' : '+'}${Math.round(offset / 2)}%)`;
34-
359
const slides = [
3610
videos?.map((v, key) => (
3711
<video key={key} className={styles.video} height={500} muted autoPlay controls={false} loop playsInline>
@@ -56,7 +30,7 @@ const Index = ({ title, text, reverse = false, images, videos }: BigPictureSecti
5630
return (
5731
<div className={styles.wrap}>
5832
<ShowOnView className={reverse ? styles.wrapTextReverse : styles.wrapText}>
59-
<h4 dangerouslySetInnerHTML={{ __html: title }}></h4>
33+
<h3 dangerouslySetInnerHTML={{ __html: title }}></h3>
6034
<p dangerouslySetInnerHTML={{ __html: text ?? '' }}></p>
6135
</ShowOnView>
6236

src/components/atoms/LanguagePicker/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const Index = () => {
1111
return (
1212
<div className={styles.languagePicker} onMouseLeave={() => setDropdown(false)}>
1313
<p onClick={() => setDropdown((v) => !v)}>
14-
<Flag className={styles.flag} code={enToUk(language)} />
14+
<Flag className={styles.flag} code={enToUk(language)} alt={language + ' flag'} />
1515
{language.toUpperCase()}
1616
{/* <Down width={10} height={10} /> */}
1717
</p>
@@ -23,7 +23,7 @@ const Index = () => {
2323
to={originalPath}
2424
language={lng}
2525
>
26-
<Flag className={styles.flag} code={enToUk(lng)} /> {lng.toUpperCase()}
26+
<Flag className={styles.flag} code={enToUk(lng)} alt={lng + ' flag'} /> {lng.toUpperCase()}
2727
</Link>
2828
{key % 2 === 0 ? <div className={styles.separator}></div> : null}
2929
</div>

src/components/atoms/VideoMasked/index.tsx

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,24 @@ import * as styles from './index.module.scss';
44
import BoscoCoste from '../../../assets/video/bosco_coste_forward.mp4';
55
import ShowOnView from '../ShowOnView';
66

7-
const VideoMasked = ({}: VideoMaskedProps) => {
7+
const VideoMasked = ({ showOnView = false }: VideoMaskedProps) => {
88
const [loadVideo, setLoadVideo] = useState<boolean>(false);
99

1010
useEffect(() => {
1111
setLoadVideo(true);
1212
}, []);
1313

14-
return (
15-
<ShowOnView className={styles.videoWrap}>
16-
<video height={500} muted autoPlay controls={false} loop playsInline>
17-
{loadVideo ? <source src={BoscoCoste} type="video/mp4" /> : <></>}
18-
Your browser doesn't support video tag
19-
</video>
20-
</ShowOnView>
14+
const children = (
15+
<video height={500} muted autoPlay controls={false} loop playsInline>
16+
{loadVideo ? <source src={BoscoCoste} type="video/mp4" /> : <></>}
17+
Your browser doesn't support video tag
18+
</video>
19+
);
20+
21+
return showOnView ? (
22+
<ShowOnView className={styles.videoWrap}>{children}</ShowOnView>
23+
) : (
24+
<div className={styles.videoWrap}>{children}</div>
2125
);
2226
};
2327

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export default interface VideoMaskedProps {
2-
3-
}
2+
showOnView?: boolean;
3+
}

0 commit comments

Comments
 (0)