Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

refactor(organisation): added displayTitle field, organised pages and moved random contributor component #2624

Merged
ovflowd merged 8 commits into from
Aug 14, 2022
Merged

refactor(organisation): added displayTitle field, organised pages and moved random contributor component #2624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a31c085
refactor(content): added displaytitles and organised pages
ovflowd Aug 12, 2022
be0018a
refactor(contributor): move random contributor to be optional per page
ovflowd Aug 12, 2022
9f75398
chore(tests): updated tests and added tsconfig for tests
ovflowd Aug 12, 2022
a124e99
chore(tests): just fixed some tests
ovflowd Aug 14, 2022
2b9e44d
feat(redirects): updated redirects
ovflowd Aug 14, 2022
a9bde6b
Merge branch 'main' into refactor/display-title-organise-links
ovflowd Aug 14, 2022
c1378e6
fix(footer): updated footer links
ovflowd Aug 14, 2022
e52f7c6
chore(snapshots): updated snapshots
ovflowd Aug 14, 2022
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
3 changes: 2 additions & 1 deletion content/about/about.en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
title: About
title: about
displayTitle: About
description: "About | Node.js"
authors: XhmikosR, mikeal, fhemberger, Fishrock123, yous, tomgco, tniessen, SMcCandlish, saadq, Trott, Gornstats, piperchester, naoufal, lpinca, j9t, bnoordhuis, harshadsabne, Chris911, benhalverson
category: about
Expand Down
5 changes: 3 additions & 2 deletions content/about/governance.en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
---
title: Governance
title: governance
displayTitle: Governance
description: 'Project Governance | Node.js'
authors: XhmikosR, fhemberger, thefourtheye, ryanmurakami, refack
category: governance
category: about
---

## Consensus Seeking Process
Expand Down
5 changes: 3 additions & 2 deletions content/about/privacy.en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
---
title: Privacy Policy
title: privacy-policy
displayTitle: Privacy Policy
description: 'Privacy Policy | Node.js'
authors: XhmikosR, nschonni, brianwarner, hackygolucky, sindelio, sonicdoe, marsonya
category: privacy
category: about
---

Effective Date: November 21, 2019
Expand Down
5 changes: 3 additions & 2 deletions content/about/releases.en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
---
title: Releases
title: releases
displayTitle: Releases
description: "Releases | Node.js"
authors: ZYSzys, nstanard, mikeal, fhemberger, garybernhardt, piepmatz, boneskull, bjb568
category: releases
category: about
---

Major Node.js versions enter _Current_ release status for six months, which gives library authors time to add support for them.
Expand Down
3 changes: 2 additions & 1 deletion content/about/resources.en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
title: Resources
title: resources
displayTitle: Resources
description: 'Resources | Node.js'
authors: XhmikosR, mikeal, fhemberger, Fishrock123, yous, tomgco, tniessen, SMcCandlish, saadq, Trott, Gornstats, piperchester, naoufal, lpinca, j9t, bnoordhuis, harshadsabne, Chris911, MrJithil
category: about
Expand Down
7 changes: 4 additions & 3 deletions content/about/security.en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
---
title: Security
description: 'This is security page'
title: security
displayTitle: Security
description: "Security | Node.js"
authors: reedloden,XhmikosR,Trott,fhemberger,MaledongGit,yous,sam-github,vdeturckheim,tniessen,richardlau,nschonni,mikeal,e-jigsaw,parthlaw
category: security
category: about
---

## Reporting a Bug in Node.js
Expand Down
5 changes: 3 additions & 2 deletions content/about/trademark.en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
---
title: Trademark Policy
title: trademark-policy
displayTitle: Trademark Policy
description: "Trademark Policy | Node.js"
authors: fhemberger, XhmikosR, mikeal, brianwarner, bf4
category: trademark
category: about
---

The Node.js trademarks, service marks, and graphics marks are symbols of the
Expand Down
7 changes: 4 additions & 3 deletions content/about/working-groups.en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
---
title: Working Groups
description: "Working Groups| Node.js"
title: working-groups
displayTitle: Working Groups
description: "Working Groups | Node.js"
authors: williamkapke,Trott,fhemberger,rxmarbles,mhdawson,XhmikosR,ryanmurakami,outsideris,MaledongGit,vsemozhetbyt,wonderdogone,sotayamashita,richardlau,pierreneter,nschonni,marocchino,stevemao,lpinca,phillipj,jasnell,sejaljain123
category: working-groups
category: about
---

Core Working Groups are created by the
Expand Down
3 changes: 2 additions & 1 deletion content/community/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
title: Node.js Community
title: node.js-community
displayTitle: Node.js Community
description: "Node.js has one of the largest, most vibrant and innovative open source communities in the world. Node.js is built, used, and maintained by the community. We believe the community to be at the core of Node.js popularity. Amazing people from every part of the world, with a common interest, collaborate and shape this community."
authors: ahmadawais, maedahbatool, saqibameen, msaaddev
category: community
Expand Down
5 changes: 3 additions & 2 deletions content/download/package-manager.en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
title: Installing Node.js via package manager
description: Installing Node.js via package manager
title: installing-node.js-via-package-manager
displayTitle: Installing Node.js via Package Manager
description: "Installing Node.js via Package Manager | Node.js"
authors: fhemberger, XhmikosR, shadowspawn, vsemozhetbyt, nschonni, wildcard, MrJithil, kasicka, cassidyjames, Trott, richardlau, Qantas94Heavy, pierreneter, 0mp, ThePrez, PoojaDurgad, MaledongGit, Megajin, marc-maurer, yodeyer, geek, sudowork, strawbrary, ryanmurakami, rbnswartz, arkwright, oliversalzburg, mweagle, Mohamed3on, Ginden, kapouer, jperkin, jericopulvera, jedsmith, jasonkarns, sonicdoe, mcollina, fornwall, danbev, naskapal, awochna, AdamMajer, ahmetanilgur, bnb, qbit
category: download
---
Expand Down
16 changes: 3 additions & 13 deletions firebase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,7 @@
"hosting": {
"target": "nodejs-dev",
"public": "public",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
]
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"]
},
"redirects": [
{
"source": "/en/get-involved",
"destination": "/community",
"type": "301"
}
]
}
"redirects": []
}
13 changes: 3 additions & 10 deletions src/components/Footer/__tests__/__snapshots__/footer.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@

exports[`Tests for Footer component renders correctly 1`] = `
<div>
<section
class="bottom-info"
>
<div
class="random-contributor"
/>
</section>
<footer
class="footer"
>
Expand All @@ -18,15 +11,15 @@ exports[`Tests for Footer component renders correctly 1`] = `
<li>
<a
class="footer__link"
href="/trademark"
href="/about/trademark"
>
Trademark Policy
</a>
</li>
<li>
<a
class="footer__link"
href="/privacy"
href="/about/privacy"
>
Privacy Policy
</a>
Expand All @@ -42,7 +35,7 @@ exports[`Tests for Footer component renders correctly 1`] = `
<li>
<a
class="footer__link"
href="/security"
href="/about/security"
>
Security Reporting
</a>
Expand Down
149 changes: 72 additions & 77 deletions src/components/Footer/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { LocalizedLink as Link } from 'gatsby-theme-i18n';
import React from 'react';
import RandomContributor from '../RandomContributor';
import { ReactComponent as GitHubLogo } from '../../images/logos/github-logo.svg';
import { ReactComponent as TwitterLogo } from '../../images/logos/twitter-logo.svg';
import { ReactComponent as SlackLogo } from '../../images/logos/slack-logo.svg';
Expand All @@ -14,82 +13,78 @@ export interface DropDownState {

const Footer = (): JSX.Element => {
return (
<>
<section className="bottom-info">
<RandomContributor />
</section>
<footer className="footer">
<ul className="footer__left">
<li>
<Link className="footer__link" to="/trademark">
Trademark Policy
</Link>
</li>
<li>
<Link className="footer__link" to="/privacy">
Privacy Policy
</Link>
</li>
<li>
<a
className="footer__link"
href="https://github.com/openjs-foundation/cross-project-council/blob/main/CODE_OF_CONDUCT.md#contributor-covenant-code-of-conduct"
>
Code of Conduct
</a>
</li>
<li>
<Link className="footer__link" to="/security">
Security Reporting
</Link>
</li>
<li>
<Link className="footer__link" to="/about">
About
</Link>
</li>
<li>
<a className="footer__link" href="https://nodejs.org/en/blog/">
Blog
</a>
</li>
</ul>
<ul className="footer__right">
<li>&copy; OpenJS Foundation</li>
<li>
<a
target="_blank"
href="https://github.com/nodejs/node"
rel="noopener noreferrer"
aria-label="Node.js Github Page Link"
>
<span className="sr-only">GitHub</span>
<GitHubLogo fill="var(--color-text-secondary)" />
</a>
</li>
<li>
<a
target="_blank"
href="https://twitter.com/nodejs"
rel="noopener noreferrer"
aria-label="Node.js Twitter Link"
>
<TwitterLogo fill="var(--color-text-secondary)" />
</a>
</li>
<li>
<a
target="_blank"
href="https://slack.openjsf.org"
rel="noopener noreferrer"
aria-label="Node.js Slack Link"
>
<SlackLogo fill="var(--color-text-secondary)" />
</a>
</li>
</ul>
</footer>
</>
<footer className="footer">
<ul className="footer__left">
<li>
<Link className="footer__link" to="/about/trademark">
Trademark Policy
</Link>
</li>
<li>
<Link className="footer__link" to="/about/privacy">
Privacy Policy
</Link>
</li>
<li>
<a
className="footer__link"
href="https://github.com/openjs-foundation/cross-project-council/blob/main/CODE_OF_CONDUCT.md#contributor-covenant-code-of-conduct"
>
Code of Conduct
</a>
</li>
<li>
<Link className="footer__link" to="/about/security">
Security Reporting
</Link>
</li>
<li>
<Link className="footer__link" to="/about">
About
</Link>
</li>
<li>
{/* @TODO: Once our Blog components are completely read, move this link to our Blog page */}
<a className="footer__link" href="https://nodejs.org/en/blog/">
Blog
</a>
</li>
</ul>
<ul className="footer__right">
<li>&copy; OpenJS Foundation</li>
<li>
<a
target="_blank"
href="https://github.com/nodejs/node"
rel="noopener noreferrer"
aria-label="Node.js Github Page Link"
>
<span className="sr-only">GitHub</span>
<GitHubLogo fill="var(--color-text-secondary)" />
</a>
</li>
<li>
<a
target="_blank"
href="https://twitter.com/nodejs"
rel="noopener noreferrer"
aria-label="Node.js Twitter Link"
>
<TwitterLogo fill="var(--color-text-secondary)" />
</a>
</li>
<li>
<a
target="_blank"
href="https://slack.openjsf.org"
rel="noopener noreferrer"
aria-label="Node.js Slack Link"
>
<SlackLogo fill="var(--color-text-secondary)" />
</a>
</li>
</ul>
</footer>
);
};

Expand Down
13 changes: 3 additions & 10 deletions src/components/Layout/__tests__/__snapshots__/centered-layout.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,6 @@ exports[`CenteredLayout component renders correctly with footer 1`] = `
>
mock-children
</main>
<section
class="bottom-info"
>
<div
class="random-contributor"
/>
</section>
<footer
class="footer"
>
Expand All @@ -151,15 +144,15 @@ exports[`CenteredLayout component renders correctly with footer 1`] = `
<li>
<a
class="footer__link"
href="/trademark"
href="/about/trademark"
>
Trademark Policy
</a>
</li>
<li>
<a
class="footer__link"
href="/privacy"
href="/about/privacy"
>
Privacy Policy
</a>
Expand All @@ -175,7 +168,7 @@ exports[`CenteredLayout component renders correctly with footer 1`] = `
<li>
<a
class="footer__link"
href="/security"
href="/about/security"
>
Security Reporting
</a>
Expand Down
Loading