Skip to content

Commit

Permalink
Merge branch 'main' into add-tooling-java-json-validator
Browse files Browse the repository at this point in the history
  • Loading branch information
benjagm authored Jan 7, 2025
2 parents 2a9fd47 + 0caf296 commit 5fd2bef
Show file tree
Hide file tree
Showing 6 changed files with 93 additions and 26 deletions.
14 changes: 7 additions & 7 deletions components/AmbassadorsCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ const SocialIcon = ({ platform }: { platform: SocialIcons }) => {
twitter: (
<svg
className='w-7 h-7 text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100'
viewBox='0 0 24 24'
viewBox='0 0 20 16'
fill='currentColor'
xmlns='http://www.w3.org/2000/svg'
>
<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' />
<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' />
</svg>
),
linkedin: (
Expand Down Expand Up @@ -114,15 +114,15 @@ const AmbassadorCard = ({ ambassador }: { ambassador: Ambassador }) => {
contributions = [],
} = ambassador;

const SocialIconss: SocialIcons[] = [
const SocialIcons: SocialIcons[] = [
'github',
'twitter',
'mastodon',
'linkedin',
];

return (
<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'>
<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'>
<div className='absolute top-0 right-0 w-1 h-20 bg-black dark:bg-gray-400'></div>
<div className='absolute bottom-100 right-0 w-20 h-1 bg-black dark:bg-gray-400'></div>
<div className='absolute bottom-0 left-0 w-1 h-20 bg-black dark:bg-gray-400'></div>
Expand All @@ -137,7 +137,7 @@ const AmbassadorCard = ({ ambassador }: { ambassador: Ambassador }) => {
onError={() => setImgSrc(`/img/ambassadors/${name}.jpg`)}
/>

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

<div className='flex justify-center mb-4'>
{SocialIconss.map((platform) => {
<div className='flex justify-center mb-4 mt-auto'>
{SocialIcons.map((platform) => {
const username = ambassador[platform];
return username ? (
<a
Expand Down
58 changes: 58 additions & 0 deletions data/tooling-data.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3065,3 +3065,61 @@
supportedDialects:
draft: ['4', '6', '7', '2019-09', '2020-12']

- name: swift-json-schema
description: 'swift-json-schema support generating JSON schema using Swift result builders or from Swift types directly using macros.'
environments: ['macOS', 'iOS', 'tvOS', 'watchOS', 'visionOS', 'Linux']
toolingTypes: ['validator', 'code-to-schema', 'model-to-schema']
languages: ['Swift']
maintainers:
- name: 'Austin Evans'
username: 'ajevans99'
platform: 'github'
license: 'MIT'
source: 'https://github.com/ajevans99/swift-json-schema'
supportedDialects:
draft: ['2020-12']

- name: 'Liquid JSON Schema Editor'
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.'
toolingTypes: ['validator', 'documentation', 'editor']
languages: ['C#', '.NET']
environments: ['Microsoft Windows']
maintainers:
- name: 'Liquid Technologies Ltd'
platform: 'other'
creators:
- name: 'Liquid Technologies Ltd'
platform: 'other'
homepage: 'https://www.liquid-technologies.com/json-schema-editor'
license: 'Proprietary and Freeware'
supportedDialects:
draft: ['4', '6', '7', '2019-09', '2020-12']

- name: 'JSON Schema Editor'
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.'
toolingTypes: ['editor']
maintainers:
- name: 'robclarabase'
username: 'robclarabase'
platform: 'github'
license: 'MIT'
source: 'https://github.com/Clarabase/json-schema-editor'
homepage: 'https://json-schema-editor.onrender.com/'
supportedDialects:
draft: ['2020-12']

- name: JSV
description: 'A generic JSON Schema validator for Elixir'
environments: ['Linux', 'MacOS', 'Windows','Embedded platform']
toolingTypes: ['validator']
languages: ['Elixir', 'Erlang']
maintainers:
- name: 'Ludovic Demblans'
username: 'lud'
platform: 'github'
license: 'MIT'
source: 'https://github.com/lud/jsv'
homepage: 'https://hex.pm/packages/jsv'
supportedDialects:
draft: ['2020-12', '7']
toolingListingNotes: 'JSON Schema Validation for Elixir according to the latest specifications. Supports compile-time schema builds, custom dialects and custom formats.'
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@docsearch/react": "3.8.0",
"@types/jsonpath": "^0.2.4",
"axios": "1.7.7",
"babel-loader": "^9.1.3",
"babel-loader": "^9.2.1",
"classnames": "^2.5.1",
"feed": "^4.2.2",
"file-saver": "^2.0.5",
Expand All @@ -43,7 +43,7 @@
"next": "14.2.14",
"next-sitemap": "^4.2.3",
"next-themes": "^0.3.0",
"node-ical": "0.19.0",
"node-ical": "0.20.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-syntax-highlighter": "^15.6.1",
Expand Down
6 changes: 2 additions & 4 deletions pages/overview/case-studies/index.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,8 @@ export default function ContentExample() {
</Head>
<Headline1>{newTitle}</Headline1>
<p className='text-[18px]'>
{/* Please fix below dummy text and make it two to three liner so that we can remove the bug of layout shifting :) */}
Learn how organizations are adopting and benefiting from JSON Schema.
Please replace this text with a two to three liner so that we can avoid
the layout shifting bug.
Learn how organizations are adopting JSON Schema to improve data
management, ensure consistency, and streamline workflows across systems.
</p>
<div className='mx-auto my-[10px] mt-8 grid w-full grid-cols-1 gap-6 sm:grid-cols-2 lg:w-full'>
{data.map((element, index) => (
Expand Down
4 changes: 2 additions & 2 deletions pages/specification-links.md
Original file line number Diff line number Diff line change
Expand Up @@ -498,8 +498,8 @@ The next unreleased draft is a work in progress. You can [give feedback and get

The specification links here link to the raw sources. We do not provide rendered [work-in-progress](work-in-progress) drafts except near the very end of a publication cycle, during the final review period.

- Core: [jsonschema-core.md](https://github.com/json-schema-org/json-schema-spec/blob/main/jsonschema-core.md)
- Validation: [jsonschema-validation.md](https://github.com/json-schema-org/json-schema-spec/blob/main/jsonschema-validation.md)
- Core: [jsonschema-core.md](https://github.com/json-schema-org/json-schema-spec/blob/main/specs/jsonschema-core.md)
- Validation: [jsonschema-validation.md](https://github.com/json-schema-org/json-schema-spec/blob/main/specs/jsonschema-validation.md)
- Hyper-Schema: [jsonschema-hyperschema.xml](https://github.com/json-schema-org/json-hyperschema-spec/blob/main/jsonschema-hyperschema.xml)
- Relative JSON Pointer: [relative-json-pointer.xml](https://github.com/json-schema-org/json-schema-spec/blob/master/relative-json-pointer.xml)
- [JSON Schema meta-schema](https://github.com/json-schema-org/json-schema-spec/blob/master/schema.json)
Expand Down
33 changes: 22 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4548,6 +4548,17 @@ __metadata:
languageName: node
linkType: hard

"axios@npm:^1.7.7":
version: 1.7.9
resolution: "axios@npm:1.7.9"
dependencies:
follow-redirects: "npm:^1.15.6"
form-data: "npm:^4.0.0"
proxy-from-env: "npm:^1.1.0"
checksum: 10c0/b7a41e24b59fee5f0f26c1fc844b45b17442832eb3a0fb42dd4f1430eb4abc571fe168e67913e8a1d91c993232bd1d1ab03e20e4d1fee8c6147649b576fc1b0b
languageName: node
linkType: hard

"axobject-query@npm:^3.2.1":
version: 3.2.1
resolution: "axobject-query@npm:3.2.1"
Expand All @@ -4557,16 +4568,16 @@ __metadata:
languageName: node
linkType: hard

"babel-loader@npm:^9.1.3":
version: 9.1.3
resolution: "babel-loader@npm:9.1.3"
"babel-loader@npm:^9.2.1":
version: 9.2.1
resolution: "babel-loader@npm:9.2.1"
dependencies:
find-cache-dir: "npm:^4.0.0"
schema-utils: "npm:^4.0.0"
peerDependencies:
"@babel/core": ^7.12.0
webpack: ">=5"
checksum: 10c0/e3fc3c9e02bd908b37e8e8cd4f3d7280cf6ac45e33fc203aedbb615135a0fecc33bf92573b71a166a827af029d302c0b060354985cd91d510320bd70a2f949eb
checksum: 10c0/efb82faff4c7c27e9c15bb28bf11c73200e61cf365118a9514e8d74dd489d0afc2a0d5aaa62cb4254eefc2ab631579224d95a03fd245410f28ea75e24de54ba4
languageName: node
linkType: hard

Expand Down Expand Up @@ -8307,7 +8318,7 @@ __metadata:
"@typescript-eslint/parser": "npm:^6.21.0"
autoprefixer: "npm:^10.4.20"
axios: "npm:1.7.7"
babel-loader: "npm:^9.1.3"
babel-loader: "npm:^9.2.1"
babel-plugin-istanbul: "npm:^7.0.0"
classnames: "npm:^2.5.1"
cypress: "npm:^13.13.1"
Expand Down Expand Up @@ -8336,7 +8347,7 @@ __metadata:
next: "npm:14.2.14"
next-sitemap: "npm:^4.2.3"
next-themes: "npm:^0.3.0"
node-ical: "npm:0.19.0"
node-ical: "npm:0.20.1"
nyc: "npm:^17.1.0"
postcss: "npm:^8.4.41"
prettier: "npm:3.3.3"
Expand Down Expand Up @@ -9151,15 +9162,15 @@ __metadata:
languageName: node
linkType: hard

"node-ical@npm:0.19.0":
version: 0.19.0
resolution: "node-ical@npm:0.19.0"
"node-ical@npm:0.20.1":
version: 0.20.1
resolution: "node-ical@npm:0.20.1"
dependencies:
axios: "npm:1.7.7"
axios: "npm:^1.7.7"
moment-timezone: "npm:^0.5.45"
rrule: "npm:2.8.1"
uuid: "npm:^10.0.0"
checksum: 10c0/15788f5a658eccb0b3ec7e692f8e882612a5e55926ab7d55e4540bdb88963e548f35388486a2d95e75caa939db840560ff4a159db46ffa509ec35df40c62b12c
checksum: 10c0/3e95ece63f0420f96b611913e0134660120bf2e87da8b1afbc73b6db2cbe2ad20d9b76ad912fa80b20923c64f0002869d98edaa53d143aa5989d223ff12ef621
languageName: node
linkType: hard

Expand Down

0 comments on commit 5fd2bef

Please sign in to comment.