Skip to content

Commit 677b984

Browse files
authored
Merge branch 'json-schema-org:main' into sidebar-sticky
2 parents 8bbb491 + 4fe7488 commit 677b984

Some content is hidden

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

60 files changed

+709
-176
lines changed

components/AmbassadorsCard.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ const SocialIcon = ({ platform }: { platform: SocialIcons }) => {
5555
twitter: (
5656
<svg
5757
className='w-7 h-7 text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100'
58-
viewBox='0 0 24 24'
58+
viewBox='0 0 20 16'
5959
fill='currentColor'
6060
xmlns='http://www.w3.org/2000/svg'
6161
>
62-
<path d='M23.954 4.569c-.885.389-1.83.654-2.825.775a4.932 4.932 0 0 0 2.163-2.723 9.85 9.85 0 0 1-3.127 1.195 4.916 4.916 0 0 0-8.374 4.482A13.936 13.936 0 0 1 1.64 3.161 4.916 4.916 0 0 0 3.195 9.86a4.897 4.897 0 0 1-2.229-.616v.061a4.919 4.919 0 0 0 3.946 4.827 4.897 4.897 0 0 1-2.224.085 4.923 4.923 0 0 0 4.604 3.42A9.869 9.869 0 0 1 .977 19.569a13.94 13.94 0 0 0 7.548 2.211c9.056 0 14.012-7.497 14.012-13.986 0-.213-.005-.425-.015-.636A9.936 9.936 0 0 0 24 4.59a9.94 9.94 0 0 1-2.046.561z' />
62+
<path d='M12.6.75h2.454l-5.36 6.142L16 15.25h-4.937l-3.867-5.07-4.425 5.07H.316l5.733-6.57L0 .75h5.063l3.495 4.633L12.601.75Zm-.86 13.028h1.36L4.323 2.145H2.865z' />
6363
</svg>
6464
),
6565
linkedin: (
@@ -114,15 +114,15 @@ const AmbassadorCard = ({ ambassador }: { ambassador: Ambassador }) => {
114114
contributions = [],
115115
} = ambassador;
116116

117-
const SocialIconss: SocialIcons[] = [
117+
const SocialIcons: SocialIcons[] = [
118118
'github',
119119
'twitter',
120120
'mastodon',
121121
'linkedin',
122122
];
123123

124124
return (
125-
<div className='relative max-w-sm md:max-w-md lg:max-w-lg mx-auto bg-white dark:bg-gray-800 shadow-lg rounded-lg overflow-hidden my-4 transition-all duration-300 h-fit'>
125+
<div className='relative flex flex-col max-w-sm md:max-w-md lg:max-w-lg mx-auto bg-white dark:bg-gray-800 shadow-lg rounded-lg overflow-hidden my-4 h-full'>
126126
<div className='absolute top-0 right-0 w-1 h-20 bg-black dark:bg-gray-400'></div>
127127
<div className='absolute bottom-100 right-0 w-20 h-1 bg-black dark:bg-gray-400'></div>
128128
<div className='absolute bottom-0 left-0 w-1 h-20 bg-black dark:bg-gray-400'></div>
@@ -137,7 +137,7 @@ const AmbassadorCard = ({ ambassador }: { ambassador: Ambassador }) => {
137137
onError={() => setImgSrc(`/img/ambassadors/${name}.jpg`)}
138138
/>
139139

140-
<div className='p-6'>
140+
<div className='flex flex-col flex-grow p-6'>
141141
<h3 className='text-xl font-semibold mb-2 text-gray-900 dark:text-white'>
142142
{name}
143143
</h3>
@@ -157,8 +157,8 @@ const AmbassadorCard = ({ ambassador }: { ambassador: Ambassador }) => {
157157
</p>
158158
)}
159159

160-
<div className='flex justify-center mb-4'>
161-
{SocialIconss.map((platform) => {
160+
<div className='flex justify-center mb-4 mt-auto'>
161+
{SocialIcons.map((platform) => {
162162
const username = ambassador[platform];
163163
return username ? (
164164
<a

components/Layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ const Footer = () => (
400400
</div>
401401
<div className='text-white font-normal text-center relative m-0 ml-0 mr-1 px-4'>
402402
<p>
403-
Copyright © 2024 JSON Schema.&nbsp;
403+
Copyright &copy; {new Date().getFullYear()} JSON Schema.&nbsp;
404404
<span className='block sm:inline sm:mb-0'>All rights reserved.</span>
405405
</p>
406406
</div>

components/Sidebar.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,7 @@ export const DocsNav = ({
379379
setOpen={setOpen}
380380
/>
381381
<DocLink uri='/overview/faq' label='FAQ' setOpen={setOpen} />
382+
<DocLink uri='/pro-help' label='Pro Help' setOpen={setOpen} />
382383
<DocLink
383384
uri='/overview/similar-technologies'
384385
label='Similar Technologies'

components/StyledMarkdown.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ const StyledMarkdownBlock = ({ markdown }: { markdown: string }) => {
173173
h4: { component: Headline4 },
174174
strong: {
175175
component: ({ children }) => (
176-
<strong className='font-semibold text-slate-800 dark:text-slate-500'>
176+
<strong className='font-semibold text-slate-800 dark:text-slate-200'>
177177
{children}
178178
</strong>
179179
),

context.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export const SectionContext = React.createContext<
2121
| 'reference'
2222
| 'roadmap'
2323
| 'ambassador'
24+
| 'pro-help'
2425
>(null);
2526
export const BlockContext = React.createContext<BlockContextValue | null>(null);
2627
export const FullMarkdownContext = React.createContext<string | null>(null);

data/tooling-data.yaml

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3046,4 +3046,63 @@
30463046
license: 'Apache-2.0'
30473047
source: 'https://github.com/pubg/protoc-gen-jsonschema'
30483048
supportedDialects:
3049-
draft: ['4', '6', '7', '2019-09', '2020-12']
3049+
draft: ['4', '6', '7', '2019-09', '2020-12']
3050+
3051+
- name: swift-json-schema
3052+
description: 'swift-json-schema support generating JSON schema using Swift result builders or from Swift types directly using macros.'
3053+
environments: ['macOS', 'iOS', 'tvOS', 'watchOS', 'visionOS', 'Linux']
3054+
toolingTypes: ['validator', 'code-to-schema', 'model-to-schema']
3055+
languages: ['Swift']
3056+
maintainers:
3057+
- name: 'Austin Evans'
3058+
username: 'ajevans99'
3059+
platform: 'github'
3060+
license: 'MIT'
3061+
source: 'https://github.com/ajevans99/swift-json-schema'
3062+
supportedDialects:
3063+
draft: ['2020-12']
3064+
3065+
- name: 'Liquid JSON Schema Editor'
3066+
description: 'Graphical JSON Schema editor for draft-04, draft-06, draft-07, 2019-09 and 2020-12, with split source code and graphical editing. Includes validation of JSON files based on JSON Schema, JSON Sample Generator and JSON Schema Documentation Generator.'
3067+
toolingTypes: ['validator', 'documentation', 'editor']
3068+
languages: ['C#', '.NET']
3069+
environments: ['Microsoft Windows']
3070+
maintainers:
3071+
- name: 'Liquid Technologies Ltd'
3072+
platform: 'other'
3073+
creators:
3074+
- name: 'Liquid Technologies Ltd'
3075+
platform: 'other'
3076+
homepage: 'https://www.liquid-technologies.com/json-schema-editor'
3077+
license: 'Proprietary and Freeware'
3078+
supportedDialects:
3079+
draft: ['4', '6', '7', '2019-09', '2020-12']
3080+
3081+
- name: 'JSON Schema Editor'
3082+
description: 'The JSON schema editor provides an easy UI for building JSON Schema. In addition, users can convert their json schema into SQL, GraphQL, and Protocol Buffers formats. Lastly this tool allows users to generate sample data that conforms to the json schema they have defined.'
3083+
toolingTypes: ['editor']
3084+
maintainers:
3085+
- name: 'robclarabase'
3086+
username: 'robclarabase'
3087+
platform: 'github'
3088+
license: 'MIT'
3089+
source: 'https://github.com/Clarabase/json-schema-editor'
3090+
homepage: 'https://json-schema-editor.onrender.com/'
3091+
supportedDialects:
3092+
draft: ['2020-12']
3093+
3094+
- name: JSV
3095+
description: 'A generic JSON Schema validator for Elixir'
3096+
environments: ['Linux', 'MacOS', 'Windows','Embedded platform']
3097+
toolingTypes: ['validator']
3098+
languages: ['Elixir', 'Erlang']
3099+
maintainers:
3100+
- name: 'Ludovic Demblans'
3101+
username: 'lud'
3102+
platform: 'github'
3103+
license: 'MIT'
3104+
source: 'https://github.com/lud/jsv'
3105+
homepage: 'https://hex.pm/packages/jsv'
3106+
supportedDialects:
3107+
draft: ['2020-12', '7']
3108+
toolingListingNotes: 'JSON Schema Validation for Elixir according to the latest specifications. Supports compile-time schema builds, custom dialects and custom formats.'

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@docsearch/react": "3.8.0",
3030
"@types/jsonpath": "^0.2.4",
3131
"axios": "1.7.7",
32-
"babel-loader": "^9.1.3",
32+
"babel-loader": "^9.2.1",
3333
"classnames": "^2.5.1",
3434
"feed": "^4.2.2",
3535
"file-saver": "^2.0.5",
@@ -43,7 +43,7 @@
4343
"next": "14.2.14",
4444
"next-sitemap": "^4.2.3",
4545
"next-themes": "^0.3.0",
46-
"node-ical": "0.19.0",
46+
"node-ical": "0.20.1",
4747
"react": "18.3.1",
4848
"react-dom": "18.3.1",
4949
"react-syntax-highlighter": "^15.6.1",

pages/[slug].page.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import getStaticMarkdownProps from '~/lib/getStaticMarkdownProps';
77
import { Headline1 } from '~/components/Headlines';
88
import { SectionContext } from '~/context';
99
import { DocsHelp } from '~/components/DocsHelp';
10+
import NextPrevButton from '~/components/NavigationButtons';
1011

1112
export async function getStaticPaths() {
1213
return getStaticMarkdownPaths('pages');
@@ -31,6 +32,12 @@ export default function StaticMarkdownPage({
3132
</Head>
3233
<Headline1>{frontmatter.title}</Headline1>
3334
<StyledMarkdown markdown={content} />
35+
<NextPrevButton
36+
prevLabel={frontmatter?.prev?.label}
37+
prevURL={frontmatter?.prev?.url}
38+
nextLabel={frontmatter?.next?.label}
39+
nextURL={frontmatter?.next?.url}
40+
/>
3441
<DocsHelp markdownFile={markdownFile} />
3542
</SectionContext.Provider>
3643
);

pages/implementers/[slug].page.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import getStaticMarkdownProps from '~/lib/getStaticMarkdownProps';
77
import { Headline1 } from '~/components/Headlines';
88
import { SectionContext } from '~/context';
99
import { DocsHelp } from '~/components/DocsHelp';
10+
import NextPrevButton from '~/components/NavigationButtons';
1011

1112
export async function getStaticPaths() {
1213
return getStaticMarkdownPaths('pages/implementers');
@@ -31,6 +32,12 @@ export default function StaticMarkdownPage({
3132
</Head>
3233
<Headline1>{frontmatter.title}</Headline1>
3334
<StyledMarkdown markdown={content} />
35+
<NextPrevButton
36+
prevLabel={frontmatter?.prev?.label}
37+
prevURL={frontmatter?.prev?.url}
38+
nextLabel={frontmatter?.next?.label}
39+
nextURL={frontmatter?.next?.url}
40+
/>
3441
<DocsHelp markdownFile={markdownFile} />
3542
</SectionContext.Provider>
3643
);

0 commit comments

Comments
 (0)