Skip to content

Commit

Permalink
sync eslint and prettier config
Browse files Browse the repository at this point in the history
  • Loading branch information
xmliszt committed Dec 17, 2023
1 parent 73c2372 commit 4c387e9
Show file tree
Hide file tree
Showing 154 changed files with 1,650 additions and 2,420 deletions.
13 changes: 11 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,22 @@ module.exports = {
ecmaVersion: 'latest',
sourceType: 'module',
},
plugins: ['@typescript-eslint'],
plugins: ['@typescript-eslint', 'unused-imports'],
rules: {
'react-hooks/exhaustive-deps': 'off',
'react/react-in-jsx-scope': 'off',
'no-unused-vars': 'off',
"unused-imports/no-unused-imports": "error",
"unused-imports/no-unused-vars": [
"warn",
{
"vars": "all",
"varsIgnorePattern": "^_",
"args": "after-used",
"argsIgnorePattern": "^_"
}
],
'@typescript-eslint/no-unused-vars': ['error'],
'@typescript-eslint/no-empty-interface': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'require-jsdoc': 'off',
'spaced-comment': 'off',
Expand Down
24 changes: 22 additions & 2 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,29 @@
{
"tabWidth": 2,
"semi": true,
"tabWidth": 2,
"singleQuote": true,
"useTabs": false,
"printWidth": 100,
"jsxSingleQuote": true,
"trailingComma": "es5",
"bracketSpacing": true,
"arrowParens": "always"
"arrowParens": "always",
"plugins": [
"@ianvs/prettier-plugin-sort-imports",
"prettier-plugin-tailwindcss"
],
"importOrder": [
"^(react/(.*)$)|^(react$)",
"^(next/(.*)$)|^(next$)",
"<THIRD_PARTY_MODULES>",
"",
"^@/(.*)$",
"",
"^~/",
"^[../]",
"^[./]"
],
"importOrderParserPlugins": ["typescript", "jsx", "decorators-legacy"],
"importOrderTypeScriptVersion": "5.1.6",
"tailwindFunctions": ["cn", "cva"]
}
2 changes: 1 addition & 1 deletion app/about/loading.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Skeleton } from '@/components/custom/skeleton';

export default function Loading() {
return (
<section className='flex justify-center h-full pt-20 px-4'>
<section className='flex h-full justify-center px-4 pt-20'>
<Skeleton numberOfRows={10} />
</section>
);
Expand Down
9 changes: 5 additions & 4 deletions app/about/page.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
import { SiDiscord } from 'react-icons/si';
import ReactMarkdown from 'react-markdown';
import content from '../../public/features/about.md';

import SocialLinkButton from '../../components/custom/social-link-button';
import { SiDiscord } from 'react-icons/si';
import content from '../../public/features/about.md';

export default async function AboutPage() {
return (
<main className='flex flex-col items-center'>
<article
data-testid='content-article'
className='leading-normal w-10/12 pt-16 lg:pt-32 pb-24'
className='w-10/12 pb-24 pt-16 leading-normal lg:pt-32'
>
<ReactMarkdown>{content}</ReactMarkdown>
<div className='sticky z-40 bottom-4 w-full flex gap-2 justify-center px-2 mt-2'>
<div className='sticky bottom-4 z-40 mt-2 flex w-full justify-center gap-2 px-2'>
<SocialLinkButton
content='Join Discord Community'
icon={<SiDiscord />}
Expand Down
2 changes: 1 addition & 1 deletion app/add-level/loading.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Skeleton } from '@/components/custom/skeleton';

export default function Loading() {
return (
<section className='flex justify-center h-full w-full pt-20 px-4'>
<section className='flex h-full w-full justify-center px-4 pt-20'>
<Skeleton numberOfRows={10} />
</section>
);
Expand Down
Loading

0 comments on commit 4c387e9

Please sign in to comment.