Skip to content

Performance and Accessibility Improvements #9

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.

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
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
40 changes: 22 additions & 18 deletions components/ImageBox/ImageBox.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Image from "next/image";
import React from "react";
import React, { useMemo } from "react";
import Styles from "./ImageBox.module.scss";

function ImageBox({
Expand All @@ -10,35 +10,39 @@ function ImageBox({
alt,
src,
style,
layout,
layout = "fill",
aspectRatio,
priority = false,
...rest
}) {
let dimensions = {};
width ? (dimensions["width"] = width) : "100%";
maxWidth ? (dimensions["maxWidth"] = maxWidth) : "100%";
height ? (dimensions["height"] = height) : "unset";
maxHeight ? (dimensions["maxHeight"] = maxHeight) : "unset";
const dimensions = useMemo(() => {
const dims = {};
if (width) dims.width = width;
if (maxWidth) dims.maxWidth = maxWidth;
if (height) dims.height = height;
if (maxHeight) dims.maxHeight = maxHeight;
return dims;
}, [width, maxWidth, height, maxHeight]);

const containerClass = aspectRatio ?
Styles.imageRatioContainer :
Styles.imageContainer;

return (
<div
className={
aspectRatio ? Styles.imageRatioContainer : Styles.imageContainer
}
style={dimensions}
>
<div className={containerClass} style={dimensions}>
<Image
className={Styles.image}
{...rest}
style={{ objectFit: "cover", ...style }}
// style={style}
alt={alt ? alt : "icon"}
alt={alt || "image"}
src={src}
objectFit={"contain"}
layout={layout ? layout : "fill"}
objectFit="contain"
layout={layout}
priority={priority}
loading={priority ? "eager" : "lazy"}
/>
</div>
);
}

export default ImageBox;
export default React.memo(ImageBox);
33 changes: 23 additions & 10 deletions components/QuestionBox/QuestionBox.jsx
Original file line number Diff line number Diff line change
@@ -1,31 +1,44 @@
import React, { useState } from "react";
import React, { useState, useCallback, useMemo } from "react";
import Styles from "./QuestionBox.module.scss";
import { BiChevronRight, BiChevronDown } from "react-icons/bi";

function QuestionBox({ question }) {
const [isOpen, setIsOpen] = useState(false);

const toggleOpen = useCallback(() => {
setIsOpen(prev => !prev);
}, []);

const sanitizedAnswer = useMemo(() => {
return question?.attributes?.answer.replace(
/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
''
);
}, [question?.attributes?.answer]);

return (
<div className={Styles.QuestionBox}>
<div
<button
className={Styles.title}
onClick={() => {
isOpen ? setIsOpen(false) : setIsOpen(true);
}}
onClick={toggleOpen}
aria-expanded={isOpen}
aria-controls={`answer-${question?.id}`}
>
<p className={Styles.question}>{question?.attributes?.question}</p>
<div className={Styles.icon}>
<div className={Styles.icon} aria-hidden="true">
{isOpen ? <BiChevronDown /> : <BiChevronRight />}
</div>
</div>
</button>

{isOpen && (
<div
id={`answer-${question?.id}`}
className={Styles.answer}
dangerouslySetInnerHTML={{ __html: question?.attributes?.answer }}
></div>
dangerouslySetInnerHTML={{ __html: sanitizedAnswer }}
/>
)}
</div>
);
}

export default QuestionBox;
export default React.memo(QuestionBox);
38 changes: 24 additions & 14 deletions components/metadata/Metadata.jsx
Original file line number Diff line number Diff line change
@@ -1,47 +1,57 @@
import Head from "next/head";
import { useRouter } from "next/router";
import React, { useEffect } from "react";
import Script from "next/script";
import React from "react";

function Metadata({
title = "Lighthouse Storage - Store Data Permanently & Securely",
description = "Decentralized storage powered by Filecoin. Secure, scalable, and ideal for individuals, developers, and enterprises.",
url = "https://lighthouse.storage/",
image = "https://gateway.lighthouse.storage/ipfs/Qmd7rR9EPKomhmoRUw2WB7FJAeSWAtC8c1nkKgGZL39LpB",
keywords = "decentralized storage, IPFS, Filecoin, permanent storage",
}) {
const router = useRouter();

return (
<>
<Head>
<title>{title}</title>
<meta name="title" content={title} />
<meta name="description" content={description} />
<meta name="keywords" content={keywords} />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta httpEquiv="Content-Type" content="text/html; charset=utf-8" />

{/* Open Graph */}
<meta property="og:type" content="website" />
<meta property="og:url" content={url} />
<meta property="og:title" content={title} />
<meta property="og:description" content={description} />
<meta property="og:image" content={image} />

{/* <!-- Twitter --> */}
{/* Twitter */}
<meta property="twitter:card" content="summary_large_image" />
<meta property="twitter:url" content={url} />
<meta property="twitter:title" content={title} />
<meta name="msvalidate.01" content="604856DE8115C3F615EDBDB485DD021A" />
<meta property="twitter:description" content={description} />
<meta property="twitter:image" content={image} />

<meta name="msvalidate.01" content="604856DE8115C3F615EDBDB485DD021A" />

<link rel="icon" href="/favicon.ico" />
</Head>

<Script src="https://www.googletagmanager.com/gtag/js?id=G-20157XPF9Y"></Script>
<Script id="google-analytics">
{` window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());

gtag('config', 'G-20157XPF9Y');`}
<Script
src="https://www.googletagmanager.com/gtag/js?id=G-20157XPF9Y"
strategy="afterInteractive"
/>
<Script id="google-analytics" strategy="afterInteractive">
{`
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'G-20157XPF9Y');
`}
</Script>
</>
);
}

export default Metadata;
export default React.memo(Metadata);
64 changes: 29 additions & 35 deletions containers/EcosystemGrid/EcosystemGrid.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, { useState, useContext } from "react";
import React, { useState, useContext, useMemo, useCallback } from "react";
import styles from "./EcosystemGrid.module.scss";
import { RiTwitterXLine } from "react-icons/ri";
import { FaTelegramPlane } from "react-icons/fa";
import { SlGlobe } from "react-icons/sl";
import ThemeContext from "../../utils/services/Themecontext";
import { ImageBox } from "../../components";
import ImageBox from "../../components/ImageBox/ImageBox";

const badgeOptions = [
"Artificial Intelligence (AI)",
Expand Down Expand Up @@ -391,21 +391,30 @@ const ecosystemData = [

const EcosystemGrid = () => {
const [activeTag, setActiveTag] = useState("Artificial Intelligence (AI)");
const filtered = ecosystemData.filter((item) =>
item.tags.includes(activeTag)
const { theme } = useContext(ThemeContext);

const filtered = useMemo(() =>
ecosystemData.filter(item => item.tags.includes(activeTag)),
[activeTag]
);
const { theme, setTheme } = useContext(ThemeContext);

const handleTagClick = useCallback((tag) => {
setActiveTag(tag);
}, []);

const imageStyle = useMemo(() => ({
filter: theme === "dark" ? "brightness(100%)" : "brightness(10%)"
}), [theme]);

return (
<section className={styles.ecosystemSection}>
<div className={styles.badgeContainer}>
{badgeOptions.map((tag) => (
<button
key={tag}
className={`${styles.badge} ${
activeTag === tag ? styles.active : ""
}`}
onClick={() => setActiveTag(tag)}
className={`${styles.badge} ${activeTag === tag ? styles.active : ""}`}
onClick={() => handleTagClick(tag)}
aria-pressed={activeTag === tag}
>
{tag}
</button>
Expand All @@ -416,39 +425,24 @@ const EcosystemGrid = () => {
{filtered
.filter((item) => item.image)
.map((item, idx) => (
<div key={idx} className={styles.highlightCard}>
<div key={item.name || idx} className={styles.highlightCard}>
<img
src={item.image}
alt={item.name}
className={styles.highlightImage}
loading="lazy"
/>
<div className={styles.highlightRight}>
{/* <img
src={item.icon}
alt={item.name}
className={styles.logo}
style={
theme === "dark"
? { filter: "brightness(100%)" }
: { filter: "brightness(10%)" }
}
/> */}
<span>
<ImageBox
src={item?.icon}
width={"200px"}
height={"50px"}
// className={styles.logo}
style={
theme === "dark"
? { filter: "brightness(100%)" }
: { filter: "brightness(10%)" }
}
aspectRatio={true}
/>

<ImageBox
src={item?.icon}
width={"200px"}
height={"50px"}
style={imageStyle}
aspectRatio={true}
alt={`${item.name} icon`}
/>
</span>

<p className={styles.desc}>{item.description}</p>
<div className={styles.footerIcons}>
<span
Expand Down Expand Up @@ -540,4 +534,4 @@ const EcosystemGrid = () => {
);
};

export default EcosystemGrid;
export default React.memo(EcosystemGrid);
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint"
"lint": "next lint",
"analyze": "ANALYZE=true next build"
},
"dependencies": {
"aos": "^2.3.4",
"axios": "^1.1.3",
"lighthouse_ui_2.0": "file:",
"next": "12.3.1",
"next": "^12.3.1",
"react": "18.2.0",
"react-countup": "^6.5.0",
"react-dom": "18.2.0",
"react-icons": "^4.7.1",
"react-markdown": "^8.0.5",
"react-paginate": "^8.1.4",
"react-pagination": "^1.0.0",
"react-toastify": "^9.1.1",
"rfs": "^10.0.0",
"sass": "^1.55.0",
"swiper": "^8.4.7"
},
"devDependencies": {
"@next/bundle-analyzer": "^12.3.1",
"eslint": "8.25.0",
"eslint-config-next": "12.3.1"
}
Expand Down
Loading