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

Added Trademark Policy Page#1298

Merged
benhalverson merged 12 commits into
nodejs:masterfrom
palakjain21:TrademarkPolicy
May 20, 2021
Merged

Added Trademark Policy Page#1298
benhalverson merged 12 commits into
nodejs:masterfrom
palakjain21:TrademarkPolicy

Conversation

@palakjain21

Copy link
Copy Markdown
Contributor

Closes #1293

@palakjain21

Copy link
Copy Markdown
Contributor Author

/preview

@github-actions

github-actions Bot commented May 7, 2021

Copy link
Copy Markdown

Please find a preview at: https://staging.nodejs.dev/1298/

@benhalverson benhalverson added the create-preview Generate preview on staging.nodejs.dev label May 7, 2021
@github-actions github-actions Bot removed the create-preview Generate preview on staging.nodejs.dev label May 7, 2021
@github-actions

github-actions Bot commented May 7, 2021

Copy link
Copy Markdown

Please find a preview at: https://staging.nodejs.dev/1298/

Comment thread content/about/trademark.md Outdated
Comment thread package.json
"@types/react-helmet": "6.1.1",
"@types/jest": "^26.0.23",
"@types/react-dom": "^17.0.3",
"@types/react-helmet": "6.1.1",

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

These updates are not related to the PR. Please revert these changes

Comment thread src/pages/trademark.tsx Outdated
Comment thread src/styles/layout.scss
@benhalverson

Copy link
Copy Markdown
Member

Thanks for working on this @palakjain21
I left a few minor comments. Could you add a test for this page? You can look at our existing pages for examples.
👍🏻

@codecov-commenter

codecov-commenter commented May 8, 2021

Copy link
Copy Markdown

Codecov Report

Merging #1298 (1d08500) into master (e8b0816) will increase coverage by 0.10%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1298      +/-   ##
==========================================
+ Coverage   89.18%   89.29%   +0.10%     
==========================================
  Files          58       59       +1     
  Lines         601      607       +6     
  Branches      183      183              
==========================================
+ Hits          536      542       +6     
  Misses         65       65              
Impacted Files Coverage Δ
src/components/Footer/index.tsx 100.00% <ø> (ø)
src/pages/trademark.tsx 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e8b0816...1d08500. Read the comment docs.

@benhalverson benhalverson added the create-preview Generate preview on staging.nodejs.dev label May 10, 2021
@github-actions github-actions Bot removed the create-preview Generate preview on staging.nodejs.dev label May 10, 2021
@github-actions

Copy link
Copy Markdown

Please find a preview at: https://staging.nodejs.dev/1298/

@benhalverson

Copy link
Copy Markdown
Member

Can you add the original authors to the authors field? https://github.com/nodejs/nodejs.org/blob/master/locale/en/about/trademark.md

@benhalverson

benhalverson commented May 19, 2021

Copy link
Copy Markdown
Member

Can you fix this conflict? We want both changes
from the master branch

<section className="bottom-info">
  <RandomContributor />
</section>

and your changes

 <Link className="footer__link" to="/trademark">
    Trademark Policy
  </Link>

@benhalverson benhalverson merged commit 09ddbad into nodejs:master May 20, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Trademark policy page

3 participants