Skip to content

Commit 0eb8aea

Browse files
authored
Merge branch 'json-schema-org:main' into content-schema-keyword
2 parents df3497f + 9899bc7 commit 0eb8aea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2197
-548
lines changed

.github/workflows/link-checker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
# This will run the link checker on all markdown files in the pages directory
5252
- name: Link Checker
5353
id: lychee
54-
uses: lycheeverse/lychee-action@v1
54+
uses: lycheeverse/lychee-action@v2
5555
with:
5656
args: --base https://json-schema.org --verbose --no-progress --accept 200,204,429,403 './pages/**/*.md' --cache --max-cache-age 1d https://json-schema.org
5757
token: ${{secrets.GITHUB_TOKEN}}

CONTRIBUTING-docs.md

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
# Docs Contributing Guide
2+
3+
This guide describes the workflow to contribute to the JSON Schema technical documentation. If you would like to contribute to other aspects of the JSON Schema website, like writing blog articles or publishing a case study, please read the website's [Contributing Guide](https://github.com/json-schema-org/website/blob/main/CONTRIBUTING.md) for more details.
4+
5+
## Welcome
6+
Thank you for helping us improve our documentation.
7+
8+
This guide is intended for use by documentation contributors and will help you get started with the basics of our working processes.
9+
10+
## Before you start
11+
To contribute to the JSON Schema documentation you will need to complete the following steps:
12+
13+
1. [Create a GitHub account](https://docs.github.com/en/get-started/start-your-journey/creating-an-account-on-github), if you don't have one already.
14+
2. Read our [Code of Conduct](https://json-schema.org/overview/code-of-conduct).
15+
3. [Install the JSON Schema website](https://github.com/json-schema-org/website/blob/main/INSTALLATION.md) on your computer.
16+
4. Read our [style guide](https://json-schema.org/md-style-guide).
17+
18+
## Community engagement
19+
To stay updated with news about the JSON Schema project and its documentation, engage with our team, ask questions, and discuss ideas, please join our [Slack workspace](https://json-schema.org/slack). We particularly recommend the following channels:
20+
21+
- `#documentation`: Discussions related to the JSON Schema documentation.
22+
23+
- `#website`: Discussions related to our website.
24+
25+
- `#introductions`: Self-introductions and connecting with other members of the community.
26+
27+
- `#community-announcements`: Events and updates related to the JSON Schema project.
28+
29+
- `#anouncements`: Important announcement from the JSON Schema organization.
30+
31+
- `#stack-overflow`: Stack overflow questions tagged with JSON Schema.
32+
33+
## Best practices
34+
35+
This is a list of best practices the JSON Schema project strives for and resources we recommend for additional information:
36+
37+
1. File and branching naming conventions: We use dashes instead of spaces, and lowercase letters to name .md files and branches. For example: `implementers-guide.md`, `web-feat-diataxis`.
38+
2. Commit messages: To learn how to write good commit messages, see [Step-by-step guide on how to write good commit messages on Git](https://www.freecodecamp.org/news/how-to-write-better-git-commit-messages/).
39+
40+
## Contribution workflow
41+
42+
Here we describe three ways you can help us improve our documentation:
43+
44+
45+
1. Review pull requests
46+
2. Work on an existing issue
47+
3. Propose changes
48+
49+
### Review pull requests
50+
51+
Are you new to the JSON Schema community? Help us review pull requests. Reviewing pull requests helps you familiarize yourself with our workflows, learn how others contribute, and understand the project's needs and goals. It's a great way to start contributing and you'll be better prepared to make your own contributions.
52+
53+
### Work on an existing issue
54+
55+
To work on an existing issue, go to the [JSON Schema docs board](https://github.com/orgs/json-schema-org/projects/16) and check all the open issues.
56+
57+
If the issue you select has no assignees, you can claim the issue by assigning it to yourself and tag @json-schema-org/docs-team in the comments to let us know you'll be working on it.
58+
59+
If the issue you select has already an assignee, write a comment expressing your interest in collaborating with them. The JSON Schema respects the order in which people claim issues, therefore, you will have to check if the assignee is accepting collaborations.
60+
61+
After you have been assigned to an issue, fork the [json-schema-org/website](https://github.com/json-schema-org/website) repository and create a new branch from `main` to work on the changes.
62+
63+
### Propose changes
64+
65+
To propose modifications to our documentation that do not have an issue in the [documentation board](https://github.com/orgs/json-schema-org/projects/16), you can [create a GitHub issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/creating-an-issue#creating-an-issue-from-a-repository) and use the *Documentation* template to describe the changes. After that, you can decide whether you want to work on the changes yourself or let someone else claim the issue. If you decide to work on the issue, assign it to yourself and commit the changes to a new branch.
66+
67+
## Create a Pull Request
68+
69+
To submit your work to review by the community, open a draft pull request to the `main` upstream branch, and add the issue your pull request solves. Add @json-schema-org/docs-team as a reviewer of your pull request, and let us know in the #documentation Slack channel your pull request is ready for review.
70+
71+
The reviewers might ask for additional changes. When they approve your pull request, you can merge your changes into `main` and your contribution to the project will be complete!
72+
73+
<br>
74+
75+
We created this guide based on templates from [The Good Docs Project](https://www.thegooddocsproject.dev/).

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ All types of contributions are encouraged and valued. See the [Table of Contents
66

77
If you don't have time to contribute, that's fine. There are other easy ways to support the project and show your appreciation:
88
- Star the project on Github
9-
- Post on Twitter or Linkedin about JSON Schema `#jsonschema
9+
- Post on X or Linkedin about JSON Schema `#jsonschema
1010

1111
## Table of Contents
1212

@@ -61,7 +61,7 @@ To publish a case study, we encourage you to join `#adopters` channel in our [Sl
6161

6262
### 📋 Improving the Documentation
6363

64-
If you would like to join the efforts to improve the JSON Schema Documentation, we encourage you to check our [documentation board](https://github.com/orgs/json-schema-org/projects/16) to get a sense of the pending issues and who is doing what. We encourage you to join the discussion on the [issue #421](https://github.com/json-schema-org/community/issues/421) so you can see the long term vision for our docs. We also invite you to join the discussion in `#documentation` channel in our [Slack workspace](https://json-schema.org/slack).
64+
Want to help us improve the JSON Schema documentation? Check out our [docs Contributing guide](https://github.com/json-schema-org/website/blob/main/CONTRIBUTING-docs.md) for docs and Style guide. These documents will give you the basics of our processes to get you started and text-formatting guidelines to create consistent documentation for JSON Schema.
6565

6666
### 🌐 Improving the Website
6767

INSTALLATION.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ git submodule update
4949

5050
### Setting Up Environment Variables
5151

52+
This step is optional. Environment variables are not required to run the website on your local development server.
53+
5254
1. Create a new `.env` file by copying the contents of the `.env.example` into `.env` file. Use this command:
5355
```
5456
cp .env.example .env

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Thanks goes to these wonderful people who contributed to this website:
8989

9090
<p align="left">
9191
<a href="https://json-schema.org/slack" target="blank" style="margin-right: 5px;"><img align="center" src="https://img.icons8.com/color/48/null/slack-new.png" alt="JSON Schema Slack" height="30" width="40" /></a>
92-
<a href="https://twitter.com/jsonschema" target="blank" style="margin-right: 5px;"><img align="center" src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/twitter.svg" alt="JSON Schema Twitter" height="30" width="40" /></a>
92+
<a href="https://x.com/jsonschema" target="blank" style="margin-right: 5px;"><img align="center" src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/twitter.svg" alt="JSON Schema Twitter" height="30" width="40" /></a>
9393
<a href="https://www.linkedin.com/company/jsonschema" target="blank" style="margin-right: 5px;"><img align="center" src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/linked-in-alt.svg" alt="JSON Schema LinkedIn" height="30" width="40" /></a>
9494
<a href="https://www.youtube.com/@JSONSchemaOrgOfficial" target="blank"><img align="center" src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/youtube.svg" alt="JSON Schema YouTube" height="30" width="40" /></a>
9595
</p>

components/Layout.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,11 +345,10 @@ const Footer = () => (
345345
</div>
346346
<div className=''>
347347
<a
348-
href='https://twitter.com/jsonschema'
348+
href='https://x.com/jsonschema'
349349
className='flex items-center text-white'
350350
>
351-
<img src='/img/logos/x-twitter.svg' className='w-4 h-4 mr-2' />
352-
Twitter
351+
<img src='/img/logos/x-twitter.svg' className='w-4 h-4 mr-2' />X
353352
</a>
354353
</div>
355354
<div className=''>

components/Sidebar.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ const getDocsPath = [
109109
'/overview/use-cases',
110110
'/overview/code-of-conduct',
111111
'/overview/faq',
112+
'/overview/roadmap',
112113
];
113114
const getStartedPath = [
114115
'/learn',
@@ -362,6 +363,7 @@ export const DocsNav = ({
362363
label='What is JSON Schema?'
363364
setOpen={setOpen}
364365
/>
366+
<DocLink uri='/overview/roadmap' label='Roadmap' setOpen={setOpen} />
365367
<DocLink
366368
uri='/overview/sponsors'
367369
label='Sponsors'

context.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export const SectionContext = React.createContext<
1919
| 'overview'
2020
| 'getting-started'
2121
| 'reference'
22+
| 'roadmap'
2223
>(null);
2324
export const BlockContext = React.createContext<BlockContextValue | null>(null);
2425
export const FullMarkdownContext = React.createContext<string | null>(null);

data/case-studies.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"title": "How JSON Schema Was an Obvious Choice at GitHub",
44
"summary": "At GitHub's Docs Engineering team, while shipping releases to production 20 times per day or more, JSON Schema is critical in increasing confidence in changes to data, content and APIs.",
5-
"logo": "/img/logos/github-logo.png",
5+
"logo": "/img/logos/github-logo.svg",
66
"links": {
77
"lang": "URL1",
88
"url": "/blog/posts/github-case-study"

0 commit comments

Comments
 (0)