From 11504e0f650966c9bc1730ee9ec56e49f82c3501 Mon Sep 17 00:00:00 2001 From: Chika Date: Sun, 8 May 2022 15:31:17 +0300 Subject: [PATCH] code-style: eslint autofix --- .prettierrc | 32 ++++++++++++++++---------------- Components/Layout/Auth.jsx | 4 ++-- Components/Layout/Header.jsx | 18 ++++++++++-------- Components/Layout/Logo.jsx | 26 ++++++++++++++------------ Components/Layout/index.jsx | 1 + Components/Spinner.jsx | 9 ++++++++- next.config.js | 4 +++- package.json | 2 +- pages/500.jsx | 2 +- pages/_app.tsx | 1 + pages/_document.jsx | 8 ++++---- pages/index.tsx | 14 +++++++++----- 12 files changed, 70 insertions(+), 51 deletions(-) diff --git a/.prettierrc b/.prettierrc index 26ad837..d268dc8 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,18 +1,18 @@ { - "endOfLine": "auto", - "arrowParens": "always", - "bracketSpacing": true, - "htmlWhitespaceSensitivity": "ignore", - "insertPragma": false, - "jsxBracketSameLine": false, - "jsxSingleQuote": false, - "printWidth": 80, - "proseWrap": "preserve", - "quoteProps": "as-needed", - "requirePragma": false, - "semi": true, - "singleQuote": true, - "tabWidth": 2, - "trailingComma": "es5", - "useTabs": false +"endOfLine": "auto", +"arrowParens": "always", +"bracketSpacing": true, +"htmlWhitespaceSensitivity": "ignore", +"insertPragma": false, +"jsxBracketSameLine": false, +"jsxSingleQuote": false, +"printWidth": 80, +"proseWrap": "preserve", +"quoteProps": "as-needed", +"requirePragma": false, +"semi": true, +"singleQuote": true, +"tabWidth": 2, +"trailingComma": "es5", +"useTabs": false } diff --git a/Components/Layout/Auth.jsx b/Components/Layout/Auth.jsx index f2deb0e..439d702 100644 --- a/Components/Layout/Auth.jsx +++ b/Components/Layout/Auth.jsx @@ -37,7 +37,7 @@ const Logout = styled.a` } `; -const Auth = () => { +function Auth() { return ( { Выход ); -}; +} export default Auth; diff --git a/Components/Layout/Header.jsx b/Components/Layout/Header.jsx index a49ddf8..d316d93 100644 --- a/Components/Layout/Header.jsx +++ b/Components/Layout/Header.jsx @@ -29,13 +29,15 @@ const Wrapper = styled.header` z-index: 999999; `; -const Header = () => ( - - - - - - -); +function Header() { + return ( + + + + + + + ); +} export default Header; diff --git a/Components/Layout/Logo.jsx b/Components/Layout/Logo.jsx index 4d8ffc2..14f8739 100644 --- a/Components/Layout/Logo.jsx +++ b/Components/Layout/Logo.jsx @@ -23,17 +23,19 @@ const LogoText = styled.h3` } `; -const Logo = () => ( - - - logo - - Лизинговый Калькулятор - -); +function Logo() { + return ( + + + logo + + Лизинговый Калькулятор + + ); +} export default Logo; diff --git a/Components/Layout/index.jsx b/Components/Layout/index.jsx index e64c607..d32fc28 100644 --- a/Components/Layout/index.jsx +++ b/Components/Layout/index.jsx @@ -1,3 +1,4 @@ +/* eslint-disable react/prop-types */ import styled from 'styled-components'; import { Flex } from 'UIKit/grid'; import { min } from 'UIKit/mq'; diff --git a/Components/Spinner.jsx b/Components/Spinner.jsx index f7ab91f..5c094f5 100644 --- a/Components/Spinner.jsx +++ b/Components/Spinner.jsx @@ -3,5 +3,12 @@ import { Spin } from 'antd'; export default Spin; -const loadingOutlined = ; +const loadingOutlined = ( + +); export const Outlined = ; diff --git a/next.config.js b/next.config.js index ba20707..61e35bd 100644 --- a/next.config.js +++ b/next.config.js @@ -5,7 +5,9 @@ const withGraphQL = require('next-plugin-graphql'); /** @type {import('next').NextConfig} */ const nextConfig = { reactStrictMode: true, - eslint: { ignoreDuringBuilds: true }, + eslint: { + ignoreDuringBuilds: true, + }, compiler: { styledComponents: true, }, diff --git a/package.json b/package.json index da4665c..9708ba5 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "build": "next build", "start": "next start", "lint": "next lint", - "lint:fix": "next lint --fix", + "lint:fix": "next lint -- --fix", "graphql:codegen": "apollo client:codegen --target typescript", "graphql:schema": "apollo client:download-schema services/crm/graphql/schema.graphql" }, diff --git a/pages/500.jsx b/pages/500.jsx index 438a1df..bcd6cf6 100644 --- a/pages/500.jsx +++ b/pages/500.jsx @@ -5,7 +5,7 @@ export default function NotFound(props) { ); diff --git a/pages/_app.tsx b/pages/_app.tsx index 880fcc0..7ca4428 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -1,3 +1,4 @@ +/* eslint-disable global-require */ import { ApolloProvider } from '@apollo/client'; import 'antd/dist/antd.less'; import { useApollo } from 'apollo/hooks'; diff --git a/pages/_document.jsx b/pages/_document.jsx index 0b61d2f..fd7ee6d 100644 --- a/pages/_document.jsx +++ b/pages/_document.jsx @@ -7,10 +7,9 @@ export default class MyDocument extends Document { const originalRenderPage = ctx.renderPage; try { - ctx.renderPage = () => - originalRenderPage({ - enhanceApp: App => props => sheet.collectStyles(), - }); + ctx.renderPage = () => originalRenderPage({ + enhanceApp: (App) => (props) => sheet.collectStyles(), + }); const initialProps = await Document.getInitialProps(ctx); return { @@ -26,6 +25,7 @@ export default class MyDocument extends Document { sheet.seal(); } } + render() { return ( diff --git a/pages/index.tsx b/pages/index.tsx index 3b0dea5..a4af239 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -1,18 +1,22 @@ import { initializeApollo } from 'apollo/client'; -import type { GetServerSideProps, NextPage } from 'next'; +import type { GetServerSideProps } from 'next'; import { fetchUser } from 'services/user'; import type { BasePageProps } from 'types/page'; interface PageProps extends BasePageProps {} -const Home: NextPage = () => { +function Home() { return
Home
; -}; +} -export const getServerSideProps: GetServerSideProps = async ctx => { +export const getServerSideProps: GetServerSideProps = async ( + ctx +) => { const user = await fetchUser({ headers: ctx?.req?.headers?.cookie - ? { cookie: ctx.req.headers.cookie } + ? { + cookie: ctx.req.headers.cookie, + } : undefined, });