Skip to content

Commit b0c19e4

Browse files
committed
merged with main
2 parents ec64330 + 7b97d30 commit b0c19e4

34 files changed

+458
-203
lines changed

.eslintrc.js

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,58 +2,59 @@ module.exports = {
22
env: {
33
es2021: true,
44
node: true,
5-
browser: true
5+
browser: true,
66
},
77
settings: {
88
react: {
9-
version: 'detect'
10-
}
9+
version: 'detect',
10+
},
1111
},
1212
extends: [
1313
'eslint:recommended',
1414
'plugin:react/recommended',
1515
'plugin:@typescript-eslint/recommended',
1616
'plugin:react-hooks/recommended',
1717
'plugin:@next/next/recommended',
18-
'plugin:prettier/recommended'
18+
'plugin:prettier/recommended',
1919
],
2020
parser: '@typescript-eslint/parser',
2121
parserOptions: {
2222
ecmaFeatures: {
23-
jsx: true
23+
jsx: true,
2424
},
2525
ecmaVersion: 12,
26-
sourceType: 'module'
26+
sourceType: 'module',
2727
},
28-
plugins: [
29-
'react',
30-
'@typescript-eslint',
31-
'prettier'
32-
],
28+
plugins: ['react', '@typescript-eslint', 'prettier'],
3329
rules: {
3430
'array-bracket-spacing': ['error', 'never'],
3531
'object-curly-spacing': ['error', 'always'],
36-
'react/jsx-curly-spacing': ['error', { 'when': 'never', 'children': true }],
37-
'indent': ['error', 2, { 'SwitchCase': 1 }],
32+
33+
'react/jsx-curly-spacing': ['error', { when: 'never', children: true }],
34+
indent: ['error', 2, { SwitchCase: 1 }],
3835
'linebreak-style': ['error', 'unix'],
39-
'quotes': ['error', 'single'],
36+
quotes: ['error', 'single'],
37+
4038
'jsx-quotes': ['error', 'prefer-single'],
4139
'no-eval': 'error',
4240
'@typescript-eslint/no-explicit-any': 'off',
4341
'@typescript-eslint/explicit-module-boundary-types': 'off',
4442
'@typescript-eslint/ban-ts-comment': 'off',
45-
'@typescript-eslint/no-unused-vars': ['error', { 'ignoreRestSiblings': true }],
43+
'@typescript-eslint/no-unused-vars': [
44+
'error',
45+
{ ignoreRestSiblings: true },
46+
],
4647
'@typescript-eslint/type-annotation-spacing': ['error'],
4748
'react/no-unescaped-entities': 'off',
4849
'react/jsx-tag-spacing': 'error',
4950
'react-hooks/exhaustive-deps': 'off',
50-
'keyword-spacing': ['error', { 'before': true, 'after': true }],
51-
'comma-spacing': ['error', { 'before': false, 'after': true }],
52-
'key-spacing': ['error', { 'beforeColon': false, 'afterColon': true }],
51+
'keyword-spacing': ['error', { before: true, after: true }],
52+
'comma-spacing': ['error', { before: false, after: true }],
53+
'key-spacing': ['error', { beforeColon: false, afterColon: true }],
5354
'@next/next/no-img-element': 'off',
5455
'no-multi-spaces': 'error',
5556
'space-infix-ops': 'error',
5657
'space-before-blocks': 'error',
57-
'arrow-spacing': 'error'
58-
}
59-
}
58+
'arrow-spacing': 'error',
59+
},
60+
};

.github/workflows/welcome-first-time-contrib.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
name: Greeting the new contributor
22

3+
<<<<<<< HEAD
34
on: [pull_request, issues]
45

6+
=======
7+
on:
8+
pull_request_target:
9+
types: [opened]
10+
issues:
11+
types: [opened]
12+
13+
>>>>>>> 7b97d3088cb76b3a9155bb0e180727d5bb625af5
514
jobs:
615
greeting:
716
runs-on: ubuntu-latest

components/Code.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ export default function Code({ children }: { children: any }) {
88
return (
99
<code
1010
className={classnames('font-mono rounded px-1.5 py-0.5', {
11-
'bg-slate-100': blockContext === null,
12-
'bg-amber-200': blockContext === BlockContextValue.Information,
11+
'bg-slate-100 dark:bg-slate-900': blockContext === null,
12+
'bg-amber-200': blockContext === BlockContextValue.Infobox,
1313
'text-white': blockContext === BlockContextValue.CodeBlock,
1414
})}
1515
>

components/DarkModeToggle.tsx

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
import { useTheme } from 'next-themes';
2+
import { useEffect, useState } from 'react';
3+
import React from 'react';
4+
5+
const DarkModeToggle = () => {
6+
const { theme, setTheme } = useTheme();
7+
const [isDarkMode, setIsDarkMode] = useState(theme === 'dark');
8+
const [isClickable, setIsClickable] = useState(true);
9+
const [img, setImg] = useState('/icons/moon.svg');
10+
11+
const toggleDarkMode = () => {
12+
if (!isClickable) return;
13+
14+
setIsClickable(false);
15+
const newTheme = isDarkMode ? 'light' : 'dark';
16+
setTheme(newTheme);
17+
setIsDarkMode(!isDarkMode);
18+
19+
setTimeout(() => {
20+
setIsClickable(true);
21+
}, 500);
22+
};
23+
24+
useEffect(() => {
25+
if (!theme) setTheme('light');
26+
27+
const img = theme === 'dark' ? '/icons/sun.svg' : '/icons/moon.svg';
28+
setImg(img);
29+
}, [theme, setTheme]);
30+
31+
return (
32+
<button
33+
onClick={toggleDarkMode}
34+
className='dark-mode-toggle rounded-md dark:hover:bg-gray-700 p-1.5 hover:bg-gray-100 focus:bg-gray-100 focus:outline-none transition duration-150'
35+
disabled={!isClickable}
36+
>
37+
<img src={img} alt='Dark Mode' width={25} height={25} />
38+
</button>
39+
);
40+
};
41+
42+
export default DarkModeToggle;

components/DocsHelp.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export function DocsHelp() {
6565
};
6666

6767
return (
68-
<section className='mt-10 mb-4 text-gray-600'>
68+
<section className='mt-10 mb-4 text-gray-600 dark:text-white'>
6969
<h2 className='text-[24px] font-semibold'>Need Help?</h2>
7070
<div className='grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-8 pt-10 border-t border-gray-600'>
7171
<div>
@@ -90,7 +90,7 @@ export function DocsHelp() {
9090
value='Y'
9191
></input>
9292
<label
93-
className='px-[16px] py-[8px] cursor-pointer border-solid border-[#aaaaaa] border rounded-md peer-checked/feedback-survery-yes:bg-[#1f6feb] peer-checked/feedback-survery-yes:text-white hover:bg-gray-200'
93+
className='px-[16px] py-[8px] cursor-pointer border-solid border-[#aaaaaa] border rounded-md peer-checked/feedback-survery-yes:bg-[#1f6feb] peer-checked/feedback-survery-yes:text-white hover:bg-gray-200 dark:hover:bg-gray-600'
9494
htmlFor='feedback-survey-yes'
9595
onClick={() => {
9696
setIsFormOpen(true);
@@ -118,7 +118,7 @@ export function DocsHelp() {
118118
value='N'
119119
></input>
120120
<label
121-
className='px-[16px] py-[8px] cursor-pointer border-solid border-[#aaaaaa] border rounded-md mx-2 peer-checked/feedback-survery-no:bg-[#da3633] peer-checked/feedback-survery-no:text-white hover:bg-gray-200'
121+
className='px-[16px] py-[8px] cursor-pointer border-solid border-[#aaaaaa] border rounded-md mx-2 peer-checked/feedback-survery-no:bg-[#da3633] peer-checked/feedback-survery-no:text-white hover:bg-gray-200 dark:hover:bg-gray-600'
122122
htmlFor='feedback-survey-no'
123123
onClick={() => {
124124
setIsFormOpen(true);
@@ -165,7 +165,7 @@ export function DocsHelp() {
165165
<div className='flex justify-start items-center mt-1 text-[14px]'>
166166
<button
167167
type='submit'
168-
className={`px-[16px] py-[7px] cursor-pointer border-solid border-[#aaaaaa] border rounded-md ${isSubmitting ? 'cursor-not-allowed opacity-50' : 'hover:bg-gray-200'}`}
168+
className={`px-[16px] py-[7px] cursor-pointer border-solid border-[#aaaaaa] border rounded-md ${isSubmitting ? 'cursor-not-allowed opacity-50' : 'hover:bg-gray-200 dark:hover:bg-gray-600'}`}
169169
disabled={isSubmitting}
170170
>
171171
<svg
@@ -187,7 +187,7 @@ export function DocsHelp() {
187187
<div className='flex justify-start items-center mt-1 text-[14px]'>
188188
<button
189189
type='button'
190-
className={`px-[16px] py-[7px] cursor-pointer border-solid border-[#aaaaaa] border rounded-md ${isSubmitting ? 'cursor-not-allowed opacity-50' : 'hover:bg-gray-200'}`}
190+
className={`px-[16px] py-[7px] cursor-pointer border-solid border-[#aaaaaa] border rounded-md ${isSubmitting ? 'cursor-not-allowed opacity-50' : 'hover:bg-gray-200 dark:hover:bg-gray-600'}`}
191191
disabled={isSubmitting}
192192
onClick={createGitHubIssueHandler}
193193
>
@@ -249,7 +249,7 @@ export function DocsHelp() {
249249
<a
250250
target='_blank'
251251
rel='noreferrer'
252-
className='px-[16px] py-[8px] cursor-pointer border-solid border-[#aaaaaa] border rounded-md hover:bg-gray-200'
252+
className='px-[16px] py-[8px] cursor-pointer border-solid border-[#aaaaaa] border rounded-md hover:bg-gray-200 dark:hover:bg-gray-600'
253253
href='https://github.com/orgs/json-schema-org/projects/16'
254254
>
255255
<svg

components/Headlines.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ const Headline1Tag = ({ children, attributes }: TagProps) => (
8585
{...attributes}
8686
className={classnames(
8787
attributes?.className,
88-
'text-h1mobile md:text-h1 font-bold pt-10 mb-6',
88+
'text-h1mobile md:text-h1 dark:text-slate-200 font-bold pt-10 mb-6',
8989
)}
9090
>
9191
{children}
@@ -96,7 +96,7 @@ const Headline2Tag = ({ children, attributes }: TagProps) => (
9696
{...attributes}
9797
className={classnames(
9898
attributes?.className,
99-
'text-h2mobile md:text-h2 font-semibold mt-10 mb-4',
99+
'text-h2mobile md:text-h2 dark:text-slate-200 font-semibold mt-10 mb-4',
100100
)}
101101
>
102102
{children}
@@ -107,7 +107,7 @@ const Headline3Tag = ({ children, attributes }: TagProps) => (
107107
{...attributes}
108108
className={classnames(
109109
attributes?.className,
110-
'text-h3mobile md:text-h3 font-semibold mt-6 mb-3',
110+
'text-h3mobile dark:text-slate-200 md:text-h3 font-semibold mt-6 mb-3',
111111
)}
112112
>
113113
{children}
@@ -118,7 +118,7 @@ const Headline4Tag = ({ children, attributes }: TagProps) => (
118118
{...attributes}
119119
className={classnames(
120120
attributes?.className,
121-
'text-h4mobile md:text-h4 font-semibold mt-4 mb-2',
121+
'text-h4mobile dark:text-slate-200 md:text-h4 font-semibold mt-4 mb-2',
122122
)}
123123
>
124124
{children}

0 commit comments

Comments
 (0)